609 changed files with 25136 additions and 71507 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -1,12 +0,0 @@
-node_modules/
-dist/
-logs/
-.DS_Store
-.git/
-config/local.json
-pleroma-backend/
-test/e2e/reports/
-test/e2e-playwright/test-results/
-test/e2e-playwright/playwright-report/
-__screenshots__/
-
--- a/.forgejo/issue_template/bug.yaml
+++ b/.forgejo/issue_template/bug.yaml
@ -1,87 +0,0 @@
-name: 'Bug report'
-about: 'Bug report for Pleroma FE'
-labels:
-  - Bug
-body:
- type: input
-  id: env-browser
-  attributes:
-    label: Browser and OS
-    description: What browser are you using, including version, and what OS are you running?
-    placeholder: Firefox 140, Arch Linux
-  validations:
-    required: true
- type: input
-  id: env-instance
-  attributes:
-    label: Instance URL
-  validations:
-    required: false
- type: input
-  id: env-backend
-  attributes:
-    label: Backend version information
-    description: Backend version being used. (See Settings->Show advanced->Developer)
-    placeholder: Pleroma BE 2.10
-  validations:
-    required: true
- type: input
-  id: env-frontend
-  attributes:
-    label: Frontend version information
-    description: Frontend version being used. (See Settings->Show advanced->Developer)
-    placeholder: Pleroma FE 2.10
-  validations:
-    required: true
- type: input
-  id: env-extensions
-  attributes:
-    label: Browser extensions
-    description: List of browser extensions you are using, like uBlock, rikaichamp etc. If none leave empty.
-  validations:
-    required: false
- type: input
-  id: env-modifications
-  attributes:
-    label: Known instance/user customizations
-    description: Whether you are using a Pleroma FE fork, any mods mods or instance level styles among others.
-  validations:
-    required: false
- type: textarea
-  id: bug-text
-  attributes:
-    label: Bug description
-    description: A short description of the bug. Images can be helpful.
-  validations:
-    required: true
- type: textarea
-  id: bug-reproducer
-  attributes:
-    label: Reproduction steps
-    description: Ordered list of reproduction steps needed to make the bug happen. If you don't have reproduction steps, leave this empty.
-    placeholder: |
-      1. Log in with a fresh browser session
-      2. Open timeline X
-      3. Click on button Y
-      4. Z broke
-  validations:
-    required: false
- type: textarea
-  id: bug-seriousness
-  attributes:
-    label: Bug seriousness
-    value: |
-      * How annoying it is:
-      * How often does it happen:
-      * How many people does it affect:
-      * Is there a workaround for it:
- type: checkboxes
-  id: duplicate-issues
-  attributes:
-    label: Duplicate issues
-    hide_label: true
-    description: Before submitting this issue, search for same or similar issues on the [Pleroma FE bug tracker](https://git.pleroma.social/pleroma/pleroma-fe/issues).
-    options:
-      - label: I've searched for same or similar issues before submitting this issue.
-        required: true
-        visible: [form]
--- a/.forgejo/issue_template/suggestion.yaml
+++ b/.forgejo/issue_template/suggestion.yaml
@ -1,22 +0,0 @@
-name: 'Feature request / Suggestion / Improvement'
-about: 'Feature requests, suggestions and improvements for Pleroma FE'
-labels:
-  - Feature Request / Enhancement
-body:
- type: textarea
-  id: issue-text
-  attributes:
-    label: Proposal
-    placeholder: Make groups happen!
-  validations:
-    required: true
- type: checkboxes
-  id: duplicate-issues
-  attributes:
-    label: Duplicate issues
-    hide_label: true
-    description: Before submitting this issue, search for same or similar requests on the [Pleroma FE bug tracker](https://git.pleroma.social/pleroma/pleroma-fe/issues).
-    options:
-      - label: I've searched for same or similar requests before submitting this issue.
-        required: true
-        visible: [form]
--- a/.forgejo/pull_request_template.md
+++ b/.forgejo/pull_request_template.md
@ -1,12 +0,0 @@
-### Checklist
- [ ] Adding a changelog: In the `changelog.d` directory, create a file named `<code>.<type>`.
-
-<!--
-  `<code>` can be anything, but we recommend using a more or less unique identifier to avoid collisions, such as the branch name.
-
-  `<type>` can be `add`, `change`, `remove`, `fix`, `security` or `skip`. `skip` is only used if there is no user-visible change in the MR (for example, only editing comments in the code). Otherwise, choose a type that corresponds to your change.
-
-  In the file, write the changelog entry. For example, if an MR adds group functionality, we can create a file named `group.add` and write `Add group functionality` in it.
-
-  If one changelog entry is not enough, you may add more. But that might mean you can split it into two MRs. Only use more than one changelog entry if you really need to (for example, when one change in the code fix two different bugs, or when refactoring).
-->
--- a/.gitignore
+++ b/.gitignore
@ -4,11 +4,8 @@ dist/
 npm-debug.log
 test/unit/coverage
 test/e2e/reports
-test/e2e-playwright/test-results
-test/e2e-playwright/playwright-report
 selenium-debug.log
 .idea/
-.gitlab-ci-local/
 config/local.json
 src/assets/emoji.json
 logs/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -34,23 +34,12 @@ check-changelog:
    - apk add git
    - sh ./tools/check-changelog

-lint-eslint:
+lint:
  stage: lint
  script:
    - yarn
-    - yarn ci-eslint
-
-lint-biome:
-  stage: lint
-  script:
-    - yarn
-    - yarn ci-biome
-
-lint-stylelint:
-  stage: lint
-  script:
-    - yarn
-    - yarn ci-stylelint
+    - yarn lint
+    - yarn stylelint

 test:
  stage: test
@ -71,135 +60,6 @@ test:
      - test/**/__screenshots__
    when: on_failure

-e2e-pleroma:
-  stage: test
-  image: mcr.microsoft.com/playwright:v1.57.0-jammy
-  services:
-    - name: postgres:15-alpine
-      alias: db
-    - name: $PLEROMA_IMAGE
-      alias: pleroma
-      entrypoint: ["/bin/ash", "-c"]
-      command:
-        - |
-          set -eu
-
-          SEED_SENTINEL_PATH=/var/lib/pleroma/.e2e_seeded
-          CONFIG_OVERRIDE_PATH=/var/lib/pleroma/config.exs
-
-          echo '-- Waiting for database...'
-          while ! pg_isready -U ${DB_USER:-pleroma} -d postgres://${DB_HOST:-db}:${DB_PORT:-5432}/${DB_NAME:-pleroma} -t 1; do
-            sleep 1s
-          done
-
-          echo '-- Writing E2E config overrides...'
-          cat > $CONFIG_OVERRIDE_PATH <<EOF
-          import Config
-
-          config :pleroma, Pleroma.Captcha,
-            enabled: false
-
-          config :pleroma, :instance,
-            registrations_open: true,
-            account_activation_required: false,
-            approval_required: false
-          EOF
-
-          echo '-- Running migrations...'
-          /opt/pleroma/bin/pleroma_ctl migrate
-
-          echo '-- Starting!'
-          /opt/pleroma/bin/pleroma start &
-          PLEROMA_PID=$!
-
-          cleanup() {
-            if kill -0 $PLEROMA_PID 2>/dev/null; then
-              kill -TERM $PLEROMA_PID
-              wait $PLEROMA_PID || true
-            fi
-          }
-
-          trap cleanup INT TERM
-
-          echo '-- Waiting for API...'
-          api_ok=false
-          for _i in $(seq 1 120); do
-            if wget -qO- http://127.0.0.1:4000/api/v1/instance >/dev/null 2>&1; then
-              api_ok=true
-              break
-            fi
-            sleep 1s
-          done
-
-          if [ $api_ok != true ]; then
-            echo 'Timed out waiting for Pleroma API to become available'
-            exit 1
-          fi
-
-          if [ ! -f $SEED_SENTINEL_PATH ]; then
-            if [ -n ${E2E_ADMIN_USERNAME:-} ] && [ -n ${E2E_ADMIN_PASSWORD:-} ] && [ -n ${E2E_ADMIN_EMAIL:-} ]; then
-              echo '-- Seeding admin user' $E2E_ADMIN_USERNAME '...'
-              if ! /opt/pleroma/bin/pleroma_ctl user new $E2E_ADMIN_USERNAME $E2E_ADMIN_EMAIL --admin --password $E2E_ADMIN_PASSWORD -y; then
-                echo '-- User already exists or creation failed, ensuring admin + confirmed...'
-                /opt/pleroma/bin/pleroma_ctl user set $E2E_ADMIN_USERNAME --admin --confirmed
-              fi
-            else
-              echo '-- Skipping admin seeding (missing E2E_ADMIN_* env)'
-            fi
-
-            touch $SEED_SENTINEL_PATH
-          fi
-
-          wait $PLEROMA_PID
-  tags:
-    - amd64
-    - himem
-  variables:
-    PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: "1"
-    FF_NETWORK_PER_BUILD: "true"
-    PLEROMA_IMAGE: git.pleroma.social:5050/pleroma/pleroma:stable
-    POSTGRES_USER: pleroma
-    POSTGRES_PASSWORD: pleroma
-    POSTGRES_DB: pleroma
-    DB_USER: pleroma
-    DB_PASS: pleroma
-    DB_NAME: pleroma
-    DB_HOST: db
-    DB_PORT: 5432
-    DOMAIN: localhost
-    INSTANCE_NAME: Pleroma E2E
-    E2E_ADMIN_USERNAME: admin
-    E2E_ADMIN_PASSWORD: adminadmin
-    E2E_ADMIN_EMAIL: admin@example.com
-    ADMIN_EMAIL: $E2E_ADMIN_EMAIL
-    NOTIFY_EMAIL: $E2E_ADMIN_EMAIL
-    VITE_PROXY_TARGET: http://pleroma:4000
-    VITE_PROXY_ORIGIN: http://localhost:4000
-    E2E_BASE_URL: http://localhost:8080
-  script:
-    - npm install -g yarn@1.22.22
-    - yarn --frozen-lockfile
-    - |
-      echo "-- Waiting for Pleroma API..."
-      api_ok="false"
-      for _i in $(seq 1 120); do
-        if wget -qO- http://pleroma:4000/api/v1/instance >/dev/null 2>&1; then
-          api_ok="true"
-          break
-        fi
-        sleep 1s
-      done
-      if [ "$api_ok" != "true" ]; then
-        echo "Timed out waiting for Pleroma API to become available"
-        exit 1
-      fi
-    - yarn e2e:pw
-  artifacts:
-    when: on_failure
-    paths:
-      - test/e2e-playwright/test-results
-      - test/e2e-playwright/playwright-report
-
 build:
  stage: build
  tags:
--- a/.gitlab/merge_request_templates/Release.md
+++ b/.gitlab/merge_request_templates/Release.md
@ -1,8 +0,0 @@
-### Release checklist
-* [ ] Bump version in `package.json`
-* [ ] Compile a changelog with the `tools/collect-changelog` script
-* [ ] Create an MR with an announcement to pleroma.social
-#### post-merge
-* [ ] Tag the release on the merge commit
-* [ ] Make the tag into a Gitlab Release™
-* [ ] Merge `master` into `develop` (in case the fixes are already in develop, use `git merge -s ours --no-commit` and manually merge the changelogs)
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@ -12,8 +12,6 @@
    "custom-property-pattern": null,
    "keyframes-name-pattern": null,
    "scss/operator-no-newline-after": null,
-    "declaration-property-value-no-unknown": true,
-    "scss/declaration-property-value-no-unknown": true,
    "declaration-block-no-redundant-longhand-properties": [
      true,
      {
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,76 +2,6 @@
 All notable changes to this project will be documented in this file.

 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
-
-## 2.10.1
-### Fixed
- fixed being unable to set actor type from profile page
- fixed error when clicking mute menu itself (instead of submenu items)
- fixed mute -> domain status submenu not working
-
-### Internal
- Add playwright E2E-tests with an optional docker-based backend
-
-## 2.10.0
-### Changed
- Temporary changes modal now shows actual countdown instead of fixed timeout
- Disabled elements are more disabled now
- Rearranged and split settings to make more sense and be less of a wall of text
- On mobile settings now take up full width and presented in navigation style
-improved styles for settings
-
-### Added
- Most of the remaining AdminFE tabs were added into Admin Dashboard
- It's now possible to customize PWA Manfiest from PleromaFE
- Make every configuration option default-overridable by instance admins
-
-### Fixed
- Fixed settings not appearing if user never touched "show advanced" toggle
- Fix display of the broken/deleted/banned users
- Fixed incorrect emoji display in post interaction lists
- Fixed list title not being saved when editing
- Fixed poll notifications not being expandable
-
-
-## 2.9.3
-### Fixed
- Being unable to update profile
-
-## 2.9.2
-### Changed
- BREAKING: due to some internal technical changes logging into AdminFE through PleromaFE is no longer possible
- User card/profile got an overhaul
- Profile editing overhaul
- Visually combined subject and content fields in post form
- Moved post form's emoji button into input field
- Minor visual changes and fixes
- Clicking on fav/rt/emoji notifications' contents expands/collapses it
- Reduced time taken processing theme by half
- Splash screen only appears if loading takes more than 2 seconds
-
-### Added
- Mutes received an update, adding support for regex, muting based on username and expiration time.
- Mutes are now synchronized across sessions
- Support for expiring mutes and blocks (if available)
- Clicking on emoji shows bigger version of it alongside with its shortcode
-  - Admins also are able to copy it into a local pack
- Added support for Akkoma and IceShrimp.NET backends
- Compatibility with stricter CSP (Akkoma backend)
- Added a way to upload new packs from a URL or ZIP file via the Admin Dashboard
- Unify show/hide content buttons
- Add support for detachable scrollTop button
- Option to left-align user bio
- Cache assets and emojis with service worker
- Indicate currently active V3 theme as a body element class
- Add arithmetic blend ISS function
-
-### Fixed
- Display counter for status action buttons when they are in the menu
- Fix bookmark button alignment in the extra actions menu
- Instance favicons are no longer stretched
- A lot more scalable UI fixes
-  - Emoji picker now should work fine when emoji size is increased
-
 ## 2.8.0
 ### Changed
 - BREAKING: static/img/nsfw.2958239.png is now static/img/nsfw.DepQPhG0.png, which may affect people who specify exactly this path as the cover image
@ -104,8 +34,8 @@ This does not guarantee that browsers will or will not work.
 - Support displaying time in absolute format
 - Add draft management system
 - Compress most kinds of images on upload.
- Added option to always convert images to JPEG format instead of using WebP when compressing images.
- Added configurable image compression option in general settings, allowing users to control whether images are compressed before upload.
+- Added option to always convert images to JPEG format instead of using WebP when compressing images. 
+- Added configurable image compression option in general settings, allowing users to control whether images are compressed before upload. 
 - Inform users that Smithereen public polls are public
 - Splash screen + loading indicator to make process of identifying initialization issues and load performance
 - UI for making v3 themes and palettes, support for bundling v3 themes
--- a/README.md
+++ b/README.md
@ -6,7 +6,7 @@

 # For Translators

-To translate Pleroma-FE, use our weblate server: https://translate.pleroma.social/. If you need to add your language it should be added as a json file in [src/i18n/](https://git.pleroma.social/pleroma/pleroma-fe/src/src/i18n/) folder and added in a list within [src/i18n/languages.js](https://git.pleroma.social/pleroma/pleroma-fe/src/src/i18n/languages.js). 
+To translate Pleroma-FE, use our weblate server: https://translate.pleroma.social/. If you need to add your language it should be added as a json file in [src/i18n/](https://git.pleroma.social/pleroma/pleroma-fe/blob/develop/src/i18n/) folder and added in a list within [src/i18n/languages.js](https://git.pleroma.social/pleroma/pleroma-fe/blob/develop/src/i18n/languages.js). 

 Pleroma-FE will set your language by your browser locale, but you can change language in settings.

@ -32,10 +32,10 @@ yarn unit

 # For Contributors:

-You can create file `/config/local.json` (see [example](https://git.pleroma.social/pleroma/pleroma-fe/src/config/local.example.json)) to enable some convenience dev options:
+You can create file `/config/local.json` (see [example](https://git.pleroma.social/pleroma/pleroma-fe/blob/develop/config/local.example.json)) to enable some convenience dev options:

 * `target`: makes local dev server redirect to some existing instance's BE instead of local BE, useful for testing things in near-production environment and searching for real-life use-cases.
-* `staticConfigPreference`: makes FE's `/static/config.json` take preference of BE-served `/api/pleroma/frontend_configurations`. Only works in dev mode.
+* `staticConfigPreference`: makes FE's `/static/config.json` take preference of BE-served `/api/statusnet/config.json`. Only works in dev mode.

 FE Build process also leaves current commit hash in global variable `___pleromafe_commit_hash` so that you can easily see which pleroma-fe commit instance is running, also helps pinpointing which commit was used when FE was bundled into BE.

--- a/biome.json
+++ b/biome.json
@ -1,149 +0,0 @@
-{
-  "$schema": "https://biomejs.dev/schemas/2.3.11/schema.json",
-  "vcs": {
-    "enabled": true,
-    "clientKind": "git",
-    "useIgnoreFile": true
-  },
-  "files": {
-    "includes": ["**", "!!**/dist", "!!tools/emojis.json"]
-  },
-  "formatter": {
-    "enabled": true,
-    "indentStyle": "space"
-  },
-  "linter": {
-    "enabled": true,
-    "domains": {
-      "vue": "recommended"
-    },
-    "rules": {
-      "recommended": false,
-      "complexity": {
-        "noAdjacentSpacesInRegex": "error",
-        "noExtraBooleanCast": "error",
-        "noUselessCatch": "error",
-        "noUselessEscapeInRegex": "error"
-      },
-      "correctness": {
-        "noConstAssign": "error",
-        "noConstantCondition": "error",
-        "noEmptyCharacterClassInRegex": "error",
-        "noEmptyPattern": "error",
-        "noGlobalObjectCalls": "error",
-        "noInvalidBuiltinInstantiation": "error",
-        "noInvalidConstructorSuper": "error",
-        "noNonoctalDecimalEscape": "error",
-        "noPrecisionLoss": "error",
-        "noSelfAssign": "error",
-        "noSetterReturn": "error",
-        "noSwitchDeclarations": "error",
-        "noUndeclaredVariables": "error",
-        "noUnreachable": "error",
-        "noUnreachableSuper": "error",
-        "noUnsafeFinally": "error",
-        "noUnsafeOptionalChaining": "error",
-        "noUnusedLabels": "error",
-        "noUnusedPrivateClassMembers": "error",
-        "noUnusedVariables": "error",
-        "useIsNan": "error",
-        "useValidForDirection": "error",
-        "useValidTypeof": "error",
-        "useYield": "error"
-      },
-      "suspicious": {
-        "noAsyncPromiseExecutor": "error",
-        "noCatchAssign": "error",
-        "noClassAssign": "error",
-        "noCompareNegZero": "error",
-        "noConstantBinaryExpressions": "error",
-        "noControlCharactersInRegex": "error",
-        "noDebugger": "error",
-        "noDuplicateCase": "error",
-        "noDuplicateClassMembers": "error",
-        "noDuplicateElseIf": "error",
-        "noDuplicateObjectKeys": "error",
-        "noDuplicateParameters": "error",
-        "noEmptyBlockStatements": "error",
-        "noFallthroughSwitchClause": "error",
-        "noFunctionAssign": "error",
-        "noGlobalAssign": "error",
-        "noImportAssign": "error",
-        "noIrregularWhitespace": "error",
-        "noMisleadingCharacterClass": "error",
-        "noPrototypeBuiltins": "error",
-        "noRedeclare": "error",
-        "noShadowRestrictedNames": "error",
-        "noSparseArray": "error",
-        "noUnsafeNegation": "error",
-        "noUselessRegexBackrefs": "error",
-        "noWith": "error",
-        "useGetterReturn": "error"
-      }
-    }
-  },
-  "javascript": {
-    "formatter": {
-      "quoteStyle": "single",
-      "semicolons": "asNeeded"
-    },
-    "globals": []
-  },
-  "overrides": [
-    {
-      "includes": ["**/*.spec.js", "test/fixtures/*.js"],
-      "javascript": {
-        "globals": [
-          "vi",
-          "describe",
-          "it",
-          "test",
-          "expect",
-          "before",
-          "beforeEach",
-          "after",
-          "afterEach"
-        ]
-      }
-    },
-    {
-      "includes": ["**/*.vue"],
-      "linter": {
-        "rules": {
-          "style": {
-            "useConst": "off",
-            "useImportType": "off"
-          },
-          "correctness": {
-            "noUnusedVariables": "off",
-            "noUnusedImports": "off"
-          }
-        }
-      }
-    }
-  ],
-  "assist": {
-    "enabled": true,
-    "actions": {
-      "source": {
-        "organizeImports": {
-          "level": "on",
-          "options": {
-            "groups": [
-              [":NODE:", ":PACKAGE:", "!src/**", "!@fortawesome/**"],
-              ":BLANK_LINE:",
-              [":PATH:", "src/components/**"],
-              ":BLANK_LINE:",
-              [":PATH:", "src/stores/**"],
-              ":BLANK_LINE:",
-              [":PATH:", "src/**", "src/stores/**", "src/components/**"],
-              ":BLANK_LINE:",
-              "@fortawesome/fontawesome-svg-core",
-              "@fortawesome/*"
-            ]
-          }
-        }
-      }
-    }
-  }
-}
--- a/build/check-versions.mjs
+++ b/build/check-versions.mjs
@ -1,5 +1,5 @@
-import chalk from 'chalk'
 import semver from 'semver'
+import chalk from 'chalk'

 import packageConfig from '../package.json' with { type: 'json' }

@ -7,8 +7,8 @@ var versionRequirements = [
  {
    name: 'node',
    currentVersion: semver.clean(process.version),
-    versionRequirement: packageConfig.engines.node,
-  },
+    versionRequirement: packageConfig.engines.node
+  }
 ]

 export default function () {
@ -16,22 +16,15 @@ export default function () {
  for (let i = 0; i < versionRequirements.length; i++) {
    const mod = versionRequirements[i]
    if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) {
-      warnings.push(
-        mod.name +
-          ': ' +
-          chalk.red(mod.currentVersion) +
-          ' should be ' +
-          chalk.green(mod.versionRequirement),
+      warnings.push(mod.name + ': ' +
+        chalk.red(mod.currentVersion) + ' should be ' +
+        chalk.green(mod.versionRequirement)
      )
    }
  }

  if (warnings.length) {
-    console.warn(
-      chalk.yellow(
-        '\nTo use this template, you must update following to modules:\n',
-      ),
-    )
+    console.warn(chalk.yellow('\nTo use this template, you must update following to modules:\n'))
    for (let i = 0; i < warnings.length; i++) {
      const warning = warnings[i]
      console.warn('  ' + warning)
--- a/build/commit_hash.js
+++ b/build/commit_hash.js
@ -1,8 +1,8 @@
 import childProcess from 'child_process'

-export const getCommitHash = () => {
-  const subst = '$Format:%h$'
-  if (!subst.match(/Format:/)) {
+export const getCommitHash = (() => {
+  const subst = "$Format:%h$"
+  if(!subst.match(/Format:/)) {
    return subst
  } else {
    try {
@ -15,4 +15,4 @@ export const getCommitHash = () => {
      return 'UNKNOWN'
    }
  }
-}
+})
--- a/build/copy_plugin.js
+++ b/build/copy_plugin.js
@ -1,8 +1,8 @@
-import { cp } from 'node:fs/promises'
-import { resolve } from 'node:path'
 import serveStatic from 'serve-static'
+import { resolve } from 'node:path'
+import { cp } from 'node:fs/promises'

-const getPrefix = (s) => {
+const getPrefix = s => {
  const padEnd = s.endsWith('/') ? s : s + '/'
  return padEnd.startsWith('/') ? padEnd : '/' + padEnd
 }
@ -13,31 +13,28 @@ const copyPlugin = ({ inUrl, inFs }) => {
  let copyTarget
  const handler = serveStatic(inFs)

-  return [
-    {
-      name: 'copy-plugin-serve',
-      apply: 'serve',
-      configureServer(server) {
-        server.middlewares.use(prefix, handler)
-      },
+  return [{
+    name: 'copy-plugin-serve',
+    apply: 'serve',
+    configureServer (server) {
+      server.middlewares.use(prefix, handler)
+    }
+  }, {
+    name: 'copy-plugin-build',
+    apply: 'build',
+    configResolved (config) {
+      copyTarget = resolve(config.root, config.build.outDir, subdir)
    },
-    {
-      name: 'copy-plugin-build',
-      apply: 'build',
-      configResolved(config) {
-        copyTarget = resolve(config.root, config.build.outDir, subdir)
-      },
-      closeBundle: {
-        order: 'post',
-        sequential: true,
-        async handler() {
-          console.info(`Copying '${inFs}' to ${copyTarget}...`)
-          await cp(inFs, copyTarget, { recursive: true })
-          console.info('Done.')
-        },
-      },
-    },
-  ]
+    closeBundle: {
+      order: 'post',
+      sequential: true,
+      async handler () {
+        console.log(`Copying '${inFs}' to ${copyTarget}...`)
+        await cp(inFs, copyTarget, { recursive: true })
+        console.log('Done.')
+      }
+    }
+  }]
 }

 export default copyPlugin
--- a/build/emojis_plugin.js
+++ b/build/emojis_plugin.js
@ -1,23 +1,21 @@
-import { access } from 'node:fs/promises'
 import { resolve } from 'node:path'
-
-import { languages } from '../src/i18n/languages.js'
+import { access } from 'node:fs/promises'
+import { languages, langCodeToCldrName } from '../src/i18n/languages.js'

 const annotationsImportPrefix = '@kazvmoe-infra/unicode-emoji-json/annotations/'
 const specialAnnotationsLocale = {
-  ja_easy: 'ja',
+  ja_easy: 'ja'
 }

-const internalToAnnotationsLocale = (internal) =>
-  specialAnnotationsLocale[internal] || internal
+const internalToAnnotationsLocale = (internal) => specialAnnotationsLocale[internal] || internal

 // This gets all the annotations that are accessible (whose language
 // can be chosen in the settings). Data for other languages are
 // discarded because there is no way for it to be fetched.
 const getAllAccessibleAnnotations = async (projectRoot) => {
-  const imports = (
-    await Promise.all(
-      languages.map(async (lang) => {
+  const imports = (await Promise.all(
+    languages
+      .map(async lang => {
        const destLang = internalToAnnotationsLocale(lang)
        const importModule = `${annotationsImportPrefix}${destLang}.json`
        const importFile = resolve(projectRoot, 'node_modules', importModule)
@ -25,18 +23,11 @@ const getAllAccessibleAnnotations = async (projectRoot) => {
          await access(importFile)
          return `'${lang}': () => import('${importModule}')`
        } catch (e) {
-          if (e.message.match(/ENOENT/)) {
-            console.warn(`Missing emoji annotations locale: ${destLang}`)
-          } else {
-            console.error('test', e.message)
-          }
          return
        }
-      }),
-    )
-  )
-    .filter((k) => k)
-    .join(',\n')
+      })))
+        .filter(k => k)
+        .join(',\n')

  return `
 export const annotationsLoader = {
@ -52,21 +43,21 @@ const emojisPlugin = () => {
  let projectRoot
  return {
    name: 'emojis-plugin',
-    configResolved(conf) {
+    configResolved (conf) {
      projectRoot = conf.root
    },
-    resolveId(id) {
+    resolveId (id) {
      if (id === emojiAnnotationsId) {
        return emojiAnnotationsIdResolved
      }
      return null
    },
-    async load(id) {
+    async load (id) {
      if (id === emojiAnnotationsIdResolved) {
        return await getAllAccessibleAnnotations(projectRoot)
      }
      return null
-    },
+    }
  }
 }

--- a/build/msw_plugin.js
+++ b/build/msw_plugin.js
@ -1,5 +1,5 @@
-import { readFile } from 'node:fs/promises'
 import { resolve } from 'node:path'
+import { readFile } from 'node:fs/promises'

 const target = 'node_modules/msw/lib/mockServiceWorker.js'

@ -8,10 +8,10 @@ const mswPlugin = () => {
  return {
    name: 'msw-plugin',
    apply: 'serve',
-    configResolved(conf) {
+    configResolved (conf) {
      projectRoot = conf.root
    },
-    configureServer(server) {
+    configureServer (server) {
      server.middlewares.use(async (req, res, next) => {
        if (req.path === '/mockServiceWorker.js') {
          const file = await readFile(resolve(projectRoot, target))
@ -21,7 +21,7 @@ const mswPlugin = () => {
          next()
        }
      })
-    },
+    }
  }
 }

--- a/build/service_worker_messages.js
+++ b/build/service_worker_messages.js
@ -1,12 +1,11 @@
+import { languages, langCodeToJsonName } from '../src/i18n/languages.js'
 import { readFile } from 'node:fs/promises'
 import { dirname, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'

-import { langCodeToJsonName, languages } from '../src/i18n/languages.js'
-
 const i18nDir = resolve(
  dirname(dirname(fileURLToPath(import.meta.url))),
-  'src/i18n',
+  'src/i18n'
 )

 export const i18nFiles = languages.reduce((acc, lang) => {
@ -17,15 +16,13 @@ export const i18nFiles = languages.reduce((acc, lang) => {
 }, {})

 export const generateServiceWorkerMessages = async () => {
-  const msgArray = await Promise.all(
-    Object.entries(i18nFiles).map(async ([lang, file]) => {
-      const fileContent = await readFile(file, 'utf-8')
-      const msg = {
-        notifications: JSON.parse(fileContent).notifications || {},
-      }
-      return [lang, msg]
-    }),
-  )
+  const msgArray = await Promise.all(Object.entries(i18nFiles).map(async ([lang, file]) => {
+    const fileContent = await readFile(file, 'utf-8')
+    const msg = {
+      notifications: JSON.parse(fileContent).notifications || {}
+    }
+    return [lang, msg]
+  }))
  return msgArray.reduce((acc, [lang, msg]) => {
    acc[lang] = msg
    return acc
--- a/build/sw_plugin.js
+++ b/build/sw_plugin.js
@ -1,13 +1,9 @@
-import { readFile } from 'node:fs/promises'
-import { dirname, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
-import * as esbuild from 'esbuild'
+import { dirname, resolve } from 'node:path'
+import { readFile } from 'node:fs/promises'
 import { build } from 'vite'
-
-import {
-  generateServiceWorkerMessages,
-  i18nFiles,
-} from './service_worker_messages.js'
+import * as esbuild from 'esbuild'
+import { generateServiceWorkerMessages, i18nFiles } from './service_worker_messages.js'

 const getSWMessagesAsText = async () => {
  const messages = await generateServiceWorkerMessages()
@ -18,10 +14,14 @@ const projectRoot = dirname(dirname(fileURLToPath(import.meta.url)))
 const swEnvName = 'virtual:pleroma-fe/service_worker_env'
 const swEnvNameResolved = '\0' + swEnvName
 const getDevSwEnv = () => `self.serviceWorkerOption = { assets: [] };`
-const getProdSwEnv = ({ assets }) =>
-  `self.serviceWorkerOption = { assets: ${JSON.stringify(assets)} };`
+const getProdSwEnv = ({ assets }) => `self.serviceWorkerOption = { assets: ${JSON.stringify(assets)} };`

-export const devSwPlugin = ({ swSrc, swDest, transformSW, alias }) => {
+export const devSwPlugin = ({
+  swSrc,
+  swDest,
+  transformSW,
+  alias
+}) => {
  const swFullSrc = resolve(projectRoot, swSrc)
  const esbuildAlias = {}
  Object.entries(alias).forEach(([source, dest]) => {
@ -31,10 +31,9 @@ export const devSwPlugin = ({ swSrc, swDest, transformSW, alias }) => {
  return {
    name: 'dev-sw-plugin',
    apply: 'serve',
-    configResolved() {
-      /* no-op */
+    configResolved (conf) {
    },
-    resolveId(id) {
+    resolveId (id) {
      const name = id.startsWith('/') ? id.slice(1) : id
      if (name === swDest) {
        return swFullSrc
@ -43,7 +42,7 @@ export const devSwPlugin = ({ swSrc, swDest, transformSW, alias }) => {
      }
      return null
    },
-    async load(id) {
+    async load (id) {
      if (id === swFullSrc) {
        return readFile(swFullSrc, 'utf-8')
      } else if (id === swEnvNameResolved) {
@ -56,7 +55,7 @@ export const devSwPlugin = ({ swSrc, swDest, transformSW, alias }) => {
     * during dev, and firefox does not support ESM as service worker
     * https://bugzilla.mozilla.org/show_bug.cgi?id=1360870
     */
-    async transform(code, id) {
+    async transform (code, id) {
      if (id === swFullSrc && transformSW) {
        const res = await esbuild.build({
          entryPoints: [swSrc],
@ -64,54 +63,52 @@ export const devSwPlugin = ({ swSrc, swDest, transformSW, alias }) => {
          write: false,
          outfile: 'sw-pleroma.js',
          alias: esbuildAlias,
-          plugins: [
-            {
-              name: 'vite-like-root-resolve',
-              setup(b) {
-                b.onResolve({ filter: new RegExp(/^\//) }, (args) => ({
-                  path: resolve(projectRoot, args.path.slice(1)),
+          plugins: [{
+            name: 'vite-like-root-resolve',
+            setup (b) {
+              b.onResolve(
+                { filter: new RegExp(/^\//) },
+                args => ({
+                  path: resolve(projectRoot, args.path.slice(1))
+                })
+              )
+            }
+          }, {
+            name: 'sw-messages',
+            setup (b) {
+              b.onResolve(
+                { filter: new RegExp('^' + swMessagesName + '$') },
+                args => ({
+                  path: args.path,
+                  namespace: 'sw-messages'
                }))
-              },
-            },
-            {
-              name: 'sw-messages',
-              setup(b) {
-                b.onResolve(
-                  { filter: new RegExp('^' + swMessagesName + '$') },
-                  (args) => ({
-                    path: args.path,
-                    namespace: 'sw-messages',
-                  }),
-                )
-                b.onLoad(
-                  { filter: /.*/, namespace: 'sw-messages' },
-                  async () => ({
-                    contents: await getSWMessagesAsText(),
-                  }),
-                )
-              },
-            },
-            {
-              name: 'sw-env',
-              setup(b) {
-                b.onResolve(
-                  { filter: new RegExp('^' + swEnvName + '$') },
-                  (args) => ({
-                    path: args.path,
-                    namespace: 'sw-env',
-                  }),
-                )
-                b.onLoad({ filter: /.*/, namespace: 'sw-env' }, () => ({
-                  contents: getDevSwEnv(),
+              b.onLoad(
+                { filter: /.*/, namespace: 'sw-messages' },
+                async () => ({
+                  contents: await getSWMessagesAsText()
                }))
-              },
-            },
-          ],
+            }
+          }, {
+            name: 'sw-env',
+            setup (b) {
+              b.onResolve(
+                { filter: new RegExp('^' + swEnvName + '$') },
+                args => ({
+                  path: args.path,
+                  namespace: 'sw-env'
+                }))
+              b.onLoad(
+                { filter: /.*/, namespace: 'sw-env' },
+                () => ({
+                  contents: getDevSwEnv()
+                }))
+            }
+          }]
        })
        const text = res.outputFiles[0].text
        return text
      }
-    },
+    }
  }
 }

@ -121,13 +118,16 @@ export const devSwPlugin = ({ swSrc, swDest, transformSW, alias }) => {
 // however, we must compile the service worker to iife because of browser support.
 // Run another vite build just for the service worker targeting iife at
 // the end of the build.
-export const buildSwPlugin = ({ swSrc, swDest }) => {
+export const buildSwPlugin = ({
+  swSrc,
+  swDest,
+}) => {
  let config
  return {
    name: 'build-sw-plugin',
    enforce: 'post',
    apply: 'build',
-    configResolved(resolvedConfig) {
+    configResolved (resolvedConfig) {
      config = {
        define: resolvedConfig.define,
        resolve: resolvedConfig.resolve,
@ -138,50 +138,50 @@ export const buildSwPlugin = ({ swSrc, swDest }) => {
          lib: {
            entry: swSrc,
            formats: ['iife'],
-            name: 'sw_pleroma',
+            name: 'sw_pleroma'
          },
          emptyOutDir: false,
          rollupOptions: {
            output: {
-              entryFileNames: swDest,
-            },
-          },
+              entryFileNames: swDest
+            }
+          }
        },
-        configFile: false,
+        configFile: false
      }
    },
    generateBundle: {
      order: 'post',
      sequential: true,
-      async handler(_, bundle) {
+      async handler (_, bundle) {
        const assets = Object.keys(bundle)
-          .filter((name) => !/\.map$/.test(name))
-          .map((name) => '/' + name)
+              .filter(name => !/\.map$/.test(name))
+              .map(name => '/' + name)
        config.plugins.push({
          name: 'build-sw-env-plugin',
-          resolveId(id) {
+          resolveId (id) {
            if (id === swEnvName) {
              return swEnvNameResolved
            }
            return null
          },
-          load(id) {
+          load (id) {
            if (id === swEnvNameResolved) {
              return getProdSwEnv({ assets })
            }
            return null
-          },
+          }
        })
-      },
+      }
    },
    closeBundle: {
      order: 'post',
      sequential: true,
-      async handler() {
-        console.info('Building service worker for production')
+      async handler () {
+        console.log('Building service worker for production')
        await build(config)
-      },
-    },
+      }
+    }
  }
 }

@ -191,9 +191,9 @@ const swMessagesNameResolved = '\0' + swMessagesName
 export const swMessagesPlugin = () => {
  return {
    name: 'sw-messages-plugin',
-    resolveId(id) {
+    resolveId (id) {
      if (id === swMessagesName) {
-        Object.values(i18nFiles).forEach((f) => {
+        Object.values(i18nFiles).forEach(f => {
          this.addWatchFile(f)
        })
        return swMessagesNameResolved
@ -201,11 +201,11 @@ export const swMessagesPlugin = () => {
        return null
      }
    },
-    async load(id) {
+    async load (id) {
      if (id === swMessagesNameResolved) {
        return await getSWMessagesAsText()
      }
      return null
-    },
+    }
  }
 }
--- a/build/update-emoji.js
+++ b/build/update-emoji.js
@ -1,21 +1,22 @@
-import emojis from '@kazvmoe-infra/unicode-emoji-json/data-by-group.json' with {
-  type: 'json',
-}
+
+import emojis from '@kazvmoe-infra/unicode-emoji-json/data-by-group.json' with { type: 'json' }
 import fs from 'fs'

-Object.keys(emojis).map((k) => {
-  emojis[k].map((e) => {
-    delete e.unicode_version
-    delete e.emoji_version
-    delete e.skin_tone_support_unicode_version
+Object.keys(emojis)
+  .map(k => {
+    emojis[k].map(e => {
+      delete e.unicode_version
+      delete e.emoji_version
+      delete e.skin_tone_support_unicode_version
+    })
  })
-})

 const res = {}
-Object.keys(emojis).map((k) => {
-  const groupId = k.replace('&', 'and').replace(/ /g, '-').toLowerCase()
-  res[groupId] = emojis[k]
-})
+Object.keys(emojis)
+  .map(k => {
+    const groupId = k.replace('&', 'and').replace(/ /g, '-').toLowerCase()
+    res[groupId] = emojis[k]
+  })

 console.info('Updating emojis...')
 fs.writeFileSync('src/assets/emoji.json', JSON.stringify(res))
--- a/changelog.d/action-button-extra-counter.add
+++ b/changelog.d/action-button-extra-counter.add
@ -0,0 +1 @@
+Display counter for status action buttons when they are on the menu
--- a/changelog.d/akkoma-sharkey-net-support.add
+++ b/changelog.d/akkoma-sharkey-net-support.add
@ -0,0 +1 @@
+Added support for Akkoma and IceShrimp.NET backend
--- a/changelog.d/instance-store-migration.skip
+++ b/changelog.d/instance-store-migration.skip
--- a/changelog.d/arithmetic-blend.add
+++ b/changelog.d/arithmetic-blend.add
@ -0,0 +1,2 @@
+Add arithmetic blend ISS function
+
--- a/changelog.d/attrs-parsing.fix
+++ b/changelog.d/attrs-parsing.fix
@ -1 +0,0 @@
-Fix HTML attribute parsing for escaped quotes
--- a/changelog.d/better-scroll-button.add
+++ b/changelog.d/better-scroll-button.add
@ -0,0 +1 @@
+Add support for detachable scrollTop button
--- a/changelog.d/bookmark-button-align.fix
+++ b/changelog.d/bookmark-button-align.fix
@ -0,0 +1 @@
+Fix bookmark button alignment in the extra actions menu
--- a/changelog.d/csp.add
+++ b/changelog.d/csp.add
@ -0,0 +1 @@
+Compatibility with stricter CSP (Akkoma backend)
--- a/changelog.d/filter-fixes.skip
+++ b/changelog.d/filter-fixes.skip
--- a/changelog.d/fix-emojis-breaking-bio.fix
+++ b/changelog.d/fix-emojis-breaking-bio.fix
@ -1 +0,0 @@
-Fix emojis breaking user bio/description editing
--- a/changelog.d/fix-wrap.skip
+++ b/changelog.d/fix-wrap.skip
--- a/changelog.d/migrate-auth-flow-pinia.skip
+++ b/changelog.d/migrate-auth-flow-pinia.skip
--- a/changelog.d/migrate-oauth-tokens-module-to-pinia-store.skip
+++ b/changelog.d/migrate-oauth-tokens-module-to-pinia-store.skip
--- a/changelog.d/mutes-sync.add
+++ b/changelog.d/mutes-sync.add
@ -0,0 +1 @@
+Synchronized mutes, advanced mute control (regexp, expiry, naming)
--- a/changelog.d/profile-error.fix
+++ b/changelog.d/profile-error.fix
@ -0,0 +1 @@
+Fix error styling for user profiles
--- a/changelog.d/small-fixes.skip
+++ b/changelog.d/small-fixes.skip
--- a/changelog.d/sw-cache-assets.add
+++ b/changelog.d/sw-cache-assets.add
@ -0,0 +1 @@
+Cache assets and emojis with service worker
--- a/changelog.d/theme3-body-class.add
+++ b/changelog.d/theme3-body-class.add
@ -0,0 +1 @@
+Indicate currently active V3 theme as a body element class
--- a/changelog.d/unify-show-hide-buttons.add
+++ b/changelog.d/unify-show-hide-buttons.add
@ -0,0 +1 @@
+Unify show/hide content buttons
--- a/docker-compose.e2e.yml
+++ b/docker-compose.e2e.yml
@ -1,57 +0,0 @@
-services:
-  db:
-    image: postgres:15-alpine
-    environment:
-      POSTGRES_USER: pleroma
-      POSTGRES_PASSWORD: pleroma
-      POSTGRES_DB: pleroma
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U pleroma -d pleroma"]
-      interval: 2s
-      timeout: 2s
-      retries: 30
-
-  pleroma:
-    image: ${PLEROMA_IMAGE:-git.pleroma.social:5050/pleroma/pleroma:stable}
-    environment:
-      DB_USER: pleroma
-      DB_PASS: pleroma
-      DB_NAME: pleroma
-      DB_HOST: db
-      DB_PORT: 5432
-      DOMAIN: localhost
-      INSTANCE_NAME: Pleroma E2E
-      ADMIN_EMAIL: ${E2E_ADMIN_EMAIL:-admin@example.com}
-      NOTIFY_EMAIL: ${E2E_ADMIN_EMAIL:-admin@example.com}
-      E2E_ADMIN_USERNAME: ${E2E_ADMIN_USERNAME:-admin}
-      E2E_ADMIN_PASSWORD: ${E2E_ADMIN_PASSWORD:-adminadmin}
-      E2E_ADMIN_EMAIL: ${E2E_ADMIN_EMAIL:-admin@example.com}
-    depends_on:
-      db:
-        condition: service_healthy
-    volumes:
-      - ./docker/pleroma/entrypoint.e2e.sh:/opt/pleroma/entrypoint.e2e.sh:ro
-    entrypoint: ["/bin/ash", "/opt/pleroma/entrypoint.e2e.sh"]
-    healthcheck:
-      # NOTE: "localhost" may resolve to ::1 in some images (IPv6) while Pleroma only
-      # listens on IPv4 in this container. Use 127.0.0.1 to avoid false negatives.
-      test: ["CMD-SHELL", "test -f /var/lib/pleroma/.e2e_seeded && wget -qO- http://127.0.0.1:4000/api/v1/instance >/dev/null || exit 1"]
-      interval: 5s
-      timeout: 3s
-      retries: 60
-
-  e2e:
-    build:
-      context: .
-      dockerfile: docker/e2e/Dockerfile.e2e
-    depends_on:
-      pleroma:
-        condition: service_healthy
-    environment:
-      CI: "1"
-      VITE_PROXY_TARGET: http://pleroma:4000
-      VITE_PROXY_ORIGIN: http://localhost:4000
-      E2E_BASE_URL: http://localhost:8080
-      E2E_ADMIN_USERNAME: ${E2E_ADMIN_USERNAME:-admin}
-      E2E_ADMIN_PASSWORD: ${E2E_ADMIN_PASSWORD:-adminadmin}
-    command: ["yarn", "e2e:pw"]
--- a/docker/e2e/Dockerfile.e2e
+++ b/docker/e2e/Dockerfile.e2e
@ -1,16 +0,0 @@
-FROM mcr.microsoft.com/playwright:v1.57.0-jammy
-
-WORKDIR /app
-
-ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
-
-RUN npm install -g yarn@1.22.22
-
-COPY package.json yarn.lock ./
-RUN yarn --frozen-lockfile
-
-COPY . .
-
-ENV CI=1
-
-CMD ["yarn", "e2e:pw"]
--- a/docker/pleroma/entrypoint.e2e.sh
+++ b/docker/pleroma/entrypoint.e2e.sh
@ -1,71 +0,0 @@
-#!/bin/ash
-
-set -eu
-
-SEED_SENTINEL_PATH="/var/lib/pleroma/.e2e_seeded"
-CONFIG_OVERRIDE_PATH="/var/lib/pleroma/config.exs"
-
-echo "-- Waiting for database..."
-while ! pg_isready -U "${DB_USER:-pleroma}" -d "postgres://${DB_HOST:-db}:${DB_PORT:-5432}/${DB_NAME:-pleroma}" -t 1; do
-  sleep 1s
-done
-
-echo "-- Writing E2E config overrides..."
-cat > "$CONFIG_OVERRIDE_PATH" <<'EOF'
-import Config
-
-config :pleroma, Pleroma.Captcha,
-  enabled: false
-
-config :pleroma, :instance,
-  registrations_open: true,
-  account_activation_required: false,
-  approval_required: false
-EOF
-
-echo "-- Running migrations..."
-/opt/pleroma/bin/pleroma_ctl migrate
-
-echo "-- Starting!"
-/opt/pleroma/bin/pleroma start &
-PLEROMA_PID="$!"
-
-cleanup() {
-  if [ -n "${PLEROMA_PID:-}" ] && kill -0 "$PLEROMA_PID" 2>/dev/null; then
-    kill -TERM "$PLEROMA_PID"
-    wait "$PLEROMA_PID" || true
-  fi
-}
-
-trap cleanup INT TERM
-
-echo "-- Waiting for API..."
-api_ok="false"
-for _i in $(seq 1 120); do
-  if wget -qO- http://127.0.0.1:4000/api/v1/instance >/dev/null 2>&1; then
-    api_ok="true"
-    break
-  fi
-  sleep 1s
-done
-
-if [ "$api_ok" != "true" ]; then
-  echo "Timed out waiting for Pleroma API to become available"
-  exit 1
-fi
-
-if [ ! -f "$SEED_SENTINEL_PATH" ]; then
-  if [ -n "${E2E_ADMIN_USERNAME:-}" ] && [ -n "${E2E_ADMIN_PASSWORD:-}" ] && [ -n "${E2E_ADMIN_EMAIL:-}" ]; then
-    echo "-- Seeding admin user (${E2E_ADMIN_USERNAME})..."
-    if ! /opt/pleroma/bin/pleroma_ctl user new "$E2E_ADMIN_USERNAME" "$E2E_ADMIN_EMAIL" --admin --password "$E2E_ADMIN_PASSWORD" -y; then
-      echo "-- User already exists (or creation failed), ensuring admin + confirmed..."
-      /opt/pleroma/bin/pleroma_ctl user set "$E2E_ADMIN_USERNAME" --admin --confirmed
-    fi
-  else
-    echo "-- Skipping admin seeding (missing E2E_ADMIN_* env)"
-  fi
-
-  touch "$SEED_SENTINEL_PATH"
-fi
-
-wait "$PLEROMA_PID"
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@ -7,9 +7,9 @@

 PleromaFE gets its configuration from several sources, in order of preference (the one above overrides ones below it)

-1. `/api/pleroma/frontend_configurations` - this is generated by backend and includes FE/Client-specific data. PleromaFE uses the `pleroma_fe` field of it. For more info on changing config on BE, look [here](../backend/configuration/cheatsheet.md#frontend_configurations)
-2. `/static/config.json` - this is a static FE-provided file, containing only FE specific configuration. This file is completely optional and could be removed but is useful as a fallback if some configuration JSON property isn't present in BE-provided config. It's also a reference point to check what default configuration are and what JSON properties even exist. In local dev mode it could be used to override BE configuration, more about that in HACKING.md. File is located [here](https://git.pleroma.social/pleroma/pleroma-fe/src/public/static/config.json).
-3. Built-in defaults. Those are hard-coded defaults that are used when `/static/config.json` is not available and BE-provided configuration JSON is missing some JSON properties. ( [Code](https://git.pleroma.social/pleroma/pleroma-fe/src/src/stores/instance.js) )
+1. `/api/statusnet/config.json` - this is generated on Backend and contains multiple things including instance name, char limit etc. It also contains FE/Client-specific data, PleromaFE uses `pleromafe` field of it. For more info on changing config on BE, look [here](../backend/configuration/cheatsheet.md#frontend_configurations)
+2. `/static/config.json` - this is a static FE-provided file, containing only FE specific configuration. This file is completely optional and could be removed but is useful as a fallback if some configuration JSON property isn't present in BE-provided config. It's also a reference point to check what default configuration are and what JSON properties even exist. In local dev mode it could be used to override BE configuration, more about that in HACKING.md. File is located [here](https://git.pleroma.social/pleroma/pleroma-fe/blob/develop/static/config.json).
+3. Built-in defaults. Those are hard-coded defaults that are used when `/static/config.json` is not available and BE-provided configuration JSON is missing some JSON properties. ( [Code](https://git.pleroma.social/pleroma/pleroma-fe/blob/develop/src/modules/instance.js) )

 ## Instance-defaults

--- a/docs/HACKING.md
+++ b/docs/HACKING.md
@ -79,7 +79,7 @@ server {

 In 99% cases PleromaFE uses [MastoAPI](https://docs.joinmastodon.org/api/) with [Pleroma Extensions](../backend/API/differences_in_mastoapi_responses.md) to fetch the data. The rest is either QvitterAPI leftovers or pleroma-exclusive APIs. QvitterAPI doesn't exactly have documentation and uses different JSON structure and sometimes different parameters and workflows, [this](https://twitter-api.readthedocs.io/en/latest/index.html) could be a good reference though. Some pleroma-exclusive API may still be using QvitterAPI JSON structure.

-PleromaFE supports both formats by transforming them into internal format which is basically QvitterAPI one with some additions and renaming. All data is passed trough [Entity Normalizer](https://git.pleroma.social/pleroma/pleroma-fe/src/src/services/entity_normalizer/entity_normalizer.service.js) which can serve as a reference of API and what's actually used, it's also a host for all the hacks and data transformation.
+PleromaFE supports both formats by transforming them into internal format which is basically QvitterAPI one with some additions and renaming. All data is passed trough [Entity Normalizer](https://git.pleroma.social/pleroma/pleroma-fe/-/blob/develop/src/services/entity_normalizer/entity_normalizer.service.js) which can serve as a reference of API and what's actually used, it's also a host for all the hacks and data transformation.

 For most part, PleromaFE tries to store all the info it can get in global vuex store - every user and post are passed trough updating mechanism where data is either added or merged with existing data, reactively updating the information throughout UI, so if in newest request user's post counter increased, it will be instantly updated in open user profile cards. This is also used to find users, posts and sometimes to build timelines and/or request parameters.

--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@ -1,34 +1,37 @@
-import js from '@eslint/js'
-import { defineConfig, globalIgnores } from 'eslint/config'
-import vue from 'eslint-plugin-vue'
-import globals from 'globals'
+import vue from "eslint-plugin-vue";
+import js from "@eslint/js";
+import globals from "globals";

-export default defineConfig([
+
+export default [
  ...vue.configs['flat/recommended'],
-  globalIgnores(['**/*.js', 'build/', 'dist/', 'config/']),
+  js.configs.recommended,
  {
-    files: ['src/**/*.vue'],
-    plugins: { js },
-    extends: ['js/recommended'],
+    files: ["**/*.js", "**/*.mjs", "**/*.vue"],
+    ignores: ["build/*.js", "config/*.js"],
+
    languageOptions: {
      ecmaVersion: 2024,
-      sourceType: 'module',
+      sourceType: "module",

      parserOptions: {
-        parser: '@babel/eslint-parser',
+        parser: "@babel/eslint-parser",
      },
      globals: {
        ...globals.browser,
        ...globals.vitest,
        ...globals.chai,
        ...globals.commonjs,
-        ...globals.serviceworker,
-      },
+        ...globals.serviceworker
+      }
    },

    rules: {
+      'arrow-parens': 0,
+      'generator-star-spacing': 0,
+      'no-debugger': 0,
      'vue/require-prop-types': 0,
      'vue/multi-word-component-names': 0,
-    },
-  },
-])
+    }
+  }
+]
--- a/index.html
+++ b/index.html
@ -11,12 +11,14 @@
    <link rel="preload" href="/static/pleromatan_apology_fox_small.webp" as="image" />
    <!-- putting styles here to avoid having to wait for styles to load up -->
    <link rel="stylesheet" id="splashscreen" href="/static/splash.css" />
-    <link rel="stylesheet" id="custom-styles-holder" type="text/css" href="/static/empty.css" />
+    <link rel="stylesheet" id="pleroma-eager-styles" type="text/css" href="/static/empty.css" />
+    <link rel="stylesheet" id="pleroma-lazy-styles" type="text/css" href="/static/empty.css" />
+    <link rel="stylesheet" id="theme-holder" type="text/css" href="/static/empty.css" />
    <!--server-generated-meta-->
  </head>
  <body>
    <noscript>To use Pleroma, please enable JavaScript.</noscript>
-    <div id="splash" class="initial-hidden">
+    <div id="splash">
      <!-- we are hiding entire graphic so no point showing credit -->
      <div aria-hidden="true" id="splash-credit">
        Art by pipivovott
--- a/package.json
+++ b/package.json
@ -1,8 +1,8 @@
 {
  "name": "pleroma_fe",
-  "version": "2.10.1",
+  "version": "2.7.1",
  "description": "Pleroma frontend, the default frontend of Pleroma social network server",
-  "author": "Pleroma contributors <https://git.pleroma.social/pleroma/pleroma-fe/src/CONTRIBUTORS.md>",
+  "author": "Pleroma contributors <https://git.pleroma.social/pleroma/pleroma-fe/-/blob/develop/CONTRIBUTORS.md>",
  "private": false,
  "scripts": {
    "dev": "node build/update-emoji.js && vite dev",
@ -10,39 +10,36 @@
    "unit": "node build/update-emoji.js && vitest --run",
    "unit-ci": "node build/update-emoji.js && vitest --run --browser.headless",
    "unit:watch": "node build/update-emoji.js && vitest",
-    "e2e:pw": "playwright test --config test/e2e-playwright/playwright.config.mjs",
-    "e2e": "sh ./tools/e2e/run.sh",
+    "e2e": "node test/e2e/runner.js",
    "test": "yarn run unit && yarn run e2e",
-    "ci-biome": "yarn exec biome check",
-    "ci-eslint": "yarn exec eslint",
-    "ci-stylelint": "yarn exec stylelint '**/*.scss' '**/*.vue'",
-    "lint": "yarn ci-biome; yarn ci-eslint; yarn ci-stylelint",
-    "lint-fix": "yarn exec eslint -- --fix; yarn exec stylelint '**/*.scss' '**/*.vue' --fix; biome check --write"
+    "stylelint": "yarn exec stylelint '**/*.scss' '**/*.vue'",
+    "lint": "eslint src test/unit/specs test/e2e/specs",
+    "lint-fix": "eslint --fix src test/unit/specs test/e2e/specs"
  },
  "dependencies": {
-    "@babel/runtime": "7.28.4",
+    "@babel/runtime": "7.27.1",
    "@chenfengyuan/vue-qrcode": "2.0.0",
-    "@fortawesome/fontawesome-svg-core": "7.1.0",
-    "@fortawesome/free-regular-svg-icons": "7.1.0",
-    "@fortawesome/free-solid-svg-icons": "7.1.0",
-    "@fortawesome/vue-fontawesome": "3.1.2",
-    "@kazvmoe-infra/pinch-zoom-element": "1.3.0",
+    "@fortawesome/fontawesome-svg-core": "6.7.2",
+    "@fortawesome/free-regular-svg-icons": "6.7.2",
+    "@fortawesome/free-solid-svg-icons": "6.7.2",
+    "@fortawesome/vue-fontawesome": "3.0.8",
+    "@floatingghost/pinch-zoom-element": "1.3.1",
    "@kazvmoe-infra/unicode-emoji-json": "0.4.0",
-    "@ruffle-rs/ruffle": "0.1.0-nightly.2025.6.22",
+    "@ruffle-rs/ruffle": "0.1.0-nightly.2025.1.13",
    "@vuelidate/core": "2.0.3",
    "@vuelidate/validators": "2.0.4",
    "@web3-storage/parse-link-header": "^3.1.0",
    "body-scroll-lock": "3.1.5",
    "chromatism": "3.0.0",
    "click-outside-vue3": "4.0.1",
-    "cropperjs": "2.0.1",
+    "cropperjs": "2.0.0",
    "escape-html": "1.0.3",
    "globals": "^16.0.0",
    "hash-sum": "^2.0.0",
    "js-cookie": "3.0.5",
    "localforage": "1.10.0",
    "parse-link-header": "2.0.0",
-    "phoenix": "1.8.1",
+    "phoenix": "1.7.21",
    "pinia": "^3.0.0",
    "punycode.js": "2.3.1",
    "qrcode": "1.5.4",
@ -50,64 +47,63 @@
    "url": "0.11.4",
    "utf8": "3.0.0",
    "uuid": "11.1.0",
-    "vue": "3.5.22",
+    "vue": "3.5.17",
    "vue-i18n": "11",
-    "vue-router": "4.6.4",
+    "vue-router": "4.5.1",
    "vue-virtual-scroller": "^2.0.0-beta.7",
    "vuex": "4.1.0"
  },
  "devDependencies": {
-    "@babel/core": "7.28.5",
-    "@babel/eslint-parser": "7.28.5",
-    "@babel/plugin-transform-runtime": "7.28.5",
-    "@babel/preset-env": "7.28.5",
-    "@babel/register": "7.28.3",
-    "@biomejs/biome": "2.3.11",
-    "@pinia/testing": "1.0.3",
+    "@babel/core": "7.27.1",
+    "@babel/eslint-parser": "7.27.1",
+    "@babel/plugin-transform-runtime": "7.27.1",
+    "@babel/preset-env": "7.27.2",
+    "@babel/register": "7.27.1",
    "@ungap/event-target": "0.2.4",
    "@vitejs/plugin-vue": "^5.2.1",
    "@vitejs/plugin-vue-jsx": "^4.1.1",
    "@vitest/browser": "^3.0.7",
    "@vitest/ui": "^3.0.7",
    "@vue/babel-helper-vue-jsx-merge-props": "1.4.0",
-    "@vue/babel-plugin-jsx": "1.5.0",
-    "@vue/compiler-sfc": "3.5.22",
+    "@vue/babel-plugin-jsx": "1.4.0",
+    "@vue/compiler-sfc": "3.5.17",
    "@vue/test-utils": "2.4.6",
    "autoprefixer": "10.4.21",
    "babel-plugin-lodash": "3.3.4",
-    "chai": "5.3.3",
-    "chalk": "5.6.2",
+    "chai": "5.2.0",
+    "chalk": "5.4.1",
    "chromedriver": "135.0.4",
    "connect-history-api-fallback": "2.0.0",
    "cross-spawn": "7.0.6",
    "custom-event-polyfill": "1.0.7",
-    "eslint": "9.39.2",
+    "eslint": "9.26.0",
+    "vue-eslint-parser": "10.1.3",
    "eslint-config-standard": "17.1.0",
    "eslint-formatter-friendly": "7.0.0",
-    "eslint-plugin-import": "2.32.0",
-    "eslint-plugin-n": "17.23.1",
+    "eslint-plugin-import": "2.31.0",
+    "eslint-plugin-n": "17.18.0",
    "eslint-plugin-promise": "7.2.1",
-    "eslint-plugin-vue": "10.6.2",
+    "eslint-plugin-vue": "10.1.0",
    "eventsource-polyfill": "0.9.6",
    "express": "5.1.0",
    "function-bind": "1.1.2",
    "http-proxy-middleware": "3.0.5",
    "iso-639-1": "3.1.5",
    "lodash": "4.17.21",
-    "msw": "2.10.5",
-    "nightwatch": "3.12.2",
-    "playwright": "1.57.0",
-    "postcss": "8.5.6",
+    "msw": "2.10.2",
+    "nightwatch": "3.12.1",
+    "playwright": "1.52.0",
+    "postcss": "8.5.3",
    "postcss-html": "^1.5.0",
    "postcss-scss": "^4.0.6",
-    "sass": "1.93.2",
+    "sass": "1.89.2",
    "selenium-server": "3.141.59",
-    "semver": "7.7.3",
+    "semver": "7.7.2",
    "serve-static": "2.2.0",
    "shelljs": "0.10.0",
    "sinon": "20.0.0",
-    "sinon-chai": "4.0.1",
-    "stylelint": "16.25.0",
+    "sinon-chai": "4.0.0",
+    "stylelint": "16.19.1",
    "stylelint-config-html": "^1.1.0",
    "stylelint-config-recommended": "^16.0.0",
    "stylelint-config-recommended-scss": "^14.0.0",
@ -116,8 +112,7 @@
    "vite": "^6.1.0",
    "vite-plugin-eslint2": "^5.0.3",
    "vite-plugin-stylelint": "^6.0.0",
-    "vitest": "^3.0.7",
-    "vue-eslint-parser": "10.2.0"
+    "vitest": "^3.0.7"
  },
  "type": "module",
  "engines": {
--- a/postcss.config.js
+++ b/postcss.config.js
@ -1,5 +1,7 @@
 import autoprefixer from 'autoprefixer'

 export default {
-  plugins: [autoprefixer],
+  plugins: [
+    autoprefixer
+  ]
 }
--- a/public/static/empty.css
+++ b/public/static/empty.css
@ -0,0 +1 @@
+// nothing here //
--- a/public/static/palettes/index.json
+++ b/public/static/palettes/index.json
@ -1,26 +1,6 @@
 {
-  "pleroma-dark": [
-    "Pleroma Dark",
-    "#121a24",
-    "#182230",
-    "#b9b9ba",
-    "#d8a070",
-    "#d31014",
-    "#0fa00f",
-    "#0095ff",
-    "#ffa500"
-  ],
-  "pleroma-light": [
-    "Pleroma Light",
-    "#f2f4f6",
-    "#dbe0e8",
-    "#304055",
-    "#f86f0f",
-    "#d31014",
-    "#0fa00f",
-    "#0095ff",
-    "#ffa500"
-  ],
+  "pleroma-dark": [ "Pleroma Dark", "#121a24", "#182230", "#b9b9ba", "#d8a070", "#d31014", "#0fa00f", "#0095ff", "#ffa500" ],
+  "pleroma-light": [ "Pleroma Light", "#f2f4f6", "#dbe0e8", "#304055", "#f86f0f", "#d31014", "#0fa00f", "#0095ff", "#ffa500" ],
  "classic-dark": {
    "name": "Classic Dark",
    "bg": "#161c20",
@ -32,28 +12,8 @@
    "cBlue": "#0095ff",
    "cOrange": "#ffa500"
  },
-  "bird": [
-    "Bird",
-    "#f8fafd",
-    "#e6ecf0",
-    "#14171a",
-    "#0084b8",
-    "#e0245e",
-    "#17bf63",
-    "#1b95e0",
-    "#fab81e"
-  ],
-  "pleroma-amoled": [
-    "Pleroma Dark AMOLED",
-    "#000000",
-    "#111111",
-    "#b0b0b1",
-    "#d8a070",
-    "#aa0000",
-    "#0fa00f",
-    "#0095ff",
-    "#d59500"
-  ],
+  "bird": [ "Bird", "#f8fafd", "#e6ecf0", "#14171a", "#0084b8", "#e0245e", "#17bf63", "#1b95e0", "#fab81e"],
+  "pleroma-amoled": [ "Pleroma Dark AMOLED", "#000000", "#111111", "#b0b0b1", "#d8a070", "#aa0000", "#0fa00f", "#0095ff", "#d59500"],
  "tomorrow-night": {
    "name": "Tomorrow Night",
    "bg": "#1d1f21",
@ -76,28 +36,8 @@
    "cGreen": "#50FA7B",
    "cOrange": "#FFB86C"
  },
-  "ir-black": [
-    "Ir Black",
-    "#000000",
-    "#242422",
-    "#b5b3aa",
-    "#ff6c60",
-    "#FF6C60",
-    "#A8FF60",
-    "#96CBFE",
-    "#FFFFB6"
-  ],
-  "monokai": [
-    "Monokai",
-    "#272822",
-    "#383830",
-    "#f8f8f2",
-    "#f92672",
-    "#F92672",
-    "#a6e22e",
-    "#66d9ef",
-    "#f4bf75"
-  ],
+  "ir-black": [ "Ir Black", "#000000", "#242422", "#b5b3aa", "#ff6c60", "#FF6C60", "#A8FF60", "#96CBFE", "#FFFFB6" ],
+  "monokai": [ "Monokai", "#272822", "#383830", "#f8f8f2", "#f92672", "#F92672", "#a6e22e", "#66d9ef", "#f4bf75" ],
  "purple-stream": {
    "name": "Purple stream",
    "bg": "#17171A",
--- a/public/static/splash.css
+++ b/public/static/splash.css
@ -5,14 +5,15 @@ body {

 #splash {
  --scale: 1;
-
  width: 100vw;
  height: 100vh;
  display: grid;
  grid-template-rows: auto;
  grid-template-columns: auto;
  align-content: center;
-  place-items: center;
+  align-items: center;
+  justify-content: center;
+  justify-items: center;
  flex-direction: column;
  background: #0f161e;
  font-family: sans-serif;
@ -20,20 +21,13 @@ body {
  position: absolute;
  z-index: 9999;
  font-size: calc(1vw + 1vh + 1vmin);
-  opacity: 1;
-  transition: opacity 500ms ease-out 2s;
-}
-
-#splash.hidden,
-#splash.initial-hidden {
-  opacity: 0;
 }

 #splash-credit {
  position: absolute;
-  font-size: 1em;
-  bottom: 1em;
-  right: 1em;
+  font-size: 14px;
+  bottom: 16px;
+  right: 16px;
 }

 #splash-container {
@ -65,17 +59,16 @@ body {
  z-index: 2;
  grid-template-rows: repeat(8, 1fr);
  grid-template-columns: repeat(5, 1fr);
-  grid-template-areas:
-    "P P . L L"
-    "P P . L L"
-    "P P . L L"
-    "P P . L L"
-    "P P . . ."
-    "P P . . ."
-    "P P . E E"
-    "P P . E E";
+  grid-template-areas: "P P . L L"
+                       "P P . L L"
+                       "P P . L L"
+                       "P P . L L"
+                       "P P . . ."
+                       "P P . . ."
+                       "P P . E E"
+                       "P P . E E";

-  --logoChunkSize: calc(2em * 0.5 * var(--scale));
+  --logoChunkSize: calc(2em * 0.5 * var(--scale))
 }

 .chunk {
@ -85,7 +78,7 @@ body {

 #chunk-P {
  grid-area: P;
-  border-top-left-radius: calc(var(--logoChunkSize) / 2);
+  border-top-left-radius:  calc(var(--logoChunkSize) / 2);
 }

 #chunk-L {
--- a/renovate.json
+++ b/renovate.json
@ -1,4 +1,6 @@
 {
  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["config:base"]
+  "extends": [
+    "config:base"
+  ]
 }
--- a/src/App.js
+++ b/src/App.js
@ -1,48 +1,34 @@
-import { throttle } from 'lodash'
-import { mapState } from 'pinia'
-import { defineAsyncComponent, toValue } from 'vue'
-
-import DesktopNav from './components/desktop_nav/desktop_nav.vue'
-import EditStatusModal from './components/edit_status_modal/edit_status_modal.vue'
-import FeaturesPanel from './components/features_panel/features_panel.vue'
-import GlobalNoticeList from './components/global_notice_list/global_notice_list.vue'
-import InstanceSpecificPanel from './components/instance_specific_panel/instance_specific_panel.vue'
-import MediaModal from './components/media_modal/media_modal.vue'
-import MobileNav from './components/mobile_nav/mobile_nav.vue'
-import MobilePostStatusButton from './components/mobile_post_status_button/mobile_post_status_button.vue'
-import NavPanel from './components/nav_panel/nav_panel.vue'
-import PostStatusModal from './components/post_status_modal/post_status_modal.vue'
-import ShoutPanel from './components/shout_panel/shout_panel.vue'
-import SideDrawer from './components/side_drawer/side_drawer.vue'
-import StatusHistoryModal from './components/status_history_modal/status_history_modal.vue'
 import UserPanel from './components/user_panel/user_panel.vue'
-import UserReportingModal from './components/user_reporting_modal/user_reporting_modal.vue'
+import NavPanel from './components/nav_panel/nav_panel.vue'
+import InstanceSpecificPanel from './components/instance_specific_panel/instance_specific_panel.vue'
+import FeaturesPanel from './components/features_panel/features_panel.vue'
 import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_panel.vue'
+import ShoutPanel from './components/shout_panel/shout_panel.vue'
+import MediaModal from './components/media_modal/media_modal.vue'
+import SideDrawer from './components/side_drawer/side_drawer.vue'
+import MobilePostStatusButton from './components/mobile_post_status_button/mobile_post_status_button.vue'
+import MobileNav from './components/mobile_nav/mobile_nav.vue'
+import DesktopNav from './components/desktop_nav/desktop_nav.vue'
+import UserReportingModal from './components/user_reporting_modal/user_reporting_modal.vue'
+import EditStatusModal from './components/edit_status_modal/edit_status_modal.vue'
+import PostStatusModal from './components/post_status_modal/post_status_modal.vue'
+import StatusHistoryModal from './components/status_history_modal/status_history_modal.vue'
+import GlobalNoticeList from './components/global_notice_list/global_notice_list.vue'
 import { getOrCreateServiceWorker } from './services/sw/sw'
-import { windowHeight, windowWidth } from './services/window_utils/window_utils'
+import { windowWidth, windowHeight } from './services/window_utils/window_utils'
+import { mapGetters } from 'vuex'
+import { defineAsyncComponent } from 'vue'
+import { useShoutStore } from './stores/shout'
+import { useInterfaceStore } from './stores/interface'

-import { useEmojiStore } from 'src/stores/emoji.js'
-import { useI18nStore } from 'src/stores/i18n.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useShoutStore } from 'src/stores/shout.js'
-
-import messages from 'src/i18n/messages'
-import localeService from 'src/services/locale/locale.service.js'
-
-// Helper to unwrap reactive proxies
-window.toValue = toValue
+import { throttle } from 'lodash'

 export default {
  name: 'app',
  components: {
    UserPanel,
    NavPanel,
-    Notifications: defineAsyncComponent(
-      () => import('./components/notifications/notifications.vue'),
-    ),
+    Notifications: defineAsyncComponent(() => import('./components/notifications/notifications.vue')),
    InstanceSpecificPanel,
    FeaturesPanel,
    WhoToFollowPanel,
@ -52,193 +38,150 @@ export default {
    MobilePostStatusButton,
    MobileNav,
    DesktopNav,
-    SettingsModal: defineAsyncComponent(
-      () => import('./components/settings_modal/settings_modal.vue'),
-    ),
-    UpdateNotification: defineAsyncComponent(
-      () => import('./components/update_notification/update_notification.vue'),
-    ),
+    SettingsModal: defineAsyncComponent(() => import('./components/settings_modal/settings_modal.vue')),
+    UpdateNotification: defineAsyncComponent(() => import('./components/update_notification/update_notification.vue')),
    UserReportingModal,
    PostStatusModal,
    EditStatusModal,
    StatusHistoryModal,
-    GlobalNoticeList,
+    GlobalNoticeList
  },
  data: () => ({
-    mobileActivePanel: 'timeline',
+    mobileActivePanel: 'timeline'
  }),
  watch: {
-    themeApplied() {
+    themeApplied () {
      this.removeSplash()
    },
-    currentTheme() {
+    currentTheme () {
      this.setThemeBodyClass()
    },
-    layoutType() {
+    layoutType () {
      document.getElementById('modal').classList = ['-' + this.layoutType]
-    },
+    }
  },
-  created() {
+  created () {
    // Load the locale from the storage
-    const value = useMergedConfigStore().mergedConfig.interfaceLanguage
-    useI18nStore().setLanguage(value)
-    useEmojiStore().loadUnicodeEmojiData(value)
-
+    const val = this.$store.getters.mergedConfig.interfaceLanguage
+    this.$store.dispatch('setOption', { name: 'interfaceLanguage', value: val })
    document.getElementById('modal').classList = ['-' + this.layoutType]

    // Create bound handlers
    this.updateScrollState = throttle(this.scrollHandler, 200)
    this.updateMobileState = throttle(this.resizeHandler, 200)
  },
-  mounted() {
+  mounted () {
    window.addEventListener('resize', this.updateMobileState)
    this.scrollParent.addEventListener('scroll', this.updateScrollState)

-    if (this.themeApplied) {
+    if (useInterfaceStore().themeApplied) {
      this.setThemeBodyClass()
      this.removeSplash()
    }
    getOrCreateServiceWorker()
  },
-  unmounted() {
+  unmounted () {
    window.removeEventListener('resize', this.updateMobileState)
    this.scrollParent.removeEventListener('scroll', this.updateScrollState)
  },
  computed: {
-    currentTheme() {
-      if (this.styleDataUsed) {
-        const styleMeta = this.styleDataUsed.find(
-          (x) => x.component === '@meta',
-        )
+    themeApplied () {
+      return useInterfaceStore().themeApplied
+    },
+    currentTheme () {
+      if (useInterfaceStore().styleDataUsed) {
+        const styleMeta = useInterfaceStore().styleDataUsed.find(x => x.component === '@meta')

        if (styleMeta !== undefined) {
-          return styleMeta.directives.name.replaceAll(' ', '-').toLowerCase()
+          return styleMeta.directives.name.replaceAll(" ", "-").toLowerCase()
        }
      }

      return 'stock'
    },
-    layoutModalClass() {
+    layoutModalClass () {
      return '-' + this.layoutType
    },
-    classes() {
+    classes () {
      return [
        {
          '-reverse': this.reverseLayout,
          '-no-sticky-headers': this.noSticky,
-          '-has-new-post-button': this.newPostButtonShown,
+          '-has-new-post-button': this.newPostButtonShown
        },
-        '-' + this.layoutType,
+        '-' + this.layoutType
      ]
    },
-    navClasses() {
-      const { navbarColumnStretch } = useMergedConfigStore().mergedConfig
+    navClasses () {
+      const { navbarColumnStretch } = this.$store.getters.mergedConfig
      return [
        '-' + this.layoutType,
-        ...(navbarColumnStretch ? ['-column-stretch'] : []),
+        ...(navbarColumnStretch ? ['-column-stretch'] : [])
      ]
    },
-    currentUser() {
-      return this.$store.state.users.currentUser
-    },
-    userBackground() {
-      return this.currentUser.background_image
-    },
-    instanceBackground() {
-      return useMergedConfigStore().mergedConfig.hideInstanceWallpaper
+    currentUser () { return this.$store.state.users.currentUser },
+    userBackground () { return this.currentUser.background_image },
+    instanceBackground () {
+      return this.mergedConfig.hideInstanceWallpaper
        ? null
-        : this.instanceBackgroundUrl
+        : this.$store.state.instance.background
    },
-    background() {
-      return this.userBackground || this.instanceBackground
-    },
-    bgStyle() {
+    background () { return this.userBackground || this.instanceBackground },
+    bgStyle () {
      if (this.background) {
        return {
-          '--body-background-image': `url(${this.background})`,
+          '--body-background-image': `url(${this.background})`
        }
      }
    },
-    shoutJoined() {
-      return useShoutStore().joined
+    shout () { return useShoutStore().joined },
+    suggestionsEnabled () { return this.$store.state.instance.suggestionsEnabled },
+    showInstanceSpecificPanel () {
+      return this.$store.state.instance.showInstanceSpecificPanel &&
+        !this.$store.getters.mergedConfig.hideISP &&
+        this.$store.state.instance.instanceSpecificPanelContent
    },
-    isChats() {
+    isChats () {
      return this.$route.name === 'chat' || this.$route.name === 'chats'
    },
-    isListEdit() {
+    isListEdit () {
      return this.$route.name === 'lists-edit'
    },
-    newPostButtonShown() {
+    newPostButtonShown () {
      if (this.isChats) return false
      if (this.isListEdit) return false
-      return (
-        useMergedConfigStore().mergedConfig.alwaysShowNewPostButton ||
-        this.layoutType === 'mobile'
-      )
+      return this.$store.getters.mergedConfig.alwaysShowNewPostButton || this.layoutType === 'mobile'
    },
-    shoutboxPosition() {
-      return (
-        useMergedConfigStore().mergedConfig.alwaysShowNewPostButton || false
-      )
+    showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel },
+    editingAvailable () { return this.$store.state.instance.editingAvailable },
+    shoutboxPosition () {
+      return this.$store.getters.mergedConfig.alwaysShowNewPostButton || false
    },
-    hideShoutbox() {
-      return useMergedConfigStore().mergedConfig.hideShoutbox
+    hideShoutbox () {
+      return this.$store.getters.mergedConfig.hideShoutbox
    },
-    reverseLayout() {
-      const { thirdColumnMode, sidebarRight: reverseSetting } =
-        useMergedConfigStore().mergedConfig
+    layoutType () { return useInterfaceStore().layoutType },
+    privateMode () { return this.$store.state.instance.private },
+    reverseLayout () {
+      const { thirdColumnMode, sidebarRight: reverseSetting } = this.$store.getters.mergedConfig
      if (this.layoutType !== 'wide') {
        return reverseSetting
      } else {
-        return thirdColumnMode === 'notifications'
-          ? reverseSetting
-          : !reverseSetting
+        return thirdColumnMode === 'notifications' ? reverseSetting : !reverseSetting
      }
    },
-    noSticky() {
-      return useMergedConfigStore().mergedConfig.disableStickyHeaders
-    },
-    showScrollbars() {
-      return useMergedConfigStore().mergedConfig.showScrollbars
-    },
-    scrollParent() {
-      return window /* this.$refs.appContentRef */
-    },
-    showInstanceSpecificPanel() {
-      return (
-        this.instanceSpecificPanelPresent &&
-        !useMergedConfigStore().mergedConfig.hideISP
-      )
-    },
-    ...mapState(useMergedConfigStore, ['mergedConfig']),
-    ...mapState(useInterfaceStore, [
-      'themeApplied',
-      'styleDataUsed',
-      'layoutType',
-    ]),
-    ...mapState(useInstanceStore, ['styleDataUsed']),
-    ...mapState(useInstanceCapabilitiesStore, [
-      'suggestionsEnabled',
-      'editingAvailable',
-    ]),
-    ...mapState(useInstanceStore, {
-      instanceBackgroundUrl: (store) => store.instanceIdentity.background,
-      showFeaturesPanel: (store) => store.instanceIdentity.showFeaturesPanel,
-      instanceSpecificPanelPresent: (store) =>
-        store.instanceIdentity.showInstanceSpecificPanel &&
-        store.instanceIdentity.instanceSpecificPanelContent,
-    }),
+    noSticky () { return this.$store.getters.mergedConfig.disableStickyHeaders },
+    showScrollbars () { return this.$store.getters.mergedConfig.showScrollbars },
+    scrollParent () { return window; /* this.$refs.appContentRef */ },
+    ...mapGetters(['mergedConfig'])
  },
  methods: {
-    resizeHandler() {
+    resizeHandler () {
      useInterfaceStore().setLayoutWidth(windowWidth())
      useInterfaceStore().setLayoutHeight(windowHeight())
    },
-    scrollHandler() {
-      const scrollPosition =
-        this.scrollParent === window
-          ? window.scrollY
-          : this.scrollParent.scrollTop
+    scrollHandler () {
+      const scrollPosition = this.scrollParent === window ? window.scrollY : this.scrollParent.scrollTop

      if (scrollPosition != 0) {
        this.$refs.appContentRef.classList.add(['-scrolled'])
@ -246,10 +189,10 @@ export default {
        this.$refs.appContentRef.classList.remove(['-scrolled'])
      }
    },
-    setThemeBodyClass() {
+    setThemeBodyClass () {
      const themeName = this.currentTheme
      const classList = Array.from(document.body.classList)
-      const oldTheme = classList.filter((c) => c.startsWith('theme-'))
+      const oldTheme = classList.filter(c => c.startsWith('theme-'))

      if (themeName !== null && themeName !== '') {
        const newTheme = `theme-${themeName.toLowerCase()}`
@ -265,19 +208,14 @@ export default {
        document.body.classList.remove(...oldTheme)
      }
    },
-    removeSplash() {
-      document.querySelector('#status').textContent = this.$t(
-        'splash.fun_' + Math.ceil(Math.random() * 4),
-      )
+    removeSplash () {
+      document.querySelector('#status').textContent = this.$t('splash.fun_' + Math.ceil(Math.random() * 4))
      const splashscreenRoot = document.querySelector('#splash')
      splashscreenRoot.addEventListener('transitionend', () => {
        splashscreenRoot.remove()
      })
-      setTimeout(() => {
-        splashscreenRoot.remove() // forcibly remove it, should fix my plasma browser widget t. HJ
-      }, 600)
      splashscreenRoot.classList.add('hidden')
      document.querySelector('#app').classList.remove('hidden')
-    },
-  },
+    }
+  }
 }
--- a/src/App.scss
+++ b/src/App.scss
@ -3,7 +3,7 @@
@use "panel";

@import '@fortawesome/fontawesome-svg-core/styles.css';
-@import '@kazvmoe-infra/pinch-zoom-element/dist/pinch-zoom.css';
+@import '@floatingghost/pinch-zoom-element/dist/pinch-zoom.css';

 :root {
  --status-margin: 0.75em;
@ -21,7 +21,7 @@
 }

 html {
-  font-size: var(--textSize, 1rem);
+  font-size: var(--textSize, 14px);

  --navbar-height: var(--navbarSize, 3.5rem);
  --emoji-size: var(--emojiSize, 32px);
@ -382,10 +382,6 @@ nav {
  font-family: sans-serif;
  font-family: var(--font);

-  &.-transparent {
-    backdrop-filter: blur(0.125em) contrast(60%);
-  }
-
  &::-moz-focus-inner {
    border: none;
  }
@ -513,12 +509,6 @@ nav {
  }
 }

-label {
-  &.-disabled {
-    color: var(--textFaint);
-  }
-}
-
 input,
 textarea {
  border: none;
@ -535,10 +525,6 @@ textarea {
    height: unset;
  }

-  &::placeholder {
-    color: var(--textFaint)
-  }
-
  --_padding: 0.5em;

  border: none;
@ -559,10 +545,6 @@ textarea {
  &[disabled="disabled"],
  &.disabled {
    cursor: not-allowed;
-    color: var(--textFaint);
-
-    /* stylelint-disable-next-line declaration-no-important */
-    background-color: transparent !important;
  }

  &[type="range"] {
@ -588,8 +570,6 @@ textarea {
      & + label::before {
        opacity: 0.5;
      }
-
-      background-color: var(--background);
    }

    + label::before {
@ -689,8 +669,7 @@ option {
  list-style: none;
  display: grid;
  grid-auto-flow: row dense;
-  grid-template-columns: repeat(auto-fit, minmax(20em, 1fr));
-  grid-gap: 0.5em;
+  grid-template-columns: 1fr 1fr;

  li {
    border: 1px solid var(--border);
@ -700,6 +679,11 @@ option {
  }
 }

+.btn-block {
+  display: block;
+  width: 100%;
+}
+
 .btn-group {
  position: relative;
  display: inline-flex;
@ -711,6 +695,7 @@ option {
    --_roundness-right: 0;

    position: relative;
+    flex: 1 1 auto;
  }

  > *:first-child,
@ -757,15 +742,17 @@ option {
  }

  &.-dot {
-    min-height: 0.6em;
-    max-height: 0.6em;
-    min-width: 0.6em;
-    max-width: 0.6em;
-    left: calc(50% + 0.5em);
-    top: calc(50% - 1em);
-    line-height: 0;
+    min-height: 8px;
+    max-height: 8px;
+    min-width: 8px;
+    max-width: 8px;
    padding: 0;
-    margin: 0;
+    line-height: 0;
+    font-size: 0;
+    left: calc(50% - 4px);
+    top: calc(50% - 4px);
+    margin-left: 6px;
+    margin-top: -6px;
  }

  &.-counter {
@ -796,18 +783,21 @@ option {
  color: var(--text);
 }

-.notice-dismissible {
-  display: flex;
-  padding: 0.75em 1em;
-  align-items: baseline;
-  line-height: 1.5;
+.visibility-notice {
+  padding: 0.5em;
+  border: 1px solid var(--textFaint);
+  border-radius: var(--roundness);
+}

-  span {
-    display: block;
-    flex: 1 1 auto;
-  }
+.notice-dismissible {
+  padding-right: 4rem;
+  position: relative;

  .dismiss {
+    position: absolute;
+    top: 0;
+    right: 0;
+    padding: 0.5em;
    color: inherit;
  }
 }
@ -946,7 +936,12 @@ option {

 #splash {
  pointer-events: none;
-  // transition: opacity 0.5s;
+  transition: opacity 0.5s;
+  opacity: 1;
+
+  &.hidden {
+    opacity: 0;
+  }

  #status {
    &.css-ok {
@ -1085,7 +1080,7 @@ option {
        scale: 1.0063 0.9938;
        translate: 0 -10%;
        transform: rotateZ(var(--defaultZ));
-        animation-timing-function: ease-in-out;
+        animation-timing-function: ease-in-ou;
      }

      90% {
--- a/src/App.vue
+++ b/src/App.vue
@ -60,8 +60,8 @@
      />
    </div>
    <MediaModal />
-    <ShoutPanel
-      v-if="currentUser && !hideShoutbox && shoutJoined"
+    <shout-panel
+      v-if="currentUser && shout && !hideShoutbox"
      :floating="true"
      class="floating-shout mobile-hidden"
      :class="{ '-left': shoutboxPosition }"
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@ -1,48 +1,29 @@
 /* global process */
-
-import vClickOutside from 'click-outside-vue3'
 import { createApp } from 'vue'
 import { createRouter, createWebHistory } from 'vue-router'
+import vClickOutside from 'click-outside-vue3'
 import VueVirtualScroller from 'vue-virtual-scroller'
 import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'

-import { config } from '@fortawesome/fontawesome-svg-core'
-import {
-  FontAwesomeIcon,
-  FontAwesomeLayers,
-} from '@fortawesome/vue-fontawesome'
-
+import { FontAwesomeIcon, FontAwesomeLayers } from '@fortawesome/vue-fontawesome'
+import { config } from '@fortawesome/fontawesome-svg-core';
 config.autoAddCss = false

 import App from '../App.vue'
-import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
-import FaviconService from '../services/favicon_service/favicon_service.js'
-import { applyStyleConfig } from '../services/style_setter/style_setter.js'
-import { initServiceWorker, updateFocus } from '../services/sw/sw.js'
-import {
-  windowHeight,
-  windowWidth,
-} from '../services/window_utils/window_utils'
 import routes from './routes'
+import VBodyScrollLock from 'src/directives/body_scroll_lock'

+import { windowWidth, windowHeight } from '../services/window_utils/window_utils'
+import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
+import { applyConfig } from '../services/style_setter/style_setter.js'
+import FaviconService from '../services/favicon_service/favicon_service.js'
+import { initServiceWorker, updateFocus } from '../services/sw/sw.js'
+
+import { useOAuthStore } from 'src/stores/oauth'
+import { useI18nStore } from 'src/stores/i18n'
+import { useInterfaceStore } from 'src/stores/interface'
 import { useAnnouncementsStore } from 'src/stores/announcements'
 import { useAuthFlowStore } from 'src/stores/auth_flow'
-import { useEmojiStore } from 'src/stores/emoji.js'
-import { useI18nStore } from 'src/stores/i18n'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-import { useLocalConfigStore } from 'src/stores/local_config.js'
-import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useOAuthStore } from 'src/stores/oauth'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { useUserHighlightStore } from 'src/stores/user_highlight.js'
-
-import VBodyScrollLock from 'src/directives/body_scroll_lock'
-import {
-  INSTANCE_DEFAULT_CONFIG_DEFINITIONS,
-  INSTANCE_IDENTITY_DEFAULT_DEFINITIONS,
-} from 'src/modules/default_config_state.js'

 let staticInitialResults = null

@ -51,9 +32,7 @@ const parsedInitialResults = () => {
    return null
  }
  if (!staticInitialResults) {
-    staticInitialResults = JSON.parse(
-      document.getElementById('initial-results').textContent,
-    )
+    staticInitialResults = JSON.parse(document.getElementById('initial-results').textContent)
  }
  return staticInitialResults
 }
@ -75,7 +54,7 @@ const preloadFetch = async (request) => {
  return {
    ok: true,
    json: () => requestData,
-    text: () => requestData,
+    text: () => requestData
  }
 }

@ -84,38 +63,20 @@ const getInstanceConfig = async ({ store }) => {
    const res = await preloadFetch('/api/v1/instance')
    if (res.ok) {
      const data = await res.json()
-      const textLimit = data.max_toot_chars
+      const textlimit = data.max_toot_chars
      const vapidPublicKey = data.pleroma.vapid_public_key

-      useInstanceCapabilitiesStore().set(
-        'pleromaExtensionsAvailable',
-        data.pleroma,
-      )
-      useInstanceStore().set({
-        path: 'limits.textLimit',
-        value: textLimit,
-      })
-      useInstanceStore().set({
-        path: 'accountApprovalRequired',
-        value: data.approval_required,
-      })
-      useInstanceStore().set({
-        path: 'birthdayRequired',
-        value: !!data.pleroma?.metadata.birthday_required,
-      })
-      useInstanceStore().set({
-        path: 'birthdayMinAge',
-        value: data.pleroma?.metadata.birthday_min_age || 0,
-      })
+      store.dispatch('setInstanceOption', { name: 'pleromaExtensionsAvailable', value: data.pleroma })
+      store.dispatch('setInstanceOption', { name: 'textlimit', value: textlimit })
+      store.dispatch('setInstanceOption', { name: 'accountApprovalRequired', value: data.approval_required })
+      store.dispatch('setInstanceOption', { name: 'birthdayRequired', value: !!data.pleroma?.metadata.birthday_required })
+      store.dispatch('setInstanceOption', { name: 'birthdayMinAge', value: data.pleroma?.metadata.birthday_min_age || 0 })

      if (vapidPublicKey) {
-        useInstanceStore().set({
-          path: 'vapidPublicKey',
-          value: vapidPublicKey,
-        })
+        store.dispatch('setInstanceOption', { name: 'vapidPublicKey', value: vapidPublicKey })
      }
    } else {
-      throw res
+      throw (res)
    }
  } catch (error) {
    console.error('Could not load instance config, potentially fatal')
@ -132,12 +93,10 @@ const getBackendProvidedConfig = async () => {
      const data = await res.json()
      return data.pleroma_fe
    } else {
-      throw res
+      throw (res)
    }
  } catch (error) {
-    console.error(
-      'Could not load backend-provided frontend config, potentially fatal',
-    )
+    console.error('Could not load backend-provided frontend config, potentially fatal')
    console.error(error)
  }
 }
@ -148,7 +107,7 @@ const getStaticConfig = async () => {
    if (res.ok) {
      return res.json()
    } else {
-      throw res
+      throw (res)
    }
  } catch (error) {
    console.warn('Failed to load static/config.json, continuing without it.')
@ -170,21 +129,51 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
    config = Object.assign({}, staticConfig, apiConfig)
  }

-  Object.keys(INSTANCE_IDENTITY_DEFAULT_DEFINITIONS).forEach((source) =>
-    useInstanceStore().set({
-      value: config[source],
-      path: `instanceIdentity.${source}`,
-    }),
-  )
+  const copyInstanceOption = (name) => {
+    store.dispatch('setInstanceOption', { name, value: config[name] })
+  }

-  Object.keys(INSTANCE_DEFAULT_CONFIG_DEFINITIONS).forEach((source) =>
-    useInstanceStore().set({
-      value: config[source],
-      path: `prefsStorage.${source}`,
-    }),
-  )
+  copyInstanceOption('theme')
+  copyInstanceOption('style')
+  copyInstanceOption('palette')
+  copyInstanceOption('embeddedToS')
+  copyInstanceOption('nsfwCensorImage')
+  copyInstanceOption('background')
+  copyInstanceOption('hidePostStats')
+  copyInstanceOption('hideBotIndication')
+  copyInstanceOption('hideUserStats')
+  copyInstanceOption('hideFilteredStatuses')
+  copyInstanceOption('logo')

+  store.dispatch('setInstanceOption', {
+    name: 'logoMask',
+    value: typeof config.logoMask === 'undefined'
+      ? true
+      : config.logoMask
+  })
+
+  store.dispatch('setInstanceOption', {
+    name: 'logoMargin',
+    value: typeof config.logoMargin === 'undefined'
+      ? 0
+      : config.logoMargin
+  })
+  copyInstanceOption('logoLeft')
  useAuthFlowStore().setInitialStrategy(config.loginMethod)
+
+  copyInstanceOption('redirectRootNoLogin')
+  copyInstanceOption('redirectRootLogin')
+  copyInstanceOption('showInstanceSpecificPanel')
+  copyInstanceOption('minimalScopesMode')
+  copyInstanceOption('hideMutedPosts')
+  copyInstanceOption('collapseMessageWithSubject')
+  copyInstanceOption('scopeCopy')
+  copyInstanceOption('subjectLineBehavior')
+  copyInstanceOption('postContentType')
+  copyInstanceOption('alwaysShowSubjectInput')
+  copyInstanceOption('showFeaturesPanel')
+  copyInstanceOption('hideSitename')
+  copyInstanceOption('sidebarRight')
 }

 const getTOS = async ({ store }) => {
@ -192,9 +181,9 @@ const getTOS = async ({ store }) => {
    const res = await window.fetch('/static/terms-of-service.html')
    if (res.ok) {
      const html = await res.text()
-      useInstanceStore().set({ path: 'instanceIdentity.tos', value: html })
+      store.dispatch('setInstanceOption', { name: 'tos', value: html })
    } else {
-      throw res
+      throw (res)
    }
  } catch (e) {
    console.warn("Can't load TOS\n", e)
@ -206,12 +195,9 @@ const getInstancePanel = async ({ store }) => {
    const res = await preloadFetch('/instance/panel.html')
    if (res.ok) {
      const html = await res.text()
-      useInstanceStore().set({
-        path: 'instanceIdentity.instanceSpecificPanelContent',
-        value: html,
-      })
+      store.dispatch('setInstanceOption', { name: 'instanceSpecificPanelContent', value: html })
    } else {
-      throw res
+      throw (res)
    }
  } catch (e) {
    console.warn("Can't load instance panel\n", e)
@ -223,27 +209,25 @@ const getStickers = async ({ store }) => {
    const res = await window.fetch('/static/stickers.json')
    if (res.ok) {
      const values = await res.json()
-      const stickers = (
-        await Promise.all(
-          Object.entries(values).map(async ([name, path]) => {
-            const resPack = await window.fetch(path + 'pack.json')
-            let meta = {}
-            if (resPack.ok) {
-              meta = await resPack.json()
-            }
-            return {
-              pack: name,
-              path,
-              meta,
-            }
-          }),
-        )
-      ).sort((a, b) => {
+      const stickers = (await Promise.all(
+        Object.entries(values).map(async ([name, path]) => {
+          const resPack = await window.fetch(path + 'pack.json')
+          let meta = {}
+          if (resPack.ok) {
+            meta = await resPack.json()
+          }
+          return {
+            pack: name,
+            path,
+            meta
+          }
+        })
+      )).sort((a, b) => {
        return a.meta.title.localeCompare(b.meta.title)
      })
-      useEmojiStore().setStickers(stickers)
+      store.dispatch('setInstanceOption', { name: 'stickers', value: stickers })
    } else {
-      throw res
+      throw (res)
    }
  } catch (e) {
    console.warn("Can't load stickers\n", e)
@ -253,19 +237,13 @@ const getStickers = async ({ store }) => {
 const getAppSecret = async ({ store }) => {
  const oauth = useOAuthStore()
  if (oauth.userToken) {
-    store.commit(
-      'setBackendInteractor',
-      backendInteractorService(oauth.getToken),
-    )
+    store.commit('setBackendInteractor', backendInteractorService(oauth.getToken))
  }
 }

 const resolveStaffAccounts = ({ store, accounts }) => {
-  const nicknames = accounts.map((uri) => uri.split('/').pop())
-  useInstanceStore().set({
-    path: 'staffAccounts',
-    value: nicknames,
-  })
+  const nicknames = accounts.map(uri => uri.split('/').pop())
+  store.dispatch('setInstanceOption', { name: 'staffAccounts', value: nicknames })
 }

 const getNodeInfo = async ({ store }) => {
@ -276,165 +254,76 @@ const getNodeInfo = async ({ store }) => {
      const data = await res.json()
      const metadata = data.metadata
      const features = metadata.features
-      useInstanceStore().set({
-        path: 'name',
-        value: metadata.nodeName,
+      store.dispatch('setInstanceOption', { name: 'name', value: metadata.nodeName })
+      store.dispatch('setInstanceOption', { name: 'registrationOpen', value: data.openRegistrations })
+      store.dispatch('setInstanceOption', { name: 'mediaProxyAvailable', value: features.includes('media_proxy') })
+      store.dispatch('setInstanceOption', { name: 'safeDM', value: features.includes('safe_dm_mentions') })
+      store.dispatch('setInstanceOption', { name: 'shoutAvailable', value: features.includes('chat') })
+      store.dispatch('setInstanceOption', { name: 'pleromaChatMessagesAvailable', value: features.includes('pleroma_chat_messages') })
+      store.dispatch('setInstanceOption', {
+        name: 'pleromaCustomEmojiReactionsAvailable',
+        value:
+          features.includes('pleroma_custom_emoji_reactions') ||
+          features.includes('custom_emoji_reactions')
      })
-      useInstanceStore().set({
-        path: 'registrationOpen',
-        value: data.openRegistrations,
-      })
-      useInstanceCapabilitiesStore().set(
-        'mediaProxyAvailable',
-        features.includes('media_proxy'),
-      )
-      useInstanceCapabilitiesStore().set(
-        'safeDM',
-        features.includes('safe_dm_mentions'),
-      )
-      useInstanceCapabilitiesStore().set(
-        'shoutAvailable',
-        features.includes('chat'),
-      )
-      useInstanceCapabilitiesStore().set(
-        'pleromaChatMessagesAvailable',
-        features.includes('pleroma_chat_messages'),
-      )
-      useInstanceCapabilitiesStore().set(
-        'pleromaCustomEmojiReactionsAvailable',
+      store.dispatch('setInstanceOption', { name: 'pleromaBookmarkFoldersAvailable', value: features.includes('pleroma:bookmark_folders') })
+      store.dispatch('setInstanceOption', { name: 'gopherAvailable', value: features.includes('gopher') })
+      store.dispatch('setInstanceOption', { name: 'pollsAvailable', value: features.includes('polls') })
+      store.dispatch('setInstanceOption', { name: 'editingAvailable', value: features.includes('editing') })
+      store.dispatch('setInstanceOption', { name: 'pollLimits', value: metadata.pollLimits })
+      store.dispatch('setInstanceOption', { name: 'mailerEnabled', value: metadata.mailerEnabled })
+      store.dispatch('setInstanceOption', { name: 'quotingAvailable', value: features.includes('quote_posting') })
+      store.dispatch('setInstanceOption', { name: 'groupActorAvailable', value: features.includes('pleroma:group_actors') })
+      store.dispatch('setInstanceOption', { name: 'localBubbleInstances', value: metadata.localBubbleInstances ?? [] })

-        features.includes('pleroma_custom_emoji_reactions') ||
-          features.includes('custom_emoji_reactions'),
-      )
-      useInstanceCapabilitiesStore().set(
-        'pleromaBookmarkFoldersAvailable',
-        features.includes('pleroma:bookmark_folders'),
-      )
-      useInstanceCapabilitiesStore().set(
-        'gopherAvailable',
-        features.includes('gopher'),
-      )
-      useInstanceCapabilitiesStore().set(
-        'pollsAvailable',
-        features.includes('polls'),
-      )
-      useInstanceCapabilitiesStore().set(
-        'editingAvailable',
-        features.includes('editing'),
-      )
-      useInstanceCapabilitiesStore().set(
-        'mailerEnabled',
-        metadata.mailerEnabled,
-      )
-      useInstanceCapabilitiesStore().set(
-        'quotingAvailable',
-        features.includes('quote_posting'),
-      )
-      useInstanceCapabilitiesStore().set(
-        'groupActorAvailable',
-        features.includes('pleroma:group_actors'),
-      )
-      useInstanceCapabilitiesStore().set(
-        'blockExpiration',
-        features.includes('pleroma:block_expiration'),
-      )
-      useInstanceStore().set({
-        path: 'localBubbleInstances',
-        value: metadata.localBubbleInstances ?? [],
-      })
-      useInstanceCapabilitiesStore().set(
-        'localBubble',
-        (metadata.localBubbleInstances ?? []).length > 0,
-      )
-
-      useInstanceStore().set({
-        path: 'limits.pollLimits',
-        value: metadata.pollLimits,
-      })
      const uploadLimits = metadata.uploadLimits
-      useInstanceStore().set({
-        path: 'limits.uploadlimit',
-        value: parseInt(uploadLimits.general),
-      })
-      useInstanceStore().set({
-        path: 'limits.avatarlimit',
-        value: parseInt(uploadLimits.avatar),
-      })
-      useInstanceStore().set({
-        path: 'limits.backgroundlimit',
-        value: parseInt(uploadLimits.background),
-      })
-      useInstanceStore().set({
-        path: 'limits.bannerlimit',
-        value: parseInt(uploadLimits.banner),
-      })
-      useInstanceStore().set({
-        path: 'limits.fieldsLimits',
-        value: metadata.fieldsLimits,
-      })
+      store.dispatch('setInstanceOption', { name: 'uploadlimit', value: parseInt(uploadLimits.general) })
+      store.dispatch('setInstanceOption', { name: 'avatarlimit', value: parseInt(uploadLimits.avatar) })
+      store.dispatch('setInstanceOption', { name: 'backgroundlimit', value: parseInt(uploadLimits.background) })
+      store.dispatch('setInstanceOption', { name: 'bannerlimit', value: parseInt(uploadLimits.banner) })
+      store.dispatch('setInstanceOption', { name: 'fieldsLimits', value: metadata.fieldsLimits })

-      useInstanceStore().set({
-        path: 'restrictedNicknames',
-        value: metadata.restrictedNicknames,
-      })
-      useInstanceCapabilitiesStore().set('postFormats', metadata.postFormats)
+      store.dispatch('setInstanceOption', { name: 'restrictedNicknames', value: metadata.restrictedNicknames })
+      store.dispatch('setInstanceOption', { name: 'postFormats', value: metadata.postFormats })

      const suggestions = metadata.suggestions
-      useInstanceCapabilitiesStore().set(
-        'suggestionsEnabled',
-        suggestions.enabled,
-      )
-      // this is unused, why?
-      useInstanceCapabilitiesStore().set('suggestionsWeb', suggestions.web)
+      store.dispatch('setInstanceOption', { name: 'suggestionsEnabled', value: suggestions.enabled })
+      store.dispatch('setInstanceOption', { name: 'suggestionsWeb', value: suggestions.web })

      const software = data.software
-      useInstanceStore().set({
-        path: 'backendVersion',
-        value: software.version,
-      })
-      useInstanceStore().set({
-        path: 'backendRepository',
-        value: software.repository,
-      })
+      store.dispatch('setInstanceOption', { name: 'backendVersion', value: software.version })
+      store.dispatch('setInstanceOption', { name: 'backendRepository', value: software.repository })

      const priv = metadata.private
-      useInstanceStore().set({ path: 'privateMode', value: priv })
+      store.dispatch('setInstanceOption', { name: 'private', value: priv })

      const frontendVersion = window.___pleromafe_commit_hash
-      useInstanceStore().set({
-        path: 'frontendVersion',
-        value: frontendVersion,
-      })
+      store.dispatch('setInstanceOption', { name: 'frontendVersion', value: frontendVersion })

      const federation = metadata.federation

-      useInstanceCapabilitiesStore().set(
-        'tagPolicyAvailable',
-        typeof federation.mrf_policies === 'undefined'
+      store.dispatch('setInstanceOption', {
+        name: 'tagPolicyAvailable',
+        value: typeof federation.mrf_policies === 'undefined'
          ? false
-          : metadata.federation.mrf_policies.includes('TagPolicy'),
-      )
-
-      useInstanceStore().set({
-        path: 'federationPolicy',
-        value: federation,
+          : metadata.federation.mrf_policies.includes('TagPolicy')
      })
-      useInstanceStore().set({
-        path: 'federating',
-        value:
-          typeof federation.enabled === 'undefined' ? true : federation.enabled,
+
+      store.dispatch('setInstanceOption', { name: 'federationPolicy', value: federation })
+      store.dispatch('setInstanceOption', {
+        name: 'federating',
+        value: typeof federation.enabled === 'undefined'
+          ? true
+          : federation.enabled
      })

      const accountActivationRequired = metadata.accountActivationRequired
-      useInstanceStore().set({
-        path: 'accountActivationRequired',
-        value: accountActivationRequired,
-      })
+      store.dispatch('setInstanceOption', { name: 'accountActivationRequired', value: accountActivationRequired })

      const accounts = metadata.staffAccounts
      resolveStaffAccounts({ store, accounts })
    } else {
-      throw res
+      throw (res)
    }
  } catch (e) {
    console.warn('Could not load nodeinfo')
@ -444,10 +333,7 @@ const getNodeInfo = async ({ store }) => {

 const setConfig = async ({ store }) => {
  // apiConfig, staticConfig
-  const configInfos = await Promise.all([
-    getBackendProvidedConfig({ store }),
-    getStaticConfig(),
-  ])
+  const configInfos = await Promise.all([getBackendProvidedConfig({ store }), getStaticConfig()])
  const apiConfig = configInfos[0]
  const staticConfig = configInfos[1]

@ -478,37 +364,29 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => {
    if (process.env.NODE_ENV === 'development') {
      // do some checks to avoid common errors
      if (!Object.keys(allStores).length) {
-        throw new Error(
-          'No stores are available. Check the code in src/boot/after_store.js',
-        )
+        throw new Error('No stores are available. Check the code in src/boot/after_store.js')
      }
    }
    await Promise.all(
-      Object.entries(allStores).map(async ([name, mod]) => {
-        const isStoreName = (name) => name.startsWith('use')
-        if (process.env.NODE_ENV === 'development') {
-          if (Object.keys(mod).filter(isStoreName).length !== 1) {
-            throw new Error(
-              'Each store file must export exactly one store as a named export. Check your code in src/stores/',
-            )
+      Object.entries(allStores)
+        .map(async ([name, mod]) => {
+          const isStoreName = name => name.startsWith('use')
+          if (process.env.NODE_ENV === 'development') {
+            if (Object.keys(mod).filter(isStoreName).length !== 1) {
+              throw new Error('Each store file must export exactly one store as a named export. Check your code in src/stores/')
+            }
          }
-        }
-        const storeFuncName = Object.keys(mod).find(isStoreName)
-        if (storeFuncName && typeof mod[storeFuncName] === 'function') {
-          const p = mod[storeFuncName]().$persistLoaded
-          if (!(p instanceof Promise)) {
-            throw new Error(
-              `${name} store's $persistLoaded is not a Promise. The persist plugin is not applied.`,
-            )
+          const storeFuncName = Object.keys(mod).find(isStoreName)
+          if (storeFuncName && typeof mod[storeFuncName] === 'function') {
+            const p = mod[storeFuncName]().$persistLoaded
+            if (!(p instanceof Promise)) {
+              throw new Error(`${name} store's $persistLoaded is not a Promise. The persist plugin is not applied.`)
+            }
+            await p
+          } else {
+            throw new Error(`Store module ${name} does not export a 'use...' function`)
          }
-          await p
-        } else {
-          throw new Error(
-            `Store module ${name} does not export a 'use...' function`,
-          )
-        }
-      }),
-    )
+        }))
  }

  try {
@ -519,18 +397,11 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => {
  }

  if (storageError) {
-    useInterfaceStore().pushGlobalNotice({
-      messageKey: 'errors.storage_unavailable',
-      level: 'error',
-    })
+    useInterfaceStore().pushGlobalNotice({ messageKey: 'errors.storage_unavailable', level: 'error' })
  }

  useInterfaceStore().setLayoutWidth(windowWidth())
  useInterfaceStore().setLayoutHeight(windowHeight())
-  window.syncConfig = useSyncConfigStore()
-  window.mergedConfig = useMergedConfigStore()
-  window.localConfig = useLocalConfigStore()
-  window.highlightConfig = useUserHighlightStore()

  FaviconService.initFaviconService()
  initServiceWorker(store)
@ -538,25 +409,18 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => {
  window.addEventListener('focus', () => updateFocus())

  const overrides = window.___pleromafe_dev_overrides || {}
-  const server =
-    typeof overrides.target !== 'undefined'
-      ? overrides.target
-      : window.location.origin
-  useInstanceStore().set({ path: 'server', value: server })
+  const server = (typeof overrides.target !== 'undefined') ? overrides.target : window.location.origin
+  store.dispatch('setInstanceOption', { name: 'server', value: server })

  await setConfig({ store })
  try {
-    await useInterfaceStore()
-      .applyTheme()
-      .catch((e) => {
-        console.error('Error setting theme', e)
-      })
+    await useInterfaceStore().applyTheme().catch((e) => { console.error('Error setting theme', e) })
  } catch (e) {
    window.splashError(e)
    return Promise.reject(e)
  }

-  applyStyleConfig(useMergedConfigStore().mergedConfig, i18n.global)
+  applyConfig(store.state.config, i18n.global)

  // Now we can try getting the server settings and logging in
  // Most of these are preloaded into the index.html so blocking is minimized
@ -564,8 +428,8 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => {
    checkOAuthToken({ store }),
    getInstancePanel({ store }),
    getNodeInfo({ store }),
-    getInstanceConfig({ store }),
-  ]).catch((e) => Promise.reject(e))
+    getInstanceConfig({ store })
+  ]).catch(e => Promise.reject(e))

  // Start fetching things that don't need to block the UI
  store.dispatch('fetchMutes')
@ -578,11 +442,11 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => {
    history: createWebHistory(),
    routes: routes(store),
    scrollBehavior: (to, _from, savedPosition) => {
-      if (to.matched.some((m) => m.meta.dontScroll)) {
+      if (to.matched.some(m => m.meta.dontScroll)) {
        return false
      }
      return savedPosition || { left: 0, top: 0 }
-    },
+    }
  })

  useI18nStore().setI18n(i18n)
--- a/src/boot/routes.js
+++ b/src/boot/routes.js
@ -1,48 +1,42 @@
-import About from 'components/about/about.vue'
-import AnnouncementsPage from 'components/announcements_page/announcements_page.vue'
-import AuthForm from 'components/auth_form/auth_form.js'
-import BookmarkTimeline from 'components/bookmark_timeline/bookmark_timeline.vue'
-import BubbleTimeline from 'components/bubble_timeline/bubble_timeline.vue'
-import Chat from 'components/chat/chat.vue'
-import ChatList from 'components/chat_list/chat_list.vue'
-import ConversationPage from 'components/conversation-page/conversation-page.vue'
-import DMs from 'components/dm_timeline/dm_timeline.vue'
-import Drafts from 'components/drafts/drafts.vue'
-import FollowRequests from 'components/follow_requests/follow_requests.vue'
-import FriendsTimeline from 'components/friends_timeline/friends_timeline.vue'
-import Interactions from 'components/interactions/interactions.vue'
-import Lists from 'components/lists/lists.vue'
-import ListsEdit from 'components/lists_edit/lists_edit.vue'
-import ListsTimeline from 'components/lists_timeline/lists_timeline.vue'
-import Notifications from 'components/notifications/notifications.vue'
-import OAuthCallback from 'components/oauth_callback/oauth_callback.vue'
-import PasswordReset from 'components/password_reset/password_reset.vue'
-import PublicAndExternalTimeline from 'components/public_and_external_timeline/public_and_external_timeline.vue'
 import PublicTimeline from 'components/public_timeline/public_timeline.vue'
-import Registration from 'components/registration/registration.vue'
-import RemoteUserResolver from 'components/remote_user_resolver/remote_user_resolver.vue'
-import Search from 'components/search/search.vue'
-import ShoutPanel from 'components/shout_panel/shout_panel.vue'
+import BubbleTimeline from 'components/bubble_timeline/bubble_timeline.vue'
+import PublicAndExternalTimeline from 'components/public_and_external_timeline/public_and_external_timeline.vue'
+import FriendsTimeline from 'components/friends_timeline/friends_timeline.vue'
 import TagTimeline from 'components/tag_timeline/tag_timeline.vue'
+import BookmarkTimeline from 'components/bookmark_timeline/bookmark_timeline.vue'
+import ConversationPage from 'components/conversation-page/conversation-page.vue'
+import Interactions from 'components/interactions/interactions.vue'
+import DMs from 'components/dm_timeline/dm_timeline.vue'
+import ChatList from 'components/chat_list/chat_list.vue'
+import Chat from 'components/chat/chat.vue'
 import UserProfile from 'components/user_profile/user_profile.vue'
+import Search from 'components/search/search.vue'
+import Registration from 'components/registration/registration.vue'
+import PasswordReset from 'components/password_reset/password_reset.vue'
+import FollowRequests from 'components/follow_requests/follow_requests.vue'
+import OAuthCallback from 'components/oauth_callback/oauth_callback.vue'
+import Notifications from 'components/notifications/notifications.vue'
+import AuthForm from 'components/auth_form/auth_form.js'
+import ShoutPanel from 'components/shout_panel/shout_panel.vue'
 import WhoToFollow from 'components/who_to_follow/who_to_follow.vue'
-
+import About from 'components/about/about.vue'
+import RemoteUserResolver from 'components/remote_user_resolver/remote_user_resolver.vue'
+import Lists from 'components/lists/lists.vue'
+import ListsTimeline from 'components/lists_timeline/lists_timeline.vue'
+import ListsEdit from 'components/lists_edit/lists_edit.vue'
 import NavPanel from 'src/components/nav_panel/nav_panel.vue'
-import BookmarkFolderEdit from '../components/bookmark_folder_edit/bookmark_folder_edit.vue'
-import BookmarkFolders from '../components/bookmark_folders/bookmark_folders.vue'
+import AnnouncementsPage from 'components/announcements_page/announcements_page.vue'
 import QuotesTimeline from '../components/quotes_timeline/quotes_timeline.vue'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
+import Drafts from 'components/drafts/drafts.vue'
+import BookmarkFolders from '../components/bookmark_folders/bookmark_folders.vue'
+import BookmarkFolderEdit from '../components/bookmark_folder_edit/bookmark_folder_edit.vue'

 export default (store) => {
  const validateAuthenticatedRoute = (to, from, next) => {
    if (store.state.users.currentUser) {
      next()
    } else {
-      next(
-        useInstanceStore().instanceIdentity.redirectRootNoLogin || '/main/all',
-      )
+      next(store.state.instance.redirectRootNoLogin || '/main/all')
    }
  }

@ -51,125 +45,46 @@ export default (store) => {
      name: 'root',
      path: '/',
      redirect: () => {
-        return (
-          (store.state.users.currentUser
-            ? useInstanceStore().instanceIdentity.redirectRootLogin
-            : useInstanceStore().instanceIdentity.redirectRootNoLogin) ||
-          '/main/all'
-        )
-      },
-    },
-    {
-      name: 'public-external-timeline',
-      path: '/main/all',
-      component: PublicAndExternalTimeline,
-    },
-    {
-      name: 'public-timeline',
-      path: '/main/public',
-      component: PublicTimeline,
-    },
-    {
-      name: 'friends',
-      path: '/main/friends',
-      component: FriendsTimeline,
-      beforeEnter: validateAuthenticatedRoute,
+        return (store.state.users.currentUser
+          ? store.state.instance.redirectRootLogin
+          : store.state.instance.redirectRootNoLogin) || '/main/all'
+      }
    },
+    { name: 'public-external-timeline', path: '/main/all', component: PublicAndExternalTimeline },
+    { name: 'public-timeline', path: '/main/public', component: PublicTimeline },
+    { name: 'friends', path: '/main/friends', component: FriendsTimeline, beforeEnter: validateAuthenticatedRoute },
    { name: 'tag-timeline', path: '/tag/:tag', component: TagTimeline },
    { name: 'bookmarks', path: '/bookmarks', component: BookmarkTimeline },
    { name: 'bubble', path: '/bubble', component: BubbleTimeline },
-    {
-      name: 'conversation',
-      path: '/notice/:id',
-      component: ConversationPage,
-      meta: { dontScroll: true },
-    },
+    { name: 'conversation', path: '/notice/:id', component: ConversationPage, meta: { dontScroll: true } },
    { name: 'quotes', path: '/notice/:id/quotes', component: QuotesTimeline },
    {
      name: 'remote-user-profile-acct',
      path: '/remote-users/:_(@)?:username([^/@]+)@:hostname([^/@]+)',
      component: RemoteUserResolver,
-      beforeEnter: validateAuthenticatedRoute,
+      beforeEnter: validateAuthenticatedRoute
    },
    {
      name: 'remote-user-profile',
      path: '/remote-users/:hostname/:username',
      component: RemoteUserResolver,
-      beforeEnter: validateAuthenticatedRoute,
-    },
-    {
-      name: 'external-user-profile',
-      path: '/users/$:id',
-      component: UserProfile,
-    },
-    {
-      name: 'interactions',
-      path: '/users/:username/interactions',
-      component: Interactions,
-      beforeEnter: validateAuthenticatedRoute,
-    },
-    {
-      name: 'dms',
-      path: '/users/:username/dms',
-      component: DMs,
-      beforeEnter: validateAuthenticatedRoute,
+      beforeEnter: validateAuthenticatedRoute
    },
+    { name: 'external-user-profile', path: '/users/$:id', component: UserProfile },
+    { name: 'interactions', path: '/users/:username/interactions', component: Interactions, beforeEnter: validateAuthenticatedRoute },
+    { name: 'dms', path: '/users/:username/dms', component: DMs, beforeEnter: validateAuthenticatedRoute },
    { name: 'registration', path: '/registration', component: Registration },
-    {
-      name: 'password-reset',
-      path: '/password-reset',
-      component: PasswordReset,
-      props: true,
-    },
-    {
-      name: 'registration-token',
-      path: '/registration/:token',
-      component: Registration,
-    },
-    {
-      name: 'friend-requests',
-      path: '/friend-requests',
-      component: FollowRequests,
-      beforeEnter: validateAuthenticatedRoute,
-    },
-    {
-      name: 'notifications',
-      path: '/:username/notifications',
-      component: Notifications,
-      props: () => ({ disableTeleport: true }),
-      beforeEnter: validateAuthenticatedRoute,
-    },
+    { name: 'password-reset', path: '/password-reset', component: PasswordReset, props: true },
+    { name: 'registration-token', path: '/registration/:token', component: Registration },
+    { name: 'friend-requests', path: '/friend-requests', component: FollowRequests, beforeEnter: validateAuthenticatedRoute },
+    { name: 'notifications', path: '/:username/notifications', component: Notifications, props: () => ({ disableTeleport: true }), beforeEnter: validateAuthenticatedRoute },
    { name: 'login', path: '/login', component: AuthForm },
-    {
-      name: 'shout-panel',
-      path: '/shout-panel',
-      component: ShoutPanel,
-      props: () => ({ floating: false }),
-    },
-    {
-      name: 'oauth-callback',
-      path: '/oauth-callback',
-      component: OAuthCallback,
-      props: (route) => ({ code: route.query.code }),
-    },
-    {
-      name: 'search',
-      path: '/search',
-      component: Search,
-      props: (route) => ({ query: route.query.query }),
-    },
-    {
-      name: 'who-to-follow',
-      path: '/who-to-follow',
-      component: WhoToFollow,
-      beforeEnter: validateAuthenticatedRoute,
-    },
+    { name: 'shout-panel', path: '/shout-panel', component: ShoutPanel, props: () => ({ floating: false }) },
+    { name: 'oauth-callback', path: '/oauth-callback', component: OAuthCallback, props: (route) => ({ code: route.query.code }) },
+    { name: 'search', path: '/search', component: Search, props: (route) => ({ query: route.query.query }) },
+    { name: 'who-to-follow', path: '/who-to-follow', component: WhoToFollow, beforeEnter: validateAuthenticatedRoute },
    { name: 'about', path: '/about', component: About },
-    {
-      name: 'announcements',
-      path: '/announcements',
-      component: AnnouncementsPage,
-    },
+    { name: 'announcements', path: '/announcements', component: AnnouncementsPage },
    { name: 'drafts', path: '/drafts', component: Drafts },
    { name: 'user-profile', path: '/users/:name', component: UserProfile },
    { name: 'legacy-user-profile', path: '/:name', component: UserProfile },
@ -177,51 +92,17 @@ export default (store) => {
    { name: 'lists-timeline', path: '/lists/:id', component: ListsTimeline },
    { name: 'lists-edit', path: '/lists/:id/edit', component: ListsEdit },
    { name: 'lists-new', path: '/lists/new', component: ListsEdit },
-    {
-      name: 'edit-navigation',
-      path: '/nav-edit',
-      component: NavPanel,
-      props: () => ({ forceExpand: true, forceEditMode: true }),
-      beforeEnter: validateAuthenticatedRoute,
-    },
-    {
-      name: 'bookmark-folders',
-      path: '/bookmark_folders',
-      component: BookmarkFolders,
-    },
-    {
-      name: 'bookmark-folder-new',
-      path: '/bookmarks/new-folder',
-      component: BookmarkFolderEdit,
-    },
-    {
-      name: 'bookmark-folder',
-      path: '/bookmarks/:id',
-      component: BookmarkTimeline,
-    },
-    {
-      name: 'bookmark-folder-edit',
-      path: '/bookmarks/:id/edit',
-      component: BookmarkFolderEdit,
-    },
+    { name: 'edit-navigation', path: '/nav-edit', component: NavPanel, props: () => ({ forceExpand: true, forceEditMode: true }), beforeEnter: validateAuthenticatedRoute },
+    { name: 'bookmark-folders', path: '/bookmark_folders', component: BookmarkFolders },
+    { name: 'bookmark-folder-new', path: '/bookmarks/new-folder', component: BookmarkFolderEdit },
+    { name: 'bookmark-folder', path: '/bookmarks/:id', component: BookmarkTimeline },
+    { name: 'bookmark-folder-edit', path: '/bookmarks/:id/edit', component: BookmarkFolderEdit }
  ]

-  if (useInstanceCapabilitiesStore().pleromaChatMessagesAvailable) {
+  if (store.state.instance.pleromaChatMessagesAvailable) {
    routes = routes.concat([
-      {
-        name: 'chat',
-        path: '/users/:username/chats/:recipient_id',
-        component: Chat,
-        meta: { dontScroll: false },
-        beforeEnter: validateAuthenticatedRoute,
-      },
-      {
-        name: 'chats',
-        path: '/users/:username/chats',
-        component: ChatList,
-        meta: { dontScroll: false },
-        beforeEnter: validateAuthenticatedRoute,
-      },
+      { name: 'chat', path: '/users/:username/chats/:recipient_id', component: Chat, meta: { dontScroll: false }, beforeEnter: validateAuthenticatedRoute },
+      { name: 'chats', path: '/users/:username/chats', component: ChatList, meta: { dontScroll: false }, beforeEnter: validateAuthenticatedRoute }
    ])
  }

--- a/src/components/about/about.js
+++ b/src/components/about/about.js
@ -1,11 +1,8 @@
-import FeaturesPanel from '../features_panel/features_panel.vue'
 import InstanceSpecificPanel from '../instance_specific_panel/instance_specific_panel.vue'
-import MRFTransparencyPanel from '../mrf_transparency_panel/mrf_transparency_panel.vue'
-import StaffPanel from '../staff_panel/staff_panel.vue'
+import FeaturesPanel from '../features_panel/features_panel.vue'
 import TermsOfServicePanel from '../terms_of_service_panel/terms_of_service_panel.vue'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import StaffPanel from '../staff_panel/staff_panel.vue'
+import MRFTransparencyPanel from '../mrf_transparency_panel/mrf_transparency_panel.vue'

 const About = {
  components: {
@ -13,20 +10,16 @@ const About = {
    FeaturesPanel,
    TermsOfServicePanel,
    StaffPanel,
-    MRFTransparencyPanel,
+    MRFTransparencyPanel
  },
  computed: {
-    showFeaturesPanel() {
-      return useInstanceStore().instanceIdentity.showFeaturesPanel
-    },
-    showInstanceSpecificPanel() {
-      return (
-        useInstanceStore().instanceIdentity.showInstanceSpecificPanel &&
-        !useMergedConfigStore().mergedConfig.hideISP &&
-        useInstanceStore().instanceIdentity.instanceSpecificPanelContent
-      )
-    },
-  },
+    showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel },
+    showInstanceSpecificPanel () {
+      return this.$store.state.instance.showInstanceSpecificPanel &&
+        !this.$store.getters.mergedConfig.hideISP &&
+        this.$store.state.instance.instanceSpecificPanelContent
+    }
+  }
 }

 export default About
--- a/src/components/account_actions/account_actions.js
+++ b/src/components/account_actions/account_actions.js
@ -1,105 +1,99 @@
-import { mapState } from 'pinia'
-
-import UserListMenu from 'src/components/user_list_menu/user_list_menu.vue'
-import UserTimedFilterModal from 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue'
-import ConfirmModal from '../confirm_modal/confirm_modal.vue'
-import Popover from '../popover/popover.vue'
+import { mapState } from 'vuex'
 import ProgressButton from '../progress_button/progress_button.vue'
-
-import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
-import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import Popover from '../popover/popover.vue'
+import UserListMenu from 'src/components/user_list_menu/user_list_menu.vue'
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faEllipsisV
+} from '@fortawesome/free-solid-svg-icons'
 import { useReportsStore } from 'src/stores/reports'

-import { library } from '@fortawesome/fontawesome-svg-core'
-import { faEllipsisV } from '@fortawesome/free-solid-svg-icons'
-
-library.add(faEllipsisV)
+library.add(
+  faEllipsisV
+)

 const AccountActions = {
-  props: ['user', 'relationship'],
-  data() {
+  props: [
+    'user', 'relationship'
+  ],
+  data () {
    return {
      showingConfirmBlock: false,
-      showingConfirmRemoveFollower: false,
+      showingConfirmRemoveFollower: false
    }
  },
  components: {
    ProgressButton,
    Popover,
    UserListMenu,
-    ConfirmModal,
-    UserTimedFilterModal,
+    ConfirmModal
  },
  methods: {
-    showConfirmRemoveUserFromFollowers() {
-      this.showingConfirmRemoveFollower = true
+    showConfirmBlock () {
+      this.showingConfirmBlock = true
    },
-    hideConfirmRemoveUserFromFollowers() {
-      this.showingConfirmRemoveFollower = false
-    },
-    hideConfirmBlock() {
+    hideConfirmBlock () {
      this.showingConfirmBlock = false
    },
-    showRepeats() {
+    showConfirmRemoveUserFromFollowers () {
+      this.showingConfirmRemoveFollower = true
+    },
+    hideConfirmRemoveUserFromFollowers () {
+      this.showingConfirmRemoveFollower = false
+    },
+    showRepeats () {
      this.$store.dispatch('showReblogs', this.user.id)
    },
-    hideRepeats() {
+    hideRepeats () {
      this.$store.dispatch('hideReblogs', this.user.id)
    },
-    blockUser() {
-      if (this.$refs.timedBlockDialog) {
-        this.$refs.timedBlockDialog.optionallyPrompt()
+    blockUser () {
+      if (!this.shouldConfirmBlock) {
+        this.doBlockUser()
      } else {
-        if (!this.shouldConfirmBlock) {
-          this.doBlockUser()
-        } else {
-          this.showingConfirmBlock = true
-        }
+        this.showConfirmBlock()
      }
    },
-    doBlockUser() {
-      this.$store.dispatch('blockUser', { id: this.user.id })
+    doBlockUser () {
+      this.$store.dispatch('blockUser', this.user.id)
      this.hideConfirmBlock()
    },
-    unblockUser() {
+    unblockUser () {
      this.$store.dispatch('unblockUser', this.user.id)
    },
-    removeUserFromFollowers() {
+    removeUserFromFollowers () {
      if (!this.shouldConfirmRemoveUserFromFollowers) {
        this.doRemoveUserFromFollowers()
      } else {
        this.showConfirmRemoveUserFromFollowers()
      }
    },
-    doRemoveUserFromFollowers() {
+    doRemoveUserFromFollowers () {
      this.$store.dispatch('removeUserFromFollowers', this.user.id)
      this.hideConfirmRemoveUserFromFollowers()
    },
-    reportUser() {
+    reportUser () {
      useReportsStore().openUserReportingModal({ userId: this.user.id })
    },
-    openChat() {
+    openChat () {
      this.$router.push({
        name: 'chat',
-        params: {
-          username: this.$store.state.users.currentUser.screen_name,
-          recipient_id: this.user.id,
-        },
+        params: { username: this.$store.state.users.currentUser.screen_name, recipient_id: this.user.id }
      })
-    },
+    }
  },
  computed: {
-    shouldConfirmBlock() {
-      return useMergedConfigStore().mergedConfig.modalOnBlock
+    shouldConfirmBlock () {
+      return this.$store.getters.mergedConfig.modalOnBlock
    },
-    shouldConfirmRemoveUserFromFollowers() {
-      return useMergedConfigStore().mergedConfig.modalOnRemoveUserFromFollowers
+    shouldConfirmRemoveUserFromFollowers () {
+      return this.$store.getters.mergedConfig.modalOnRemoveUserFromFollowers
    },
-    ...mapState(useInstanceCapabilitiesStore, [
-      'blockExpiration',
-      'pleromaChatMessagesAvailable',
-    ]),
-  },
+    ...mapState({
+      pleromaChatMessagesAvailable: state => state.instance.pleromaChatMessagesAvailable
+    })
+  }
 }

 export default AccountActions
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@ -3,6 +3,7 @@
    <Popover
      trigger="click"
      placement="bottom"
+      :bound-to="{ x: 'container' }"
      remove-padding
    >
      <template #content>
@ -95,8 +96,7 @@
    </Popover>
    <teleport to="#modal">
      <confirm-modal
-        v-if="showingConfirmBlock && !blockExpiration"
-        ref="blockDialog"
+        v-if="showingConfirmBlock"
        :title="$t('user_card.block_confirm_title')"
        :confirm-text="$t('user_card.block_confirm_accept_button')"
        :cancel-text="$t('user_card.block_confirm_cancel_button')"
@ -137,12 +137,6 @@
          </template>
        </i18n-t>
      </confirm-modal>
-      <UserTimedFilterModal
-        v-if="blockExpiration"
-        ref="timedBlockDialog"
-        :is-mute="false"
-        :user="user"
-      />
    </teleport>
  </div>
 </template>
--- a/src/components/alert.style.js
+++ b/src/components/alert.style.js
@ -1,51 +1,57 @@
 export default {
  name: 'Alert',
  selector: '.alert',
-  validInnerComponents: ['Text', 'Icon', 'Link', 'Border', 'ButtonUnstyled'],
+  validInnerComponents: [
+    'Text',
+    'Icon',
+    'Link',
+    'Border',
+    'ButtonUnstyled'
+  ],
  variants: {
    normal: '.neutral',
    error: '.error',
    warning: '.warning',
-    success: '.success',
+    success: '.success'
  },
  editor: {
    border: 1,
-    aspect: '3 / 1',
+    aspect: '3 / 1'
  },
  defaultRules: [
    {
      directives: {
        background: '--text',
        opacity: 0.5,
-        blur: '9px',
-      },
+        blur: '9px'
+      }
    },
    {
      parent: {
-        component: 'Alert',
+        component: 'Alert'
      },
      component: 'Border',
      directives: {
-        textColor: '--parent',
-      },
+        textColor: '--parent'
+      }
    },
    {
      variant: 'error',
      directives: {
-        background: '--cRed',
-      },
+        background: '--cRed'
+      }
    },
    {
      variant: 'warning',
      directives: {
-        background: '--cOrange',
-      },
+        background: '--cOrange'
+      }
    },
    {
      variant: 'success',
      directives: {
-        background: '--cGreen',
-      },
-    },
-  ],
+        background: '--cGreen'
+      }
+    }
+  ]
 }
--- a/src/components/announcement/announcement.js
+++ b/src/components/announcement/announcement.js
@ -1,130 +1,109 @@
 import { mapState } from 'vuex'
-
-import localeService from '../../services/locale/locale.service.js'
 import AnnouncementEditor from '../announcement_editor/announcement_editor.vue'
 import RichContent from '../rich_content/rich_content.jsx'
-
-import { useAnnouncementsStore } from 'src/stores/announcements.js'
+import localeService from '../../services/locale/locale.service.js'
+import { useAnnouncementsStore } from 'src/stores/announcements'

 const Announcement = {
  components: {
    AnnouncementEditor,
-    RichContent,
+    RichContent
  },
-  data() {
+  data () {
    return {
      editing: false,
      editedAnnouncement: {
        content: '',
        startsAt: undefined,
        endsAt: undefined,
-        allDay: undefined,
+        allDay: undefined
      },
-      editError: '',
+      editError: ''
    }
  },
  props: {
-    announcement: Object,
+    announcement: Object
  },
  computed: {
    ...mapState({
-      currentUser: (state) => state.users.currentUser,
+      currentUser: state => state.users.currentUser
    }),
-    canEditAnnouncement() {
-      return (
-        this.currentUser &&
-        this.currentUser.privileges.includes(
-          'announcements_manage_announcements',
-        )
-      )
+    canEditAnnouncement () {
+      return this.currentUser && this.currentUser.privileges.includes('announcements_manage_announcements')
    },
-    content() {
+    content () {
      return this.announcement.content
    },
-    isRead() {
+    isRead () {
      return this.announcement.read
    },
-    publishedAt() {
+    publishedAt () {
      const time = this.announcement.published_at
      if (!time) {
        return
      }

-      return this.formatTimeOrDate(
-        time,
-        localeService.internalToBrowserLocale(this.$i18n.locale),
-      )
+      return this.formatTimeOrDate(time, localeService.internalToBrowserLocale(this.$i18n.locale))
    },
-    startsAt() {
+    startsAt () {
      const time = this.announcement.starts_at
      if (!time) {
        return
      }

-      return this.formatTimeOrDate(
-        time,
-        localeService.internalToBrowserLocale(this.$i18n.locale),
-      )
+      return this.formatTimeOrDate(time, localeService.internalToBrowserLocale(this.$i18n.locale))
    },
-    endsAt() {
+    endsAt () {
      const time = this.announcement.ends_at
      if (!time) {
        return
      }

-      return this.formatTimeOrDate(
-        time,
-        localeService.internalToBrowserLocale(this.$i18n.locale),
-      )
+      return this.formatTimeOrDate(time, localeService.internalToBrowserLocale(this.$i18n.locale))
    },
-    inactive() {
+    inactive () {
      return this.announcement.inactive
-    },
+    }
  },
  methods: {
-    markAsRead() {
+    markAsRead () {
      if (!this.isRead) {
-        return useAnnouncementsStore().markAnnouncementAsRead(
-          this.announcement.id,
-        )
+        return useAnnouncementsStore().markAnnouncementAsRead(this.announcement.id)
      }
    },
-    deleteAnnouncement() {
+    deleteAnnouncement () {
      return useAnnouncementsStore().deleteAnnouncement(this.announcement.id)
    },
-    formatTimeOrDate(time, locale) {
+    formatTimeOrDate (time, locale) {
      const d = new Date(time)
-      return this.announcement.all_day
-        ? d.toLocaleDateString(locale)
-        : d.toLocaleString(locale)
+      return this.announcement.all_day ? d.toLocaleDateString(locale) : d.toLocaleString(locale)
    },
-    enterEditMode() {
+    enterEditMode () {
      this.editedAnnouncement.content = this.announcement.pleroma.raw_content
      this.editedAnnouncement.startsAt = this.announcement.starts_at
      this.editedAnnouncement.endsAt = this.announcement.ends_at
      this.editedAnnouncement.allDay = this.announcement.all_day
      this.editing = true
    },
-    submitEdit() {
-      useAnnouncementsStore()
-        .editAnnouncement({
-          id: this.announcement.id,
-          ...this.editedAnnouncement,
-        })
+    submitEdit () {
+      useAnnouncementsStore().editAnnouncement({
+        id: this.announcement.id,
+        ...this.editedAnnouncement
+      })
        .then(() => {
          this.editing = false
        })
-        .catch((error) => {
+        .catch(error => {
          this.editError = error.error
        })
    },
-    cancelEdit() {
+    cancelEdit () {
      this.editing = false
    },
-    clearError() {
+    clearError () {
      this.editError = undefined
-    },
-  },
+    }
+  }
 }

 export default Announcement
--- a/src/components/announcement_editor/announcement_editor.js
+++ b/src/components/announcement_editor/announcement_editor.js
@ -2,12 +2,12 @@ import Checkbox from '../checkbox/checkbox.vue'

 const AnnouncementEditor = {
  components: {
-    Checkbox,
+    Checkbox
  },
  props: {
    announcement: Object,
-    disabled: Boolean,
-  },
+    disabled: Boolean
+  }
 }

 export default AnnouncementEditor
--- a/src/components/announcements_page/announcements_page.js
+++ b/src/components/announcements_page/announcements_page.js
@ -1,67 +1,59 @@
 import { mapState } from 'vuex'
-
 import Announcement from '../announcement/announcement.vue'
 import AnnouncementEditor from '../announcement_editor/announcement_editor.vue'
-
-import { useAnnouncementsStore } from 'src/stores/announcements.js'
+import { useAnnouncementsStore } from 'src/stores/announcements'

 const AnnouncementsPage = {
  components: {
    Announcement,
-    AnnouncementEditor,
+    AnnouncementEditor
  },
-  data() {
+  data () {
    return {
      newAnnouncement: {
        content: '',
        startsAt: undefined,
        endsAt: undefined,
-        allDay: false,
+        allDay: false
      },
      posting: false,
-      error: undefined,
+      error: undefined
    }
  },
-  mounted() {
+  mounted () {
    useAnnouncementsStore().fetchAnnouncements()
  },
  computed: {
    ...mapState({
-      currentUser: (state) => state.users.currentUser,
+      currentUser: state => state.users.currentUser
    }),
-    announcements() {
+    announcements () {
      return useAnnouncementsStore().announcements
    },
-    canPostAnnouncement() {
-      return (
-        this.currentUser &&
-        this.currentUser.privileges.includes(
-          'announcements_manage_announcements',
-        )
-      )
-    },
+    canPostAnnouncement () {
+      return this.currentUser && this.currentUser.privileges.includes('announcements_manage_announcements')
+    }
  },
  methods: {
-    postAnnouncement() {
+    postAnnouncement () {
      this.posting = true
-      useAnnouncementsStore()
-        .postAnnouncement(this.newAnnouncement)
+      useAnnouncementsStore().postAnnouncement(this.newAnnouncement)
        .then(() => {
          this.newAnnouncement.content = ''
          this.startsAt = undefined
          this.endsAt = undefined
        })
-        .catch((error) => {
+        .catch(error => {
          this.error = error.error
        })
        .finally(() => {
          this.posting = false
        })
    },
-    clearError() {
+    clearError () {
      this.error = undefined
-    },
-  },
+    }
+  }
 }

 export default AnnouncementsPage
--- a/src/components/async_component_error/async_component_error.vue
+++ b/src/components/async_component_error/async_component_error.vue
@ -21,10 +21,10 @@
 export default {
  emits: ['resetAsyncComponent'],
  methods: {
-    retry() {
+    retry () {
      this.$emit('resetAsyncComponent')
-    },
-  },
+    }
+  }
 }
 </script>

--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@ -1,29 +1,24 @@
-import { mapState } from 'pinia'
-
-import nsfwImage from '../../assets/nsfw.png'
-import Flash from '../flash/flash.vue'
 import StillImage from '../still-image/still-image.vue'
+import Flash from '../flash/flash.vue'
 import VideoAttachment from '../video_attachment/video_attachment.vue'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
-import { useMediaViewerStore } from 'src/stores/media_viewer'
-import { useMergedConfigStore } from 'src/stores/merged_config.js'
-
+import nsfwImage from '../../assets/nsfw.png'
+import fileTypeService from '../../services/file_type/file_type.service.js'
+import { mapGetters } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
-  faAlignRight,
  faFile,
-  faImage,
  faMusic,
-  faPencilAlt,
-  faPlayCircle,
-  faSearchPlus,
-  faStop,
-  faTimes,
-  faTrashAlt,
+  faImage,
  faVideo,
+  faPlayCircle,
+  faTimes,
+  faStop,
+  faSearchPlus,
+  faTrashAlt,
+  faPencilAlt,
+  faAlignRight
 } from '@fortawesome/free-solid-svg-icons'
+import { useMediaViewerStore } from 'src/stores/media_viewer'

 library.add(
  faFile,
@ -36,7 +31,7 @@ library.add(
  faSearchPlus,
  faTrashAlt,
  faPencilAlt,
-  faAlignRight,
+  faAlignRight
 )

 const Attachment = {
@ -51,72 +46,72 @@ const Attachment = {
    'remove',
    'shiftUp',
    'shiftDn',
-    'edit',
+    'edit'
  ],
-  data() {
+  data () {
    return {
      localDescription: this.description || this.attachment.description,
-      nsfwImage:
-        useInstanceStore().instanceIdentity.nsfwCensorImage || nsfwImage,
-      hideNsfwLocal: useMergedConfigStore().mergedConfig.hideNsfw,
-      preloadImage: useMergedConfigStore().mergedConfig.preloadImage,
+      nsfwImage: this.$store.state.instance.nsfwCensorImage || nsfwImage,
+      hideNsfwLocal: this.$store.getters.mergedConfig.hideNsfw,
+      preloadImage: this.$store.getters.mergedConfig.preloadImage,
      loading: false,
-      img: this.attachment.type === 'image' && document.createElement('img'),
+      img: fileTypeService.fileType(this.attachment.mimetype) === 'image' && document.createElement('img'),
      modalOpen: false,
      showHidden: false,
      flashLoaded: false,
-      showDescription: false,
+      showDescription: false
    }
  },
  components: {
    Flash,
    StillImage,
-    VideoAttachment,
+    VideoAttachment
  },
  computed: {
-    classNames() {
+    classNames () {
      return [
        {
          '-loading': this.loading,
          '-nsfw-placeholder': this.hidden,
          '-editable': this.edit !== undefined,
-          '-compact': this.compact,
+          '-compact': this.compact
        },
-        '-type-' + this.attachment.type,
+        '-type-' + this.type,
        this.size && '-size-' + this.size,
-        `-${this.useContainFit ? 'contain' : 'cover'}-fit`,
+        `-${this.useContainFit ? 'contain' : 'cover'}-fit`
      ]
    },
-    usePlaceholder() {
+    usePlaceholder () {
      return this.size === 'hide'
    },
-    useContainFit() {
-      return this.mergedConfig.useContainFit
+    useContainFit () {
+      return this.$store.getters.mergedConfig.useContainFit
    },
-    placeholderName() {
+    placeholderName () {
      if (this.attachment.description === '' || !this.attachment.description) {
-        return this.attachment.type.toUpperCase()
+        return this.type.toUpperCase()
      }
      return this.attachment.description
    },
-    placeholderIconClass() {
-      if (this.attachment.type === 'image') return 'image'
-      if (this.attachment.type === 'video') return 'video'
-      if (this.attachment.type === 'audio') return 'music'
+    placeholderIconClass () {
+      if (this.type === 'image') return 'image'
+      if (this.type === 'video') return 'video'
+      if (this.type === 'audio') return 'music'
      return 'file'
    },
-    referrerpolicy() {
-      return useInstanceCapabilitiesStore().mediaProxyAvailable
-        ? ''
-        : 'no-referrer'
+    referrerpolicy () {
+      return this.$store.state.instance.mediaProxyAvailable ? '' : 'no-referrer'
    },
-    hidden() {
+    type () {
+      return fileTypeService.fileType(this.attachment.mimetype)
+    },
+    hidden () {
      return this.nsfw && this.hideNsfwLocal && !this.showHidden
    },
-    isEmpty() {
-      return this.attachment.type === 'html' && !this.attachment.oembed
+    isEmpty () {
+      return (this.type === 'html' && !this.attachment.oembed)
    },
-    useModal() {
+    useModal () {
      let modalTypes = []
      switch (this.size) {
        case 'hide':
@ -129,66 +124,64 @@ const Attachment = {
            : ['image']
          break
      }
-      return modalTypes.includes(this.attachment.type)
+      return modalTypes.includes(this.type)
    },
-    videoTag() {
+    videoTag () {
      return this.useModal ? 'button' : 'span'
    },
-    ...mapState(useMergedConfigStore, ['mergedConfig']),
+    ...mapGetters(['mergedConfig'])
  },
  watch: {
-    'attachment.description'(newVal) {
+    'attachment.description' (newVal) {
      this.localDescription = newVal
    },
-    localDescription(newVal) {
+    localDescription (newVal) {
      this.onEdit(newVal)
-    },
+    }
  },
  methods: {
-    linkClicked({ target }) {
+    linkClicked ({ target }) {
      if (target.tagName === 'A') {
        window.open(target.href, '_blank')
      }
    },
-    openModal() {
+    openModal () {
      if (this.useModal) {
        this.$emit('setMedia')
        useMediaViewerStore().setCurrentMedia(this.attachment)
-      } else if (this.attachment.type === 'unknown') {
+      } else if (this.type === 'unknown') {
        window.open(this.attachment.url)
      }
    },
-    openModalForce() {
+    openModalForce () {
      this.$emit('setMedia')
      useMediaViewerStore().setCurrentMedia(this.attachment)
    },
-    onEdit(event) {
+    onEdit (event) {
      this.edit && this.edit(this.attachment, event)
    },
-    onRemove() {
+    onRemove () {
      this.remove && this.remove(this.attachment)
    },
-    onShiftUp() {
+    onShiftUp () {
      this.shiftUp && this.shiftUp(this.attachment)
    },
-    onShiftDn() {
+    onShiftDn () {
      this.shiftDn && this.shiftDn(this.attachment)
    },
-    stopFlash() {
+    stopFlash () {
      this.$refs.flash.closePlayer()
    },
-    setFlashLoaded(event) {
+    setFlashLoaded (event) {
      this.flashLoaded = event
    },
-    toggleDescription() {
+    toggleDescription () {
      this.showDescription = !this.showDescription
    },
-    toggleHidden(event) {
+    toggleHidden (event) {
      if (
-        this.mergedConfig.useOneClickNsfw &&
-        !this.showHidden &&
-        (this.attachment.type !== 'video' ||
-          this.mergedConfig.playVideosInModal)
+        (this.mergedConfig.useOneClickNsfw && !this.showHidden) &&
+        (this.type !== 'video' || this.mergedConfig.playVideosInModal)
      ) {
        this.openModal(event)
        return
@ -208,12 +201,12 @@ const Attachment = {
        this.showHidden = !this.showHidden
      }
    },
-    onImageLoad(image) {
+    onImageLoad (image) {
      const width = image.naturalWidth
      const height = image.naturalHeight
      this.$emit('naturalSizeLoad', { id: this.attachment.id, width, height })
-    },
-  },
+    }
+  }
 }

 export default Attachment
--- a/src/components/attachment/attachment.scss
+++ b/src/components/attachment/attachment.scss
@ -107,9 +107,9 @@

  .play-icon {
    position: absolute;
-    font-size: 4.5em;
-    top: calc(50% - 2.25rem);
-    left: calc(50% - 2.25rem);
+    font-size: 64px;
+    top: calc(50% - 32px);
+    left: calc(50% - 32px);
    color: rgb(255 255 255 / 75%);
    text-shadow: 0 0 2px rgb(0 0 0 / 40%);

--- a/src/components/attachment/attachment.style.js
+++ b/src/components/attachment/attachment.style.js
@ -0,0 +1,27 @@
+export default {
+  name: 'Attachment',
+  selector: '.Attachment',
+  notEditable: true,
+  validInnerComponents: [
+    'Border',
+    'Button',
+    'Input'
+  ],
+  defaultRules: [
+    {
+      directives: {
+        roundness: 3
+      }
+    },
+    {
+      component: 'Button',
+      parent: {
+        component: 'Attachment'
+      },
+      directives: {
+        background: '#FFFFFF',
+        opacity: 0.5
+      }
+    }
+  ]
+}
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@ -6,7 +6,7 @@
    @click="openModal"
  >
    <a
-      v-if="attachment.type !== 'html'"
+      v-if="type !== 'html'"
      class="placeholder"
      target="_blank"
      :href="attachment.url"
@ -23,7 +23,7 @@
    >
      <button
        v-if="remove"
-        class="button-default attachment-button -transparent"
+        class="button-default attachment-button"
        @click.prevent="onRemove"
      >
        <FAIcon icon="trash-alt" />
@ -70,7 +70,7 @@
          :src="nsfwImage"
        >
        <FAIcon
-          v-if="attachment.type === 'video'"
+          v-if="type === 'video'"
          class="play-icon"
          icon="play-circle"
        />
@ -80,24 +80,24 @@
        class="attachment-buttons"
      >
        <button
-          v-if="attachment.type === 'flash' && flashLoaded"
-          class="button-default attachment-button -transparent"
+          v-if="type === 'flash' && flashLoaded"
+          class="button-default attachment-button"
          :title="$t('status.attachment_stop_flash')"
          @click.prevent="stopFlash"
        >
          <FAIcon icon="stop" />
        </button>
        <button
-          v-if="attachment.description && size !== 'small' && !edit && attachment.type !== 'unknown'"
-          class="button-default attachment-button -transparent"
+          v-if="attachment.description && size !== 'small' && !edit && type !== 'unknown'"
+          class="button-default attachment-button"
          :title="$t('status.show_attachment_description')"
          @click.prevent="toggleDescription"
        >
          <FAIcon icon="align-right" />
        </button>
        <button
-          v-if="!useModal && attachment.type !== 'unknown'"
-          class="button-default attachment-button -transparent"
+          v-if="!useModal && type !== 'unknown'"
+          class="button-default attachment-button"
          :title="$t('status.show_attachment_in_modal')"
          @click.prevent="openModalForce"
        >
@ -105,7 +105,7 @@
        </button>
        <button
          v-if="nsfw && hideNsfwLocal"
-          class="button-default attachment-button -transparent"
+          class="button-default attachment-button"
          :title="$t('status.hide_attachment')"
          @click.prevent="toggleHidden"
        >
@ -113,7 +113,7 @@
        </button>
        <button
          v-if="shiftUp"
-          class="button-default attachment-button -transparent"
+          class="button-default attachment-button"
          :title="$t('status.move_up')"
          @click.prevent="onShiftUp"
        >
@ -121,7 +121,7 @@
        </button>
        <button
          v-if="shiftDn"
-          class="button-default attachment-button -transparent"
+          class="button-default attachment-button"
          :title="$t('status.move_down')"
          @click.prevent="onShiftDn"
        >
@ -129,7 +129,7 @@
        </button>
        <button
          v-if="remove"
-          class="button-default attachment-button -transparent"
+          class="button-default attachment-button"
          :title="$t('status.remove_attachment')"
          @click.prevent="onRemove"
        >
@ -138,7 +138,7 @@
      </div>

      <a
-        v-if="attachment.type === 'image' && (!hidden || preloadImage)"
+        v-if="type === 'image' && (!hidden || preloadImage)"
        class="image-container"
        :class="{'-hidden': hidden && preloadImage }"
        :href="attachment.url"
@ -156,7 +156,7 @@
      </a>

      <a
-        v-if="attachment.type === 'unknown' && !hidden"
+        v-if="type === 'unknown' && !hidden"
        class="placeholder-container"
        :href="attachment.url"
        target="_blank"
@ -173,7 +173,7 @@

      <component
        :is="videoTag"
-        v-if="attachment.type === 'video' && !hidden"
+        v-if="type === 'video' && !hidden"
        class="video-container"
        :href="attachment.url"
        @click.stop.prevent="openModal"
@ -193,13 +193,13 @@
      </component>

      <span
-        v-if="attachment.type === 'audio' && !hidden"
+        v-if="type === 'audio' && !hidden"
        class="audio-container"
        :href="attachment.url"
        @click.stop.prevent="openModal"
      >
        <audio
-          v-if="attachment.type === 'audio'"
+          v-if="type === 'audio'"
          :src="attachment.url"
          :alt="attachment.description"
          :title="attachment.description"
@ -210,7 +210,7 @@
      </span>

      <div
-        v-if="attachment.type === 'html' && attachment.oembed"
+        v-if="type === 'html' && attachment.oembed"
        class="oembed-container"
        @click.prevent="linkClicked"
      >
@ -229,7 +229,7 @@
      </div>

      <span
-        v-if="attachment.type === 'flash' && !hidden"
+        v-if="type === 'flash' && !hidden"
        class="flash-container"
        :href="attachment.url"
        @click.stop.prevent="openModal"
--- a/src/components/auth_form/auth_form.js
+++ b/src/components/auth_form/auth_form.js
@ -1,34 +1,28 @@
-import { mapState } from 'pinia'
 import { h, resolveComponent } from 'vue'
-
 import LoginForm from '../login_form/login_form.vue'
 import MFARecoveryForm from '../mfa_form/recovery_form.vue'
 import MFATOTPForm from '../mfa_form/totp_form.vue'
-
-import { useAuthFlowStore } from 'src/stores/auth_flow.js'
+import { mapState } from 'pinia'
+import { useAuthFlowStore } from 'src/stores/auth_flow'

 const AuthForm = {
  name: 'AuthForm',
-  render() {
+  render () {
    return h(resolveComponent(this.authForm))
  },
  computed: {
-    authForm() {
-      if (this.requiredTOTP) {
-        return 'MFATOTPForm'
-      }
-      if (this.requiredRecovery) {
-        return 'MFARecoveryForm'
-      }
+    authForm () {
+      if (this.requiredTOTP) { return 'MFATOTPForm' }
+      if (this.requiredRecovery) { return 'MFARecoveryForm' }
      return 'LoginForm'
    },
-    ...mapState(useAuthFlowStore, ['requiredTOTP', 'requiredRecovery']),
+    ...mapState(useAuthFlowStore, ['requiredTOTP', 'requiredRecovery'])
  },
  components: {
    MFARecoveryForm,
    MFATOTPForm,
-    LoginForm,
-  },
+    LoginForm
+  }
 }

 export default AuthForm
--- a/src/components/autosuggest/autosuggest.js
+++ b/src/components/autosuggest/autosuggest.js
@ -2,55 +2,51 @@ const debounceMilliseconds = 500

 export default {
  props: {
-    query: {
-      // function to query results and return a promise
+    query: { // function to query results and return a promise
      type: Function,
-      required: true,
+      required: true
    },
-    filter: {
-      // function to filter results in real time
-      type: Function,
+    filter: { // function to filter results in real time
+      type: Function
    },
    placeholder: {
      type: String,
-      default: 'Search...',
-    },
+      default: 'Search...'
+    }
  },
-  data() {
+  data () {
    return {
      term: '',
      timeout: null,
      results: [],
-      resultsVisible: false,
+      resultsVisible: false
    }
  },
  computed: {
-    filtered() {
+    filtered () {
      return this.filter ? this.filter(this.results) : this.results
-    },
+    }
  },
  watch: {
-    term(val) {
+    term (val) {
      this.fetchResults(val)
-    },
+    }
  },
  methods: {
-    fetchResults(term) {
+    fetchResults (term) {
      clearTimeout(this.timeout)
      this.timeout = setTimeout(() => {
        this.results = []
        if (term) {
-          this.query(term).then((results) => {
-            this.results = results
-          })
+          this.query(term).then((results) => { this.results = results })
        }
      }, debounceMilliseconds)
    },
-    onInputClick() {
+    onInputClick () {
      this.resultsVisible = true
    },
-    onClickOutside() {
+    onClickOutside () {
      this.resultsVisible = false
-    },
-  },
+    }
+  }
 }
--- a/src/components/avatar_list/avatar_list.js
+++ b/src/components/avatar_list/avatar_list.js
@ -1,28 +1,21 @@
 import UserAvatar from '../user_avatar/user_avatar.vue'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'

 const AvatarList = {
  props: ['users'],
  computed: {
-    slicedUsers() {
+    slicedUsers () {
      return this.users ? this.users.slice(0, 15) : []
-    },
+    }
  },
  components: {
-    UserAvatar,
+    UserAvatar
  },
  methods: {
-    userProfileLink(user) {
-      return generateProfileLink(
-        user.id,
-        user.screen_name,
-        useInstanceStore().restrictedNicknames,
-      )
-    },
-  },
+    userProfileLink (user) {
+      return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames)
+    }
+  }
 }

 export default AvatarList
--- a/src/components/badge.style.js
+++ b/src/components/badge.style.js
@ -1,27 +1,30 @@
 export default {
  name: 'Badge',
  selector: '.badge',
-  validInnerComponents: ['Text', 'Icon'],
+  validInnerComponents: [
+    'Text',
+    'Icon'
+  ],
  variants: {
-    notification: '.-notification',
+    notification: '.-notification'
  },
  defaultRules: [
    {
      component: 'Root',
      directives: {
-        '--badgeNotification': 'color | --cRed',
-      },
+        '--badgeNotification': 'color | --cRed'
+      }
    },
    {
      directives: {
-        background: '--cGreen',
-      },
+        background: '--cGreen'
+      }
    },
    {
      variant: 'notification',
      directives: {
-        background: '--cRed',
-      },
-    },
-  ],
+        background: '--cRed'
+      }
+    }
+  ]
 }
--- a/src/components/basic_user_card/basic_user_card.js
+++ b/src/components/basic_user_card/basic_user_card.js
@ -1,29 +1,24 @@
-import RichContent from 'src/components/rich_content/rich_content.jsx'
+import UserPopover from '../user_popover/user_popover.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import UserLink from '../user_link/user_link.vue'
-import UserPopover from '../user_popover/user_popover.vue'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-
+import RichContent from 'src/components/rich_content/rich_content.jsx'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'

 const BasicUserCard = {
-  props: ['user'],
+  props: [
+    'user'
+  ],
  components: {
    UserPopover,
    UserAvatar,
    RichContent,
-    UserLink,
+    UserLink
  },
  methods: {
-    userProfileLink(user) {
-      return generateProfileLink(
-        user.id,
-        user.screen_name,
-        useInstanceStore().restrictedNicknames,
-      )
-    },
-  },
+    userProfileLink (user) {
+      return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames)
+    }
+  }
 }

 export default BasicUserCard
--- a/src/components/block_card/block_card.js
+++ b/src/components/block_card/block_card.js
@ -1,50 +1,40 @@
-import { mapState } from 'pinia'
-
-import UserTimedFilterModal from 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue'
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'

-import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
-
 const BlockCard = {
  props: ['userId'],
+  data () {
+    return {
+      progress: false
+    }
+  },
  computed: {
-    user() {
+    user () {
      return this.$store.getters.findUser(this.userId)
    },
-    relationship() {
+    relationship () {
      return this.$store.getters.relationship(this.userId)
    },
-    blocked() {
+    blocked () {
      return this.relationship.blocking
-    },
-    blockExpiryAvailable() {
-      return Object.hasOwn(this.user, 'block_expires_at')
-    },
-    blockExpiry() {
-      return this.user.block_expires_at === false
-        ? this.$t('user_card.block_expires_forever')
-        : this.$t('user_card.block_expires_at', [
-            new Date(this.user.mute_expires_at).toLocaleString(),
-          ])
-    },
-    ...mapState(useInstanceCapabilitiesStore, ['blockExpiration']),
+    }
  },
  components: {
-    BasicUserCard,
-    UserTimedFilterModal,
+    BasicUserCard
  },
  methods: {
-    unblockUser() {
-      this.$store.dispatch('unblockUser', this.user.id)
+    unblockUser () {
+      this.progress = true
+      this.$store.dispatch('unblockUser', this.user.id).then(() => {
+        this.progress = false
+      })
    },
-    blockUser() {
-      if (this.blockExpiration) {
-        this.$refs.timedBlockDialog.optionallyPrompt()
-      } else {
-        this.$store.dispatch('blockUser', { id: this.user.id })
-      }
-    },
-  },
+    blockUser () {
+      this.progress = true
+      this.$store.dispatch('blockUser', this.user.id).then(() => {
+        this.progress = false
+      })
+    }
+  }
 }

 export default BlockCard
--- a/src/components/block_card/block_card.vue
+++ b/src/components/block_card/block_card.vue
@ -1,35 +1,33 @@
 <template>
  <basic-user-card :user="user">
    <div class="block-card-content-container">
-      <span
-        v-if="blocked && blockExpiryAvailable"
-        class="alert neutral"
-      >
-        {{ blockExpiry }}
-      </span>
-      {{ ' ' }}
      <button
        v-if="blocked"
        class="btn button-default"
+        :disabled="progress"
        @click="unblockUser"
      >
-        {{ $t('user_card.unblock') }}
+        <template v-if="progress">
+          {{ $t('user_card.unblock_progress') }}
+        </template>
+        <template v-else>
+          {{ $t('user_card.unblock') }}
+        </template>
      </button>
      <button
        v-else
        class="btn button-default"
+        :disabled="progress"
        @click="blockUser"
      >
-        {{ $t('user_card.block') }}
+        <template v-if="progress">
+          {{ $t('user_card.block_progress') }}
+        </template>
+        <template v-else>
+          {{ $t('user_card.block') }}
+        </template>
      </button>
    </div>
-    <teleport to="#modal">
-      <UserTimedFilterModal
-        ref="timedBlockDialog"
-        :user="user"
-        :is-mute="false"
-      />
-    </teleport>
  </basic-user-card>
 </template>

--- a/src/components/bookmark_folder_card/bookmark_folder_card.js
+++ b/src/components/bookmark_folder_card/bookmark_folder_card.js
@ -1,15 +1,22 @@
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { faEllipsisH } from '@fortawesome/free-solid-svg-icons'
+import {
+  faEllipsisH
+} from '@fortawesome/free-solid-svg-icons'

-library.add(faEllipsisH)
+library.add(
+  faEllipsisH
+)

 const BookmarkFolderCard = {
-  props: ['folder', 'allBookmarks'],
+  props: [
+    'folder',
+    'allBookmarks'
+  ],
  computed: {
-    firstLetter() {
+    firstLetter () {
      return this.folder ? this.folder.name[0] : null
-    },
-  },
+    }
+  }
 }

 export default BookmarkFolderCard
--- a/src/components/bookmark_folder_edit/bookmark_folder_edit.js
+++ b/src/components/bookmark_folder_edit/bookmark_folder_edit.js
@ -1,11 +1,10 @@
-import apiService from '../../services/api/api.service'
 import EmojiPicker from '../emoji_picker/emoji_picker.vue'
-
-import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
+import apiService from '../../services/api/api.service'
+import { useInterfaceStore } from 'src/stores/interface'
+import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders'

 const BookmarkFolderEdit = {
-  data() {
+  data () {
    return {
      name: '',
      nameDraft: '',
@ -14,59 +13,54 @@ const BookmarkFolderEdit = {
      emojiDraft: '',
      emojiUrlDraft: null,
      emojiPickerExpanded: false,
-      reallyDelete: false,
+      reallyDelete: false
    }
  },
  components: {
-    EmojiPicker,
+    EmojiPicker
  },
-  created() {
+  created () {
    if (!this.id) return
    const credentials = this.$store.state.users.currentUser.credentials
-    apiService.fetchBookmarkFolders({ credentials }).then((folders) => {
-      const folder = folders.find((folder) => folder.id === this.id)
-      if (!folder) return
+    apiService.fetchBookmarkFolders({ credentials })
+      .then((folders) => {
+        const folder = folders.find(folder => folder.id === this.id)
+        if (!folder) return

-      this.nameDraft = this.name = folder.name
-      this.emojiDraft = this.emoji = folder.emoji
-      this.emojiUrlDraft = this.emojiUrl = folder.emoji_url
-    })
+        this.nameDraft = this.name = folder.name
+        this.emojiDraft = this.emoji = folder.emoji
+        this.emojiUrlDraft = this.emojiUrl = folder.emoji_url
+      })
  },
  computed: {
-    id() {
+    id () {
      return this.$route.params.id
-    },
+    }
  },
  methods: {
-    selectEmoji(event) {
+    selectEmoji (event) {
      this.emojiDraft = event.insertion
      this.emojiUrlDraft = event.insertionUrl
    },
-    showEmojiPicker() {
+    showEmojiPicker () {
      if (!this.emojiPickerExpanded) {
        this.$refs.picker.showPicker()
      }
    },
-    onShowPicker() {
+    onShowPicker () {
      this.emojiPickerExpanded = true
    },
-    onClosePicker() {
+    onClosePicker () {
      this.emojiPickerExpanded = false
    },
-    updateFolder() {
-      useBookmarkFoldersStore()
-        .updateBookmarkFolder({
-          folderId: this.id,
-          name: this.nameDraft,
-          emoji: this.emojiDraft,
-        })
+    updateFolder () {
+      useBookmarkFoldersStore().updateBookmarkFolder({ folderId: this.id, name: this.nameDraft, emoji: this.emojiDraft })
        .then(() => {
          this.$router.push({ name: 'bookmark-folders' })
        })
    },
-    createFolder() {
-      useBookmarkFoldersStore()
-        .createBookmarkFolder({ name: this.nameDraft, emoji: this.emojiDraft })
+    createFolder () {
+      useBookmarkFoldersStore().createBookmarkFolder({ name: this.nameDraft, emoji: this.emojiDraft })
        .then(() => {
          this.$router.push({ name: 'bookmark-folders' })
        })
@ -74,15 +68,15 @@ const BookmarkFolderEdit = {
          useInterfaceStore().pushGlobalNotice({
            messageKey: 'bookmark_folders.error',
            messageArgs: [e.message],
-            level: 'error',
+            level: 'error'
          })
        })
    },
-    deleteFolder() {
+    deleteFolder () {
      useBookmarkFoldersStore().deleteBookmarkFolder({ folderId: this.id })
      this.$router.push({ name: 'bookmark-folders' })
-    },
-  },
+    }
+  }
 }

 export default BookmarkFolderEdit
--- a/src/components/bookmark_folders/bookmark_folders.js
+++ b/src/components/bookmark_folders/bookmark_folders.js
@ -1,29 +1,28 @@
 import BookmarkFolderCard from '../bookmark_folder_card/bookmark_folder_card.vue'
-
-import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
+import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders'

 const BookmarkFolders = {
-  data() {
+  data () {
    return {
-      isNew: false,
+      isNew: false
    }
  },
  components: {
-    BookmarkFolderCard,
+    BookmarkFolderCard
  },
  computed: {
-    bookmarkFolders() {
+    bookmarkFolders () {
      return useBookmarkFoldersStore().allFolders
-    },
+    }
  },
  methods: {
-    cancelNewFolder() {
+    cancelNewFolder () {
      this.isNew = false
    },
-    newFolder() {
+    newFolder () {
      this.isNew = true
-    },
-  },
+    }
+  }
 }

 export default BookmarkFolders
--- a/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js
+++ b/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js
@ -1,20 +1,20 @@
 import { mapState } from 'pinia'
-
-import { getBookmarkFolderEntries } from 'src/components/navigation/filter.js'
 import NavigationEntry from 'src/components/navigation/navigation_entry.vue'
-
-import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
+import { getBookmarkFolderEntries } from 'src/components/navigation/filter.js'
+import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders'

 export const BookmarkFoldersMenuContent = {
-  props: ['showPin'],
+  props: [
+    'showPin'
+  ],
  components: {
-    NavigationEntry,
+    NavigationEntry
  },
  computed: {
    ...mapState(useBookmarkFoldersStore, {
-      folders: getBookmarkFolderEntries,
-    }),
-  },
+      folders: getBookmarkFolderEntries
+    })
+  }
 }

 export default BookmarkFoldersMenuContent
--- a/src/components/bookmark_timeline/bookmark_timeline.js
+++ b/src/components/bookmark_timeline/bookmark_timeline.js
@ -1,38 +1,32 @@
 import Timeline from '../timeline/timeline.vue'

 const Bookmarks = {
-  created() {
+  created () {
    this.$store.commit('clearTimeline', { timeline: 'bookmarks' })
-    this.$store.dispatch('startFetchingTimeline', {
-      timeline: 'bookmarks',
-      bookmarkFolderId: this.folderId || null,
-    })
+    this.$store.dispatch('startFetchingTimeline', { timeline: 'bookmarks', bookmarkFolderId: this.folderId || null })
  },
  components: {
-    Timeline,
+    Timeline
  },
  computed: {
-    folderId() {
+    folderId () {
      return this.$route.params.id
    },
-    timeline() {
+    timeline () {
      return this.$store.state.statuses.timelines.bookmarks
-    },
+    }
  },
  watch: {
-    folderId() {
+    folderId () {
      this.$store.commit('clearTimeline', { timeline: 'bookmarks' })
      this.$store.dispatch('stopFetchingTimeline', 'bookmarks')
-      this.$store.dispatch('startFetchingTimeline', {
-        timeline: 'bookmarks',
-        bookmarkFolderId: this.folderId || null,
-      })
-    },
+      this.$store.dispatch('startFetchingTimeline', { timeline: 'bookmarks', bookmarkFolderId: this.folderId || null })
+    }
  },
-  unmounted() {
+  unmounted () {
    this.$store.commit('clearTimeline', { timeline: 'bookmarks' })
    this.$store.dispatch('stopFetchingTimeline', 'bookmarks')
-  },
+  }
 }

 export default Bookmarks
--- a/src/components/border.style.js
+++ b/src/components/border.style.js
@ -6,8 +6,8 @@ export default {
    {
      directives: {
        textColor: '$mod(--parent 10)',
-        textAuto: 'no-auto',
-      },
-    },
-  ],
+        textAuto: 'no-auto'
+      }
+    }
+  ]
 }
--- a/src/components/bubble_timeline/bubble_timeline.js
+++ b/src/components/bubble_timeline/bubble_timeline.js
@ -1,20 +1,18 @@
 import Timeline from '../timeline/timeline.vue'
-
 const BubbleTimeline = {
  components: {
-    Timeline,
+    Timeline
  },
  computed: {
-    timeline() {
-      return this.$store.state.statuses.timelines.bubble
-    },
+    timeline () { return this.$store.state.statuses.timelines.bubble }
  },
-  created() {
+  created () {
    this.$store.dispatch('startFetchingTimeline', { timeline: 'bubble' })
  },
-  unmounted() {
+  unmounted () {
    this.$store.dispatch('stopFetchingTimeline', 'bubble')
-  },
+  }
+
 }

 export default BubbleTimeline
--- a/src/components/button.style.js
+++ b/src/components/button.style.js
@ -10,24 +10,26 @@ export default {
    // normal: '' // normal state is implicitly added, it is always included
    toggled: '.toggled',
    focused: ':focus-within',
-    pressed: ':active',
+    pressed: ':focus:active',
    hover: ':is(:hover, :focus-visible):not(:disabled)',
-    disabled: ':disabled',
+    disabled: ':disabled'
  },
  // Variants are mutually exclusive, each component implicitly has "normal" variant, and all other variants inherit from it.
  variants: {
    // Variants save on computation time since adding new variant just adds one more "set".
    // normal: '', // you can override normal variant, it will be appenended to the main class
-    danger: '.-danger',
-    transparent: '.-transparent',
+    danger: '.danger'
    // Overall the compuation difficulty is N*((1/6)M^3+M) where M is number of distinct states and N is number of variants.
    // This (currently) is further multipled by number of places where component can exist.
  },
  editor: {
-    aspect: '2 / 1',
+    aspect: '2 / 1'
  },
  // This lists all other components that can possibly exist within one. Recursion is currently not supported (and probably won't be supported ever).
-  validInnerComponents: ['Text', 'Icon'],
+  validInnerComponents: [
+    'Text',
+    'Icon'
+  ],
  // Default rules, used as "default theme", essentially.
  defaultRules: [
    {
@ -36,11 +38,9 @@ export default {
        '--buttonDefaultHoverGlow': 'shadow | 0 0 1 2 --text / 0.4',
        '--buttonDefaultFocusGlow': 'shadow | 0 0 1 2 --link / 0.5',
        '--buttonDefaultShadow': 'shadow | 0 0 2 #000000',
-        '--buttonDefaultBevel':
-          'shadow | $borderSide(#FFFFFF top 0.2 1), $borderSide(#000000 bottom 0.2 1)',
-        '--buttonPressedBevel':
-          'shadow | inset 0 0 4 #000000, $borderSide(#FFFFFF bottom 0.2 1), $borderSide(#000000 top 0.2 1)',
-      },
+        '--buttonDefaultBevel': 'shadow | $borderSide(#FFFFFF top 0.2 1), $borderSide(#000000 bottom 0.2 1)',
+        '--buttonPressedBevel': 'shadow | inset 0 0 4 #000000, $borderSide(#FFFFFF bottom 0.2 1), $borderSide(#000000 top 0.2 1)'
+      }
    },
    {
      // component: 'Button', // no need to specify components every time unless you're specifying how other component should look
@ -48,128 +48,89 @@ export default {
      directives: {
        background: '--fg',
        shadow: ['--buttonDefaultShadow', '--buttonDefaultBevel'],
-        roundness: 3,
-      },
-    },
-    {
-      variant: 'danger',
-      directives: {
-        background: '--cRed',
-      },
-    },
-    {
-      variant: 'transparent',
-      directives: {
-        opacity: 0.5,
-      },
-    },
-    {
-      component: 'Text',
-      parent: {
-        component: 'Button',
-        variant: 'transparent',
-      },
-      directives: {
-        textColor: '--text',
-      },
-    },
-    {
-      component: 'Icon',
-      parent: {
-        component: 'Button',
-        variant: 'transparent',
-      },
-      directives: {
-        textColor: '--text',
-      },
+        roundness: 3
+      }
    },
    {
      state: ['hover'],
      directives: {
-        shadow: ['--buttonDefaultHoverGlow', '--buttonDefaultBevel'],
-      },
+        shadow: ['--buttonDefaultHoverGlow', '--buttonDefaultBevel']
+      }
    },
    {
      state: ['focused'],
      directives: {
-        shadow: ['--buttonDefaultFocusGlow', '--buttonDefaultBevel'],
-      },
+        shadow: ['--buttonDefaultFocusGlow', '--buttonDefaultBevel']
+      }
    },
    {
      state: ['pressed'],
      directives: {
-        shadow: ['--buttonDefaultShadow', '--buttonPressedBevel'],
-      },
+        shadow: ['--buttonDefaultShadow', '--buttonPressedBevel']
+      }
    },
    {
      state: ['pressed', 'hover'],
      directives: {
-        shadow: ['--buttonPressedBevel', '--buttonDefaultHoverGlow'],
-      },
+        shadow: ['--buttonPressedBevel', '--buttonDefaultHoverGlow']
+      }
    },
    {
      state: ['toggled'],
      directives: {
        background: '--accent,-24.2',
-        shadow: ['--buttonDefaultShadow', '--buttonPressedBevel'],
-      },
+        shadow: ['--buttonDefaultShadow', '--buttonPressedBevel']
+      }
    },
    {
      state: ['toggled', 'hover'],
      directives: {
        background: '--accent,-24.2',
-        shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel'],
-      },
+        shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel']
+      }
    },
    {
      state: ['toggled', 'focused'],
      directives: {
        background: '--accent,-24.2',
-        shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel'],
-      },
-    },
-    {
-      state: ['toggled', 'hover', 'focused'],
-      directives: {
-        background: '--accent,-24.2',
-        shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel'],
-      },
+        shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel']
+      }
    },
    {
      state: ['toggled', 'disabled'],
      directives: {
        background: '$blend(--accent 0.25 --parent)',
-        shadow: ['--buttonPressedBevel'],
-      },
+        shadow: ['--buttonPressedBevel']
+      }
    },
    {
      state: ['disabled'],
      directives: {
        background: '$blend(--inheritedBackground 0.25 --parent)',
-        shadow: ['--buttonDefaultBevel'],
-      },
+        shadow: ['--buttonDefaultBevel']
+      }
    },
    {
      component: 'Text',
      parent: {
        component: 'Button',
-        state: ['disabled'],
+        state: ['disabled']
      },
      directives: {
        textOpacity: 0.25,
-        textOpacityMode: 'blend',
-      },
+        textOpacityMode: 'blend'
+      }
    },
    {
      component: 'Icon',
      parent: {
        component: 'Button',
-        state: ['disabled'],
+        state: ['disabled']
      },
      directives: {
        textOpacity: 0.25,
-        textOpacityMode: 'blend',
-      },
-    },
-  ],
+        textOpacityMode: 'blend'
+      }
+    }
+  ]
 }
--- a/src/components/button_unstyled.style.js
+++ b/src/components/button_unstyled.style.js
@ -7,86 +7,91 @@ export default {
    toggled: '.toggled',
    disabled: ':disabled',
    hover: ':is(:hover, :focus-visible):not(:disabled)',
-    focused: ':focus-within:not(:is(:focus-visible))',
+    focused: ':focus-within:not(:is(:focus-visible))'
  },
-  validInnerComponents: ['Text', 'Link', 'Icon', 'Badge'],
+  validInnerComponents: [
+    'Text',
+    'Link',
+    'Icon',
+    'Badge'
+  ],
  defaultRules: [
    {
      directives: {
-        shadow: [],
-      },
+        shadow: []
+      }
    },
    {
      component: 'Icon',
      parent: {
        component: 'ButtonUnstyled',
-        state: ['hover'],
+        state: ['hover']
      },
      directives: {
-        textColor: '--parent--text',
-      },
+        textColor: '--parent--text'
+      }
    },
    {
      component: 'Icon',
      parent: {
        component: 'ButtonUnstyled',
-        state: ['toggled'],
+        state: ['toggled']
      },
      directives: {
-        textColor: '--parent--text',
-      },
+        textColor: '--parent--text'
+      }
    },
    {
      component: 'Icon',
      parent: {
        component: 'ButtonUnstyled',
-        state: ['toggled', 'hover'],
+        state: ['toggled', 'hover']
      },
      directives: {
-        textColor: '--parent--text',
-      },
+        textColor: '--parent--text'
+      }
    },
    {
      component: 'Icon',
      parent: {
        component: 'ButtonUnstyled',
-        state: ['toggled', 'focused'],
+        state: ['toggled', 'focused']
      },
      directives: {
-        textColor: '--parent--text',
-      },
+        textColor: '--parent--text'
+      }
    },
    {
      component: 'Icon',
      parent: {
        component: 'ButtonUnstyled',
-        state: ['toggled', 'focused', 'hover'],
+        state: ['toggled', 'focused', 'hover']
      },
      directives: {
-        textColor: '--parent--text',
-      },
+        textColor: '--parent--text'
+      }
    },
    {
      component: 'Text',
      parent: {
        component: 'ButtonUnstyled',
-        state: ['disabled'],
+        state: ['disabled']
      },
      directives: {
        textOpacity: 0.25,
-        textOpacityMode: 'blend',
-      },
+        textOpacityMode: 'blend'
+      }
    },
    {
      component: 'Icon',
      parent: {
        component: 'ButtonUnstyled',
-        state: ['disabled'],
+        state: ['disabled']
      },
      directives: {
        textOpacity: 0.25,
-        textOpacityMode: 'blend',
-      },
-    },
-  ],
+        textOpacityMode: 'blend'
+      }
+    }
+  ]
 }
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@ -1,27 +1,25 @@
 import _ from 'lodash'
-import { mapState as mapPiniaState } from 'pinia'
-import { mapGetters, mapState } from 'vuex'
-
 import { WSConnectionStatus } from '../../services/api/api.service.js'
-import chatService from '../../services/chat_service/chat_service.js'
-import { buildFakeMessage } from '../../services/chat_utils/chat_utils.js'
-import { promiseInterval } from '../../services/promise_interval/promise_interval.js'
+import { mapGetters, mapState } from 'vuex'
+import { mapState as mapPiniaState } from 'pinia'
 import ChatMessage from '../chat_message/chat_message.vue'
-import ChatTitle from '../chat_title/chat_title.vue'
 import PostStatusForm from '../post_status_form/post_status_form.vue'
+import ChatTitle from '../chat_title/chat_title.vue'
+import chatService from '../../services/chat_service/chat_service.js'
+import { promiseInterval } from '../../services/promise_interval/promise_interval.js'
+import { getScrollPosition, getNewTopPosition, isBottomedOut, isScrollable } from './chat_layout_utils.js'
+import { library } from '@fortawesome/fontawesome-svg-core'
 import {
-  getNewTopPosition,
-  getScrollPosition,
-  isBottomedOut,
-  isScrollable,
-} from './chat_layout_utils.js'
-
+  faChevronDown,
+  faChevronLeft
+} from '@fortawesome/free-solid-svg-icons'
+import { buildFakeMessage } from '../../services/chat_utils/chat_utils.js'
 import { useInterfaceStore } from 'src/stores/interface.js'

-import { library } from '@fortawesome/fontawesome-svg-core'
-import { faChevronDown, faChevronLeft } from '@fortawesome/free-solid-svg-icons'
-
-library.add(faChevronDown, faChevronLeft)
+library.add(
+  faChevronDown,
+  faChevronLeft
+)

 const BOTTOMED_OUT_OFFSET = 10
 const JUMP_TO_BOTTOM_BUTTON_VISIBILITY_OFFSET = 10
@ -33,95 +31,78 @@ const Chat = {
  components: {
    ChatMessage,
    ChatTitle,
-    PostStatusForm,
+    PostStatusForm
  },
-  data() {
+  data () {
    return {
      jumpToBottomButtonVisible: false,
      hoveredMessageChainId: undefined,
      lastScrollPosition: {},
      scrollableContainerHeight: '100%',
      errorLoadingChat: false,
-      messageRetriers: {},
+      messageRetriers: {}
    }
  },
-  created() {
+  created () {
    this.startFetching()
    window.addEventListener('resize', this.handleResize)
  },
-  mounted() {
+  mounted () {
    window.addEventListener('scroll', this.handleScroll)
    if (typeof document.hidden !== 'undefined') {
-      document.addEventListener(
-        'visibilitychange',
-        this.handleVisibilityChange,
-        false,
-      )
+      document.addEventListener('visibilitychange', this.handleVisibilityChange, false)
    }

    this.$nextTick(() => {
      this.handleResize()
    })
  },
-  unmounted() {
+  unmounted () {
    window.removeEventListener('scroll', this.handleScroll)
    window.removeEventListener('resize', this.handleResize)
-    if (typeof document.hidden !== 'undefined')
-      document.removeEventListener(
-        'visibilitychange',
-        this.handleVisibilityChange,
-        false,
-      )
+    if (typeof document.hidden !== 'undefined') document.removeEventListener('visibilitychange', this.handleVisibilityChange, false)
    this.$store.dispatch('clearCurrentChat')
  },
  computed: {
-    recipient() {
+    recipient () {
      return this.currentChat && this.currentChat.account
    },
-    recipientId() {
+    recipientId () {
      return this.$route.params.recipient_id
    },
-    formPlaceholder() {
+    formPlaceholder () {
      if (this.recipient) {
-        return this.$t('chats.message_user', {
-          nickname: this.recipient.screen_name_ui,
-        })
+        return this.$t('chats.message_user', { nickname: this.recipient.screen_name_ui })
      } else {
        return ''
      }
    },
-    chatViewItems() {
+    chatViewItems () {
      return chatService.getView(this.currentChatMessageService)
    },
-    newMessageCount() {
-      return (
-        this.currentChatMessageService &&
-        this.currentChatMessageService.newMessageCount
-      )
+    newMessageCount () {
+      return this.currentChatMessageService && this.currentChatMessageService.newMessageCount
    },
-    streamingEnabled() {
-      return (
-        this.mergedConfig.useStreamingApi &&
-        this.mastoUserSocketStatus === WSConnectionStatus.JOINED
-      )
+    streamingEnabled () {
+      return this.mergedConfig.useStreamingApi && this.mastoUserSocketStatus === WSConnectionStatus.JOINED
    },
    ...mapGetters([
      'currentChat',
      'currentChatMessageService',
      'findOpenedChatByRecipientId',
-      'mergedConfig',
+      'mergedConfig'
    ]),
    ...mapPiniaState(useInterfaceStore, {
-      mobileLayout: (store) => store.layoutType === 'mobile',
+      mobileLayout: store => store.layoutType === 'mobile'
    }),
    ...mapState({
-      backendInteractor: (state) => state.api.backendInteractor,
-      mastoUserSocketStatus: (state) => state.api.mastoUserSocketStatus,
-      currentUser: (state) => state.users.currentUser,
-    }),
+      backendInteractor: state => state.api.backendInteractor,
+      mastoUserSocketStatus: state => state.api.mastoUserSocketStatus,
+      currentUser: state => state.users.currentUser
+    })
  },
  watch: {
-    chatViewItems() {
+    chatViewItems () {
      // We don't want to scroll to the bottom on a new message when the user is viewing older messages.
      // Therefore we need to know whether the scroll position was at the bottom before the DOM update.
      const bottomedOutBeforeUpdate = this.bottomedOut(BOTTOMED_OUT_OFFSET)
@ -134,23 +115,23 @@ const Chat = {
    $route: function () {
      this.startFetching()
    },
-    mastoUserSocketStatus(newValue) {
+    mastoUserSocketStatus (newValue) {
      if (newValue === WSConnectionStatus.JOINED) {
        this.fetchChat({ isFirstFetch: true })
      }
-    },
+    }
  },
  methods: {
    // Used to animate the avatar near the first message of the message chain when any message belonging to the chain is hovered
-    onMessageHover({ isHovered, messageChainId }) {
+    onMessageHover ({ isHovered, messageChainId }) {
      this.hoveredMessageChainId = isHovered ? messageChainId : undefined
    },
-    onFilesDropped() {
+    onFilesDropped () {
      this.$nextTick(() => {
        this.handleResize()
      })
    },
-    handleVisibilityChange() {
+    handleVisibilityChange () {
      this.$nextTick(() => {
        if (!document.hidden && this.bottomedOut(BOTTOMED_OUT_OFFSET)) {
          this.scrollDown({ forceRead: true })
@ -158,7 +139,7 @@ const Chat = {
      })
    },
    // "Sticks" scroll to bottom instead of top, helps with OSK resizing the viewport
-    handleResize(opts = {}) {
+    handleResize (opts = {}) {
      const { delayed = false } = opts

      if (delayed) {
@ -179,56 +160,40 @@ const Chat = {
        this.lastScrollPosition = getScrollPosition()
      })
    },
-    scrollDown(options = {}) {
+    scrollDown (options = {}) {
      const { behavior = 'auto', forceRead = false } = options
      this.$nextTick(() => {
-        window.scrollTo({
-          top: document.documentElement.scrollHeight,
-          behavior,
-        })
+        window.scrollTo({ top: document.documentElement.scrollHeight, behavior })
      })
      if (forceRead) {
        this.readChat()
      }
    },
-    readChat() {
-      if (
-        !(
-          this.currentChatMessageService && this.currentChatMessageService.maxId
-        )
-      ) {
-        return
-      }
-      if (document.hidden) {
-        return
-      }
+    readChat () {
+      if (!(this.currentChatMessageService && this.currentChatMessageService.maxId)) { return }
+      if (document.hidden) { return }
      const lastReadId = this.currentChatMessageService.maxId
      this.$store.dispatch('readChat', {
        id: this.currentChat.id,
-        lastReadId,
+        lastReadId
      })
    },
-    bottomedOut(offset) {
+    bottomedOut (offset) {
      return isBottomedOut(offset)
    },
-    reachedTop() {
+    reachedTop () {
      return window.scrollY <= 0
    },
-    cullOlderCheck() {
+    cullOlderCheck () {
      window.setTimeout(() => {
        if (this.bottomedOut(JUMP_TO_BOTTOM_BUTTON_VISIBILITY_OFFSET)) {
-          this.$store.dispatch(
-            'cullOlderMessages',
-            this.currentChatMessageService.chatId,
-          )
+          this.$store.dispatch('cullOlderMessages', this.currentChatMessageService.chatId)
        }
      }, 5000)
    },
    handleScroll: _.throttle(function () {
      this.lastScrollPosition = getScrollPosition()
-      if (!this.currentChat) {
-        return
-      }
+      if (!this.currentChat) { return }

      if (this.reachedTop()) {
        this.fetchChat({ maxId: this.currentChatMessageService.minId })
@ -248,27 +213,22 @@ const Chat = {
        this.jumpToBottomButtonVisible = true
      }
    }, 200),
-    handleScrollUp(positionBeforeLoading) {
+    handleScrollUp (positionBeforeLoading) {
      const positionAfterLoading = getScrollPosition()
      window.scrollTo({
-        top: getNewTopPosition(positionBeforeLoading, positionAfterLoading),
+        top: getNewTopPosition(positionBeforeLoading, positionAfterLoading)
      })
    },
-    fetchChat({ isFirstFetch = false, fetchLatest = false, maxId }) {
+    fetchChat ({ isFirstFetch = false, fetchLatest = false, maxId }) {
      const chatMessageService = this.currentChatMessageService
-      if (!chatMessageService) {
-        return
-      }
-      if (fetchLatest && this.streamingEnabled) {
-        return
-      }
+      if (!chatMessageService) { return }
+      if (fetchLatest && this.streamingEnabled) { return }

      const chatId = chatMessageService.chatId
      const fetchOlderMessages = !!maxId
      const sinceId = fetchLatest && chatMessageService.maxId

-      return this.backendInteractor
-        .chatMessages({ id: chatId, maxId, sinceId })
+      return this.backendInteractor.chatMessages({ id: chatId, maxId, sinceId })
        .then((messages) => {
          // Clear the current chat in case we're recovering from a ws connection loss.
          if (isFirstFetch) {
@ -276,34 +236,28 @@ const Chat = {
          }

          const positionBeforeUpdate = getScrollPosition()
-          this.$store
-            .dispatch('addChatMessages', { chatId, messages })
-            .then(() => {
-              this.$nextTick(() => {
-                if (fetchOlderMessages) {
-                  this.handleScrollUp(positionBeforeUpdate)
-                }
+          this.$store.dispatch('addChatMessages', { chatId, messages }).then(() => {
+            this.$nextTick(() => {
+              if (fetchOlderMessages) {
+                this.handleScrollUp(positionBeforeUpdate)
+              }

-                // In vertical screens, the first batch of fetched messages may not always take the
-                // full height of the scrollable container.
-                // If this is the case, we want to fetch the messages until the scrollable container
-                // is fully populated so that the user has the ability to scroll up and load the history.
-                if (!isScrollable() && messages.length > 0) {
-                  this.fetchChat({
-                    maxId: this.currentChatMessageService.minId,
-                  })
-                }
-              })
+              // In vertical screens, the first batch of fetched messages may not always take the
+              // full height of the scrollable container.
+              // If this is the case, we want to fetch the messages until the scrollable container
+              // is fully populated so that the user has the ability to scroll up and load the history.
+              if (!isScrollable() && messages.length > 0) {
+                this.fetchChat({ maxId: this.currentChatMessageService.minId })
+              }
            })
+          })
        })
    },
-    async startFetching() {
+    async startFetching () {
      let chat = this.findOpenedChatByRecipientId(this.recipientId)
      if (!chat) {
        try {
-          chat = await this.backendInteractor.getOrCreateChat({
-            accountId: this.recipientId,
-          })
+          chat = await this.backendInteractor.getOrCreateChat({ accountId: this.recipientId })
        } catch (e) {
          console.error('Error creating or getting a chat', e)
          this.errorLoadingChat = true
@ -317,14 +271,13 @@ const Chat = {
        this.doStartFetching()
      }
    },
-    doStartFetching() {
+    doStartFetching () {
      this.$store.dispatch('startFetchingCurrentChat', {
-        fetcher: () =>
-          promiseInterval(() => this.fetchChat({ fetchLatest: true }), 5000),
+        fetcher: () => promiseInterval(() => this.fetchChat({ fetchLatest: true }), 5000)
      })
      this.fetchChat({ isFirstFetch: true })
    },
-    handleAttachmentPosting() {
+    handleAttachmentPosting () {
      this.$nextTick(() => {
        this.handleResize()
        // When the posting form size changes because of a media attachment, we need an extra resize
@ -332,11 +285,11 @@ const Chat = {
        this.scrollDown({ forceRead: true })
      })
    },
-    sendMessage({ status, media, idempotencyKey }) {
+    sendMessage ({ status, media, idempotencyKey }) {
      const params = {
        id: this.currentChat.id,
        content: status,
-        idempotencyKey,
+        idempotencyKey
      }

      if (media[0]) {
@ -348,72 +301,52 @@ const Chat = {
        chatId: this.currentChat.id,
        content: status,
        userId: this.currentUser.id,
-        idempotencyKey,
+        idempotencyKey
      })

-      this.$store
-        .dispatch('addChatMessages', {
-          chatId: this.currentChat.id,
-          messages: [fakeMessage],
-        })
-        .then(() => {
-          this.handleAttachmentPosting()
-        })
-
-      return this.doSendMessage({
-        params,
-        fakeMessage,
-        retriesLeft: MAX_RETRIES,
+      this.$store.dispatch('addChatMessages', {
+        chatId: this.currentChat.id,
+        messages: [fakeMessage]
+      }).then(() => {
+        this.handleAttachmentPosting()
      })
+
+      return this.doSendMessage({ params, fakeMessage, retriesLeft: MAX_RETRIES })
    },
-    doSendMessage({ params, fakeMessage, retriesLeft = MAX_RETRIES }) {
+    doSendMessage ({ params, fakeMessage, retriesLeft = MAX_RETRIES }) {
      if (retriesLeft <= 0) return

-      this.backendInteractor
-        .sendChatMessage(params)
-        .then((data) => {
+      this.backendInteractor.sendChatMessage(params)
+        .then(data => {
          this.$store.dispatch('addChatMessages', {
            chatId: this.currentChat.id,
            updateMaxId: false,
-            messages: [{ ...data, fakeId: fakeMessage.id }],
+            messages: [{ ...data, fakeId: fakeMessage.id }]
          })

          return data
        })
-        .catch((error) => {
+        .catch(error => {
          console.error('Error sending message', error)
          this.$store.dispatch('handleMessageError', {
            chatId: this.currentChat.id,
            fakeId: fakeMessage.id,
-            isRetry: retriesLeft !== MAX_RETRIES,
+            isRetry: retriesLeft !== MAX_RETRIES
          })
-          if (
-            (error.statusCode >= 500 && error.statusCode < 600) ||
-            error.message === 'Failed to fetch'
-          ) {
-            this.messageRetriers[fakeMessage.id] = setTimeout(
-              () => {
-                this.doSendMessage({
-                  params,
-                  fakeMessage,
-                  retriesLeft: retriesLeft - 1,
-                })
-              },
-              1000 * 2 ** (MAX_RETRIES - retriesLeft),
-            )
+          if ((error.statusCode >= 500 && error.statusCode < 600) || error.message === 'Failed to fetch') {
+            this.messageRetriers[fakeMessage.id] = setTimeout(() => {
+              this.doSendMessage({ params, fakeMessage, retriesLeft: retriesLeft - 1 })
+            }, 1000 * (2 ** (MAX_RETRIES - retriesLeft)))
          }
          return {}
        })

      return Promise.resolve(fakeMessage)
    },
-    goBack() {
-      this.$router.push({
-        name: 'chats',
-        params: { username: this.currentUser.screen_name },
-      })
-    },
-  },
+    goBack () {
+      this.$router.push({ name: 'chats', params: { username: this.currentUser.screen_name } })
+    }
+  }
 }

 export default Chat
--- a/src/components/chat/chat.style.js
+++ b/src/components/chat/chat.style.js
@ -1,13 +1,19 @@
 export default {
  name: 'Chat',
  selector: '.chat-message-list',
-  validInnerComponents: ['Text', 'Link', 'Icon', 'Avatar', 'ChatMessage'],
+  validInnerComponents: [
+    'Text',
+    'Link',
+    'Icon',
+    'Avatar',
+    'ChatMessage'
+  ],
  defaultRules: [
    {
      directives: {
        background: '--bg',
-        blur: '5px',
-      },
-    },
-  ],
+        blur: '5px'
+      }
+    }
+  ]
 }
--- a/src/components/chat/chat_layout_utils.js
+++ b/src/components/chat/chat_layout_utils.js
@ -3,17 +3,14 @@ export const getScrollPosition = () => {
  return {
    scrollTop: window.scrollY,
    scrollHeight: document.documentElement.scrollHeight,
-    offsetHeight: window.innerHeight,
+    offsetHeight: window.innerHeight
  }
 }

 // A helper function that is used to keep the scroll position fixed as the new elements are added to the top
 // Takes two scroll positions, before and after the update.
 export const getNewTopPosition = (previousPosition, newPosition) => {
-  return (
-    previousPosition.scrollTop +
-    (newPosition.scrollHeight - previousPosition.scrollHeight)
-  )
+  return previousPosition.scrollTop + (newPosition.scrollHeight - previousPosition.scrollHeight)
 }

 export const isBottomedOut = (offset = 0) => {
--- a/src/components/chat_list/chat_list.js
+++ b/src/components/chat_list/chat_list.js
@ -1,5 +1,4 @@
-import { mapGetters, mapState } from 'vuex'
-
+import { mapState, mapGetters } from 'vuex'
 import ChatListItem from '../chat_list_item/chat_list_item.vue'
 import ChatNew from '../chat_new/chat_new.vue'
 import List from '../list/list.vue'
@ -8,31 +7,31 @@ const ChatList = {
  components: {
    ChatListItem,
    List,
-    ChatNew,
+    ChatNew
  },
  computed: {
    ...mapState({
-      currentUser: (state) => state.users.currentUser,
+      currentUser: state => state.users.currentUser
    }),
-    ...mapGetters(['sortedChatList']),
+    ...mapGetters(['sortedChatList'])
  },
-  data() {
+  data () {
    return {
-      isNew: false,
+      isNew: false
    }
  },
-  created() {
+  created () {
    this.$store.dispatch('fetchChats', { latest: true })
  },
  methods: {
-    cancelNewChat() {
+    cancelNewChat () {
      this.isNew = false
      this.$store.dispatch('fetchChats', { latest: true })
    },
-    newChat() {
+    newChat () {
      this.isNew = true
-    },
-  },
+    }
+  }
 }

 export default ChatList
--- a/src/components/chat_list_item/chat_list_item.js
+++ b/src/components/chat_list_item/chat_list_item.js
@ -1,31 +1,31 @@
 import { mapState } from 'vuex'
-
-import AvatarList from '../avatar_list/avatar_list.vue'
-import ChatTitle from '../chat_title/chat_title.vue'
 import StatusBody from '../status_content/status_content.vue'
-import Timeago from '../timeago/timeago.vue'
+import fileType from 'src/services/file_type/file_type.service'
 import UserAvatar from '../user_avatar/user_avatar.vue'
+import AvatarList from '../avatar_list/avatar_list.vue'
+import Timeago from '../timeago/timeago.vue'
+import ChatTitle from '../chat_title/chat_title.vue'

 const ChatListItem = {
  name: 'ChatListItem',
-  props: ['chat'],
+  props: [
+    'chat'
+  ],
  components: {
    UserAvatar,
    AvatarList,
    Timeago,
    ChatTitle,
-    StatusBody,
+    StatusBody
  },
  computed: {
    ...mapState({
-      currentUser: (state) => state.users.currentUser,
+      currentUser: state => state.users.currentUser
    }),
-    attachmentInfo() {
-      if (this.chat.lastMessage.attachments.length === 0) {
-        return
-      }
+    attachmentInfo () {
+      if (this.chat.lastMessage.attachments.length === 0) { return }

-      const types = this.chat.lastMessage.attachments.map((file) => file.type)
+      const types = this.chat.lastMessage.attachments.map(file => fileType.fileType(file.mimetype))
      if (types.includes('video')) {
        return this.$t('file_type.video')
      } else if (types.includes('audio')) {
@ -36,36 +36,34 @@ const ChatListItem = {
        return this.$t('file_type.file')
      }
    },
-    messageForStatusContent() {
+    messageForStatusContent () {
      const message = this.chat.lastMessage
      const messageEmojis = message ? message.emojis : []
      const isYou = message && message.account_id === this.currentUser.id
-      const content = message ? this.attachmentInfo || message.content : ''
-      const messagePreview = isYou
-        ? `<i>${this.$t('chats.you')}</i> ${content}`
-        : content
+      const content = message ? (this.attachmentInfo || message.content) : ''
+      const messagePreview = isYou ? `<i>${this.$t('chats.you')}</i> ${content}` : content
      return {
        summary: '',
        emojis: messageEmojis,
        raw_html: messagePreview,
        text: messagePreview,
-        attachments: [],
+        attachments: []
      }
-    },
+    }
  },
  methods: {
-    openChat() {
+    openChat () {
      if (this.chat.id) {
        this.$router.push({
          name: 'chat',
          params: {
            username: this.currentUser.screen_name,
-            recipient_id: this.chat.account.id,
-          },
+            recipient_id: this.chat.account.id
+          }
        })
      }
-    },
-  },
+    }
+  }
 }

 export default ChatListItem
--- a/src/components/chat_message/chat_message.js
+++ b/src/components/chat_message/chat_message.js
@ -1,23 +1,24 @@
+import { mapState, mapGetters } from 'vuex'
 import { mapState as mapPiniaState } from 'pinia'
-import { defineAsyncComponent } from 'vue'
-import { mapGetters, mapState } from 'vuex'
-
+import Popover from '../popover/popover.vue'
 import Attachment from '../attachment/attachment.vue'
-import ChatMessageDate from '../chat_message_date/chat_message_date.vue'
+import UserAvatar from '../user_avatar/user_avatar.vue'
 import Gallery from '../gallery/gallery.vue'
 import LinkPreview from '../link-preview/link-preview.vue'
-import Popover from '../popover/popover.vue'
 import StatusContent from '../status_content/status_content.vue'
-import UserAvatar from '../user_avatar/user_avatar.vue'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface'
-import { useMergedConfigStore } from 'src/stores/merged_config.js'
-
+import ChatMessageDate from '../chat_message_date/chat_message_date.vue'
+import { defineAsyncComponent } from 'vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { faEllipsisH, faTimes } from '@fortawesome/free-solid-svg-icons'
+import {
+  faTimes,
+  faEllipsisH
+} from '@fortawesome/free-solid-svg-icons'
+import { useInterfaceStore } from 'src/stores/interface'

-library.add(faTimes, faEllipsisH)
+library.add(
+  faTimes,
+  faEllipsisH
+)

 const ChatMessage = {
  name: 'ChatMessage',
@ -26,7 +27,7 @@ const ChatMessage = {
    'edited',
    'noHeading',
    'chatViewItem',
-    'hoveredMessageChain',
+    'hoveredMessageChain'
  ],
  emits: ['hover'],
  components: {
@ -37,82 +38,73 @@ const ChatMessage = {
    Gallery,
    LinkPreview,
    ChatMessageDate,
-    UserPopover: defineAsyncComponent(
-      () => import('../user_popover/user_popover.vue'),
-    ),
+    UserPopover: defineAsyncComponent(() => import('../user_popover/user_popover.vue'))
  },
  computed: {
    // Returns HH:MM (hours and minutes) in local time.
-    createdAt() {
+    createdAt () {
      const time = this.chatViewItem.data.created_at
-      return time.toLocaleTimeString('en', {
-        hour: '2-digit',
-        minute: '2-digit',
-        hour12: false,
-      })
+      return time.toLocaleTimeString('en', { hour: '2-digit', minute: '2-digit', hour12: false })
    },
-    isCurrentUser() {
+    isCurrentUser () {
      return this.message.account_id === this.currentUser.id
    },
-    message() {
+    message () {
      return this.chatViewItem.data
    },
-    isMessage() {
+    isMessage () {
      return this.chatViewItem.type === 'message'
    },
-    messageForStatusContent() {
+    messageForStatusContent () {
      return {
        summary: '',
        emojis: this.message.emojis,
        raw_html: this.message.content || '',
        text: this.message.content || '',
-        attachments: this.message.attachments,
+        attachments: this.message.attachments
      }
    },
-    hasAttachment() {
+    hasAttachment () {
      return this.message.attachments.length > 0
    },
    ...mapPiniaState(useInterfaceStore, {
-      betterShadow: (store) => store.browserSupport.cssFilter,
+      betterShadow: store => store.browserSupport.cssFilter
    }),
    ...mapState({
-      currentUser: (state) => state.users.currentUser,
-      restrictedNicknames: (state) => useInstanceStore().restrictedNicknames,
+      currentUser: state => state.users.currentUser,
+      restrictedNicknames: state => state.instance.restrictedNicknames
    }),
-    popoverMarginStyle() {
+    popoverMarginStyle () {
      if (this.isCurrentUser) {
        return {}
      } else {
        return { left: 50 }
      }
    },
-    ...mapPiniaState(useMergedConfigStore, ['mergedConfig', 'findUser']),
+    ...mapGetters(['mergedConfig', 'findUser'])
  },
-  data() {
+  data () {
    return {
      hovered: false,
-      menuOpened: false,
+      menuOpened: false
    }
  },
  methods: {
-    onHover(bool) {
-      this.$emit('hover', {
-        isHovered: bool,
-        messageChainId: this.chatViewItem.messageChainId,
-      })
+    onHover (bool) {
+      this.$emit('hover', { isHovered: bool, messageChainId: this.chatViewItem.messageChainId })
    },
-    async deleteMessage() {
+    async deleteMessage () {
      const confirmed = window.confirm(this.$t('chats.delete_confirm'))
      if (confirmed) {
        await this.$store.dispatch('deleteChatMessage', {
          messageId: this.chatViewItem.data.id,
-          chatId: this.chatViewItem.data.chat_id,
+          chatId: this.chatViewItem.data.chat_id
        })
      }
      this.hovered = false
      this.menuOpened = false
-    },
-  },
+    }
+  }
 }

 export default ChatMessage
--- a/src/components/chat_message/chat_message.style.js
+++ b/src/components/chat_message/chat_message.style.js
@ -2,21 +2,29 @@ export default {
  name: 'ChatMessage',
  selector: '.chat-message',
  variants: {
-    outgoing: '.outgoing',
+    outgoing: '.outgoing'
  },
-  validInnerComponents: ['Text', 'Icon', 'Border', 'PollGraph'],
+  validInnerComponents: [
+    'Text',
+    'Icon',
+    'Border',
+    'Button',
+    'RichContent',
+    'Attachment',
+    'PollGraph'
+  ],
  defaultRules: [
    {
      directives: {
        background: '--bg, 2',
-        backgroundNoCssColor: 'yes',
-      },
+        backgroundNoCssColor: 'yes'
+      }
    },
    {
      variant: 'outgoing',
      directives: {
-        background: '--bg, 5',
-      },
-    },
-  ],
+        background: '--bg, 5'
+      }
+    }
+  ]
 }
--- a/src/components/chat_message_date/chat_message_date.vue
+++ b/src/components/chat_message_date/chat_message_date.vue
@ -11,19 +11,16 @@ export default {
  name: 'Timeago',
  props: ['date'],
  computed: {
-    displayDate() {
+    displayDate () {
      const today = new Date()
      today.setHours(0, 0, 0, 0)

      if (this.date.getTime() === today.getTime()) {
        return this.$t('display_date.today')
      } else {
-        return this.date.toLocaleDateString(
-          localeService.internalToBrowserLocale(this.$i18n.locale),
-          { day: 'numeric', month: 'long' },
-        )
+        return this.date.toLocaleDateString(localeService.internalToBrowserLocale(this.$i18n.locale), { day: 'numeric', month: 'long' })
      }
-    },
-  },
+    }
+  }
 }
 </script>
--- a/src/components/chat_new/chat_new.js
+++ b/src/components/chat_new/chat_new.js
@ -1,35 +1,39 @@
-import { mapGetters, mapState } from 'vuex'
-
+import { mapState, mapGetters } from 'vuex'
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { faChevronLeft, faSearch } from '@fortawesome/free-solid-svg-icons'
+import {
+  faSearch,
+  faChevronLeft
+} from '@fortawesome/free-solid-svg-icons'

-library.add(faSearch, faChevronLeft)
+library.add(
+  faSearch,
+  faChevronLeft
+)

 const chatNew = {
  components: {
    BasicUserCard,
-    UserAvatar,
+    UserAvatar
  },
-  data() {
+  data () {
    return {
      suggestions: [],
      userIds: [],
      loading: false,
-      query: '',
+      query: ''
    }
  },
-  async created() {
+  async created () {
    const { chats } = await this.backendInteractor.chats()
-    chats.forEach((chat) => this.suggestions.push(chat.account))
+    chats.forEach(chat => this.suggestions.push(chat.account))
  },
  computed: {
-    users() {
-      return this.userIds.map((userId) => this.findUser(userId))
+    users () {
+      return this.userIds.map(userId => this.findUser(userId))
    },
-    availableUsers() {
+    availableUsers () {
      if (this.query.length !== 0) {
        return this.users
      } else {
@ -37,29 +41,29 @@ const chatNew = {
      }
    },
    ...mapState({
-      currentUser: (state) => state.users.currentUser,
-      backendInteractor: (state) => state.api.backendInteractor,
+      currentUser: state => state.users.currentUser,
+      backendInteractor: state => state.api.backendInteractor
    }),
-    ...mapGetters(['findUser']),
+    ...mapGetters(['findUser'])
  },
  methods: {
-    goBack() {
+    goBack () {
      this.$emit('cancel')
    },
-    goToChat(user) {
+    goToChat (user) {
      this.$router.push({ name: 'chat', params: { recipient_id: user.id } })
    },
-    onInput() {
+    onInput () {
      this.search(this.query)
    },
-    addUser(user) {
+    addUser (user) {
      this.selectedUserIds.push(user.id)
      this.query = ''
    },
-    removeUser(userId) {
-      this.selectedUserIds = this.selectedUserIds.filter((id) => id !== userId)
+    removeUser (userId) {
+      this.selectedUserIds = this.selectedUserIds.filter(id => id !== userId)
    },
-    search(query) {
+    search (query) {
      if (!query) {
        this.loading = false
        return
@ -67,14 +71,13 @@ const chatNew = {

      this.loading = true
      this.userIds = []
-      this.$store
-        .dispatch('search', { q: query, resolve: true, type: 'accounts' })
-        .then((data) => {
+      this.$store.dispatch('search', { q: query, resolve: true, type: 'accounts' })
+        .then(data => {
          this.loading = false
-          this.userIds = data.accounts.map((a) => a.id)
+          this.userIds = data.accounts.map(a => a.id)
        })
-    },
-  },
+    }
+  }
 }

 export default chatNew
--- a/src/components/chat_title/chat_title.js
+++ b/src/components/chat_title/chat_title.js
@ -1,24 +1,23 @@
-import { defineAsyncComponent } from 'vue'
-
-import RichContent from 'src/components/rich_content/rich_content.jsx'
 import UserAvatar from '../user_avatar/user_avatar.vue'
+import RichContent from 'src/components/rich_content/rich_content.jsx'
+import { defineAsyncComponent } from 'vue'

 export default {
  name: 'ChatTitle',
  components: {
    UserAvatar,
    RichContent,
-    UserPopover: defineAsyncComponent(
-      () => import('../user_popover/user_popover.vue'),
-    ),
+    UserPopover: defineAsyncComponent(() => import('../user_popover/user_popover.vue'))
  },
-  props: ['user', 'withAvatar'],
+  props: [
+    'user', 'withAvatar'
+  ],
  computed: {
-    title() {
+    title () {
      return this.user ? this.user.screen_name_ui : ''
    },
-    htmlTitle() {
+    htmlTitle () {
      return this.user ? this.user.name_html : ''
-    },
-  },
+    }
+  }
 }
--- a/src/components/chat_title/chat_title.vue
+++ b/src/components/chat_title/chat_title.vue
@ -19,7 +19,6 @@
      :title="'@'+(user && user.screen_name_ui)"
      :html="htmlTitle"
      :emoji="user.emoji || []"
-      :is-local="user.is_local"
    />
  </div>
 </template>
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@ -1,7 +1,7 @@
 <template>
  <label
    class="checkbox"
-    :class="[{ ['-disabled']: disabled, indeterminate, 'indeterminate-fix': indeterminateTransitionFix }, radio ? '-radio' : '-checkbox']"
+    :class="[{ disabled, indeterminate, 'indeterminate-fix': indeterminateTransitionFix }, radio ? '-radio' : '-checkbox']"
  >
    <span
      v-if="!!$slots.before"
@ -36,25 +36,30 @@

 <script>
 export default {
-  props: ['radio', 'modelValue', 'indeterminate', 'disabled'],
+  props: [
+    'radio',
+    'modelValue',
+    'indeterminate',
+    'disabled'
+  ],
  emits: ['update:modelValue'],
  data: (vm) => ({
-    indeterminateTransitionFix: vm.indeterminate,
+    indeterminateTransitionFix: vm.indeterminate
  }),
  watch: {
-    indeterminate(e) {
+    indeterminate (e) {
      if (e) {
        this.indeterminateTransitionFix = true
      }
-    },
+    }
  },
  methods: {
-    onTransitionEnd() {
+    onTransitionEnd () {
      if (!this.indeterminate) {
        this.indeterminateTransitionFix = false
      }
-    },
-  },
+    }
+  }
 }
 </script>

@ -118,7 +123,7 @@ export default {

  .disabled {
    .checkbox-indicator::before {
-      background-color: transparent;
+      background-color: var(--background);
    }
  }

--- a/src/components/color_input/color_input.scss
+++ b/src/components/color_input/color_input.scss
@ -1,27 +1,18 @@
 .color-input {
  display: inline-flex;
-  flex-wrap: wrap;
-  max-width: 10em;
-
-  &.-compact {
-    max-width: none;
-  }

  .label {
    flex: 1 1 auto;
-    grid-area: label;
  }

  .opt {
-    grid-area: checkbox;
    margin-right: 0.5em;
  }

  &-field.input {
-    flex: 1 1 10em;
-    max-width: 10em;
-    grid-area: input;
-    display: flex;
+    display: inline-flex;
+    flex: 0 0 0;
+    max-width: 9em;
    align-items: stretch;

    input {
--- a/src/components/color_input/color_input.vue
+++ b/src/components/color_input/color_input.vue
@ -1,7 +1,7 @@
 <template>
  <div
    class="color-input style-control"
-    :class="{ disabled: !present || disabled, '-compact': compact }"
+    :class="{ disabled: !present || disabled }"
  >
    <label
      :for="name"
@ -19,7 +19,7 @@
    />
    <div
      class="input color-input-field"
-      :class="{ disabled: !present || disabled, unstyled }"
+      :class="{ disabled: !present || disabled }"
    >
      <input
        :id="name + '-t'"
@ -64,95 +64,86 @@
  </div>
 </template>
 <script>
+import Checkbox from '../checkbox/checkbox.vue'
+import { hex2rgb } from '../../services/color_convert/color_convert.js'
 import { throttle } from 'lodash'

-import { hex2rgb } from '../../services/color_convert/color_convert.js'
-import Checkbox from '../checkbox/checkbox.vue'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { faEyeDropper } from '@fortawesome/free-solid-svg-icons'
+import {
+  faEyeDropper
+} from '@fortawesome/free-solid-svg-icons'

-library.add(faEyeDropper)
+library.add(
+  faEyeDropper
+)

 export default {
  components: {
-    Checkbox,
+    Checkbox
  },
  props: {
    // Name of color, used for identifying
    name: {
      required: true,
-      type: String,
+      type: String
    },
    // Readable label
    label: {
-      required: false,
-      type: String,
-    },
-    // use unstyled, uh, style
-    unstyled: {
-      required: false,
-      type: Boolean,
+      required: true,
+      type: String
    },
    // Color value, should be required but vue cannot tell the difference
    // between "property missing" and "property set to undefined"
    modelValue: {
      required: false,
      type: String,
-      default: undefined,
+      default: undefined
    },
    // Color fallback to use when value is not defeind
    fallback: {
      required: false,
      type: String,
-      default: undefined,
+      default: undefined
    },
    // Disable the control
    disabled: {
      required: false,
      type: Boolean,
-      default: false,
+      default: false
    },
    // Show "optional" tickbox, for when value might become mandatory
    showOptionalCheckbox: {
      required: false,
      type: Boolean,
-      default: true,
+      default: true
    },
    // Force "optional" tickbox to hide
    hideOptionalCheckbox: {
      required: false,
      type: Boolean,
-      default: false,
-    },
-    compact: {
-      required: false,
-      type: Boolean,
-    },
+      default: false
+    }
  },
  emits: ['update:modelValue'],
  computed: {
-    present() {
+    present () {
      return typeof this.modelValue !== 'undefined'
    },
-    validColor() {
+    validColor () {
      return hex2rgb(this.modelValue || this.fallback)
    },
-    transparentColor() {
+    transparentColor () {
      return this.modelValue === 'transparent'
    },
-    computedColor() {
-      return (
-        this.modelValue &&
-        (this.modelValue.startsWith('--') || this.modelValue.startsWith('$'))
-      )
-    },
+    computedColor () {
+      return this.modelValue && (this.modelValue.startsWith('--') || this.modelValue.startsWith('$'))
+    }
  },
  methods: {
    updateValue: throttle(function (value) {
      this.$emit('update:modelValue', value)
-    }, 100),
-  },
+    }, 100)
+  }
 }
 </script>
 <style lang="scss" src="./color_input.scss"></style>
--- a/src/components/component_preview/component_preview.js
+++ b/src/components/component_preview/component_preview.js
@ -1,87 +0,0 @@
-import Checkbox from 'src/components/checkbox/checkbox.vue'
-import ColorInput from 'src/components/color_input/color_input.vue'
-
-import genRandomSeed from 'src/services/random_seed/random_seed.service.js'
-import {
-  adoptStyleSheets,
-  createStyleSheet,
-} from 'src/services/style_setter/style_setter.js'
-
-export default {
-  components: {
-    Checkbox,
-    ColorInput,
-  },
-  props: [
-    'shadow',
-    'shadowControl',
-    'previewClass',
-    'previewStyle',
-    'previewCss',
-    'disabled',
-    'invalid',
-    'noColorControl',
-  ],
-  emits: ['update:shadow'],
-  data() {
-    return {
-      colorOverride: undefined,
-      lightGrid: false,
-      zoom: 100,
-      randomSeed: genRandomSeed(),
-    }
-  },
-  mounted() {
-    this.update()
-  },
-  computed: {
-    hideControls() {
-      return typeof this.shadow === 'string'
-    },
-  },
-  watch: {
-    previewCss() {
-      this.update()
-    },
-    previewStyle() {
-      this.update()
-    },
-    zoom() {
-      this.update()
-    },
-  },
-  methods: {
-    updateProperty(axis, value) {
-      this.$emit('update:shadow', { axis, value: Number(value) })
-    },
-    update() {
-      const sheet = createStyleSheet('style-component-preview', 90)
-
-      sheet.clear()
-
-      const result = [this.previewCss]
-      if (this.colorOverride) result.push(`--background: ${this.colorOverride}`)
-
-      const styleRule = [
-        '#component-preview-',
-        this.randomSeed,
-        ' {\n',
-        '.preview-block {\n',
-        `zoom: ${this.zoom / 100};`,
-        this.previewStyle,
-        '\n}',
-        '\n}',
-      ].join('')
-
-      sheet.addRule(styleRule)
-      sheet.addRule(
-        ['#component-preview-', this.randomSeed, ' {\n', ...result, '\n}'].join(
-          '',
-        ),
-      )
-
-      sheet.ready = true
-      adoptStyleSheets()
-    },
-  },
-}
--- a/src/components/component_preview/component_preview.scss
+++ b/src/components/component_preview/component_preview.scss
@ -1,151 +0,0 @@
-.ComponentPreview {
-  display: grid;
-  grid-template-columns: 1em 1fr 1fr 1em;
-  grid-template-rows: 2em 1fr 1fr 1fr 1em 2em max-content;
-  grid-template-areas:
-    "header     header     header     header "
-    "preview    preview    preview    y-slide"
-    "preview    preview    preview    y-slide"
-    "preview    preview    preview    y-slide"
-    "x-slide    x-slide    x-slide    .      "
-    "x-num      x-num      y-num      y-num  "
-    "assists    assists    assists    assists";
-  grid-gap: 0.5em;
-
-  &:not(.-shadow-controls) {
-    grid-template-areas:
-      "header     header     header     header "
-      "preview    preview    preview    y-slide"
-      "preview    preview    preview    y-slide"
-      "preview    preview    preview    y-slide"
-      "assists    assists    assists    assists";
-    grid-template-rows: 2em 1fr 1fr 1fr max-content;
-  }
-
-  .header {
-    grid-area: header;
-    place-self: baseline center;
-    line-height: 2;
-  }
-
-  .invalid-container {
-    position: absolute;
-    inset: 0;
-    display: grid;
-    place-items: center center;
-    background-color: rgb(100 0 0 / 50%);
-
-    .alert {
-      padding: 0.5em 1em;
-    }
-  }
-
-  .assists {
-    grid-area: assists;
-    display: grid;
-    grid-auto-flow: row;
-    grid-auto-rows: 2em;
-    grid-gap: 0.5em;
-  }
-
-  .input-light-grid {
-    justify-self: center;
-  }
-
-  .input-number {
-    min-width: 2em;
-  }
-
-  .x-shift-number {
-    grid-area: x-num;
-    justify-self: right;
-  }
-
-  .y-shift-number {
-    grid-area: y-num;
-    justify-self: left;
-  }
-
-  .x-shift-number,
-  .y-shift-number {
-    input {
-      max-width: 4em;
-    }
-  }
-
-  .x-shift-slider {
-    grid-area: x-slide;
-    height: auto;
-    align-self: start;
-    min-width: 10em;
-  }
-
-  .y-shift-slider {
-    grid-area: y-slide;
-    writing-mode: vertical-lr;
-    justify-self: left;
-    min-height: 10em;
-  }
-
-  .x-shift-slider,
-  .y-shift-slider {
-    padding: 0;
-  }
-
-  .preview-window {
-    --__grid-color1: rgb(102 102 102);
-    --__grid-color2: rgb(153 153 153);
-    --__grid-color1-disabled: rgb(102 102 102 / 20%);
-    --__grid-color2-disabled: rgb(153 153 153 / 20%);
-
-    &.-light-grid {
-      --__grid-color1: rgb(205 205 205);
-      --__grid-color2: rgb(255 255 255);
-      --__grid-color1-disabled: rgb(205 205 205 / 20%);
-      --__grid-color2-disabled: rgb(255 255 255 / 20%);
-    }
-
-    position: relative;
-    grid-area: preview;
-    aspect-ratio: 1;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    min-width: 10em;
-    min-height: 10em;
-    background-color: var(--__grid-color2);
-    background-image:
-      linear-gradient(45deg, var(--__grid-color1) 25%, transparent 25%),
-      linear-gradient(-45deg, var(--__grid-color1) 25%, transparent 25%),
-      linear-gradient(45deg, transparent 75%, var(--__grid-color1) 75%),
-      linear-gradient(-45deg, transparent 75%, var(--__grid-color1) 75%);
-    background-size: 20px 20px;
-    background-position: 0 0, 0 10px, 10px -10px, -10px 0;
-    border-radius: var(--roundness);
-
-    &.disabled {
-      background-color: var(--__grid-color2-disabled);
-      background-image:
-        linear-gradient(45deg, var(--__grid-color1-disabled) 25%, transparent 25%),
-        linear-gradient(-45deg, var(--__grid-color1-disabled) 25%, transparent 25%),
-        linear-gradient(45deg, transparent 75%, var(--__grid-color1-disabled) 75%),
-        linear-gradient(-45deg, transparent 75%, var(--__grid-color1-disabled) 75%);
-    }
-
-    .preview-block {
-      background: var(--background, var(--bg));
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      min-width: 33%;
-      min-height: 33%;
-      max-width: 80%;
-      max-height: 80%;
-      border-width: 0;
-      border-style: solid;
-      border-color: var(--border);
-      border-radius: var(--roundness);
-      box-shadow: var(--shadow);
-    }
-  }
-}
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`Display counter for status action buttons when they are on the menu`
				`@ -0,0 +1 @@`
				`Added support for Akkoma and IceShrimp.NET backend`
				`@ -1 +0,0 @@`
				`Fix HTML attribute parsing for escaped quotes`
				`@ -0,0 +1 @@`
				`Fix bookmark button alignment in the extra actions menu`
				`@ -0,0 +1 @@`
				`Compatibility with stricter CSP (Akkoma backend)`
				`@ -1 +0,0 @@`
				`Fix emojis breaking user bio/description editing`
				`@ -0,0 +1 @@`
				`Synchronized mutes, advanced mute control (regexp, expiry, naming)`
				`@ -0,0 +1 @@`
				`Indicate currently active V3 theme as a body element class`