diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..c5b9ea10
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+/build/webpack.prod.conf.js export-subst
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fb72931..444a863c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,37 @@ 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.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
diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
index 7de93721..7a108f68 100644
--- 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')
-    .execSync('git rev-parse --short HEAD')
-    .toString();
+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',
diff --git a/changelog.d/add-apng.add b/changelog.d/add-apng.add
new file mode 100644
index 00000000..cdec58af
--- /dev/null
+++ b/changelog.d/add-apng.add
@@ -0,0 +1 @@
+Make Pleroma FE to also view apng (Animated PNG) attachment.
diff --git a/changelog.d/add-taiwanese-aka-hokkien-i18n-support.add b/changelog.d/add-taiwanese-aka-hokkien-i18n-support.add
deleted file mode 100644
index 53d89805..00000000
--- a/changelog.d/add-taiwanese-aka-hokkien-i18n-support.add
+++ /dev/null
@@ -1 +0,0 @@
-add the initial i18n translation file for Taiwanese (Hokkien), and modify some related files.
\ No newline at end of file
diff --git a/changelog.d/adminfe.add b/changelog.d/adminfe.add
deleted file mode 100644
index 188c4555..00000000
--- a/changelog.d/adminfe.add
+++ /dev/null
@@ -1 +0,0 @@
-Implemented a very basic instance administration screen
diff --git a/changelog.d/check-changelog.skip b/changelog.d/check-changelog.skip
deleted file mode 100644
index e69de29b..00000000
diff --git a/changelog.d/create-link-when-url-present.add b/changelog.d/create-link-when-url-present.add
new file mode 100644
index 00000000..11aa3758
--- /dev/null
+++ b/changelog.d/create-link-when-url-present.add
@@ -0,0 +1 @@
+Create a link to the URL of the scrobble when it's present
diff --git a/changelog.d/custom-emoji-notif-width.fix b/changelog.d/custom-emoji-notif-width.fix
deleted file mode 100644
index da118f6b..00000000
--- a/changelog.d/custom-emoji-notif-width.fix
+++ /dev/null
@@ -1 +0,0 @@
-Keep aspect ratio of custom emoji reaction in notification
diff --git a/changelog.d/double-notifications.fix b/changelog.d/double-notifications.fix
new file mode 100644
index 00000000..24e08c0f
--- /dev/null
+++ b/changelog.d/double-notifications.fix
@@ -0,0 +1 @@
+Fix native notifications appearing as many times as there are open tabs. Clicking on notification will focus last focused tab.
diff --git a/changelog.d/edit-profile-button.fix b/changelog.d/edit-profile-button.fix
deleted file mode 100644
index 5a92765c..00000000
--- a/changelog.d/edit-profile-button.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fix openSettingsModalTab so that it correctly opens Settings modal instead of Admin modal
diff --git a/changelog.d/extra-notifications.add b/changelog.d/extra-notifications.add
new file mode 100644
index 00000000..90f21f54
--- /dev/null
+++ b/changelog.d/extra-notifications.add
@@ -0,0 +1 @@
+Support showing extra notifications in the notifications column
diff --git a/changelog.d/focus-clear.add b/changelog.d/focus-clear.add
new file mode 100644
index 00000000..70f54ab6
--- /dev/null
+++ b/changelog.d/focus-clear.add
@@ -0,0 +1 @@
+Focusing into a tab clears all current desktop notifications
diff --git a/changelog.d/mention-twice.fix b/changelog.d/mention-twice.fix
deleted file mode 100644
index 0e4b71df..00000000
--- a/changelog.d/mention-twice.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug where mentioning a user twice will not fill the mention into the textarea
diff --git a/changelog.d/mentionsline-shouldbreak.fix b/changelog.d/mentionsline-shouldbreak.fix
deleted file mode 100644
index 33ee8d2c..00000000
--- a/changelog.d/mentionsline-shouldbreak.fix
+++ /dev/null
@@ -1 +0,0 @@
-Make MentionsLine aware of line breaking by non-br elements
diff --git a/changelog.d/mobile-chrome-notifs.fix b/changelog.d/mobile-chrome-notifs.fix
new file mode 100644
index 00000000..7db10c56
--- /dev/null
+++ b/changelog.d/mobile-chrome-notifs.fix
@@ -0,0 +1 @@
+Fixed error that appeared on mobile Chrome(ium) (and derivatives) when native notifications are allowed
diff --git a/changelog.d/mobile-drawer-notifications.change b/changelog.d/mobile-drawer-notifications.change
new file mode 100644
index 00000000..9353c709
--- /dev/null
+++ b/changelog.d/mobile-drawer-notifications.change
@@ -0,0 +1 @@
+Added option to not mark all notifications when closing notifications drawer on mobile, this creates a new button to mark all as seen.
diff --git a/changelog.d/more-notification-types-setting.fix b/changelog.d/more-notification-types-setting.fix
new file mode 100644
index 00000000..2d71b599
--- /dev/null
+++ b/changelog.d/more-notification-types-setting.fix
@@ -0,0 +1 @@
+Fixed being unable to set notification visibility for reports and follow requests
diff --git a/changelog.d/native-filtering.add b/changelog.d/native-filtering.add
new file mode 100644
index 00000000..82ab9a23
--- /dev/null
+++ b/changelog.d/native-filtering.add
@@ -0,0 +1 @@
+Added 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.
diff --git a/changelog.d/native-notifications.add b/changelog.d/native-notifications.add
new file mode 100644
index 00000000..d896e7c0
--- /dev/null
+++ b/changelog.d/native-notifications.add
@@ -0,0 +1 @@
+Native notifications now also have "badge" property that matches instance's favicon (visible in Android Chromium at least)
diff --git a/changelog.d/noninteractive-ignore-read.add b/changelog.d/noninteractive-ignore-read.add
new file mode 100644
index 00000000..5e8710cf
--- /dev/null
+++ b/changelog.d/noninteractive-ignore-read.add
@@ -0,0 +1 @@
+Added 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)
diff --git a/changelog.d/notification-read.add b/changelog.d/notification-read.add
new file mode 100644
index 00000000..e5027a95
--- /dev/null
+++ b/changelog.d/notification-read.add
@@ -0,0 +1 @@
+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.
diff --git a/changelog.d/notifications-sorting.change b/changelog.d/notifications-sorting.change
new file mode 100644
index 00000000..3a616244
--- /dev/null
+++ b/changelog.d/notifications-sorting.change
@@ -0,0 +1 @@
+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.
diff --git a/changelog.d/parser.fix b/changelog.d/parser.fix
deleted file mode 100644
index 13bac0bf..00000000
--- a/changelog.d/parser.fix
+++ /dev/null
@@ -1 +0,0 @@
-fix regex issue in HTML parser/renderer
diff --git a/changelog.d/react-button-safari.fix b/changelog.d/react-button-safari.fix
deleted file mode 100644
index 9846d50d..00000000
--- a/changelog.d/react-button-safari.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fix react button misalignment on safari ios
diff --git a/changelog.d/react-button.fix b/changelog.d/react-button.fix
deleted file mode 100644
index c2222fb6..00000000
--- a/changelog.d/react-button.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fix react button not working if reaction accounts are not loaded
diff --git a/changelog.d/scroll-emoji-selector-safari.fix b/changelog.d/scroll-emoji-selector-safari.fix
deleted file mode 100644
index 3f5dda7d..00000000
--- a/changelog.d/scroll-emoji-selector-safari.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fix scrolling emoji selector in modal in safari ios
diff --git a/changelog.d/serviceworkers.change b/changelog.d/serviceworkers.change
new file mode 100644
index 00000000..b3b64f6d
--- /dev/null
+++ b/changelog.d/serviceworkers.change
@@ -0,0 +1 @@
+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.
diff --git a/changelog.d/show-recent-scrobble.skip b/changelog.d/show-recent-scrobble.skip
new file mode 100644
index 00000000..9227de06
--- /dev/null
+++ b/changelog.d/show-recent-scrobble.skip
@@ -0,0 +1 @@
+Shows the most recent scrobble under each post when available
diff --git a/changelog.d/unreads-sync.fix b/changelog.d/unreads-sync.fix
new file mode 100644
index 00000000..1eac3364
--- /dev/null
+++ b/changelog.d/unreads-sync.fix
@@ -0,0 +1 @@
+unread notifications should now properly catch up (eventually) in polling mode
diff --git a/changelog.d/video-poster.fix b/changelog.d/video-poster.fix
new file mode 100644
index 00000000..43e95f6e
--- /dev/null
+++ b/changelog.d/video-poster.fix
@@ -0,0 +1 @@
+Video posters on Safari
diff --git a/changelog.d/web-push-always.add b/changelog.d/web-push-always.add
new file mode 100644
index 00000000..f8b8888a
--- /dev/null
+++ b/changelog.d/web-push-always.add
@@ -0,0 +1 @@
+Added option to always "show" notifications when using web push for better compatibility with some browsers (chrome, edge, safari)
diff --git a/index.html b/index.html
index a02939f7..e790fb57 100644
--- a/index.html
+++ b/index.html
@@ -3,8 +3,8 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no">
-    <!--server-generated-meta-->
     <link rel="icon" type="image/png" href="/favicon.png">
+    <!--server-generated-meta-->
   </head>
   <body class="hidden">
     <noscript>To use Pleroma, please enable JavaScript.</noscript>
diff --git a/package.json b/package.json
index 4824df82..fa41beb3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pleroma_fe",
-  "version": "2.5.0",
+  "version": "2.6.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,
@@ -25,7 +25,7 @@
     "@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.2",
+    "@vuelidate/core": "2.0.3",
     "@vuelidate/validators": "2.0.0",
     "body-scroll-lock": "3.1.5",
     "chromatism": "3.0.0",
@@ -35,9 +35,9 @@
     "js-cookie": "3.0.1",
     "localforage": "1.10.0",
     "parse-link-header": "2.0.0",
-    "phoenix": "1.6.2",
+    "phoenix": "1.7.7",
     "punycode.js": "2.3.0",
-    "qrcode": "1.5.1",
+    "qrcode": "1.5.3",
     "querystring-es3": "0.2.1",
     "url": "0.11.0",
     "utf8": "3.0.0",
@@ -97,7 +97,7 @@
     "karma-spec-reporter": "0.0.36",
     "karma-webpack": "5.0.0",
     "lodash": "4.17.21",
-    "mini-css-extract-plugin": "2.7.5",
+    "mini-css-extract-plugin": "2.7.6",
     "mocha": "10.2.0",
     "nightwatch": "2.6.20",
     "opn": "5.5.0",
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 9c1f007b..84fea954 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -16,6 +16,7 @@ import backendInteractorService from '../services/backend_interactor_service/bac
 import { CURRENT_VERSION } from '../services/theme_data/theme_data.service.js'
 import { applyTheme, 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'
 
 let staticInitialResults = null
 
@@ -259,6 +260,7 @@ const getNodeInfo = async ({ store }) => {
       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') })
 
       const uploadLimits = metadata.uploadLimits
       store.dispatch('setInstanceOption', { name: 'uploadlimit', value: parseInt(uploadLimits.general) })
@@ -343,6 +345,9 @@ const afterStoreSetup = async ({ store, i18n }) => {
   store.dispatch('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
diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index 68654f69..9baf63f2 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -1,4 +1,5 @@
 import Completion from '../../services/completion/completion.js'
+import genRandomSeed from '../../services/random_seed/random_seed.service.js'
 import EmojiPicker from '../emoji_picker/emoji_picker.vue'
 import Popover from 'src/components/popover/popover.vue'
 import ScreenReaderNotice from 'src/components/screen_reader_notice/screen_reader_notice.vue'
@@ -110,7 +111,7 @@ const EmojiInput = {
   },
   data () {
     return {
-      randomSeed: `${Math.random()}`.replace('.', '-'),
+      randomSeed: genRandomSeed(),
       input: undefined,
       caretEl: undefined,
       highlighted: -1,
diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index 227d7718..0788f34c 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -3,7 +3,7 @@
     ref="popover"
     trigger="click"
     popover-class="emoji-picker popover-default"
-    :trigger-attrs="{ 'aria-hidden': true }"
+    :trigger-attrs="{ 'aria-hidden': true, tabindex: -1 }"
     @show="onPopoverShown"
     @close="onPopoverClosed"
   >
@@ -28,6 +28,7 @@
               active: activeGroupView === group.id
             }"
             :title="group.text"
+            role="button"
             @click.prevent="highlight(group.id)"
           >
             <span
@@ -116,6 +117,7 @@
                     :key="group.id + emoji.displayText"
                     :title="maybeLocalizedEmojiName(emoji)"
                     class="emoji-item"
+                    role="button"
                     @click.stop.prevent="onEmoji(emoji)"
                   >
                     <span
@@ -126,6 +128,7 @@
                       v-else
                       class="emoji-picker-emoji -custom"
                       loading="lazy"
+                      :alt="maybeLocalizedEmojiName(emoji)"
                       :src="emoji.imageUrl"
                       :data-emoji-name="group.id + emoji.displayText"
                     />
diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index 48b960b2..e2c88ceb 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -1,4 +1,5 @@
 import Popover from '../popover/popover.vue'
+import genRandomSeed from '../../services/random_seed/random_seed.service.js'
 import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -40,7 +41,8 @@ const ExtraButtons = {
   data () {
     return {
       expanded: false,
-      showingDeleteDialog: false
+      showingDeleteDialog: false,
+      randomSeed: genRandomSeed()
     }
   },
   methods: {
@@ -152,6 +154,15 @@ const ExtraButtons = {
     editingAvailable () { return this.$store.state.instance.editingAvailable },
     shouldConfirmDelete () {
       return this.$store.getters.mergedConfig.modalOnDelete
+    },
+    triggerAttrs () {
+      return {
+        title: this.$t('status.more_actions'),
+        id: `popup-trigger-${this.randomSeed}`,
+        'aria-controls': `popup-menu-${this.randomSeed}`,
+        'aria-expanded': this.expanded,
+        'aria-haspopup': 'menu'
+      }
     }
   }
 }
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index c1c15c0f..b7d3b1d3 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -2,6 +2,7 @@
   <Popover
     class="ExtraButtons"
     trigger="click"
+    :trigger-attrs="triggerAttrs"
     placement="top"
     :offset="{ y: 5 }"
     :bound-to="{ x: 'container' }"
@@ -10,10 +11,15 @@
     @close="onClose"
   >
     <template #content="{close}">
-      <div class="dropdown-menu">
+      <div
+        class="dropdown-menu"
+        role="menu"
+        :id="`popup-menu-${randomSeed}`"
+      >
         <button
           v-if="canMute && !status.thread_muted"
           class="button-default dropdown-item dropdown-item-icon"
+          role="menuitem"
           @click.prevent="muteConversation"
         >
           <FAIcon
@@ -24,6 +30,7 @@
         <button
           v-if="canMute && status.thread_muted"
           class="button-default dropdown-item dropdown-item-icon"
+          role="menuitem"
           @click.prevent="unmuteConversation"
         >
           <FAIcon
@@ -34,6 +41,7 @@
         <button
           v-if="!status.pinned && canPin"
           class="button-default dropdown-item dropdown-item-icon"
+          role="menuitem"
           @click.prevent="pinStatus"
           @click="close"
         >
@@ -45,6 +53,7 @@
         <button
           v-if="status.pinned && canPin"
           class="button-default dropdown-item dropdown-item-icon"
+          role="menuitem"
           @click.prevent="unpinStatus"
           @click="close"
         >
@@ -57,6 +66,7 @@
           <button
             v-if="!status.bookmarked"
             class="button-default dropdown-item dropdown-item-icon"
+            role="menuitem"
             @click.prevent="bookmarkStatus"
             @click="close"
           >
@@ -68,6 +78,7 @@
           <button
             v-if="status.bookmarked"
             class="button-default dropdown-item dropdown-item-icon"
+            role="menuitem"
             @click.prevent="unbookmarkStatus"
             @click="close"
           >
@@ -80,6 +91,7 @@
         <button
           v-if="ownStatus && editingAvailable"
           class="button-default dropdown-item dropdown-item-icon"
+          role="menuitem"
           @click.prevent="editStatus"
           @click="close"
         >
@@ -91,6 +103,7 @@
         <button
           v-if="isEdited && editingAvailable"
           class="button-default dropdown-item dropdown-item-icon"
+          role="menuitem"
           @click.prevent="showStatusHistory"
           @click="close"
         >
@@ -102,6 +115,7 @@
         <button
           v-if="canDelete"
           class="button-default dropdown-item dropdown-item-icon"
+          role="menuitem"
           @click.prevent="deleteStatus"
           @click="close"
         >
@@ -112,6 +126,7 @@
         </button>
         <button
           class="button-default dropdown-item dropdown-item-icon"
+          role="menuitem"
           @click.prevent="copyLink"
           @click="close"
         >
@@ -123,6 +138,7 @@
         <a
           v-if="!status.is_local"
           class="button-default dropdown-item dropdown-item-icon"
+          role="menuitem"
           title="Source"
           :href="status.external_url"
           target="_blank"
@@ -134,6 +150,7 @@
         </a>
         <button
           class="button-default dropdown-item dropdown-item-icon"
+          role="menuitem"
           @click.prevent="reportStatus"
           @click="close"
         >
diff --git a/src/components/extra_notifications/extra_notifications.js b/src/components/extra_notifications/extra_notifications.js
new file mode 100644
index 00000000..1bb0f837
--- /dev/null
+++ b/src/components/extra_notifications/extra_notifications.js
@@ -0,0 +1,48 @@
+import { mapGetters } from 'vuex'
+
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faUserPlus,
+  faComments,
+  faBullhorn
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faUserPlus,
+  faComments,
+  faBullhorn
+)
+
+const ExtraNotifications = {
+  computed: {
+    shouldShowChats () {
+      return this.mergedConfig.showExtraNotifications && this.mergedConfig.showChatsInExtraNotifications && this.unreadChatCount
+    },
+    shouldShowAnnouncements () {
+      return this.mergedConfig.showExtraNotifications && this.mergedConfig.showAnnouncementsInExtraNotifications && this.unreadAnnouncementCount
+    },
+    shouldShowFollowRequests () {
+      return this.mergedConfig.showExtraNotifications && this.mergedConfig.showFollowRequestsInExtraNotifications && this.followRequestCount
+    },
+    hasAnythingToShow () {
+      return this.shouldShowChats || this.shouldShowAnnouncements || this.shouldShowFollowRequests
+    },
+    shouldShowCustomizationTip () {
+      return this.mergedConfig.showExtraNotificationsTip && this.hasAnythingToShow
+    },
+    currentUser () {
+      return this.$store.state.users.currentUser
+    },
+    ...mapGetters(['unreadChatCount', 'unreadAnnouncementCount', 'followRequestCount', 'mergedConfig'])
+  },
+  methods: {
+    openNotificationSettings () {
+      return this.$store.dispatch('openSettingsModalTab', 'notifications')
+    },
+    dismissConfigurationTip () {
+      return this.$store.dispatch('setOption', { name: 'showExtraNotificationsTip', value: false })
+    }
+  }
+}
+
+export default ExtraNotifications
diff --git a/src/components/extra_notifications/extra_notifications.vue b/src/components/extra_notifications/extra_notifications.vue
new file mode 100644
index 00000000..6e0456a5
--- /dev/null
+++ b/src/components/extra_notifications/extra_notifications.vue
@@ -0,0 +1,113 @@
+<template>
+  <div class="ExtraNotifications">
+    <div
+      v-if="shouldShowChats"
+      class="notification unseen"
+    >
+      <div class="notification-overlay" />
+      <router-link
+        class="button-unstyled -link extra-notification"
+        :to="{ name: 'chats', params: { username: currentUser.screen_name } }"
+      >
+        <FAIcon
+          fixed-width
+          class="fa-scale-110 icon"
+          icon="comments"
+        />
+        {{ $tc('notifications.unread_chats', unreadChatCount, { num: unreadChatCount }) }}
+      </router-link>
+    </div>
+    <div
+      v-if="shouldShowAnnouncements"
+      class="notification unseen"
+    >
+      <div class="notification-overlay" />
+      <router-link
+        class="button-unstyled -link extra-notification"
+        :to="{ name: 'announcements' }"
+      >
+        <FAIcon
+          fixed-width
+          class="fa-scale-110 icon"
+          icon="bullhorn"
+        />
+        {{ $tc('notifications.unread_announcements', unreadAnnouncementCount, { num: unreadAnnouncementCount }) }}
+      </router-link>
+    </div>
+    <div
+      v-if="shouldShowFollowRequests"
+      class="notification unseen"
+    >
+      <div class="notification-overlay" />
+      <router-link
+        class="button-unstyled -link extra-notification"
+        :to="{ name: 'friend-requests' }"
+      >
+        <FAIcon
+          fixed-width
+          class="fa-scale-110 icon"
+          icon="user-plus"
+        />
+        {{ $tc('notifications.unread_follow_requests', followRequestCount, { num: followRequestCount }) }}
+      </router-link>
+    </div>
+    <i18n-t
+      v-if="shouldShowCustomizationTip"
+      tag="span"
+      class="notification tip extra-notification"
+      keypath="notifications.configuration_tip"
+    >
+      <template #theSettings>
+        <button
+          class="button-unstyled -link"
+          @click="openNotificationSettings"
+        >
+          {{ $t('notifications.configuration_tip_settings') }}
+        </button>
+      </template>
+      <template #dismiss>
+        <button
+          class="button-unstyled -link"
+          @click="dismissConfigurationTip"
+        >
+          {{ $t('notifications.configuration_tip_dismiss') }}
+        </button>
+      </template>
+    </i18n-t>
+  </div>
+</template>
+
+<script src="./extra_notifications.js" />
+
+<style lang="scss">
+@import "../../variables";
+
+.ExtraNotifications {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+
+  .notification {
+    width: 100%;
+    border-bottom: 1px solid;
+    border-color: $fallback--border;
+    border-color: var(--border, $fallback--border);
+    display: flex;
+    flex-direction: column;
+    align-items: stretch;
+  }
+
+  .extra-notification {
+    padding: 1em;
+  }
+
+  .icon {
+    margin-right: 0.5em;
+  }
+
+  .tip {
+    display: inline;
+  }
+}
+</style>
diff --git a/src/components/global_notice_list/global_notice_list.vue b/src/components/global_notice_list/global_notice_list.vue
index 0e58476f..9e9ec7aa 100644
--- a/src/components/global_notice_list/global_notice_list.vue
+++ b/src/components/global_notice_list/global_notice_list.vue
@@ -32,7 +32,7 @@
   top: calc(var(--navbar-height) + 0.5em);
   width: 100%;
   pointer-events: none;
-  z-index: var(--ZI_navbar_popovers);
+  z-index: var(--ZI_modals_popovers);
   display: flex;
   flex-direction: column;
   align-items: center;
diff --git a/src/components/interactions/interactions.vue b/src/components/interactions/interactions.vue
index b7291c02..35d03562 100644
--- a/src/components/interactions/interactions.vue
+++ b/src/components/interactions/interactions.vue
@@ -39,6 +39,7 @@
     <Notifications
       ref="notifications"
       :no-heading="true"
+      :no-extra="true"
       :minimal-mode="true"
       :filter-mode="filterMode"
     />
diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index dad1f6aa..8c9261b0 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -1,7 +1,10 @@
 import SideDrawer from '../side_drawer/side_drawer.vue'
 import Notifications from '../notifications/notifications.vue'
 import ConfirmModal from '../confirm_modal/confirm_modal.vue'
-import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
+import {
+  unseenNotificationsFromStore,
+  countExtraNotifications
+} from '../../services/notification_utils/notification_utils'
 import GestureService from '../../services/gesture_service/gesture_service'
 import NavigationPins from 'src/components/navigation/navigation_pins.vue'
 import { mapGetters } from 'vuex'
@@ -11,7 +14,8 @@ import {
   faBell,
   faBars,
   faArrowUp,
-  faMinus
+  faMinus,
+  faCheckDouble
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
@@ -19,7 +23,8 @@ library.add(
   faBell,
   faBars,
   faArrowUp,
-  faMinus
+  faMinus,
+  faCheckDouble
 )
 
 const MobileNav = {
@@ -50,8 +55,14 @@ const MobileNav = {
       return unseenNotificationsFromStore(this.$store)
     },
     unseenNotificationsCount () {
+      return this.unseenNotifications.length + countExtraNotifications(this.$store)
+    },
+    unseenCount () {
       return this.unseenNotifications.length
     },
+    unseenCountBadgeText () {
+      return `${this.unseenCount ? this.unseenCount : ''}`
+    },
     hideSitename () { return this.$store.state.instance.hideSitename },
     sitename () { return this.$store.state.instance.name },
     isChat () {
@@ -64,6 +75,9 @@ const MobileNav = {
     shouldConfirmLogout () {
       return this.$store.getters.mergedConfig.modalOnLogout
     },
+    closingDrawerMarksAsSeen () {
+      return this.$store.getters.mergedConfig.closingDrawerMarksAsSeen
+    },
     ...mapGetters(['unreadChatCount'])
   },
   methods: {
@@ -78,7 +92,7 @@ const MobileNav = {
         // make sure to mark notifs seen only when the notifs were open and not
         // from close-calls.
         this.notificationsOpen = false
-        if (markRead) {
+        if (markRead && this.closingDrawerMarksAsSeen) {
           this.markNotificationsAsSeen()
         }
       }
@@ -114,7 +128,6 @@ const MobileNav = {
       this.hideConfirmLogout()
     },
     markNotificationsAsSeen () {
-      // this.$refs.notifications.markAsSeen()
       this.$store.dispatch('markNotificationsAsSeen')
     },
     onScroll ({ target: { scrollTop, clientHeight, scrollHeight } }) {
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index c2746abe..f20a509d 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -50,7 +50,13 @@
       @touchmove.stop="notificationsTouchMove"
     >
       <div class="mobile-notifications-header">
-        <span class="title">{{ $t('notifications.notifications') }}</span>
+        <span class="title">
+          {{ $t('notifications.notifications') }}
+          <span
+            v-if="unseenCountBadgeText"
+            class="badge badge-notification unseen-count"
+          >{{ unseenCountBadgeText }}</span>
+        </span>
         <span class="spacer" />
         <button
           v-if="notificationsAtTop"
@@ -66,6 +72,17 @@
             />
           </FALayers>
         </button>
+        <button
+          v-if="!closingDrawerMarksAsSeen"
+          class="button-unstyled mobile-nav-button"
+          :title="$t('nav.mobile_notifications_mark_as_seen')"
+          @click.stop.prevent="markNotificationsAsSeen()"
+        >
+          <FAIcon
+            class="fa-scale-110 fa-old-padding"
+            icon="check-double"
+          />
+        </button>
         <button
           class="button-unstyled mobile-nav-button"
           :title="$t('nav.mobile_notifications_close')"
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index 420db4f0..0e938c42 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -50,6 +50,7 @@ const Notification = {
     }
   },
   props: ['notification'],
+  emits: ['interacted'],
   components: {
     StatusContent,
     UserAvatar,
@@ -72,6 +73,9 @@ const Notification = {
     getUser (notification) {
       return this.$store.state.users.usersObject[notification.from_profile.id]
     },
+    interacted () {
+      this.$emit('interacted')
+    },
     toggleMute () {
       this.unmuted = !this.unmuted
     },
@@ -95,6 +99,7 @@ const Notification = {
       }
     },
     doApprove () {
+      this.$emit('interacted')
       this.$store.state.api.backendInteractor.approveUser({ id: this.user.id })
       this.$store.dispatch('removeFollowRequest', this.user)
       this.$store.dispatch('markSingleNotificationAsSeen', { id: this.notification.id })
@@ -114,6 +119,7 @@ const Notification = {
       }
     },
     doDeny () {
+      this.$emit('interacted')
       this.$store.state.api.backendInteractor.denyUser({ id: this.user.id })
         .then(() => {
           this.$store.dispatch('dismissNotificationLocal', { id: this.notification.id })
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 6b3315f9..a8eceab0 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -6,6 +6,7 @@
       class="Notification"
       :compact="true"
       :statusoid="notification.status"
+      @interacted="interacted"
     />
   </article>
   <article v-else>
@@ -248,7 +249,7 @@
           <StatusContent
             :class="{ faint: !statusExpanded }"
             :compact="!statusExpanded"
-            :status="notification.action"
+            :status="notification.status"
           />
         </template>
       </div>
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index d499d3d6..a9fa8455 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -1,12 +1,15 @@
 import { computed } from 'vue'
 import { mapGetters } from 'vuex'
 import Notification from '../notification/notification.vue'
+import ExtraNotifications from '../extra_notifications/extra_notifications.vue'
 import NotificationFilters from './notification_filters.vue'
 import notificationsFetcher from '../../services/notifications_fetcher/notifications_fetcher.service.js'
 import {
   notificationsFromStore,
   filteredNotificationsFromStore,
-  unseenNotificationsFromStore
+  unseenNotificationsFromStore,
+  countExtraNotifications,
+  ACTIONABLE_NOTIFICATION_TYPES
 } from '../../services/notification_utils/notification_utils.js'
 import FaviconService from '../../services/favicon_service/favicon_service.js'
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -23,7 +26,8 @@ const DEFAULT_SEEN_TO_DISPLAY_COUNT = 30
 const Notifications = {
   components: {
     Notification,
-    NotificationFilters
+    NotificationFilters,
+    ExtraNotifications
   },
   props: {
     // Disables panel styles, unread mark, potentially other notification-related actions
@@ -31,6 +35,11 @@ const Notifications = {
     minimalMode: Boolean,
     // Custom filter mode, an array of strings, possible values 'mention', 'repeat', 'like', 'follow', used to override global filter for use in "Interactions" timeline
     filterMode: Array,
+    // Do not show extra notifications
+    noExtra: {
+      type: Boolean,
+      default: false
+    },
     // Disable teleporting (i.e. for /users/user/notifications)
     disableTeleport: Boolean
   },
@@ -57,22 +66,36 @@ const Notifications = {
       return notificationsFromStore(this.$store)
     },
     error () {
-      return this.$store.state.statuses.notifications.error
+      return this.$store.state.notifications.error
     },
     unseenNotifications () {
       return unseenNotificationsFromStore(this.$store)
     },
     filteredNotifications () {
-      return filteredNotificationsFromStore(this.$store, this.filterMode)
+      if (this.unseenAtTop) {
+        return [
+          ...filteredNotificationsFromStore(this.$store).filter(n => this.shouldShowUnseen(n)),
+          ...filteredNotificationsFromStore(this.$store).filter(n => !this.shouldShowUnseen(n))
+        ]
+      } else {
+        return filteredNotificationsFromStore(this.$store, this.filterMode)
+      }
+    },
+    unseenCountBadgeText () {
+      return `${this.unseenCount ? this.unseenCount : ''}${this.extraNotificationsCount ? '*' : ''}`
     },
     unseenCount () {
       return this.unseenNotifications.length
     },
+    ignoreInactionableSeen () { return this.$store.getters.mergedConfig.ignoreInactionableSeen },
+    extraNotificationsCount () {
+      return countExtraNotifications(this.$store)
+    },
     unseenCountTitle () {
-      return this.unseenCount + (this.unreadChatCount) + this.unreadAnnouncementCount
+      return this.unseenNotifications.length + (this.unreadChatCount) + this.unreadAnnouncementCount
     },
     loading () {
-      return this.$store.state.statuses.notifications.loading
+      return this.$store.state.notifications.loading
     },
     noHeading () {
       const { layoutType } = this.$store.state.interface
@@ -94,6 +117,10 @@ const Notifications = {
       return this.filteredNotifications.slice(0, this.unseenCount + this.seenToDisplayCount)
     },
     noSticky () { return this.$store.getters.mergedConfig.disableStickyHeaders },
+    unseenAtTop () { return this.$store.getters.mergedConfig.unseenAtTop },
+    showExtraNotifications () {
+      return !this.noExtra
+    },
     ...mapGetters(['unreadChatCount', 'unreadAnnouncementCount'])
   },
   mounted () {
@@ -137,11 +164,28 @@ const Notifications = {
     scrollToTop () {
       const scrollable = this.scrollerRef
       scrollable.scrollTo({ top: this.$refs.root.offsetTop })
-      // this.$refs.root.scrollIntoView({ behavior: 'smooth', block: 'start' })
     },
     updateScrollPosition () {
       this.showScrollTop = this.$refs.root.offsetTop < this.scrollerRef.scrollTop
     },
+    shouldShowUnseen (notification) {
+      if (notification.seen) return false
+
+      const actionable = ACTIONABLE_NOTIFICATION_TYPES.has(notification.type)
+      return this.ignoreInactionableSeen ? actionable : true
+    },
+    /* "Interacted" really refers to "actionable" notifications that require user input,
+     * everything else (likes/repeats/reacts) cannot be acted and therefore we just clear
+     * the "seen" status upon any clicks on them
+     */
+    notificationClicked (notification) {
+      const { id } = notification
+      this.$store.dispatch('notificationClicked', { id })
+    },
+    notificationInteracted (notification) {
+      const { id } = notification
+      this.$store.dispatch('markSingleNotificationAsSeen', { id })
+    },
     markAsSeen () {
       this.$store.dispatch('markNotificationsAsSeen')
       this.seenToDisplayCount = DEFAULT_SEEN_TO_DISPLAY_COUNT
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 633efca6..a0025182 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -17,9 +17,9 @@
           <div class="title">
             {{ $t('notifications.notifications') }}
             <span
-              v-if="unseenCount"
+              v-if="unseenCountBadgeText"
               class="badge badge-notification unseen-count"
-            >{{ unseenCount }}</span>
+            >{{ unseenCountBadgeText }}</span>
           </div>
           <div
             v-if="showScrollTop"
@@ -54,15 +54,26 @@
           class="panel-body"
           role="feed"
         >
+          <div
+            v-if="showExtraNotifications"
+            role="listitem"
+            class="notification"
+          >
+            <extra-notifications />
+          </div>
           <div
             v-for="notification in notificationsToDisplay"
             :key="notification.id"
             role="listitem"
             class="notification"
-            :class="{unseen: !minimalMode && !notification.seen}"
+            :class="{unseen: !minimalMode && shouldShowUnseen(notification)}"
+            @click="e => notificationClicked(notification)"
           >
             <div class="notification-overlay" />
-            <notification :notification="notification" />
+            <notification
+              :notification="notification"
+              @interacted="e => notificationInteracted(notification)"
+            />
           </div>
         </div>
         <div class="panel-footer">
diff --git a/src/components/poll/poll.js b/src/components/poll/poll.js
index e4d6869a..f6001f56 100644
--- a/src/components/poll/poll.js
+++ b/src/components/poll/poll.js
@@ -1,4 +1,5 @@
 import Timeago from 'components/timeago/timeago.vue'
+import genRandomSeed from '../../services/random_seed/random_seed.service.js'
 import RichContent from 'components/rich_content/rich_content.jsx'
 import { forEach, map } from 'lodash'
 
@@ -13,7 +14,7 @@ export default {
     return {
       loading: false,
       choices: [],
-      randomSeed: `${Math.random()}`.replace('.', '-')
+      randomSeed: genRandomSeed()
     }
   },
   created () {
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index b75fee69..5564b118 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -1,4 +1,5 @@
 import statusPoster from '../../services/status_poster/status_poster.service.js'
+import genRandomSeed from '../../services/random_seed/random_seed.service.js'
 import MediaUpload from '../media_upload/media_upload.vue'
 import ScopeSelector from '../scope_selector/scope_selector.vue'
 import EmojiInput from '../emoji_input/emoji_input.vue'
@@ -156,11 +157,13 @@ const PostStatusForm = {
         poll: this.statusPoll || {},
         mediaDescriptions: this.statusMediaDescriptions || {},
         visibility: this.statusScope || scope,
-        contentType: statusContentType
+        contentType: statusContentType,
+        quoting: false
       }
     }
 
     return {
+      randomSeed: genRandomSeed(),
       dropFiles: [],
       uploadingFiles: false,
       error: null,
@@ -265,6 +268,30 @@ const PostStatusForm = {
     isEdit () {
       return typeof this.statusId !== 'undefined' && this.statusId.trim() !== ''
     },
+    quotable () {
+      if (!this.$store.state.instance.quotingAvailable) {
+        return false
+      }
+
+      if (!this.replyTo) {
+        return false
+      }
+
+      const repliedStatus = this.$store.state.statuses.allStatusesObject[this.replyTo]
+      if (!repliedStatus) {
+        return false
+      }
+
+      if (repliedStatus.visibility === 'public' ||
+          repliedStatus.visibility === 'unlisted' ||
+          repliedStatus.visibility === 'local') {
+        return true
+      } else if (repliedStatus.visibility === 'private') {
+        return repliedStatus.user.id === this.$store.state.users.currentUser.id
+      }
+
+      return false
+    },
     ...mapGetters(['mergedConfig']),
     ...mapState({
       mobileLayout: state => state.interface.mobileLayout
@@ -292,7 +319,8 @@ const PostStatusForm = {
         visibility: newStatus.visibility,
         contentType: newStatus.contentType,
         poll: {},
-        mediaDescriptions: {}
+        mediaDescriptions: {},
+        quoting: false
       }
       this.pollFormVisible = false
       this.$refs.mediaUpload && this.$refs.mediaUpload.clearFile()
@@ -340,6 +368,8 @@ const PostStatusForm = {
         return
       }
 
+      const replyOrQuoteAttr = newStatus.quoting ? 'quoteId' : 'inReplyToStatusId'
+
       const postingOptions = {
         status: newStatus.status,
         spoilerText: newStatus.spoilerText || null,
@@ -347,7 +377,7 @@ const PostStatusForm = {
         sensitive: newStatus.nsfw,
         media: newStatus.files,
         store: this.$store,
-        inReplyToStatusId: this.replyTo,
+        [replyOrQuoteAttr]: this.replyTo,
         contentType: newStatus.contentType,
         poll,
         idempotencyKey: this.idempotencyKey
@@ -373,6 +403,7 @@ const PostStatusForm = {
       }
       const newStatus = this.newStatus
       this.previewLoading = true
+      const replyOrQuoteAttr = newStatus.quoting ? 'quoteId' : 'inReplyToStatusId'
       statusPoster.postStatus({
         status: newStatus.status,
         spoilerText: newStatus.spoilerText || null,
@@ -380,7 +411,7 @@ const PostStatusForm = {
         sensitive: newStatus.nsfw,
         media: [],
         store: this.$store,
-        inReplyToStatusId: this.replyTo,
+        [replyOrQuoteAttr]: this.replyTo,
         contentType: newStatus.contentType,
         poll: {},
         preview: true
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 86c1f907..9b108a5a 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -126,6 +126,36 @@
             class="preview-status"
           />
         </div>
+        <div
+          v-if="quotable"
+          role="radiogroup"
+          class="btn-group reply-or-quote-selector"
+        >
+          <button
+            :id="`reply-or-quote-option-${randomSeed}-reply`"
+            class="btn button-default reply-or-quote-option"
+            :class="{ toggled: !newStatus.quoting }"
+            tabindex="0"
+            role="radio"
+            :aria-labelledby="`reply-or-quote-option-${randomSeed}-reply`"
+            :aria-checked="!newStatus.quoting"
+            @click="newStatus.quoting = false"
+          >
+            {{ $t('post_status.reply_option') }}
+          </button>
+          <button
+            :id="`reply-or-quote-option-${randomSeed}-quote`"
+            class="btn button-default reply-or-quote-option"
+            :class="{ toggled: newStatus.quoting }"
+            tabindex="0"
+            role="radio"
+            :aria-labelledby="`reply-or-quote-option-${randomSeed}-quote`"
+            :aria-checked="newStatus.quoting"
+            @click="newStatus.quoting = true"
+          >
+            {{ $t('post_status.quote_option') }}
+          </button>
+        </div>
         <EmojiInput
           v-if="!disableSubject && (newStatus.spoilerText || alwaysShowSubject)"
           v-model="newStatus.spoilerText"
@@ -420,6 +450,10 @@
     margin: 0;
   }
 
+  .reply-or-quote-selector {
+    margin-bottom: 0.5em;
+  }
+
   .text-format {
     .only-format {
       color: $fallback--faint;
diff --git a/src/components/quick_view_settings/quick_view_settings.js b/src/components/quick_view_settings/quick_view_settings.js
index 2798f37a..67aa6713 100644
--- a/src/components/quick_view_settings/quick_view_settings.js
+++ b/src/components/quick_view_settings/quick_view_settings.js
@@ -52,7 +52,6 @@ const QuickViewSettings = {
       get () { return this.mergedConfig.mentionLinkShowAvatar },
       set () {
         const value = !this.showUserAvatars
-        console.log(value)
         this.$store.dispatch('setOption', { name: 'mentionLinkShowAvatar', value })
       }
     },
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index 947536a1..1b0674e6 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -11,6 +11,8 @@
     />
     <span
       class="button-unstyled popover-trigger"
+      role="button"
+      :tabindex="0"
       :title="$t('tool_tip.add_reaction')"
       @click.stop.prevent="show"
     >
diff --git a/src/components/report/report.js b/src/components/report/report.js
index 76055764..f8675c0f 100644
--- a/src/components/report/report.js
+++ b/src/components/report/report.js
@@ -1,6 +1,7 @@
 import Select from '../select/select.vue'
 import StatusContent from '../status_content/status_content.vue'
 import Timeago from '../timeago/timeago.vue'
+import RichContent from 'src/components/rich_content/rich_content.jsx'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
 const Report = {
@@ -10,7 +11,8 @@ const Report = {
   components: {
     Select,
     StatusContent,
-    Timeago
+    Timeago,
+    RichContent
   },
   computed: {
     report () {
diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.js b/src/components/settings_modal/admin_tabs/frontends_tab.js
index a2c27c2a..8163af59 100644
--- a/src/components/settings_modal/admin_tabs/frontends_tab.js
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.js
@@ -4,6 +4,7 @@ import IntegerSetting from '../helpers/integer_setting.vue'
 import StringSetting from '../helpers/string_setting.vue'
 import GroupSetting from '../helpers/group_setting.vue'
 import Popover from 'src/components/popover/popover.vue'
+import PanelLoading from 'src/components/panel_loading/panel_loading.vue'
 
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -22,12 +23,18 @@ const FrontendsTab = {
       defaultSource: 'admin'
     }
   },
+  data () {
+    return {
+      working: false
+    }
+  },
   components: {
     BooleanSetting,
     ChoiceSetting,
     IntegerSetting,
     StringSetting,
     GroupSetting,
+    PanelLoading,
     Popover
   },
   created () {
@@ -42,18 +49,56 @@ const FrontendsTab = {
     ...SharedComputedObject()
   },
   methods: {
+    canInstall (frontend) {
+      const fe = this.frontends.find(f => f.name === frontend.name)
+      if (!fe) return false
+      return fe.refs.includes(frontend.ref)
+    },
+    getSuggestedRef (frontend) {
+      const defaultFe = this.adminDraft[':pleroma'][':frontends'][':primary']
+      if (defaultFe?.name === frontend.name && this.canInstall(defaultFe)) {
+        return defaultFe.ref
+      } else {
+        return frontend.refs[0]
+      }
+    },
     update (frontend, suggestRef) {
-      const ref = suggestRef || frontend.refs[0]
+      const ref = suggestRef || this.getSuggestedRef(frontend)
       const { name } = frontend
       const payload = { name, ref }
 
+      this.working = true
       this.$store.state.api.backendInteractor.installFrontend({ payload })
-        .then((externalUser) => {
+        .finally(() => {
+          this.working = false
+        })
+        .then(async (response) => {
           this.$store.dispatch('loadFrontendsStuff')
+          if (response.error) {
+            const reason = await response.error.json()
+            this.$store.dispatch('pushGlobalNotice', {
+              level: 'error',
+              messageKey: 'admin_dash.frontend.failure_installing_frontend',
+              messageArgs: {
+                version: name + '/' + ref,
+                reason: reason.error
+              },
+              timeout: 5000
+            })
+          } else {
+            this.$store.dispatch('pushGlobalNotice', {
+              level: 'success',
+              messageKey: 'admin_dash.frontend.success_installing_frontend',
+              messageArgs: {
+                version: name + '/' + ref
+              },
+              timeout: 2000
+            })
+          }
         })
     },
     setDefault (frontend, suggestRef) {
-      const ref = suggestRef || frontend.refs[0]
+      const ref = suggestRef || this.getSuggestedRef(frontend)
       const { name } = frontend
 
       this.$store.commit('updateAdminDraft', { path: [':pleroma', ':frontends', ':primary'], value: { name, ref } })
diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.scss b/src/components/settings_modal/admin_tabs/frontends_tab.scss
index e3e04bc6..420d20b3 100644
--- a/src/components/settings_modal/admin_tabs/frontends_tab.scss
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.scss
@@ -3,6 +3,22 @@
     padding: 0;
   }
 
+  .relative {
+    position: relative;
+  }
+
+  .overlay {
+    position: absolute;
+    background: var(--bg);
+    // fix buttons showing through
+    z-index: 2;
+    opacity: 0.9;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+  }
+
   dd {
     text-overflow: ellipsis;
     word-wrap: nowrap;
diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.vue b/src/components/settings_modal/admin_tabs/frontends_tab.vue
index 13b8fa6b..dd4c9790 100644
--- a/src/components/settings_modal/admin_tabs/frontends_tab.vue
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.vue
@@ -10,7 +10,6 @@
         <li>
           <h3>{{ $t('admin_dash.frontend.default_frontend') }}</h3>
           <p>{{ $t('admin_dash.frontend.default_frontend_tip') }}</p>
-          <p>{{ $t('admin_dash.frontend.default_frontend_tip2') }}</p>
           <ul class="setting-list">
             <li>
               <StringSetting path=":pleroma.:frontends.:primary.name" />
@@ -24,7 +23,8 @@
           </ul>
         </li>
       </ul>
-      <div class="setting-list">
+      <div class="setting-list relative">
+        <PanelLoading class="overlay" v-if="working"/>
         <h3>{{ $t('admin_dash.frontend.available_frontends') }}</h3>
         <ul class="cards-list">
           <li
@@ -33,9 +33,9 @@
           >
             <strong>{{ frontend.name }}</strong>
             {{ ' ' }}
-            <span v-if="adminDraft[':pleroma'][':frontends'][':primary'].name === frontend.name">
+            <span v-if="adminDraft[':pleroma'][':frontends'][':primary']?.name === frontend.name">
               <i18n-t
-                v-if="adminDraft[':pleroma'][':frontends'][':primary'].ref === frontend.refs[0]"
+                v-if="adminDraft[':pleroma'][':frontends'][':primary']?.ref === frontend.refs[0]"
                 keypath="admin_dash.frontend.is_default"
               />
               <i18n-t
@@ -86,6 +86,11 @@
                       ? $t('admin_dash.frontend.reinstall')
                       : $t('admin_dash.frontend.install')
                   }}
+                  <code>
+                    {{
+                      getSuggestedRef(frontend)
+                    }}
+                  </code>
                 </button>
                 <Popover
                   v-if="frontend.refs.length > 1"
@@ -93,13 +98,14 @@
                   class="button-dropdown"
                   placement="bottom"
                 >
-                  <template #content>
+                  <template #content="{close}">
                     <div class="dropdown-menu">
                       <button
                         v-for="ref in frontend.refs"
                         :key="ref"
                         class="button-default dropdown-item"
-                        @click="update(frontend, ref)"
+                        @click.prevent="update(frontend, ref)"
+                        @click="close"
                       >
                         <i18n-t keypath="admin_dash.frontend.install_version">
                           <template #version>
@@ -128,14 +134,19 @@
                   class="button button-default btn"
                   type="button"
                   :disabled="
-                    adminDraft[':pleroma'][':frontends'][':primary'].name === frontend.name &&
-                      adminDraft[':pleroma'][':frontends'][':primary'].ref === frontend.refs[0]
+                    adminDraft[':pleroma'][':frontends'][':primary']?.name === frontend.name &&
+                      adminDraft[':pleroma'][':frontends'][':primary']?.ref === frontend.refs[0]
                   "
                   @click="setDefault(frontend)"
                 >
                   {{
                     $t('admin_dash.frontend.set_default')
                   }}
+                  <code>
+                    {{
+                      getSuggestedRef(frontend)
+                    }}
+                  </code>
                 </button>
                 {{ ' ' }}
                 <Popover
@@ -144,13 +155,14 @@
                   class="button-dropdown"
                   placement="bottom"
                 >
-                  <template #content>
+                  <template #content="{close}">
                     <div class="dropdown-menu">
                       <button
-                        v-for="ref in frontend.refs.slice(1)"
+                        v-for="ref in frontend.installedRefs || frontend.refs"
                         :key="ref"
                         class="button-default dropdown-item"
-                        @click="setDefault(frontend, ref)"
+                        @click.prevent="setDefault(frontend, ref)"
+                        @click="close"
                       >
                         <i18n-t keypath="admin_dash.frontend.set_default_version">
                           <template #version>
diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue
index a6be776b..a0e3351e 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.vue
+++ b/src/components/settings_modal/admin_tabs/instance_tab.vue
@@ -6,6 +6,10 @@
         <li>
           <StringSetting path=":pleroma.:instance.:name" />
         </li>
+        <!-- See https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3963 -->
+        <li v-if="adminDraft[':pleroma'][':instance'][':favicon'] !== undefined">
+          <AttachmentSetting compact path=":pleroma.:instance.:favicon" />
+        </li>
         <li>
           <StringSetting path=":pleroma.:instance.:email" />
         </li>
@@ -16,7 +20,7 @@
           <StringSetting path=":pleroma.:instance.:short_description" />
         </li>
         <li>
-          <AttachmentSetting path=":pleroma.:instance.:instance_thumbnail" />
+          <AttachmentSetting compact path=":pleroma.:instance.:instance_thumbnail" />
         </li>
         <li>
           <AttachmentSetting path=":pleroma.:instance.:background_image" />
diff --git a/src/components/settings_modal/helpers/attachment_setting.js b/src/components/settings_modal/helpers/attachment_setting.js
index ac5c6f86..c4c04b2b 100644
--- a/src/components/settings_modal/helpers/attachment_setting.js
+++ b/src/components/settings_modal/helpers/attachment_setting.js
@@ -7,6 +7,7 @@ export default {
   ...Setting,
   props: {
     ...Setting.props,
+    compact: Boolean,
     acceptTypes: {
       type: String,
       required: false,
diff --git a/src/components/settings_modal/helpers/attachment_setting.vue b/src/components/settings_modal/helpers/attachment_setting.vue
index bbc5172c..b50231f2 100644
--- a/src/components/settings_modal/helpers/attachment_setting.vue
+++ b/src/components/settings_modal/helpers/attachment_setting.vue
@@ -2,6 +2,7 @@
   <span
     v-if="matchesExpertLevel"
     class="AttachmentSetting"
+    :class="{ '-compact': compact }"
   >
     <label
       :for="path"
@@ -24,8 +25,8 @@
       {{ backendDescriptionDescription + ' ' }}
     </p>
     <div class="attachment-input">
-      <div>{{ $t('settings.url') }}</div>
-      <div class="controls">
+      <div class="controls control-field">
+        <label for="path">{{ $t('settings.url') }}</label>
         <input
           :id="path"
           class="string-input"
@@ -40,7 +41,7 @@
         />
         <ProfileSettingIndicator :is-profile="isProfileSetting" />
       </div>
-      <div>{{ $t('settings.preview') }}</div>
+      <div v-if="!compact">{{ $t('settings.preview') }}</div>
       <Attachment
         class="attachment"
         :compact="compact"
@@ -50,7 +51,7 @@
         @setMedia="onMedia"
         @naturalSizeLoad="onNaturalSizeLoad"
       />
-      <div class="controls">
+      <div class="controls control-upload">
         <MediaUpload
           ref="mediaUpload"
           class="media-upload-icon"
@@ -84,6 +85,35 @@
     width: 20em;
   }
 
+  &.-compact {
+    .attachment-input {
+      flex-direction: row;
+      align-items: flex-end;
+    }
+
+    .attachment {
+      flex: 0;
+      order: 0;
+      display: block;
+      min-width: 4em;
+      height: 4em;
+      align-self: center;
+      margin-bottom: 0;
+    }
+
+    .control-field {
+      order: 1;
+      min-width: 12em;
+      margin-left: 0.5em;
+    }
+
+    .control-upload {
+      order: 2;
+      min-width: 12em;
+      padding: 0 0.5em;
+    }
+  }
+
   .controls {
     margin-bottom: 0.5em;
 
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index 49ef83e0..6bc9459b 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -3,6 +3,10 @@
 .settings-modal {
   overflow: hidden;
 
+  h4 {
+    margin-bottom: 0.5em;
+  }
+
   .setting-list,
   .option-list {
     list-style-type: none;
@@ -15,6 +19,14 @@
     .suboptions {
       margin-top: 0.3em;
     }
+
+    &.two-column {
+      column-count: 2;
+
+      > li {
+        break-inside: avoid;
+      }
+    }
   }
 
   .setting-description {
diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue
index 41d1b54f..89fdef1a 100644
--- a/src/components/settings_modal/tabs/filtering_tab.vue
+++ b/src/components/settings_modal/tabs/filtering_tab.vue
@@ -91,6 +91,11 @@
             {{ $t('settings.hide_attachments_in_convo') }}
           </BooleanSetting>
         </li>
+        <li>
+          <BooleanSetting path="hideScrobbles">
+            {{ $t('settings.hide_scrobbles') }}
+          </BooleanSetting>
+        </li>
       </ul>
     </div>
     <div
diff --git a/src/components/settings_modal/tabs/notifications_tab.js b/src/components/settings_modal/tabs/notifications_tab.js
index 3c6ab87f..c53b5889 100644
--- a/src/components/settings_modal/tabs/notifications_tab.js
+++ b/src/components/settings_modal/tabs/notifications_tab.js
@@ -16,6 +16,10 @@ const NotificationsTab = {
     user () {
       return this.$store.state.users.currentUser
     },
+    canReceiveReports () {
+      if (!this.user) { return false }
+      return this.user.privileges.includes('reports_manage_reports')
+    },
     ...SharedComputedObject()
   },
   methods: {
diff --git a/src/components/settings_modal/tabs/notifications_tab.vue b/src/components/settings_modal/tabs/notifications_tab.vue
index fcb92135..9ace4c36 100644
--- a/src/components/settings_modal/tabs/notifications_tab.vue
+++ b/src/components/settings_modal/tabs/notifications_tab.vue
@@ -1,5 +1,30 @@
 <template>
   <div :label="$t('settings.notifications')">
+    <div class="setting-item">
+      <h2>{{ $t('settings.notification_setting_annoyance') }}</h2>
+      <ul class="setting-list">
+        <li>
+          <BooleanSetting path="closingDrawerMarksAsSeen">
+            {{ $t('settings.notification_setting_drawer_marks_as_seen') }}
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting path="ignoreInactionableSeen">
+            {{ $t('settings.notification_setting_ignore_inactionable_seen') }}
+          </BooleanSetting>
+          <div>
+            <small>
+              {{ $t('settings.notification_setting_ignore_inactionable_seen_tip') }}
+            </small>
+          </div>
+        </li>
+        <li>
+          <BooleanSetting path="unseenAtTop" expert="1">
+            {{ $t('settings.notification_setting_unseen_at_top') }}
+          </BooleanSetting>
+        </li>
+      </ul>
+    </div>
     <div class="setting-item">
       <h2>{{ $t('settings.notification_setting_filters') }}</h2>
       <ul class="setting-list">
@@ -11,42 +36,184 @@
             {{ $t('settings.notification_setting_block_from_strangers') }}
           </BooleanSetting>
         </li>
-        <li class="select-multiple">
-          <span class="label">{{ $t('settings.notification_visibility') }}</span>
-          <ul class="option-list">
+        <li>
+          <h3> {{ $t('settings.notification_visibility') }}</h3>
+          <p v-if="expertLevel > 0">{{ $t('settings.notification_setting_filters_chrome_push') }}</p>
+          <ul class="setting-list two-column">
             <li>
-              <BooleanSetting path="notificationVisibility.likes">
-                {{ $t('settings.notification_visibility_likes') }}
+              <h4> {{ $t('settings.notification_visibility_mentions') }}</h4>
+              <ul class="setting-list">
+                <li>
+                  <BooleanSetting path="notificationVisibility.mentions">
+                    {{ $t('settings.notification_visibility_in_column') }}
+                  </BooleanSetting>
+                </li>
+                <li>
+                  <BooleanSetting path="notificationNative.mentions">
+                    {{ $t('settings.notification_visibility_native_notifications') }}
+                  </BooleanSetting>
+                </li>
+              </ul>
+            </li>
+            <li>
+              <h4> {{ $t('settings.notification_visibility_likes') }}</h4>
+              <ul class="setting-list">
+                <li>
+                  <BooleanSetting path="notificationVisibility.likes">
+                    {{ $t('settings.notification_visibility_in_column') }}
+                  </BooleanSetting>
+                </li>
+                <li>
+                  <BooleanSetting path="notificationNative.likes">
+                    {{ $t('settings.notification_visibility_native_notifications') }}
+                  </BooleanSetting>
+                </li>
+              </ul>
+            </li>
+            <li>
+              <h4> {{ $t('settings.notification_visibility_repeats') }}</h4>
+              <ul class="setting-list">
+                <li>
+                  <BooleanSetting path="notificationVisibility.repeats">
+                    {{ $t('settings.notification_visibility_in_column') }}
+                  </BooleanSetting>
+                </li>
+                <li>
+                  <BooleanSetting path="notificationNative.repeats">
+                    {{ $t('settings.notification_visibility_native_notifications') }}
+                  </BooleanSetting>
+                </li>
+              </ul>
+            </li>
+            <li>
+              <h4> {{ $t('settings.notification_visibility_emoji_reactions') }}</h4>
+              <ul class="setting-list">
+                <li>
+                  <BooleanSetting path="notificationVisibility.emojiReactions">
+                    {{ $t('settings.notification_visibility_in_column') }}
+                  </BooleanSetting>
+                </li>
+                <li>
+                  <BooleanSetting path="notificationNative.emojiReactions">
+                    {{ $t('settings.notification_visibility_native_notifications') }}
+                  </BooleanSetting>
+                </li>
+              </ul>
+            </li>
+            <li>
+              <h4> {{ $t('settings.notification_visibility_follows') }}</h4>
+              <ul class="setting-list">
+                <li>
+                  <BooleanSetting path="notificationVisibility.follows">
+                    {{ $t('settings.notification_visibility_in_column') }}
+                  </BooleanSetting>
+                </li>
+                <li>
+                  <BooleanSetting path="notificationNative.follows">
+                    {{ $t('settings.notification_visibility_native_notifications') }}
+                  </BooleanSetting>
+                </li>
+              </ul>
+            </li>
+            <li>
+              <h4> {{ $t('settings.notification_visibility_follow_requests') }}</h4>
+              <ul class="setting-list">
+                <li>
+                  <BooleanSetting path="notificationVisibility.followRequest">
+                    {{ $t('settings.notification_visibility_in_column') }}
+                  </BooleanSetting>
+                </li>
+                <li>
+                  <BooleanSetting path="notificationNative.followRequest">
+                    {{ $t('settings.notification_visibility_native_notifications') }}
+                  </BooleanSetting>
+                </li>
+              </ul>
+            </li>
+            <li>
+              <h4> {{ $t('settings.notification_visibility_moves') }}</h4>
+              <ul class="setting-list">
+                <li>
+                  <BooleanSetting path="notificationVisibility.moves">
+                    {{ $t('settings.notification_visibility_in_column') }}
+                  </BooleanSetting>
+                </li>
+                <li>
+                  <BooleanSetting path="notificationNative.moves">
+                    {{ $t('settings.notification_visibility_native_notifications') }}
+                  </BooleanSetting>
+                </li>
+              </ul>
+            </li>
+            <li>
+              <h4> {{ $t('settings.notification_visibility_polls') }}</h4>
+              <ul class="setting-list">
+                <li>
+                  <BooleanSetting path="notificationVisibility.polls">
+                    {{ $t('settings.notification_visibility_in_column') }}
+                  </BooleanSetting>
+                </li>
+                <li>
+                  <BooleanSetting path="notificationNative.polls">
+                    {{ $t('settings.notification_visibility_native_notifications') }}
+                  </BooleanSetting>
+                </li>
+              </ul>
+            </li>
+            <li v-if="canReceiveReports">
+              <h4> {{ $t('settings.notification_visibility_reports') }}</h4>
+              <ul class="setting-list">
+                <li>
+                  <BooleanSetting path="notificationVisibility.reports">
+                    {{ $t('settings.notification_visibility_in_column') }}
+                  </BooleanSetting>
+                </li>
+                <li>
+                  <BooleanSetting path="notificationNative.reports">
+                    {{ $t('settings.notification_visibility_native_notifications') }}
+                  </BooleanSetting>
+                </li>
+              </ul>
+            </li>
+          </ul>
+        </li>
+        <li>
+          <BooleanSetting path="showExtraNotifications">
+            {{ $t('settings.notification_show_extra') }}
+          </BooleanSetting>
+        </li>
+        <li>
+          <ul class="setting-list suboptions">
+            <li>
+              <BooleanSetting
+                path="showChatsInExtraNotifications"
+                :disabled="!mergedConfig.showExtraNotifications"
+              >
+                {{ $t('settings.notification_extra_chats') }}
               </BooleanSetting>
             </li>
             <li>
-              <BooleanSetting path="notificationVisibility.repeats">
-                {{ $t('settings.notification_visibility_repeats') }}
+              <BooleanSetting
+                path="showAnnouncementsInExtraNotifications"
+                :disabled="!mergedConfig.showExtraNotifications"
+              >
+                {{ $t('settings.notification_extra_announcements') }}
               </BooleanSetting>
             </li>
             <li>
-              <BooleanSetting path="notificationVisibility.follows">
-                {{ $t('settings.notification_visibility_follows') }}
+              <BooleanSetting
+                path="showFollowRequestsInExtraNotifications"
+                :disabled="!mergedConfig.showExtraNotifications"
+              >
+                {{ $t('settings.notification_extra_follow_requests') }}
               </BooleanSetting>
             </li>
             <li>
-              <BooleanSetting path="notificationVisibility.mentions">
-                {{ $t('settings.notification_visibility_mentions') }}
-              </BooleanSetting>
-            </li>
-            <li>
-              <BooleanSetting path="notificationVisibility.moves">
-                {{ $t('settings.notification_visibility_moves') }}
-              </BooleanSetting>
-            </li>
-            <li>
-              <BooleanSetting path="notificationVisibility.emojiReactions">
-                {{ $t('settings.notification_visibility_emoji_reactions') }}
-              </BooleanSetting>
-            </li>
-            <li>
-              <BooleanSetting path="notificationVisibility.polls">
-                {{ $t('settings.notification_visibility_polls') }}
+              <BooleanSetting
+                path="showExtraNotificationsTip"
+                :disabled="!mergedConfig.showExtraNotifications"
+              >
+                {{ $t('settings.notification_extra_tip') }}
               </BooleanSetting>
             </li>
           </ul>
@@ -67,6 +234,21 @@
           >
             {{ $t('settings.enable_web_push_notifications') }}
           </BooleanSetting>
+          <ul class="setting-list suboptions">
+            <li>
+              <BooleanSetting
+                path="webPushAlwaysShowNotifications"
+                :disabled="!mergedConfig.webPushNotifications"
+              >
+                {{ $t('settings.enable_web_push_always_show') }}
+              </BooleanSetting>
+              <div :class="{ faint: !mergedConfig.webPushNotifications }">
+                <small>
+                  {{ $t('settings.enable_web_push_always_show_tip') }}
+                </small>
+              </div>
+            </li>
+          </ul>
         </li>
         <li>
           <BooleanSetting
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.js b/src/components/settings_modal/tabs/theme_tab/theme_tab.js
index 4a739f73..58f8d44a 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.js
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.js
@@ -755,7 +755,6 @@ export default {
     selected () {
       this.selectedTheme = Object.entries(this.availableStyles).find(([k, s]) => {
         if (Array.isArray(s)) {
-          console.log(s[0] === this.selected, this.selected)
           return s[0] === this.selected
         } else {
           return s.name === this.selected
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 9a9bca7a..129929a3 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -39,7 +39,8 @@ import {
   faThumbtack,
   faChevronUp,
   faChevronDown,
-  faAngleDoubleRight
+  faAngleDoubleRight,
+  faPlay
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
@@ -59,7 +60,8 @@ library.add(
   faThumbtack,
   faChevronUp,
   faChevronDown,
-  faAngleDoubleRight
+  faAngleDoubleRight,
+  faPlay
 )
 
 const camelCase = name => name.charAt(0).toUpperCase() + name.slice(1)
@@ -133,6 +135,7 @@ const Status = {
     'showPinned',
     'inProfile',
     'profileUserId',
+    'inQuote',
 
     'simpleTree',
     'controlledThreadDisplayStatus',
@@ -151,6 +154,7 @@ const Status = {
     'controlledSetMediaPlaying',
     'dive'
   ],
+  emits: ['interacted'],
   data () {
     return {
       uncontrolledReplying: false,
@@ -159,7 +163,8 @@ const Status = {
       uncontrolledMediaPlaying: [],
       suspendable: true,
       error: null,
-      headTailLinks: null
+      headTailLinks: null,
+      displayQuote: !this.inQuote
     }
   },
   computed: {
@@ -401,6 +406,24 @@ const Status = {
     },
     editingAvailable () {
       return this.$store.state.instance.editingAvailable
+    },
+    hasVisibleQuote () {
+      return this.status.quote_url && this.status.quote_visible
+    },
+    hasInvisibleQuote () {
+      return this.status.quote_url && !this.status.quote_visible
+    },
+    quotedStatus () {
+      return this.status.quote_id ? this.$store.state.statuses.allStatusesObject[this.status.quote_id] : undefined
+    },
+    shouldDisplayQuote () {
+      return this.quotedStatus && this.displayQuote
+    },
+    scrobblePresent () {
+      return !this.mergedConfig.hideScrobbles && this.status.user.latestScrobble && this.status.user.latestScrobble.artist
+    },
+    scrobble () {
+      return this.status.user.latestScrobble
     }
   },
   methods: {
@@ -420,9 +443,11 @@ const Status = {
       this.error = error
     },
     clearError () {
+      this.$emit('interacted')
       this.error = undefined
     },
     toggleReplying () {
+      this.$emit('interacted')
       controlledOrUncontrolledToggle(this, 'replying')
     },
     gotoOriginal (id) {
@@ -469,6 +494,18 @@ const Status = {
           window.scrollBy(0, rect.bottom - window.innerHeight + 50)
         }
       }
+    },
+    toggleDisplayQuote () {
+      if (this.shouldDisplayQuote) {
+        this.displayQuote = false
+      } else if (!this.quotedStatus) {
+        this.$store.dispatch('fetchStatus', this.status.quote_id)
+          .then(() => {
+            this.displayQuote = true
+          })
+      } else {
+        this.displayQuote = true
+      }
     }
   },
   watch: {
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 44812867..760c6ac1 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -422,4 +422,22 @@
       }
     }
   }
+
+  .quoted-status {
+    margin-top: 0.5em;
+    border: 1px solid var(--border, $fallback--border);
+    border-radius: var(--attachmentRadius, $fallback--attachmentRadius);
+
+    &.-unavailable-prompt {
+      padding: 0.5em;
+    }
+  }
+
+  .display-quoted-status-button {
+    margin: 0.5em;
+
+    &-icon {
+      color: inherit;
+    }
+  }
 }
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 35b15362..fa9d6f0b 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -249,6 +249,47 @@
                 </button>
               </span>
             </div>
+            <div
+              v-if="scrobblePresent"
+              class="status-rich-presence"
+            >
+              <a
+                v-if="scrobble.externalLink"
+                :href="scrobble.externalLink"
+                target="_blank"
+              >
+                {{ scrobble.artist }} — {{ scrobble.title }}
+                <FAIcon
+                  class="fa-scale-110 fa-old-padding"
+                  icon="play"
+                />
+                <span class="status-rich-presence-time">
+                  <Timeago
+                    template-key="time.in_past"
+                    :time="scrobble.created_at"
+                    :auto-update="60"
+                  />
+                </span>
+              </a>
+              <span v-if="!scrobble.externalLink">
+                <FAIcon
+                  class="fa-scale-110 fa-old-padding"
+                  icon="music"
+                />
+                {{ scrobble.artist }} — {{ scrobble.title }}
+                <FAIcon
+                  class="fa-scale-110 fa-old-padding"
+                  icon="play"
+                />
+                <span class="status-rich-presence-time">
+                  <Timeago
+                    template-key="time.in_past"
+                    :time="scrobble.created_at"
+                    :auto-update="60"
+                  />
+                </span>
+              </span>
+            </div>
             <div
               v-if="isReply || hasMentionsLine"
               class="heading-reply-row"
@@ -364,6 +405,45 @@
             @parseReady="setHeadTailLinks"
           />
 
+          <article
+            v-if="hasVisibleQuote"
+            class="quoted-status"
+          >
+            <button
+              class="button-unstyled -link display-quoted-status-button"
+              :aria-expanded="shouldDisplayQuote"
+              @click="toggleDisplayQuote"
+            >
+              {{ shouldDisplayQuote ? $t('status.hide_quote') : $t('status.display_quote') }}
+              <FAIcon
+                class="display-quoted-status-button-icon"
+                :icon="shouldDisplayQuote ? 'chevron-up' : 'chevron-down'"
+              />
+            </button>
+            <Status
+              v-if="shouldDisplayQuote"
+              :statusoid="quotedStatus"
+              :in-quote="true"
+            />
+          </article>
+          <p
+            v-else-if="hasInvisibleQuote"
+            class="quoted-status -unavailable-prompt"
+          >
+            <i18n-t keypath="status.invisible_quote">
+              <template #link>
+                <bdi>
+                  <a
+                    :href="status.quote_url"
+                    target="_blank"
+                  >
+                    {{ status.quote_url }}
+                  </a>
+                </bdi>
+              </template>
+            </i18n-t>
+          </p>
+
           <div
             v-if="inConversation && !isPreview && replies && replies.length"
             class="replies"
@@ -451,14 +531,17 @@
               :visibility="status.visibility"
               :logged-in="loggedIn"
               :status="status"
+              @click="$emit('interacted')"
             />
             <favorite-button
               :logged-in="loggedIn"
               :status="status"
+              @click="$emit('interacted')"
             />
             <ReactButton
               v-if="loggedIn"
               :status="status"
+              @click="$emit('interacted')"
             />
             <extra-buttons
               :status="status"
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index 89f0aa51..8d8a91dc 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -73,6 +73,10 @@ const StatusContent = {
   },
   computed: {
     ...controlledOrUncontrolledGetters(['showingTall', 'expandingSubject', 'showingLongSubject']),
+    statusCard () {
+      if (!this.status.card) return null
+      return this.status.card.url === this.status.quote_url ? null : this.status.card
+    },
     hideAttachments () {
       return (this.mergedConfig.hideAttachments && !this.inConversation) ||
         (this.mergedConfig.hideAttachmentsInConv && this.inConversation)
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index c0e5c0b9..e977d489 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -43,7 +43,7 @@
       />
 
       <div
-        v-if="status.card && !noHeading && !compact"
+        v-if="statusCard && !noHeading && !compact"
         class="link-preview media-body"
       >
         <link-preview
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index b7414610..1050b87a 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -160,6 +160,9 @@ const Timeline = {
       if (this.timeline.flushMarker !== 0) {
         this.$store.commit('clearTimeline', { timeline: this.timelineName, excludeUserId: true })
         this.$store.commit('queueFlush', { timeline: this.timelineName, id: 0 })
+        if (this.timelineName === 'user') {
+          this.$store.dispatch('fetchPinnedStatuses', this.userId)
+        }
         this.fetchOlderStatuses()
       } else {
         this.blockClicksTemporarily()
diff --git a/src/components/video_attachment/video_attachment.vue b/src/components/video_attachment/video_attachment.vue
index 8a3ea1e3..23eb4c55 100644
--- a/src/components/video_attachment/video_attachment.vue
+++ b/src/components/video_attachment/video_attachment.vue
@@ -2,7 +2,7 @@
   <video
     class="video"
     preload="metadata"
-    :src="attachment.url"
+    :src="attachment.url + '#t=0.5'"
     :loop="loopVideo"
     :controls="controls"
     :alt="attachment.description"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index fd0010f4..726c313b 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -189,6 +189,7 @@
     "mobile_notifications": "Open notifications",
     "mobile_notifications": "Open notifications (there are unread ones)",
     "mobile_notifications_close": "Close notifications",
+    "mobile_notifications_mark_as_seen": "Mark all as seen",
     "announcements": "Announcements"
   },
   "notifications": {
@@ -205,7 +206,13 @@
     "migrated_to": "migrated to",
     "reacted_with": "reacted with {0}",
     "submitted_report": "submitted a report",
-    "poll_ended": "poll has ended"
+    "poll_ended": "poll has ended",
+    "unread_announcements": "{num} unread announcement | {num} unread announcements",
+    "unread_chats": "{num} unread chat | {num} unread chats",
+    "unread_follow_requests": "{num} new follow request | {num} new follow requests",
+    "configuration_tip": "You can customize what to display here in {theSettings}. {dismiss}",
+    "configuration_tip_settings": "the settings",
+    "configuration_tip_dismiss": "Do not show again"
   },
   "polls": {
     "add_poll": "Add poll",
@@ -261,6 +268,8 @@
   "post_status": {
     "edit_status": "Edit status",
     "new_status": "Post new status",
+    "reply_option": "Reply to this status",
+    "quote_option": "Quote this status",
     "account_not_locked_warning": "Your account is not {0}. Anyone can follow you to view your follower-only posts.",
     "account_not_locked_warning_link": "locked",
     "attachments_sensitive": "Mark attachments as sensitive",
@@ -487,6 +496,7 @@
     "hide_muted_posts": "Hide posts of muted users",
     "mute_bot_posts": "Mute bot posts",
     "hide_bot_indication": "Hide bot indication in posts",
+    "hide_scrobbles": "Hide scrobbles",
     "hide_all_muted_posts": "Hide muted posts",
     "max_thumbnails": "Maximum amount of thumbnails per post (empty = no limit)",
     "hide_isp": "Hide instance-specific panel",
@@ -552,13 +562,22 @@
     "posts": "Posts",
     "user_profiles": "User Profiles",
     "notification_visibility": "Types of notifications to show",
+    "notification_visibility_in_column": "Show in notifications column/drawer",
+    "notification_visibility_native_notifications": "Show a native notification",
     "notification_visibility_follows": "Follows",
+    "notification_visibility_follow_requests": "Follow requests",
     "notification_visibility_likes": "Favorites",
     "notification_visibility_mentions": "Mentions",
     "notification_visibility_repeats": "Repeats",
+    "notification_visibility_reports": "Reports",
     "notification_visibility_moves": "User Migrates",
     "notification_visibility_emoji_reactions": "Reactions",
     "notification_visibility_polls": "Ends of polls you voted in",
+    "notification_show_extra": "Show extra notifications in the notifications column",
+    "notification_extra_chats": "Show unread chats",
+    "notification_extra_announcements": "Show unread announcements",
+    "notification_extra_follow_requests": "Show new follow requests",
+    "notification_extra_tip": "Show the customization tip for extra notifications",
     "no_rich_text_description": "Strip rich text formatting from all posts",
     "no_blocks": "No blocks",
     "no_mutes": "No mutes",
@@ -674,13 +693,21 @@
     "greentext": "Meme arrows",
     "show_yous": "Show (You)s",
     "notifications": "Notifications",
+    "notification_setting_annoyance": "Annoyance",
+    "notification_setting_drawer_marks_as_seen": "Closing drawer (mobile) marks all notifications as read",
+    "notification_setting_ignore_inactionable_seen": "Ignore read state of inactionable notifications (likes, repeats etc)",
+    "notification_setting_ignore_inactionable_seen_tip": "This will not actually mark those notifications as read, and you'll still get desktop notifications about them if you chose so",
+    "notification_setting_unseen_at_top": "Show unread notifications above others",
     "notification_setting_filters": "Filters",
+    "notification_setting_filters_chrome_push": "On some browsers (chrome) it might be impossible to completely filter out notifications by type when they arrive by Push",
     "notification_setting_block_from_strangers": "Block notifications from users who you do not follow",
     "notification_setting_privacy": "Privacy",
     "notification_setting_hide_notification_contents": "Hide the sender and contents of push notifications",
     "notification_mutes": "To stop receiving notifications from a specific user, use a mute.",
     "notification_blocks": "Blocking a user stops all notifications as well as unsubscribes them.",
     "enable_web_push_notifications": "Enable web push notifications",
+    "enable_web_push_always_show": "Always show web push notifications",
+    "enable_web_push_always_show_tip": "Some browsers (Chromium, Chrome) require that push messages always result in a notification, otherwise generic 'Website was updated in background' is shown, enable this to prevent this notification from showing, as Chrome seem to hide push notifications if tab is in focus. Can result in showing duplicate notifications on other browsers.",
     "more_settings": "More settings",
     "style": {
       "switcher": {
@@ -900,8 +927,9 @@
       "wip_notice": "Please note that this section is a WIP and lacks certain features as backend implementation of front-end management is incomplete.",
       "default_frontend": "Default front-end",
       "default_frontend_tip": "Default front-end will be shown to all users. Currently there's no way to for a user to select personal front-end. If you switch away from PleromaFE you'll most likely have to use old and buggy AdminFE to do instance configuration until we replace it.",
-      "default_frontend_tip2": "WIP: Since Pleroma backend doesn't properly list all installed frontends you'll have to enter name and reference manually. List below provides shortcuts to fill the values.",
-      "available_frontends": "Available for install"
+      "available_frontends": "Available for install",
+      "failure_installing_frontend": "Failed to install frontend {version}: {reason}",
+      "success_installing_frontend": "Frontend {version} successfully installed"
     },
     "temp_overrides": {
       ":pleroma": {
@@ -1028,7 +1056,11 @@
     "show_all_conversation": "Show full conversation ({numStatus} other status) | Show full conversation ({numStatus} other statuses)",
     "show_only_conversation_under_this": "Only show replies to this status",
     "status_history": "Status history",
-    "reaction_count_label": "{num} person reacted | {num} people reacted"
+    "reaction_count_label": "{num} person reacted | {num} people reacted",
+    "hide_quote": "Hide the quoted status",
+    "display_quote": "Display the quoted status",
+    "invisible_quote": "Quoted status unavailable: {link}",
+    "more_actions": "More actions on this status"
   },
   "user_card": {
     "approve": "Approve",
diff --git a/src/i18n/ja_easy.json b/src/i18n/ja_easy.json
index 21b27d12..c5ed3b6c 100644
--- a/src/i18n/ja_easy.json
+++ b/src/i18n/ja_easy.json
@@ -163,7 +163,8 @@
     "search_close": "けんさくバーをとじる",
     "edit_nav_mobile": "ナビゲーションバーのせっていをかえる",
     "mobile_sidebar": "モバイルのサイドバーをきりかえる",
-    "edit_finish": "へんしゅうをおわりにする"
+    "edit_finish": "へんしゅうをおわりにする",
+    "mobile_notifications_mark_as_seen": "ぜんぶ みたことにする"
   },
   "notifications": {
     "broken_favorite": "ステータスがみつかりません。さがしています…",
@@ -179,7 +180,13 @@
     "migrated_to": "インスタンスを、ひっこしました",
     "reacted_with": "{0} でリアクションしました",
     "poll_ended": "とうひょうが、おわりました",
-    "submitted_report": "つうほうしました"
+    "submitted_report": "つうほうしました",
+    "unread_announcements": "まだ よんでいない おしらせが {num}こ あります",
+    "configuration_tip_settings": "せってい",
+    "configuration_tip_dismiss": "つぎは ひょうじしない",
+    "unread_chats": "よんでいない チャットが {num}こ あります",
+    "unread_follow_requests": "フォローリクエストが {num}こ あります",
+    "configuration_tip": "ここに ひょうじする ものを {theSettings}で へんこうできます。 {dismiss}"
   },
   "polls": {
     "add_poll": "とうひょうをはじめる",
@@ -218,7 +225,8 @@
       "symbols": "きごう",
       "travel-and-places": "りょこう・ばしょ"
     },
-    "regional_indicator": "ばしょをしめすきごう {letter}"
+    "regional_indicator": "ばしょをしめすきごう {letter}",
+    "unpacked": "アンパックされた えもじ"
   },
   "stickers": {
     "add_sticker": "ステッカーをふやす"
@@ -269,7 +277,9 @@
     "preview": "プレビュー",
     "preview_empty": "なにもありません",
     "empty_status_error": "とうこうないようを、にゅうりょくしてください",
-    "scope_notice_dismiss": "このつうちをとじる"
+    "scope_notice_dismiss": "このつうちをとじる",
+    "reply_option": "この ステータスに へんしんする",
+    "quote_option": "この ステータスを いんようする"
   },
   "registration": {
     "bio": "プロフィール",
@@ -324,7 +334,7 @@
       "warning_of_generate_new_codes": "あたらしいリカバリーコードをつくったら、ふるいコードはつかえなくなります。",
       "recovery_codes": "リカバリーコード。",
       "waiting_a_recovery_codes": "バックアップコードをうけとっています…",
-      "recovery_codes_warning": "コードをかきうつすか、ひとにみられないところにセーブしてください。そうでなければ、あなたはこのコードをふたたびみることはできません。もしあなたが、2FAアプリのアクセスをうしなって、なおかつ、リカバリーコードもおもいだせないならば、あなたはあなたのアカウントから、しめだされます。",
+      "recovery_codes_warning": "コードを かきうつすか、 ほかのひとが みれないところに ほぞんしてください。 そうしないと、 あなたは このコードを にどと みることができません。 もし あなたが 2FAアプリに アクセスできなくなり、 リカバリーコードも おもいだせないなら、 あなたは あなたの アカウントに はいれなくなります。",
       "authentication_methods": "にんしょうメソッド",
       "scan": {
         "title": "スキャン",
@@ -697,9 +707,9 @@
     "import_mutes_from_a_csv_file": "CSVファイルからミュートをインポートする",
     "reset_avatar": "アバターをリセットする",
     "remove_language": "とりのぞく",
-    "primary_language": "いちばんわかることば:",
+    "primary_language": "さいしょに つかう ことば:",
     "add_language": "よびとしてつかうことばを、ついかする",
-    "fallback_language": "よびとしてつかうことば {index}:",
+    "fallback_language": "よびとして つかう ことば {index}:",
     "lists_navigation": "ナビゲーションにリストをひょうじする",
     "account_alias": "アカウントのエイリアス",
     "mention_link_display_full": "いつも、ながいなまえをひょうじする (れい: {'@'}hoge{'@'}example.org)",
@@ -797,7 +807,11 @@
     "virtual_scrolling": "タイムラインのレンダリングをよくする",
     "use_at_icon": "{'@'} きごうを、もじのかわりに、アイコンでひょうじする",
     "mention_link_display_short": "いつも、みじかいなまえにする (れい: {'@'}hoge)",
-    "mention_link_display": "メンションのリンクをひょうじするけいしき"
+    "mention_link_display": "メンションのリンクをひょうじするけいしき",
+    "url": "URL",
+    "preview": "プレビュー",
+    "emoji_reactions_scale": "リアクションを なんばいの おおきさで ひょうじするか",
+    "autocomplete_select_first": "じどうほかんが あれば、 さいしょの ものを じどうで えらぶ"
   },
   "time": {
     "day": "{0}日",
diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index fddf24db..0b20ffff 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -4,36 +4,37 @@
   },
   "exporter": {
     "export": "エクスポート",
-    "processing": "処理中です。処理が完了すると、ファイルをダウンロードするよう指示があります"
+    "processing": "処理中です。処理が完了すると、ファイルのダウンロードが開始します"
   },
   "features_panel": {
     "chat": "チャット",
     "gopher": "Gopher",
-    "media_proxy": "メディアプロクシ",
+    "media_proxy": "メディアプロキシ",
     "scope_options": "公開範囲選択",
-    "text_limit": "文字の数",
+    "text_limit": "文字数制限",
     "title": "有効な機能",
     "who_to_follow": "おすすめユーザー",
     "upload_limit": "ファイルサイズの上限",
-    "pleroma_chat_messages": "Pleroma チャット"
+    "pleroma_chat_messages": "Pleroma チャット",
+    "shout": "Shoutbox"
   },
   "finder": {
-    "error_fetching_user": "ユーザー検索がエラーになりました",
+    "error_fetching_user": "ユーザーの取得に失敗しました",
     "find_user": "ユーザーを探す"
   },
   "general": {
     "apply": "適用",
     "submit": "送信",
-    "more": "続き",
-    "generic_error": "エラーになりました",
-    "optional": "省略可",
+    "more": "もっと",
+    "generic_error": "エラーが発生しました",
+    "optional": "任意",
     "show_more": "もっと見る",
     "show_less": "たたむ",
     "cancel": "キャンセル",
     "disable": "無効",
     "enable": "有効",
     "confirm": "確認",
-    "verify": "検査",
+    "verify": "検証",
     "peek": "隠す",
     "close": "閉じる",
     "dismiss": "無視",
@@ -46,7 +47,21 @@
     },
     "flash_security": "Flashコンテンツが任意の命令を実行させることにより、コンピューターが危険にさらされることがあります。",
     "flash_fail": "Flashコンテンツの読み込みに失敗しました。コンソールで詳細を確認できます。",
-    "flash_content": "（試験的機能）クリックしてFlashコンテンツを再生します。"
+    "flash_content": "(試験的機能) クリックしてFlashコンテンツを再生します。",
+    "yes": "はい",
+    "no": "いいえ",
+    "scroll_to_top": "最上部へスクロール",
+    "unpin": "ピン留めを外す",
+    "pin": "ピン留めする",
+    "scope_in_timeline": {
+      "direct": "ダイレクト",
+      "private": "フォロワー限定",
+      "public": "パブリック",
+      "unlisted": "アンリステッド"
+    },
+    "generic_error_message": "エラーが発生しました: {0}",
+    "never_show_again": "二度と表示しない",
+    "undo": "取り消す"
   },
   "image_cropper": {
     "crop_picture": "画像を切り抜く",
@@ -57,7 +72,7 @@
   "importer": {
     "submit": "送信",
     "success": "正常にインポートされました。",
-    "error": "このファイルをインポートするとき、エラーが発生しました。"
+    "error": "ファイルのインポート中にエラーが発生しました。"
   },
   "login": {
     "login": "ログイン",
@@ -69,30 +84,36 @@
     "username": "ユーザー名",
     "hint": "会話に加わるには、ログインしてください",
     "authentication_code": "認証コード",
-    "enter_recovery_code": "リカバリーコードを入力してください",
-    "enter_two_factor_code": "2段階認証コードを入力してください",
+    "enter_recovery_code": "リカバリーコードを入力",
+    "enter_two_factor_code": "2段階認証コードを入力",
     "recovery_code": "リカバリーコード",
     "heading": {
       "totp": "2段階認証",
-      "recovery": "2段階リカバリー"
-    }
+      "recovery": "2段階認証リカバリー"
+    },
+    "logout_confirm": "本当にログアウトしますか？",
+    "logout_confirm_accept_button": "ログアウト",
+    "logout_confirm_cancel_button": "ログアウトしない",
+    "logout_confirm_title": "ログアウトの確認"
   },
   "media_modal": {
-    "previous": "前",
-    "next": "次"
+    "previous": "前へ",
+    "next": "次へ",
+    "hide": "メディアビューアを閉じる",
+    "counter": "{current} / {total}"
   },
   "nav": {
     "about": "このインスタンスについて",
     "back": "戻る",
     "chat": "ローカルチャット",
     "friend_requests": "フォローリクエスト",
-    "mentions": "通知",
-    "interactions": "インタラクション",
+    "mentions": "メンション",
+    "interactions": "通知",
     "dms": "ダイレクトメッセージ",
     "public_tl": "公開タイムライン",
     "timeline": "タイムライン",
     "twkn": "すべてのネットワーク",
-    "user_search": "ユーザーを探す",
+    "user_search": "ユーザー検索",
     "search": "検索",
     "who_to_follow": "おすすめユーザー",
     "preferences": "設定",
@@ -100,21 +121,35 @@
     "bookmarks": "ブックマーク",
     "timelines": "タイムライン",
     "chats": "チャット",
-    "home_timeline": "ホームタイムライン"
+    "home_timeline": "ホームタイムライン",
+    "mobile_notifications_mark_as_seen": "すべて既読にする",
+    "search_close": "検索バーを閉じる",
+    "lists": "リスト",
+    "edit_nav_mobile": "ナビゲーションバーを編集",
+    "edit_pinned": "ピン留めを編集",
+    "edit_finish": "完了",
+    "mobile_notifications": "通知を開く (未読あり)",
+    "mobile_notifications_close": "通知を閉じる",
+    "announcements": "お知らせ"
   },
   "notifications": {
     "broken_favorite": "ステータスが見つかりません。探しています…",
-    "favorited_you": "あなたのステータスがお気に入りされました",
+    "favorited_you": "ステータスがお気に入りされました",
     "followed_you": "フォローされました",
-    "load_older": "古い通知をみる",
+    "load_older": "古い通知を読み込む",
     "notifications": "通知",
     "read": "読んだ！",
-    "repeated_you": "あなたのステータスがリピートされました",
+    "repeated_you": "ステータスがリピートされました",
     "no_more_notifications": "通知はありません",
     "reacted_with": "{0} でリアクションしました",
     "migrated_to": "インスタンスを引っ越しました",
-    "follow_request": "あなたをフォローしたいです",
-    "error": "通知の取得に失敗しました: {0}"
+    "follow_request": "あなたをフォローしたがっています",
+    "error": "通知の取得に失敗しました: {0}",
+    "poll_ended": "投票結果が確定しました",
+    "configuration_tip_dismiss": "二度と表示しない",
+    "unread_announcements": "未読のお知らせが{num}件あります | 未読のお知らせが{num}件あります",
+    "unread_chats": "未読のチャットが{num}件あります | 未読のチャットが{num}件あります",
+    "unread_follow_requests": "フォローリクエストが{num}件来ています | フォローリクエストが{num}件来ています"
   },
   "polls": {
     "add_poll": "投票を追加",
@@ -128,20 +163,21 @@
     "expiry": "投票期間",
     "expires_in": "投票は {0} で終了します",
     "expired": "投票は {0} 前に終了しました",
-    "not_enough_options": "相異なる選択肢が不足しています",
+    "not_enough_options": "選択肢が少なすぎます",
     "votes_count": "{count} 票 | {count} 票",
-    "people_voted_count": "{count} 人投票 | {count} 人投票"
+    "people_voted_count": "{count}人が投票しました | {count}人が投票しました"
   },
   "emoji": {
     "stickers": "ステッカー",
     "emoji": "絵文字",
-    "keep_open": "ピッカーを開いたままにする",
+    "keep_open": "絵文字ピッカーを開いたままにする",
     "search_emoji": "絵文字を検索",
     "add_emoji": "絵文字を挿入",
     "custom": "カスタム絵文字",
     "unicode": "Unicode絵文字",
     "load_all": "全 {emojiAmount} 絵文字を読み込む",
-    "load_all_hint": "最初の {saneAmount} 絵文字を読み込みました、全て読み込むと重くなる可能性があります。"
+    "load_all_hint": "最初の {saneAmount} 件の絵文字を読み込みました。すべて読み込むとパフォーマンスに影響を与える可能性があります。",
+    "unpacked": "パック外の絵文字"
   },
   "stickers": {
     "add_sticker": "ステッカーを追加"
@@ -149,30 +185,32 @@
   "interactions": {
     "favs_repeats": "リピートとお気に入り",
     "follows": "新しいフォロワー",
-    "load_older": "古いインタラクションを見る",
-    "moves": "ユーザーの引っ越し"
+    "load_older": "古い通知を読み込む",
+    "moves": "ユーザーの引っ越し",
+    "emoji_reactions": "絵文字リアクション",
+    "reports": "通報"
   },
   "post_status": {
     "new_status": "投稿する",
-    "account_not_locked_warning": "あなたのアカウントは {0} ではありません。あなたをフォローすれば、誰でも、フォロワー限定のステータスを読むことができます。",
-    "account_not_locked_warning_link": "ロックされたアカウント",
-    "attachments_sensitive": "ファイルをNSFWにする",
+    "account_not_locked_warning": "あなたのアカウントは {0} ではありません。あなたをフォローすれば、誰でもフォロワー限定のステータスを読むことができます。",
+    "account_not_locked_warning_link": "鍵アカウント",
+    "attachments_sensitive": "ファイルを閲覧注意に設定する",
     "content_type": {
       "text/plain": "プレーンテキスト",
       "text/html": "HTML",
       "text/markdown": "Markdown",
       "text/bbcode": "BBCode"
     },
-    "content_warning": "説明 (省略可)",
+    "content_warning": "注釈 (任意)",
     "default": "羽田空港に着きました。",
-    "direct_warning_to_all": "この投稿は、メンションされたすべてのユーザーが、見ることができます。",
-    "direct_warning_to_first_only": "この投稿は、メッセージの冒頭でメンションされたユーザーだけが、見ることができます。",
+    "direct_warning_to_all": "この投稿は、メンションされたすべてのユーザーが閲覧できます。",
+    "direct_warning_to_first_only": "この投稿は、メッセージの冒頭でメンションされたユーザーだけが閲覧できます。",
     "direct_warning": "このステータスは、メンションされたユーザーだけが、読むことができます。",
     "posting": "投稿",
     "scope_notice": {
-      "public": "この投稿は、誰でも見ることができます",
-      "private": "この投稿は、あなたのフォロワーだけが、見ることができます",
-      "unlisted": "この投稿は、パブリックタイムラインと、接続しているすべてのネットワークには、表示されません"
+      "public": "この投稿は誰でも閲覧できます",
+      "private": "この投稿はフォロワーのみ閲覧できます",
+      "unlisted": "この投稿は、公開タイムラインとすべてのネットワークには表示されません"
     },
     "scope": {
       "direct": "ダイレクト: メンションされたユーザーのみに届きます",
@@ -180,22 +218,29 @@
       "public": "パブリック: 公開タイムラインに届きます",
       "unlisted": "アンリステッド: 公開タイムラインに届きません"
     },
-    "media_description_error": "メディアのアップロードに失敗しました。もう一度お試しください",
+    "media_description_error": "メディアのアップデートに失敗しました。もう一度お試しください",
     "empty_status_error": "投稿内容を入力してください",
     "preview_empty": "何もありません",
     "preview": "プレビュー",
     "media_description": "メディアの説明",
-    "post": "投稿"
+    "post": "投稿",
+    "edit_status": "ステータスを編集",
+    "reply_option": "このステータスに返信する",
+    "quote_option": "このステータスを引用する",
+    "edit_remote_warning": "他のインスタンスは投稿の編集に対応していないかもしれません。その場合、編集した内容は伝わりません。",
+    "edit_unsupported_warning": "Pleromaは、メンションと投票の編集に対応していません。",
+    "scope_notice_dismiss": "このメッセージを閉じる",
+    "content_type_selection": "投稿形式"
   },
   "registration": {
     "bio": "プロフィール",
-    "email": "Eメール",
-    "fullname": "スクリーンネーム",
+    "email": "メールアドレス",
+    "fullname": "表示名",
     "password_confirm": "パスワードの確認",
     "registration": "登録",
-    "token": "招待トークン",
+    "token": "招待コード",
     "captcha": "CAPTCHA",
-    "new_captcha": "文字が読めないときは、画像をクリックすると、新しい画像になります",
+    "new_captcha": "文字が読めない場合、画像をクリックすると新しい画像が表示されます",
     "username_placeholder": "例: lain",
     "fullname_placeholder": "例: 岩倉玲音",
     "bio_placeholder": "例:\nこんにちは。私は玲音。\n私はアニメのキャラクターで、日本の郊外に住んでいます。私をWiredで見たことがあるかもしれません。",
@@ -205,11 +250,18 @@
       "email_required": "必須",
       "password_required": "必須",
       "password_confirmation_required": "必須",
-      "password_confirmation_match": "パスワードが違います"
+      "password_confirmation_match": "パスワードが一致しません",
+      "birthday_required": "必須",
+      "birthday_min_age": "{date} 以降のユーザーは登録できません"
     },
-    "reason_placeholder": "このインスタンスは、新規登録を手動で受け付けています。\n登録したい理由を、インスタンスの管理者に教えてください。",
-    "reason": "登録するための目的",
-    "register": "登録"
+    "reason_placeholder": "このインスタンスは、新規登録を手動で承認しています。\n登録したい理由をインスタンスの管理者に教えてください。",
+    "reason": "登録を希望する理由",
+    "register": "登録",
+    "email_language": "このサーバーからのメールをどの言語で受け取りますか？",
+    "bio_optional": "プロフィール (任意)",
+    "email_optional": "メールアドレス (任意)",
+    "birthday": "誕生日:",
+    "birthday_optional": "誕生日 (任意):"
   },
   "selectable_list": {
     "select_all": "すべて選択"
@@ -228,39 +280,39 @@
       "warning_of_generate_new_codes": "新しいリカバリーコードを生成すると、古いコードは使用できなくなります。",
       "recovery_codes": "リカバリーコード。",
       "waiting_a_recovery_codes": "バックアップコードを受信しています…",
-      "recovery_codes_warning": "コードを紙に書くか、安全な場所に保存してください。そうでなければ、あなたはコードを再び見ることはできません。もし2段階認証アプリのアクセスを喪失し、なおかつ、リカバリーコードもないならば、あなたは自分のアカウントから閉め出されます。",
+      "recovery_codes_warning": "リカバリーコードをどこか安全な場所に書き留めてください。このコードは二度と表示されません。二段階認証アプリへのアクセスを失い、リカバリーコードも紛失した場合、二度とアカウントにログインできなくなります。",
       "authentication_methods": "認証方法",
       "scan": {
         "title": "スキャン",
-        "desc": "あなたの2段階認証アプリを使って、このQRコードをスキャンするか、テキストキーを入力してください:",
+        "desc": "二段階認証アプリでQRコードを読み取るか、テキストキーを入力してください:",
         "secret_code": "キー"
       },
       "verify": {
-        "desc": "2段階認証を有効にするには、あなたの2段階認証アプリのコードを入力してください:"
+        "desc": "2段階認証を有効にするには、2段階認証アプリに表示されたコードを入力してください:"
       }
     },
     "attachmentRadius": "ファイル",
     "attachments": "ファイル",
-    "avatar": "アバター",
-    "avatarAltRadius": "通知のアバター",
-    "avatarRadius": "アバター",
+    "avatar": "アイコン",
+    "avatarAltRadius": "通知内のアイコン",
+    "avatarRadius": "アイコン",
     "background": "バックグラウンド",
     "bio": "プロフィール",
     "block_export": "ブロックのエクスポート",
     "block_export_button": "ブロックをCSVファイルにエクスポートする",
     "block_import": "ブロックのインポート",
     "block_import_error": "ブロックのインポートに失敗しました",
-    "blocks_imported": "ブロックをインポートしました！ 実際に処理されるまでに、しばらく時間がかかります。",
+    "blocks_imported": "ブロックがインポートされました。処理には時間がかかる場合があります。",
     "blocks_tab": "ブロック",
     "btnRadius": "ボタン",
     "cBlue": "返信とフォロー",
     "cGreen": "リピート",
     "cOrange": "お気に入り",
     "cRed": "キャンセル",
-    "change_password": "パスワードを変える",
-    "change_password_error": "パスワードを変えることが、できなかったかもしれません。",
-    "changed_password": "パスワードが、変わりました！",
-    "collapse_subject": "説明のある投稿をたたむ",
+    "change_password": "パスワードを変更",
+    "change_password_error": "パスワードの変更中にエラーが発生しました。",
+    "changed_password": "パスワードが変更されました！",
+    "collapse_subject": "注釈のついた投稿をたたむ",
     "composing": "投稿",
     "confirm_new_password": "新しいパスワードの確認",
     "current_avatar": "現在のアバター",
@@ -268,52 +320,52 @@
     "current_profile_banner": "現在のプロフィールバナー",
     "data_import_export_tab": "インポートとエクスポート",
     "default_vis": "デフォルトの公開範囲",
-    "delete_account": "アカウントを消す",
-    "delete_account_description": "あなたのデータが消えて、アカウントが使えなくなります。",
-    "delete_account_error": "アカウントを消すことが、できなかったかもしれません。インスタンスの管理者に、連絡してください。",
-    "delete_account_instructions": "本当にアカウントを消してもいいなら、パスワードを入力してください。",
+    "delete_account": "アカウントの削除",
+    "delete_account_description": "アカウントのデータを永久的に削除し、アカウントを無効化します。",
+    "delete_account_error": "アカウントの削除中にエラーが発生しました。継続して発生する場合、管理者に問い合せてください。",
+    "delete_account_instructions": "アカウント削除の確認のため、パスワードを入力してください。",
     "discoverable": "検索などのサービスでこのアカウントを見つけることを許可する",
-    "avatar_size_instruction": "アバターの大きさは、150×150ピクセルか、それよりも大きくするといいです。",
-    "pad_emoji": "ピッカーから絵文字を挿入するとき、絵文字の両側にスペースを入れる",
-    "export_theme": "保存",
+    "avatar_size_instruction": "アイコン画像のサイズは150x150以上を推奨します。",
+    "pad_emoji": "絵文字ピッカーから絵文字を挿入するとき、絵文字の前後に空白を挿入する",
+    "export_theme": "ファイルにテーマを出力",
     "filtering": "フィルタリング",
-    "filtering_explanation": "これらの言葉を含むすべてのものがミュートされます。1行に1つの言葉を書いてください",
+    "filtering_explanation": "以下の単語を含むステータスはミュートされます。(1行に1単語)",
     "follow_export": "フォローのエクスポート",
     "follow_export_button": "エクスポート",
     "follow_export_processing": "お待ちください。まもなくファイルをダウンロードできます。",
     "follow_import": "フォローのインポート",
-    "follow_import_error": "フォローのインポートがエラーになりました",
-    "follows_imported": "フォローがインポートされました！ 少し時間がかかるかもしれません。",
+    "follow_import_error": "フォローのインポートに失敗しました",
+    "follows_imported": "フォローがインポートされました。処理には時間がかかる場合があります。",
     "foreground": "フォアグラウンド",
     "general": "全般",
-    "hide_attachments_in_convo": "スレッドのファイルを隠す",
-    "hide_attachments_in_tl": "タイムラインのファイルを隠す",
-    "hide_muted_posts": "ミュートしているユーザーの投稿を隠す",
-    "max_thumbnails": "投稿に含まれるサムネイルの最大数",
-    "hide_isp": "インスタンス固有パネルを隠す",
+    "hide_attachments_in_convo": "スレッド内のファイルを表示しない",
+    "hide_attachments_in_tl": "タイムラインのファイルを表示しない",
+    "hide_muted_posts": "ミュートしているユーザーの投稿を表示しない",
+    "max_thumbnails": "投稿に表示するサムネイルの最大数 (空にすると無制限)",
+    "hide_isp": "インスタンス固有パネルを表示しない",
     "preload_images": "画像を先読みする",
-    "use_one_click_nsfw": "NSFWなファイルを1クリックで開く",
-    "hide_post_stats": "投稿の統計を隠す (例: お気に入りの数)",
-    "hide_user_stats": "ユーザーの統計を隠す (例: フォロワーの数)",
-    "hide_filtered_statuses": "フィルターされた投稿を隠す",
+    "use_one_click_nsfw": "閲覧注意なファイルを1クリックで開く",
+    "hide_post_stats": "投稿の統計を表示しない (例: お気に入りの数)",
+    "hide_user_stats": "ユーザーの統計を表示しない (例: フォロワーの数)",
+    "hide_filtered_statuses": "フィルタリングされた投稿を表示しない",
     "import_blocks_from_a_csv_file": "CSVファイルからブロックをインポートする",
     "import_followers_from_a_csv_file": "CSVファイルからフォローをインポートする",
-    "import_theme": "ロード",
-    "inputRadius": "インプットフィールド",
+    "import_theme": "ファイルからテーマを読み込む",
+    "inputRadius": "入力欄",
     "checkboxRadius": "チェックボックス",
     "instance_default": "(デフォルト: {value})",
     "instance_default_simple": "(デフォルト)",
     "interface": "インターフェース",
     "interfaceLanguage": "インターフェースの言語",
-    "invalid_theme_imported": "このファイルはPleromaのテーマではありません。テーマは変更されませんでした。",
-    "limited_availability": "あなたのブラウザではできません",
+    "invalid_theme_imported": "非対応の形式のテーマファイルです。テーマは変更されませんでした。",
+    "limited_availability": "非対応のブラウザです",
     "links": "リンク",
-    "lock_account_description": "あなたが認めた人だけ、あなたのアカウントをフォローできる",
-    "loop_video": "ビデオを繰り返す",
-    "loop_video_silent_only": "音のないビデオだけ繰り返す",
+    "lock_account_description": "フォローを承認制にする",
+    "loop_video": "動画をループ再生する",
+    "loop_video_silent_only": "音声のない動画のみループ再生する",
     "mutes_tab": "ミュート",
-    "play_videos_in_modal": "ビデオをメディアビューアーで見る",
-    "use_contain_fit": "画像のサムネイルを、切り抜かない",
+    "play_videos_in_modal": "動画をメディアビューアで再生する",
+    "use_contain_fit": "画像のサムネイルを切り抜かない",
     "name": "名前",
     "name_bio": "名前とプロフィール",
     "new_password": "新しいパスワード",
@@ -322,55 +374,55 @@
     "notification_visibility_likes": "お気に入り",
     "notification_visibility_mentions": "メンション",
     "notification_visibility_repeats": "リピート",
-    "no_rich_text_description": "リッチテキストを使わない",
-    "no_blocks": "ブロックはありません",
-    "no_mutes": "ミュートはありません",
-    "hide_follows_description": "フォローしている人を見せない",
-    "hide_followers_description": "フォロワーを見せない",
-    "hide_follows_count_description": "フォローしている人の数を見せない",
-    "hide_followers_count_description": "フォロワーの数を見せない",
-    "show_admin_badge": "\"管理者\"のバッジを見せる",
-    "show_moderator_badge": "\"モデレーター\"のバッジを見せる",
-    "nsfw_clickthrough": "NSFWなファイルを隠す",
+    "no_rich_text_description": "投稿のテキスト装飾を無効化する",
+    "no_blocks": "ブロックしたユーザーはいません",
+    "no_mutes": "ミュートしたユーザーはいません",
+    "hide_follows_description": "フォロー欄を非公開にする",
+    "hide_followers_description": "フォロワー欄を非公開にする",
+    "hide_follows_count_description": "フォロー数を非公開にする",
+    "hide_followers_count_description": "フォロワー数を非公開にする",
+    "show_admin_badge": "プロフィールに「管理者」バッジを表示する",
+    "show_moderator_badge": "プロフィールに「モデレーター」バッジを表示する",
+    "nsfw_clickthrough": "閲覧注意なファイルを隠す",
     "oauth_tokens": "OAuthトークン",
     "token": "トークン",
     "refresh_token": "トークンを更新",
-    "valid_until": "まで有効",
+    "valid_until": "有効期限",
     "revoke_token": "取り消す",
     "panelRadius": "パネル",
-    "pause_on_unfocused": "タブにフォーカスがないときストリーミングを止める",
+    "pause_on_unfocused": "タブにフォーカスがないとき、タイムラインの自動更新を止める",
     "presets": "プリセット",
     "profile_background": "プロフィールの背景",
     "profile_banner": "プロフィールのバナー",
     "profile_tab": "プロフィール",
-    "radii_help": "インターフェースの丸さを設定する",
-    "replies_in_timeline": "タイムラインのリプライ",
-    "reply_visibility_all": "すべてのリプライを見る",
-    "reply_visibility_following": "私に宛てられたリプライと、フォローしている人からのリプライを見る",
-    "reply_visibility_self": "私に宛てられたリプライを見る",
-    "autohide_floating_post_button": "新しい投稿ボタンを自動的に隠す (モバイル)",
+    "radii_help": "インターフェースの角丸を設定する (ピクセル単位)",
+    "replies_in_timeline": "タイムライン上の返信",
+    "reply_visibility_all": "すべての返信を表示",
+    "reply_visibility_following": "自分、もしくはフォローしているユーザー宛ての返信のみを表示",
+    "reply_visibility_self": "自分に宛てられた返信のみを表示",
+    "autohide_floating_post_button": "投稿ボタンを自動的に隠す (モバイル)",
     "saving_err": "設定を保存できませんでした",
     "saving_ok": "設定を保存しました",
     "search_user_to_block": "ブロックしたいユーザーを検索",
     "search_user_to_mute": "ミュートしたいユーザーを検索",
     "security_tab": "セキュリティ",
-    "scope_copy": "返信するとき、公開範囲をコピーする (DMの公開範囲は、常にコピーされます)",
-    "minimal_scopes_mode": "公開範囲選択オプションを最小にする",
-    "set_new_avatar": "新しいアバターを設定する",
-    "set_new_profile_background": "新しいプロフィールのバックグラウンドを設定する",
-    "set_new_profile_banner": "新しいプロフィールバナーを設定する",
+    "scope_copy": "返信の公開範囲を返信先に合わせる",
+    "minimal_scopes_mode": "公開範囲選択オプションを最小化する",
+    "set_new_avatar": "アイコンを設定する",
+    "set_new_profile_background": "プロフィールの背景を設定する",
+    "set_new_profile_banner": "プロフィールのバナーを設定する",
     "settings": "設定",
-    "subject_input_always_show": "サブジェクトフィールドをいつでも表示する",
-    "subject_line_behavior": "返信するときサブジェクトをコピーする",
-    "subject_line_email": "メール風: \"re: サブジェクト\"",
-    "subject_line_mastodon": "マストドン風: そのままコピー",
+    "subject_input_always_show": "注釈欄をいつでも表示する",
+    "subject_line_behavior": "返信するとき、返信先の注釈をコピーする",
+    "subject_line_email": "メール風: \"re: 注釈\"",
+    "subject_line_mastodon": "Mastodon風: そのままコピー",
     "subject_line_noop": "コピーしない",
-    "post_status_content_type": "投稿のコンテントタイプ",
-    "stop_gifs": "カーソルを重ねたとき、GIFを動かす",
-    "streaming": "上までスクロールしたとき、自動的にストリーミングする",
+    "post_status_content_type": "デフォルトの投稿形式",
+    "stop_gifs": "GIFを自動再生しない",
+    "streaming": "上までスクロールしたとき、自動でタイムラインを更新する",
     "text": "文字",
     "theme": "テーマ",
-    "theme_help": "カラーテーマをカスタマイズできます。",
+    "theme_help": "カラーコード(#rrggbb)を使用してカラーテーマをカスタマイズできます。",
     "theme_help_v2_1": "チェックボックスをONにすると、コンポーネントごとに、色と透明度をオーバーライドできます。「すべてクリア」ボタンを押すと、すべてのオーバーライドをやめます。",
     "theme_help_v2_2": "バックグラウンドとテキストのコントラストを表すアイコンがあります。マウスをホバーすると、詳しい説明が出ます。透明な色を使っているときは、最悪の場合のコントラストが示されます。",
     "tooltipRadius": "ツールチップとアラート",
@@ -381,9 +433,9 @@
       "true": "はい"
     },
     "notifications": "通知",
-    "notification_mutes": "特定のユーザーからの通知を止めるには、ミュートしてください。",
-    "notification_blocks": "ブロックしているユーザーからの通知は、すべて止まります。",
-    "enable_web_push_notifications": "ウェブプッシュ通知を許可する",
+    "notification_mutes": "特定のユーザーからの通知を止めるには、ミュートを使用してください。",
+    "notification_blocks": "ユーザーをブロックすると、そのユーザーからの通知はすべて停止されます。",
+    "enable_web_push_notifications": "プッシュ通知を有効にする",
     "style": {
       "switcher": {
         "keep_color": "色を残す",
@@ -398,12 +450,12 @@
         "help": {
           "snapshot_missing": "テーマのスナップショットがありません。思っていた見た目と違うかもしれません。",
           "migration_snapshot_ok": "念のために、テーマのスナップショットが読み込まれました。テーマのデータを読み込むことができます。",
-          "fe_downgraded": "フロントエンドが前のバージョンに戻りました。",
-          "fe_upgraded": "フロントエンドと一緒に、テーマエンジンが新しくなりました。",
-          "older_version_imported": "古いフロントエンドで作られたファイルをインポートしました。",
-          "future_version_imported": "新しいフロントエンドで作られたファイルをインポートしました。",
-          "v2_imported": "古いフロントエンドのためのファイルをインポートしました。設定した通りにならないかもしれません。",
-          "upgraded_from_v2": "フロントエンドが新しくなったので、今までの見た目と少し違うかもしれません。",
+          "fe_downgraded": "PleromaFEが前のバージョンに戻りました。",
+          "fe_upgraded": "PleromaFEのテーマエンジンが更新されました。",
+          "older_version_imported": "古いバージョンで作成されたファイルをインポートしました。",
+          "future_version_imported": "新しいバージョンで作成されたファイルをインポートしました。",
+          "v2_imported": "古いバージョンで作成されたファイルをインポートしました。設定した通りにならないかもしれません。",
+          "upgraded_from_v2": "PleromaFEが更新されました。テーマの表示が以前と異なる場合があります。",
           "snapshot_source_mismatch": "フロントエンドがロールバックと更新を繰り返したため、バージョンが競合しています。",
           "migration_napshot_gone": "スナップショットがありません、覚えているものと見た目が違うかもしれません。",
           "snapshot_present": "テーマのスナップショットが読み込まれました。設定は上書きされました。代わりとして実データを読み込むことができます。"
@@ -432,7 +484,7 @@
       "common_colors": {
         "_tab_label": "共通",
         "main": "共通の色",
-        "foreground_hint": "「詳細」タブで、もっと細かく設定できます",
+        "foreground_hint": "「詳細」タブで、より細かく設定できます",
         "rgbo": "アイコンとアクセントとバッジ"
       },
       "advanced_colors": {
@@ -445,7 +497,7 @@
         "top_bar": "トップバー",
         "borders": "境界",
         "buttons": "ボタン",
-        "inputs": "インプットフィールド",
+        "inputs": "入力欄",
         "faint_text": "薄いテキスト",
         "alert_neutral": "それ以外",
         "chat": {
@@ -498,7 +550,7 @@
           "buttonHover": "ボタン (ホバー)",
           "buttonPressed": "ボタン (押されているとき)",
           "buttonPressedHover": "ボタン (ホバー、かつ、押されているとき)",
-          "input": "インプットフィールド"
+          "input": "入力欄"
         },
         "hintV3": "影の場合は、 {0} 表記を使って他の色スロットを使うこともできます。"
       },
@@ -507,7 +559,7 @@
         "help": "「カスタム」を選んだときは、システムにあるフォントの名前を、正しく入力してください。",
         "components": {
           "interface": "インターフェース",
-          "input": "インプットフィールド",
+          "input": "入力欄",
           "post": "投稿",
           "postCode": "等幅 (投稿がリッチテキストであるとき)"
         },
@@ -536,7 +588,7 @@
       "backend_version": "バックエンドのバージョン",
       "frontend_version": "フロントエンドのバージョン"
     },
-    "notification_setting_hide_notification_contents": "送った人と内容を、プッシュ通知に表示しない",
+    "notification_setting_hide_notification_contents": "送った人と通知の内容をプッシュ通知に表示しない",
     "notification_setting_privacy": "プライバシー",
     "notification_setting_block_from_strangers": "フォローしていないユーザーからの通知を拒否する",
     "notification_setting_filters": "フィルター",
@@ -544,53 +596,55 @@
     "virtual_scrolling": "タイムラインの描画を最適化する",
     "type_domains_to_mute": "ミュートしたいドメインを検索",
     "useStreamingApiWarning": "（実験中で、投稿を取りこぼすかもしれないので、おすすめしません）",
-    "useStreamingApi": "投稿と通知を、すぐに受け取る",
+    "useStreamingApi": "投稿と通知をリアルタイムで受信する",
     "user_mutes": "ユーザー",
-    "reset_background_confirm": "本当にバックグラウンドを初期化しますか？",
-    "reset_banner_confirm": "本当にバナーを初期化しますか？",
-    "reset_avatar_confirm": "本当にアバターを初期化しますか？",
-    "hide_wallpaper": "インスタンスのバックグラウンドを隠す",
-    "reset_profile_background": "プロフィールのバックグラウンドを初期化",
-    "reset_profile_banner": "プロフィールのバナーを初期化",
-    "reset_avatar": "アバターを初期化",
+    "reset_background_confirm": "本当に背景をリセットしますか？",
+    "reset_banner_confirm": "本当にバナーをリセットしますか？",
+    "reset_avatar_confirm": "本当にアイコンをリセットしますか？",
+    "hide_wallpaper": "インスタンスデフォルトの壁紙を表示しない",
+    "reset_profile_background": "プロフィールの背景をリセット",
+    "reset_profile_banner": "プロフィールのバナーをリセット",
+    "reset_avatar": "アイコンをリセット",
     "notification_visibility_emoji_reactions": "リアクション",
     "notification_visibility_moves": "ユーザーの引っ越し",
     "new_email": "新しいメールアドレス",
     "profile_fields": {
       "value": "内容",
       "name": "ラベル",
-      "add_field": "枠を追加",
-      "label": "プロフィール補足情報"
+      "add_field": "入力欄を追加",
+      "label": "追加情報"
     },
     "accent": "アクセント",
-    "mutes_imported": "ミュートをインポートしました！少し時間がかかるかもしれません。",
+    "mutes_imported": "ミュートがインポートされました。処理には時間がかかる場合があります。",
     "emoji_reactions_on_timeline": "絵文字リアクションをタイムラインに表示",
     "domain_mutes": "ドメイン",
     "mutes_and_blocks": "ミュートとブロック",
     "chatMessageRadius": "チャットメッセージ",
-    "change_email_error": "メールアドレスを変えることが、できなかったかもしれません。",
-    "changed_email": "メールアドレスが、変わりました！",
-    "change_email": "メールアドレスを変える",
+    "change_email_error": "メールアドレスの変更中にエラーが発生しました。",
+    "changed_email": "メールアドレスが変更されました！",
+    "change_email": "メールアドレスを変更",
     "bot": "これは bot アカウントです",
     "mute_export_button": "ミュートをCSVファイルにエクスポートする",
     "import_mutes_from_a_csv_file": "CSVファイルからミュートをインポートする",
     "mute_import_error": "ミュートのインポートに失敗しました",
     "mute_import": "ミュートのインポート",
     "mute_export": "ミュートのエクスポート",
-    "allow_following_move": "フォロー中のアカウントが引っ越したとき、自動フォローを許可する",
-    "setting_changed": "規定の設定と異なっています",
-    "greentext": "引用を緑色で表示",
-    "sensitive_by_default": "はじめから投稿をセンシティブとして設定",
+    "allow_following_move": "フォローしているアカウントが引っ越したとき、引っ越し先を自動でフォローする",
+    "setting_changed": "デフォルトから変更された設定",
+    "greentext": ">記号から始まる行を「リピート」の色で表示 (Meme Arrows)",
+    "sensitive_by_default": "デフォルトで投稿を閲覧注意として設定",
     "more_settings": "その他の設定",
-    "reply_visibility_self_short": "自分宛のリプライを見る",
-    "reply_visibility_following_short": "フォローしている人に宛てられたリプライを見る",
-    "hide_all_muted_posts": "ミュートした投稿を隠す",
-    "hide_media_previews": "メディアのプレビューを隠す",
+    "reply_visibility_self_short": "自分宛ての返信のみ表示",
+    "reply_visibility_following_short": "フォローしているユーザー宛ての返信のみ表示",
+    "hide_all_muted_posts": "ミュートした投稿を表示しない",
+    "hide_media_previews": "メディアのプレビューを表示しない",
     "word_filter": "単語フィルタ",
     "file_export_import": {
       "errors": {
-        "invalid_file": "これはPleromaの設定をバックアップしたファイルではありません。",
-        "file_slightly_new": "ファイルのマイナーバージョンが異なり、一部の設定が読み込まれないことがあります"
+        "invalid_file": "非対応の形式の設定ファイルです。設定は変更されませんでした。",
+        "file_slightly_new": "設定ファイルのバージョンが異なります。一部の設定は読み込まれないかもしれません",
+        "file_too_new": "互換性エラー: PleromaFEが古すぎます。設定ファイルのバージョン{fileMajor}はこのPleromaFE (バージョン{feMajor})と互換性がありません",
+        "file_too_old": "互換性エラー: 設定ファイルが古すぎます。設定ファイルのバージョン{fileMajor}はこのPleromaFE (バージョン{feMajor})と互換性がありません"
       },
       "restore_settings": "設定をファイルから復元する",
       "backup_settings_theme": "テーマを含む設定をファイルにバックアップする",
@@ -600,7 +654,123 @@
     "save": "変更を保存",
     "hide_shoutbox": "Shoutboxを表示しない",
     "always_show_post_button": "投稿ボタンを常に表示",
-    "right_sidebar": "サイドバーを右に表示"
+    "right_sidebar": "サイドバーを右に表示",
+    "email_language": "このサーバーから受け取るメールの言語",
+    "confirm_dialogs": "以下のとき確認ダイアログを表示する:",
+    "confirm_dialogs_repeat": "ステータスをリピートするとき",
+    "confirm_dialogs_unfollow": "ユーザーのフォローを解除するとき",
+    "confirm_dialogs_block": "ユーザーをブロックするとき",
+    "confirm_dialogs_mute": "ユーザーをミュートするとき",
+    "confirm_dialogs_delete": "投稿を削除するとき",
+    "confirm_dialogs_logout": "ログアウトするとき",
+    "confirm_dialogs_deny_follow": "フォローリクエストを却下するとき",
+    "confirm_dialogs_remove_follower": "フォロワーを解除するとき",
+    "move_account_target": "引っ越し先のアカウント (例: {example})",
+    "move_account_error": "引っ越し中にエラーが発生しました: {error}",
+    "autocomplete_select_first": "オートコンプリートで最初の結果を自動的に選択する",
+    "hide_bot_indication": "bot アカウントであることを示すマークを表示しない",
+    "navbar_column_stretch": "ナビゲーションバーの幅を画面幅に合わせる",
+    "notification_visibility_follow_requests": "フォローリクエスト",
+    "notification_visibility_reports": "通報",
+    "notification_extra_chats": "未読のチャットを表示する",
+    "hide_favorites_description": "お気に入り欄を非公開にする (通知は送信されます)",
+    "conversation_display_tree": "ツリー形式",
+    "max_depth_in_thread": "デフォルトで表示するスレッドの深さ",
+    "mention_link_display": "メンションリンクを",
+    "mention_link_display_short": "常に短く表示する (例: {'@'}hoge)",
+    "mention_link_use_tooltip": "メンションリンクをクリックした時ユーザーカードを表示する",
+    "mention_link_show_avatar": "メンションリンクの横にユーザーのアイコンを表示する",
+    "mention_link_display_full_for_remote": "リモートのユーザーのみすべて表示する (例: {'@'}hoge{'@'}example.org)",
+    "mention_link_display_full": "常にすべて表示する (例: {'@'}hoge{'@'}example.org)",
+    "notification_setting_filters_chrome_push": "Chromeなどのブラウザでは、種類に応じた通知の無効化がプッシュ通知に反映されない場合があります",
+    "hard_reset_value_tooltip": "データベースから設定値を削除し、デフォルト値に戻します",
+    "disable_sticky_headers": "カラムヘッダーを画面上部に固定しない",
+    "column_sizes_notifs": "通知カラム",
+    "conversation_other_replies_button": "「その他の返信」ボタンの位置",
+    "use_websockets": "Websocketを利用してリアルタイムで更新を行う",
+    "mention_link_fade_domain": "メンションのドメイン部分を薄く表示する (例: {'@'}foo{'@'}example.org の {'@'}example.org の部分)",
+    "mention_link_show_avatar_quick": "メンションの横にユーザーアイコンを表示する",
+    "mention_link_bolden_you": "自分宛てのメンションを強調表示する",
+    "user_popover_avatar_action": "ユーザーカード内のユーザーアイコンをクリックした際の挙動",
+    "user_popover_avatar_overlay": "ユーザーカードをユーザーアイコンに被せて表示する",
+    "show_yous": "自分宛てのメンションの横に「(あなた)」を表示",
+    "preview": "プレビュー",
+    "url": "URL",
+    "conversation_display": "スレッドの表示形式",
+    "column_sizes": "カラム幅",
+    "third_column_mode_none": "表示しない",
+    "column_sizes_content": "コンテンツ",
+    "third_column_mode_notifications": "通知カラムにする",
+    "third_column_mode_postform": "投稿フォームとナビゲーションにする",
+    "conversation_display_linear_quick": "時系列表示",
+    "conversation_display_linear": "時系列形式",
+    "conversation_display_tree_quick": "ツリー表示",
+    "user_popover_avatar_action_open": "プロフィールを表示する",
+    "account_backup": "アカウントのバックアップ",
+    "wordfilter": "ワードフィルター",
+    "column_sizes_sidebar": "サイドバー",
+    "emoji_reactions_scale": "絵文字リアクションの表示倍率",
+    "hide_wordfiltered_statuses": "ワードフィルターによってフィルタリングされたステータスを表示しない",
+    "hide_muted_threads": "ミュートしたスレッドを表示しない",
+    "notification_visibility_polls": "投票結果の確定",
+    "user_popover_avatar_action_zoom": "アイコンを拡大する",
+    "post_look_feel": "投稿の表示形式",
+    "mention_links": "メンションのリンク",
+    "setting_server_side": "この設定はサーバー側に保存され、すべてのセッションとクライアントに影響します",
+    "word_filter_and_more": "ワードフィルターとその他の設定",
+    "notification_extra_announcements": "未読のお知らせを表示する",
+    "notification_extra_follow_requests": "新着のフォローリクエストを表示する",
+    "show_scrollbars": "サイドカラムにスクロールバーを表示する",
+    "third_column_mode": "十分に幅があるとき、三つ目のカラムを",
+    "columns": "カラム",
+    "commit_value": "保存",
+    "commit_value_tooltip": "値は保存されていません。反映するにはこのボタンを押してください",
+    "remove_backup": "削除",
+    "add_backup": "新規バックアップを作成",
+    "account_backup_description": "アカウント情報と投稿のアーカイブをダウンロードできます。開発段階の機能であり、現状、ダウンロードしたデータをインポートすることはできません。",
+    "mute_bot_posts": "bot アカウントの投稿をミュートする",
+    "auto_update": "自動でタイムラインを更新する",
+    "enable_web_push_always_show_tip": "この設定は、Chromeなどのブラウザで「このサイトはバックグラウンドで更新されました」という通知が表示されることを防止します。その他のブラウザでこの設定を有効化すると、通知が二重で表示されることがあります。",
+    "backup_failed": "バックアップに失敗しました。",
+    "confirm_dialogs_approve_follow": "フォローリクエストを承認するとき",
+    "moved_account": "アカウントの引っ越しが完了しました。",
+    "reset_value": "リセット",
+    "reset_value_tooltip": "編集中の値を破棄します",
+    "hard_reset_value": "デフォルトに戻す",
+    "conversation_other_replies_button_below": "投稿の下",
+    "conversation_other_replies_button_inside": "投稿の中",
+    "add_language": "代替言語を追加",
+    "remove_language": "削除",
+    "account_alias_table_head": "エイリアス",
+    "account_alias": "アカウントエイリアス",
+    "list_aliases_error": "エイリアスの取得中にエラーが発生しました: {error}",
+    "hide_list_aliases_error_action": "閉じる",
+    "remove_alias": "削除",
+    "new_alias_target": "エイリアスを追加 (例: {example})",
+    "added_alias": "エイリアスが追加されました。",
+    "add_alias_error": "エイリアスの追加中にエラーが発生しました: {error}",
+    "move_account": "アカウントの引っ越し",
+    "move_account_notes": "アカウントを引っ越すためには、まず引っ越し先のアカウントにこのアカウントへのエイリアスを追加する必要があります。",
+    "birthday": {
+      "label": "誕生日",
+      "show_birthday": "誕生日を公開する"
+    },
+    "account_privacy": "プライバシー",
+    "posts": "投稿",
+    "user_profiles": "ユーザープロフィール",
+    "primary_language": "第一言語:",
+    "fallback_language": "代替言語 {index}:",
+    "expert_mode": "高度な設定を表示",
+    "account_backup_table_head": "バックアップ",
+    "download_backup": "ダウンロード",
+    "backup_not_ready": "まだ準備中です。",
+    "backup_running": "処理中…{number}件のデータが処理されました。 | 処理中… {number}件のデータが処理されました。",
+    "list_backups_error": "バックアップ一覧の取得に失敗しました: {error}",
+    "added_backup": "バックアップがキューに追加されました。",
+    "add_backup_error": "バックアップの追加に失敗しました: {error}",
+    "user_popover_avatar_action_close": "ユーザーカードを閉じる",
+    "tree_advanced": "高度なナビゲーションボタンを表示する",
+    "tree_fade_ancestors": "スレッド上で祖先にあたるステータスを薄いテキストで表示する"
   },
   "time": {
     "day": "{0}日",
@@ -622,7 +792,7 @@
     "month_short": "{0}ヶ月前",
     "months_short": "{0}ヶ月前",
     "now": "たった今",
-    "now_short": "たった今",
+    "now_short": "今",
     "second": "{0}秒",
     "seconds": "{0}秒",
     "second_short": "{0}秒",
@@ -634,23 +804,41 @@
     "year": "{0}年",
     "years": "{0}年",
     "year_short": "{0}年",
-    "years_short": "{0}年"
+    "years_short": "{0}年",
+    "unit": {
+      "seconds_short": "{0}秒",
+      "weeks": "{0} 週間 | {0} 週間",
+      "weeks_short": "{0}週",
+      "years": "{0} 年 | {0} 年",
+      "years_short": "{0}年",
+      "days": "{0} 日 | {0} 日",
+      "hours": "{0} 時間 | {0} 時間",
+      "hours_short": "{0}時間",
+      "minutes": "{0} 分 | {0} 分",
+      "minutes_short": "{0}分",
+      "months": "{0} ヶ月 | {0} ヶ月",
+      "months_short": "{0}ヶ月",
+      "seconds": "{0} 秒 | {0} 秒",
+      "days_short": "{0}日"
+    }
   },
   "timeline": {
     "collapse": "たたむ",
     "conversation": "スレッド",
     "error_fetching": "読み込みがエラーになりました",
-    "load_older": "古いステータス",
-    "no_retweet_hint": "投稿を「フォロワーのみ」または「ダイレクト」にすると、リピートできなくなります",
+    "load_older": "古いステータスを読み込む",
+    "no_retweet_hint": "公開範囲が「フォロワーのみ」または「ダイレクト」の投稿はリピートできません",
     "repeated": "リピート",
     "show_new": "読み込み",
     "up_to_date": "最新",
     "no_more_statuses": "これで終わりです",
     "no_statuses": "ステータスはありません",
     "reload": "再読み込み",
-    "error": "タイムラインの読み込みに失敗しました: {0}",
+    "error": "タイムラインの読み込み中にエラーが発生しました: {0}",
     "socket_reconnected": "リアルタイム接続が確立されました",
-    "socket_broke": "コード{0}によりリアルタイム接続が切断されました"
+    "socket_broke": "リアルタイム接続が切断されました: コード{0}",
+    "quick_view_settings": "表示の簡易設定",
+    "quick_filter_settings": "フィルターの簡易設定"
   },
   "status": {
     "favorites": "お気に入り",
@@ -659,8 +847,8 @@
     "pin": "プロフィールにピン留め",
     "unpin": "プロフィールのピン留めを外す",
     "pinned": "ピン留め",
-    "delete_confirm": "本当にこのステータスを削除してもよろしいですか？",
-    "reply_to": "返信",
+    "delete_confirm": "本当にこの削除しますか？",
+    "reply_to": "返信先:",
     "replies_list": "返信:",
     "mute_conversation": "スレッドをミュート",
     "unmute_conversation": "スレッドのミュートを解除",
@@ -679,19 +867,58 @@
     "unbookmark": "ブックマーク解除",
     "bookmark": "ブックマーク",
     "mentions": "メンション",
-    "you": "（あなた）",
-    "plus_more": "ほか{number}件"
+    "you": "(あなた)",
+    "plus_more": "ほか{number}件",
+    "delete_confirm_title": "削除の確認",
+    "ancestor_follow": "このステータスについた{numReplies}件の返信をすべて表示 | このステータスについた{numReplies}件の返信をすべて表示",
+    "invisible_quote": "引用先のステータスが存在しません: {link}",
+    "ancestor_follow_with_icon": "{icon} {text}",
+    "show_all_conversation_with_icon": "{icon} {text}",
+    "delete_error": "ステータスの削除中にエラーが発生しました: {0}",
+    "delete_confirm_accept_button": "削除する",
+    "delete_confirm_cancel_button": "削除しない",
+    "collapse_attachments": "ファイルをたたむ",
+    "show_all_attachments": "すべてのファイルを表示",
+    "hide_attachment": "ファイルを隠す",
+    "reaction_count_label": "{num}人がリアクションしました | {num}人がリアクションしました",
+    "repeat_confirm_accept_button": "リピートする",
+    "repeat_confirm_cancel_button": "リピートしない",
+    "repeat_confirm": "本当にリピートしますか？",
+    "edit": "ステータスを編集",
+    "edited_at": "(最終編集: {time})",
+    "repeat_confirm_title": "リピートの確認",
+    "many_attachments": "この投稿には{number}件のファイルが添付されています",
+    "remove_attachment": "ファイルを削除",
+    "attachment_stop_flash": "Flashプレーヤーを停止",
+    "move_up": "ファイルを左へ移動",
+    "move_down": "ファイルを右へ移動",
+    "thread_follow": "このスレッドの残りを表示 (全部で{numStatus}件の投稿があります) | このスレッドの残りを表示 (全部で{numStatus}件の投稿があります)",
+    "thread_follow_with_icon": "{icon} {text}",
+    "hide_quote": "引用先を隠す",
+    "display_quote": "引用先を表示",
+    "show_only_conversation_under_this": "このステータスへの返信のみを表示",
+    "show_all_conversation": "スレッドの全体を表示 ({numStatus}件のステータス) | スレッドの全体を表示 ({numStatus}件のステータス)",
+    "replies_list_with_others": "返信 (+{numReplies}人): | 返信 (+{numReplies}人):",
+    "more_actions": "その他のアクション",
+    "thread_show_full": "このスレッドをすべて表示 (全部で{depth}層、{numStatus}件の投稿があります) | このスレッドを全て表示 (全部で{depth}層、{numStatus}件の投稿があります)",
+    "thread_show_full_with_icon": "{icon} {text}",
+    "show_attachment_in_modal": "メディアビューアで開く",
+    "show_attachment_description": "メディアの説明文をポップアップで表示 (全文を読むにはメディアを開いてください)",
+    "thread_hide": "このスレッドをたたむ",
+    "thread_show": "このスレッドを開く",
+    "open_gallery": "メディアビューアで開く",
+    "status_history": "編集履歴"
   },
   "user_card": {
-    "approve": "受け入れ",
+    "approve": "承認",
     "block": "ブロック",
     "blocked": "ブロックしています！",
-    "deny": "お断り",
+    "deny": "拒否",
     "favorites": "お気に入り",
     "follow": "フォロー",
-    "follow_sent": "リクエストを送りました！",
+    "follow_sent": "リクエストを送信しました！",
     "follow_progress": "リクエストしています…",
-    "follow_unfollow": "フォローをやめる",
+    "follow_unfollow": "フォロー解除",
     "followees": "フォロー",
     "followers": "フォロワー",
     "following": "フォローしています！",
@@ -700,7 +927,7 @@
     "media": "メディア",
     "mention": "メンション",
     "mute": "ミュート",
-    "muted": "ミュートしています",
+    "muted": "ミュート済み",
     "per_day": "/日",
     "remote_follow": "リモートフォロー",
     "report": "通報",
@@ -720,16 +947,17 @@
       "grant_moderator": "モデレーター権限を付与",
       "revoke_moderator": "モデレーター権限を解除",
       "activate_account": "アカウントをアクティブにする",
-      "deactivate_account": "アカウントをアクティブでなくする",
+      "deactivate_account": "アカウントを無効化する",
       "delete_account": "アカウントを削除",
-      "force_nsfw": "すべての投稿をNSFWにする",
-      "strip_media": "投稿からメディアを除去する",
-      "force_unlisted": "投稿を未収載にする",
-      "sandbox": "投稿をフォロワーのみにする",
-      "disable_remote_subscription": "他のインスタンスからフォローされないようにする",
-      "disable_any_subscription": "フォローされないようにする",
-      "quarantine": "他のインスタンスからの投稿を止める",
-      "delete_user": "ユーザーを削除"
+      "force_nsfw": "すべての投稿を閲覧注意にする",
+      "strip_media": "すべての投稿からメディアを除去する",
+      "force_unlisted": "すべての投稿をアンリステッドにする",
+      "sandbox": "すべての投稿をフォロワー限定にする",
+      "disable_remote_subscription": "他のインスタンスからフォローできないようにする",
+      "disable_any_subscription": "フォローできないようにする",
+      "quarantine": "投稿を連合しないようにする",
+      "delete_user": "ユーザーを削除",
+      "delete_user_data_and_deactivate_confirmation": "このアカウントのデータを永久に削除し、アカウントを無効化します。本当によろしいですね？"
     },
     "roles": {
       "moderator": "モデレーター",
@@ -746,21 +974,54 @@
       "side": "端に線を付ける",
       "disabled": "強調しない"
     },
-    "edit_profile": "プロフィールを編集"
+    "edit_profile": "プロフィールを編集",
+    "deny_confirm_accept_button": "拒否する",
+    "note_blank": "(なし)",
+    "edit_note_cancel": "キャンセル",
+    "remove_follower_confirm_cancel_button": "解除しない",
+    "block_confirm_title": "ブロックの確認",
+    "block_confirm": "本当に{user}をブロックしますか？",
+    "birthday": "誕生日: {birthday}",
+    "edit_note": "メモを編集",
+    "edit_note_apply": "適用",
+    "note": "メモ",
+    "remove_follower_confirm": "本当に{user}からのフォローを解除しますか？",
+    "follow_cancel": "リクエストを取り消す",
+    "approve_confirm_title": "承認の確認",
+    "remove_follower": "フォロワーを解除",
+    "remove_follower_confirm_title": "フォロワー解除の確認",
+    "approve_confirm_accept_button": "承認する",
+    "deny_confirm": "本当に{user}からのフォローリクエストを拒否しますか？",
+    "deny_confirm_cancel_button": "拒否しない",
+    "mute_confirm_cancel_button": "ミュートしない",
+    "approve_confirm_cancel_button": "承認しない",
+    "approve_confirm": "本当に{user}からのフォローリクエストを承認しますか？",
+    "unfollow_confirm_title": "フォロー解除の確認",
+    "unfollow_confirm_cancel_button": "解除しない",
+    "mute_confirm_accept_button": "ミュートする",
+    "mute_confirm": "本当に{user}をミュートしますか？",
+    "block_confirm_accept_button": "ブロックする",
+    "block_confirm_cancel_button": "ブロックしない",
+    "deny_confirm_title": "拒否の確認",
+    "unfollow_confirm": "本当に{user}のフォローを解除しますか？",
+    "unfollow_confirm_accept_button": "解除する",
+    "remove_follower_confirm_accept_button": "解除する",
+    "mute_confirm_title": "ミュートの確認",
+    "deactivated": "無効化済み"
   },
   "user_profile": {
     "timeline_title": "ユーザータイムライン",
-    "profile_does_not_exist": "申し訳ない。このプロフィールは存在しません。",
-    "profile_loading_error": "申し訳ない。プロフィールの読み込みがエラーになりました。"
+    "profile_does_not_exist": "このプロフィールは存在しません。",
+    "profile_loading_error": "プロフィールの読み込み中にエラーが発生しました。"
   },
   "user_reporting": {
-    "title": "通報する: {0}",
+    "title": "{0}を通報する",
     "add_comment_description": "この通報は、あなたのインスタンスのモデレーターに送られます。このアカウントを通報する理由を説明することができます:",
     "additional_comments": "追加のコメント",
-    "forward_description": "このアカウントは他のサーバーに置かれています。この通報のコピーをリモートのサーバーに送りますか？",
-    "forward_to": "転送する: {0}",
+    "forward_description": "これは他のインスタンスのアカウントです。この通報のコピーをリモートのインスタンスに送りますか？",
+    "forward_to": "{0}に転送する",
     "submit": "送信",
-    "generic_error": "あなたのリクエストを処理しようとしましたが、エラーになりました。"
+    "generic_error": "リクエストの処理中にエラーが発生しました。"
   },
   "who_to_follow": {
     "more": "詳細",
@@ -774,15 +1035,15 @@
     "user_settings": "ユーザー設定",
     "bookmark": "ブックマーク",
     "reject_follow_request": "フォローリクエストを拒否",
-    "accept_follow_request": "フォローリクエストを許可",
+    "accept_follow_request": "フォローリクエストを承認",
     "add_reaction": "リアクションを追加"
   },
   "upload": {
     "error": {
       "base": "アップロードに失敗しました。",
-      "file_too_big": "ファイルが大きすぎます [{filesize} {filesizeunit} / {allowedsize} {allowedsizeunit}]",
-      "default": "しばらくしてから試してください",
-      "message": "アップロードに失敗: {0}"
+      "file_too_big": "ファイルが大きすぎます [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "default": "時間を置いて再試行してください",
+      "message": "アップロードに失敗しました: {0}"
     },
     "file_size_units": {
       "B": "B",
@@ -793,11 +1054,13 @@
     }
   },
   "search": {
-    "people": "人々",
+    "people": "ユーザー",
     "hashtags": "ハッシュタグ",
     "person_talking": "{count} 人が話しています",
     "people_talking": "{count} 人が話しています",
-    "no_results": "見つかりませんでした"
+    "no_results": "見つかりませんでした",
+    "load_more": "さらに読み込む",
+    "no_more_results": "結果は以上です"
   },
   "password_reset": {
     "forgot_password": "パスワードを忘れましたか？",
@@ -820,20 +1083,22 @@
         "media_nsfw": "メディアを閲覧注意に設定",
         "media_removal_desc": "このインスタンスでは、以下のインスタンスからの投稿に対して、メディアを除去します:",
         "media_removal": "メディア除去",
-        "ftl_removal": "「既知のネットワーク」タイムラインから除外",
-        "ftl_removal_desc": "このインスタンスでは、以下のインスタンスを「既知のネットワーク」タイムラインから除外します:",
+        "ftl_removal": "「すべてのネットワーク」タイムラインから除外",
+        "ftl_removal_desc": "このインスタンスでは、以下のインスタンスを「すべてのネットワーク」タイムラインから除外します:",
         "quarantine_desc": "このインスタンスでは、以下のインスタンスに対して公開投稿のみを送信します:",
         "quarantine": "検疫",
         "reject_desc": "このインスタンスでは、以下のインスタンスからのメッセージを受け付けません:",
         "accept_desc": "このインスタンスでは、以下のインスタンスからのメッセージのみを受け付けます:",
         "accept": "許可",
         "simple_policies": "インスタンス固有のポリシー",
-        "reject": "拒否"
+        "reject": "拒否",
+        "instance": "インスタンス",
+        "reason": "理由"
       },
       "mrf_policies": "有効なMRFポリシー",
       "keyword": {
         "replace": "置き換え",
-        "ftl_removal": "「接続しているすべてのネットワーク」タイムラインから除外",
+        "ftl_removal": "「すべてのネットワーク」タイムラインから除外",
         "keyword_policies": "キーワードポリシー",
         "is_replaced_by": "→",
         "reject": "拒否"
@@ -847,8 +1112,8 @@
   "file_type": {
     "file": "ファイル",
     "image": "画像",
-    "video": "ビデオ",
-    "audio": "オーディオ"
+    "video": "動画",
+    "audio": "音声"
   },
   "remote_user_resolver": {
     "error": "見つかりませんでした。",
@@ -865,7 +1130,7 @@
     "empty_chat_list_placeholder": "チャットはありません。新規チャットのボタンを押して始めましょう！",
     "error_sending_message": "メッセージの送信に失敗しました。",
     "error_loading_chat": "チャットの読み込みに失敗しました。",
-    "delete_confirm": "このメッセージを本当に消してもいいですか？",
+    "delete_confirm": "本当にこのメッセージを削除しますか？",
     "more": "もっと見る",
     "empty_message_error": "メッセージを入力して下さい",
     "new": "新規チャット",
@@ -879,5 +1144,152 @@
     "unmute": "ミュート解除",
     "mute_progress": "ミュート中…",
     "mute": "ミュート"
+  },
+  "admin_dash": {
+    "window_title": "管理者設定",
+    "nodb": {
+      "text": "{property}が{value}に設定されるよう、設定ファイルを編集する必要があります。詳しくは{documentation}を確認してください。",
+      "documentation": "ドキュメント",
+      "text2": "ほとんどの設定項目は利用できません。",
+      "heading": "データベースへの設定の保存は無効化されています"
+    },
+    "captcha": {
+      "native": "ネイティブ",
+      "kocaptcha": "KoCaptcha"
+    },
+    "instance": {
+      "restrict": {
+        "header": "匿名ユーザーへのアクセス制限",
+        "profiles": "ユーザープロフィールへのアクセス",
+        "timelines": "タイムラインへのアクセス",
+        "activities": "ステータスへのアクセス",
+        "description": "この設定は特定のAPIへのアクセスを制御します。デフォルトでは、インスタンスの公開設定を反映します。一部の設定は、変更すると予期しない動作を引き起こすことがあります(例: ユーザープロフィールへのアクセスを禁止すると、投稿にユーザーの情報が表示されなくなります)。"
+      },
+      "instance": "インスタンス情報",
+      "registrations": "ユーザー登録",
+      "access": "インスタンスへのアクセス",
+      "captcha_header": "CAPTCHA",
+      "kocaptcha": "KoCaptchaの設定"
+    },
+    "frontend": {
+      "available_frontends": "インストール可能なフロントエンド",
+      "success_installing_frontend": "{version} は正常にインストールされました",
+      "failure_installing_frontend": "{version} のインストールに失敗しました: {reason}",
+      "repository": "リポジトリのURL",
+      "versions": "利用可能なバージョン",
+      "build_url": "ダウンロードURL",
+      "reinstall": "再インストール",
+      "install": "インストール",
+      "install_version": "バージョン {version} をインストール",
+      "is_default": "(デフォルト)",
+      "is_default_custom": "(デフォルト、バージョン: {version})",
+      "default_frontend": "デフォルトのフロントエンド",
+      "more_install_options": "その他のインストールオプション",
+      "wip_notice": "このセクションは開発段階です。バックエンド側の実装が未完成であるため、一部の機能は欠けています。",
+      "set_default": "デフォルトに設定",
+      "set_default_version": "バージョン {version} をデフォルトに設定",
+      "default_frontend_tip": "デフォルトのフロントエンドはすべてのユーザーに表示されます。現時点で、ユーザーがフロントエンドを選択する方法はありません。デフォルトのフロントエンドをPleromaFE以外に設定した場合、インスタンスの設定を変更するには古いAdminFEを使用する必要があります。"
+    },
+    "temp_overrides": {
+      ":pleroma": {
+        ":instance": {
+          ":public": {
+            "label": "インスタンスを公開する",
+            "description": "この設定を無効化すると、すべてのAPIの使用にログインが必要になります。これにより、匿名ユーザーは公開タイムラインとすべてのネットワークにアクセスできなくなります。"
+          },
+          ":background_image": {
+            "description": "(主にPleromaFEで使用される)背景画像",
+            "label": "背景画像"
+          },
+          ":limit_to_local_content": {
+            "description": "他インスタンスの情報の検索を、未ログインのユーザー(デフォルト)もしくはすべてのユーザーに対して制限します",
+            "label": "検索をローカルのみに制限する"
+          },
+          ":description_limit": {
+            "description": "ファイルの説明欄に対する文字数制限",
+            "label": "制限"
+          }
+        }
+      }
+    },
+    "wip_notice": "この管理者用設定画面は試験段階であり、未完成です。{adminFeLink}。",
+    "reset_all": "すべてリセット",
+    "commit_all": "すべて保存",
+    "old_ui_link": "これまでの管理者画面にはここからアクセスできます",
+    "tabs": {
+      "limits": "制限",
+      "instance": "インスタンス",
+      "frontends": "フロントエンド"
+    },
+    "limits": {
+      "arbitrary_limits": "変更可能な制限",
+      "posts": "投稿の制限",
+      "uploads": "ファイルの制限",
+      "profile_fields": "追加情報欄の制限",
+      "user_uploads": "プロフィール画像の制限",
+      "users": "ユーザープロフィールの設定"
+    }
+  },
+  "lists": {
+    "search": "ユーザーを検索",
+    "update_title": "リスト名を保存",
+    "really_delete": "本当に削除しますか？",
+    "error": "リストの処理中にエラーが発生しました: {0}",
+    "lists": "リスト",
+    "new": "新規リスト",
+    "save": "変更を保存",
+    "delete": "リストを削除",
+    "editing_list": "{listTitle}の編集",
+    "creating_list": "新規リストの作成",
+    "create": "作成",
+    "title": "リスト名",
+    "following_only": "フォローしているユーザーのみ表示",
+    "manage_lists": "リストの管理",
+    "manage_members": "メンバーの管理",
+    "add_members": "メンバーの追加",
+    "remove_from_list": "リストから削除",
+    "add_to_list": "リストに追加",
+    "is_in_list": "追加済み"
+  },
+  "update": {
+    "update_bugs": "何か問題を見つけたら{pleromaGitlab}にて報告してください。開発中のバージョンにて念入りに確認はしましたが、様々なものが変更されているため、我々が見逃したものがあるかもしれません。バグの報告や、Pleroma/PleromaFEを改善するための提案やフィードバックは大歓迎です。",
+    "update_changelog_here": "変更履歴",
+    "update_changelog": "全ての変更点は{theFullChangelog}を参照してください。",
+    "big_update_content": "久しぶりのリリースですので、今までと異なるところがあるかもしれません。",
+    "update_bugs_gitlab": "Pleroma GitLab",
+    "big_update_title": ""
+  },
+  "report": {
+    "reported_statuses": "通報されたステータス:",
+    "notes": "メモ:",
+    "state": "状態:",
+    "state_open": "未解決",
+    "reporter": "通報者:",
+    "state_resolved": "解決済み",
+    "reported_user": "被通報者:",
+    "state_closed": "問題なし"
+  },
+  "unicode_domain_indicator": {
+    "tooltip": "このドメインには非ASCII文字が含まれています。"
+  },
+  "announcements": {
+    "page_header": "お知らせ",
+    "title": "お知らせ",
+    "mark_as_read_action": "既読にする",
+    "post_form_header": "お知らせを投稿",
+    "post_placeholder": "お知らせの内容を入力してください…",
+    "post_action": "投稿",
+    "post_error": "エラー: {error}",
+    "close_error": "閉じる",
+    "delete_action": "削除",
+    "submit_edit_action": "完了",
+    "cancel_edit_action": "キャンセル",
+    "published_time_display": "{time} に公開",
+    "start_time_display": "{time}から開始",
+    "end_time_display": "{time}に終了",
+    "edit_action": "編集",
+    "start_time_prompt": "開始日時: ",
+    "end_time_prompt": "終了日時: ",
+    "all_day_prompt": "終日"
   }
 }
diff --git a/src/i18n/nan-TW.json b/src/i18n/nan-TW.json
index 491018ad..5e0df8ec 100644
--- a/src/i18n/nan-TW.json
+++ b/src/i18n/nan-TW.json
@@ -205,7 +205,13 @@
     "migrated_to": "移民到",
     "reacted_with": "顯出{0} ê 反應",
     "submitted_report": "送出檢舉",
-    "poll_ended": "投票結束"
+    "poll_ended": "投票結束",
+    "unread_announcements": "{num} 篇公告iáu bē 讀",
+    "unread_chats": "{num} ê開講iáu bē讀",
+    "unread_follow_requests": "{num}ê新ê跟tuè請求",
+    "configuration_tip": "用{theSettings}，lí通自訂siánn物佇tsia顯示。{dismiss}",
+    "configuration_tip_settings": "設定",
+    "configuration_tip_dismiss": "Mài koh顯示"
   },
   "polls": {
     "add_poll": "開投票",
@@ -248,12 +254,12 @@
     "regional_indicator": "地區指引 {letter}"
   },
   "errors": {
-    "storage_unavailable": "Pleroma buē-tàng the̍h 著瀏覽器儲存 ê。Lí ê 登入狀態抑是局部設定 buē 儲存，mā 凡勢 tú 著意料外 ê 問題。拍開 cookie 看覓。"
+    "storage_unavailable": "Pleroma buē-tàng the̍h 著瀏覽器儲存 ê。Lí ê 登入狀態抑是局部設定 buē 儲存，mā 凡勢 tú 著意料外 ê 問題。拍開 cookie 看māi。"
   },
   "interactions": {
     "favs_repeats": "轉送 kap kah 意",
     "follows": "最近綴 lí ê",
-    "emoji_reactions": "繪文字 ê 回應",
+    "emoji_reactions": "繪文字 ê 反應",
     "reports": "檢舉",
     "moves": "用者 ê 移民",
     "load_older": "載入 koh khah 早 ê 互動"
@@ -273,13 +279,13 @@
     },
     "content_type_selection": "貼 ê 形式",
     "content_warning": "主旨（毋是必要）",
-    "default": "Tú 正 kàu 高雄 ah。",
+    "default": "Tú正kàu高雄ah。",
     "direct_warning_to_all": "Tsit ê PO 文通 hōo 逐 ê 提起 ê 用者看見。",
-    "direct_warning_to_first_only": "Tsit ê PO 文，kan-ta 短信 tú 開始提起 ê 用者，tsiah 通看見。",
+    "direct_warning_to_first_only": "Tsit ê PO 文，kan-ta佇短phue tú開始提起ê用者，tsiah通看見。",
     "edit_remote_warning": "別 ê 站臺可能無支援編輯，無法度收著 PO 文上新 ê 版本。",
     "edit_unsupported_warning": "Pleroma 無支持編輯 the̍h 起 hām 投票。",
     "posting": "PO 文",
-    "preview": "Sing 看覓",
+    "preview": "Sing看māi",
     "preview_empty": "空 ê",
     "empty_status_error": "無法度 PO 無檔案 koh 空 ê 狀態",
     "media_description_error": "更新媒體失敗，請 koh 試一 kái",
@@ -295,7 +301,9 @@
       "public": "公開 - PO kàu 公開時間線",
       "unlisted": "Mài 列出來 - Mài PO tī 公開時間線"
     },
-    "post": "PO 上去"
+    "post": "PO 上去",
+    "reply_option": "應tsit ê狀態",
+    "quote_option": "引用tsit ê狀態"
   },
   "registration": {
     "bio_optional": "介紹（毋是必要）",
@@ -360,7 +368,16 @@
         "color": "色彩",
         "opacity": "無透明度",
         "contrast": {
-          "hint": "色彩ê對比率：{ratio}。{level}、 {context}"
+          "hint": "色彩ê對比率：{ratio}。{level}、 {context}",
+          "level": {
+            "aa": "合AA級ê準則（上kē ê）",
+            "aaa": "合AAA級ê準則（建議ê）",
+            "bad": "無合半ê無障礙準則"
+          },
+          "context": {
+            "18pt": "大（18pt 以上）ê文字",
+            "text": "文字"
+          }
         }
       },
       "switcher": {
@@ -370,7 +387,7 @@
         "keep_roundness": "保留邊á角ê khà-buh",
         "keep_fonts": "保持字型",
         "reset": "重頭設定",
-        "clear_all": "攏清掉",
+        "clear_all": "Lóng清掉",
         "clear_opacity": "清掉無透明度",
         "load_theme": "載入主題",
         "keep_as_is": "Mài振動",
@@ -380,8 +397,116 @@
           "upgraded_from_v2": "PleromaFE升級ah，主題huân-sè kap lí知影ê無kâng。",
           "v2_imported": "Lí輸入ê檔案是舊版本ê前端用ê。Guán盡量予版本相通，毋過可能有所在buē-tàng。",
           "older_version_imported": "Lí輸入ê檔案是予舊ê前端用ê。",
-          "future_version_imported": "Lí輸入ê檔案是新ê前端所用ê。"
+          "future_version_imported": "Lí輸入ê檔案是新ê前端所用ê。",
+          "snapshot_missing": "無主題ê快相佇檔案內，所以，伊看起來凡勢kap原來預料ê無kâng。",
+          "snapshot_present": "主題ê快相有載入，所以逐ê值lóng khàm過去ah。Lí 通改載入主題實際ê資料。",
+          "fe_upgraded": "版本更新了後，Pleroma前端ê ia̋n-jín 升級ah。",
+          "fe_downgraded": "Pleroma ê前端滾tńg去ah。",
+          "migration_snapshot_ok": "為著保險，主題快相載入去ah。Lí ē當試載入主題資料。",
+          "migration_napshot_gone": "快相因故無去ah，tsi̍t-kuá所在看起來可能hām lí所想ê無kâng。",
+          "snapshot_source_mismatch": "版本tshia̋ng-póng：上可能因為前端滾轉去koh更新ah，若因為用舊版本ê前端，主題tsiah改變，lí有可能beh用舊ê版本。無，著用新ê。"
+        },
+        "save_load_hint": "佇揀iah是載入主題ê時，「保存」選項保留現tsú時設定ê選項；mā佇輸出主題ê時tsūn，儲存頭拄á講ê選項。若是逐ê選擇框á無設定，逐項設定就ē khǹg佇輸出ê主題。"
+      },
+      "common_colors": {
+        "_tab_label": "一般",
+        "main": "一般ê色彩",
+        "foreground_hint": "請看「進階」分頁，來調整khah幼ê所在",
+        "rgbo": "標頭、強調、徽章"
+      },
+      "advanced_colors": {
+        "_tab_label": "進階",
+        "alert": "警告ê背景",
+        "alert_error": "錯誤",
+        "alert_warning": "警告",
+        "alert_neutral": "其他ê",
+        "post": "PO文／用者紹介",
+        "badge": "徽章ê背景",
+        "popover": "提示、目錄、跳出來ê",
+        "badge_notification": "通知",
+        "panel_header": "面枋ê標題",
+        "top_bar": "頂 liâu-á",
+        "borders": "框á邊",
+        "buttons": "鈕仔",
+        "inputs": "輸入框á",
+        "faint_text": "淺ê文字",
+        "underlay": "Tshū-á",
+        "wallpaper": "壁紙",
+        "poll": "投票數ê圖",
+        "icons": "標á",
+        "highlight": "強調ê要素",
+        "pressed": "Tshi̍h ê 時",
+        "selectedPost": "選擇ê PO文",
+        "selectedMenu": "選擇ê目錄項目",
+        "disabled": "關ê",
+        "toggled": "切換ê時",
+        "tabs": "分頁",
+        "chat": {
+          "incoming": "收著ê",
+          "outgoing": "送出ê",
+          "border": "框á邊"
         }
+      },
+      "radii": {
+        "_tab_label": "邊á角ê khà-buh"
+      },
+      "shadows": {
+        "_tab_label": "影kap光",
+        "override": "Khàm掉",
+        "shadow_id": "影 #{value}",
+        "blur": "予n̄g-n̄g",
+        "spread": "Hōo 闊",
+        "inset": "內pîng",
+        "filter_hint": {
+          "always_drop_shadow": "警告，tsit ê 影一直用 {0}，若是瀏覽器支援tsē。",
+          "drop_shadow_syntax": "{0} 無支援參數 {1} kap 關鍵字 {2}。",
+          "avatar_inset": "請注意，結合內pîng kap外pîng ê影佇標頭，可能佇透明ê標頭現無預料ê結果。",
+          "spread_zero": "若是「hōo 闊」ê值比0較大，影ê顯示ē kap hōo 闊設做0 kâng款",
+          "inset_classic": "內pîng ê影ē用{0}"
+        },
+        "component": "部件",
+        "hintV3": "針對影，lí mā ē當用 {0} 標示法，來用其他ê色彩 khang (slot)。",
+        "components": {
+          "panelHeader": "面枋ê標題",
+          "topBar": "頂 liâu-á",
+          "avatar": "用者ê標頭（佇個人資料欄位）",
+          "popup": "跳出來ê kap提醒",
+          "button": "鈕仔",
+          "buttonHover": "鈕仔（滑鼠ê指標khǹg佇面頂）",
+          "panel": "面枋",
+          "avatarStatus": "用者ê標頭（佇PO文ê顯示）",
+          "buttonPressedHover": "鈕仔（滑鼠指標leh khǹg 佇頂懸，koh tshi̍h ê時）",
+          "buttonPressed": "鈕仔（leh tshi̍h ê時）",
+          "input": "輸入框á"
+        }
+      },
+      "fonts": {
+        "_tab_label": "字型",
+        "components": {
+          "interface": "界面",
+          "input": "輸入框á",
+          "post": "PO文",
+          "postCode": "RTF ê PO文ê平闊文字"
+        },
+        "family": "字型ê名",
+        "help": "揀界面元件所用ê字型。若是揀「家己指定」，lí著輸入系統內ê字型正確ê名。",
+        "size": "Sài-suh（單位：畫素）",
+        "weight": "字ê重（粗度）",
+        "custom": "家己指定"
+      },
+      "preview": {
+        "header": "先看māi",
+        "content": "內容",
+        "error": "錯誤ê例",
+        "button": "鈕á",
+        "text": "Tsē是{0}kap{1} ê例",
+        "mono": "內容",
+        "input": "Tú正kàu高雄ah。",
+        "faint_link": "有幫tsān ê手冊",
+        "fine_print": "讀guán ê {0}，毋過學無有路用ê！",
+        "header_faint": "Tsē OK",
+        "checkbox": "我有讀過使用條款",
+        "link": "好ê細ê連結"
       }
     },
     "upload": {
@@ -594,11 +719,11 @@
     "hide_all_muted_posts": "Khàm掉消音êPO文",
     "max_thumbnails": "PO文ê縮小圖ê khòo-tah（無寫=無限制）",
     "hide_isp": "Khàm 站臺特有ê面 pang",
-    "right_sidebar": "Kā 邊á liâu徙kah正手pîng",
-    "navbar_column_stretch": "伸導覽liâu，kah 欄平闊",
+    "right_sidebar": "Kā 邊á ê欄位徙kah正手pîng",
+    "navbar_column_stretch": "伸導覽liâu，kah 欄位平闊",
     "always_show_post_button": "一直顯示「新ê PO文」ê鈕仔",
     "hide_wallpaper": "Khàm站臺ê壁紙",
-    "use_one_click_nsfw": "Tshi̍h 一ê就會當拍開敏感內容",
+    "use_one_click_nsfw": "Tshi̍h chi̍t 下就ē當拍開敏感內容",
     "hide_post_stats": "Khàm PO文ê統計數據（比如：kah 意ê額數）",
     "hide_filtered_statuses": "Khàm 逐ê過濾掉êPO文",
     "hide_wordfiltered_statuses": "Khàm詞語過濾掉ê狀態",
@@ -627,7 +752,7 @@
     "mute_bot_posts": "Kā 機器lâng ê PO文消音",
     "hide_shoutbox": "Khàm 站臺ê留話pang",
     "account_backup_description": "Tse 予 lí ē當 kā lín 口座 ê 資訊 kap PO 文載落來，毋過 in 猶無法度輸入kàu Pleroma口座 ê 內底。",
-    "theme_help_v2_1": "拍開選擇框á就 ē 當改掉一寡組件ê色彩kap無透明度。Ji̍h「清掉所有ê」，ē 恢復原來ê款。",
+    "theme_help_v2_1": "拍開選擇框á就 ē 當改掉一寡組件ê色彩kap無透明度。Ji̍h「Lóng清掉」，ē 恢復原來ê款。",
     "preload_images": "Kā 圖片先載入",
     "hide_user_stats": "Khàm 掉用者ê統計數據（比如：綴ê lâng額）",
     "interfaceLanguage": "界面ê語言",
@@ -678,7 +803,7 @@
     "notification_visibility_mentions": "提起",
     "notification_visibility_repeats": "轉送",
     "notification_visibility_moves": "用者suá位",
-    "notification_visibility_emoji_reactions": "回應",
+    "notification_visibility_emoji_reactions": "反應",
     "notification_visibility_polls": "Lí參與ê選舉辦suah佇",
     "no_rich_text_description": "Po文mài用RTF格式",
     "no_blocks": "無封鎖",
@@ -690,7 +815,7 @@
     "show_moderator_badge": "佇我ê個人資料顯示「管理員」證章",
     "nsfw_clickthrough": "Khàm掉敏感ê媒體內容",
     "oauth_tokens": "OAuth token",
-    "refresh_token": "對頭the̍h token",
+    "refresh_token": "重頭the̍h token",
     "valid_until": "到期佇",
     "revoke_token": "撤回",
     "panelRadius": "面pang",
@@ -716,12 +841,12 @@
     "set_new_avatar": "設定新ê標頭",
     "set_new_profile_background": "設定新ê個人資料ê背景",
     "set_new_profile_banner": "設定新ê個人資料ê條á",
-    "reset_avatar": "Tuì頭設定標頭",
-    "reset_profile_background": "Tuì頭設個人資料ê背景",
-    "reset_profile_banner": "Tuì頭設個人資料ê條á",
-    "reset_avatar_confirm": "Lí敢確實beh tuì頭設定標頭？",
-    "reset_banner_confirm": "Lí敢確實beh tuì頭設定條á？",
-    "reset_background_confirm": "Lí敢確實beh tuì頭設定背景？",
+    "reset_avatar": "重頭設定標頭",
+    "reset_profile_background": "重頭設個人資料ê背景",
+    "reset_profile_banner": "重頭設個人資料ê條á",
+    "reset_avatar_confirm": "Lí敢確實beh 重頭設定標頭？",
+    "reset_banner_confirm": "Lí敢確實beh 重頭設定條á？",
+    "reset_background_confirm": "Lí敢確實beh 重頭設定背景？",
     "settings": "設定",
     "subject_input_always_show": "一直顯示主旨ê格á",
     "subject_line_behavior": "回應ê時，khóo-pih主旨",
@@ -731,11 +856,11 @@
     "conversation_display": "顯示對話ê風格",
     "conversation_display_tree": "樹á ê形",
     "disable_sticky_headers": "Mài 予欄位ê頭牢佇螢幕頂懸",
-    "show_scrollbars": "展示邊á liâu ê giú-á",
+    "show_scrollbars": "展示邊á ê欄位 ê giú-á",
     "third_column_mode": "空間夠額ê時，展示第三ê欄位",
     "third_column_mode_none": "不管時mài顯示第三ê欄位",
     "third_column_mode_notifications": "通知ê欄位",
-    "third_column_mode_postform": "主要êPO文表kah導覽",
+    "third_column_mode_postform": "主要ê PO文表kah導覽",
     "show_admin_badge": "佇我ê個人資料顯示「行政員」證章",
     "pause_on_unfocused": "若是 Pleroma ê分頁無點開，tiō 暫停更新",
     "conversation_display_tree_quick": "樹á形ê展示",
@@ -792,15 +917,437 @@
     "notification_mutes": "若tsún無愛收tuì指定用者來ê通知，著用消音。",
     "notification_blocks": "封鎖用者ē停止所有i hia來ê通知，mā取消訂伊。",
     "enable_web_push_notifications": "拍開網頁sak通知ê功能",
-    "more_settings": "Koh較tsē ê設定"
+    "more_settings": "Koh較tsē ê設定",
+    "version": {
+      "title": "版本",
+      "backend_version": "後端ê版本",
+      "frontend_version": "前端ê版本"
+    },
+    "commit_value": "儲存",
+    "commit_value_tooltip": "值無儲存，tshi̍h tsit ê 鈕仔來送出你改變ê",
+    "hard_reset_value": "硬ê重頭設",
+    "hard_reset_value_tooltip": "Suá掉儲存內底ê設定，強制用預設ê值",
+    "reset_value": "重頭設",
+    "reset_value_tooltip": "重頭設草稿",
+    "hide_scrobbles": "Tshàng scrobble（記錄）",
+    "notification_show_extra": "顯示koh khah tsē ê通知佇通知ê欄位",
+    "notification_extra_chats": "顯示bô讀ê開講",
+    "notification_extra_announcements": "顯示bô讀ê公告",
+    "notification_extra_follow_requests": "顯示新ê跟tuè請求",
+    "notification_extra_tip": "顯示自訂其他通知ê撇步"
   },
   "status": {
-    "favorites": "收藏"
+    "favorites": "收藏",
+    "repeat_confirm_cancel_button": "Mài轉送",
+    "delete_confirm_title": "Thâi掉ê確認",
+    "edit": "編輯狀態",
+    "edited_at": "（頂kái編輯佇：{time}）",
+    "pin": "釘佇個人資料",
+    "unpin": "Tuì個人資料拆掉",
+    "pinned": "釘入去ê",
+    "bookmark": "加入冊籤",
+    "unbookmark": "Tuì冊籤the̍h掉",
+    "delete_confirm": "Lí kám真ê beh thâi掉tsit ê狀態？",
+    "delete_confirm_accept_button": "Thâi掉",
+    "delete_confirm_cancel_button": "保留",
+    "reply_to": "回應",
+    "replies_list": "回應：",
+    "repeats": "轉送",
+    "repeat_confirm_accept_button": "轉送",
+    "repeat_confirm_title": "轉送ê確認",
+    "repeat_confirm": "Lí kám真ê beh轉送tsit ê狀態？",
+    "delete": "Thâi掉身份",
+    "delete_error": "Thâi狀態ê時出tshê：{0}",
+    "mentions": "提起",
+    "move_down": "Kā附件suá kàu正pîng",
+    "thread_show_full": "展示tsit 條討論線ê所有（lóng總有{numStatus}ê狀態，深度上限：{depth}）",
+    "thread_follow": "看討論線tshun ê部份（lóng總有{numStatus}ê狀態）",
+    "replies_list_with_others": "回應（+其他{numReplies}ê）：",
+    "mute_conversation": "Kā會話消音",
+    "unmute_conversation": "Kā會話取消消音",
+    "status_unavailable": "狀態bē當用",
+    "copy_link": "Khóo-pih 狀態ê連結",
+    "external_source": "外口ê來源",
+    "thread_muted": "討論線消音ah",
+    "thread_muted_and_words": "，有詞語：",
+    "hide_full_subject": "Khàm掉主題ê全文",
+    "show_full_subject": "顯示標題ê全文",
+    "show_content": "顯示內容",
+    "hide_content": "Khàm掉內容",
+    "status_deleted": "Tsit篇PO文thâi掉ah",
+    "nsfw": "敏感ê內容",
+    "expand": "Thián開",
+    "you": "（Lí）",
+    "plus_more": "Koh有{number}ê",
+    "many_attachments": "PO文有{number}ê附件",
+    "collapse_attachments": "Kā附件tshàng起來",
+    "show_all_attachments": "顯示逐ê附件",
+    "show_attachment_in_modal": "佇媒體模式顯示",
+    "show_attachment_description": "Kā敘述先看māi（拍開附件會當看kui ê敘述）",
+    "hide_attachment": "Khàm掉附件",
+    "attachment_stop_flash": "停止Flash ê播放器",
+    "remove_attachment": "Kā附件suá走",
+    "move_up": "Kā附件suá kàu倒pîng",
+    "open_gallery": "拍開畫廊",
+    "thread_hide": "Khàm掉討論線",
+    "thread_show": "顯示討論線",
+    "thread_show_full_with_icon": "{icon} {text}",
+    "thread_follow_with_icon": "{icon} {text}",
+    "ancestor_follow": "看其他{numReplies}ê佇tsit ê狀態ê回應",
+    "ancestor_follow_with_icon": "{icon} {text}",
+    "show_all_conversation_with_icon": "{icon} {text}",
+    "show_all_conversation": "看kui ê會話（有其他{numStatus}ê狀態）",
+    "show_only_conversation_under_this": "Kan-ta顯示tsit ê狀態ê回應",
+    "status_history": "狀態ê歷史",
+    "reaction_count_label": "{num}ê lâng用表情反應",
+    "hide_quote": "Khàm條引用ê狀態",
+    "display_quote": "顯示引用ê狀態",
+    "invisible_quote": "引用ê狀態bē當用：{link}",
+    "more_actions": "佇tsit ê狀態ê其他動作"
   },
   "user_card": {
-    "favorites": "收藏"
+    "favorites": "收藏",
+    "show_repeats": "顯示轉送",
+    "hide_repeats": "Khàm掉轉送",
+    "remove_follower_confirm": "Lí kám真正想beh kā {user} tuì lí所跟綴ê suá走？",
+    "statuses": "狀態",
+    "admin_menu": {
+      "activate_account": "啟動口座",
+      "deactivate_account": "予口座失效",
+      "delete_account": "Thâi掉口座",
+      "force_nsfw": "Kā逐ê PO文標做敏感內容",
+      "strip_media": "Tuì PO文thâi掉媒體",
+      "force_unlisted": "強制PO文mài列佇公共時間線",
+      "disable_remote_subscription": "Mài允准tuì其他站臺跟tuè用者",
+      "sandbox": "強制PO文kan-ta予跟tuè ê看",
+      "disable_any_subscription": "Mài允准跟tuè任何用者",
+      "quarantine": "Tuì聯邦禁止用者ê PO文",
+      "delete_user": "Thâi掉用者ê口座",
+      "delete_user_data_and_deactivate_confirmation": "Án-ne ē永永thâi掉tsit ê口座ê資料兼hōo失效。Lí kám完全確定？",
+      "grant_admin": "授與行政員ê權",
+      "revoke_admin": "撤掉行政員ê權",
+      "moderation": "仲裁",
+      "grant_moderator": "授與仲裁員ê權",
+      "revoke_moderator": "撤掉仲裁員ê權"
+    },
+    "highlight": {
+      "disabled": "Mài強調",
+      "side": "邊á ê花tsuā",
+      "solid": "孤色ê背景",
+      "striped": "花tsuā ê背景"
+    },
+    "note": "筆記",
+    "note_blank": "（無）",
+    "edit_note": "編輯筆記",
+    "edit_note_apply": "適用",
+    "approve": "核准",
+    "approve_confirm_title": "核准ê確認",
+    "approve_confirm_accept_button": "核准",
+    "approve_confirm_cancel_button": "Mài核准",
+    "block": "封鎖",
+    "blocked": "封鎖ah！",
+    "block_confirm_title": "封鎖ê確認",
+    "approve_confirm": "Lí kám想beh核准{user}ê跟tuè請求？",
+    "block_confirm": "Lí kám 真正想beh封鎖{user}?",
+    "block_confirm_accept_button": "封鎖",
+    "block_confirm_cancel_button": "Mài封鎖",
+    "deactivated": "停止使用ah",
+    "deny": "拒絕",
+    "deny_confirm_title": "拒絕ê確認",
+    "deny_confirm_accept_button": "拒絕",
+    "deny_confirm_cancel_button": "Mài拒絕",
+    "deny_confirm": "Lí kám想beh拒絕{user}ê跟tuè請求？",
+    "edit_profile": "編輯個人資料",
+    "follow": "跟tuè",
+    "follow_cancel": "取消請求",
+    "follow_sent": "請求送ah！",
+    "follow_progress": "Teh請求……",
+    "follow_unfollow": "無愛跟tuè",
+    "unfollow_confirm_title": "無愛跟tuè ê確認",
+    "unfollow_confirm": "lí kám真正無beh跟tuè {user}?",
+    "unfollow_confirm_accept_button": "無愛跟綴",
+    "unfollow_confirm_cancel_button": "繼續跟tuè",
+    "followees": "Teh跟綴",
+    "followers": "跟綴ê",
+    "following": "Teh跟tuè！",
+    "follows_you": "跟tuè lí！",
+    "hidden": "Tshàng起來ê",
+    "its_you": "Tse是lí！",
+    "media": "媒體",
+    "mention": "提起",
+    "message": "短phue",
+    "mute": "消音",
+    "muted": "消音ê",
+    "mute_confirm_title": "消音ê確認",
+    "mute_confirm": "Lí確定想beh kā {user}消音？",
+    "mute_confirm_accept_button": "消音",
+    "mute_confirm_cancel_button": "Mài消音",
+    "mute_duration_prompt": "消音tsit ê用戶ê期限（0表示永遠）：",
+    "per_day": "/kang",
+    "remote_follow": "遠距離ê關注",
+    "remove_follower": "Suá走跟綴ê",
+    "remove_follower_confirm_title": "Suá走跟tuè者ê確認",
+    "remove_follower_confirm_accept_button": "Suá走",
+    "remove_follower_confirm_cancel_button": "保留",
+    "report": "檢舉",
+    "subscribe": "注文",
+    "unsubscribe": "取消注文",
+    "unblock": "Mài封鎖",
+    "unblock_progress": "Teh取消封鎖……",
+    "block_progress": "Leh封鎖……",
+    "unmute": "Mài消音",
+    "mute_progress": "Leh消音……",
+    "unmute_progress": "Leh取消消音……",
+    "bot": "機器lâng",
+    "birthday": "出世佇{birthday}",
+    "edit_note_cancel": "取消"
   },
   "tool_tip": {
-    "favorite": "收藏"
+    "favorite": "收藏",
+    "repeat": "轉送",
+    "media_upload": "Kā媒體傳起去",
+    "reply": "回應",
+    "add_reaction": "加反應",
+    "user_settings": "用者ê設定",
+    "accept_follow_request": "允准跟tuè ê請求",
+    "reject_follow_request": "拒絕跟tuè ê請求",
+    "bookmark": "冊籤",
+    "toggle_expand": "Thián開á是tshàng通知，顯示kui篇PO文",
+    "toggle_mute": "Thián開á是tshàng通知，顯露消音ê內容",
+    "autocomplete_available": "{number} ê結果通用。用頂kap下ê key來看結果。"
+  },
+  "password_reset": {
+    "instruction": "輸入你ê email地址iah是用者ê名。阮ē寄予lí連結，通重頭設你ê密碼。",
+    "password_reset_disabled": "密碼重頭設ê功能無開放。請聯絡lín站臺ê行政員。",
+    "password_reset_required_but_mailer_is_disabled": "Lí著重設密碼，M̄-koh重頭設密碼ê功能無開放。請聯絡lín站臺ê行政員。",
+    "forgot_password": "Buē記得密碼？",
+    "password_reset": "密碼重頭設",
+    "placeholder": "你ê email iah是用者ê名",
+    "check_email": "檢查你ê電子phue箱，有重頭設密碼ê連結ê phue無。",
+    "return_home": "Tńg去頭頁",
+    "too_many_requests": "Lí已經kàu 試ê回數限制 ah，小等leh koh試。",
+    "password_reset_required": "Lí著重設密碼，tsiah通登入。"
+  },
+  "admin_dash": {
+    "window_title": "行政員",
+    "reset_all": "Kui ê重頭設",
+    "wip_notice": "Tsit ê 管理 la-jí-báng (dashboard) 是試驗ê，koh teh 起做，{adminFeLink}.",
+    "old_ui_link": "舊ê管理界面佇tsia",
+    "commit_all": "Lóng總儲存",
+    "tabs": {
+      "nodb": "無資料庫ê設置",
+      "instance": "站臺",
+      "limits": "限制",
+      "frontends": "前端"
+    },
+    "nodb": {
+      "heading": "資料庫設置無開放",
+      "text": "Lí需要改後端ê設置檔案，tsiah ē當kā{property}設做{value}，請佇{documentation}了解詳細。",
+      "documentation": "文件",
+      "text2": "大部份ê設定ē無開放。"
+    },
+    "limits": {
+      "user_uploads": "個人資料ê媒體限制",
+      "arbitrary_limits": "任何限制",
+      "posts": "PO文ê限制",
+      "uploads": "附件ê限制",
+      "users": "用者個人資料ê限制",
+      "profile_fields": "個人資料欄位ê限制"
+    },
+    "captcha": {
+      "native": "在來ê",
+      "kocaptcha": "KoCaptcha"
+    },
+    "instance": {
+      "instance": "站臺ê資訊",
+      "registrations": "用者ê註冊",
+      "kocaptcha": "KoCaptcha ê設定",
+      "restrict": {
+        "header": "管制無落名ê訪客使用",
+        "timelines": "讀取時間線",
+        "profiles": "讀取用者ê個人資料",
+        "activities": "讀取狀態／活動",
+        "description": "（無）允准一kuá方面ê API the̍h取資源ê詳細設定。預設（無定ê狀態），若是站臺毋是公開ê，ē無允准the̍h取；選擇框á若勾，就算站臺是公開ê，iáu是無允准the̍h取；若無勾，就算站臺是私人ê，mā是允准the̍h取。請注意，若是設一kuá設定，無預料ê行為可能產生。比如講，若是the̍h取個人資料無開放，PO文buē顯示個人資料。"
+      },
+      "access": "讀取實體",
+      "captcha_header": "CAPTCHA"
+    },
+    "frontend": {
+      "repository": "原始碼庫ê連結",
+      "versions": "通用ê版本",
+      "build_url": "起做URL",
+      "reinstall": "重頭安裝",
+      "is_default": "（預設）",
+      "is_default_custom": "（預設，版本：{version}）",
+      "install": "安裝",
+      "install_version": "安裝ê版本：{version}",
+      "more_install_options": "其他ê安裝選項",
+      "more_default_options": "其他ê預設設定ê選項",
+      "set_default": "設做預設ê",
+      "set_default_version": "Kā版本{version}設做預設ê",
+      "default_frontend_tip": "預設ê前端ē展示予逐ê用者。現在，用者無法度揀個人ê前端。若是lí變換，無beh用PleromaFE，上有可能ē用舊koh問題tsē ê AdminFE 做站臺ê設置，佇阮iáu-bē kā伊取代以前。",
+      "wip_notice": "請注意，tsit ê段落iáu teh起做，欠缺一寡特點，因為後端tuì前端管理ê實做無齊備。",
+      "default_frontend": "預設ê前端",
+      "default_frontend_tip2": "Teh起做：因為Pleroma後端無適當列出逐ê安裝ê前端，lí著手動輸入名字kap引用。下kha ê列單提供寫tsiah-ê 值ê近路。",
+      "available_frontends": "Ē當安裝"
+    },
+    "temp_overrides": {
+      ":pleroma": {
+        ":instance": {
+          ":public": {
+            "description": "無開放tse，ē 控制逐êAPI，干焦予登入ê用者用，mā ē予公開kap聯邦ê時間線，buē當予無落名ê訪客the̍h著。",
+            "label": "站臺是公開ê"
+          },
+          ":limit_to_local_content": {
+            "label": "Kan-ta會當tshuē在地ê內容",
+            "description": "無開放無認證ê用者、逐儂，猶是lóng總開放tshuē全球ê網路"
+          },
+          ":description_limit": {
+            "label": "限制",
+            "description": "附件說明ê字元限制"
+          },
+          ":background_image": {
+            "label": "背景ê影像",
+            "description": "背景ê影像（主要予PleromaFE用）"
+          }
+        }
+      }
+    }
+  },
+  "timeline": {
+    "up_to_date": "是上新ê",
+    "collapse": "疊起來",
+    "conversation": "會話",
+    "error": "佇the̍h時間線ê時出tshê：{0}",
+    "load_older": "載入舊ê狀態",
+    "repeated": "轉送ah",
+    "no_retweet_hint": "PO文hőng標做限定跟綴ê，á是私人phue，無法度轉送",
+    "show_new": "看新ê",
+    "reload": "重新載入",
+    "no_more_statuses": "無其他ê狀態",
+    "no_statuses": "無狀態",
+    "socket_reconnected": "實時ê連結成立ah",
+    "socket_broke": "實時連結拍m̄見ah：CloseEvent代碼{0}",
+    "quick_view_settings": "快速 view ê設定",
+    "quick_filter_settings": "快速過濾器ê設定"
+  },
+  "time": {
+    "unit": {
+      "days": "{0}工",
+      "days_short": "{0}工",
+      "hours": "{0}點鐘",
+      "hours_short": "{0}點鐘",
+      "minutes": "{0}分鐘",
+      "minutes_short": "{0}分",
+      "months": "{0}個月",
+      "months_short": "{0}個月",
+      "seconds": "{0}秒鐘",
+      "seconds_short": "{0}秒",
+      "weeks": "{0}禮拜",
+      "weeks_short": "{0}週",
+      "years": "{0}年",
+      "years_short": "{0}年"
+    },
+    "in_future": "koh有{0}",
+    "in_past": "{0}進前",
+    "now": "tú正",
+    "now_short": "tsit-má"
+  },
+  "user_reporting": {
+    "title": "檢舉 {0}",
+    "forward_description": "Tsit ê口座是別ê站臺ê。Mā kám beh寄報告ê khóo-pih kàu hit ê站？",
+    "add_comment_description": "本檢舉ē 寄kàu你ê站臺ê仲裁員。Lí會當佇下kha解說檢舉tsit ê口座ê原因：",
+    "additional_comments": "其他ê意見",
+    "forward_to": "轉送kàu{0}",
+    "submit": "送出",
+    "generic_error": "佇處理lí ê請求ê時出tshê。"
+  },
+  "lists": {
+    "really_delete": "Kám真正 beh thâi列單？",
+    "search": "Tshiau-tshuē用者",
+    "create": "建立",
+    "save": "保存改變",
+    "delete": "Thâi列單",
+    "lists": "列單",
+    "new": "新ê列單",
+    "title": "列單ê標題",
+    "following_only": "限制佇跟tuè ê",
+    "manage_lists": "管理列單",
+    "manage_members": "管理列單ê成員",
+    "add_members": "Tshiau-tshuē其他ê用者",
+    "remove_from_list": "Tuì列單suá走",
+    "add_to_list": "Ke-thinn kàu列單",
+    "is_in_list": "已經佇列單內底",
+    "editing_list": "編輯列單 {listTitle}",
+    "creating_list": "開新ê列單",
+    "update_title": "保存標題",
+    "error": "佇操作列單ê時出tshê：{0}"
+  },
+  "update": {
+    "update_bugs": "請報告任何問題kap錯誤佇 {pleromaGitlab}，因為已經改變真tsē。雖bóng guán徹底試過，ka-kī mā用開發版，iáu是有可能有無注意ê所在。Guán歡迎lí tuì所tú tio̍h ê問題，提出意見kap建議，或者是改進Pleroma kap Pleroma-FE ê方法。",
+    "big_update_title": "請sió等tsi̍t ê",
+    "update_bugs_gitlab": "Pleroma GitLab",
+    "big_update_content": "Guán已經有tsi̍t段時間無推出發行，所以外觀kap感覺kap lí所慣勢ê，凡勢無kâng。",
+    "update_changelog": "Beh知影改變ê詳細，請看{theFullChangelog}。",
+    "update_changelog_here": "Changelog全文",
+    "art_by": "美術製作：{linkToArtist}"
+  },
+  "user_profile": {
+    "timeline_title": "用者ê時間線",
+    "profile_does_not_exist": "Pháinn勢，tsit ê個人資料無佇leh。",
+    "profile_loading_error": "Pháinn勢，佇載入tsit ê個人資料ê時出tshê。"
+  },
+  "who_to_follow": {
+    "more": "詳情",
+    "who_to_follow": "Siáng通tuè"
+  },
+  "upload": {
+    "error": {
+      "base": "傳起去ê時失敗。",
+      "message": "傳起去ê時失敗：{0}",
+      "file_too_big": "檔案siūnn大[{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "default": "Koh試tsi̍t kái"
+    },
+    "file_size_units": {
+      "B": "B",
+      "KiB": "KiB",
+      "MiB": "MiB",
+      "GiB": "GiB",
+      "TiB": "TiB"
+    }
+  },
+  "search": {
+    "people": "Lâng",
+    "hashtags": "井字ê標籤",
+    "person_talking": "{count}ê lâng teh開講",
+    "people_talking": "{count}ê lâng teh開講",
+    "no_results": "無結果",
+    "no_more_results": "無其他結果",
+    "load_more": "載入其他結果"
+  },
+  "chats": {
+    "you": "Lí：",
+    "message_user": "送短phue予：{nickname}",
+    "delete": "Thâi掉",
+    "chats": "開講",
+    "new": "新ê開講",
+    "empty_message_error": "Bē當PO空ê短phue",
+    "more": "其他",
+    "delete_confirm": "Lí kám真正beh thâi tsit ê短phue？",
+    "error_loading_chat": "佇載入開講ê時出問題。",
+    "error_sending_message": "佇送短phue ê時出問題。",
+    "empty_chat_list_placeholder": "Lí iáu buē開講過。開始開講！"
+  },
+  "file_type": {
+    "audio": "聲音",
+    "video": "影片",
+    "image": "影像",
+    "file": "檔案"
+  },
+  "display_date": {
+    "today": "今á日"
+  },
+  "unicode_domain_indicator": {
+    "tooltip": "Tsit ê域名含m̄是ascii ê字元。"
   }
 }
diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index cbb1a21f..51bfe120 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -121,7 +121,8 @@
     "placeholder": "напр. stepan",
     "logout_confirm": "Ви дійсно хочете вийти?",
     "logout_confirm_accept_button": "Вийти",
-    "logout_confirm_cancel_button": "Ні, хочу назад!"
+    "logout_confirm_cancel_button": "Ні, хочу назад!",
+    "logout_confirm_title": "Вихід"
   },
   "importer": {
     "error": "Під час імпортування файлу сталася помилка.",
@@ -164,7 +165,13 @@
     "broken_favorite": "Невідомий допис, шукаю його…",
     "error": "Помилка при оновленні сповіщень: {0}",
     "poll_ended": "опитування закінчено",
-    "submitted_report": "подав скаргу"
+    "submitted_report": "подав скаргу",
+    "unread_announcements": "{num} непрочитане оголошення | {num} непрочитаних оголошень",
+    "unread_chats": "{num} непрочитаний чат | {num} непрочитаних чатів",
+    "unread_follow_requests": "{num} новий запит на підписку | {num} нових запитів на підписку",
+    "configuration_tip": "Ви можете налаштувати, що відображати тут у {theSettings}. {dismiss}",
+    "configuration_tip_settings": "налаштування",
+    "configuration_tip_dismiss": "Не показувати знову"
   },
   "nav": {
     "chats": "Чати",
@@ -267,7 +274,8 @@
       "activities": "Активності",
       "symbols": "Символи",
       "travel-and-places": "Подорожі та Місця"
-    }
+    },
+    "unpacked": "Розпаковані емоджі"
   },
   "post_status": {
     "content_type": {
@@ -304,7 +312,11 @@
     "post": "Опублікувати",
     "edit_unsupported_warning": "Pleroma не підтримує редагування згадувань чи голосувань.",
     "edit_status": "Редагувати допис",
-    "edit_remote_warning": "Інші віддалені інстанси можуть не підтримувати редагування та вони можуть не отримати актуальну версію допису."
+    "edit_remote_warning": "Інші віддалені інстанси можуть не підтримувати редагування та вони можуть не отримати актуальну версію допису.",
+    "content_type_selection": "Форматування допису",
+    "scope_notice_dismiss": "Закрити це сповіщення",
+    "reply_option": "Відповісти на цей допис",
+    "quote_option": "Процитувати допис"
   },
   "settings": {
     "blocks_imported": "Блокування імпортовані! Їх обробка триватиме певний час.",
@@ -730,7 +742,7 @@
     "conversation_display_tree_quick": "Вигляд дерева",
     "disable_sticky_headers": "Не закріплювати заголовок колонки зверху на сторінці",
     "third_column_mode_none": "Не показувати третю колонку взагалі",
-    "third_column_mode_notifications": "Колонка сповіщень",
+    "third_column_mode_notifications": "Колонку сповіщень",
     "columns": "Колонки",
     "auto_update": "Автоматично показувати нові дописи",
     "use_websockets": "Використовувати вебсокети (Оновлення в реальному часі)",
@@ -743,7 +755,38 @@
     "wordfilter": "Фільтр слів",
     "mention_links": "Посилання для згадування",
     "user_profiles": "Профілі користувачів",
-    "notification_visibility_polls": "Закінчення опитувань, в яких ви проголосували"
+    "notification_visibility_polls": "Закінчення опитувань, в яких ви проголосували",
+    "remove_language": "Вилучити",
+    "primary_language": "Основна мова:",
+    "fallback_language": "Резервна мова {index}:",
+    "confirm_dialogs_deny_follow": "тим, як відмовити у запиті на підписку",
+    "confirm_dialogs_remove_follower": "видаленням підписника",
+    "notification_show_extra": "Показувати додаткові сповіщення в панелі сповіщень",
+    "notification_extra_chats": "Показувати непрочитані чати",
+    "notification_extra_announcements": "Показувати непрочитані оголошення",
+    "notification_extra_follow_requests": "Показувати нові запити на підписку",
+    "third_column_mode_postform": "Форму відправки повідомлень та панель навігації",
+    "notification_extra_tip": "Показати пораду з налаштувань для додаткових сповіщень",
+    "backup_running": "Резервне копіювання триває, оброблено {number} записи. | Резервне копіювання триває, оброблено {number} записів.",
+    "backup_failed": "Резервне копіювання не вдалося.",
+    "preview": "Попередній перегляд",
+    "url": "URL",
+    "birthday": {
+      "label": "День народження",
+      "show_birthday": "Показувати мій день народження"
+    },
+    "confirm_dialogs": "Запитувати підтвердження перед",
+    "confirm_dialogs_repeat": "поширенням допису",
+    "confirm_dialogs_unfollow": "скасуванням підписки",
+    "confirm_dialogs_block": "блокуванням користувача",
+    "confirm_dialogs_mute": "тим, як заглушити користувача",
+    "show_scrollbars": "Показувати смугу прокрутки на бічних панелях",
+    "column_sizes": "Розміри панелей",
+    "column_sizes_sidebar": "Бічна панель",
+    "add_language": "Додати резервну мову",
+    "confirm_dialogs_delete": "видаленням допису",
+    "confirm_dialogs_logout": "виходом із системи",
+    "confirm_dialogs_approve_follow": "схваленням запиту на підписку"
   },
   "selectable_list": {
     "select_all": "Вибрати все"
@@ -760,7 +803,8 @@
       "password_required": "не може бути порожнім",
       "email_required": "не може бути порожнім",
       "fullname_required": "не може бути порожнім",
-      "username_required": "не може бути порожнім"
+      "username_required": "не може бути порожнім",
+      "birthday_required": "не може бути пустим"
     },
     "bio_placeholder": "напр.\nНаш народ завжди прагне волі для себе і бажає її для інших народів. Він боровся і бореться за правду і справедливість. Ми хочемо жити у згоді і взаємному шануванні з усіми народами доброї волі. Такі самі права визнаємо за іншими народами, за які боремося для себе.",
     "fullname_placeholder": "напр. Степан Бандера",
@@ -778,7 +822,9 @@
     "reason": "Причина реєстрації",
     "bio_optional": "Біографія (необов'язково)",
     "email_language": "Якою мовою ви бажаєте отримувати електронні листи від сервера?",
-    "email_optional": "Ел. пошта (необов'язково)"
+    "email_optional": "Ел. пошта (необов'язково)",
+    "birthday": "День народження:",
+    "birthday_optional": "День народження (необов'язково):"
   },
   "who_to_follow": {
     "who_to_follow": "На кого підписатися",
@@ -890,7 +936,8 @@
       "grant_moderator": "Надати права модератора",
       "revoke_admin": "Позбавити прав адміністратора",
       "grant_admin": "Надати права адміністратора",
-      "quarantine": "Не розповсюджувати дописи на інших інстансах"
+      "quarantine": "Не розповсюджувати дописи на інших інстансах",
+      "delete_user_data_and_deactivate_confirmation": "Це назовсім видалить дані обліковки й вимкне її. Точно продовжити?"
     },
     "deny": "Відмовити",
     "block": "Заблокувати",
@@ -929,7 +976,32 @@
     "bot": "Бот",
     "edit_profile": "Редагувати профіль",
     "deactivated": "Деактивований",
-    "follow_cancel": "Скасувати запит"
+    "follow_cancel": "Скасувати запит",
+    "block_confirm_title": "Блокування",
+    "block_confirm": "Точно заблокувати {user}?",
+    "mute_confirm_cancel_button": "Ні, не приглушувати",
+    "note_blank": "(Пусто)",
+    "edit_note_apply": "Застосувати",
+    "edit_note_cancel": "Скасувати",
+    "block_confirm_accept_button": "Так, заблокувати",
+    "block_confirm_cancel_button": "Ні, не блокувати",
+    "deny_confirm_title": "Відхилити запит на підписку",
+    "mute_confirm_accept_button": "Так, приглушити",
+    "mute_confirm": "Точно приглушити {user}?",
+    "edit_note": "Редагувати нотатку",
+    "mute_confirm_title": "Приглушення",
+    "mute_duration_prompt": "Приглушити користувача на (0 якщо назавжди):",
+    "approve_confirm_title": "Дозвіл підписатись",
+    "approve_confirm_accept_button": "Так, дозволити",
+    "approve_confirm_cancel_button": "Ні, скасувати",
+    "deny_confirm_accept_button": "Так, відхилити",
+    "deny_confirm_cancel_button": "Ні, скасувати",
+    "deny_confirm": "Ви точно хочете відхилити запит на підписку від {user}?",
+    "unfollow_confirm_title": "Відписка",
+    "unfollow_confirm": "Точно відписатись від {user}?",
+    "unfollow_confirm_accept_button": "Так, відписатись",
+    "unfollow_confirm_cancel_button": "Ні, не відписуватись",
+    "note": "Приватна нотатка"
   },
   "status": {
     "copy_link": "Скопіювати посилання на допис",
@@ -965,7 +1037,38 @@
     "plus_more": "+{number} більше",
     "thread_show_full_with_icon": "{icon} {text}",
     "show_only_conversation_under_this": "Показати всі відповіді на цей допис",
-    "status_history": "Історія змін"
+    "status_history": "Історія змін",
+    "thread_hide": "Сховати гілку",
+    "open_gallery": "Відкрити галерею",
+    "repeat_confirm": "Точно поширити допис?",
+    "repeat_confirm_title": "Підтвердьте поширення",
+    "repeat_confirm_accept_button": "Так, поширити",
+    "repeat_confirm_cancel_button": "Ні, не поширювати",
+    "delete_error": "Помилка при видаленні допису: {0}",
+    "delete_confirm_accept_button": "Так, видалити",
+    "delete_confirm_cancel_button": "Ні, лишити",
+    "delete_confirm_title": "Підтвердьте видалення",
+    "you": "(ви)",
+    "collapse_attachments": "Згорнути вкладення",
+    "show_all_attachments": "Показати всі вкладення",
+    "hide_attachment": "Сховати вкладення",
+    "many_attachments": "Вкладень: {number} | Вкладень: {number}",
+    "attachment_stop_flash": "Зупинити Flash-плеєр",
+    "thread_follow": "Ще відповідей: {numStatus} | Ще відповідей: {numStatus}",
+    "remove_attachment": "Видалити вкладення",
+    "ancestor_follow": "Переглянути ще {numReplies} під цим дописом | Переглянути ще {numReplies} під цим дописом",
+    "show_all_conversation": "Показати всю розмову (ще дописів: {numStatus}) | Показати всю розмову (ще дописів: {numStatus})",
+    "move_up": "Посунути вкладення ліворуч",
+    "move_down": "Посунути вкладення праворуч",
+    "thread_show": "Показати гілку",
+    "mentions": "Згадки",
+    "thread_show_full": "Показати відповіді: {numStatus} | Показати відповіді: {numStatus}",
+    "hide_quote": "Сховати процитований допис",
+    "display_quote": "Показати процитований допис",
+    "invisible_quote": "Процитований допис недоступний: {link}",
+    "replies_list_with_others": "Ще відповідей: {numReplies} | Ще відповідей: {numReplies}:",
+    "show_attachment_in_modal": "Показати вкладення у вікні",
+    "show_attachment_description": "Переглянути опис (натисніть саме вкладення, якщо опис не вміщається)"
   },
   "timeline": {
     "no_more_statuses": "Більше немає дописів",
@@ -980,7 +1083,8 @@
     "repeated": "поширив(-ла)",
     "no_retweet_hint": "Запис, позначено як \"тільки для підписників\" або \"особисте\" і тому не може бути поширений",
     "socket_broke": "Втрачено з'єднання у реальному часі: код {0}",
-    "socket_reconnected": "Встановлено з'єднання у реальному часі"
+    "socket_reconnected": "Встановлено з'єднання у реальному часі",
+    "quick_view_settings": "Налаштування швидкого перегляду"
   },
   "user_reporting": {
     "submit": "Відправити",
@@ -1026,5 +1130,35 @@
     "submit_edit_action": "Надіслати",
     "cancel_edit_action": "Скасувати",
     "inactive_message": "Це оголошення неактивне"
+  },
+  "lists": {
+    "really_delete": "Дійсно видалити список?",
+    "error": "Помилка при роботі зі списками: {0}",
+    "is_in_list": "Вже є у списку",
+    "editing_list": "Редагування списку {listTitle}",
+    "creating_list": "Створення нового списку",
+    "search": "Знайти користувачів",
+    "create": "Створити",
+    "save": "Зберегти зміни",
+    "manage_members": "Керувати учасниками списку",
+    "new": "Новий список",
+    "title": "Назва списку",
+    "delete": "Видалити список",
+    "following_only": "Лише за ким ви стежите",
+    "lists": "Списки",
+    "manage_lists": "Керувати списками",
+    "remove_from_list": "Видалити зі списку",
+    "add_to_list": "Додати до списку"
+  },
+  "update": {
+    "update_changelog": "Щоб дізнатись більше інформації, дивіться {theFullChangelog}.",
+    "update_bugs": "Будь ласка, повідомляйте про будь-які проблеми та помилки на {pleromaGitlab}, оскільки ми внесли багато змін, і навіть після ретельно проведених перевірок, ми можемо щось пропустити. Ми заздалегідь вдячні за ваші відгуки щодо проблем, з якими ви можете зіткнутися, а також пропозиції щодо вдосконалення Pleroma та Pleroma-FE.",
+    "update_changelog_here": "повний список змін",
+    "big_update_title": "Хвилинку уваги",
+    "update_bugs_gitlab": "Pleroma GitLab",
+    "big_update_content": "У нас не було оновлень протягом тривалого часу, тому речі можуть мати інакший вигляд, аніж ви звикли."
+  },
+  "unicode_domain_indicator": {
+    "tooltip": "Цей домен містить не-ASCII символи."
   }
 }
diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 69266caa..396cb2f2 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -146,7 +146,13 @@
     "follow_request": "想要关注你",
     "error": "取得通知时发生错误：{0}",
     "poll_ended": "投票结束了",
-    "submitted_report": "提交举报"
+    "submitted_report": "提交举报",
+    "unread_announcements": "{num} 条未读公告",
+    "unread_chats": "{num} 条未读聊天讯息",
+    "unread_follow_requests": "{num} 个新关注请求",
+    "configuration_tip": "可以在 {theSettings} 里定制什么会显示在这里。{dismiss}",
+    "configuration_tip_settings": "设置",
+    "configuration_tip_dismiss": "不再显示"
   },
   "polls": {
     "add_poll": "增加投票",
@@ -212,7 +218,9 @@
     "edit_unsupported_warning": "Pleroma 不支持对提及或投票进行编辑。",
     "edit_status": "编辑状态",
     "content_type_selection": "发帖格式",
-    "scope_notice_dismiss": "关闭此提示"
+    "scope_notice_dismiss": "关闭此提示",
+    "reply_option": "回复这条状态",
+    "quote_option": "引用这条状态"
   },
   "registration": {
     "bio": "简介",
@@ -747,7 +755,12 @@
     "reset_value_tooltip": "重置草稿",
     "hard_reset_value": "硬重置",
     "hard_reset_value_tooltip": "从存储中移除设置，强制使用默认值",
-    "emoji_reactions_scale": "表情回应比例系数"
+    "emoji_reactions_scale": "表情回应比例系数",
+    "notification_show_extra": "在通知栏里显示额外通知",
+    "notification_extra_chats": "显示未读聊天",
+    "notification_extra_announcements": "显示未读公告",
+    "notification_extra_follow_requests": "显示新的关注请求",
+    "notification_extra_tip": "显示额外通知的定制提示"
   },
   "time": {
     "day": "{0} 天",
@@ -880,7 +893,10 @@
     "show_attachment_in_modal": "在媒体模式中显示",
     "status_history": "状态历史",
     "delete_error": "删除状态时出错：{0}",
-    "reaction_count_label": "{num} 人作出了表情回应"
+    "reaction_count_label": "{num} 人作出了表情回应",
+    "invisible_quote": "引用的状态不可用：{link}",
+    "hide_quote": "隐藏引用的状态",
+    "display_quote": "显示引用的状态"
   },
   "user_card": {
     "approve": "核准",
@@ -1184,7 +1200,7 @@
     "big_update_title": "请忍耐一下",
     "big_update_content": "我们已经有一段时间没有发布发行版，所以事情的外观和感觉可能与你习惯的不一样。",
     "update_bugs": "请在 {pleromaGitlab} 上报告任何问题和bug，因为我们已经改变了很多，虽然我们进行了彻底的测试，并且自己使用了开发版本，但我们可能错过了一些东西。我们欢迎你对你可能遇到的问题或如何改进Pleroma和Pleroma-FE提出反馈和建议。",
-    "art_by": "Art by {linkToArtist}"
+    "art_by": "{linkToArtist} 的作品"
   },
   "lists": {
     "search": "搜索用户",
@@ -1266,7 +1282,6 @@
       "wip_notice": "请注意，此部分是一个WIP，缺乏某些功能，因为前端管理的后台实现并不完整。",
       "default_frontend": "默认前端",
       "default_frontend_tip": "默认的前端将显示给所有用户。目前还没有办法让用户选择个人的前端。如果你不使用 PleromaFE，你很可能不得不使用旧的和有问题的 AdminFE 来进行实例配置，直到我们替换它。",
-      "default_frontend_tip2": "WIP: 由于 Pleroma 后端没有正确列出所有已安装的前端，你必须手动输入名称和引用。下面的列表提供了填写这些值的快捷方式。",
       "available_frontends": "可供安装"
     },
     "temp_overrides": {
diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index 6d59c595..22ba1e7f 100644
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@@ -38,7 +38,7 @@ export default function createPersistedState ({
   },
   setState = (key, state, storage) => {
     if (!loaded) {
-      console.log('waiting for old state to be loaded...')
+      console.info('waiting for old state to be loaded...')
       return Promise.resolve()
     } else {
       return storage.setItem(key, state)
@@ -65,7 +65,7 @@ export default function createPersistedState ({
         }
         loaded = true
       } catch (e) {
-        console.log("Couldn't load state")
+        console.error("Couldn't load state")
         console.error(e)
         loaded = true
       }
@@ -86,8 +86,8 @@ export default function createPersistedState ({
               })
           }
         } catch (e) {
-          console.log("Couldn't persist state:")
-          console.log(e)
+          console.error("Couldn't persist state:")
+          console.error(e)
         }
       })
     }
diff --git a/src/main.js b/src/main.js
index 96b1a7c4..d350773f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,6 +6,7 @@ import './lib/event_target_polyfill.js'
 import interfaceModule from './modules/interface.js'
 import instanceModule from './modules/instance.js'
 import statusesModule from './modules/statuses.js'
+import notificationsModule from './modules/notifications.js'
 import listsModule from './modules/lists.js'
 import usersModule from './modules/users.js'
 import apiModule from './modules/api.js'
@@ -78,6 +79,7 @@ const persistedStateOptions = {
       // TODO refactor users/statuses modules, they depend on each other
       users: usersModule,
       statuses: statusesModule,
+      notifications: notificationsModule,
       lists: listsModule,
       api: apiModule,
       config: configModule,
diff --git a/src/modules/adminSettings.js b/src/modules/adminSettings.js
index cad9c0ca..ef28f6e0 100644
--- a/src/modules/adminSettings.js
+++ b/src/modules/adminSettings.js
@@ -26,6 +26,7 @@ const adminSettingsStorage = {
     },
     setAvailableFrontends (state, { frontends }) {
       state.frontends = frontends.map(f => {
+        f.installedRefs = f.installed_refs
         if (f.name === 'pleroma-fe') {
           f.refs = ['master', 'develop']
         } else {
@@ -104,7 +105,6 @@ const adminSettingsStorage = {
         }
         set(config, path, convert(c.value))
       })
-      console.log(config[':pleroma'])
       commit('updateAdminSettings', { config, modifiedPaths })
       commit('resetAdminDraft')
     },
@@ -122,7 +122,6 @@ const adminSettingsStorage = {
 
       const descriptions = {}
       backendDescriptions.forEach(d => convert(d, '', descriptions))
-      console.log(descriptions[':pleroma']['Pleroma.Captcha'])
       commit('updateAdminDescriptions', { descriptions })
     },
 
diff --git a/src/modules/config.js b/src/modules/config.js
index ad1c76b9..a0ac4312 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -40,6 +40,7 @@ export const defaultState = {
   padEmoji: true,
   hideAttachments: false,
   hideAttachmentsInConv: false,
+  hideScrobbles: false,
   maxThumbnails: 16,
   hideNsfw: true,
   preloadImage: true,
@@ -65,7 +66,20 @@ export const defaultState = {
     chatMention: true,
     polls: true
   },
+  notificationNative: {
+    follows: true,
+    mentions: true,
+    likes: false,
+    repeats: false,
+    moves: false,
+    emojiReactions: false,
+    followRequest: true,
+    reports: true,
+    chatMention: true,
+    polls: true
+  },
   webPushNotifications: false,
+  webPushAlwaysShowNotifications: false,
   muteWords: [],
   highlight: {},
   interfaceLanguage: browserLocale,
@@ -117,8 +131,16 @@ export const defaultState = {
   conversationTreeAdvanced: undefined, // instance default
   conversationOtherRepliesButton: undefined, // instance default
   conversationTreeFadeAncestors: undefined, // instance default
+  showExtraNotifications: undefined, // instance default
+  showExtraNotificationsTip: undefined, // instance default
+  showChatsInExtraNotifications: undefined, // instance default
+  showAnnouncementsInExtraNotifications: undefined, // instance default
+  showFollowRequestsInExtraNotifications: undefined, // instance default
   maxDepthInThread: undefined, // instance default
-  autocompleteSelect: undefined // instance default
+  autocompleteSelect: undefined, // instance default
+  closingDrawerMarksAsSeen: undefined, // instance default
+  unseenAtTop: undefined, // instance default
+  ignoreInactionableSeen: undefined // instance default
 }
 
 // caching the instance default properties
diff --git a/src/modules/instance.js b/src/modules/instance.js
index bb0292da..3022a41a 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -103,8 +103,16 @@ const defaultState = {
   conversationTreeAdvanced: false,
   conversationOtherRepliesButton: 'below',
   conversationTreeFadeAncestors: false,
+  showExtraNotifications: true,
+  showExtraNotificationsTip: true,
+  showChatsInExtraNotifications: true,
+  showAnnouncementsInExtraNotifications: true,
+  showFollowRequestsInExtraNotifications: true,
   maxDepthInThread: 6,
   autocompleteSelect: false,
+  closingDrawerMarksAsSeen: true,
+  unseenAtTop: false,
+  ignoreInactionableSeen: false,
 
   // Nasty stuff
   customEmoji: [],
@@ -128,6 +136,7 @@ const defaultState = {
   mediaProxyAvailable: false,
   suggestionsEnabled: false,
   suggestionsWeb: '',
+  quotingAvailable: false,
 
   // Html stuff
   instanceSpecificPanelContent: '',
diff --git a/src/modules/notifications.js b/src/modules/notifications.js
new file mode 100644
index 00000000..c1f5a63e
--- /dev/null
+++ b/src/modules/notifications.js
@@ -0,0 +1,169 @@
+import apiService from '../services/api/api.service.js'
+
+import {
+  isStatusNotification,
+  isValidNotification,
+  maybeShowNotification
+} from '../services/notification_utils/notification_utils.js'
+
+import {
+  closeDesktopNotification,
+  closeAllDesktopNotifications
+} from '../services/desktop_notification_utils/desktop_notification_utils.js'
+
+const emptyNotifications = () => ({
+  desktopNotificationSilence: true,
+  maxId: 0,
+  minId: Number.POSITIVE_INFINITY,
+  data: [],
+  idStore: {},
+  loading: false
+})
+
+export const defaultState = () => ({
+  ...emptyNotifications()
+})
+
+export const notifications = {
+  state: defaultState(),
+  mutations: {
+    addNewNotifications (state, { notifications }) {
+      notifications.forEach(notification => {
+        state.data.push(notification)
+        state.idStore[notification.id] = notification
+      })
+    },
+    clearNotifications (state) {
+      state = emptyNotifications()
+    },
+    updateNotificationsMinMaxId (state, id) {
+      state.maxId = id > state.maxId ? id : state.maxId
+      state.minId = id < state.minId ? id : state.minId
+    },
+    setNotificationsLoading (state, { value }) {
+      state.loading = value
+    },
+    setNotificationsSilence (state, { value }) {
+      state.desktopNotificationSilence = value
+    },
+    markNotificationsAsSeen (state) {
+      state.data.forEach((notification) => {
+        notification.seen = true
+      })
+    },
+    markSingleNotificationAsSeen (state, { id }) {
+      const notification = state.idStore[id]
+      if (notification) notification.seen = true
+    },
+    dismissNotification (state, { id }) {
+      state.data = state.data.filter(n => n.id !== id)
+      delete state.idStore[id]
+    },
+    updateNotification (state, { id, updater }) {
+      const notification = state.idStore[id]
+      notification && updater(notification)
+    }
+  },
+  actions: {
+    addNewNotifications (store, { notifications, older }) {
+      const { commit, dispatch, state, rootState } = store
+      const validNotifications = notifications.filter((notification) => {
+        // If invalid notification, update ids but don't add it to store
+        if (!isValidNotification(notification)) {
+          console.error('Invalid notification:', notification)
+          commit('updateNotificationsMinMaxId', notification.id)
+          return false
+        }
+        return true
+      })
+
+      const statusNotifications = validNotifications.filter(notification => isStatusNotification(notification.type) && notification.status)
+
+      // Synchronous commit to add all the statuses
+      commit('addNewStatuses', { statuses: statusNotifications.map(notification => notification.status) })
+
+      // Update references to statuses in notifications to ones in the store
+      statusNotifications.forEach(notification => {
+        const id = notification.status.id
+        const referenceStatus = rootState.statuses.allStatusesObject[id]
+
+        if (referenceStatus) {
+          notification.status = referenceStatus
+        }
+      })
+
+      validNotifications.forEach(notification => {
+        if (notification.type === 'pleroma:report') {
+          dispatch('addReport', notification.report)
+        }
+
+        if (notification.type === 'pleroma:emoji_reaction') {
+          dispatch('fetchEmojiReactionsBy', notification.status.id)
+        }
+
+        // Only add a new notification if we don't have one for the same action
+        // eslint-disable-next-line no-prototype-builtins
+        if (!state.idStore.hasOwnProperty(notification.id)) {
+          commit('updateNotificationsMinMaxId', notification.id)
+          commit('addNewNotifications', { notifications: [notification] })
+
+          maybeShowNotification(store, notification)
+        } else if (notification.seen) {
+          state.idStore[notification.id].seen = true
+        }
+      })
+    },
+    notificationClicked ({ state, dispatch }, { id }) {
+      const notification = state.idStore[id]
+      const { type, seen } = notification
+
+      if (!seen) {
+        switch (type) {
+          case 'mention':
+          case 'pleroma:report':
+          case 'follow_request':
+            break
+          default:
+            dispatch('markSingleNotificationAsSeen', { id })
+        }
+      }
+    },
+    setNotificationsLoading ({ rootState, commit }, { value }) {
+      commit('setNotificationsLoading', { value })
+    },
+    setNotificationsSilence ({ rootState, commit }, { value }) {
+      commit('setNotificationsSilence', { value })
+    },
+    markNotificationsAsSeen ({ rootState, state, commit }) {
+      commit('markNotificationsAsSeen')
+      apiService.markNotificationsAsSeen({
+        id: state.maxId,
+        credentials: rootState.users.currentUser.credentials
+      }).then(() => {
+        closeAllDesktopNotifications(rootState)
+      })
+    },
+    markSingleNotificationAsSeen ({ rootState, commit }, { id }) {
+      commit('markSingleNotificationAsSeen', { id })
+      apiService.markNotificationsAsSeen({
+        single: true,
+        id,
+        credentials: rootState.users.currentUser.credentials
+      }).then(() => {
+        closeDesktopNotification(rootState, { id })
+      })
+    },
+    dismissNotificationLocal ({ rootState, commit }, { id }) {
+      commit('dismissNotification', { id })
+    },
+    dismissNotification ({ rootState, commit }, { id }) {
+      commit('dismissNotification', { id })
+      rootState.api.backendInteractor.dismissNotification({ id })
+    },
+    updateNotification ({ rootState, commit }, { id, updater }) {
+      commit('updateNotification', { id, updater })
+    }
+  }
+}
+
+export default notifications
diff --git a/src/modules/serverSideStorage.js b/src/modules/serverSideStorage.js
index c933ce8d..c55f54fd 100644
--- a/src/modules/serverSideStorage.js
+++ b/src/modules/serverSideStorage.js
@@ -419,7 +419,6 @@ const serverSideStorage = {
   actions: {
     pushServerSideStorage ({ state, rootState, commit }, { force = false } = {}) {
       const needPush = state.dirty || force
-      console.log(needPush)
       if (!needPush) return
       commit('updateCache', { username: rootState.users.currentUser.fqn })
       const params = { pleroma_settings_store: { 'pleroma-fe': state.cache } }
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index ed21a730..462def22 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -12,11 +12,6 @@ import {
   isArray,
   omitBy
 } from 'lodash'
-import {
-  isStatusNotification,
-  isValidNotification,
-  maybeShowNotification
-} from '../services/notification_utils/notification_utils.js'
 import apiService from '../services/api/api.service.js'
 
 const emptyTl = (userId = 0) => ({
@@ -36,21 +31,12 @@ const emptyTl = (userId = 0) => ({
   flushMarker: 0
 })
 
-const emptyNotifications = () => ({
-  desktopNotificationSilence: true,
-  maxId: 0,
-  minId: Number.POSITIVE_INFINITY,
-  data: [],
-  idStore: {},
-  loading: false
-})
-
 export const defaultState = () => ({
   allStatuses: [],
+  scrobblesNextFetch: {},
   allStatusesObject: {},
   conversationsObject: {},
   maxId: 0,
-  notifications: emptyNotifications(),
   favorites: new Set(),
   timelines: {
     mentions: emptyTl(),
@@ -120,8 +106,24 @@ const sortTimeline = (timeline) => {
   return timeline
 }
 
+const getLatestScrobble = (state, user) => {
+  if (state.scrobblesNextFetch[user.id] && state.scrobblesNextFetch[user.id] > Date.now()) {
+    return
+  }
+
+  state.scrobblesNextFetch[user.id] = Date.now() + 24 * 60 * 60 * 1000
+  apiService.fetchScrobbles({ accountId: user.id }).then((scrobbles) => {
+    if (scrobbles.length > 0) {
+      user.latestScrobble = scrobbles[0]
+
+      state.scrobblesNextFetch[user.id] = Date.now() + 60 * 1000
+    }
+  })
+}
+
 // Add status to the global storages (arrays and objects maintaining statuses) except timelines
 const addStatusToGlobalStorage = (state, data) => {
+  getLatestScrobble(state, data.user)
   const result = mergeOrAdd(state.allStatuses, state.allStatusesObject, data)
   if (result.new) {
     // Add to conversation
@@ -137,22 +139,6 @@ const addStatusToGlobalStorage = (state, data) => {
   return result
 }
 
-// Remove status from the global storages (arrays and objects maintaining statuses) except timelines
-const removeStatusFromGlobalStorage = (state, status) => {
-  remove(state.allStatuses, { id: status.id })
-
-  // TODO: Need to remove from allStatusesObject?
-
-  // Remove possible notification
-  remove(state.notifications.data, ({ action: { id } }) => id === status.id)
-
-  // Remove from conversation
-  const conversationId = status.statusnet_conversation_id
-  if (state.conversationsObject[conversationId]) {
-    remove(state.conversationsObject[conversationId], { id: status.id })
-  }
-}
-
 const addNewStatuses = (state, { statuses, showImmediately = false, timeline, user = {}, noIdUpdate = false, userId, pagination = {} }) => {
   // Sanity check
   if (!isArray(statuses)) {
@@ -229,6 +215,10 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
       timelineObject.newStatusCount += 1
     }
 
+    if (status.quote) {
+      addStatus(status.quote, /* showImmediately = */ false, /* addToTimeline = */ false)
+    }
+
     return status
   }
 
@@ -282,20 +272,6 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
         favoriteStatus(favorite)
       }
     },
-    deletion: (deletion) => {
-      const uri = deletion.uri
-      const status = find(allStatuses, { uri })
-      if (!status) {
-        return
-      }
-
-      removeStatusFromGlobalStorage(state, status)
-
-      if (timeline) {
-        remove(timelineObject.statuses, { uri })
-        remove(timelineObject.visibleStatuses, { uri })
-      }
-    },
     follow: (follow) => {
       // NOOP, it is known status but we don't do anything about it for now
     },
@@ -317,52 +293,6 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   }
 }
 
-const updateNotificationsMinMaxId = (state, notification) => {
-  state.notifications.maxId = notification.id > state.notifications.maxId
-    ? notification.id
-    : state.notifications.maxId
-  state.notifications.minId = notification.id < state.notifications.minId
-    ? notification.id
-    : state.notifications.minId
-}
-
-const addNewNotifications = (state, { dispatch, notifications, older, visibleNotificationTypes, rootGetters, newNotificationSideEffects }) => {
-  each(notifications, (notification) => {
-    // If invalid notification, update ids but don't add it to store
-    if (!isValidNotification(notification)) {
-      console.error('Invalid notification:', notification)
-      updateNotificationsMinMaxId(state, notification)
-      return
-    }
-
-    if (isStatusNotification(notification.type)) {
-      notification.action = addStatusToGlobalStorage(state, notification.action).item
-      notification.status = notification.status && addStatusToGlobalStorage(state, notification.status).item
-    }
-
-    if (notification.type === 'pleroma:report') {
-      dispatch('addReport', notification.report)
-    }
-
-    if (notification.type === 'pleroma:emoji_reaction') {
-      dispatch('fetchEmojiReactionsBy', notification.status.id)
-    }
-
-    // Only add a new notification if we don't have one for the same action
-    // eslint-disable-next-line no-prototype-builtins
-    if (!state.notifications.idStore.hasOwnProperty(notification.id)) {
-      updateNotificationsMinMaxId(state, notification)
-
-      state.notifications.data.push(notification)
-      state.notifications.idStore[notification.id] = notification
-
-      newNotificationSideEffects(notification)
-    } else if (notification.seen) {
-      state.notifications.idStore[notification.id].seen = true
-    }
-  })
-}
-
 const removeStatus = (state, { timeline, userId }) => {
   const timelineObject = state.timelines[timeline]
   if (userId) {
@@ -375,7 +305,6 @@ const removeStatus = (state, { timeline, userId }) => {
 
 export const mutations = {
   addNewStatuses,
-  addNewNotifications,
   removeStatus,
   showNewStatuses (state, { timeline }) {
     const oldTimeline = (state.timelines[timeline])
@@ -397,9 +326,6 @@ export const mutations = {
     const userId = excludeUserId ? state.timelines[timeline].userId : undefined
     state.timelines[timeline] = emptyTl(userId)
   },
-  clearNotifications (state) {
-    state.notifications = emptyNotifications()
-  },
   setFavorited (state, { status, value }) {
     const newStatus = state.allStatusesObject[status.id]
 
@@ -482,31 +408,6 @@ export const mutations = {
     const newStatus = state.allStatusesObject[id]
     newStatus.nsfw = nsfw
   },
-  setNotificationsLoading (state, { value }) {
-    state.notifications.loading = value
-  },
-  setNotificationsSilence (state, { value }) {
-    state.notifications.desktopNotificationSilence = value
-  },
-  markNotificationsAsSeen (state) {
-    each(state.notifications.data, (notification) => {
-      notification.seen = true
-    })
-  },
-  markSingleNotificationAsSeen (state, { id }) {
-    const notification = find(state.notifications.data, n => n.id === id)
-    if (notification) notification.seen = true
-  },
-  dismissNotification (state, { id }) {
-    state.notifications.data = state.notifications.data.filter(n => n.id !== id)
-  },
-  dismissNotifications (state, { finder }) {
-    state.notifications.data = state.notifications.data.filter(n => finder)
-  },
-  updateNotification (state, { id, updater }) {
-    const notification = find(state.notifications.data, n => n.id === id)
-    notification && updater(notification)
-  },
   queueFlush (state, { timeline, id }) {
     state.timelines[timeline].flushMarker = id
   },
@@ -588,23 +489,9 @@ export const mutations = {
 const statuses = {
   state: defaultState(),
   actions: {
-    addNewStatuses ({ rootState, commit }, { statuses, showImmediately = false, timeline = false, noIdUpdate = false, userId, pagination }) {
+    addNewStatuses ({ rootState, commit, dispatch, state }, { statuses, showImmediately = false, timeline = false, noIdUpdate = false, userId, pagination }) {
       commit('addNewStatuses', { statuses, showImmediately, timeline, noIdUpdate, user: rootState.users.currentUser, userId, pagination })
     },
-    addNewNotifications (store, { notifications, older }) {
-      const { commit, dispatch, rootGetters } = store
-
-      const newNotificationSideEffects = (notification) => {
-        maybeShowNotification(store, notification)
-      }
-      commit('addNewNotifications', { dispatch, notifications, older, rootGetters, newNotificationSideEffects })
-    },
-    setNotificationsLoading ({ rootState, commit }, { value }) {
-      commit('setNotificationsLoading', { value })
-    },
-    setNotificationsSilence ({ rootState, commit }, { value }) {
-      commit('setNotificationsSilence', { value })
-    },
     fetchStatus ({ rootState, dispatch }, id) {
       return rootState.api.backendInteractor.fetchStatus({ id })
         .then((status) => dispatch('addNewStatuses', { statuses: [status] }))
@@ -700,31 +587,6 @@ const statuses = {
     queueFlushAll ({ rootState, commit }) {
       commit('queueFlushAll')
     },
-    markNotificationsAsSeen ({ rootState, commit }) {
-      commit('markNotificationsAsSeen')
-      apiService.markNotificationsAsSeen({
-        id: rootState.statuses.notifications.maxId,
-        credentials: rootState.users.currentUser.credentials
-      })
-    },
-    markSingleNotificationAsSeen ({ rootState, commit }, { id }) {
-      commit('markSingleNotificationAsSeen', { id })
-      apiService.markNotificationsAsSeen({
-        single: true,
-        id,
-        credentials: rootState.users.currentUser.credentials
-      })
-    },
-    dismissNotificationLocal ({ rootState, commit }, { id }) {
-      commit('dismissNotification', { id })
-    },
-    dismissNotification ({ rootState, commit }, { id }) {
-      commit('dismissNotification', { id })
-      rootState.api.backendInteractor.dismissNotification({ id })
-    },
-    updateNotification ({ rootState, commit }, { id, updater }) {
-      commit('updateNotification', { id, updater })
-    },
     fetchFavsAndRepeats ({ rootState, commit }, id) {
       Promise.all([
         rootState.api.backendInteractor.fetchFavoritedByUsers({ id }),
diff --git a/src/modules/users.js b/src/modules/users.js
index e976d875..6467d732 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -2,7 +2,7 @@ import backendInteractorService from '../services/backend_interactor_service/bac
 import { windowWidth, windowHeight } from '../services/window_utils/window_utils'
 import oauthApi from '../services/new_api/oauth.js'
 import { compact, map, each, mergeWith, last, concat, uniq, isArray } from 'lodash'
-import { registerPushNotifications, unregisterPushNotifications } from '../services/push/push.js'
+import { registerPushNotifications, unregisterPushNotifications } from '../services/sw/sw.js'
 
 // TODO: Unify with mergeOrAdd in statuses.js
 export const mergeOrAdd = (arr, obj, item) => {
@@ -498,7 +498,7 @@ const users = {
       store.commit('addNewUsers', users)
       store.commit('addNewUsers', targetUsers)
 
-      const notificationsObject = store.rootState.statuses.notifications.idStore
+      const notificationsObject = store.rootState.notifications.idStore
       const relevantNotifications = Object.entries(notificationsObject)
         .filter(([k, val]) => notificationIds.includes(k))
         .map(([k, val]) => val)
@@ -651,6 +651,12 @@ const users = {
               const response = data.error
               // Authentication failed
               commit('endLogin')
+
+              // remove authentication token on client/authentication errors
+              if ([400, 401, 403, 422].includes(response.status)) {
+                commit('clearToken')
+              }
+
               if (response.status === 401) {
                 reject(new Error('Wrong username or password'))
               } else {
@@ -661,7 +667,7 @@ const users = {
             resolve()
           })
           .catch((error) => {
-            console.log(error)
+            console.error(error)
             commit('endLogin')
             reject(new Error('Failed to connect to server, try again'))
           })
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index ac715678..bde2e163 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -107,6 +107,7 @@ const PLEROMA_ANNOUNCEMENTS_URL = '/api/v1/pleroma/admin/announcements'
 const PLEROMA_POST_ANNOUNCEMENT_URL = '/api/v1/pleroma/admin/announcements'
 const PLEROMA_EDIT_ANNOUNCEMENT_URL = id => `/api/v1/pleroma/admin/announcements/${id}`
 const PLEROMA_DELETE_ANNOUNCEMENT_URL = id => `/api/v1/pleroma/admin/announcements/${id}`
+const PLEROMA_SCROBBLES_URL = id => `/api/v1/pleroma/accounts/${id}/scrobbles`
 
 const PLEROMA_ADMIN_CONFIG_URL = '/api/pleroma/admin/config'
 const PLEROMA_ADMIN_DESCRIPTIONS_URL = '/api/pleroma/admin/config/descriptions'
@@ -670,6 +671,7 @@ const fetchTimeline = ({
   timeline,
   credentials,
   since = false,
+  minId = false,
   until = false,
   userId = false,
   listId = false,
@@ -704,6 +706,9 @@ const fetchTimeline = ({
     url = url(listId)
   }
 
+  if (minId) {
+    params.push(['min_id', minId])
+  }
   if (since) {
     params.push(['since_id', since])
   }
@@ -827,6 +832,7 @@ const postStatus = ({
   poll,
   mediaIds = [],
   inReplyToStatusId,
+  quoteId,
   contentType,
   preview,
   idempotencyKey
@@ -859,6 +865,9 @@ const postStatus = ({
   if (inReplyToStatusId) {
     form.append('in_reply_to_id', inReplyToStatusId)
   }
+  if (quoteId) {
+    form.append('quote_id', quoteId)
+  }
   if (preview) {
     form.append('preview', 'true')
   }
@@ -1761,6 +1770,23 @@ const installFrontend = ({ credentials, payload }) => {
     })
 }
 
+const fetchScrobbles = ({ accountId, limit = 1 }) => {
+  let url = PLEROMA_SCROBBLES_URL(accountId)
+  const params = [['limit', limit]]
+  const queryString = map(params, (param) => `${param[0]}=${param[1]}`).join('&')
+  url += `?${queryString}`
+  return fetch(url, {})
+    .then((response) => {
+      if (response.ok) {
+        return response.json()
+      } else {
+        return {
+          error: response
+        }
+      }
+    })
+}
+
 const apiService = {
   verifyCredentials,
   fetchTimeline,
@@ -1874,6 +1900,7 @@ const apiService = {
   postAnnouncement,
   editAnnouncement,
   deleteAnnouncement,
+  fetchScrobbles,
   adminFetchAnnouncements,
   fetchInstanceDBConfig,
   fetchInstanceConfigDescriptions,
diff --git a/src/services/desktop_notification_utils/desktop_notification_utils.js b/src/services/desktop_notification_utils/desktop_notification_utils.js
index b84a1f75..80b8c6e0 100644
--- a/src/services/desktop_notification_utils/desktop_notification_utils.js
+++ b/src/services/desktop_notification_utils/desktop_notification_utils.js
@@ -1,9 +1,38 @@
+import {
+  showDesktopNotification as swDesktopNotification,
+  closeDesktopNotification as swCloseDesktopNotification,
+  isSWSupported
+} from '../sw/sw.js'
+const state = { failCreateNotif: false }
+
 export const showDesktopNotification = (rootState, desktopNotificationOpts) => {
   if (!('Notification' in window && window.Notification.permission === 'granted')) return
-  if (rootState.statuses.notifications.desktopNotificationSilence) { return }
+  if (rootState.notifications.desktopNotificationSilence) { return }
 
-  const desktopNotification = new window.Notification(desktopNotificationOpts.title, desktopNotificationOpts)
-  // Chrome is known for not closing notifications automatically
-  // according to MDN, anyway.
-  setTimeout(desktopNotification.close.bind(desktopNotification), 5000)
+  if (isSWSupported()) {
+    swDesktopNotification(desktopNotificationOpts)
+  } else if (!state.failCreateNotif) {
+    try {
+      const desktopNotification = new window.Notification(desktopNotificationOpts.title, desktopNotificationOpts)
+      setTimeout(desktopNotification.close.bind(desktopNotification), 5000)
+    } catch {
+      state.failCreateNotif = true
+    }
+  }
+}
+
+export const closeDesktopNotification = (rootState, { id }) => {
+  if (!('Notification' in window && window.Notification.permission === 'granted')) return
+
+  if (isSWSupported()) {
+    swCloseDesktopNotification({ id })
+  }
+}
+
+export const closeAllDesktopNotifications = (rootState) => {
+  if (!('Notification' in window && window.Notification.permission === 'granted')) return
+
+  if (isSWSupported()) {
+    swCloseDesktopNotification({})
+  }
 }
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index adefc5a5..85da5223 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -325,6 +325,10 @@ export const parseStatus = (data) => {
       output.thread_muted = pleroma.thread_muted
       output.emoji_reactions = pleroma.emoji_reactions
       output.parent_visible = pleroma.parent_visible === undefined ? true : pleroma.parent_visible
+      output.quote = pleroma.quote ? parseStatus(pleroma.quote) : undefined
+      output.quote_id = pleroma.quote_id ? pleroma.quote_id : (output.quote ? output.quote.id : undefined)
+      output.quote_url = pleroma.quote_url
+      output.quote_visible = pleroma.quote_visible
     } else {
       output.text = data.content
       output.summary = data.spoiler_text
@@ -435,7 +439,6 @@ export const parseNotification = (data) => {
     output.type = mastoDict[data.type] || data.type
     output.seen = data.pleroma.is_seen
     output.status = isStatusNotification(output.type) ? parseStatus(data.status) : null
-    output.action = output.status // TODO: Refactor, this is unneeded
     output.target = output.type !== 'move'
       ? null
       : parseUser(data.target)
diff --git a/src/services/favicon_service/favicon_service.js b/src/services/favicon_service/favicon_service.js
index 7e19629d..df603bb4 100644
--- a/src/services/favicon_service/favicon_service.js
+++ b/src/services/favicon_service/favicon_service.js
@@ -55,10 +55,13 @@ const createFaviconService = () => {
     })
   }
 
+  const getOriginalFavicons = () => [...favicons]
+
   return {
     initFaviconService,
     clearFaviconBadge,
-    drawFaviconBadge
+    drawFaviconBadge,
+    getOriginalFavicons
   }
 }
 
diff --git a/src/services/file_type/file_type.service.js b/src/services/file_type/file_type.service.js
index b92c6c64..f7989ffe 100644
--- a/src/services/file_type/file_type.service.js
+++ b/src/services/file_type/file_type.service.js
@@ -26,7 +26,7 @@ export const fileType = mimetype => {
 }
 
 export const fileTypeExt = url => {
-  if (url.match(/\.(png|jpe?g|gif|webp|avif)$/)) {
+  if (url.match(/\.(a?png|jpe?g|gif|webp|avif)$/)) {
     return 'image'
   }
   if (url.match(/\.(ogv|mp4|webm|mov)$/)) {
diff --git a/src/services/html_converter/utility.service.js b/src/services/html_converter/utility.service.js
index a1301353..f8e62dfe 100644
--- a/src/services/html_converter/utility.service.js
+++ b/src/services/html_converter/utility.service.js
@@ -22,7 +22,7 @@ export const getAttrs = (tag, filter) => {
     .replace(new RegExp('^' + getTagName(tag)), '')
     .replace(/\/?$/, '')
     .trim()
-  const attrs = Array.from(innertag.matchAll(/([a-z0-9-]+)(?:=("[^"]+?"|'[^']+?'))?/gi))
+  const attrs = Array.from(innertag.matchAll(/([a-z]+[a-z0-9-]*)(?:=("[^"]+?"|'[^']+?'))?/gi))
     .map(([trash, key, value]) => [key, value])
     .map(([k, v]) => {
       if (!v) return [k, true]
diff --git a/src/services/matcher/matcher.service.js b/src/services/matcher/matcher.service.js
index b6c4e909..54f02d31 100644
--- a/src/services/matcher/matcher.service.js
+++ b/src/services/matcher/matcher.service.js
@@ -14,8 +14,11 @@ export const mentionMatchesUrl = (attention, url) => {
  * @param {string} url
  */
 export const extractTagFromUrl = (url) => {
-  const regex = /tag[s]*\/(\w+)$/g
-  const result = regex.exec(url)
+  const decoded = decodeURI(url)
+  // https://git.pleroma.social/pleroma/elixir-libraries/linkify/-/blob/master/lib/linkify/parser.ex
+  // https://www.pcre.org/original/doc/html/pcrepattern.html
+  const regex = /tag[s]*\/([\p{L}\p{N}_]*[\p{Alphabetic}_·\u{200c}][\p{L}\p{N}_·\p{M}\u{200c}]*)$/ug
+  const result = regex.exec(decoded)
   if (!result) {
     return false
   }
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index 0f8b9b02..7b705e65 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -1,28 +1,36 @@
-import { filter, sortBy, includes } from 'lodash'
 import { muteWordHits } from '../status_parser/status_parser.js'
 import { showDesktopNotification } from '../desktop_notification_utils/desktop_notification_utils.js'
 
-export const notificationsFromStore = store => store.state.statuses.notifications.data
+import FaviconService from 'src/services/favicon_service/favicon_service.js'
+
+export const ACTIONABLE_NOTIFICATION_TYPES = new Set(['mention', 'pleroma:report', 'follow_request'])
+
+let cachedBadgeUrl = null
+
+export const notificationsFromStore = store => store.state.notifications.data
 
 export const visibleTypes = store => {
-  const rootState = store.rootState || store.state
+  // When called from within a module we need rootGetters to access wider scope
+  // however when called from a component (i.e. this.$store) we already have wider scope
+  const rootGetters = store.rootGetters || store.getters
+  const { notificationVisibility } = rootGetters.mergedConfig
 
   return ([
-    rootState.config.notificationVisibility.likes && 'like',
-    rootState.config.notificationVisibility.mentions && 'mention',
-    rootState.config.notificationVisibility.repeats && 'repeat',
-    rootState.config.notificationVisibility.follows && 'follow',
-    rootState.config.notificationVisibility.followRequest && 'follow_request',
-    rootState.config.notificationVisibility.moves && 'move',
-    rootState.config.notificationVisibility.emojiReactions && 'pleroma:emoji_reaction',
-    rootState.config.notificationVisibility.reports && 'pleroma:report',
-    rootState.config.notificationVisibility.polls && 'poll'
+    notificationVisibility.likes && 'like',
+    notificationVisibility.mentions && 'mention',
+    notificationVisibility.repeats && 'repeat',
+    notificationVisibility.follows && 'follow',
+    notificationVisibility.followRequest && 'follow_request',
+    notificationVisibility.moves && 'move',
+    notificationVisibility.emojiReactions && 'pleroma:emoji_reaction',
+    notificationVisibility.reports && 'pleroma:report',
+    notificationVisibility.polls && 'poll'
   ].filter(_ => _))
 }
 
-const statusNotifications = ['like', 'mention', 'repeat', 'pleroma:emoji_reaction', 'poll']
+const statusNotifications = new Set(['like', 'mention', 'repeat', 'pleroma:emoji_reaction', 'poll'])
 
-export const isStatusNotification = (type) => includes(statusNotifications, type)
+export const isStatusNotification = (type) => statusNotifications.has(type)
 
 export const isValidNotification = (notification) => {
   if (isStatusNotification(notification.type) && !notification.status) {
@@ -49,35 +57,57 @@ const sortById = (a, b) => {
 
 const isMutedNotification = (store, notification) => {
   if (!notification.status) return
-  return notification.status.muted || muteWordHits(notification.status, store.rootGetters.mergedConfig.muteWords).length > 0
+  const rootGetters = store.rootGetters || store.getters
+  return notification.status.muted || muteWordHits(notification.status, rootGetters.mergedConfig.muteWords).length > 0
 }
 
 export const maybeShowNotification = (store, notification) => {
   const rootState = store.rootState || store.state
+  const rootGetters = store.rootGetters || store.getters
 
   if (notification.seen) return
   if (!visibleTypes(store).includes(notification.type)) return
   if (notification.type === 'mention' && isMutedNotification(store, notification)) return
 
-  const notificationObject = prepareNotificationObject(notification, store.rootGetters.i18n)
+  const notificationObject = prepareNotificationObject(notification, rootGetters.i18n)
   showDesktopNotification(rootState, notificationObject)
 }
 
 export const filteredNotificationsFromStore = (store, types) => {
   // map is just to clone the array since sort mutates it and it causes some issues
-  let sortedNotifications = notificationsFromStore(store).map(_ => _).sort(sortById)
-  sortedNotifications = sortBy(sortedNotifications, 'seen')
+  const sortedNotifications = notificationsFromStore(store).map(_ => _).sort(sortById)
+  // TODO implement sorting elsewhere and make it optional
   return sortedNotifications.filter(
     (notification) => (types || visibleTypes(store)).includes(notification.type)
   )
 }
 
-export const unseenNotificationsFromStore = store =>
-  filter(filteredNotificationsFromStore(store), ({ seen }) => !seen)
+export const unseenNotificationsFromStore = store => {
+  const rootGetters = store.rootGetters || store.getters
+  const ignoreInactionableSeen = rootGetters.mergedConfig.ignoreInactionableSeen
+
+  return filteredNotificationsFromStore(store).filter(({ seen, type }) => {
+    if (!ignoreInactionableSeen) return !seen
+    if (seen) return false
+    return ACTIONABLE_NOTIFICATION_TYPES.has(type)
+  })
+}
 
 export const prepareNotificationObject = (notification, i18n) => {
+  if (cachedBadgeUrl === null) {
+    const favicons = FaviconService.getOriginalFavicons()
+    const favicon = favicons[favicons.length - 1]
+    if (!favicon) {
+      cachedBadgeUrl = 'about:blank'
+    } else {
+      cachedBadgeUrl = favicon.favimg.src
+    }
+  }
+
   const notifObj = {
-    tag: notification.id
+    tag: notification.id,
+    type: notification.type,
+    badge: cachedBadgeUrl
   }
   const status = notification.status
   const title = notification.from_profile.name
@@ -124,3 +154,18 @@ export const prepareNotificationObject = (notification, i18n) => {
 
   return notifObj
 }
+
+export const countExtraNotifications = (store) => {
+  const rootGetters = store.rootGetters || store.getters
+  const mergedConfig = rootGetters.mergedConfig
+
+  if (!mergedConfig.showExtraNotifications) {
+    return 0
+  }
+
+  return [
+    mergedConfig.showChatsInExtraNotifications ? rootGetters.unreadChatCount : 0,
+    mergedConfig.showAnnouncementsInExtraNotifications ? rootGetters.unreadAnnouncementCount : 0,
+    mergedConfig.showFollowRequestsInExtraNotifications ? rootGetters.followRequestCount : 0
+  ].reduce((a, c) => a + c, 0)
+}
diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
index 6c247210..c91a86c8 100644
--- a/src/services/notifications_fetcher/notifications_fetcher.service.js
+++ b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -21,7 +21,7 @@ const fetchAndUpdate = ({ store, credentials, older = false, since }) => {
   const args = { credentials }
   const { getters } = store
   const rootState = store.rootState || store.state
-  const timelineData = rootState.statuses.notifications
+  const timelineData = rootState.notifications
   const hideMutedPosts = getters.mergedConfig.hideMutedPosts
 
   args.includeTypes = mastoApiNotificationTypes
@@ -49,10 +49,14 @@ const fetchAndUpdate = ({ store, credentials, older = false, since }) => {
     // The normal maxId-check does not tell if older notifications have changed
     const notifications = timelineData.data
     const readNotifsIds = notifications.filter(n => n.seen).map(n => n.id)
-    const numUnseenNotifs = notifications.length - readNotifsIds.length
-    if (numUnseenNotifs > 0 && readNotifsIds.length > 0) {
-      args.since = Math.max(...readNotifsIds)
-      fetchNotifications({ store, args, older })
+    const unreadNotifsIds = notifications.filter(n => !n.seen).map(n => n.id)
+    if (readNotifsIds.length > 0 && readNotifsIds.length > 0) {
+      const minId = Math.min(...unreadNotifsIds) // Oldest known unread notification
+      if (minId !== Infinity) {
+        args.since = false // Don't use since_id since it sorta conflicts with min_id
+        args.minId = minId - 1 // go beyond
+        fetchNotifications({ store, args, older })
+      }
     }
 
     return result
diff --git a/src/services/random_seed/random_seed.service.js b/src/services/random_seed/random_seed.service.js
new file mode 100644
index 00000000..33f92e81
--- /dev/null
+++ b/src/services/random_seed/random_seed.service.js
@@ -0,0 +1,3 @@
+const genRandomSeed = () => `${Math.random()}`.replace('.', '-')
+
+export default genRandomSeed
diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js
index 1eb10bb6..aaef5a7a 100644
--- a/src/services/status_poster/status_poster.service.js
+++ b/src/services/status_poster/status_poster.service.js
@@ -10,6 +10,7 @@ const postStatus = ({
   poll,
   media = [],
   inReplyToStatusId = undefined,
+  quoteId = undefined,
   contentType = 'text/plain',
   preview = false,
   idempotencyKey = ''
@@ -24,6 +25,7 @@ const postStatus = ({
     sensitive,
     mediaIds,
     inReplyToStatusId,
+    quoteId,
     contentType,
     poll,
     preview,
diff --git a/src/services/push/push.js b/src/services/sw/sw.js
similarity index 68%
rename from src/services/push/push.js
rename to src/services/sw/sw.js
index 1787ac36..554cc7b8 100644
--- a/src/services/push/push.js
+++ b/src/services/sw/sw.js
@@ -10,8 +10,12 @@ function urlBase64ToUint8Array (base64String) {
   return Uint8Array.from([...rawData].map((char) => char.charCodeAt(0)))
 }
 
+export function isSWSupported () {
+  return 'serviceWorker' in navigator
+}
+
 function isPushSupported () {
-  return 'serviceWorker' in navigator && 'PushManager' in window
+  return 'PushManager' in window
 }
 
 function getOrCreateServiceWorker () {
@@ -24,7 +28,7 @@ function subscribePush (registration, isEnabled, vapidPublicKey) {
   if (!vapidPublicKey) return Promise.reject(new Error('VAPID public key is not found'))
 
   const subscribeOptions = {
-    userVisibleOnly: true,
+    userVisibleOnly: false,
     applicationServerKey: urlBase64ToUint8Array(vapidPublicKey)
   }
   return registration.pushManager.subscribe(subscribeOptions)
@@ -39,7 +43,7 @@ function unsubscribePush (registration) {
 }
 
 function deleteSubscriptionFromBackEnd (token) {
-  return window.fetch('/api/v1/push/subscription/', {
+  return fetch('/api/v1/push/subscription/', {
     method: 'DELETE',
     headers: {
       'Content-Type': 'application/json',
@@ -78,6 +82,44 @@ function sendSubscriptionToBackEnd (subscription, token, notificationVisibility)
     return responseData
   })
 }
+export async function initServiceWorker (store) {
+  if (!isSWSupported()) return
+  await getOrCreateServiceWorker()
+  navigator.serviceWorker.addEventListener('message', (event) => {
+    const { dispatch } = store
+    const { type, ...rest } = event.data
+
+    switch (type) {
+      case 'notificationClicked':
+        dispatch('notificationClicked', { id: rest.id })
+    }
+  })
+}
+
+export async function showDesktopNotification (content) {
+  if (!isSWSupported) return
+  const { active: sw } = await window.navigator.serviceWorker.getRegistration()
+  if (!sw) return console.error('No serviceworker found!')
+  sw.postMessage({ type: 'desktopNotification', content })
+}
+
+export async function closeDesktopNotification ({ id }) {
+  if (!isSWSupported) return
+  const { active: sw } = await window.navigator.serviceWorker.getRegistration()
+  if (!sw) return console.error('No serviceworker found!')
+  if (id >= 0) {
+    sw.postMessage({ type: 'desktopNotificationClose', content: { id } })
+  } else {
+    sw.postMessage({ type: 'desktopNotificationClose', content: { all: true } })
+  }
+}
+
+export async function updateFocus () {
+  if (!isSWSupported) return
+  const { active: sw } = await window.navigator.serviceWorker.getRegistration()
+  if (!sw) return console.error('No serviceworker found!')
+  sw.postMessage({ type: 'updateFocus' })
+}
 
 export function registerPushNotifications (isEnabled, vapidPublicKey, token, notificationVisibility) {
   if (isPushSupported()) {
@@ -98,13 +140,8 @@ export function unregisterPushNotifications (token) {
         })
         .then(([registration, unsubResult]) => {
           if (!unsubResult) {
-            console.warn('Push subscription cancellation wasn\'t successful, killing SW anyway...')
+            console.warn('Push subscription cancellation wasn\'t successful')
           }
-          return registration.unregister().then((result) => {
-            if (!result) {
-              console.warn('Failed to kill SW')
-            }
-          })
         })
     ]).catch((e) => console.warn(`Failed to disable Web Push Notifications: ${e.message}`))
   }
diff --git a/src/sw.js b/src/sw.js
index 68818998..06d90af7 100644
--- a/src/sw.js
+++ b/src/sw.js
@@ -13,9 +13,10 @@ const i18n = createI18n({
   messages
 })
 
-function isEnabled () {
-  return localForage.getItem('vuex-lz')
-    .then(data => data.config.webPushNotifications)
+const state = {
+  lastFocused: null,
+  notificationIds: new Set(),
+  allowedNotificationTypes: null
 }
 
 function getWindowClients () {
@@ -23,17 +24,46 @@ function getWindowClients () {
     .then((clientList) => clientList.filter(({ type }) => type === 'window'))
 }
 
-const setLocale = async () => {
-  const state = await localForage.getItem('vuex-lz')
-  const locale = state.config.interfaceLanguage || 'en'
+const setSettings = async () => {
+  const vuexState = await localForage.getItem('vuex-lz')
+  const locale = vuexState.config.interfaceLanguage || 'en'
   i18n.locale = locale
+  const notificationsNativeArray = Object.entries(vuexState.config.notificationNative)
+  state.webPushAlwaysShowNotifications = vuexState.config.webPushAlwaysShowNotifications
+
+  state.allowedNotificationTypes = new Set(
+    notificationsNativeArray
+      .filter(([k, v]) => v)
+      .map(([k]) => {
+        switch (k) {
+          case 'mentions':
+            return 'mention'
+          case 'likes':
+            return 'like'
+          case 'repeats':
+            return 'repeat'
+          case 'emojiReactions':
+            return 'pleroma:emoji_reaction'
+          case 'reports':
+            return 'pleroma:report'
+          case 'followRequest':
+            return 'follow_request'
+          case 'follows':
+            return 'follow'
+          case 'polls':
+            return 'poll'
+          default:
+            return k
+        }
+      })
+  )
 }
 
-const maybeShowNotification = async (event) => {
-  const enabled = await isEnabled()
+const showPushNotification = async (event) => {
   const activeClients = await getWindowClients()
-  await setLocale()
-  if (enabled && (activeClients.length === 0)) {
+  await setSettings()
+  // Only show push notifications if all tabs/windows are closed
+  if (state.webPushAlwaysShowNotifications || activeClients.length === 0) {
     const data = event.data.json()
 
     const url = `${self.registration.scope}api/v1/notifications/${data.notification_id}`
@@ -43,13 +73,48 @@ const maybeShowNotification = async (event) => {
 
     const res = prepareNotificationObject(parsedNotification, i18n)
 
-    self.registration.showNotification(res.title, res)
+    if (state.webPushAlwaysShowNotifications || state.allowedNotificationTypes.has(parsedNotification.type)) {
+      return self.registration.showNotification(res.title, res)
+    }
   }
+  return Promise.resolve()
 }
 
 self.addEventListener('push', async (event) => {
   if (event.data) {
-    event.waitUntil(maybeShowNotification(event))
+    // Supposedly, we HAVE to return a promise inside waitUntil otherwise it will
+    // show (extra) notification that website is updated in background
+    event.waitUntil(showPushNotification(event))
+  }
+})
+
+self.addEventListener('message', async (event) => {
+  await setSettings()
+  const { type, content } = event.data
+
+  if (type === 'desktopNotification') {
+    const { title, ...rest } = content
+    const { tag, type } = rest
+    if (state.notificationIds.has(tag)) return
+    state.notificationIds.add(tag)
+    setTimeout(() => state.notificationIds.delete(tag), 10000)
+    if (state.allowedNotificationTypes.has(type)) {
+      self.registration.showNotification(title, rest)
+    }
+  }
+
+  if (type === 'desktopNotificationClose') {
+    const { id, all } = content
+    const search = all ? null : { tag: id }
+    const notifications = await self.registration.getNotifications(search)
+    notifications.forEach(n => n.close())
+  }
+
+  if (type === 'updateFocus') {
+    state.lastFocused = event.source.id
+
+    const notifications = await self.registration.getNotifications()
+    notifications.forEach(n => n.close())
   }
 })
 
@@ -59,7 +124,14 @@ self.addEventListener('notificationclick', (event) => {
   event.waitUntil(getWindowClients().then((list) => {
     for (let i = 0; i < list.length; i++) {
       const client = list[i]
-      if (client.url === '/' && 'focus' in client) { return client.focus() }
+      client.postMessage({ type: 'notificationClicked', id: event.notification.tag })
+    }
+
+    for (let i = 0; i < list.length; i++) {
+      const client = list[i]
+      if (state.lastFocused === null || client.id === state.lastFocused) {
+        if ('focus' in client) return client.focus()
+      }
     }
 
     if (clients.openWindow) return clients.openWindow('/')
diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
index a8d0e5a3..0d83a9f8 100644
--- a/test/unit/specs/modules/statuses.spec.js
+++ b/test/unit/specs/modules/statuses.spec.js
@@ -77,24 +77,6 @@ describe('Statuses module', () => {
       expect(state.timelines.public.newStatusCount).to.equal(0)
     })
 
-    it('removes statuses by tag on deletion', () => {
-      const state = defaultState()
-      const status = makeMockStatus({ id: '1' })
-      const otherStatus = makeMockStatus({ id: '3' })
-      status.uri = 'xxx'
-      const deletion = makeMockStatus({ id: '2', type: 'deletion' })
-      deletion.text = 'Dolus deleted notice {{tag:gs.smuglo.li,2016-11-18:noticeId=1038007:objectType=note}}.'
-      deletion.uri = 'xxx'
-
-      mutations.addNewStatuses(state, { statuses: [status, otherStatus], showImmediately: true, timeline: 'public' })
-      mutations.addNewStatuses(state, { statuses: [deletion], showImmediately: true, timeline: 'public' })
-
-      expect(state.allStatuses).to.eql([otherStatus])
-      expect(state.timelines.public.statuses).to.eql([otherStatus])
-      expect(state.timelines.public.visibleStatuses).to.eql([otherStatus])
-      expect(state.timelines.public.maxId).to.eql('3')
-    })
-
     it('does not update the maxId when the noIdUpdate flag is set', () => {
       const state = defaultState()
       const status = makeMockStatus({ id: '1' })
@@ -315,62 +297,4 @@ describe('Statuses module', () => {
       expect(state.timelines.user.userId).to.eql(123)
     })
   })
-
-  describe('notifications', () => {
-    it('removes a notification when the notice gets removed', () => {
-      const user = { id: '1' }
-      const state = defaultState()
-      const status = makeMockStatus({ id: '1' })
-      const otherStatus = makeMockStatus({ id: '3' })
-      const mentionedStatus = makeMockStatus({ id: '2' })
-      mentionedStatus.attentions = [user]
-      mentionedStatus.uri = 'xxx'
-      otherStatus.attentions = [user]
-
-      const deletion = makeMockStatus({ id: '4', type: 'deletion' })
-      deletion.text = 'Dolus deleted notice {{tag:gs.smuglo.li,2016-11-18:noticeId=1038007:objectType=note}}.'
-      deletion.uri = 'xxx'
-      const newNotificationSideEffects = () => {}
-      mutations.addNewStatuses(state, { statuses: [status, otherStatus], user })
-      mutations.addNewNotifications(
-        state,
-        {
-          notifications: [{
-            from_profile: { id: '2' },
-            id: '998',
-            type: 'mention',
-            status: otherStatus,
-            action: otherStatus,
-            seen: false
-          }],
-          newNotificationSideEffects
-        })
-
-      expect(state.notifications.data.length).to.eql(1)
-      mutations.addNewNotifications(
-        state,
-        {
-          notifications: [{
-            from_profile: { id: '2' },
-            id: '999',
-            type: 'mention',
-            status: mentionedStatus,
-            action: mentionedStatus,
-            seen: false
-          }],
-          newNotificationSideEffects
-        })
-
-      mutations.addNewStatuses(state, { statuses: [mentionedStatus], user })
-      expect(state.allStatuses.length).to.eql(3)
-      expect(state.notifications.data.length).to.eql(2)
-      expect(state.notifications.data[1].status).to.eql(mentionedStatus)
-      expect(state.notifications.data[1].action).to.eql(mentionedStatus)
-      expect(state.notifications.data[1].type).to.eql('mention')
-
-      mutations.addNewStatuses(state, { statuses: [deletion], user })
-      expect(state.allStatuses.length).to.eql(2)
-      expect(state.notifications.data.length).to.eql(1)
-    })
-  })
 })
diff --git a/test/unit/specs/services/matcher/matcher.spec.js b/test/unit/specs/services/matcher/matcher.spec.js
index 7a2494f0..c6e9719d 100644
--- a/test/unit/specs/services/matcher/matcher.spec.js
+++ b/test/unit/specs/services/matcher/matcher.spec.js
@@ -78,5 +78,11 @@ describe('MatcherService', () => {
 
       expect(MatcherService.extractTagFromUrl(url)).to.eql(false)
     })
+
+    it('should return tag name from non-ascii tags', () => {
+      const url = encodeURI('https://website.com/tag/喵喵喵')
+
+      expect(MatcherService.extractTagFromUrl(url)).to.eql('喵喵喵')
+    })
   })
 })
diff --git a/test/unit/specs/services/notification_utils/notification_utils.spec.js b/test/unit/specs/services/notification_utils/notification_utils.spec.js
index 00628d83..60db7380 100644
--- a/test/unit/specs/services/notification_utils/notification_utils.spec.js
+++ b/test/unit/specs/services/notification_utils/notification_utils.spec.js
@@ -5,28 +5,28 @@ describe('NotificationUtils', () => {
     it('should return sorted notifications with configured types', () => {
       const store = {
         state: {
-          statuses: {
-            notifications: {
-              data: [
-                {
-                  id: 1,
-                  action: { id: '1' },
-                  type: 'like'
-                },
-                {
-                  id: 2,
-                  action: { id: '2' },
-                  type: 'mention'
-                },
-                {
-                  id: 3,
-                  action: { id: '3' },
-                  type: 'repeat'
-                }
-              ]
-            }
-          },
-          config: {
+          notifications: {
+            data: [
+              {
+                id: 1,
+                action: { id: '1' },
+                type: 'like'
+              },
+              {
+                id: 2,
+                action: { id: '2' },
+                type: 'mention'
+              },
+              {
+                id: 3,
+                action: { id: '3' },
+                type: 'repeat'
+              }
+            ]
+          }
+        },
+        getters: {
+          mergedConfig: {
             notificationVisibility: {
               likes: true,
               repeats: true,
@@ -55,23 +55,23 @@ describe('NotificationUtils', () => {
     it('should return only notifications not marked as seen', () => {
       const store = {
         state: {
-          statuses: {
-            notifications: {
-              data: [
-                {
-                  action: { id: '1' },
-                  type: 'like',
-                  seen: false
-                },
-                {
-                  action: { id: '2' },
-                  type: 'mention',
-                  seen: true
-                }
-              ]
-            }
-          },
-          config: {
+          notifications: {
+            data: [
+              {
+                action: { id: '1' },
+                type: 'like',
+                seen: false
+              },
+              {
+                action: { id: '2' },
+                type: 'mention',
+                seen: true
+              }
+            ]
+          }
+        },
+        getters: {
+          mergedConfig: {
             notificationVisibility: {
               likes: true,
               repeats: true,
diff --git a/tools/collect-changelog b/tools/collect-changelog
new file mode 100755
index 00000000..1e12d564
--- /dev/null
+++ b/tools/collect-changelog
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+collectType() {
+    local suffix="$1"
+    local header="$2"
+    local printed=0
+    for file in changelog.d/*."$suffix"; do
+        if [ '!' -f "$file" ]; then
+            continue
+        fi
+        if [ "$printed" = 0 ]; then
+            echo
+            echo "### $header"
+            printed=1
+        fi
+        # Normalize any trailing newlines/spaces, etc.
+        echo "- $(cat "$file")"
+    done
+}
+
+collectType security Security
+collectType change Changed
+collectType add Added
+collectType fix Fixed
+collectType remove Removed
+
+rm changelog.d/*
diff --git a/yarn.lock b/yarn.lock
index fdf6634d..2febc216 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2345,10 +2345,10 @@
   dependencies:
     js-beautify "1.14.6"
 
-"@vuelidate/core@2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@vuelidate/core/-/core-2.0.2.tgz#e874afc830ccc5295e83a0c0a0f0621e084348c9"
-  integrity sha512-aG1OZWv6xVws3ljyKy/pyxq1rdZZ2ryj+FEREcC9d4GP4qOvNHHZUl/NQxa0Bck3Ooc0RfXU8vwCA9piRoWy6w==
+"@vuelidate/core@2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@vuelidate/core/-/core-2.0.3.tgz#40468c5ed15b72bde880a026b0699c2f0f1ecede"
+  integrity sha512-AN6l7KF7+mEfyWG0doT96z+47ljwPpZfi9/JrNMkOGLFv27XVZvKzRLXlmDPQjPl/wOB1GNnHuc54jlCLRNqGA==
   dependencies:
     vue-demi "^0.13.11"
 
@@ -6523,10 +6523,10 @@ min-indent@^1.0.0:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
-mini-css-extract-plugin@2.7.5:
-  version "2.7.5"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.5.tgz#afbb344977659ec0f1f6e050c7aea456b121cfc5"
-  integrity sha512-9HaR++0mlgom81s95vvNjxkg52n2b5s//3ZTI1EtzFb98awsLSivs2LMsVqnQ3ay0PVhqWcGNyDaTE961FOcjQ==
+mini-css-extract-plugin@2.7.6:
+  version "2.7.6"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz#282a3d38863fddcd2e0c220aaed5b90bc156564d"
+  integrity sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==
   dependencies:
     schema-utils "^4.0.0"
 
@@ -7141,10 +7141,10 @@ pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
 
-phoenix@1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/phoenix/-/phoenix-1.6.2.tgz#8d1d9f06e51cb893d08059e80488cd0de328e01a"
-  integrity sha512-VjR27NETvrLSj8rI6DlpVAfo7pCYth/9+1OCoTof4LKEbq0141ze/tdxFHHZzVQSok3gqJUo2h/tqbxR3r8eyw==
+phoenix@1.7.7:
+  version "1.7.7"
+  resolved "https://registry.yarnpkg.com/phoenix/-/phoenix-1.7.7.tgz#829817ea65a83ef78a3a88e3e074125f502a034f"
+  integrity sha512-moAN6e4Z16x/x1nswUpnTR2v5gm7HsI7eluZ2YnYUUsBNzi3cY/5frmiJfXIEi877IQAafzTfp8hd6vEUMme+w==
 
 picocolors@^1.0.0:
   version "1.0.0"
@@ -7622,10 +7622,10 @@ qjobs@^1.2.0:
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
   integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
 
-qrcode@1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.1.tgz#0103f97317409f7bc91772ef30793a54cd59f0cb"
-  integrity sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg==
+qrcode@1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.3.tgz#03afa80912c0dccf12bc93f615a535aad1066170"
+  integrity sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg==
   dependencies:
     dijkstrajs "^1.0.1"
     encode-utf8 "^1.0.3"