Merge remote-tracking branch 'origin/develop' into migrate/vuex-to-pinia

2025-01-30 18:08:05 +02:00 · 2025-01-30 18:08:05 +02:00 · 58e18d48df
commit 58e18d48df
parent 5515f53794 753f5fa65d
489 changed files with 31167 additions and 9871 deletions
--- a/.browserslistrc
+++ b/.browserslistrc
@ -0,0 +1,7 @@
+>0.2%
+not op_mini all
+Safari > 15
+Firefox >= 115
+Firefox ESR
+Android > 4
+not dead
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1 @@
+/build/webpack.prod.conf.js export-subst
--- a/.gitignore
+++ b/.gitignore
@ -8,3 +8,4 @@ selenium-debug.log
 .idea/
 config/local.json
 static/emoji.json
+logs/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,23 +1,51 @@
 # This file is a template, and might need editing before it works on your project.
 # Official framework image. Look for the different tagged releases at:
 # https://hub.docker.com/r/library/node/tags/
-image: node:16
+image: node:18

 stages:
+  - check-changelog
  - lint
  - build
  - test
  - deploy

+# https://git.pleroma.social/help/ci/yaml/workflow.md#switch-between-branch-pipelines-and-merge-request-pipelines
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
+      when: never
+    - if: $CI_COMMIT_BRANCH
+
+check-changelog:
+  stage: check-changelog
+  image: alpine
+  rules:
+    - if: $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH == 'pleroma/pleroma-fe' && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^renovate/
+      when: never
+    - if: $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH == 'pleroma/pleroma-fe' && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == 'weblate'
+      when: never
+    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"
+  before_script: ''
+  after_script: ''
+  cache: {}
+  script:
+    - apk add git
+    - sh ./tools/check-changelog
+
 lint:
  stage: lint
  script:
    - yarn
-    - npm run lint
-    - npm run stylelint
+    - yarn lint
+    - yarn stylelint

 test:
  stage: test
+  tags:
+    - amd64
+    - himem
  variables:
    APT_CACHE_DIR: apt-cache
  script:
@ -29,9 +57,12 @@ test:

 build:
  stage: build
+  tags:
+    - amd64
+    - himem
  script:
    - yarn
-    - npm run build
+    - yarn build
  artifacts:
    paths:
    - dist/
--- a/.node-version
+++ b/.node-version
@ -1 +1 @@
-16.18.1
+18.20.6
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,6 +3,105 @@ 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.7.1
+Bugfix release. Added small optimizations to emoji picker that should make it a bit more responsive, however it needs rather large change to make it more performant which might come in a major release.
+
+### Fixed
+- Instance default theme not respected
+- Nested panel header having wrong sticky position if navbar height != panel header height
+- Toggled buttons having bad contrast (when using v2 theme)
+
+### Changed
+- Simplify the OAuth client_name to 'PleromaFE'
+- Small optimizations to emoji picker
+
+
+## 2.7.0
+
+### Known issues
+We got some reports related to emoji picker performance, this hopefully will be fixed in 2.7.1.
+
+### Notes
+This release overhauls how themes work, themes now need to be "compiled", which can cause some delay when loading for the first time and temporarily look "wrong" in some places (popups, menus, dialogs). Please do report any issues, especially if your theme looks wrong or breaks interface when loading. Also report issues if you're experiencing constant performance issues.
+
+To admins: remember that you can update PleromaFE to recent `master` or `develop` in admin dashboard in "Front-ends" tab, scroll down to find PleromaFE box and click "Reinstall `master`" or dropdown and then "Reinstall `develop`". Currently there is no mechanism to check if there is an update or not.
+
+### Changed
+- Overhauled the way themes work, migrating to new Pleroma Interface Style Sheets system aka "Themes 3".
+- Notifications are no longer sorted by "seen" status since interacting with them can change their read status and makes UI jumpy. Old behavior can be restored in settings.
+- Notifications are now shown through a ServiceWorker (since mobile chrome does not allow them otherwise), it's always enabled, even if previously we only enabled it for WebPush notifications only. If you don't like websites "running" while closed, check how to disable them in your browser. Old way to show notifications will be used as a fallback but might not have all the new features.
+- Reorganized Settings modal to move out visual stuff into Appearance tab
+
+### Added
+- Emoji pack management to the admin panel
+- Support `status` notification type (subscriptions/bell, fixes PleromaFE on newer PleromaBE versions)
+- Poll end notifications.
+- Added option to not mark all notifications when closing notifications drawer on mobile, this creates a new button to mark all as seen.
+- Option to always "show" notifications when using web push for better compatibility with some browsers (chrome, edge, safari)
+- Option to toggle what notification types appear in native notifications, by default less important ones (likes, repeats, etc) will no longer show up in native notifications.
+- Option to treat non-interactive notifications (likes, repeats et all) as seen for visual purposes (no read mark, ignored in counters, still can show in native notifications)
+- Ability to resize UI (and certain components) scale independent of browser/text scale
+- Ability to override certain aspects of UI style independent of theme used (UI roundness, fonts, underlay)
+- Theme selector with visual previews of the theme
+- Display loading and error indicator for conversation page
+- Option to only show scrobbles that are recent enough
+- Interacting (opening reply box etc) or simply clicking on non-interactive notifications now marks them as read. Clicking on native notifications for non-interactive ones also marks them as seen.
+- Support group actors
+- Focusing into a tab clears all current desktop notifications
+- Ability to change size of emoji
+- Ability to view APNG (Animated PNG) attachments.
+- Support showing extra notifications in the notifications column
+- Create a link to the URL of the scrobble when it's present
+- Allow hiding custom emojis in picker.
+- Ability to mute sensitive posts (ported from eintei).
+- Native notifications now also have "badge" property that matches instance's favicon (visible in Android Chromium at least)
+- Display public favorites on user profiles
+- Display quotes count on posts and add quotes list page
+- Show a dedicated registration notice page when further action is required after registering
+
+### Fixed
+- Synchronized requested notification types with backend, hopefully should fix missing notifications for polls and follow requests
+- Error that appeared on mobile Chromium (and derivatives) when native notifications are allowed
+- Being unable to set notification visibility for reports and follow requests
+- Native notifications appearing as many times as there are open tabs. Clicking on notification will focus last focused tab.
+- The expiry date indication won't be shown if the poll never expires
+- Profile mentions causing a 422 error on newer PleromaBE versions.
+- Color inputs are less ugly now
+- Unread notifications should now properly catch up between sessions (eventually) in polling mode
+- Video posters on Safari
+
+
+## 2.6.1
+### Fixed
+- fix admin dashboard not having any feedback on frontend installation
+- Fix frontend admin tab crashing when no primary frontend is set
+- Add aria attributes to react and extra buttons
+
+## 2.6.0
+### Added
+- add the initial i18n translation file for Taiwanese (Hokkien), and modify some related files.
+- Implemented a very basic instance administration screen
+- Implement quoting
+
+### Fixed
+- Keep aspect ratio of custom emoji reaction in notification
+- Fix openSettingsModalTab so that it correctly opens Settings modal instead of Admin modal
+- Add alt text to emoji picker buttons
+- Use export-subst gitattribute to allow tarball builds
+- fix reports now showing reason/content
+- Fix HTML attribute parsing, discard attributes not strating with a letter
+- Make MentionsLine aware of line breaking by non-br elements
+- Fix a bug where mentioning a user twice will not fill the mention into the textarea
+- Fix parsing non-ascii tags
+- Fix OAuth2 token lingering after revocation
+- fix regex issue in HTML parser/renderer
+- don't display quoted status twice
+- fix typo in code that prevented cards from showing at all
+- Fix react button not working if reaction accounts are not loaded
+- Fix react button misalignment on safari ios
+- Fix pinned statuses gone when reloading user timeline
+- Fix scrolling emoji selector in modal in safari ios
+
 ## 2.5.1
 ### Fixed
 - Checkboxes in settings can now work with screenreaders
--- a/build/build.js
+++ b/build/build.js
@ -9,7 +9,7 @@ var ora = require('ora')
 var webpack = require('webpack')
 var webpackConfig = require('./webpack.prod.conf')

-console.log(
+console.info(
  '  Tip:\n' +
  '  Built files are meant to be served over an HTTP server.\n' +
  '  Opening index.html over file:// won\'t work.\n'
--- a/build/check-versions.js
+++ b/build/check-versions.js
@ -11,11 +11,6 @@ var versionRequirements = [
    name: 'node',
    currentVersion: semver.clean(process.version),
    versionRequirement: packageConfig.engines.node
-  },
-  {
-    name: 'npm',
-    currentVersion: exec('npm --version'),
-    versionRequirement: packageConfig.engines.npm
  }
 ]

@ -32,14 +27,12 @@ module.exports = function () {
  }

  if (warnings.length) {
-    console.log('')
-    console.log(chalk.yellow('To use this template, you must update following to modules:'))
-    console.log()
+    console.warn(chalk.yellow('\nTo use this template, you must update following to modules:\n'))
    for (var i = 0; i < warnings.length; i++) {
      var warning = warnings[i]
-      console.log('  ' + warning)
+      console.warn('  ' + warning)
    }
-    console.log()
+    console.warn()
    process.exit(1)
  }
 }
--- a/build/dev-server.js
+++ b/build/dev-server.js
@ -72,10 +72,10 @@ app.use(staticPath, express.static('./static'))

 module.exports = app.listen(port, function (err) {
  if (err) {
-    console.log(err)
+    console.error(err)
    return
  }
  var uri = 'http://localhost:' + port
-  console.log('Listening at ' + uri + '\n')
+  console.info('Listening at ' + uri + '\n')
  // opn(uri)
 })
--- a/build/webpack.dev.conf.js
+++ b/build/webpack.dev.conf.js
@ -23,7 +23,8 @@ module.exports = merge(baseWebpackConfig, {
      'COMMIT_HASH': JSON.stringify('DEV'),
      'DEV_OVERRIDES': JSON.stringify(config.dev.settings),
      '__VUE_OPTIONS_API__': true,
-      '__VUE_PROD_DEVTOOLS__': false
+      '__VUE_PROD_DEVTOOLS__': false,
+      '__VUE_PROD_HYDRATION_MISMATCH_DETAILS__': false
    }),
    // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
    new webpack.HotModuleReplacementPlugin(),
--- a/build/webpack.prod.conf.js
+++ b/build/webpack.prod.conf.js
@ -11,9 +11,16 @@ var env = process.env.NODE_ENV === 'testing'
    ? require('../config/test.env')
    : config.build.env

-let commitHash = require('child_process')
+let commitHash = (() => {
+  const subst = "$Format:%h$";
+  if(!subst.match(/Format:/)) {
+    return subst;
+  } else {
+    return require('child_process')
      .execSync('git rev-parse --short HEAD')
      .toString();
+  }
+})();

 var webpackConfig = merge(baseWebpackConfig, {
  mode: 'production',
@ -43,7 +50,8 @@ var webpackConfig = merge(baseWebpackConfig, {
      'COMMIT_HASH': JSON.stringify(commitHash),
      'DEV_OVERRIDES': JSON.stringify(undefined),
      '__VUE_OPTIONS_API__': true,
-      '__VUE_PROD_DEVTOOLS__': false
+      '__VUE_PROD_DEVTOOLS__': false,
+      '__VUE_PROD_HYDRATION_MISMATCH_DETAILS__': false
    }),
    // extract css into its own file
    new MiniCssExtractPlugin({
--- a/changelog.d/backend-repo-url.skip
+++ b/changelog.d/backend-repo-url.skip
--- a/changelog.d/batch2.skip
+++ b/changelog.d/batch2.skip
--- a/changelog.d/better-shadow-control.fix
+++ b/changelog.d/better-shadow-control.fix
@ -0,0 +1 @@
+Updated shadow editor, hopefully fixed long-standing bugs, added ability to specify shadow's name.
--- a/changelog.d/bookmark-folders.add
+++ b/changelog.d/bookmark-folders.add
@ -0,0 +1 @@
+Support bookmark folders
--- a/changelog.d/browsers-support.change
+++ b/changelog.d/browsers-support.change
@ -0,0 +1,9 @@
+Updated our build system to support browsers:
+  Safari >= 15
+  Firefox >= 115
+  Android > 4
+  no Opera Mini support
+  no IE support
+  no "dead" (unmaintained) browsers support
+
+This does not guarantee that browsers will or will not work.
--- a/changelog.d/checkbox.fix
+++ b/changelog.d/checkbox.fix
@ -0,0 +1 @@
+checkbox vertical alignment has been fixed
--- a/changelog.d/color-schemes.add
+++ b/changelog.d/color-schemes.add
@ -0,0 +1 @@
+Some new default color schemes
--- a/changelog.d/colorfuncs.fix
+++ b/changelog.d/colorfuncs.fix
@ -0,0 +1 @@
+Fix some of the color manipulation functions
--- a/changelog.d/custom.add
+++ b/changelog.d/custom.add
@ -0,0 +1 @@
+Added support for fetching /{resource}.custom.ext to allow adding instance-specific themes without altering sourcetree
--- a/changelog.d/customizable-actions.add
+++ b/changelog.d/customizable-actions.add
@ -0,0 +1 @@
+Post actions can be customized
--- a/changelog.d/date-absolute.add
+++ b/changelog.d/date-absolute.add
@ -0,0 +1 @@
+Support displaying time in absolute format
--- a/changelog.d/denpmify-gitlab-ci.skip
+++ b/changelog.d/denpmify-gitlab-ci.skip
--- a/changelog.d/deprecate-subscribe.change
+++ b/changelog.d/deprecate-subscribe.change
@ -0,0 +1 @@
+Use /api/v1/accounts/:id/follow for account subscriptions instead of the deprecated routes
--- a/changelog.d/drafts-imp.skip
+++ b/changelog.d/drafts-imp.skip
--- a/changelog.d/drafts.add
+++ b/changelog.d/drafts.add
@ -0,0 +1 @@
+Add draft management system
--- a/changelog.d/emoji-picker.add
+++ b/changelog.d/emoji-picker.add
@ -0,0 +1 @@
+fixed occasional overflows in emoji picker and made header scrollable
--- a/changelog.d/emoji-size.fix
+++ b/changelog.d/emoji-size.fix
@ -0,0 +1 @@
+fix emoji inconsistencies in notifications, fix some emoji not scaling with interface
--- a/changelog.d/image-compression.add
+++ b/changelog.d/image-compression.add
@ -0,0 +1 @@
+Added configurable image compression option in general settings, allowing users to control whether images are compressed before upload. 
--- a/changelog.d/misc-markup.fix
+++ b/changelog.d/misc-markup.fix
@ -0,0 +1 @@
+Fix small markup inconsistencies
--- a/changelog.d/modals-mobile.change
+++ b/changelog.d/modals-mobile.change
@ -0,0 +1 @@
+modal layout for mobile has new layout to make it easy to use
--- a/changelog.d/modals.fix
+++ b/changelog.d/modals.fix
@ -0,0 +1 @@
+fixed modals buttons overflow
--- a/changelog.d/multiple-status-mute-reasons.fix
+++ b/changelog.d/multiple-status-mute-reasons.fix
@ -0,0 +1 @@
+Fix whitespaces for multiple status mute reasons, display bot status reason
--- a/changelog.d/muted_user_en_translation.skip
+++ b/changelog.d/muted_user_en_translation.skip
@ -0,0 +1 @@
+Added missing EN translation key for status.muted_user
--- a/changelog.d/mutes.change
+++ b/changelog.d/mutes.change
@ -0,0 +1 @@
+better display of mute reason on posts
--- a/changelog.d/no-check-npm.skip
+++ b/changelog.d/no-check-npm.skip
--- a/changelog.d/non-anonymous-polls.add
+++ b/changelog.d/non-anonymous-polls.add
@ -0,0 +1 @@
+Inform users that Smithereen public polls are public
--- a/changelog.d/oauth-app-name.change
+++ b/changelog.d/oauth-app-name.change
@ -0,0 +1 @@
+Simplify the OAuth client_name to 'PleromaFE'
--- a/changelog.d/panel-stack.fix
+++ b/changelog.d/panel-stack.fix
@ -0,0 +1 @@
+proper sticky header for conversations on user page
--- a/changelog.d/piss-fix.skip
+++ b/changelog.d/piss-fix.skip
--- a/changelog.d/piss-serialization.skip
+++ b/changelog.d/piss-serialization.skip
--- a/changelog.d/quote-buttons.fix
+++ b/changelog.d/quote-buttons.fix
@ -0,0 +1 @@
+reply-or-quote buttons now take less space
--- a/changelog.d/roundup3.skip
+++ b/changelog.d/roundup3.skip
--- a/changelog.d/show-bookmarks-on-mobile.fix
+++ b/changelog.d/show-bookmarks-on-mobile.fix
@ -0,0 +1 @@
+Bookmarks visible again on mobile
--- a/changelog.d/splashfix.skip
+++ b/changelog.d/splashfix.skip
--- a/changelog.d/splashscreen.add
+++ b/changelog.d/splashscreen.add
@ -0,0 +1 @@
+Splash screen + loading indicator to make process of identifying initialization issues and load performance
--- a/changelog.d/streaming-op-after-conn.change
+++ b/changelog.d/streaming-op-after-conn.change
@ -0,0 +1 @@
+Authenticate and subscribe to streaming after connection
--- a/changelog.d/tabs.change
+++ b/changelog.d/tabs.change
@ -0,0 +1 @@
+Tabs now have indentation for better visibility of which tab is currently active
--- a/changelog.d/themes3.add
+++ b/changelog.d/themes3.add
@ -0,0 +1 @@
+UI for making v3 themes and palettes, support for bundling v3 themes
--- a/changelog.d/upload-resizing.add
+++ b/changelog.d/upload-resizing.add
@ -0,0 +1 @@
+Resize most kinds of images on upload.
--- a/changelog.d/user-link.add
+++ b/changelog.d/user-link.add
@ -0,0 +1 @@
+Make UserLink wrappable
--- a/changelog.d/vue.change
+++ b/changelog.d/vue.change
@ -0,0 +1 @@
+Upgraded Vue to version 3.5
--- a/changelog.d/vuex-devtools.skip
+++ b/changelog.d/vuex-devtools.skip
--- a/changelog.d/weird-absolute-time-format.fix
+++ b/changelog.d/weird-absolute-time-format.fix
@ -0,0 +1 @@
+Show only month and day instead of weird "day, hour" format. While at it, fixed typo "defualt" in a comment.
--- a/config/index.js
+++ b/config/index.js
@ -8,10 +8,10 @@ try {
    // and that's how actual BE reports its url
    settings.target = settings.target.replace(/\/$/, '')
  }
-  console.log('Using local dev server settings (/config/local.json):')
-  console.log(JSON.stringify(settings, null, 2))
+  console.info('Using local dev server settings (/config/local.json):')
+  console.info(JSON.stringify(settings, null, 2))
 } catch (e) {
-  console.log('Local dev server settings not found (/config/local.json)')
+  console.info('Local dev server settings not found (/config/local.json)')
 }

 const target = settings.target || 'http://localhost:4000/'
--- a/index.html
+++ b/index.html
@ -3,12 +3,163 @@
  <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no">
+    <!-- putting styles here to avoid having to wait for styles to load up -->
+    <style id="splashscreen">
+     #splash {
+       --scale: 1;
+       width: 100vw;
+       height: 100vh;
+       display: grid;
+       grid-template-rows: auto;
+       grid-template-columns: auto;
+       align-content: center;
+       align-items: center;
+       justify-content: center;
+       justify-items: center;
+       flex-direction: column;
+       background: #0f161e;
+       font-family: sans-serif;
+       color: #b9b9ba;
+       position: absolute;
+       z-index: 9999;
+       font-size: calc(1vw + 1vh + 1vmin);
+     }
+
+     #splash-credit {
+       position: absolute;
+       font-size: 14px;
+       bottom: 16px;
+       right: 16px;
+     }
+
+     #splash-container {
+       align-items: center;
+     }
+
+     #mascot-container {
+       display: flex;
+       align-items: flex-end;
+       justify-content: center;
+       perspective: 60em;
+       perspective-origin: 0 -15em;
+       transform-style: preserve-3d;
+     }
+
+     #mascot {
+       width: calc(10em * var(--scale));
+       height: calc(10em * var(--scale));
+       object-fit: contain;
+       object-position: bottom;
+       transform: translateZ(-2em);
+     }
+
+     #throbber {
+       display: grid;
+       width: calc(5em * 0.5 * var(--scale));
+       height: calc(8em * 0.5 * var(--scale));
+       margin-left: 4.1em;
+       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";
+
+       --logoChunkSize: calc(2em * 0.5 * var(--scale))
+     }
+
+     .chunk {
+       background-color: #e2b188;
+       box-shadow: 0.01em 0.01em 0.1em 0 #e2b188;
+     }
+
+     #chunk-P {
+       grid-area: P;
+       border-top-left-radius:  calc(var(--logoChunkSize) / 2);
+     }
+
+     #chunk-L {
+       grid-area: L;
+       border-bottom-right-radius: calc(var(--logoChunkSize) / 2);
+     }
+
+     #chunk-E {
+       grid-area: E;
+       border-bottom-right-radius: calc(var(--logoChunkSize) / 2);
+     }
+
+     #status {
+       margin-top: 1em;
+       line-height: 2;
+       width: 100%;
+       text-align: center;
+     }
+
+     #statusError {
+       display: none;
+       margin-top: 1em;
+       font-size: calc(1vw + 1vh + 1vmin);
+       line-height: 2;
+       width: 100%;
+       text-align: center;
+     }
+
+     #statusStack {
+       display: none;
+       margin-top: 1em;
+       font-size: calc((1vw + 1vh + 1vmin) / 2.5);
+       width: calc(100vw - 5em);
+       padding: 1em;
+       text-overflow: ellipsis;
+       overflow-x: hidden;
+       text-align: left;
+       line-height: 2;
+     }
+
+     @media (prefers-reduced-motion) {
+       #throbber {
+         animation: none !important;
+       }
+     }
+    </style>
+    <style id="pleroma-eager-styles" type="text/css"></style>
+    <style id="pleroma-lazy-styles" type="text/css"></style>
    <!--server-generated-meta-->
-    <link rel="icon" type="image/png" href="/favicon.png">
  </head>
-  <body class="hidden">
+  <body style="margin: 0; padding: 0">
    <noscript>To use Pleroma, please enable JavaScript.</noscript>
-    <div id="app"></div>
+    <div id="splash">
+      <!-- we are hiding entire graphic so no point showing credit -->
+      <div aria-hidden="true" id="splash-credit">
+        Art by pipivovott
+      </div>
+      <div id="splash-container">
+        <div aria-hidden="true" id="mascot-container">
+          <div id="throbber">
+            <div class="chunk" id="chunk-P">
+            </div>
+            <div class="chunk" id="chunk-L">
+            </div>
+            <div class="chunk" id="chunk-E">
+            </div>
+          </div>
+          <img id="mascot" src="/static/pleromatan_apology.png">
+        </div>
+        <div id="status" class="css-ok">
+          <!-- (｡>﹏<) -->
+          <!-- it's a pseudographic, don't want screenreader read out nonsense -->
+          <span aria-hidden="true" class="initial-text">(｡&gt;﹏&lt;)</span>
+        </div>
+        <code id="statusError"></code>
+        <pre id="statusStack"></pre>
+      </div>
+    </div>
+    <div id="app" class="hidden"></div>
    <div id="modal"></div>
    <!-- built files will be auto injected -->
    <div id="popovers" />
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "pleroma_fe",
-  "version": "2.5.0",
+  "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/-/blob/develop/CONTRIBUTORS.md>",
  "private": false,
@ -10,110 +10,110 @@
    "unit": "karma start test/unit/karma.conf.js --single-run",
    "unit:watch": "karma start test/unit/karma.conf.js --single-run=false",
    "e2e": "node test/e2e/runner.js",
-    "test": "npm run unit && npm run e2e",
-    "stylelint": "npx stylelint '**/*.scss' '**/*.vue'",
+    "test": "yarn run unit && yarn run e2e",
+    "stylelint": "yarn exec stylelint '**/*.scss' '**/*.vue'",
    "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs",
    "lint-fix": "eslint --fix --ext .js,.vue src test/unit/specs test/e2e/specs"
  },
  "dependencies": {
-    "@babel/runtime": "7.21.0",
+    "@babel/runtime": "7.26.7",
    "@chenfengyuan/vue-qrcode": "2.0.0",
-    "@fortawesome/fontawesome-svg-core": "6.3.0",
-    "@fortawesome/free-regular-svg-icons": "6.3.0",
-    "@fortawesome/free-solid-svg-icons": "6.3.0",
-    "@fortawesome/vue-fontawesome": "3.0.3",
+    "@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",
    "@kazvmoe-infra/pinch-zoom-element": "1.2.0",
    "@kazvmoe-infra/unicode-emoji-json": "0.4.0",
-    "@ruffle-rs/ruffle": "0.1.0-nightly.2022.7.12",
-    "@vuelidate/core": "2.0.0",
-    "@vuelidate/validators": "2.0.0",
+    "@ruffle-rs/ruffle": "0.1.0-nightly.2025.1.13",
+    "@vuelidate/core": "2.0.3",
+    "@vuelidate/validators": "2.0.4",
    "body-scroll-lock": "3.1.5",
    "chromatism": "3.0.0",
    "click-outside-vue3": "4.0.1",
-    "cropperjs": "1.5.12",
+    "cropperjs": "1.6.2",
    "escape-html": "1.0.3",
-    "js-cookie": "3.0.1",
+    "hash-sum": "^2.0.0",
+    "js-cookie": "3.0.5",
    "localforage": "1.10.0",
+    "pako": "^2.1.0",
    "parse-link-header": "2.0.0",
-    "phoenix": "1.6.2",
-    "pinia": "^2.0.33",
-    "punycode.js": "2.3.0",
-    "qrcode": "1.5.0",
+    "phoenix": "1.7.18",
+    "punycode.js": "2.3.1",
+    "qrcode": "1.5.4",
    "querystring-es3": "0.2.1",
-    "url": "0.11.0",
+    "url": "0.11.4",
    "utf8": "3.0.0",
-    "vue": "3.2.45",
-    "vue-i18n": "9.2.2",
-    "vue-router": "4.1.6",
-    "vue-template-compiler": "2.7.14",
+    "vue": "3.5.13",
+    "vue-i18n": "10",
+    "vue-router": "4.5.0",
    "vue-virtual-scroller": "^2.0.0-beta.7",
    "vuex": "4.1.0"
  },
  "devDependencies": {
-    "@babel/core": "7.21.0",
-    "@babel/eslint-parser": "7.19.1",
-    "@babel/plugin-transform-runtime": "7.21.0",
-    "@babel/preset-env": "7.20.2",
-    "@babel/register": "7.21.0",
+    "@babel/core": "7.26.7",
+    "@babel/eslint-parser": "7.26.5",
+    "@babel/plugin-transform-runtime": "7.25.9",
+    "@babel/preset-env": "7.26.7",
+    "@babel/register": "7.25.9",
    "@intlify/vue-i18n-loader": "5.0.1",
-    "@ungap/event-target": "0.2.3",
+    "@ungap/event-target": "0.2.4",
    "@vue/babel-helper-vue-jsx-merge-props": "1.4.0",
-    "@vue/babel-plugin-jsx": "1.1.1",
-    "@vue/compiler-sfc": "3.2.45",
-    "@vue/test-utils": "2.2.8",
-    "autoprefixer": "10.4.13",
-    "babel-loader": "9.1.2",
+    "@vue/babel-plugin-jsx": "1.2.5",
+    "@vue/compiler-sfc": "3.5.13",
+    "@vue/test-utils": "2.4.6",
+    "autoprefixer": "10.4.20",
+    "babel-loader": "9.2.1",
    "babel-plugin-lodash": "3.3.4",
-    "chai": "4.3.7",
+    "chai": "4.5.0",
    "chalk": "1.1.3",
    "chromedriver": "108.0.0",
    "connect-history-api-fallback": "2.0.0",
    "copy-webpack-plugin": "11.0.0",
-    "cross-spawn": "7.0.3",
-    "css-loader": "6.7.3",
+    "cross-spawn": "7.0.6",
+    "css-loader": "6.11.0",
    "css-minimizer-webpack-plugin": "4.2.2",
    "custom-event-polyfill": "1.0.7",
-    "eslint": "8.33.0",
-    "eslint-config-standard": "17.0.0",
+    "eslint": "8.57.1",
+    "eslint-config-standard": "17.1.0",
    "eslint-formatter-friendly": "7.0.0",
-    "eslint-plugin-import": "2.27.5",
-    "eslint-plugin-n": "15.6.1",
-    "eslint-plugin-promise": "6.1.1",
-    "eslint-plugin-vue": "9.9.0",
+    "eslint-plugin-import": "2.31.0",
+    "eslint-plugin-n": "15.7.0",
+    "eslint-plugin-promise": "6.6.0",
+    "eslint-plugin-vue": "9.32.0",
    "eslint-webpack-plugin": "3.2.0",
    "eventsource-polyfill": "0.9.6",
-    "express": "4.18.2",
-    "function-bind": "1.1.1",
-    "html-webpack-plugin": "5.5.0",
-    "http-proxy-middleware": "2.0.6",
+    "express": "4.21.2",
+    "function-bind": "1.1.2",
+    "html-webpack-plugin": "5.6.3",
+    "http-proxy-middleware": "2.0.7",
    "iso-639-1": "2.1.15",
    "json-loader": "0.5.7",
-    "karma": "6.4.1",
-    "karma-coverage": "2.2.0",
-    "karma-firefox-launcher": "2.1.2",
+    "karma": "6.4.4",
+    "karma-coverage": "2.2.1",
+    "karma-firefox-launcher": "2.1.3",
    "karma-mocha": "2.0.1",
    "karma-mocha-reporter": "2.2.5",
    "karma-sinon-chai": "2.0.2",
-    "karma-sourcemap-loader": "0.3.8",
+    "karma-sourcemap-loader": "0.4.0",
    "karma-spec-reporter": "0.0.36",
-    "karma-webpack": "5.0.0",
+    "karma-webpack": "5.0.1",
    "lodash": "4.17.21",
-    "mini-css-extract-plugin": "2.7.2",
-    "mocha": "10.2.0",
-    "nightwatch": "2.6.19",
+    "mini-css-extract-plugin": "2.9.2",
+    "mocha": "10.8.2",
+    "nightwatch": "2.6.25",
    "opn": "5.5.0",
    "ora": "0.4.1",
-    "postcss": "8.4.20",
+    "postcss": "8.5.1",
    "postcss-html": "^1.5.0",
    "postcss-loader": "7.0.2",
    "postcss-scss": "^4.0.6",
    "sass": "1.60.0",
-    "sass-loader": "13.2.0",
-    "selenium-server": "2.53.1",
-    "semver": "7.3.8",
+    "sass-loader": "13.3.3",
+    "selenium-server": "3.141.59",
+    "semver": "7.6.3",
    "serviceworker-webpack5-plugin": "2.0.0",
    "shelljs": "0.8.5",
-    "sinon": "15.0.1",
+    "sinon": "15.2.0",
    "sinon-chai": "3.7.0",
    "stylelint": "14.16.1",
    "stylelint-config-html": "^1.1.0",
@ -130,7 +130,7 @@
    "webpack-merge": "0.20.0"
  },
  "engines": {
-    "node": ">= 16.0.0",
-    "npm": ">= 3.0.0"
-  }
+    "node": ">= 16.0.0"
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }
--- a/preview.style.js
+++ b/preview.style.js
--- a/src/App.js
+++ b/src/App.js
@ -46,16 +46,36 @@ export default {
  data: () => ({
    mobileActivePanel: 'timeline'
  }),
+  watch: {
+    themeApplied (value) {
+      this.removeSplash()
+    },
+    layoutType (value) {
+      document.getElementById('modal').classList = ['-' + this.layoutType]
+    }
+  },
  created () {
    // Load the locale from the storage
    const val = this.$store.getters.mergedConfig.interfaceLanguage
    this.$store.dispatch('setOption', { name: 'interfaceLanguage', value: val })
    window.addEventListener('resize', this.updateMobileState)
+    document.getElementById('modal').classList = ['-' + this.layoutType]
+  },
+  mounted () {
+    if (this.$store.state.interface.themeApplied) {
+      this.removeSplash()
+    }
  },
  unmounted () {
    window.removeEventListener('resize', this.updateMobileState)
  },
  computed: {
+    themeApplied () {
+      return this.$store.state.interface.themeApplied
+    },
+    layoutModalClass () {
+      return '-' + this.layoutType
+    },
    classes () {
      return [
        {
@ -132,6 +152,15 @@ export default {
    updateMobileState () {
      useInterfaceStore().setLayoutWidth(windowWidth())
      useInterfaceStore().setLayoutHeight(windowHeight())
+    },
+    removeSplash () {
+      document.querySelector('#status').textContent = this.$t('splash.fun_' + Math.ceil(Math.random() * 4))
+      const splashscreenRoot = document.querySelector('#splash')
+      splashscreenRoot.addEventListener('transitionend', () => {
+        splashscreenRoot.remove()
+      })
+      splashscreenRoot.classList.add('hidden')
+      document.querySelector('#app').classList.remove('hidden')
    }
  }
 }
--- a/src/App.scss
+++ b/src/App.scss
@ -1,10 +1,9 @@
 // stylelint-disable rscss/class-format
 /* stylelint-disable no-descending-specificity */
-@import "./variables";
@import "./panel";

 :root {
-  --navbar-height: 3.5rem;
+  --status-margin: 0.75em;
  --post-line-height: 1.4;
  // Z-Index stuff
  --ZI_media_modal: 9000;
@ -13,19 +12,25 @@
  --ZI_navbar_popovers: 7500;
  --ZI_navbar: 7000;
  --ZI_popovers: 6000;
+
+  // Fallback for when stuff is loading
+  --background: var(--bg);
 }

 html {
-  font-size: 14px;
+  font-size: var(--textSize, 14px);
+
+  --navbar-height: var(--navbarSize, 3.5rem);
+  --emoji-size: var(--emojiSize, 32px);
+  --panel-header-height: var(--panelHeaderSize, 3.2rem);
  // overflow-x: clip causes my browser's tab to crash with SIGILL lul
 }

 body {
  font-family: sans-serif;
-  font-family: var(--interfaceFont, sans-serif);
+  font-family: var(--font);
  margin: 0;
-  color: $fallback--text;
-  color: var(--text, $fallback--text);
+  color: var(--text);
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
  overscroll-behavior-y: none;
@ -42,17 +47,35 @@ body {
 // have a cursor/pointer to operate them
@media (any-pointer: fine) {
  * {
-    scrollbar-color: var(--btn) transparent;
+    scrollbar-color: var(--fg) transparent;

    &::-webkit-scrollbar {
      background: transparent;
    }

+    &::-webkit-scrollbar-corner {
+      background: transparent;
+    }
+
+    &::-webkit-resizer {
+      /* stylelint-disable-next-line declaration-no-important */
+      background-color: transparent !important;
+      background-image:
+        linear-gradient(
+          135deg,
+          transparent calc(50% - 1px),
+          var(--textFaint) 50%,
+          transparent calc(50% + 1px),
+          transparent calc(75% - 1px),
+          var(--textFaint) 75%,
+          transparent calc(75% + 1px),
+        );
+    }
+
    &::-webkit-scrollbar-button,
    &::-webkit-scrollbar-thumb {
-      background-color: var(--btn);
-      box-shadow: var(--buttonShadow);
-      border-radius: var(--btnRadius);
+      box-shadow: var(--shadow);
+      border-radius: var(--roundness);
    }

    // horizontal/vertical/increment/decrement are webkit-specific stuff
@ -61,7 +84,7 @@ body {
    &::-webkit-scrollbar-button {
      --___bgPadding: 2px;

-      color: var(--btnText);
+      color: var(--text);
      background-repeat: no-repeat, no-repeat;

      &:horizontal {
@ -69,15 +92,15 @@ body {

        &:increment {
          background-image:
-            linear-gradient(45deg, var(--btnText) 50%, transparent 51%),
-            linear-gradient(-45deg, transparent 50%, var(--btnText) 51%);
+            linear-gradient(45deg, var(--text) 50%, transparent 51%),
+            linear-gradient(-45deg, transparent 50%, var(--text) 51%);
          background-position: top var(--___bgPadding) left 50%, right 50% bottom var(--___bgPadding);
        }

        &:decrement {
          background-image:
-            linear-gradient(45deg, transparent 50%, var(--btnText) 51%),
-            linear-gradient(-45deg, var(--btnText) 50%, transparent 51%);
+            linear-gradient(45deg, transparent 50%, var(--text) calc(50% + 1px)),
+            linear-gradient(-45deg, var(--text) 50%, transparent 51%);
          background-position: bottom var(--___bgPadding) right 50%, left 50% top var(--___bgPadding);
        }
      }
@ -87,15 +110,15 @@ body {

        &:increment {
          background-image:
-            linear-gradient(-45deg, transparent 50%, var(--btnText) 51%),
-            linear-gradient(45deg, transparent 50%, var(--btnText) 51%);
+            linear-gradient(-45deg, transparent 50%, var(--text) 51%),
+            linear-gradient(45deg, transparent 50%, var(--text) 51%);
          background-position: right var(--___bgPadding) top 50%, left var(--___bgPadding) top 50%;
        }

        &:decrement {
          background-image:
-            linear-gradient(-45deg, var(--btnText) 50%, transparent 51%),
-            linear-gradient(45deg, var(--btnText) 50%, transparent 51%);
+            linear-gradient(-45deg, var(--text) 50%, transparent 51%),
+            linear-gradient(45deg, var(--text) 50%, transparent 51%);
          background-position: left var(--___bgPadding) top 50%, right var(--___bgPadding) top 50%;
        }
      }
@ -104,15 +127,14 @@ body {
  }
  // Body should have background to scrollbar otherwise it will use white (body color?)
  html {
-    scrollbar-color: var(--selectedMenu) var(--wallpaper);
+    scrollbar-color: var(--fg) var(--wallpaper);
    background: var(--wallpaper);
  }
 }

 a {
  text-decoration: none;
-  color: $fallback--link;
-  color: var(--link, $fallback--link);
+  color: var(--link);
 }

 h4 {
@ -128,29 +150,15 @@ h4 {
 i[class*="icon-"],
 .svg-inline--fa,
 .iconLetter {
-  color: $fallback--icon;
-  color: var(--icon, $fallback--icon);
-}
-
-.button-unstyled:hover,
-a:hover {
-  > i[class*="icon-"],
-  > .svg-inline--fa,
-  > .iconLetter {
-    color: var(--text);
-  }
+  color: var(--icon);
 }

 nav {
  z-index: var(--ZI_navbar);
-  background-color: $fallback--fg;
-  background-color: var(--topBar, $fallback--fg);
-  color: $fallback--faint;
-  color: var(--faint, $fallback--faint);
-  box-shadow: 0 0 4px rgb(0 0 0 / 60%);
-  box-shadow: var(--topBarShadow);
+  box-shadow: var(--shadow);
  box-sizing: border-box;
  height: var(--navbar-height);
+  font-size: calc(var(--navbar-height) / 3.5);
  position: fixed;
 }

@ -195,16 +203,14 @@ nav {
  grid-column: 1 / span 3;
  grid-row: 1 / 1;
  pointer-events: none;
-  background-color: rgb(0 0 0 / 15%);
-  background-color: var(--underlay, rgb(0 0 0 / 15%));
+  background-color: var(--underlay);
  z-index: -1000;
 }

 .app-layout {
  --miniColumn: 25rem;
  --maxiColumn: 45rem;
-  --columnGap: 1em;
-  --status-margin: 0.75em;
+  --columnGap: 1rem;
  --effectiveSidebarColumnWidth: minmax(var(--miniColumn), var(--sidebarColumnWidth, var(--miniColumn)));
  --effectiveNotifsColumnWidth: minmax(var(--miniColumn), var(--notifsColumnWidth, var(--miniColumn)));
  --effectiveContentColumnWidth: minmax(var(--miniColumn), var(--contentColumnWidth, var(--maxiColumn)));
@ -366,106 +372,126 @@ nav {

 .button-default {
  user-select: none;
-  color: $fallback--text;
-  color: var(--btnText, $fallback--text);
-  background-color: $fallback--fg;
-  background-color: var(--btn, $fallback--fg);
+  color: var(--text);
  border: none;
-  border-radius: $fallback--btnRadius;
-  border-radius: var(--btnRadius, $fallback--btnRadius);
  cursor: pointer;
-  box-shadow: $fallback--buttonShadow;
-  box-shadow: var(--buttonShadow);
+  background-color: var(--background);
+  box-shadow: var(--shadow);
  font-size: 1em;
  font-family: sans-serif;
-  font-family: var(--interfaceFont, sans-serif);
-
-  &.-sublime {
-    background: transparent;
-  }
-
-  i[class*="icon-"],
-  .svg-inline--fa {
-    color: $fallback--text;
-    color: var(--btnText, $fallback--text);
-  }
+  font-family: var(--font);

  &::-moz-focus-inner {
    border: none;
  }

-  &:hover {
-    box-shadow: 0 0 4px rgb(255 255 255 / 30%);
-    box-shadow: var(--buttonHoverShadow);
-  }
-
-  &:active {
-    box-shadow:
-      0 0 4px 0 rgb(255 255 255 / 30%),
-      0 1px 0 0 rgb(0 0 0 / 20%) inset,
-      0 -1px 0 0 rgb(255 255 255 / 20%) inset;
-    box-shadow: var(--buttonPressedShadow);
-    color: $fallback--text;
-    color: var(--btnPressedText, $fallback--text);
-    background-color: $fallback--fg;
-    background-color: var(--btnPressed, $fallback--fg);
-
-    svg,
-    i {
-      color: $fallback--text;
-      color: var(--btnPressedText, $fallback--text);
-    }
-  }
-
  &:disabled {
    cursor: not-allowed;
-    color: $fallback--text;
-    color: var(--btnDisabledText, $fallback--text);
-    background-color: $fallback--fg;
-    background-color: var(--btnDisabled, $fallback--fg);
-
-    svg,
-    i {
-      color: $fallback--text;
-      color: var(--btnDisabledText, $fallback--text);
  }
+}
+
+.menu-item {
+  line-height: var(--__line-height);
+  font-family: inherit;
+  font-weight: 400;
+  font-size: 100%;
+  cursor: pointer;
+
+  a,
+  button:not(.button-default) {
+    color: var(--text);
+    font-size: 100%;
  }

-  &.toggled {
-    color: $fallback--text;
-    color: var(--btnToggledText, $fallback--text);
-    background-color: $fallback--fg;
-    background-color: var(--btnToggled, $fallback--fg);
-    box-shadow:
-      0 0 4px 0 rgb(255 255 255 / 30%),
-      0 1px 0 0 rgb(0 0 0 / 20%) inset,
-      0 -1px 0 0 rgb(255 255 255 / 20%) inset;
-    box-shadow: var(--buttonPressedShadow);
-
-    svg,
-    i {
-      color: $fallback--text;
-      color: var(--btnToggledText, $fallback--text);
+  &.disabled {
+    cursor: not-allowed;
  }
+}
+
+.list-item {
+  border-color: var(--border);
+  border-style: solid;
+  border-width: 0;
+  border-top-width: 1px;
+
+  &.-active,
+  &:hover {
+    border-top-width: 1px;
+    border-bottom-width: 1px;
  }

-  &.danger {
-    // TODO: add better color variable
-    color: $fallback--text;
-    color: var(--alertErrorPanelText, $fallback--text);
-    background-color: $fallback--alertError;
-    background-color: var(--alertError, $fallback--alertError);
+  &.-active + &,
+  &:hover + & {
+    border-top-width: 0;
+  }
+
+  &:hover + .menu-item-collapsible:not(.-expanded) + &,
+  &.-active + .menu-item-collapsible:not(.-expanded) + & {
+    border-top-width: 0;
+  }
+
+  &[aria-expanded="true"] {
+    border-bottom-width: 1px;
+  }
+
+  &:first-child {
+    border-top-right-radius: var(--roundness);
+    border-top-left-radius: var(--roundness);
+    border-top-width: 0;
+  }
+
+  &:last-child {
+    border-bottom-right-radius: var(--roundness);
+    border-bottom-left-radius: var(--roundness);
+    border-bottom-width: 0;
+  }
+}
+
+.menu-item,
+.list-item {
+  display: block;
+  box-sizing: border-box;
+  border: none;
+  outline: none;
+  text-align: initial;
+  color: inherit;
+  clear: both;
+  position: relative;
+  white-space: nowrap;
+  width: 100%;
+  padding: var(--__vertical-gap) var(--__horizontal-gap);
+  background: transparent;
+
+  --__line-height: 1.5em;
+  --__horizontal-gap: 0.75em;
+  --__vertical-gap: 0.5em;
+
+  &.-non-interactive {
+    cursor: auto;
+  }
+
+  a,
+  button:not(.button-default) {
+    text-align: initial;
+    padding: 0;
+    background: none;
+    border: none;
+    outline: none;
+    display: inline;
+    font-family: inherit;
+    line-height: unset;
  }
 }

 .button-unstyled {
-  background: none;
  border: none;
  outline: none;
  display: inline;
  text-align: initial;
  font-size: 100%;
  font-family: inherit;
+  box-shadow: var(--shadow);
+  background-color: transparent;
  padding: 0;
  line-height: unset;
  cursor: pointer;
@ -473,28 +499,23 @@ nav {
  color: inherit;

  &.-link {
-    color: $fallback--link;
-    color: var(--link, $fallback--link);
-  }
-
-  &.-fullwidth {
-    width: 100%;
-  }
-
-  &.-hover-highlight {
-    &:hover svg {
-      color: $fallback--lightText;
-      color: var(--lightText, $fallback--lightText);
-    }
+    /* stylelint-disable-next-line declaration-no-important */
+    color: var(--link) !important;
  }
 }

 input,
-textarea,
+textarea {
+  border: none;
+  display: inline-block;
+  outline: none;
+}
+
 .input {
  &.unstyled {
    border-radius: 0;
-    background: none;
+    /* stylelint-disable-next-line declaration-no-important */
+    background: none !important;
    box-shadow: none;
    height: unset;
  }
@ -502,19 +523,10 @@ textarea,
  --_padding: 0.5em;

  border: none;
-  border-radius: $fallback--inputRadius;
-  border-radius: var(--inputRadius, $fallback--inputRadius);
-  box-shadow:
-    0 1px 0 0 rgb(0 0 0 / 20%) inset,
-    0 -1px 0 0 rgb(255 255 255 / 20%) inset,
-    0 0 2px 0 rgb(0 0 0 / 100%) inset;
-  box-shadow: var(--inputShadow);
-  background-color: $fallback--fg;
-  background-color: var(--input, $fallback--fg);
-  color: $fallback--lightText;
-  color: var(--inputText, $fallback--lightText);
-  font-family: sans-serif;
-  font-family: var(--inputFont, sans-serif);
+  background-color: var(--background);
+  color: var(--text);
+  box-shadow: var(--shadow);
+  font-family: var(--font);
  font-size: 1em;
  margin: 0;
  box-sizing: border-box;
@ -528,7 +540,6 @@ textarea,
  &[disabled="disabled"],
  &.disabled {
    cursor: not-allowed;
-    opacity: 0.5;
  }

  &[type="range"] {
@ -543,9 +554,9 @@ textarea,
    display: none;

    &:checked + label::before {
-      box-shadow: 0 0 2px black inset, 0 0 0 4px $fallback--fg inset;
-      box-shadow: var(--inputShadow), 0 0 0 4px var(--fg, $fallback--fg) inset;
-      background-color: var(--accent, $fallback--link);
+      box-shadow: var(--shadow);
+      background-color: var(--background);
+      color: var(--text);
    }

    &:disabled {
@ -559,16 +570,14 @@ textarea,
    + label::before {
      flex-shrink: 0;
      display: inline-block;
-      content: "";
+      content: "•";
      transition: box-shadow 200ms;
      width: 1.1em;
      height: 1.1em;
      border-radius: 100%; // Radio buttons should always be circle
-      box-shadow: 0 0 2px black inset;
-      box-shadow: var(--inputShadow);
+      background-color: var(--background);
+      box-shadow: var(--shadow);
      margin-right: 0.5em;
-      background-color: $fallback--fg;
-      background-color: var(--input, $fallback--fg);
      vertical-align: top;
      text-align: center;
      line-height: 1.1;
@ -581,8 +590,9 @@ textarea,

  &[type="checkbox"] {
    &:checked + label::before {
-      color: $fallback--text;
-      color: var(--inputText, $fallback--text);
+      color: var(--text);
+      background-color: var(--background);
+      box-shadow: var(--shadow);
    }

    &:disabled {
@ -600,13 +610,9 @@ textarea,
      transition: color 200ms;
      width: 1.1em;
      height: 1.1em;
-      border-radius: $fallback--checkboxRadius;
-      border-radius: var(--checkboxRadius, $fallback--checkboxRadius);
-      box-shadow: 0 0 2px black inset;
-      box-shadow: var(--inputShadow);
+      border-radius: var(--roundness);
+      box-shadow: var(--shadow);
      margin-right: 0.5em;
-      background-color: $fallback--fg;
-      background-color: var(--input, $fallback--fg);
      vertical-align: top;
      text-align: center;
      line-height: 1.1;
@ -622,17 +628,26 @@ textarea,
  }
 }

+.input,
+.button-default {
+  --_roundness-left: var(--roundness);
+  --_roundness-right: var(--roundness);
+
+  border-top-left-radius: var(--_roundness-left);
+  border-bottom-left-radius: var(--_roundness-left);
+  border-top-right-radius: var(--_roundness-right);
+  border-bottom-right-radius: var(--_roundness-right);
+}
+
 // Textareas should have stock line-height + vertical padding instead of huge line-height
-textarea {
+textarea.input {
  padding: var(--_padding);
  line-height: var(--post-line-height);
 }

 option {
-  color: $fallback--text;
-  color: var(--text, $fallback--text);
-  background-color: $fallback--bg;
-  background-color: var(--bg, $fallback--bg);
+  color: var(--text);
+  background-color: var(--background);
 }

 .hide-number-spinner {
@ -645,6 +660,20 @@ option {
  }
 }

+.cards-list {
+  list-style: none;
+  display: grid;
+  grid-auto-flow: row dense;
+  grid-template-columns: 1fr 1fr;
+
+  li {
+    border: 1px solid var(--border);
+    border-radius: var(--roundness);
+    padding: 0.5em;
+    margin: 0.25em;
+  }
+}
+
 .btn-block {
  display: block;
  width: 100%;
@ -655,19 +684,23 @@ option {
  display: inline-flex;
  vertical-align: middle;

-  button {
+  > *,
+  > * .button-default {
+    --_roundness-left: 0;
+    --_roundness-right: 0;
+
    position: relative;
    flex: 1 1 auto;
-
-    &:not(:last-child) {
-      border-top-right-radius: 0;
-      border-bottom-right-radius: 0;
  }

-    &:not(:first-child) {
-      border-top-left-radius: 0;
-      border-bottom-left-radius: 0;
+  > *:first-child,
+  > *:first-child .button-default {
+    --_roundness-left: var(--roundness);
  }
+
+  > *:last-child,
+  > *:last-child .button-default {
+    --_roundness-right: var(--roundness);
  }
 }

@ -697,74 +730,64 @@ option {
  overflow: hidden;
  text-overflow: ellipsis;

-  &.badge-notification {
-    background-color: $fallback--cRed;
-    background-color: var(--badgeNotification, $fallback--cRed);
+  &.-dot,
+  &.-counter {
+    margin: 0;
+    position: absolute;
+  }
+
+  &.-dot {
+    min-height: 8px;
+    max-height: 8px;
+    min-width: 8px;
+    max-width: 8px;
+    padding: 0;
+    line-height: 0;
+    font-size: 0;
+    left: calc(50% - 4px);
+    top: calc(50% - 4px);
+    margin-left: 6px;
+    margin-top: -6px;
+  }
+
+  &.-counter {
+    border-radius: var(--roundness);
+    font-size: 0.75em;
+    line-height: 1;
+    text-align: right;
+    padding: 0.2em;
+    min-width: 0;
+    left: calc(50% - 0.5em);
+    top: calc(50% - 0.4em);
+    margin-left: 0.7em;
+    margin-top: -1em;
+  }
+
+  &.-neutral {
+    background-color: var(--badgeNeutral);
    color: white;
-    color: var(--badgeNotificationText, white);
+    color: var(--badgeNeutralText, white);
  }
 }

 .alert {
  margin: 0 0.35em;
  padding: 0 0.25em;
-  border-radius: $fallback--tooltipRadius;
-  border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
-
-  &.error {
-    background-color: $fallback--alertError;
-    background-color: var(--alertError, $fallback--alertError);
-    color: $fallback--text;
-    color: var(--alertErrorText, $fallback--text);
-
-    .panel-heading & {
-      color: $fallback--text;
-      color: var(--alertErrorPanelText, $fallback--text);
-    }
-  }
-
-  &.warning {
-    background-color: $fallback--alertWarning;
-    background-color: var(--alertWarning, $fallback--alertWarning);
-    color: $fallback--text;
-    color: var(--alertWarningText, $fallback--text);
-
-    .panel-heading & {
-      color: $fallback--text;
-      color: var(--alertWarningPanelText, $fallback--text);
-    }
-  }
-
-  &.success {
-    background-color: var(--alertSuccess, $fallback--alertWarning);
-    color: var(--alertSuccessText, $fallback--text);
-
-    .panel-heading & {
-      color: var(--alertSuccessPanelText, $fallback--text);
-    }
-  }
+  border-radius: var(--roundness);
+  border: 1px solid var(--border);
 }

 .faint {
-  color: $fallback--faint;
-  color: var(--faint, $fallback--faint);
-}
+  --text: var(--textFaint);
+  --link: var(--linkFaint);

-.faint-link {
-  color: $fallback--faint;
-  color: var(--faint, $fallback--faint);
-
-  &:hover {
-    text-decoration: underline;
-  }
+  color: var(--text);
 }

 .visibility-notice {
  padding: 0.5em;
-  border: 1px solid $fallback--faint;
-  border: 1px solid var(--faint, $fallback--faint);
-  border-radius: $fallback--inputRadius;
-  border-radius: var(--inputRadius, $fallback--inputRadius);
+  border: 1px solid var(--textFaint);
+  border-radius: var(--roundness);
 }

 .notice-dismissible {
@ -785,6 +808,10 @@ option {
  &.iconLetter {
    font-size: 1.1em;
  }
+
+  &.svg-inline--fa {
+    vertical-align: -0.15em;
+  }
 }

 .fa-old-padding {
@ -799,6 +826,11 @@ option {
  opacity: 0.25;
 }

+.timeago {
+  --link: var(--text);
+  --linkFaint: var(--textFaint);
+}
+
 .login-hint {
  text-align: center;

@ -897,3 +929,174 @@ option {
  padding: 0;
  position: absolute;
 }
+
+*::selection {
+  color: var(--selectionText);
+  background-color: var(--selectionBackground);
+}
+
+#splash {
+  pointer-events: none;
+  transition: opacity 2s;
+  opacity: 1;
+
+  &.hidden {
+    opacity: 0;
+  }
+
+  #status {
+    &.css-ok {
+      &::before {
+        display: inline-block;
+        content: "CSS OK";
+      }
+    }
+
+    .initial-text {
+      display: none;
+    }
+  }
+
+  #throbber {
+    animation-duration: 3s;
+    animation-name: bounce;
+    animation-iteration-count: infinite;
+    animation-direction: normal;
+    transform-origin: bottom center;
+
+    &.dead {
+      animation-name: dead;
+      animation-duration: 2s;
+      animation-iteration-count: 1;
+      transform: rotateX(90deg) rotateY(0) rotateZ(-45deg);
+    }
+
+    @keyframes dead {
+      0% {
+        transform: rotateX(0) rotateY(0) rotateZ(0);
+      }
+
+      5% {
+        transform: rotateX(0) rotateY(0) rotateZ(1deg);
+      }
+
+      10% {
+        transform: rotateX(0) rotateY(0) rotateZ(-2deg);
+      }
+
+      15% {
+        transform: rotateX(0) rotateY(0) rotateZ(3deg);
+      }
+
+      20% {
+        transform: rotateX(0) rotateY(0) rotateZ(0);
+      }
+
+      25% {
+        transform: rotateX(0) rotateY(0) rotateZ(0);
+      }
+
+      30% {
+        transform: rotateX(10deg) rotateY(0) rotateZ(0);
+      }
+
+      35% {
+        transform: rotateX(-10deg) rotateY(0) rotateZ(0);
+      }
+
+      40% {
+        transform: rotateX(10deg) rotateY(0) rotateZ(0);
+      }
+
+      45% {
+        transform: rotateX(-10deg) rotateY(0) rotateZ(0);
+      }
+
+      50% {
+        transform: rotateX(10deg) rotateY(0) rotateZ(0);
+      }
+
+      100% {
+        transform: rotateX(90deg) rotateY(0) rotateZ(-45deg);
+        transition-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06); /* easeInQuint */
+      }
+    }
+
+    @keyframes bounce {
+      0% {
+        scale: 1 1;
+        translate: 0 0;
+        animation-timing-function: ease-out;
+      }
+
+      10% {
+        scale: 1.2 0.8;
+        translate: 0 0;
+        transform: rotateZ(var(--defaultZ));
+        animation-timing-function: ease-out;
+      }
+
+      30% {
+        scale: 0.9 1.1;
+        translate: 0 -40%;
+        transform: rotateZ(var(--defaultZ));
+        animation-timing-function: ease-in;
+      }
+
+      40% {
+        scale: 1.1 0.9;
+        translate: 0 -50%;
+        transform: rotateZ(var(--defaultZ));
+        animation-timing-function: ease-in;
+      }
+
+      45% {
+        scale: 0.9 1.1;
+        translate: 0 -45%;
+        transform: rotateZ(var(--defaultZ));
+        animation-timing-function: ease-in;
+      }
+
+      50% {
+        scale: 1.05 0.95;
+        translate: 0 -40%;
+        animation-timing-function: ease-in;
+      }
+
+      55% {
+        scale: 0.985 1.025;
+        translate: 0 -35%;
+        transform: rotateZ(var(--defaultZ));
+        animation-timing-function: ease-in;
+      }
+
+      60% {
+        scale: 1.0125 0.9985;
+        translate: 0 -30%;
+        transform: rotateZ(var(--defaultZ));
+        animation-timing-function: ease-in;
+      }
+
+      80% {
+        scale: 1.0063 0.9938;
+        translate: 0 -10%;
+        transform: rotateZ(var(--defaultZ));
+        animation-timing-function: ease-in-ou;
+      }
+
+      90% {
+        scale: 1.2 0.8;
+        translate: 0 0;
+        transform: rotateZ(var(--defaultZ));
+        animation-timing-function: ease-out;
+      }
+
+      100% {
+        scale: 1 1;
+        translate: 0 0;
+        transform: rotateZ(var(--defaultZ));
+        animation-timing-function: ease-out;
+      }
+    }
+  }
+}
--- a/src/App.vue
+++ b/src/App.vue
@ -1,5 +1,6 @@
 <template>
  <div
+    v-show="$store.state.interface.themeApplied"
    id="app-loaded"
    :style="bgStyle"
  >
@ -69,7 +70,7 @@
    <PostStatusModal />
    <EditStatusModal v-if="editingAvailable" />
    <StatusHistoryModal v-if="editingAvailable" />
-    <SettingsModal />
+    <SettingsModal :class="layoutModalClass" />
    <UpdateNotification />
    <GlobalNoticeList />
  </div>
--- a/src/_variables.scss
+++ b/src/_variables.scss
@ -1,36 +0,0 @@
-$main-color: #f58d2c;
-$main-background: white;
-$darkened-background: whitesmoke;
-
-$fallback--bg: #121a24;
-$fallback--fg: #182230;
-$fallback--faint: rgb(185 185 186 / 50%);
-$fallback--text: #b9b9ba;
-$fallback--link: #d8a070;
-$fallback--icon: #666;
-$fallback--lightBg: rgb(21 30 42);
-$fallback--lightText: #b9b9ba;
-$fallback--border: #222;
-$fallback--cRed: #f00;
-$fallback--cBlue: #0095ff;
-$fallback--cGreen: #0fa00f;
-$fallback--cOrange: orange;
-
-$fallback--alertError: rgb(211 16 20 / 50%);
-$fallback--alertWarning: rgb(111 111 20 / 50%);
-
-$fallback--panelRadius: 10px;
-$fallback--checkboxRadius: 2px;
-$fallback--btnRadius: 4px;
-$fallback--inputRadius: 4px;
-$fallback--tooltipRadius: 5px;
-$fallback--avatarRadius: 4px;
-$fallback--avatarAltRadius: 10px;
-$fallback--attachmentRadius: 10px;
-$fallback--chatMessageRadius: 10px;
-
-$fallback--buttonShadow: 0 0 2px 0 rgb(0 0 0 / 100%),
-  0 1px 0 0 rgb(255 255 255 / 20%) inset,
-  0 -1px 0 0 rgb(0 0 0 / 20%) inset;
-
-$status-margin: 0.75em;
--- a/src/assets/pleromatan_apology.png
+++ b/src/assets/pleromatan_apology.png
--- a/src/assets/pleromatan_apology.png
+++ b/src/assets/pleromatan_apology.png
@ -0,0 +1 @@
+../../static/pleromatan_apology.png
--- a/src/assets/pleromatan_apology_fox.png
+++ b/src/assets/pleromatan_apology_fox.png
--- a/src/assets/pleromatan_apology_fox.png
+++ b/src/assets/pleromatan_apology_fox.png
@ -0,0 +1 @@
+../../static/pleromatan_apology_fox.png
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@ -13,9 +13,9 @@ import VBodyScrollLock from 'src/directives/body_scroll_lock'
 import { windowWidth, windowHeight } from '../services/window_utils/window_utils'
 import { getOrCreateApp, getClientToken } from '../services/new_api/oauth.js'
 import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
-import { CURRENT_VERSION } from '../services/theme_data/theme_data.service.js'
-import { applyTheme, applyConfig } from '../services/style_setter/style_setter.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 { useI18nStore } from '../stores/i18n'
 import { useInterfaceStore } from '../stores/interface'
@ -126,6 +126,9 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
    store.dispatch('setInstanceOption', { name, value: config[name] })
  }

+  copyInstanceOption('theme')
+  copyInstanceOption('style')
+  copyInstanceOption('palette')
  copyInstanceOption('nsfwCensorImage')
  copyInstanceOption('background')
  copyInstanceOption('hidePostStats')
@ -163,8 +166,6 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
  copyInstanceOption('showFeaturesPanel')
  copyInstanceOption('hideSitename')
  copyInstanceOption('sidebarRight')
-
-  return store.dispatch('setTheme', config.theme)
 }

 const getTOS = async ({ store }) => {
@ -177,8 +178,7 @@ const getTOS = async ({ store }) => {
      throw (res)
    }
  } catch (e) {
-    console.warn("Can't load TOS")
-    console.warn(e)
+    console.warn("Can't load TOS\n", e)
  }
 }

@ -192,8 +192,7 @@ const getInstancePanel = async ({ store }) => {
      throw (res)
    }
  } catch (e) {
-    console.warn("Can't load instance panel")
-    console.warn(e)
+    console.warn("Can't load instance panel\n", e)
  }
 }

@ -223,8 +222,7 @@ const getStickers = async ({ store }) => {
      throw (res)
    }
  } catch (e) {
-    console.warn("Can't load stickers")
-    console.warn(e)
+    console.warn("Can't load stickers\n", e)
  }
 }

@ -246,7 +244,7 @@ const resolveStaffAccounts = ({ store, accounts }) => {

 const getNodeInfo = async ({ store }) => {
  try {
-    const res = await preloadFetch('/nodeinfo/2.0.json')
+    const res = await preloadFetch('/nodeinfo/2.1.json')
    if (res.ok) {
      const data = await res.json()
      const metadata = data.metadata
@ -258,11 +256,14 @@ const getNodeInfo = async ({ store }) => {
      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') })
+      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') })

      const uploadLimits = metadata.uploadLimits
      store.dispatch('setInstanceOption', { name: 'uploadlimit', value: parseInt(uploadLimits.general) })
@ -280,6 +281,7 @@ const getNodeInfo = async ({ store }) => {

      const software = data.software
      store.dispatch('setInstanceOption', { name: 'backendVersion', value: software.version })
+      store.dispatch('setInstanceOption', { name: 'backendRepository', value: software.repository })
      store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: software.name === 'pleroma' })

      const priv = metadata.private
@ -329,17 +331,10 @@ const setConfig = async ({ store }) => {
 }

 const checkOAuthToken = async ({ store }) => {
-  // eslint-disable-next-line no-async-promise-executor
-  return new Promise(async (resolve, reject) => {
  if (store.getters.getUserToken()) {
-      try {
-        await store.dispatch('loginUser', store.getters.getUserToken())
-      } catch (e) {
-        console.error(e)
+    return store.dispatch('loginUser', store.getters.getUserToken())
  }
-    }
-    resolve()
-  })
+  return Promise.resolve()
 }

 const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => {
@ -354,30 +349,23 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => {
  useInterfaceStore().setLayoutHeight(windowHeight())

  FaviconService.initFaviconService()
+  initServiceWorker(store)
+
+  window.addEventListener('focus', () => updateFocus())

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

  await setConfig({ store })
-
-  const { customTheme, customThemeSource } = store.state.config
-  const { theme } = store.state.instance
-  const customThemePresent = customThemeSource || customTheme
-
-  if (customThemePresent) {
-    if (customThemeSource && customThemeSource.themeEngineVersion === CURRENT_VERSION) {
-      applyTheme(customThemeSource)
-    } else {
-      applyTheme(customTheme)
-    }
-  } else if (theme) {
-    // do nothing, it will load asynchronously
-  } else {
-    console.error('Failed to load any theme!')
+  try {
+    await store.dispatch('applyTheme').catch((e) => { console.error('Error setting theme', e) })
+  } catch (e) {
+    window.splashError(e)
+    return Promise.reject(e)
  }

-  applyConfig(store.state.config)
+  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
@ -386,7 +374,9 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => {
    getInstancePanel({ store }),
    getNodeInfo({ store }),
    getInstanceConfig({ store })
-  ])
+  ]).catch(e => Promise.reject(e))
+
+  await store.dispatch('loadDrafts')

  // Start fetching things that don't need to block the UI
  store.dispatch('fetchMutes')
@ -411,6 +401,13 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => {
  app.use(store)
  app.use(i18n)

+  // Little thing to get out of invalid theme state
+  window.resetThemes = () => {
+    store.dispatch('resetThemeV3')
+    store.dispatch('resetThemeV3Palette')
+    store.dispatch('resetThemeV2')
+  }
+
  app.use(vClickOutside)
  app.use(VBodyScrollLock)
  app.use(VueVirtualScroller)
@ -422,7 +419,6 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => {
  app.config.unwrapInjectedRef = true

  app.mount('#app')
-
  return app
 }

--- a/src/boot/routes.js
+++ b/src/boot/routes.js
@ -25,6 +25,10 @@ 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 AnnouncementsPage from 'components/announcements_page/announcements_page.vue'
+import QuotesTimeline from '../components/quotes_timeline/quotes_timeline.vue'
+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) => {
@ -51,6 +55,7 @@ export default (store) => {
    { name: 'tag-timeline', path: '/tag/:tag', component: TagTimeline },
    { name: 'bookmarks', path: '/bookmarks', component: BookmarkTimeline },
    { 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([^/@]+)',
@ -78,13 +83,18 @@ export default (store) => {
    { 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: 'drafts', path: '/drafts', component: Drafts },
    { name: 'user-profile', path: '/users/:name', component: UserProfile },
    { name: 'legacy-user-profile', path: '/:name', component: UserProfile },
    { name: 'lists', path: '/lists', component: Lists },
    { 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: '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 (store.state.instance.pleromaChatMessagesAvailable) {
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@ -9,61 +9,81 @@
      <template #content>
        <div class="dropdown-menu">
          <template v-if="relationship.following">
-            <button
+            <div
              v-if="relationship.showing_reblogs"
-              class="btn button-default dropdown-item"
+              class="menu-item dropdown-item"
+            >
+              <button
+                class="main-button"
                @click="hideRepeats"
              >
                {{ $t('user_card.hide_repeats') }}
              </button>
-            <button
+            </div>
+            <div
              v-if="!relationship.showing_reblogs"
-              class="btn button-default dropdown-item"
+              class="menu-item dropdown-item"
+            >
+              <button
+                class="main-button"
                @click="showRepeats"
              >
                {{ $t('user_card.show_repeats') }}
              </button>
+            </div>
            <div
              role="separator"
              class="dropdown-divider"
            />
          </template>
          <UserListMenu :user="user" />
-          <button
+          <div
            v-if="relationship.followed_by"
-            class="btn button-default btn-block dropdown-item"
+            class="menu-item dropdown-item"
+          >
+            <button
+              class="main-button"
              @click="removeUserFromFollowers"
            >
              {{ $t('user_card.remove_follower') }}
            </button>
+          </div>
+          <div class="menu-item dropdown-item">
            <button
              v-if="relationship.blocking"
-            class="btn button-default btn-block dropdown-item"
+              class="main-button"
              @click="unblockUser"
            >
              {{ $t('user_card.unblock') }}
            </button>
            <button
              v-else
-            class="btn button-default btn-block dropdown-item"
+              class="main-button"
              @click="blockUser"
            >
              {{ $t('user_card.block') }}
            </button>
+          </div>
+          <div class="menu-item dropdown-item">
            <button
-            class="btn button-default btn-block dropdown-item"
+              class="main-button"
              @click="reportUser"
            >
              {{ $t('user_card.report') }}
            </button>
-          <button
+          </div>
+          <div
            v-if="pleromaChatMessagesAvailable"
-            class="btn button-default btn-block dropdown-item"
+            class="menu-item dropdown-item"
+          >
+            <button
+              class="main-button"
              @click="openChat"
            >
              {{ $t('user_card.message') }}
            </button>
          </div>
+        </div>
      </template>
      <template #trigger>
        <button class="button-unstyled ellipsis-button">
@ -86,6 +106,7 @@
        <i18n-t
          keypath="user_card.block_confirm"
          tag="span"
+          scope="global"
        >
          <template #user>
            <span
@ -107,6 +128,7 @@
        <i18n-t
          keypath="user_card.remove_follower_confirm"
          tag="span"
+          scope="global"
        >
          <template #user>
            <span
@ -122,19 +144,12 @@
 <script src="./account_actions.js"></script>

 <style lang="scss">
-@import "../../variables";
-
 .AccountActions {
  .ellipsis-button {
    width: 2.5em;
    margin: -0.5em 0;
    padding: 0.5em 0;
    text-align: center;
-
-    &:not(:hover) .icon {
-      color: $fallback--lightText;
-      color: var(--lightText, $fallback--lightText);
-    }
  }
 }
 </style>
--- a/src/components/alert.style.js
+++ b/src/components/alert.style.js
@ -0,0 +1,57 @@
+export default {
+  name: 'Alert',
+  selector: '.alert',
+  validInnerComponents: [
+    'Text',
+    'Icon',
+    'Link',
+    'Border',
+    'ButtonUnstyled'
+  ],
+  variants: {
+    normal: '.neutral',
+    error: '.error',
+    warning: '.warning',
+    success: '.success'
+  },
+  editor: {
+    border: 1,
+    aspect: '3 / 1'
+  },
+  defaultRules: [
+    {
+      directives: {
+        background: '--text',
+        opacity: 0.5,
+        blur: '9px'
+      }
+    },
+    {
+      parent: {
+        component: 'Alert'
+      },
+      component: 'Border',
+      directives: {
+        textColor: '--parent'
+      }
+    },
+    {
+      variant: 'error',
+      directives: {
+        background: '--cRed'
+      }
+    },
+    {
+      variant: 'warning',
+      directives: {
+        background: '--cOrange'
+      }
+    },
+    {
+      variant: 'success',
+      directives: {
+        background: '--cGreen'
+      }
+    }
+  ]
+}
--- a/src/components/announcement/announcement.vue
+++ b/src/components/announcement/announcement.vue
@ -99,16 +99,14 @@
 <script src="./announcement.js"></script>

 <style lang="scss">
-@import "../../variables";
-
 .announcement {
-  border-bottom: 1px solid var(--border, $fallback--border);
+  border-bottom: 1px solid var(--border);
  border-radius: 0;
-  padding: var(--status-margin, $status-margin);
+  padding: var(--status-margin);

  .heading,
  .body {
-    margin-bottom: var(--status-margin, $status-margin);
+    margin-bottom: var(--status-margin);
  }

  .footer {
--- a/src/components/announcement_editor/announcement_editor.vue
+++ b/src/components/announcement_editor/announcement_editor.vue
@ -3,7 +3,7 @@
    <textarea
      ref="textarea"
      v-model="announcement.content"
-      class="post-textarea"
+      class="input post-textarea"
      rows="1"
      cols="1"
      :placeholder="$t('announcements.post_placeholder')"
@ -14,6 +14,7 @@
      <input
        id="announcement-start-time"
        v-model="announcement.startsAt"
+        class="input"
        :type="announcement.allDay ? 'date' : 'datetime-local'"
        :disabled="disabled"
      >
@ -23,6 +24,7 @@
      <input
        id="announcement-end-time"
        v-model="announcement.endsAt"
+        class="input"
        :type="announcement.allDay ? 'date' : 'datetime-local'"
        :disabled="disabled"
      >
@ -32,8 +34,9 @@
        id="announcement-all-day"
        v-model="announcement.allDay"
        :disabled="disabled"
-      />
-      <label for="announcement-all-day">{{ $t('announcements.all_day_prompt') }}</label>
+      >
+        {{ $t('announcements.all_day_prompt') }}
+      </Checkbox>
    </span>
  </div>
 </template>
--- a/src/components/announcements_page/announcements_page.vue
+++ b/src/components/announcements_page/announcements_page.vue
@ -1,9 +1,9 @@
 <template>
  <div class="panel panel-default announcements-page">
    <div class="panel-heading">
-      <span>
+      <h1 class="title">
        {{ $t('announcements.page_header') }}
-      </span>
+      </h1>
    </div>
    <div class="panel-body">
      <section
@ -61,15 +61,13 @@
 <script src="./announcements_page.js"></script>

 <style lang="scss">
-@import "../../variables";
-
 .announcements-page {
  .post-form {
-    padding: var(--status-margin, $status-margin);
+    padding: var(--status-margin);

    .heading,
    .body {
-      margin-bottom: var(--status-margin, $status-margin);
+      margin-bottom: var(--status-margin);
    }

    .post-button {
--- a/src/components/attachment/attachment.scss
+++ b/src/components/attachment/attachment.scss
@ -1,5 +1,3 @@
-@import "../../variables";
-
 .Attachment {
  display: inline-flex;
  flex-direction: column;
@ -9,10 +7,8 @@
  height: 100%;
  border-style: solid;
  border-width: 1px;
-  border-radius: $fallback--attachmentRadius;
-  border-radius: var(--attachmentRadius, $fallback--attachmentRadius);
-  border-color: $fallback--border;
-  border-color: var(--border, $fallback--border);
+  border-radius: var(--roundness);
+  border-color: var(--border);

  .attachment-wrapper {
    flex: 1 1 auto;
@ -84,6 +80,13 @@
    }
  }

+  .video-container {
+    border: none;
+    outline: none;
+    color: inherit;
+    background: transparent;
+  }
+
  .audio-container {
    display: flex;
    align-items: flex-end;
@ -126,23 +129,12 @@

    .attachment-button {
      padding: 0;
-      border-radius: $fallback--tooltipRadius;
-      border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
+      border-radius: var(--roundness);
      text-align: center;
      width: 2em;
      height: 2em;
      margin-left: 0.5em;
      font-size: 1.25em;
-      // TODO: theming? hard to theme with unknown background image color
-      background: rgb(230 230 230 / 70%);
-
-      .svg-inline--fa {
-        color: rgb(0 0 0 / 60%);
-      }
-
-      &:hover .svg-inline--fa {
-        color: rgb(0 0 0 / 90%);
-      }
    }
  }

@ -217,8 +209,7 @@

  &.-placeholder {
    display: inline-block;
-    color: $fallback--link;
-    color: var(--postLink, $fallback--link);
+    color: var(--link);
    overflow: hidden;
    white-space: nowrap;
    height: auto;
--- a/src/components/attachment/attachment.style.js
+++ b/src/components/attachment/attachment.style.js
@ -0,0 +1,25 @@
+export default {
+  name: 'Attachment',
+  selector: '.Attachment',
+  notEditable: true,
+  validInnerComponents: [
+    'Border',
+    'ButtonUnstyled',
+    'Input'
+  ],
+  defaultRules: [
+    {
+      directives: {
+        roundness: 3
+      }
+    },
+    {
+      component: 'ButtonUnstyled',
+      parent: { component: 'Attachment' },
+      directives: {
+        background: '#FFFFFF',
+        opacity: 0.5
+      }
+    }
+  ]
+}
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@ -38,7 +38,7 @@
        v-if="edit"
        v-model="localDescription"
        type="text"
-        class="description-field"
+        class="input description-field"
        :placeholder="$t('post_status.media_description')"
        @keydown.enter.prevent=""
      >
@ -175,7 +175,6 @@
        :is="videoTag"
        v-if="type === 'video' && !hidden"
        class="video-container"
-        :class="{ 'button-unstyled': 'isModal' }"
        :href="attachment.url"
        @click.stop.prevent="openModal"
      >
@ -253,7 +252,7 @@
        v-if="edit"
        v-model="localDescription"
        type="text"
-        class="description-field"
+        class="input description-field"
        :placeholder="$t('post_status.media_description')"
        @keydown.enter.prevent=""
      >
--- a/src/components/autosuggest/autosuggest.vue
+++ b/src/components/autosuggest/autosuggest.vue
@ -1,3 +1,4 @@
+<!-- FIXME THIS NEEDS TO BE REFACTORED TO USE POPOVER -->
 <template>
  <div
    v-click-outside="onClickOutside"
@ -6,12 +7,12 @@
    <input
      v-model="term"
      :placeholder="placeholder"
-      class="autosuggest-input"
+      class="input autosuggest-input"
      @click="onInputClick"
    >
    <div
      v-if="resultsVisible && filtered.length > 0"
-      class="autosuggest-results"
+      class="panel autosuggest-results"
    >
      <slot
        v-for="item in filtered"
@ -24,8 +25,6 @@
 <script src="./autosuggest.js"></script>

 <style lang="scss">
-@import "../../variables";
-
 .autosuggest {
  position: relative;

@ -40,18 +39,15 @@
    top: 100%;
    right: 0;
    max-height: 400px;
-    background-color: $fallback--bg;
-    background-color: var(--bg, $fallback--bg);
+    background-color: var(--bg);
    border-style: solid;
    border-width: 1px;
-    border-color: $fallback--border;
-    border-color: var(--border, $fallback--border);
-    border-radius: $fallback--inputRadius;
-    border-radius: var(--inputRadius, $fallback--inputRadius);
+    border-color: var(--border);
+    border-radius: var(--roundness);
    border-top-left-radius: 0;
    border-top-right-radius: 0;
    box-shadow: 1px 1px 4px rgb(0 0 0 / 60%);
-    box-shadow: var(--panelShadow);
+    box-shadow: var(--shadow);
    overflow-y: auto;
    z-index: 1;
  }
--- a/src/components/avatar_list/avatar_list.vue
+++ b/src/components/avatar_list/avatar_list.vue
@ -17,8 +17,6 @@
 <script src="./avatar_list.js"></script>

 <style lang="scss">
-@import "../../variables";
-
 .avatars {
  display: flex;
  margin: 0;
@ -36,8 +34,7 @@
    }

    .avatar-small {
-      border-radius: $fallback--avatarAltRadius;
-      border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
+      border-radius: var(--roundness);
      height: 24px;
      width: 24px;
    }
--- a/src/components/badge.style.js
+++ b/src/components/badge.style.js
@ -0,0 +1,30 @@
+export default {
+  name: 'Badge',
+  selector: '.badge',
+  validInnerComponents: [
+    'Text',
+    'Icon'
+  ],
+  variants: {
+    notification: '.-notification'
+  },
+  defaultRules: [
+    {
+      component: 'Root',
+      directives: {
+        '--badgeNotification': 'color | --cRed'
+      }
+    },
+    {
+      directives: {
+        background: '--cGreen'
+      }
+    },
+    {
+      variant: 'notification',
+      directives: {
+        background: '--cRed'
+      }
+    }
+  ]
+}
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@ -47,9 +47,8 @@
  display: flex;
  flex: 1 0;
  margin: 0;
-  padding: 0.6em 1em;

-  --emoji-size: 14px;
+  --emoji-size: 1em;

  &-collapsed-content {
    margin-left: 0.7em;
--- a/src/components/bookmark_folder_card/bookmark_folder_card.js
+++ b/src/components/bookmark_folder_card/bookmark_folder_card.js
@ -0,0 +1,22 @@
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faEllipsisH
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faEllipsisH
+)
+
+const BookmarkFolderCard = {
+  props: [
+    'folder',
+    'allBookmarks'
+  ],
+  computed: {
+    firstLetter () {
+      return this.folder ? this.folder.name[0] : null
+    }
+  }
+}
+
+export default BookmarkFolderCard
--- a/src/components/bookmark_folder_card/bookmark_folder_card.vue
+++ b/src/components/bookmark_folder_card/bookmark_folder_card.vue
@ -0,0 +1,111 @@
+<template>
+  <div
+    v-if="allBookmarks"
+    class="bookmark-folder-card"
+  >
+    <router-link
+      :to="{ name: 'bookmarks' }"
+      class="bookmark-folder-name"
+    >
+      <span class="icon">
+        <FAIcon
+          fixed-width
+          class="fa-scale-110 menu-icon"
+          icon="bookmark"
+        />
+      </span>{{ $t('nav.all_bookmarks') }}
+    </router-link>
+  </div>
+  <div
+    v-else
+    class="bookmark-folder-card"
+  >
+    <router-link
+      :to="{ name: 'bookmark-folder', params: { id: folder.id } }"
+      class="bookmark-folder-name"
+    >
+      <img
+        v-if="folder.emoji_url"
+        class="iconEmoji iconEmoji-image"
+        :src="folder.emoji_url"
+        :alt="folder.emoji"
+        :title="folder.emoji"
+      >
+      <span
+        v-else-if="folder.emoji"
+        class="iconEmoji"
+      >
+        <span>
+          {{ folder.emoji }}
+        </span>
+      </span>
+      <span
+        v-else-if="firstLetter"
+        class="icon iconLetter fa-scale-110"
+      >{{ firstLetter }}</span>{{ folder.name }}
+    </router-link>
+    <router-link
+      :to="{ name: 'bookmark-folder-edit', params: { id: folder.id } }"
+      class="button-folder-edit"
+    >
+      <FAIcon
+        class="fa-scale-110 fa-old-padding"
+        icon="ellipsis-h"
+      />
+    </router-link>
+  </div>
+</template>
+
+<script src="./bookmark_folder_card.js"></script>
+
+<style lang="scss">
+.bookmark-folder-card {
+  display: flex;
+  align-items: center;
+}
+
+a.bookmark-folder-name {
+  display: flex;
+  align-items: center;
+  flex-grow: 1;
+
+  .icon,
+  .iconLetter,
+  .iconEmoji {
+    display: inline-block;
+    height: 2.5rem;
+    width: 2.5rem;
+    margin-right: 0.5rem;
+  }
+
+  .icon,
+  .iconLetter {
+    font-size: 1.5rem;
+    line-height: 2.5rem;
+    text-align: center;
+  }
+
+  .iconEmoji {
+    text-align: center;
+    object-fit: contain;
+    vertical-align: middle;
+
+    > span {
+      font-size: 1.5rem;
+      line-height: 2.5rem;
+    }
+  }
+
+  img.iconEmoji {
+    padding: 0.25em;
+    box-sizing: border-box;
+  }
+}
+
+.bookmark-folder-name,
+.button-folder-edit {
+  margin: 0;
+  padding: 1em;
+  color: var(--link);
+}
+</style>
--- a/src/components/bookmark_folder_edit/bookmark_folder_edit.js
+++ b/src/components/bookmark_folder_edit/bookmark_folder_edit.js
@ -0,0 +1,80 @@
+import EmojiPicker from '../emoji_picker/emoji_picker.vue'
+import apiService from '../../services/api/api.service'
+
+const BookmarkFolderEdit = {
+  data () {
+    return {
+      name: '',
+      nameDraft: '',
+      emoji: '',
+      emojiUrl: null,
+      emojiDraft: '',
+      emojiUrlDraft: null,
+      emojiPickerExpanded: false,
+      reallyDelete: false
+    }
+  },
+  components: {
+    EmojiPicker
+  },
+  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
+
+        this.nameDraft = this.name = folder.name
+        this.emojiDraft = this.emoji = folder.emoji
+        this.emojiUrlDraft = this.emojiUrl = folder.emoji_url
+      })
+  },
+  computed: {
+    id () {
+      return this.$route.params.id
+    }
+  },
+  methods: {
+    selectEmoji (event) {
+      this.emojiDraft = event.insertion
+      this.emojiUrlDraft = event.insertionUrl
+    },
+    showEmojiPicker () {
+      if (!this.emojiPickerExpanded) {
+        this.$refs.picker.showPicker()
+      }
+    },
+    onShowPicker () {
+      this.emojiPickerExpanded = true
+    },
+    onClosePicker () {
+      this.emojiPickerExpanded = false
+    },
+    updateFolder () {
+      this.$store.dispatch('setBookmarkFolder', { folderId: this.id, name: this.nameDraft, emoji: this.emojiDraft })
+        .then(() => {
+          this.$router.push({ name: 'bookmark-folders' })
+        })
+    },
+    createFolder () {
+      this.$store.dispatch('createBookmarkFolder', { name: this.nameDraft, emoji: this.emojiDraft })
+        .then(() => {
+          this.$router.push({ name: 'bookmark-folders' })
+        })
+        .catch((e) => {
+          this.$store.dispatch('pushGlobalNotice', {
+            messageKey: 'bookmark_folders.error',
+            messageArgs: [e.message],
+            level: 'error'
+          })
+        })
+    },
+    deleteFolder () {
+      this.$store.dispatch('deleteBookmarkFolder', { folderId: this.id })
+      this.$router.push({ name: 'bookmark-folders' })
+    }
+  }
+}
+
+export default BookmarkFolderEdit
--- a/src/components/bookmark_folder_edit/bookmark_folder_edit.vue
+++ b/src/components/bookmark_folder_edit/bookmark_folder_edit.vue
@ -0,0 +1,200 @@
+<template>
+  <div class="panel-default panel BookmarkFolderEdit">
+    <div
+      ref="header"
+      class="panel-heading folder-edit-heading"
+    >
+      <button
+        class="button-unstyled go-back-button"
+        @click="$router.back"
+      >
+        <FAIcon
+          size="lg"
+          icon="chevron-left"
+        />
+      </button>
+      <h1 class="title">
+        <i18n-t
+          v-if="id"
+          keypath="bookmark_folders.editing_folder"
+          scope="global"
+        >
+          <template #folderName>
+            {{ name }}
+          </template>
+        </i18n-t>
+        <i18n-t
+          v-else
+          keypath="bookmark_folders.creating_folder"
+          scope="global"
+        />
+      </h1>
+    </div>
+    <div class="panel-body">
+      <div class="input-wrap">
+        <label for="folder-edit-title">{{ $t('bookmark_folders.emoji') }}</label>
+        <button
+          class="input input-emoji"
+          :title="$t('bookmark_folder.emoji_pick')"
+          @click="showEmojiPicker"
+        >
+          <img
+            v-if="emojiUrlDraft"
+            class="iconEmoji iconEmoji-image"
+            :src="emojiUrlDraft"
+            :alt="emojiDraft"
+            :title="emojiDraft"
+          >
+          <span
+            v-else-if="emojiDraft"
+            class="iconEmoji"
+          >
+            <span>
+              {{ emojiDraft }}
+            </span>
+          </span>
+        </button>
+        <EmojiPicker
+          ref="picker"
+          class="emoji-picker-panel"
+          @emoji="selectEmoji"
+          @show="onShowPicker"
+          @close="onClosePicker"
+        />
+      </div>
+      <div class="input-wrap">
+        <label for="folder-edit-title">{{ $t('bookmark_folders.name') }}</label>
+        <input
+          id="folder-edit-title"
+          ref="name"
+          v-model="nameDraft"
+          class="input"
+        >
+      </div>
+    </div>
+    <div class="panel-footer">
+      <span class="spacer" />
+      <button
+        v-if="!id"
+        class="btn button-default footer-button"
+        @click="createFolder"
+      >
+        {{ $t('bookmark_folders.create') }}
+      </button>
+      <button
+        v-else-if="!reallyDelete"
+        class="btn button-default footer-button"
+        @click="reallyDelete = true"
+      >
+        {{ $t('bookmark_folders.delete') }}
+      </button>
+      <template v-else>
+        {{ $t('bookmark_folders.really_delete') }}
+        <button
+          class="btn button-default footer-button"
+          @click="deleteFolder"
+        >
+          {{ $t('general.yes') }}
+        </button>
+        <button
+          class="btn button-default footer-button"
+          @click="reallyDelete = false"
+        >
+          {{ $t('general.no') }}
+        </button>
+      </template>
+      <div
+        v-if="id && !reallyDelete"
+      >
+        <button
+          class="btn button-default follow-button"
+          @click="updateFolder"
+        >
+          {{ $t('bookmark_folders.update_folder') }}
+        </button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script src="./bookmark_folder_edit.js"></script>
+
+<style lang="scss">
+.BookmarkFolderEdit {
+  --panel-body-padding: 0.5em;
+
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+
+  .folder-edit-heading {
+    grid-template-columns: auto minmax(50%, 1fr);
+  }
+
+  .panel-body {
+    display: flex;
+    gap: 0.5em;
+  }
+
+  .emoji-picker-panel {
+    position: absolute;
+    z-index: 20;
+    margin-top: 2px;
+
+    &.hide {
+      display: none;
+    }
+  }
+
+  .input-emoji {
+    height: 2.5em;
+    width: 2.5em;
+    padding: 0;
+
+    .iconEmoji {
+      display: inline-block;
+      text-align: center;
+      object-fit: contain;
+      vertical-align: middle;
+      height: 2.5em;
+      width: 2.5em;
+
+      > span {
+        font-size: 1.5rem;
+        line-height: 2.5rem;
+      }
+    }
+
+    img.iconEmoji {
+      padding: 0.25em;
+      box-sizing: border-box;
+    }
+  }
+
+  .input-wrap {
+    display: flex;
+    flex-direction: column;
+    gap: 0.5em;
+  }
+
+  .go-back-button {
+    text-align: center;
+    line-height: 1;
+    height: 100%;
+    align-self: start;
+    width: var(--__panel-heading-height-inner);
+  }
+
+  .btn {
+    margin: 0 0.5em;
+  }
+
+  .panel-footer {
+    grid-template-columns: minmax(10%, 1fr);
+
+    .footer-button {
+      min-width: 9em;
+    }
+  }
+}
+</style>
--- a/src/components/bookmark_folders/bookmark_folders.js
+++ b/src/components/bookmark_folders/bookmark_folders.js
@ -0,0 +1,27 @@
+import BookmarkFolderCard from '../bookmark_folder_card/bookmark_folder_card.vue'
+
+const BookmarkFolders = {
+  data () {
+    return {
+      isNew: false
+    }
+  },
+  components: {
+    BookmarkFolderCard
+  },
+  computed: {
+    bookmarkFolders () {
+      return this.$store.state.bookmarkFolders.allFolders
+    }
+  },
+  methods: {
+    cancelNewFolder () {
+      this.isNew = false
+    },
+    newFolder () {
+      this.isNew = true
+    }
+  }
+}
+
+export default BookmarkFolders
--- a/src/components/bookmark_folders/bookmark_folders.vue
+++ b/src/components/bookmark_folders/bookmark_folders.vue
@ -0,0 +1,37 @@
+<template>
+  <div class="Bookmark-folders panel panel-default">
+    <div class="panel-heading">
+      <h1 class="title">
+        {{ $t('nav.bookmark_folders') }}
+      </h1>
+      <router-link
+        :to="{ name: 'bookmark-folder-new' }"
+        class="button-default btn new-folder-button"
+      >
+        {{ $t("bookmark_folders.new") }}
+      </router-link>
+    </div>
+    <div class="panel-body">
+      <BookmarkFolderCard
+        :all-bookmarks="true"
+        class="list-item"
+      />
+      <BookmarkFolderCard
+        v-for="folder in bookmarkFolders.slice().reverse()"
+        :key="folder"
+        :folder="folder"
+        class="list-item"
+      />
+    </div>
+  </div>
+</template>
+
+<script src="./bookmark_folders.js"></script>
+
+<style lang="scss">
+.Bookmark-folders {
+  .new-folder-button {
+    padding: 0 0.5em;
+  }
+}
+</style>
--- a/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js
+++ b/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js
@ -0,0 +1,19 @@
+import { mapState } from 'vuex'
+import NavigationEntry from 'src/components/navigation/navigation_entry.vue'
+import { getBookmarkFolderEntries } from 'src/components/navigation/filter.js'
+
+export const BookmarkFoldersMenuContent = {
+  props: [
+    'showPin'
+  ],
+  components: {
+    NavigationEntry
+  },
+  computed: {
+    ...mapState({
+      folders: getBookmarkFolderEntries
+    })
+  }
+}
+
+export default BookmarkFoldersMenuContent
--- a/src/components/bookmark_folders_menu/bookmark_folders_menu_content.vue
+++ b/src/components/bookmark_folders_menu/bookmark_folders_menu_content.vue
@ -0,0 +1,21 @@
+<template>
+  <ul>
+    <NavigationEntry
+      :item="{
+        name: 'bookmarks',
+        routeObject: { name: 'bookmarks' },
+        label: 'nav.all_bookmarks',
+        icon: 'bookmark'
+      }"
+      :show-pin="showPin"
+    />
+    <NavigationEntry
+      v-for="item in folders"
+      :key="item.id"
+      :show-pin="showPin"
+      :item="item"
+    />
+  </ul>
+</template>
+
+<script src="./bookmark_folders_menu_content.js"></script>
--- a/src/components/bookmark_timeline/bookmark_timeline.js
+++ b/src/components/bookmark_timeline/bookmark_timeline.js
@ -1,16 +1,31 @@
 import Timeline from '../timeline/timeline.vue'

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

--- a/src/components/bookmark_timeline/bookmark_timeline.vue
+++ b/src/components/bookmark_timeline/bookmark_timeline.vue
@ -3,6 +3,7 @@
    :title="$t('nav.bookmarks')"
    :timeline="timeline"
    :timeline-name="'bookmarks'"
+    :bookmark-folder-id="folderId"
  />
 </template>

--- a/src/components/border.style.js
+++ b/src/components/border.style.js
@ -0,0 +1,13 @@
+export default {
+  name: 'Border',
+  selector: '/*border*/',
+  virtual: true,
+  defaultRules: [
+    {
+      directives: {
+        textColor: '$mod(--parent 10)',
+        textAuto: 'no-auto'
+      }
+    }
+  ]
+}
--- a/src/components/button.style.js
+++ b/src/components/button.style.js
@ -0,0 +1,129 @@
+export default {
+  name: 'Button', // Name of the component
+  selector: '.button-default', // CSS selector/prefix
+  // outOfTreeSelector: '' // out-of-tree selector is used when other components are laid over it but it's not part of the tree, see Underlay component
+  // States, system witll calculate ALL possible combinations of those and prepend "normal" to them + standalone "normal" state
+  states: {
+    // States are a bit expensive - the amount of combinations generated is about (1/6)n^3+n, so adding more state increased number of combination by an order of magnitude!
+    // All states inherit from "normal" state, there is no other inheirtance, i.e. hover+disabled only inherits from "normal", not from hover nor disabled.
+    // However, cascading still works, so resulting state will be result of merging of all relevant states/variants
+    // normal: '' // normal state is implicitly added, it is always included
+    toggled: '.toggled',
+    focused: ':focus-visible',
+    pressed: ':focus:active',
+    hover: ':hover:not(: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'
+    // 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'
+  },
+  // 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'
+  ],
+  // Default rules, used as "default theme", essentially.
+  defaultRules: [
+    {
+      component: 'Root',
+      directives: {
+        '--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)'
+      }
+    },
+    {
+      // component: 'Button', // no need to specify components every time unless you're specifying how other component should look
+      // like within it
+      directives: {
+        background: '--fg',
+        shadow: ['--buttonDefaultShadow', '--buttonDefaultBevel'],
+        roundness: 3
+      }
+    },
+    {
+      state: ['hover'],
+      directives: {
+        shadow: ['--buttonDefaultHoverGlow', '--buttonDefaultBevel']
+      }
+    },
+    {
+      state: ['focused'],
+      directives: {
+        shadow: ['--buttonDefaultFocusGlow', '--buttonDefaultBevel']
+      }
+    },
+    {
+      state: ['pressed'],
+      directives: {
+        shadow: ['--buttonDefaultShadow', '--buttonPressedBevel']
+      }
+    },
+    {
+      state: ['pressed', 'hover'],
+      directives: {
+        shadow: ['--buttonPressedBevel', '--buttonDefaultHoverGlow']
+      }
+    },
+    {
+      state: ['toggled'],
+      directives: {
+        background: '--accent,-24.2',
+        shadow: ['--buttonDefaultShadow', '--buttonPressedBevel']
+      }
+    },
+    {
+      state: ['toggled', 'hover'],
+      directives: {
+        background: '--accent,-24.2',
+        shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel']
+      }
+    },
+    {
+      state: ['toggled', 'disabled'],
+      directives: {
+        background: '$blend(--accent 0.25 --parent)',
+        shadow: ['--buttonPressedBevel']
+      }
+    },
+    {
+      state: ['disabled'],
+      directives: {
+        background: '$blend(--accent 0.25 --parent)',
+        shadow: ['--buttonDefaultBevel']
+      }
+    },
+    {
+      component: 'Text',
+      parent: {
+        component: 'Button',
+        state: ['disabled']
+      },
+      directives: {
+        textOpacity: 0.25,
+        textOpacityMode: 'blend'
+      }
+    },
+    {
+      component: 'Icon',
+      parent: {
+        component: 'Button',
+        state: ['disabled']
+      },
+      directives: {
+        textOpacity: 0.25,
+        textOpacityMode: 'blend'
+      }
+    }
+  ]
+}
--- a/src/components/button_unstyled.style.js
+++ b/src/components/button_unstyled.style.js
@ -0,0 +1,96 @@
+export default {
+  name: 'ButtonUnstyled',
+  selector: '.button-unstyled',
+  notEditable: true,
+  states: {
+    toggled: '.toggled',
+    disabled: ':disabled',
+    hover: ':hover:not(:disabled)',
+    focused: ':focus-within'
+  },
+  validInnerComponents: [
+    'Text',
+    'Link',
+    'Icon',
+    'Badge'
+  ],
+  defaultRules: [
+    {
+      directives: {
+        shadow: []
+      }
+    },
+    {
+      component: 'Icon',
+      parent: {
+        component: 'ButtonUnstyled',
+        state: ['hover']
+      },
+      directives: {
+        textColor: '--parent--text'
+      }
+    },
+    {
+      component: 'Icon',
+      parent: {
+        component: 'ButtonUnstyled',
+        state: ['toggled']
+      },
+      directives: {
+        textColor: '--parent--text'
+      }
+    },
+    {
+      component: 'Icon',
+      parent: {
+        component: 'ButtonUnstyled',
+        state: ['toggled', 'hover']
+      },
+      directives: {
+        textColor: '--parent--text'
+      }
+    },
+    {
+      component: 'Icon',
+      parent: {
+        component: 'ButtonUnstyled',
+        state: ['toggled', 'focused']
+      },
+      directives: {
+        textColor: '--parent--text'
+      }
+    },
+    {
+      component: 'Icon',
+      parent: {
+        component: 'ButtonUnstyled',
+        state: ['toggled', 'focused', 'hover']
+      },
+      directives: {
+        textColor: '--parent--text'
+      }
+    },
+    {
+      component: 'Text',
+      parent: {
+        component: 'ButtonUnstyled',
+        state: ['disabled']
+      },
+      directives: {
+        textOpacity: 0.25,
+        textOpacityMode: 'blend'
+      }
+    },
+    {
+      component: 'Icon',
+      parent: {
+        component: 'ButtonUnstyled',
+        state: ['disabled']
+      },
+      directives: {
+        textOpacity: 0.25,
+        textOpacityMode: 'blend'
+      }
+    }
+  ]
+}
--- a/src/components/chat/chat.scss
+++ b/src/components/chat/chat.scss
@ -11,15 +11,15 @@

  .chat-view-body {
    box-sizing: border-box;
-    background-color: var(--chatBg, $fallback--bg);
    display: flex;
    flex-direction: column;
    width: 100%;
    overflow: visible;
    min-height: calc(100vh - var(--navbar-height));
    margin: 0;
-    border-radius: 10px 10px 0 0;
-    border-radius: var(--panelRadius, 10px) var(--panelRadius, 10px) 0 0;
+    border-radius: var(--roundness);
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;

    &::after {
      border-radius: 0;
@ -37,8 +37,6 @@
  .footer {
    position: sticky;
    bottom: 0;
-    background-color: $fallback--bg;
-    background-color: var(--bg, $fallback--bg);
    z-index: 1;
  }

@ -61,8 +59,6 @@
    position: absolute;
    right: 1.3em;
    top: -3.2em;
-    background-color: $fallback--fg;
-    background-color: var(--btn, $fallback--fg);
    display: flex;
    justify-content: center;
    align-items: center;
@ -79,12 +75,6 @@
      visibility: visible;
    }

-    i {
-      font-size: 1em;
-      color: $fallback--text;
-      color: var(--text, $fallback--text);
-    }
-
    .unread-message-count {
      font-size: 0.8em;
      left: 50%;
--- a/src/components/chat/chat.style.js
+++ b/src/components/chat/chat.style.js
@ -0,0 +1,19 @@
+export default {
+  name: 'Chat',
+  selector: '.chat-message-list',
+  validInnerComponents: [
+    'Text',
+    'Link',
+    'Icon',
+    'Avatar',
+    'ChatMessage'
+  ],
+  defaultRules: [
+    {
+      directives: {
+        background: '--bg',
+        blur: '5px'
+      }
+    }
+  ]
+}
--- a/src/components/chat/chat.vue
+++ b/src/components/chat/chat.vue
@ -26,7 +26,7 @@
          </div>
        </div>
        <div
-          class="message-list"
+          class="chat-message-list message-list"
          :style="{ height: scrollableContainerHeight }"
        >
          <template v-if="!errorLoadingChat">
@ -61,7 +61,7 @@
              <FAIcon icon="chevron-down" />
              <div
                v-if="newMessageCount"
-                class="badge badge-notification unread-chat-count unread-message-count"
+                class="badge -notification unread-chat-count unread-message-count"
              >
                {{ newMessageCount }}
              </div>
@ -76,6 +76,7 @@
            :disable-sensitivity-checkbox="true"
            :disable-submit="errorLoadingChat || !currentChat"
            :disable-preview="true"
+            :disable-draft="true"
            :optimistic-posting="true"
            :post-handler="sendMessage"
            :submit-on-enter="!mobileLayout"
@ -95,6 +96,5 @@

 <script src="./chat.js"></script>
 <style lang="scss">
-@import "../../variables";
@import "./chat";
 </style>
--- a/src/components/chat_list/chat_list.vue
+++ b/src/components/chat_list/chat_list.vue
@ -7,9 +7,9 @@
    class="chat-list panel panel-default"
  >
    <div class="panel-heading -sticky">
-      <span class="title">
+      <h1 class="title">
        {{ $t("chats.chats") }}
-      </span>
+      </h1>
      <button
        class="button-default"
        @click="newChat"
@ -45,8 +45,6 @@
 <script src="./chat_list.js"></script>

 <style lang="scss">
-@import "../../variables";
-
 .chat-list {
  min-height: 25em;
  margin-bottom: 0;
@ -57,8 +55,7 @@
  font-size: 1.2em;
  display: flex;
  justify-content: center;
-  color: $fallback--text;
-  color: var(--faint, $fallback--text);
+  color: var(--textFaint);
 }

 </style>
--- a/src/components/chat_list_item/chat_list_item.scss
+++ b/src/components/chat_list_item/chat_list_item.scss
@ -1,8 +1,6 @@
 .chat-list-item {
  display: flex;
  flex-direction: row;
-  padding: 0.75em;
-  height: 5em;
  overflow: hidden;
  box-sizing: border-box;
  cursor: pointer;
@ -11,11 +9,6 @@
    outline: none;
  }

-  &:hover {
-    background-color: var(--selectedPost, $fallback--lightBg);
-    box-shadow: 0 0 3px 1px rgb(0 0 0 / 10%);
-  }
-
  .chat-list-item-left {
    margin-right: 1em;
  }
@ -29,7 +22,7 @@

  .heading {
    width: 100%;
-    display: inline-flex;
+    display: flex;
    justify-content: space-between;
    line-height: 1em;
  }
@ -47,18 +40,17 @@
  }

  .chat-preview {
-    display: inline-flex;
+    display: flex;
    overflow: hidden;
    white-space: nowrap;
    text-overflow: ellipsis;
    margin: 0.35em 0;
-    color: $fallback--text;
-    color: var(--faint, $fallback--text);
+    color: var(--textFaint);
    width: 100%;
  }

  a {
-    color: var(--faintLink, $fallback--link);
+    color: var(--linkFaint);
    text-decoration: none;
    pointer-events: none;
  }
@ -73,11 +65,6 @@
    }
  }

-  .Avatar {
-    border-radius: $fallback--avatarAltRadius;
-    border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
-  }
-
  .chat-preview-body {
    --emoji-size: 1.4em;

--- a/src/components/chat_list_item/chat_list_item.vue
+++ b/src/components/chat_list_item/chat_list_item.vue
@ -36,7 +36,7 @@
        />
        <div
          v-if="chat.unread > 0"
-          class="badge badge-notification unread-chat-count"
+          class="badge -notification unread-chat-count"
        >
          {{ chat.unread }}
        </div>
@ -48,6 +48,5 @@
 <script src="./chat_list_item.js"></script>

 <style lang="scss">
-@import "../../variables";
@import "./chat_list_item";
 </style>
--- a/src/components/chat_message/chat_message.scss
+++ b/src/components/chat_message/chat_message.scss
@ -1,5 +1,3 @@
-@import "../../variables";
-
 .chat-message-wrapper {
  &.hovered-message-chain {
    .animated.Avatar {
@ -27,12 +25,6 @@

  .menu-icon {
    cursor: pointer;
-
-    &:hover,
-    .extra-button-popover.open & {
-      color: $fallback--text;
-      color: var(--text, $fallback--text);
-    }
  }

  .popover {
@ -61,10 +53,12 @@
  }

  .status {
-    border-radius: $fallback--chatMessageRadius;
-    border-radius: var(--chatMessageRadius, $fallback--chatMessageRadius);
+    background-color: var(--background);
+    color: var(--text);
+    border-radius: var(--roundness);
    display: flex;
    padding: 0.75em;
+    border: 1px solid var(--border);
  }

  .created-at {
@ -97,8 +91,7 @@
  .error {
    .status-content.media-body,
    .created-at {
-      color: $fallback--cRed;
-      color: var(--badgeNotification, $fallback--cRed);
+      color: var(--badgeNotification);
    }
  }

@ -117,16 +110,6 @@
    align-content: end;
    justify-content: flex-end;

-    a {
-      color: var(--chatMessageOutgoingLink, $fallback--link);
-    }
-
-    .status {
-      color: var(--chatMessageOutgoingText, $fallback--text);
-      background-color: var(--chatMessageOutgoingBg, $fallback--lightBg);
-      border: 1px solid var(--chatMessageOutgoingBorder, --lightBg);
-    }
-
    .chat-message-inner {
      align-items: flex-end;
    }
@ -137,22 +120,6 @@
  }

  .incoming {
-    a {
-      color: var(--chatMessageIncomingLink, $fallback--link);
-    }
-
-    .status {
-      color: var(--chatMessageIncomingText, $fallback--text);
-      background-color: var(--chatMessageIncomingBg, $fallback--bg);
-      border: 1px solid var(--chatMessageIncomingBorder, --border);
-    }
-
-    .created-at {
-      a {
-        color: var(--chatMessageIncomingText, $fallback--text);
-      }
-    }
-
    .chat-message-menu {
      left: 0.4rem;
    }
@ -176,6 +143,5 @@
  margin: 1.4em 0;
  font-size: 0.9em;
  user-select: none;
-  color: $fallback--text;
-  color: var(--faintedText, $fallback--text);
+  color: var(--textFaint);
 }
--- a/Show more
+++ b/Show more
 @ -1 +1 @@
 .18.1
 .20.6
				`@ -0,0 +1 @@`
				`Updated shadow editor, hopefully fixed long-standing bugs, added ability to specify shadow's name.`
				`@ -0,0 +1 @@`
				`Fix some of the color manipulation functions`
				`@ -0,0 +1 @@`
				`Added support for fetching /{resource}.custom.ext to allow adding instance-specific themes without altering sourcetree`
				`@ -0,0 +1 @@`
				`Use /api/v1/accounts/:id/follow for account subscriptions instead of the deprecated routes`
				`@ -0,0 +1 @@`
				`fixed occasional overflows in emoji picker and made header scrollable`
				`@ -0,0 +1 @@`
				`fix emoji inconsistencies in notifications, fix some emoji not scaling with interface`
				`@ -0,0 +1 @@`
				`Added configurable image compression option in general settings, allowing users to control whether images are compressed before upload.`
				`@ -0,0 +1 @@`
				`modal layout for mobile has new layout to make it easy to use`
				`@ -0,0 +1 @@`
				`Fix whitespaces for multiple status mute reasons, display bot status reason`