diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1eb5a9cb4..b3d38ea24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,15 +3,6 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## 2.10.1
-### Fixed
-- fixed being unable to set actor type from profile page
-- fixed error when clicking mute menu itself (instead of submenu items)
-- fixed mute -> domain status submenu not working
-
-### Internal
-- Add playwright E2E-tests with an optional docker-based backend
-
 ## 2.10.0
 ### Changed
 - Temporary changes modal now shows actual countdown instead of fixed timeout
diff --git a/biome.json b/biome.json
index 6a464a0e5..d64639d52 100644
--- a/biome.json
+++ b/biome.json
@@ -132,11 +132,7 @@
             "groups": [
               [":NODE:", ":PACKAGE:", "!src/**", "!@fortawesome/**"],
               ":BLANK_LINE:",
-              [":PATH:", "src/components/**"],
-              ":BLANK_LINE:",
-              [":PATH:", "src/stores/**"],
-              ":BLANK_LINE:",
-              [":PATH:", "src/**", "src/stores/**", "src/components/**"],
+              [":PATH:", "src/**"],
               ":BLANK_LINE:",
               "@fortawesome/fontawesome-svg-core",
               "@fortawesome/*"
diff --git a/changelog.d/actor-type.fix b/changelog.d/actor-type.fix
new file mode 100644
index 000000000..a2c873c1a
--- /dev/null
+++ b/changelog.d/actor-type.fix
@@ -0,0 +1 @@
+fixed being unable to set actor type from profile page
diff --git a/changelog.d/biome.skip b/changelog.d/biome.skip
new file mode 100644
index 000000000..e69de29bb
diff --git a/changelog.d/e2e-tests.add b/changelog.d/e2e-tests.add
new file mode 100644
index 000000000..ba62b25ac
--- /dev/null
+++ b/changelog.d/e2e-tests.add
@@ -0,0 +1 @@
+Add playwright E2E-tests with an optional docker-based backend
diff --git a/changelog.d/e2e.skip b/changelog.d/e2e.skip
new file mode 100644
index 000000000..e84c25121
--- /dev/null
+++ b/changelog.d/e2e.skip
@@ -0,0 +1 @@
+fix e2e
diff --git a/package.json b/package.json
index bdd1acfbe..b00ed545a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pleroma_fe",
-  "version": "2.10.1",
+  "version": "2.10.0",
   "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,
diff --git a/src/App.js b/src/App.js
index 916b5b33a..33645c63d 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,5 +1,4 @@
 import { throttle } from 'lodash'
-import { mapState } from 'pinia'
 import { defineAsyncComponent } from 'vue'
 import { mapGetters } from 'vuex'
 
@@ -21,10 +20,8 @@ import UserReportingModal from './components/user_reporting_modal/user_reporting
 import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_panel.vue'
 import { getOrCreateServiceWorker } from './services/sw/sw'
 import { windowHeight, windowWidth } from './services/window_utils/window_utils'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-import { useShoutStore } from 'src/stores/shout.js'
+import { useInterfaceStore } from './stores/interface'
+import { useShoutStore } from './stores/shout'
 
 export default {
   name: 'app',
@@ -94,9 +91,12 @@ export default {
     this.scrollParent.removeEventListener('scroll', this.updateScrollState)
   },
   computed: {
+    themeApplied() {
+      return useInterfaceStore().themeApplied
+    },
     currentTheme() {
-      if (this.styleDataUsed) {
-        const styleMeta = this.styleDataUsed.find(
+      if (useInterfaceStore().styleDataUsed) {
+        const styleMeta = useInterfaceStore().styleDataUsed.find(
           (x) => x.component === '@meta',
         )
 
@@ -134,7 +134,9 @@ export default {
       return this.currentUser.background_image
     },
     instanceBackground() {
-      return this.mergedConfig.hideInstanceWallpaper ? null : this.background
+      return this.mergedConfig.hideInstanceWallpaper
+        ? null
+        : this.$store.state.instance.background
     },
     background() {
       return this.userBackground || this.instanceBackground
@@ -149,11 +151,14 @@ export default {
     shout() {
       return useShoutStore().joined
     },
+    suggestionsEnabled() {
+      return this.$store.state.instance.suggestionsEnabled
+    },
     showInstanceSpecificPanel() {
       return (
-        this.showInstanceSpecificPanel &&
+        this.$store.state.instance.showInstanceSpecificPanel &&
         !this.$store.getters.mergedConfig.hideISP &&
-        this.instanceSpecificPanelContent
+        this.$store.state.instance.instanceSpecificPanelContent
       )
     },
     isChats() {
@@ -170,12 +175,24 @@ export default {
         this.layoutType === 'mobile'
       )
     },
+    showFeaturesPanel() {
+      return this.$store.state.instance.showFeaturesPanel
+    },
+    editingAvailable() {
+      return this.$store.state.instance.editingAvailable
+    },
     shoutboxPosition() {
       return this.$store.getters.mergedConfig.alwaysShowNewPostButton || false
     },
     hideShoutbox() {
       return this.$store.getters.mergedConfig.hideShoutbox
     },
+    layoutType() {
+      return useInterfaceStore().layoutType
+    },
+    privateMode() {
+      return this.$store.state.instance.private
+    },
     reverseLayout() {
       const { thirdColumnMode, sidebarRight: reverseSetting } =
         this.$store.getters.mergedConfig
@@ -197,22 +214,6 @@ export default {
       return window /* this.$refs.appContentRef */
     },
     ...mapGetters(['mergedConfig']),
-    ...mapState(useInterfaceStore, [
-      'themeApplied',
-      'styleDataUsed',
-      'layoutType',
-    ]),
-    ...mapState(useInstanceStore, ['styleDataUsed', 'private']),
-    ...mapState(useInstanceStore, {
-      background: (store) => store.instanceIdentity.background,
-      showFeaturesPanel: (store) => store.instanceIdentity.showFeaturesPanel,
-      showInstanceSpecificPanel: (store) =>
-        store.instanceIdentity.showInstanceSpecificPanel,
-      suggestionsEnabled: (store) => store.featureSet.suggestionsEnabled,
-      editingAvailable: (store) => store.featureSet.editingAvailable,
-      instanceSpecificPanelContent: (store) =>
-        store.instanceIdentity.instanceSpecificPanelContent,
-    }),
   },
   methods: {
     resizeHandler() {
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index a970d25cc..1a2be5bd7 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -14,6 +14,16 @@ import {
 
 config.autoAddCss = false
 
+import VBodyScrollLock from 'src/directives/body_scroll_lock'
+import {
+  instanceDefaultConfig,
+  staticOrApiConfigDefault,
+} from 'src/modules/default_config_state.js'
+import { useAnnouncementsStore } from 'src/stores/announcements'
+import { useAuthFlowStore } from 'src/stores/auth_flow'
+import { useI18nStore } from 'src/stores/i18n'
+import { useInterfaceStore } from 'src/stores/interface'
+import { useOAuthStore } from 'src/stores/oauth'
 import App from '../App.vue'
 import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
 import FaviconService from '../services/favicon_service/favicon_service.js'
@@ -25,20 +35,6 @@ import {
 } from '../services/window_utils/window_utils'
 import routes from './routes'
 
-import { useAnnouncementsStore } from 'src/stores/announcements'
-import { useAuthFlowStore } from 'src/stores/auth_flow'
-import { useEmojiStore } from 'src/stores/emoji.js'
-import { useI18nStore } from 'src/stores/i18n'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-import { useOAuthStore } from 'src/stores/oauth'
-
-import VBodyScrollLock from 'src/directives/body_scroll_lock'
-import {
-  instanceDefaultConfig,
-  staticOrApiConfigDefault,
-} from 'src/modules/default_config_state.js'
-
 let staticInitialResults = null
 
 const parsedInitialResults = () => {
@@ -82,29 +78,29 @@ const getInstanceConfig = async ({ store }) => {
       const textlimit = data.max_toot_chars
       const vapidPublicKey = data.pleroma.vapid_public_key
 
-      useInstanceStore().set({
-        name: 'featureSet.pleromaExtensionsAvailable',
+      store.dispatch('setInstanceOption', {
+        name: 'pleromaExtensionsAvailable',
         value: data.pleroma,
       })
-      useInstanceStore().set({
+      store.dispatch('setInstanceOption', {
         name: 'textlimit',
         value: textlimit,
       })
-      useInstanceStore().set({
+      store.dispatch('setInstanceOption', {
         name: 'accountApprovalRequired',
         value: data.approval_required,
       })
-      useInstanceStore().set({
+      store.dispatch('setInstanceOption', {
         name: 'birthdayRequired',
         value: !!data.pleroma?.metadata.birthday_required,
       })
-      useInstanceStore().set({
+      store.dispatch('setInstanceOption', {
         name: 'birthdayMinAge',
         value: data.pleroma?.metadata.birthday_min_age || 0,
       })
 
       if (vapidPublicKey) {
-        useInstanceStore().set({
+        store.dispatch('setInstanceOption', {
           name: 'vapidPublicKey',
           value: vapidPublicKey,
         })
@@ -165,18 +161,14 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
     config = Object.assign({}, staticConfig, apiConfig)
   }
 
-  const copyInstanceOption = ({ source, destination }) => {
-    if (typeof config[source] !== 'undefined') {
-      useInstanceStore().set({ path: destination, value: config[source] })
+  const copyInstanceOption = (name) => {
+    if (typeof config[name] !== 'undefined') {
+      store.dispatch('setInstanceOption', { name, value: config[name] })
     }
   }
 
-  Object.keys(staticOrApiConfigDefault)
-    .map((k) => ({ source: k, destination: `instanceIdentity.${k}` }))
-    .forEach(copyInstanceOption)
-  Object.keys(instanceDefaultConfig)
-    .map((k) => ({ source: k, destination: `prefsStorage.${k}` }))
-    .forEach(copyInstanceOption)
+  Object.keys(staticOrApiConfigDefault).forEach(copyInstanceOption)
+  Object.keys(instanceDefaultConfig).forEach(copyInstanceOption)
 
   useAuthFlowStore().setInitialStrategy(config.loginMethod)
 }
@@ -186,7 +178,7 @@ const getTOS = async ({ store }) => {
     const res = await window.fetch('/static/terms-of-service.html')
     if (res.ok) {
       const html = await res.text()
-      useInstanceStore().set({ name: 'instanceIdentity.tos', value: html })
+      store.dispatch('setInstanceOption', { name: 'tos', value: html })
     } else {
       throw res
     }
@@ -200,8 +192,8 @@ const getInstancePanel = async ({ store }) => {
     const res = await preloadFetch('/instance/panel.html')
     if (res.ok) {
       const html = await res.text()
-      useInstanceStore().set({
-        name: 'instanceIdentity.instanceSpecificPanelContent',
+      store.dispatch('setInstanceOption', {
+        name: 'instanceSpecificPanelContent',
         value: html,
       })
     } else {
@@ -235,7 +227,7 @@ const getStickers = async ({ store }) => {
       ).sort((a, b) => {
         return a.meta.title.localeCompare(b.meta.title)
       })
-      useEmojiStore().setStickers(stickers)
+      store.dispatch('setInstanceOption', { name: 'stickers', value: stickers })
     } else {
       throw res
     }
@@ -256,7 +248,7 @@ const getAppSecret = async ({ store }) => {
 
 const resolveStaffAccounts = ({ store, accounts }) => {
   const nicknames = accounts.map((uri) => uri.split('/').pop())
-  useInstanceStore().set({
+  store.dispatch('setInstanceOption', {
     name: 'staffAccounts',
     value: nicknames,
   })
@@ -270,163 +262,159 @@ const getNodeInfo = async ({ store }) => {
       const data = await res.json()
       const metadata = data.metadata
       const features = metadata.features
-      useInstanceStore().set({
-        path: 'name',
+      store.dispatch('setInstanceOption', {
+        name: 'name',
         value: metadata.nodeName,
       })
-      useInstanceStore().set({
-        path: 'registrationOpen',
+      store.dispatch('setInstanceOption', {
+        name: 'registrationOpen',
         value: data.openRegistrations,
       })
-      useInstanceStore().set({
-        path: 'featureSet.mediaProxyAvailable',
+      store.dispatch('setInstanceOption', {
+        name: 'mediaProxyAvailable',
         value: features.includes('media_proxy'),
       })
-      useInstanceStore().set({
-        path: 'featureSet.safeDM',
+      store.dispatch('setInstanceOption', {
+        name: 'safeDM',
         value: features.includes('safe_dm_mentions'),
       })
-      useInstanceStore().set({
-        path: 'featureSet.shoutAvailable',
+      store.dispatch('setInstanceOption', {
+        name: 'shoutAvailable',
         value: features.includes('chat'),
       })
-      useInstanceStore().set({
-        path: 'featureSet.pleromaChatMessagesAvailable',
+      store.dispatch('setInstanceOption', {
+        name: 'pleromaChatMessagesAvailable',
         value: features.includes('pleroma_chat_messages'),
       })
-      useInstanceStore().set({
-        path: 'featureSet.pleromaCustomEmojiReactionsAvailable',
+      store.dispatch('setInstanceOption', {
+        name: 'pleromaCustomEmojiReactionsAvailable',
         value:
           features.includes('pleroma_custom_emoji_reactions') ||
           features.includes('custom_emoji_reactions'),
       })
-      useInstanceStore().set({
-        path: 'featureSet.pleromaBookmarkFoldersAvailable',
+      store.dispatch('setInstanceOption', {
+        name: 'pleromaBookmarkFoldersAvailable',
         value: features.includes('pleroma:bookmark_folders'),
       })
-      useInstanceStore().set({
-        path: 'featureSet.gopherAvailable',
+      store.dispatch('setInstanceOption', {
+        name: 'gopherAvailable',
         value: features.includes('gopher'),
       })
-      useInstanceStore().set({
-        path: 'featureSet.pollsAvailable',
+      store.dispatch('setInstanceOption', {
+        name: 'pollsAvailable',
         value: features.includes('polls'),
       })
-      useInstanceStore().set({
-        path: 'featureSet.editingAvailable',
+      store.dispatch('setInstanceOption', {
+        name: 'editingAvailable',
         value: features.includes('editing'),
       })
-      useInstanceStore().set({
-        path: 'featureSet.mailerEnabled',
-        value: metadata.mailerEnabled,
-      })
-      useInstanceStore().set({
-        path: 'featureSet.quotingAvailable',
-        value: features.includes('quote_posting'),
-      })
-      useInstanceStore().set({
-        path: 'featureSet.groupActorAvailable',
-        value: features.includes('pleroma:group_actors'),
-      })
-      useInstanceStore().set({
-        path: 'featureSet.blockExpiration',
-        value: features.includes('pleroma:block_expiration'),
-      })
-      useInstanceStore().set({
-        path: 'localBubbleInstances',
-        value: metadata.localBubbleInstances ?? [],
-      })
-      useInstanceStore().set({
-        path: 'featureSet.localBubble',
-        value: (metadata.localBubbleInstances ?? []).length > 0,
-      })
-
-      useInstanceStore().set({
-        path: 'limits.pollLimits',
+      store.dispatch('setInstanceOption', {
+        name: 'pollLimits',
         value: metadata.pollLimits,
       })
+      store.dispatch('setInstanceOption', {
+        name: 'mailerEnabled',
+        value: metadata.mailerEnabled,
+      })
+      store.dispatch('setInstanceOption', {
+        name: 'quotingAvailable',
+        value: features.includes('quote_posting'),
+      })
+      store.dispatch('setInstanceOption', {
+        name: 'groupActorAvailable',
+        value: features.includes('pleroma:group_actors'),
+      })
+      store.dispatch('setInstanceOption', {
+        name: 'blockExpiration',
+        value: features.includes('pleroma:block_expiration'),
+      })
+      store.dispatch('setInstanceOption', {
+        name: 'localBubbleInstances',
+        value: metadata.localBubbleInstances ?? [],
+      })
+
       const uploadLimits = metadata.uploadLimits
-      useInstanceStore().set({
-        name: 'limits.uploadlimit',
+      store.dispatch('setInstanceOption', {
+        name: 'uploadlimit',
         value: parseInt(uploadLimits.general),
       })
-      useInstanceStore().set({
-        name: 'limits.avatarlimit',
+      store.dispatch('setInstanceOption', {
+        name: 'avatarlimit',
         value: parseInt(uploadLimits.avatar),
       })
-      useInstanceStore().set({
-        name: 'limits.backgroundlimit',
+      store.dispatch('setInstanceOption', {
+        name: 'backgroundlimit',
         value: parseInt(uploadLimits.background),
       })
-      useInstanceStore().set({
-        name: 'limits.bannerlimit',
+      store.dispatch('setInstanceOption', {
+        name: 'bannerlimit',
         value: parseInt(uploadLimits.banner),
       })
-      useInstanceStore().set({
-        name: 'limits.fieldsLimits',
+      store.dispatch('setInstanceOption', {
+        name: 'fieldsLimits',
         value: metadata.fieldsLimits,
       })
 
-      useInstanceStore().set({
+      store.dispatch('setInstanceOption', {
         name: 'restrictedNicknames',
         value: metadata.restrictedNicknames,
       })
-      useInstanceStore().set({
-        name: 'featureSet.postFormats',
+      store.dispatch('setInstanceOption', {
+        name: 'postFormats',
         value: metadata.postFormats,
       })
 
       const suggestions = metadata.suggestions
-      useInstanceStore().set({
-        name: 'featureSet.suggestionsEnabled',
+      store.dispatch('setInstanceOption', {
+        name: 'suggestionsEnabled',
         value: suggestions.enabled,
       })
-      useInstanceStore().set({
-        name: 'featureSet.suggestionsWeb',
+      store.dispatch('setInstanceOption', {
+        name: 'suggestionsWeb',
         value: suggestions.web,
       })
 
       const software = data.software
-      useInstanceStore().set({
+      store.dispatch('setInstanceOption', {
         name: 'backendVersion',
         value: software.version,
       })
-      useInstanceStore().set({
+      store.dispatch('setInstanceOption', {
         name: 'backendRepository',
         value: software.repository,
       })
 
       const priv = metadata.private
-      useInstanceStore().set({ name: 'private', value: priv })
+      store.dispatch('setInstanceOption', { name: 'private', value: priv })
 
       const frontendVersion = window.___pleromafe_commit_hash
-      useInstanceStore().set({
+      store.dispatch('setInstanceOption', {
         name: 'frontendVersion',
         value: frontendVersion,
       })
 
       const federation = metadata.federation
 
-      useInstanceStore().set({
-        name: 'featureSet.tagPolicyAvailable',
+      store.dispatch('setInstanceOption', {
+        name: 'tagPolicyAvailable',
         value:
           typeof federation.mrf_policies === 'undefined'
             ? false
             : metadata.federation.mrf_policies.includes('TagPolicy'),
       })
 
-      useInstanceStore().set({
+      store.dispatch('setInstanceOption', {
         name: 'federationPolicy',
         value: federation,
       })
-      useInstanceStore().set({
+      store.dispatch('setInstanceOption', {
         name: 'federating',
         value:
           typeof federation.enabled === 'undefined' ? true : federation.enabled,
       })
 
       const accountActivationRequired = metadata.accountActivationRequired
-      useInstanceStore().set({
+      store.dispatch('setInstanceOption', {
         name: 'accountActivationRequired',
         value: accountActivationRequired,
       })
@@ -538,7 +526,7 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => {
     typeof overrides.target !== 'undefined'
       ? overrides.target
       : window.location.origin
-  useInstanceStore().set({ name: 'server', value: server })
+  store.dispatch('setInstanceOption', { name: 'server', value: server })
 
   await setConfig({ store })
   try {
diff --git a/src/boot/routes.js b/src/boot/routes.js
index c5876a3d4..3296755a1 100644
--- a/src/boot/routes.js
+++ b/src/boot/routes.js
@@ -32,16 +32,12 @@ import BookmarkFolderEdit from '../components/bookmark_folder_edit/bookmark_fold
 import BookmarkFolders from '../components/bookmark_folders/bookmark_folders.vue'
 import QuotesTimeline from '../components/quotes_timeline/quotes_timeline.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-
 export default (store) => {
   const validateAuthenticatedRoute = (to, from, next) => {
     if (store.state.users.currentUser) {
       next()
     } else {
-      next(
-        useInstanceStore().instanceIdentity.redirectRootNoLogin || '/main/all',
-      )
+      next(store.state.instance.redirectRootNoLogin || '/main/all')
     }
   }
 
@@ -52,9 +48,8 @@ export default (store) => {
       redirect: () => {
         return (
           (store.state.users.currentUser
-            ? useInstanceStore().instanceIdentity.redirectRootLogin
-            : useInstanceStore().instanceIdentity.redirectRootNoLogin) ||
-          '/main/all'
+            ? store.state.instance.redirectRootLogin
+            : store.state.instance.redirectRootNoLogin) || '/main/all'
         )
       },
     },
@@ -205,7 +200,7 @@ export default (store) => {
     },
   ]
 
-  if (useInstanceStore().featureSet.pleromaChatMessagesAvailable) {
+  if (store.state.instance.pleromaChatMessagesAvailable) {
     routes = routes.concat([
       {
         name: 'chat',
diff --git a/src/components/about/about.js b/src/components/about/about.js
index f52d5c797..d091dfd0a 100644
--- a/src/components/about/about.js
+++ b/src/components/about/about.js
@@ -4,8 +4,6 @@ import MRFTransparencyPanel from '../mrf_transparency_panel/mrf_transparency_pan
 import StaffPanel from '../staff_panel/staff_panel.vue'
 import TermsOfServicePanel from '../terms_of_service_panel/terms_of_service_panel.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-
 const About = {
   components: {
     InstanceSpecificPanel,
@@ -16,13 +14,13 @@ const About = {
   },
   computed: {
     showFeaturesPanel() {
-      return useInstanceStore().instanceIdentity.showFeaturesPanel
+      return this.$store.state.instance.showFeaturesPanel
     },
     showInstanceSpecificPanel() {
       return (
-        useInstanceStore().instanceIdentity.showInstanceSpecificPanel &&
+        this.$store.state.instance.showInstanceSpecificPanel &&
         !this.$store.getters.mergedConfig.hideISP &&
-        useInstanceStore().instanceIdentity.instanceSpecificPanelContent
+        this.$store.state.instance.instanceSpecificPanelContent
       )
     },
   },
diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js
index 1910d3544..ee94dc544 100644
--- a/src/components/account_actions/account_actions.js
+++ b/src/components/account_actions/account_actions.js
@@ -1,14 +1,12 @@
-import { mapState } from 'pinia'
+import { mapState } from 'vuex'
 
 import UserListMenu from 'src/components/user_list_menu/user_list_menu.vue'
 import UserTimedFilterModal from 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue'
+import { useReportsStore } from 'src/stores/reports'
 import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import Popover from '../popover/popover.vue'
 import ProgressButton from '../progress_button/progress_button.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useReportsStore } from 'src/stores/reports'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faEllipsisV } from '@fortawesome/free-solid-svg-icons'
 
@@ -94,10 +92,10 @@ const AccountActions = {
     shouldConfirmRemoveUserFromFollowers() {
       return this.$store.getters.mergedConfig.modalOnRemoveUserFromFollowers
     },
-    ...mapState(useInstanceStore, {
-      blockExpirationSupported: (store) => store.featureSet.blockExpiration,
-      pleromaChatMessagesAvailable: (store) =>
-        store.featureSet.pleromaChatMessagesAvailable,
+    ...mapState({
+      blockExpirationSupported: (state) => state.instance.blockExpiration,
+      pleromaChatMessagesAvailable: (state) =>
+        state.instance.pleromaChatMessagesAvailable,
     }),
   },
 }
diff --git a/src/components/announcement/announcement.js b/src/components/announcement/announcement.js
index 13d55c159..906b84ce2 100644
--- a/src/components/announcement/announcement.js
+++ b/src/components/announcement/announcement.js
@@ -1,11 +1,10 @@
 import { mapState } from 'vuex'
 
+import { useAnnouncementsStore } from 'src/stores/announcements'
 import localeService from '../../services/locale/locale.service.js'
 import AnnouncementEditor from '../announcement_editor/announcement_editor.vue'
 import RichContent from '../rich_content/rich_content.jsx'
 
-import { useAnnouncementsStore } from 'src/stores/announcements.js'
-
 const Announcement = {
   components: {
     AnnouncementEditor,
diff --git a/src/components/announcements_page/announcements_page.js b/src/components/announcements_page/announcements_page.js
index b8b1f000a..0c4383d2e 100644
--- a/src/components/announcements_page/announcements_page.js
+++ b/src/components/announcements_page/announcements_page.js
@@ -1,10 +1,9 @@
 import { mapState } from 'vuex'
 
+import { useAnnouncementsStore } from 'src/stores/announcements'
 import Announcement from '../announcement/announcement.vue'
 import AnnouncementEditor from '../announcement_editor/announcement_editor.vue'
 
-import { useAnnouncementsStore } from 'src/stores/announcements.js'
-
 const AnnouncementsPage = {
   components: {
     Announcement,
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index d1884ba5c..31fceba60 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -1,14 +1,12 @@
 import { mapGetters } from 'vuex'
 
+import { useMediaViewerStore } from 'src/stores/media_viewer'
 import nsfwImage from '../../assets/nsfw.png'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import Flash from '../flash/flash.vue'
 import StillImage from '../still-image/still-image.vue'
 import VideoAttachment from '../video_attachment/video_attachment.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useMediaViewerStore } from 'src/stores/media_viewer'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faAlignRight,
@@ -55,8 +53,7 @@ const Attachment = {
   data() {
     return {
       localDescription: this.description || this.attachment.description,
-      nsfwImage:
-        useInstanceStore().instanceIdentity.nsfwCensorImage || nsfwImage,
+      nsfwImage: this.$store.state.instance.nsfwCensorImage || nsfwImage,
       hideNsfwLocal: this.$store.getters.mergedConfig.hideNsfw,
       preloadImage: this.$store.getters.mergedConfig.preloadImage,
       loading: false,
@@ -107,9 +104,7 @@ const Attachment = {
       return 'file'
     },
     referrerpolicy() {
-      return useInstanceStore().featureSet.mediaProxyAvailable
-        ? ''
-        : 'no-referrer'
+      return this.$store.state.instance.mediaProxyAvailable ? '' : 'no-referrer'
     },
     type() {
       return fileTypeService.fileType(this.attachment.mimetype)
diff --git a/src/components/auth_form/auth_form.js b/src/components/auth_form/auth_form.js
index 9e05095ca..ce88aa6f9 100644
--- a/src/components/auth_form/auth_form.js
+++ b/src/components/auth_form/auth_form.js
@@ -1,12 +1,11 @@
 import { mapState } from 'pinia'
 import { h, resolveComponent } from 'vue'
 
+import { useAuthFlowStore } from 'src/stores/auth_flow'
 import LoginForm from '../login_form/login_form.vue'
 import MFARecoveryForm from '../mfa_form/recovery_form.vue'
 import MFATOTPForm from '../mfa_form/totp_form.vue'
 
-import { useAuthFlowStore } from 'src/stores/auth_flow.js'
-
 const AuthForm = {
   name: 'AuthForm',
   render() {
diff --git a/src/components/avatar_list/avatar_list.js b/src/components/avatar_list/avatar_list.js
index 830b64219..aad157686 100644
--- a/src/components/avatar_list/avatar_list.js
+++ b/src/components/avatar_list/avatar_list.js
@@ -1,8 +1,5 @@
-import UserAvatar from '../user_avatar/user_avatar.vue'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+import UserAvatar from '../user_avatar/user_avatar.vue'
 
 const AvatarList = {
   props: ['users'],
@@ -19,7 +16,7 @@ const AvatarList = {
       return generateProfileLink(
         user.id,
         user.screen_name,
-        useInstanceStore().restrictedNicknames,
+        this.$store.state.instance.restrictedNicknames,
       )
     },
   },
diff --git a/src/components/basic_user_card/basic_user_card.js b/src/components/basic_user_card/basic_user_card.js
index 0e45b140a..cc4cbce44 100644
--- a/src/components/basic_user_card/basic_user_card.js
+++ b/src/components/basic_user_card/basic_user_card.js
@@ -1,12 +1,9 @@
 import RichContent from 'src/components/rich_content/rich_content.jsx'
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import UserLink from '../user_link/user_link.vue'
 import UserPopover from '../user_popover/user_popover.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
-
 const BasicUserCard = {
   props: ['user'],
   components: {
@@ -20,7 +17,7 @@ const BasicUserCard = {
       return generateProfileLink(
         user.id,
         user.screen_name,
-        useInstanceStore().restrictedNicknames,
+        this.$store.state.instance.restrictedNicknames,
       )
     },
   },
diff --git a/src/components/block_card/block_card.js b/src/components/block_card/block_card.js
index 8101394dd..7301bf0c7 100644
--- a/src/components/block_card/block_card.js
+++ b/src/components/block_card/block_card.js
@@ -1,9 +1,7 @@
-import { mapState } from 'pinia'
+import { mapState } from 'vuex'
 
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-
 const BlockCard = {
   props: ['userId'],
   computed: {
@@ -26,8 +24,8 @@ const BlockCard = {
             new Date(this.user.mute_expires_at).toLocaleString(),
           ])
     },
-    ...mapState(useInstanceStore, {
-      blockExpirationSupported: (store) => store.featureSet.blockExpiration,
+    ...mapState({
+      blockExpirationSupported: (state) => state.instance.blockExpiration,
     }),
   },
   components: {
diff --git a/src/components/bookmark_folder_edit/bookmark_folder_edit.js b/src/components/bookmark_folder_edit/bookmark_folder_edit.js
index a036895bf..a658a0f40 100644
--- a/src/components/bookmark_folder_edit/bookmark_folder_edit.js
+++ b/src/components/bookmark_folder_edit/bookmark_folder_edit.js
@@ -1,9 +1,8 @@
+import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders'
+import { useInterfaceStore } from 'src/stores/interface'
 import apiService from '../../services/api/api.service'
 import EmojiPicker from '../emoji_picker/emoji_picker.vue'
 
-import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-
 const BookmarkFolderEdit = {
   data() {
     return {
diff --git a/src/components/bookmark_folders/bookmark_folders.js b/src/components/bookmark_folders/bookmark_folders.js
index 1147fd3a5..8e09abb31 100644
--- a/src/components/bookmark_folders/bookmark_folders.js
+++ b/src/components/bookmark_folders/bookmark_folders.js
@@ -1,7 +1,6 @@
+import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders'
 import BookmarkFolderCard from '../bookmark_folder_card/bookmark_folder_card.vue'
 
-import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
-
 const BookmarkFolders = {
   data() {
     return {
diff --git a/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js b/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js
index be1fb06ea..e84b3bc85 100644
--- a/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js
+++ b/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js
@@ -2,8 +2,7 @@ import { mapState } from 'pinia'
 
 import { getBookmarkFolderEntries } from 'src/components/navigation/filter.js'
 import NavigationEntry from 'src/components/navigation/navigation_entry.vue'
-
-import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
+import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders'
 
 export const BookmarkFoldersMenuContent = {
   props: ['showPin'],
diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js
index caeb2aea7..6dd69ada4 100644
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@@ -2,6 +2,7 @@ import _ from 'lodash'
 import { mapState as mapPiniaState } from 'pinia'
 import { mapGetters, mapState } from 'vuex'
 
+import { useInterfaceStore } from 'src/stores/interface.js'
 import { WSConnectionStatus } from '../../services/api/api.service.js'
 import chatService from '../../services/chat_service/chat_service.js'
 import { buildFakeMessage } from '../../services/chat_utils/chat_utils.js'
@@ -16,8 +17,6 @@ import {
   isScrollable,
 } from './chat_layout_utils.js'
 
-import { useInterfaceStore } from 'src/stores/interface.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronDown, faChevronLeft } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/chat_list_item/chat_list_item.js b/src/components/chat_list_item/chat_list_item.js
index 4f4ea4955..0923a8568 100644
--- a/src/components/chat_list_item/chat_list_item.js
+++ b/src/components/chat_list_item/chat_list_item.js
@@ -1,13 +1,12 @@
 import { mapState } from 'vuex'
 
+import fileType from 'src/services/file_type/file_type.service'
 import AvatarList from '../avatar_list/avatar_list.vue'
 import ChatTitle from '../chat_title/chat_title.vue'
 import StatusBody from '../status_content/status_content.vue'
 import Timeago from '../timeago/timeago.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 
-import fileType from 'src/services/file_type/file_type.service'
-
 const ChatListItem = {
   name: 'ChatListItem',
   props: ['chat'],
diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js
index af3701ebf..f3cc495c2 100644
--- a/src/components/chat_message/chat_message.js
+++ b/src/components/chat_message/chat_message.js
@@ -2,6 +2,7 @@ import { mapState as mapPiniaState } from 'pinia'
 import { defineAsyncComponent } from 'vue'
 import { mapGetters, mapState } from 'vuex'
 
+import { useInterfaceStore } from 'src/stores/interface'
 import Attachment from '../attachment/attachment.vue'
 import ChatMessageDate from '../chat_message_date/chat_message_date.vue'
 import Gallery from '../gallery/gallery.vue'
@@ -10,9 +11,6 @@ import Popover from '../popover/popover.vue'
 import StatusContent from '../status_content/status_content.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faEllipsisH, faTimes } from '@fortawesome/free-solid-svg-icons'
 
@@ -76,7 +74,7 @@ const ChatMessage = {
     }),
     ...mapState({
       currentUser: (state) => state.users.currentUser,
-      restrictedNicknames: (state) => useInstanceStore().restrictedNicknames,
+      restrictedNicknames: (state) => state.instance.restrictedNicknames,
     }),
     popoverMarginStyle() {
       if (this.isCurrentUser) {
diff --git a/src/components/component_preview/component_preview.js b/src/components/component_preview/component_preview.js
index 1d54f58de..70696f56b 100644
--- a/src/components/component_preview/component_preview.js
+++ b/src/components/component_preview/component_preview.js
@@ -1,6 +1,5 @@
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import ColorInput from 'src/components/color_input/color_input.vue'
-
 import genRandomSeed from 'src/services/random_seed/random_seed.service.js'
 import {
   adoptStyleSheets,
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index cb7cf4782..3caf4add7 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -2,14 +2,13 @@ import { clone, filter, findIndex, get, reduce } from 'lodash'
 import { mapState as mapPiniaState } from 'pinia'
 import { mapGetters, mapState } from 'vuex'
 
+import { useInterfaceStore } from 'src/stores/interface'
 import { WSConnectionStatus } from '../../services/api/api.service.js'
 import QuickFilterSettings from '../quick_filter_settings/quick_filter_settings.vue'
 import QuickViewSettings from '../quick_view_settings/quick_view_settings.vue'
 import Status from '../status/status.vue'
 import ThreadTree from '../thread_tree/thread_tree.vue'
 
-import { useInterfaceStore } from 'src/stores/interface'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faAngleDoubleDown,
diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
index a2c48ae53..8ab54b3df 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -1,10 +1,7 @@
 import SearchBar from 'components/search_bar/search_bar.vue'
-import { mapActions, mapState } from 'pinia'
 
-import ConfirmModal from '../confirm_modal/confirm_modal.vue'
-
-import { useInstanceStore } from 'src/stores/instance.js'
 import { useInterfaceStore } from 'src/stores/interface'
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -54,7 +51,7 @@ export default {
   }),
   computed: {
     enableMask() {
-      return this.supportsMask && this.logoMask
+      return this.supportsMask && this.$store.state.instance.logoMask
     },
     logoStyle() {
       return {
@@ -64,7 +61,7 @@ export default {
     logoMaskStyle() {
       return this.enableMask
         ? {
-            'mask-image': `url(${this.logo})`,
+            'mask-image': `url(${this.$store.state.instance.logo})`,
           }
         : {
             'background-color': this.enableMask ? '' : 'transparent',
@@ -73,7 +70,7 @@ export default {
     logoBgStyle() {
       return Object.assign(
         {
-          margin: `${this.logoMargin} 0`,
+          margin: `${this.$store.state.instance.logoMargin} 0`,
           opacity: this.searchBarHidden ? 1 : 0,
         },
         this.enableMask
@@ -83,18 +80,24 @@ export default {
             },
       )
     },
-    ...mapState(useInstanceStore, ['private']),
-    ...mapState(useInstanceStore, {
-      logoMask: (store) => store.instanceIdentity.logoMask,
-      logo: (store) => store.instanceIdentity.logo,
-      logoLeft: (store) => store.instanceIdentity.logoLeft,
-      logoMargin: (store) => store.instanceIdentity.logoMargin,
-      sitename: (store) => store.instanceIdentity.name,
-      hideSitename: (store) => store.instanceIdentity.hideSitename,
-    }),
+    logo() {
+      return this.$store.state.instance.logo
+    },
+    sitename() {
+      return this.$store.state.instance.name
+    },
+    hideSitename() {
+      return this.$store.state.instance.hideSitename
+    },
+    logoLeft() {
+      return this.$store.state.instance.logoLeft
+    },
     currentUser() {
       return this.$store.state.users.currentUser
     },
+    privateMode() {
+      return this.$store.state.instance.private
+    },
     shouldConfirmLogout() {
       return this.$store.getters.mergedConfig.modalOnLogout
     },
@@ -124,6 +127,11 @@ export default {
     onSearchBarToggled(hidden) {
       this.searchBarHidden = hidden
     },
-    ...mapActions(useInterfaceStore, ['openSettingsModal']),
+    openSettingsModal() {
+      useInterfaceStore().openSettingsModal('user')
+    },
+    openAdminModal() {
+      useInterfaceStore().openSettingsModal('admin')
+    },
   },
 }
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index da427f2a1..49382f8ee 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -40,7 +40,7 @@
         <button
           class="button-unstyled nav-icon"
           :title="$t('nav.preferences')"
-          @click.stop="openSettingsModal('user')"
+          @click.stop="openSettingsModal"
         >
           <FAIcon
             fixed-width
@@ -53,7 +53,7 @@
           class="button-unstyled nav-icon"
           target="_blank"
           :title="$t('nav.administration')"
-          @click.stop="openSettingsModal('admin')"
+          @click.stop="openAdminModal"
         >
           <FAIcon
             fixed-width
diff --git a/src/components/edit_status_modal/edit_status_modal.js b/src/components/edit_status_modal/edit_status_modal.js
index 07836f161..8a16e4234 100644
--- a/src/components/edit_status_modal/edit_status_modal.js
+++ b/src/components/edit_status_modal/edit_status_modal.js
@@ -1,10 +1,9 @@
 import get from 'lodash/get'
 
+import { useEditStatusStore } from 'src/stores/editStatus'
 import EditStatusForm from '../edit_status_form/edit_status_form.vue'
 import Modal from '../modal/modal.vue'
 
-import { useEditStatusStore } from 'src/stores/editStatus.js'
-
 const EditStatusModal = {
   components: {
     EditStatusForm,
diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index 22631dc1d..24794640e 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -9,8 +9,6 @@ import genRandomSeed from '../../services/random_seed/random_seed.service.js'
 import EmojiPicker from '../emoji_picker/emoji_picker.vue'
 import UnicodeDomainIndicator from '../unicode_domain_indicator/unicode_domain_indicator.vue'
 
-import { useEmojiStore } from 'src/stores/emoji.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faSmileBeam } from '@fortawesome/free-regular-svg-icons'
 
@@ -133,7 +131,7 @@ const EmojiInput = {
   },
   computed: {
     padEmoji() {
-      return useEmojiStore().mergedConfig.padEmoji
+      return this.$store.getters.mergedConfig.padEmoji
     },
     defaultCandidateIndex() {
       return this.$store.getters.mergedConfig.autocompleteSelect ? 0 : -1
diff --git a/src/components/emoji_input/suggestor.js b/src/components/emoji_input/suggestor.js
index c478fea67..79d97cff7 100644
--- a/src/components/emoji_input/suggestor.js
+++ b/src/components/emoji_input/suggestor.js
@@ -2,7 +2,7 @@
  * suggest - generates a suggestor function to be used by emoji-input
  * data: object providing source information for specific types of suggestions:
  * data.emoji - optional, an array of all emoji available i.e.
- *   (useEmojiStore().standardEmojiList + state.instance.customEmoji)
+ *   (getters.standardEmojiList + state.instance.customEmoji)
  * data.users - optional, an array of all known users
  * updateUsersList - optional, a function to search and append to users
  *
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 79c0ab47e..e4221f706 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -6,9 +6,6 @@ import { ensureFinalFallback } from '../../i18n/languages.js'
 import Checkbox from '../checkbox/checkbox.vue'
 import StillImage from '../still-image/still-image.vue'
 
-import { useEmojiStore } from 'src/stores/emoji.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faBasketballBall,
@@ -352,8 +349,8 @@ const EmojiPicker = {
       return this.showingStickers ? '' : this.activeGroup
     },
     stickersAvailable() {
-      if (useEmojiStore().stickers) {
-        return useEmojiStore().stickers.length > 0
+      if (this.$store.state.instance.stickers) {
+        return this.$store.state.instance.stickers.length > 0
       }
       return 0
     },
@@ -361,7 +358,7 @@ const EmojiPicker = {
       if (this.hideCustomEmoji || this.hideCustomEmojiInPicker) {
         return {}
       }
-      const emojis = useEmojiStore().groupedCustomEmojis
+      const emojis = this.$store.getters.groupedCustomEmojis
       if (emojis.unpacked) {
         emojis.unpacked.text = this.$t('emoji.unpacked')
       }
@@ -371,7 +368,7 @@ const EmojiPicker = {
       return Object.keys(this.allCustomGroups)[0]
     },
     unicodeEmojiGroups() {
-      return useEmojiStore().standardEmojiGroupList.map((group) => ({
+      return this.$store.getters.standardEmojiGroupList.map((group) => ({
         id: `standard-${group.id}`,
         text: this.$t(`emoji.unicode_groups.${group.id}`),
         icon: UNICODE_EMOJI_GROUP_ICON[group.id],
@@ -384,7 +381,7 @@ const EmojiPicker = {
         .concat(this.unicodeEmojiGroups)
     },
     stickerPickerEnabled() {
-      return (useEmojiStore().stickers || []).length !== 0
+      return (this.$store.state.instance.stickers || []).length !== 0
     },
     debouncedHandleKeywordChange() {
       return debounce(() => {
diff --git a/src/components/extra_notifications/extra_notifications.js b/src/components/extra_notifications/extra_notifications.js
index 85f4f72bd..1deebd878 100644
--- a/src/components/extra_notifications/extra_notifications.js
+++ b/src/components/extra_notifications/extra_notifications.js
@@ -1,8 +1,8 @@
 import { mapState as mapPiniaState } from 'pinia'
 import { mapGetters } from 'vuex'
 
-import { useAnnouncementsStore } from 'src/stores/announcements.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
+import { useAnnouncementsStore } from 'src/stores/announcements'
+import { useInterfaceStore } from 'src/stores/interface'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
diff --git a/src/components/features_panel/features_panel.js b/src/components/features_panel/features_panel.js
index dc46f5e6f..e92cb975e 100644
--- a/src/components/features_panel/features_panel.js
+++ b/src/components/features_panel/features_panel.js
@@ -1,23 +1,33 @@
-import { mapState } from 'pinia'
-
 import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-
 const FeaturesPanel = {
   computed: {
-    ...mapState(useInstanceStore, {
-      shout: (store) => store.shoutAvailable,
-      pleromaChatMessages: (store) =>
-        store.featureSet.pleromaChatMessagesAvailable,
-      gopher: (store) => store.featureSet.gopherAvailable,
-      whoToFollow: (store) => store.featureSet.suggestionsEnabled,
-      mediaProxy: (store) => store.featureSet.mediaProxyAvailable,
-      minimalScopesMode: (store) => store.prefsStorage.minimalScopesMode,
-      textlimit: (store) => store.limits.textlimit,
-      uploadlimit: (store) =>
-        fileSizeFormatService.fileSizeFormat(store.limits.uploadlimit),
-    }),
+    shout: function () {
+      return this.$store.state.instance.shoutAvailable
+    },
+    pleromaChatMessages: function () {
+      return this.$store.state.instance.pleromaChatMessagesAvailable
+    },
+    gopher: function () {
+      return this.$store.state.instance.gopherAvailable
+    },
+    whoToFollow: function () {
+      return this.$store.state.instance.suggestionsEnabled
+    },
+    mediaProxy: function () {
+      return this.$store.state.instance.mediaProxyAvailable
+    },
+    minimalScopesMode: function () {
+      return this.$store.state.instance.minimalScopesMode
+    },
+    textlimit: function () {
+      return this.$store.state.instance.textlimit
+    },
+    uploadlimit: function () {
+      return fileSizeFormatService.fileSizeFormat(
+        this.$store.state.instance.uploadlimit,
+      )
+    },
   },
 }
 
diff --git a/src/components/font_control/font_control.js b/src/components/font_control/font_control.js
index 45e5fde81..08d25d52d 100644
--- a/src/components/font_control/font_control.js
+++ b/src/components/font_control/font_control.js
@@ -1,9 +1,8 @@
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import Popover from 'src/components/popover/popover.vue'
+import { useInterfaceStore } from 'src/stores/interface'
 import Select from '../select/select.vue'
 
-import { useInterfaceStore } from 'src/stores/interface.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faExclamationTriangle,
diff --git a/src/components/gallery/gallery.js b/src/components/gallery/gallery.js
index 6015861f8..9934a7905 100644
--- a/src/components/gallery/gallery.js
+++ b/src/components/gallery/gallery.js
@@ -1,9 +1,8 @@
 import { set, sumBy } from 'lodash'
 
+import { useMediaViewerStore } from 'src/stores/media_viewer'
 import Attachment from '../attachment/attachment.vue'
 
-import { useMediaViewerStore } from 'src/stores/media_viewer.js'
-
 const Gallery = {
   props: [
     'attachments',
diff --git a/src/components/global_notice_list/global_notice_list.js b/src/components/global_notice_list/global_notice_list.js
index f3a7eee42..4a2726d7b 100644
--- a/src/components/global_notice_list/global_notice_list.js
+++ b/src/components/global_notice_list/global_notice_list.js
@@ -1,4 +1,4 @@
-import { useInterfaceStore } from 'src/stores/interface.js'
+import { useInterfaceStore } from 'src/stores/interface'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faTimes } from '@fortawesome/free-solid-svg-icons'
diff --git a/src/components/instance_specific_panel/instance_specific_panel.js b/src/components/instance_specific_panel/instance_specific_panel.js
index 1ab0eec61..eead52f40 100644
--- a/src/components/instance_specific_panel/instance_specific_panel.js
+++ b/src/components/instance_specific_panel/instance_specific_panel.js
@@ -1,9 +1,7 @@
-import { useInstanceStore } from 'src/stores/instance.js'
-
 const InstanceSpecificPanel = {
   computed: {
     instanceSpecificPanelContent() {
-      return useInstanceStore().instanceIdentity.instanceSpecificPanelContent
+      return this.$store.state.instance.instanceSpecificPanelContent
     },
   },
 }
diff --git a/src/components/lists/lists.js b/src/components/lists/lists.js
index ae58960f5..446178245 100644
--- a/src/components/lists/lists.js
+++ b/src/components/lists/lists.js
@@ -1,7 +1,6 @@
+import { useListsStore } from 'src/stores/lists'
 import ListsCard from '../lists_card/lists_card.vue'
 
-import { useListsStore } from 'src/stores/lists.js'
-
 const Lists = {
   data() {
     return {
diff --git a/src/components/lists_edit/lists_edit.js b/src/components/lists_edit/lists_edit.js
index 83bd56de9..64a2e942c 100644
--- a/src/components/lists_edit/lists_edit.js
+++ b/src/components/lists_edit/lists_edit.js
@@ -3,13 +3,12 @@ import { mapGetters, mapState } from 'vuex'
 
 import PanelLoading from 'src/components/panel_loading/panel_loading.vue'
 import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
+import { useInterfaceStore } from 'src/stores/interface'
+import { useListsStore } from 'src/stores/lists'
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 import ListsUserSearch from '../lists_user_search/lists_user_search.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 
-import { useInterfaceStore } from 'src/stores/interface.js'
-import { useListsStore } from 'src/stores/lists.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronLeft, faSearch } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/lists_menu/lists_menu_content.js b/src/components/lists_menu/lists_menu_content.js
index 2279ca6f0..7574c4c3f 100644
--- a/src/components/lists_menu/lists_menu_content.js
+++ b/src/components/lists_menu/lists_menu_content.js
@@ -3,9 +3,7 @@ import { mapState } from 'vuex'
 
 import { getListEntries } from 'src/components/navigation/filter.js'
 import NavigationEntry from 'src/components/navigation/navigation_entry.vue'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useListsStore } from 'src/stores/lists.js'
+import { useListsStore } from 'src/stores/lists'
 
 export const ListsMenuContent = {
   props: ['showPin'],
@@ -18,8 +16,8 @@ export const ListsMenuContent = {
     }),
     ...mapState({
       currentUser: (state) => state.users.currentUser,
-      privateMode: (state) => useInstanceStore().private,
-      federating: (state) => useInstanceStore().federating,
+      privateMode: (state) => state.instance.private,
+      federating: (state) => state.instance.federating,
     }),
   },
 }
diff --git a/src/components/lists_timeline/lists_timeline.js b/src/components/lists_timeline/lists_timeline.js
index 3d2cafa73..ae1554eb6 100644
--- a/src/components/lists_timeline/lists_timeline.js
+++ b/src/components/lists_timeline/lists_timeline.js
@@ -1,7 +1,6 @@
+import { useListsStore } from 'src/stores/lists'
 import Timeline from '../timeline/timeline.vue'
 
-import { useListsStore } from 'src/stores/lists.js'
-
 const ListsTimeline = {
   data() {
     return {
diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js
index b16fb8d2f..7c43923c9 100644
--- a/src/components/login_form/login_form.js
+++ b/src/components/login_form/login_form.js
@@ -1,11 +1,9 @@
 import { mapActions, mapState as mapPiniaState, mapStores } from 'pinia'
 import { mapState } from 'vuex'
 
-import oauthApi from '../../services/new_api/oauth.js'
-
 import { useAuthFlowStore } from 'src/stores/auth_flow.js'
-import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
+import oauthApi from '../../services/new_api/oauth.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faTimes } from '@fortawesome/free-solid-svg-icons'
@@ -18,34 +16,41 @@ const LoginForm = {
     error: false,
   }),
   computed: {
+    isPasswordAuth() {
+      return this.requiredPassword
+    },
+    isTokenAuth() {
+      return this.requiredToken
+    },
+    ...mapStores(useOAuthStore),
     ...mapState({
+      registrationOpen: (state) => state.instance.registrationOpen,
+      instance: (state) => state.instance,
       loggingIn: (state) => state.users.loggingIn,
     }),
-    ...mapPiniaState(useOAuthStore, ['clientId', 'clientSecret']),
-    ...mapPiniaState(useInstanceStore, ['server', 'registrationOpen']),
-    ...mapPiniaState(useAuthFlowStore, {
-      isTokenAuth: (store) => store.requiredToken,
-      isPasswordAuth: (store) => !store.requiredToken,
-    }),
+    ...mapPiniaState(useAuthFlowStore, [
+      'requiredPassword',
+      'requiredToken',
+      'requiredMFA',
+    ]),
   },
   methods: {
     ...mapActions(useAuthFlowStore, ['requireMFA', 'login']),
-    ...mapActions(useOAuthStore, ['ensureAppToken']),
     submit() {
       this.isTokenAuth ? this.submitToken() : this.submitPassword()
     },
     submitToken() {
       const data = {
-        instance: this.server,
+        instance: this.instance.server,
         commit: this.$store.commit,
       }
 
       // NOTE: we do not really need the app token, but obtaining a token and
       // calling verify_credentials is the only way to ensure the app still works.
-      this.ensureAppToken().then(() => {
+      this.oauthStore.ensureAppToken().then(() => {
         const app = {
-          clientId: this.clientId,
-          clientSecret: this.clientSecret,
+          clientId: this.oauthStore.clientId,
+          clientSecret: this.oauthStore.clientSecret,
         }
         oauthApi.login({ ...app, ...data })
       })
@@ -55,16 +60,16 @@ const LoginForm = {
 
       // NOTE: we do not really need the app token, but obtaining a token and
       // calling verify_credentials is the only way to ensure the app still works.
-      this.ensureAppToken().then(() => {
+      this.oauthStore.ensureAppToken().then(() => {
         const app = {
-          clientId: this.clientId,
-          clientSecret: this.clientSecret,
+          clientId: this.oauthStore.clientId,
+          clientSecret: this.oauthStore.clientSecret,
         }
 
         oauthApi
           .getTokenWithCredentials({
             ...app,
-            instance: this.server,
+            instance: this.instance.server,
             username: this.user.username,
             password: this.user.password,
           })
diff --git a/src/components/media_modal/media_modal.js b/src/components/media_modal/media_modal.js
index f0db02ffd..6199a6e32 100644
--- a/src/components/media_modal/media_modal.js
+++ b/src/components/media_modal/media_modal.js
@@ -1,4 +1,5 @@
 import Flash from 'src/components/flash/flash.vue'
+import { useMediaViewerStore } from 'src/stores/media_viewer'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import GestureService from '../../services/gesture_service/gesture_service'
 import Modal from '../modal/modal.vue'
@@ -7,8 +8,6 @@ import StillImage from '../still-image/still-image.vue'
 import SwipeClick from '../swipe_click/swipe_click.vue'
 import VideoAttachment from '../video_attachment/video_attachment.vue'
 
-import { useMediaViewerStore } from 'src/stores/media_viewer.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faChevronLeft,
diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index ee61fa369..8dc3d6c65 100644
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@@ -1,8 +1,8 @@
+/* eslint-env browser */
+
 import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'
 import statusPosterService from '../../services/status_poster/status_poster.service.js'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircleNotch, faUpload } from '@fortawesome/free-solid-svg-icons'
 
@@ -122,10 +122,10 @@ const mediaUpload = {
     async uploadFile(file) {
       const self = this
       const store = this.$store
-      if (file.size > useInstanceStore().uploadlimit) {
+      if (file.size > store.state.instance.uploadlimit) {
         const filesize = fileSizeFormatService.fileSizeFormat(file.size)
         const allowedsize = fileSizeFormatService.fileSizeFormat(
-          useInstanceStore().uploadlimit,
+          store.state.instance.uploadlimit,
         )
         self.$emit('upload-failed', 'file_too_big', {
           filesize: filesize.num,
diff --git a/src/components/mention_link/mention_link.js b/src/components/mention_link/mention_link.js
index 37c30355c..4c211b5e9 100644
--- a/src/components/mention_link/mention_link.js
+++ b/src/components/mention_link/mention_link.js
@@ -1,6 +1,7 @@
 import { defineAsyncComponent } from 'vue'
 import { mapGetters, mapState } from 'vuex'
 
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 import {
   highlightClass,
   highlightStyle,
@@ -8,8 +9,6 @@ import {
 import UnicodeDomainIndicator from '../unicode_domain_indicator/unicode_domain_indicator.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faAt } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/mfa_form/recovery_form.js b/src/components/mfa_form/recovery_form.js
index f4ddcadd0..5fa5c187a 100644
--- a/src/components/mfa_form/recovery_form.js
+++ b/src/components/mfa_form/recovery_form.js
@@ -1,10 +1,9 @@
-import { mapActions, mapState, mapStores } from 'pinia'
-
-import mfaApi from '../../services/new_api/mfa.js'
+import { mapActions, mapState as mapPiniaState, mapStores } from 'pinia'
+import { mapState } from 'vuex'
 
 import { useAuthFlowStore } from 'src/stores/auth_flow.js'
-import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
+import mfaApi from '../../services/new_api/mfa.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faTimes } from '@fortawesome/free-solid-svg-icons'
@@ -17,10 +16,13 @@ export default {
     error: false,
   }),
   computed: {
+    ...mapPiniaState(useAuthFlowStore, {
+      authSettings: (store) => store.settings,
+    }),
     ...mapStores(useOAuthStore),
-    ...mapState(useOAuthStore, ['clientId', 'clientSecret']),
-    ...mapState(useAuthFlowStore, ['settings']),
-    ...mapState(useInstanceStore, ['server']),
+    ...mapState({
+      instance: 'instance',
+    }),
   },
   methods: {
     ...mapActions(useAuthFlowStore, ['requireTOTP', 'abortMFA', 'login']),
@@ -35,11 +37,13 @@ export default {
     },
 
     submit() {
+      const { clientId, clientSecret } = this.oauthStore
+
       const data = {
-        clientId: this.clientId,
-        clientSecret: this.clientSecret,
-        instance: this.server,
-        mfaToken: this.settings.mfa_token,
+        clientId,
+        clientSecret,
+        instance: this.instance.server,
+        mfaToken: this.authSettings.mfa_token,
         code: this.code,
       }
 
diff --git a/src/components/mfa_form/totp_form.js b/src/components/mfa_form/totp_form.js
index 6d51cba94..d1378b078 100644
--- a/src/components/mfa_form/totp_form.js
+++ b/src/components/mfa_form/totp_form.js
@@ -1,10 +1,9 @@
-import { mapActions, mapState, mapStores } from 'pinia'
-
-import mfaApi from '../../services/new_api/mfa.js'
+import { mapActions, mapState as mapPiniaState, mapStores } from 'pinia'
+import { mapState } from 'vuex'
 
 import { useAuthFlowStore } from 'src/stores/auth_flow.js'
-import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
+import mfaApi from '../../services/new_api/mfa.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faTimes } from '@fortawesome/free-solid-svg-icons'
@@ -17,11 +16,13 @@ export default {
     error: false,
   }),
   computed: {
-    ...mapState(useAuthFlowStore, {
+    ...mapPiniaState(useAuthFlowStore, {
       authSettings: (store) => store.settings,
     }),
-    ...mapState(useInstanceStore, ['server']),
     ...mapStores(useOAuthStore),
+    ...mapState({
+      instance: 'instance',
+    }),
   },
   methods: {
     ...mapActions(useAuthFlowStore, ['requireRecovery', 'abortMFA', 'login']),
@@ -41,7 +42,7 @@ export default {
       const data = {
         clientId,
         clientSecret,
-        instance: this.server,
+        instance: this.instance.server,
         mfaToken: this.authSettings.mfa_token,
         code: this.code,
       }
diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index c5b1d66f6..873bdc40d 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -2,6 +2,8 @@ import { mapState } from 'pinia'
 import { mapGetters } from 'vuex'
 
 import NavigationPins from 'src/components/navigation/navigation_pins.vue'
+import { useAnnouncementsStore } from 'src/stores/announcements'
+import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
 import GestureService from '../../services/gesture_service/gesture_service'
 import {
   countExtraNotifications,
@@ -11,10 +13,6 @@ import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import Notifications from '../notifications/notifications.vue'
 import SideDrawer from '../side_drawer/side_drawer.vue'
 
-import { useAnnouncementsStore } from 'src/stores/announcements.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useServerSideStorageStore } from 'src/stores/serverSideStorage.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faArrowUp,
@@ -66,10 +64,10 @@ const MobileNav = {
       return `${this.unseenCount ? this.unseenCount : ''}`
     },
     hideSitename() {
-      return useInstanceStore().hideSitename
+      return this.$store.state.instance.hideSitename
     },
     sitename() {
-      return useInstanceStore().name
+      return this.$store.state.instance.name
     },
     isChat() {
       return this.$route.name === 'chat'
diff --git a/src/components/mobile_post_status_button/mobile_post_status_button.js b/src/components/mobile_post_status_button/mobile_post_status_button.js
index 83103c827..dfa7b6fe2 100644
--- a/src/components/mobile_post_status_button/mobile_post_status_button.js
+++ b/src/components/mobile_post_status_button/mobile_post_status_button.js
@@ -1,6 +1,6 @@
 import { debounce } from 'lodash'
 
-import { usePostStatusStore } from 'src/stores/post_status.js'
+import { usePostStatusStore } from 'src/stores/post_status'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faPen } from '@fortawesome/free-solid-svg-icons'
diff --git a/src/components/moderation_tools/moderation_tools.js b/src/components/moderation_tools/moderation_tools.js
index 6628e02f8..fdb8a74b6 100644
--- a/src/components/moderation_tools/moderation_tools.js
+++ b/src/components/moderation_tools/moderation_tools.js
@@ -1,8 +1,6 @@
 import DialogModal from '../dialog_modal/dialog_modal.vue'
 import Popover from '../popover/popover.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronDown } from '@fortawesome/free-solid-svg-icons'
 
@@ -56,7 +54,7 @@ const ModerationTools = {
     },
     canUseTagPolicy() {
       return (
-        useInstanceStore().featureSet.tagPolicyAvailable &&
+        this.$store.state.instance.tagPolicyAvailable &&
         this.privileged('users_manage_tags')
       )
     },
diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
index 7eed379da..d80cd0a5d 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -8,9 +8,7 @@ import { filterNavigation } from 'src/components/navigation/filter.js'
 import { ROOT_ITEMS, TIMELINES } from 'src/components/navigation/navigation.js'
 import NavigationEntry from 'src/components/navigation/navigation_entry.vue'
 import NavigationPins from 'src/components/navigation/navigation_pins.vue'
-
 import { useAnnouncementsStore } from 'src/stores/announcements'
-import { useInstanceStore } from 'src/stores/instance.js'
 import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -112,14 +110,6 @@ const NavPanel = {
       unreadAnnouncementCount: 'unreadAnnouncementCount',
       supportsAnnouncements: (store) => store.supportsAnnouncements,
     }),
-    ...mapPiniaState(useInstanceStore, ['private', 'federating']),
-    ...mapPiniaState(useInstanceStore, {
-      pleromaChatMessagesAvailable: (store) =>
-        store.featureSet.pleromaChatMessagesAvailable,
-      bookmarkFolders: (store) =>
-        store.fetaureSet.pleromaBookmarkFoldersAvailable,
-      bubbleTimeline: (store) => store.fetaureSet.localBubble,
-    }),
     ...mapPiniaState(useServerSideStorageStore, {
       collapsed: (store) => store.prefsStorage.simple.collapseNav,
       pinnedItems: (store) =>
@@ -128,6 +118,13 @@ const NavPanel = {
     ...mapState({
       currentUser: (state) => state.users.currentUser,
       followRequestCount: (state) => state.api.followRequests.length,
+      privateMode: (state) => state.instance.private,
+      federating: (state) => state.instance.federating,
+      pleromaChatMessagesAvailable: (state) =>
+        state.instance.pleromaChatMessagesAvailable,
+      bookmarkFolders: (state) =>
+        state.instance.pleromaBookmarkFoldersAvailable,
+      bubbleTimeline: (state) => state.instance.localBubbleInstances.length > 0,
     }),
     timelinesItems() {
       return filterNavigation(
diff --git a/src/components/navigation/navigation_entry.js b/src/components/navigation/navigation_entry.js
index 3384534be..75d4dffdd 100644
--- a/src/components/navigation/navigation_entry.js
+++ b/src/components/navigation/navigation_entry.js
@@ -3,9 +3,8 @@ import { mapState } from 'vuex'
 
 import { routeTo } from 'src/components/navigation/navigation.js'
 import OptionalRouterLink from 'src/components/optional_router_link/optional_router_link.vue'
-
-import { useAnnouncementsStore } from 'src/stores/announcements.js'
-import { useServerSideStorageStore } from 'src/stores/serverSideStorage.js'
+import { useAnnouncementsStore } from 'src/stores/announcements'
+import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faThumbtack } from '@fortawesome/free-solid-svg-icons'
diff --git a/src/components/navigation/navigation_pins.js b/src/components/navigation/navigation_pins.js
index a6845eee6..e14edce14 100644
--- a/src/components/navigation/navigation_pins.js
+++ b/src/components/navigation/navigation_pins.js
@@ -12,10 +12,8 @@ import {
   TIMELINES,
 } from 'src/components/navigation/navigation.js'
 import StillImage from 'src/components/still-image/still-image.vue'
-
 import { useAnnouncementsStore } from 'src/stores/announcements'
 import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders'
-import { useInstanceStore } from 'src/stores/instance.js'
 import { useListsStore } from 'src/stores/lists'
 import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
 
@@ -73,16 +71,14 @@ const NavPanel = {
       pinnedItems: (store) =>
         new Set(store.prefsStorage.collections.pinnedNavItems),
     }),
-    ...mapPiniaState(useInstanceStore, {
-      bookmarks: getBookmarkFolderEntries,
-      pleromaChatMessagesAvailable: (store) =>
-        store.featureSet.pleromaChatMessagesAvailable,
-      bubbleTimeline: (store) => store.featureSet.localBubble,
-    }),
-    ...mapPiniaState(useInstanceStore, ['private', 'federating']),
     ...mapState({
       currentUser: (state) => state.users.currentUser,
       followRequestCount: (state) => state.api.followRequests.length,
+      privateMode: (state) => state.instance.private,
+      federating: (state) => state.instance.federating,
+      pleromaChatMessagesAvailable: (state) =>
+        state.instance.pleromaChatMessagesAvailable,
+      bubbleTimeline: (state) => state.instance.localBubbleInstances.length > 0,
     }),
     pinnedList() {
       if (!this.currentUser) {
@@ -96,7 +92,7 @@ const NavPanel = {
             hasChats: this.pleromaChatMessagesAvailable,
             hasAnnouncements: this.supportsAnnouncements,
             isFederating: this.federating,
-            isPrivate: this.private,
+            isPrivate: this.privateMode,
             currentUser: this.currentUser,
             supportsBubbleTimeline: this.bubbleTimeline,
             supportsBookmarkFolders: this.bookmarks,
@@ -120,7 +116,7 @@ const NavPanel = {
           supportsBubbleTimeline: this.bubbleTimeline,
           supportsBookmarkFolders: this.bookmarks,
           isFederating: this.federating,
-          isPrivate: this.private,
+          isPrivate: this.privateMode,
           currentUser: this.currentUser,
         },
       ).slice(0, this.limit)
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index 16084dee4..275827c43 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -1,6 +1,7 @@
 import { mapState } from 'vuex'
 
 import RichContent from 'src/components/rich_content/rich_content.jsx'
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 import { isStatusNotification } from '../../services/notification_utils/notification_utils.js'
 import {
   highlightClass,
@@ -16,10 +17,6 @@ import UserCard from '../user_card/user_card.vue'
 import UserLink from '../user_link/user_link.vue'
 import UserPopover from '../user_popover/user_popover.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faCheck,
@@ -110,7 +107,7 @@ const Notification = {
       return generateProfileLink(
         user.id,
         user.screen_name,
-        useInstanceStore().restrictedNicknames,
+        this.$store.state.instance.restrictedNicknames,
       )
     },
     getUser(notification) {
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index 6483a256e..9e349a2eb 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -2,6 +2,8 @@ import { mapState } from 'pinia'
 import { computed } from 'vue'
 import { mapGetters } from 'vuex'
 
+import { useAnnouncementsStore } from 'src/stores/announcements'
+import { useInterfaceStore } from 'src/stores/interface'
 import FaviconService from '../../services/favicon_service/favicon_service.js'
 import {
   ACTIONABLE_NOTIFICATION_TYPES,
@@ -15,9 +17,6 @@ import ExtraNotifications from '../extra_notifications/extra_notifications.vue'
 import Notification from '../notification/notification.vue'
 import NotificationFilters from './notification_filters.vue'
 
-import { useAnnouncementsStore } from 'src/stores/announcements.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faArrowUp,
diff --git a/src/components/oauth_callback/oauth_callback.js b/src/components/oauth_callback/oauth_callback.js
index 4bcb9803e..82c3db047 100644
--- a/src/components/oauth_callback/oauth_callback.js
+++ b/src/components/oauth_callback/oauth_callback.js
@@ -1,7 +1,5 @@
-import oauth from '../../services/new_api/oauth.js'
-
-import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
+import oauth from '../../services/new_api/oauth.js'
 
 const oac = {
   props: ['code'],
@@ -14,7 +12,7 @@ const oac = {
         .getToken({
           clientId,
           clientSecret,
-          instance: useInstanceStore().server,
+          instance: this.$store.state.instance.server,
           code: this.code,
         })
         .then((result) => {
diff --git a/src/components/palette_editor/palette_editor.vue b/src/components/palette_editor/palette_editor.vue
index eec9fe361..21b40bccb 100644
--- a/src/components/palette_editor/palette_editor.vue
+++ b/src/components/palette_editor/palette_editor.vue
@@ -48,13 +48,11 @@
 import { computed } from 'vue'
 
 import ColorInput from 'src/components/color_input/color_input.vue'
-
-import { useInterfaceStore } from 'src/stores/interface.js'
-
 import {
   newExporter,
   newImporter,
 } from 'src/services/export_import/export_import.js'
+import { useInterfaceStore } from 'src/stores/interface'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faFileExport, faFileImport } from '@fortawesome/free-solid-svg-icons'
diff --git a/src/components/password_reset/password_reset.js b/src/components/password_reset/password_reset.js
index 5a54d846b..4fd53f8dd 100644
--- a/src/components/password_reset/password_reset.js
+++ b/src/components/password_reset/password_reset.js
@@ -1,10 +1,7 @@
-import { mapState as mapPiniaState } from 'pinia'
 import { mapState } from 'vuex'
 
 import passwordResetApi from '../../services/new_api/password_reset.js'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faTimes } from '@fortawesome/free-solid-svg-icons'
 
@@ -23,8 +20,11 @@ const passwordReset = {
   computed: {
     ...mapState({
       signedIn: (state) => !!state.users.currentUser,
+      instance: (state) => state.instance,
     }),
-    ...mapPiniaState(useInstanceStore, ['server', 'mailerEnabled']),
+    mailerEnabled() {
+      return this.instance.mailerEnabled
+    },
   },
   created() {
     if (this.signedIn) {
@@ -44,9 +44,9 @@ const passwordReset = {
     submit() {
       this.isPending = true
       const email = this.user.email
-      const server = this.server
+      const instance = this.instance.server
 
-      passwordResetApi({ server, email })
+      passwordResetApi({ instance, email })
         .then(({ status }) => {
           this.isPending = false
           this.user.email = ''
diff --git a/src/components/poll/poll.js b/src/components/poll/poll.js
index f8887e53f..594a7be88 100644
--- a/src/components/poll/poll.js
+++ b/src/components/poll/poll.js
@@ -2,10 +2,9 @@ import Checkbox from 'components/checkbox/checkbox.vue'
 import RichContent from 'components/rich_content/rich_content.jsx'
 import Timeago from 'components/timeago/timeago.vue'
 
+import { usePollsStore } from 'src/stores/polls'
 import genRandomSeed from '../../services/random_seed/random_seed.service.js'
 
-import { usePollsStore } from 'src/stores/polls.js'
-
 export default {
   name: 'Poll',
   props: ['basePoll', 'emoji'],
diff --git a/src/components/poll/poll_form.js b/src/components/poll/poll_form.js
index 1e132312f..92b471314 100644
--- a/src/components/poll/poll_form.js
+++ b/src/components/poll/poll_form.js
@@ -1,9 +1,6 @@
-import Select from '../select/select.vue'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-
 import * as DateUtils from 'src/services/date_utils/date_utils.js'
 import { pollFallback } from 'src/services/poll/poll.service.js'
+import Select from '../select/select.vue'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faPlus, faTimes } from '@fortawesome/free-solid-svg-icons'
@@ -55,7 +52,7 @@ export default {
       },
     },
     pollLimits() {
-      return useInstanceStore().limits.pollLimits
+      return this.$store.state.instance.pollLimits
     },
     maxOptions() {
       return this.pollLimits.max_options
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 7b9512456..396aa94f0 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -5,6 +5,9 @@ import { mapGetters } from 'vuex'
 import DraftCloser from 'src/components/draft_closer/draft_closer.vue'
 import Gallery from 'src/components/gallery/gallery.vue'
 import Popover from 'src/components/popover/popover.vue'
+import { pollFormToMasto } from 'src/services/poll/poll.service.js'
+import { useInterfaceStore } from 'src/stores/interface.js'
+import { useMediaViewerStore } from 'src/stores/media_viewer.js'
 import { propsToNative } from '../../services/attributes_helper/attributes_helper.service.js'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
@@ -20,13 +23,6 @@ import ScopeSelector from '../scope_selector/scope_selector.vue'
 import Select from '../select/select.vue'
 import StatusContent from '../status_content/status_content.vue'
 
-import { useEmojiStore } from 'src/stores/emoji.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-import { useMediaViewerStore } from 'src/stores/media_viewer.js'
-
-import { pollFormToMasto } from 'src/services/poll/poll.service.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faBan,
@@ -262,8 +258,8 @@ const PostStatusForm = {
     emojiUserSuggestor() {
       return suggestor({
         emoji: [
-          ...useEmojiStore().standardEmojiList,
-          ...useEmojiStore().customEmoji,
+          ...this.$store.getters.standardEmojiList,
+          ...this.$store.state.instance.customEmoji,
         ],
         store: this.$store,
       })
@@ -271,16 +267,16 @@ const PostStatusForm = {
     emojiSuggestor() {
       return suggestor({
         emoji: [
-          ...useEmojiStore().standardEmojiList,
-          ...useEmojiStore().customEmoji,
+          ...this.$store.getters.standardEmojiList,
+          ...this.$store.state.instance.customEmoji,
         ],
       })
     },
     emoji() {
-      return useEmojiStore().standardEmojiList || []
+      return this.$store.getters.standardEmojiList || []
     },
     customEmoji() {
-      return useEmojiStore().customEmoji || []
+      return this.$store.state.instance.customEmoji || []
     },
     statusLength() {
       return this.newStatus.status.length
@@ -289,7 +285,7 @@ const PostStatusForm = {
       return this.newStatus.spoilerText.length
     },
     statusLengthLimit() {
-      return useInstanceStore().textlimit
+      return this.$store.state.instance.textlimit
     },
     hasStatusLengthLimit() {
       return this.statusLengthLimit > 0
@@ -303,21 +299,21 @@ const PostStatusForm = {
       return this.hasStatusLengthLimit && this.charactersLeft < 0
     },
     minimalScopesMode() {
-      return useInstanceStore().minimalScopesMode
+      return this.$store.state.instance.minimalScopesMode
     },
     alwaysShowSubject() {
       return this.mergedConfig.alwaysShowSubjectInput
     },
     postFormats() {
-      return useInstanceStore().featureSet.postFormats || []
+      return this.$store.state.instance.postFormats || []
     },
     safeDMEnabled() {
-      return useInstanceStore().featureSet.safeDM
+      return this.$store.state.instance.safeDM
     },
     pollsAvailable() {
       return (
-        useInstanceStore().featureSet.pollsAvailable &&
-        useInstanceStore().limits.pollLimits.max_options >= 2 &&
+        this.$store.state.instance.pollsAvailable &&
+        this.$store.state.instance.pollLimits.max_options >= 2 &&
         this.disablePolls !== true
       )
     },
@@ -346,7 +342,7 @@ const PostStatusForm = {
       return typeof this.statusId !== 'undefined' && this.statusId.trim() !== ''
     },
     quotable() {
-      if (!useInstanceStore().featureSet.quotingAvailable) {
+      if (!this.$store.state.instance.quotingAvailable) {
         return false
       }
 
diff --git a/src/components/post_status_modal/post_status_modal.js b/src/components/post_status_modal/post_status_modal.js
index 0fe51791e..2c643e9db 100644
--- a/src/components/post_status_modal/post_status_modal.js
+++ b/src/components/post_status_modal/post_status_modal.js
@@ -1,10 +1,9 @@
 import get from 'lodash/get'
 
+import { usePostStatusStore } from 'src/stores/post_status'
 import Modal from '../modal/modal.vue'
 import PostStatusForm from '../post_status_form/post_status_form.vue'
 
-import { usePostStatusStore } from 'src/stores/post_status.js'
-
 const PostStatusModal = {
   components: {
     PostStatusForm,
diff --git a/src/components/quick_filter_settings/quick_filter_settings.js b/src/components/quick_filter_settings/quick_filter_settings.js
index 84abeec72..3572dbb18 100644
--- a/src/components/quick_filter_settings/quick_filter_settings.js
+++ b/src/components/quick_filter_settings/quick_filter_settings.js
@@ -1,10 +1,9 @@
 import { mapState } from 'pinia'
 import { mapGetters } from 'vuex'
 
+import { useInterfaceStore } from 'src/stores/interface'
 import Popover from '../popover/popover.vue'
 
-import { useInterfaceStore } from 'src/stores/interface.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faFilter, faFont, faWrench } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/quick_view_settings/quick_view_settings.js b/src/components/quick_view_settings/quick_view_settings.js
index 438d1405b..6c5a9f667 100644
--- a/src/components/quick_view_settings/quick_view_settings.js
+++ b/src/components/quick_view_settings/quick_view_settings.js
@@ -3,8 +3,7 @@ import { mapGetters } from 'vuex'
 
 import Popover from 'src/components/popover/popover.vue'
 import QuickFilterSettings from 'src/components/quick_filter_settings/quick_filter_settings.vue'
-
-import { useInterfaceStore } from 'src/stores/interface.js'
+import { useInterfaceStore } from 'src/stores/interface'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index 9058963c6..8d1081acb 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -1,16 +1,12 @@
 import useVuelidate from '@vuelidate/core'
 import { required, requiredIf, sameAs } from '@vuelidate/validators'
-import { mapState as mapPiniaState } from 'pinia'
 import { mapActions, mapState } from 'vuex'
 
+import { DAY } from 'src/services/date_utils/date_utils.js'
 import localeService from '../../services/locale/locale.service.js'
 import InterfaceLanguageSwitcher from '../interface_language_switcher/interface_language_switcher.vue'
 import TermsOfServicePanel from '../terms_of_service_panel/terms_of_service_panel.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-
-import { DAY } from 'src/services/date_utils/date_utils.js'
-
 const registration = {
   setup() {
     return { v$: useVuelidate() }
@@ -100,21 +96,21 @@ const registration = {
         )
       )
     },
-    ...mapPiniaState(useInstanceStore, {
-      registrationOpen: (store) => store.registrationOpen,
-      embeddedToS: (store) => store.embeddedToS,
-      termsOfService: (store) => store.tos,
-      accountActivationRequired: (store) => store.accountActivationRequired,
-      accountApprovalRequired: (store) => store.accountApprovalRequired,
-      birthdayRequired: (store) => store.birthdayRequired,
-      birthdayMinAge: (store) => store.birthdayMinAge,
-    }),
     ...mapState({
+      registrationOpen: (state) => state.instance.registrationOpen,
       signedIn: (state) => !!state.users.currentUser,
       isPending: (state) => state.users.signUpPending,
       serverValidationErrors: (state) => state.users.signUpErrors,
       signUpNotice: (state) => state.users.signUpNotice,
       hasSignUpNotice: (state) => !!state.users.signUpNotice.message,
+      termsOfService: (state) => state.instance.tos,
+      embeddedToS: (state) => state.instance.embeddedToS,
+      accountActivationRequired: (state) =>
+        state.instance.accountActivationRequired,
+      accountApprovalRequired: (state) =>
+        state.instance.accountApprovalRequired,
+      birthdayRequired: (state) => state.instance.birthdayRequired,
+      birthdayMinAge: (state) => state.instance.birthdayMinAge,
     }),
   },
   methods: {
diff --git a/src/components/report/report.js b/src/components/report/report.js
index fcfb83c3a..a4df8eb6c 100644
--- a/src/components/report/report.js
+++ b/src/components/report/report.js
@@ -1,13 +1,10 @@
 import RichContent from 'src/components/rich_content/rich_content.jsx'
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+import { useReportsStore } from 'src/stores/reports'
 import Select from '../select/select.vue'
 import StatusContent from '../status_content/status_content.vue'
 import Timeago from '../timeago/timeago.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useReportsStore } from 'src/stores/reports.js'
-
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
-
 const Report = {
   props: ['reportId'],
   components: {
@@ -34,7 +31,7 @@ const Report = {
       return generateProfileLink(
         user.id,
         user.screen_name,
-        useInstanceStore().restrictedNicknames,
+        this.$store.state.instance.restrictedNicknames,
       )
     },
     setReportState(state) {
diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx
index 3a6f0b1bc..99dd8035d 100644
--- a/src/components/rich_content/rich_content.jsx
+++ b/src/components/rich_content/rich_content.jsx
@@ -5,7 +5,6 @@ import { MENTIONS_LIMIT } from 'src/components/mentions_line/mentions_line.js'
 import MentionsLine from 'src/components/mentions_line/mentions_line.vue'
 import StillImage from 'src/components/still-image/still-image.vue'
 import StillImageEmojiPopover from 'src/components/still-image/still-image-emoji-popover.vue'
-
 import { convertHtmlToLines } from 'src/services/html_converter/html_line_converter.service.js'
 import { convertHtmlToTree } from 'src/services/html_converter/html_tree_converter.service.js'
 import {
diff --git a/src/components/settings_modal/admin_tabs/emoji_tab.js b/src/components/settings_modal/admin_tabs/emoji_tab.js
index 115ef519b..e53c2f219 100644
--- a/src/components/settings_modal/admin_tabs/emoji_tab.js
+++ b/src/components/settings_modal/admin_tabs/emoji_tab.js
@@ -6,14 +6,12 @@ import StillImage from 'components/still-image/still-image.vue'
 import { assign, clone } from 'lodash'
 
 import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
+import { useInterfaceStore } from 'src/stores/interface'
 import EmojiEditingPopover from '../helpers/emoji_editing_popover.vue'
 import ModifiedIndicator from '../helpers/modified_indicator.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import StringSetting from '../helpers/string_setting.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faArrowsRotate,
@@ -104,7 +102,7 @@ const EmojiTab = {
         // Remote pack
         return `${this.pack.remote.instance}/emoji/${encodeURIComponent(this.pack.remote.baseName)}/${name}`
       } else {
-        return `${useInstanceStore().server}/emoji/${encodeURIComponent(this.packName)}/${name}`
+        return `${this.$store.state.instance.server}/emoji/${encodeURIComponent(this.packName)}/${name}`
       }
     },
 
diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.js b/src/components/settings_modal/admin_tabs/frontends_tab.js
index b76cd9015..7563adae0 100644
--- a/src/components/settings_modal/admin_tabs/frontends_tab.js
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.js
@@ -1,5 +1,6 @@
 import PanelLoading from 'src/components/panel_loading/panel_loading.vue'
 import Popover from 'src/components/popover/popover.vue'
+import { useInterfaceStore } from 'src/stores/interface'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import GroupSetting from '../helpers/group_setting.vue'
@@ -7,8 +8,6 @@ import IntegerSetting from '../helpers/integer_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import StringSetting from '../helpers/string_setting.vue'
 
-import { useInterfaceStore } from 'src/stores/interface.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faGlobe } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/settings_modal/helpers/attachment_setting.js b/src/components/settings_modal/helpers/attachment_setting.js
index 7ba910950..61e00a353 100644
--- a/src/components/settings_modal/helpers/attachment_setting.js
+++ b/src/components/settings_modal/helpers/attachment_setting.js
@@ -1,10 +1,7 @@
 import Attachment from 'src/components/attachment/attachment.vue'
 import MediaUpload from 'src/components/media_upload/media_upload.vue'
-import Setting from './setting.js'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-
 import { fileTypeExt } from 'src/services/file_type/file_type.service.js'
+import Setting from './setting.js'
 
 export default {
   ...Setting,
@@ -27,7 +24,9 @@ export default {
     attachment() {
       const path = this.realDraftMode ? this.draft : this.state
       // The "server" part is primarily for local dev, but could be useful for alt-domain or multiuser usage.
-      const url = path.includes('://') ? path : useInstanceStore().server + path
+      const url = path.includes('://')
+        ? path
+        : this.$store.state.instance.server + path
       return {
         mimetype: fileTypeExt(url),
         url,
diff --git a/src/components/settings_modal/helpers/pwa_manifest_icons_setting.js b/src/components/settings_modal/helpers/pwa_manifest_icons_setting.js
index 5d90ccb1e..6d6cdd121 100644
--- a/src/components/settings_modal/helpers/pwa_manifest_icons_setting.js
+++ b/src/components/settings_modal/helpers/pwa_manifest_icons_setting.js
@@ -3,11 +3,8 @@ import { clone } from 'lodash'
 import Attachment from 'src/components/attachment/attachment.vue'
 import MediaUpload from 'src/components/media_upload/media_upload.vue'
 import Select from 'src/components/select/select.vue'
-import Setting from './setting.js'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-
 import { fileTypeExt } from 'src/services/file_type/file_type.service.js'
+import Setting from './setting.js'
 
 export default {
   ...Setting,
@@ -37,7 +34,9 @@ export default {
           url: '',
         }
       }
-      const url = path.includes('://') ? path : useInstanceStore().server + path
+      const url = path.includes('://')
+        ? path
+        : this.$store.state.instance.server + path
 
       return {
         mimetype: fileTypeExt(url),
diff --git a/src/components/settings_modal/helpers/vertical_tab_switcher.jsx b/src/components/settings_modal/helpers/vertical_tab_switcher.jsx
index 1a8e13e18..a3238ce2f 100644
--- a/src/components/settings_modal/helpers/vertical_tab_switcher.jsx
+++ b/src/components/settings_modal/helpers/vertical_tab_switcher.jsx
@@ -8,7 +8,7 @@ import { FontAwesomeIcon as FAIcon } from '@fortawesome/vue-fontawesome'
 
 import './vertical_tab_switcher.scss'
 
-import { useInterfaceStore } from 'src/stores/interface.js'
+import { useInterfaceStore } from 'src/stores/interface'
 
 const findFirstUsable = (slots) => slots.findIndex((_) => _.props)
 
diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index f2c071045..4517c3295 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -6,15 +6,13 @@ import Checkbox from 'src/components/checkbox/checkbox.vue'
 import ConfirmModal from 'src/components/confirm_modal/confirm_modal.vue'
 import Modal from 'src/components/modal/modal.vue'
 import PanelLoading from 'src/components/panel_loading/panel_loading.vue'
-import Popover from '../popover/popover.vue'
-
-import { useInterfaceStore } from 'src/stores/interface.js'
-
 import {
   newExporter,
   newImporter,
 } from 'src/services/export_import/export_import.js'
 import getResettableAsyncComponent from 'src/services/resettable_async_component.js'
+import { useInterfaceStore } from 'src/stores/interface'
+import Popover from '../popover/popover.vue'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faWindowMinimize } from '@fortawesome/free-regular-svg-icons'
diff --git a/src/components/settings_modal/settings_modal_admin_content.js b/src/components/settings_modal/settings_modal_admin_content.js
index 6cd760833..1a3f10e77 100644
--- a/src/components/settings_modal/settings_modal_admin_content.js
+++ b/src/components/settings_modal/settings_modal_admin_content.js
@@ -1,3 +1,4 @@
+import { useInterfaceStore } from 'src/stores/interface'
 import AuthTab from './admin_tabs/auth_tab.vue'
 import EmojiTab from './admin_tabs/emoji_tab.vue'
 import FederationTab from './admin_tabs/federation_tab.vue'
@@ -17,8 +18,6 @@ import RegistrationsTab from './admin_tabs/registrations_tab.vue'
 import UploadsTab from './admin_tabs/uploads_tab.vue'
 import VerticalTabSwitcher from './helpers/vertical_tab_switcher.jsx'
 
-import { useInterfaceStore } from 'src/stores/interface.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faChain,
diff --git a/src/components/settings_modal/settings_modal_user_content.js b/src/components/settings_modal/settings_modal_user_content.js
index ddee812ca..f66099049 100644
--- a/src/components/settings_modal/settings_modal_user_content.js
+++ b/src/components/settings_modal/settings_modal_user_content.js
@@ -1,3 +1,4 @@
+import { useInterfaceStore } from 'src/stores/interface'
 import VerticalTabSwitcher from './helpers/vertical_tab_switcher.jsx'
 import AppearanceTab from './tabs/appearance_tab.vue'
 import ClutterTab from './tabs/clutter_tab.vue'
@@ -15,8 +16,6 @@ import ProfileTab from './tabs/profile_tab.vue'
 import SecurityTab from './tabs/security_tab/security_tab.vue'
 import StyleTab from './tabs/style_tab/style_tab.vue'
 
-import { useInterfaceStore } from 'src/stores/interface.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faBell,
diff --git a/src/components/settings_modal/tabs/appearance_tab.js b/src/components/settings_modal/tabs/appearance_tab.js
index 0a217a216..1110505cc 100644
--- a/src/components/settings_modal/tabs/appearance_tab.js
+++ b/src/components/settings_modal/tabs/appearance_tab.js
@@ -2,18 +2,6 @@ import { mapActions } from 'pinia'
 
 import fileSizeFormatService from 'src/components/../services/file_size_format/file_size_format.js'
 import PaletteEditor from 'src/components/palette_editor/palette_editor.vue'
-import BooleanSetting from '../helpers/boolean_setting.vue'
-import ChoiceSetting from '../helpers/choice_setting.vue'
-import FloatSetting from '../helpers/float_setting.vue'
-import IntegerSetting from '../helpers/integer_setting.vue'
-import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue'
-import SharedComputedObject from '../helpers/shared_computed_object.js'
-import UnitSetting from '../helpers/unit_setting.vue'
-import Preview from './old_theme_tab/theme_preview.vue'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-import { normalizeThemeData, useInterfaceStore } from 'src/stores/interface.js'
-
 import { newImporter } from 'src/services/export_import/export_import.js'
 import {
   adoptStyleSheets,
@@ -23,6 +11,15 @@ import { getCssRules } from 'src/services/theme_data/css_utils.js'
 import { deserialize } from 'src/services/theme_data/iss_deserializer.js'
 import { init } from 'src/services/theme_data/theme_data_3.service.js'
 import { convertTheme2To3 } from 'src/services/theme_data/theme2_to_theme3.js'
+import { normalizeThemeData, useInterfaceStore } from 'src/stores/interface'
+import BooleanSetting from '../helpers/boolean_setting.vue'
+import ChoiceSetting from '../helpers/choice_setting.vue'
+import FloatSetting from '../helpers/float_setting.vue'
+import IntegerSetting from '../helpers/integer_setting.vue'
+import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue'
+import SharedComputedObject from '../helpers/shared_computed_object.js'
+import UnitSetting from '../helpers/unit_setting.vue'
+import Preview from './old_theme_tab/theme_preview.vue'
 
 const AppearanceTab = {
   data() {
@@ -86,7 +83,7 @@ const AppearanceTab = {
 
     const updateIndex = (resource) => {
       const capitalizedResource = resource[0].toUpperCase() + resource.slice(1)
-      const currentIndex = useInstanceStore()[`${resource}sIndex`]
+      const currentIndex = this.$store.state.instance[`${resource}sIndex`]
 
       let promise
       if (currentIndex) {
@@ -276,11 +273,11 @@ const AppearanceTab = {
       return !window.IntersectionObserver
     },
     instanceWallpaper() {
-      useInstanceStore().instanceIdentity.background
+      this.$store.state.instance.background
     },
     instanceWallpaperUsed() {
       return (
-        useInstanceStore().instanceIdentity.background &&
+        this.$store.state.instance.background &&
         !this.$store.state.users.currentUser.background_image
       )
     },
@@ -336,21 +333,18 @@ const AppearanceTab = {
     },
     isThemeActive(key) {
       return (
-        key ===
-        (this.mergedConfig.theme || useInstanceStore().instanceIdentity.theme)
+        key === (this.mergedConfig.theme || this.$store.state.instance.theme)
       )
     },
     isStyleActive(key) {
       return (
-        key ===
-        (this.mergedConfig.style || useInstanceStore().instanceIdentity.style)
+        key === (this.mergedConfig.style || this.$store.state.instance.style)
       )
     },
     isPaletteActive(key) {
       return (
         key ===
-        (this.mergedConfig.palette ||
-          useInstanceStore().instanceIdentity.palette)
+        (this.mergedConfig.palette || this.$store.state.instance.palette)
       )
     },
     ...mapActions(useInterfaceStore, ['setStyle', 'setTheme']),
@@ -437,10 +431,10 @@ const AppearanceTab = {
       if (!file) {
         return
       }
-      if (file.size > useInstanceStore()[slot + 'limit']) {
+      if (file.size > this.$store.state.instance[slot + 'limit']) {
         const filesize = fileSizeFormatService.fileSizeFormat(file.size)
         const allowedsize = fileSizeFormatService.fileSizeFormat(
-          useInstanceStore()[slot + 'limit'],
+          this.$store.state.instance[slot + 'limit'],
         )
         useInterfaceStore().pushGlobalNotice({
           messageKey: 'upload.error.message',
diff --git a/src/components/settings_modal/tabs/clutter_tab.js b/src/components/settings_modal/tabs/clutter_tab.js
index eb7d64a53..c0b7b33b2 100644
--- a/src/components/settings_modal/tabs/clutter_tab.js
+++ b/src/components/settings_modal/tabs/clutter_tab.js
@@ -1,8 +1,10 @@
 import { mapActions, mapState } from 'pinia'
 import { v4 as uuidv4 } from 'uuid'
+import { mapState as mapVuexState } from 'vuex'
 
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import Select from 'src/components/select/select.vue'
+import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import HelpIndicator from '../helpers/help_indicator.vue'
@@ -10,9 +12,6 @@ import IntegerSetting from '../helpers/integer_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import UnitSetting from '../helpers/unit_setting.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
-
 const ClutterTab = {
   components: {
     BooleanSetting,
@@ -25,7 +24,7 @@ const ClutterTab = {
   },
   computed: {
     instanceSpecificPanelPresent() {
-      return useInstanceStore().showInstanceSpecificPanel
+      return this.$store.state.instance.showInstanceSpecificPanel
     },
     ...SharedComputedObject(),
     ...mapState(useServerSideStorageStore, {
@@ -33,8 +32,8 @@ const ClutterTab = {
         Object.entries(store.prefsStorage.simple.muteFilters),
       muteFiltersObject: (store) => store.prefsStorage.simple.muteFilters,
     }),
-    ...mapState(useInstanceStore, {
-      blockExpirationSupported: (store) => store.featureSet.blockExpiration,
+    ...mapVuexState({
+      blockExpirationSupported: (state) => state.instance.blockExpiration,
     }),
     onMuteDefaultActionLv1: {
       get() {
diff --git a/src/components/settings_modal/tabs/composing_tab.js b/src/components/settings_modal/tabs/composing_tab.js
index ba3ddaca8..0b06922e0 100644
--- a/src/components/settings_modal/tabs/composing_tab.js
+++ b/src/components/settings_modal/tabs/composing_tab.js
@@ -4,6 +4,8 @@ import FontControl from 'src/components/font_control/font_control.vue'
 import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
 import ScopeSelector from 'src/components/scope_selector/scope_selector.vue'
 import Select from 'src/components/select/select.vue'
+import localeService from 'src/services/locale/locale.service.js'
+import { cacheKey, clearCache, emojiCacheKey } from 'src/services/sw/sw.js'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import FloatSetting from '../helpers/float_setting.vue'
@@ -12,11 +14,6 @@ import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import UnitSetting from '../helpers/unit_setting.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-
-import localeService from 'src/services/locale/locale.service.js'
-import { cacheKey, clearCache, emojiCacheKey } from 'src/services/sw/sw.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faDatabase,
@@ -111,7 +108,7 @@ const ComposingTab = {
   },
   computed: {
     postFormats() {
-      return useInstanceStore().postFormats || []
+      return this.$store.state.instance.postFormats || []
     },
     postContentOptions() {
       return this.postFormats.map((format) => ({
@@ -132,8 +129,8 @@ const ComposingTab = {
       },
     },
     ...SharedComputedObject(),
-    ...mapState(useInstanceStore, {
-      blockExpirationSupported: (store) => store.featureSet.blockExpiration,
+    ...mapState({
+      blockExpirationSupported: (state) => state.instance.blockExpiration,
     }),
   },
   methods: {
diff --git a/src/components/settings_modal/tabs/data_import_export_tab.js b/src/components/settings_modal/tabs/data_import_export_tab.js
index cc41302c7..dcd63416b 100644
--- a/src/components/settings_modal/tabs/data_import_export_tab.js
+++ b/src/components/settings_modal/tabs/data_import_export_tab.js
@@ -3,8 +3,7 @@ import { mapState } from 'vuex'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import Exporter from 'src/components/exporter/exporter.vue'
 import Importer from 'src/components/importer/importer.vue'
-
-import { useOAuthTokensStore } from 'src/stores/oauth_tokens.js'
+import { useOAuthTokensStore } from 'src/stores/oauth_tokens'
 
 const DataImportExportTab = {
   data() {
diff --git a/src/components/settings_modal/tabs/developer_tab.js b/src/components/settings_modal/tabs/developer_tab.js
index b500d2f03..60f2ecb36 100644
--- a/src/components/settings_modal/tabs/developer_tab.js
+++ b/src/components/settings_modal/tabs/developer_tab.js
@@ -1,16 +1,13 @@
+import { cacheKey, clearCache, emojiCacheKey } from 'src/services/sw/sw.js'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-
-import { cacheKey, clearCache, emojiCacheKey } from 'src/services/sw/sw.js'
-
 const pleromaFeCommitUrl =
   'https://git.pleroma.social/pleroma/pleroma-fe/commit/'
 
 const VersionTab = {
   data() {
-    const instance = useInstanceStore()
+    const instance = this.$store.state.instance
     return {
       backendVersion: instance.backendVersion,
       backendRepository: instance.backendRepository,
diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js
index 0e6c6c725..8bd2b913d 100644
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -1,9 +1,16 @@
 import { cloneDeep } from 'lodash'
 import { mapActions, mapState } from 'pinia'
 import { v4 as uuidv4 } from 'uuid'
+import { mapState as mapVuexState } from 'vuex'
 
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import Select from 'src/components/select/select.vue'
+import {
+  newExporter,
+  newImporter,
+} from 'src/services/export_import/export_import.js'
+import { useInterfaceStore } from 'src/stores/interface'
+import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import HelpIndicator from '../helpers/help_indicator.vue'
@@ -11,15 +18,6 @@ import IntegerSetting from '../helpers/integer_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import UnitSetting from '../helpers/unit_setting.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface'
-import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
-
-import {
-  newExporter,
-  newImporter,
-} from 'src/services/export_import/export_import.js'
-
 const SUPPORTED_TYPES = new Set(['word', 'regexp', 'user', 'user_regexp'])
 
 const FilteringTab = {
@@ -92,7 +90,7 @@ const FilteringTab = {
   },
   computed: {
     instanceSpecificPanelPresent() {
-      return useInstanceStore().instanceIdentity.showInstanceSpecificPanel
+      return this.$store.state.instance.showInstanceSpecificPanel
     },
     ...SharedComputedObject(),
     ...mapState(useServerSideStorageStore, {
@@ -100,8 +98,8 @@ const FilteringTab = {
         Object.entries(store.prefsStorage.simple.muteFilters),
       muteFiltersObject: (store) => store.prefsStorage.simple.muteFilters,
     }),
-    ...mapState(useInstanceStore, {
-      blockExpirationSupported: (store) => store.featureSet.blockExpiration,
+    ...mapVuexState({
+      blockExpirationSupported: (state) => state.instance.blockExpiration,
     }),
     onMuteDefaultActionLv1: {
       get() {
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index 3f2530278..cf98fd182 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -1,7 +1,8 @@
-import { mapState } from 'pinia'
+import { mapState } from 'vuex'
 
 import FontControl from 'src/components/font_control/font_control.vue'
 import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
+import localeService from 'src/services/locale/locale.service.js'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import FloatSetting from '../helpers/float_setting.vue'
@@ -9,10 +10,6 @@ import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import UnitSetting from '../helpers/unit_setting.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-
-import localeService from 'src/services/locale/locale.service.js'
-
 const GeneralTab = {
   props: {
     parentCollapsed: {
@@ -52,8 +49,8 @@ const GeneralTab = {
       },
     },
     ...SharedComputedObject(),
-    ...mapState(useInstanceStore, {
-      blockExpirationSupported: (store) => store.featureSet.blockExpiration,
+    ...mapState({
+      blockExpirationSupported: (state) => state.instance.blockExpiration,
     }),
   },
   methods: {
diff --git a/src/components/settings_modal/tabs/layout_tab.js b/src/components/settings_modal/tabs/layout_tab.js
index 9accd1979..3fc18491c 100644
--- a/src/components/settings_modal/tabs/layout_tab.js
+++ b/src/components/settings_modal/tabs/layout_tab.js
@@ -4,8 +4,6 @@ import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import UnitSetting from '../helpers/unit_setting.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-
 const GeneralTab = {
   props: {
     parentCollapsed: {
@@ -32,10 +30,10 @@ const GeneralTab = {
   },
   computed: {
     postFormats() {
-      return useInstanceStore().featureSet.postFormats || []
+      return this.$store.state.instance.postFormats || []
     },
     instanceShoutboxPresent() {
-      return useInstanceStore().featureSet.shoutAvailable
+      return this.$store.state.instance.shoutAvailable
     },
     columns() {
       const mode = this.$store.getters.mergedConfig.thirdColumnMode
diff --git a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
index 34474e605..55087d1e2 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
@@ -12,9 +12,7 @@ import MuteCard from 'src/components/mute_card/mute_card.vue'
 import ProgressButton from 'src/components/progress_button/progress_button.vue'
 import SelectableList from 'src/components/selectable_list/selectable_list.vue'
 import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useOAuthTokensStore } from 'src/stores/oauth_tokens.js'
+import { useOAuthTokensStore } from 'src/stores/oauth_tokens'
 
 const BlockList = withLoadMore({
   fetch: (props, $store) => $store.dispatch('fetchBlocks'),
@@ -66,7 +64,7 @@ const MutesAndBlocks = {
   },
   computed: {
     knownDomains() {
-      return useInstanceStore().knownDomains
+      return this.$store.state.instance.knownDomains
     },
     user() {
       return this.$store.state.users.currentUser
diff --git a/src/components/settings_modal/tabs/old_theme_tab/old_theme_tab.js b/src/components/settings_modal/tabs/old_theme_tab/old_theme_tab.js
index 549803265..c79c72e70 100644
--- a/src/components/settings_modal/tabs/old_theme_tab/old_theme_tab.js
+++ b/src/components/settings_modal/tabs/old_theme_tab/old_theme_tab.js
@@ -7,11 +7,6 @@ import RangeInput from 'src/components/range_input/range_input.vue'
 import Select from 'src/components/select/select.vue'
 import ShadowControl from 'src/components/shadow_control/shadow_control.vue'
 import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
-import Preview from './theme_preview.vue'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-
 import {
   getContrastRatioLayers,
   hex2rgb,
@@ -46,6 +41,8 @@ import {
 } from 'src/services/theme_data/theme_data.service.js'
 import { init } from 'src/services/theme_data/theme_data_3.service.js'
 import { convertTheme2To3 } from 'src/services/theme_data/theme2_to_theme3.js'
+import { useInterfaceStore } from 'src/stores/interface'
+import Preview from './theme_preview.vue'
 
 // List of color values used in v1
 const v1OnlyNames = [
@@ -128,7 +125,7 @@ export default {
     }
   },
   created() {
-    const currentIndex = useInstanceStore().themesIndex
+    const currentIndex = this.$store.state.instance.themesIndex
 
     let promise
     if (currentIndex) {
diff --git a/src/components/settings_modal/tabs/security_tab/security_tab.js b/src/components/settings_modal/tabs/security_tab/security_tab.js
index c24ff8b6f..3bc02829a 100644
--- a/src/components/settings_modal/tabs/security_tab/security_tab.js
+++ b/src/components/settings_modal/tabs/security_tab/security_tab.js
@@ -1,11 +1,8 @@
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import ProgressButton from 'src/components/progress_button/progress_button.vue'
-import Mfa from './mfa.vue'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useOAuthTokensStore } from 'src/stores/oauth_tokens'
-
 import localeService from 'src/services/locale/locale.service.js'
+import { useOAuthTokensStore } from 'src/stores/oauth_tokens'
+import Mfa from './mfa.vue'
 
 const SecurityTab = {
   data() {
@@ -45,7 +42,7 @@ const SecurityTab = {
       return this.$store.state.users.currentUser
     },
     pleromaExtensionsAvailable() {
-      return useInstanceStore().featureSet.pleromaExtensionsAvailable
+      return this.$store.state.instance.pleromaExtensionsAvailable
     },
     oauthTokens() {
       return useOAuthTokensStore().tokens.map((oauthToken) => {
diff --git a/src/components/settings_modal/tabs/style_tab/style_tab.js b/src/components/settings_modal/tabs/style_tab/style_tab.js
index 6c2366999..7fa55761a 100644
--- a/src/components/settings_modal/tabs/style_tab/style_tab.js
+++ b/src/components/settings_modal/tabs/style_tab/style_tab.js
@@ -20,12 +20,6 @@ import SelectMotion from 'src/components/select/select_motion.vue'
 import ShadowControl from 'src/components/shadow_control/shadow_control.vue'
 import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
 import Tooltip from 'src/components/tooltip/tooltip.vue'
-import StringSetting from '../../helpers/string_setting.vue'
-import Preview from '../old_theme_tab/theme_preview.vue'
-import VirtualDirectivesTab from './virtual_directives_tab.vue'
-
-import { useInterfaceStore } from 'src/stores/interface'
-
 import {
   getContrastRatio,
   hex2rgb,
@@ -49,6 +43,10 @@ import {
   findColor,
   init,
 } from 'src/services/theme_data/theme_data_3.service.js'
+import { useInterfaceStore } from 'src/stores/interface'
+import StringSetting from '../../helpers/string_setting.vue'
+import Preview from '../old_theme_tab/theme_preview.vue'
+import VirtualDirectivesTab from './virtual_directives_tab.vue'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
diff --git a/src/components/settings_modal/tabs/style_tab/virtual_directives_tab.js b/src/components/settings_modal/tabs/style_tab/virtual_directives_tab.js
index 70a24010b..d52c0084c 100644
--- a/src/components/settings_modal/tabs/style_tab/virtual_directives_tab.js
+++ b/src/components/settings_modal/tabs/style_tab/virtual_directives_tab.js
@@ -4,7 +4,6 @@ import ColorInput from 'src/components/color_input/color_input.vue'
 import Select from 'src/components/select/select.vue'
 import SelectMotion from 'src/components/select/select_motion.vue'
 import ShadowControl from 'src/components/shadow_control/shadow_control.vue'
-
 import { serializeShadow } from 'src/services/theme_data/iss_serializer.js'
 
 // helper for debugging
diff --git a/src/components/shadow_control/shadow_control.js b/src/components/shadow_control/shadow_control.js
index 066fe9d71..a7613923c 100644
--- a/src/components/shadow_control/shadow_control.js
+++ b/src/components/shadow_control/shadow_control.js
@@ -7,7 +7,6 @@ import OpacityInput from 'src/components/opacity_input/opacity_input.vue'
 import Popover from 'src/components/popover/popover.vue'
 import Select from 'src/components/select/select.vue'
 import SelectMotion from 'src/components/select/select_motion.vue'
-
 import { rgb2hex } from 'src/services/color_convert/color_convert.js'
 import {
   getCssShadow,
diff --git a/src/components/shout_panel/shout_panel.js b/src/components/shout_panel/shout_panel.js
index fd0f6912b..6cb6a53b0 100644
--- a/src/components/shout_panel/shout_panel.js
+++ b/src/components/shout_panel/shout_panel.js
@@ -1,7 +1,5 @@
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useShoutStore } from 'src/stores/shout.js'
-
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+import { useShoutStore } from 'src/stores/shout'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faBullhorn, faTimes } from '@fortawesome/free-solid-svg-icons'
@@ -34,7 +32,7 @@ const shoutPanel = {
       return generateProfileLink(
         user.id,
         user.username,
-        useInstanceStore().restrictedNicknames,
+        this.$store.state.instance.restrictedNicknames,
       )
     },
   },
diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
index 0f7b06990..b12cef86e 100644
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@@ -1,16 +1,14 @@
-import { mapActions, mapState } from 'pinia'
-import { mapGetters } from 'vuex'
+import { mapState as mapPiniaState } from 'pinia'
+import { mapGetters, mapState } from 'vuex'
 
 import { USERNAME_ROUTES } from 'src/components/navigation/navigation.js'
+import { useAnnouncementsStore } from 'src/stores/announcements'
+import { useInterfaceStore } from 'src/stores/interface'
+import { useShoutStore } from 'src/stores/shout'
 import GestureService from '../../services/gesture_service/gesture_service'
 import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
 import UserCard from '../user_card/user_card.vue'
 
-import { useAnnouncementsStore } from 'src/stores/announcements'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface'
-import { useShoutStore } from 'src/stores/shout'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faBell,
@@ -76,14 +74,26 @@ const SideDrawer = {
     unseenNotificationsCount() {
       return this.unseenNotifications.length
     },
+    suggestionsEnabled() {
+      return this.$store.state.instance.suggestionsEnabled
+    },
+    logo() {
+      return this.$store.state.instance.logo
+    },
+    hideSitename() {
+      return this.$store.state.instance.hideSitename
+    },
+    sitename() {
+      return this.$store.state.instance.name
+    },
     followRequestCount() {
       return this.$store.state.api.followRequests.length
     },
     privateMode() {
-      return useInstanceStore().private
+      return this.$store.state.instance.private
     },
     federating() {
-      return useInstanceStore().federating
+      return this.$store.state.instance.federating
     },
     timelinesRoute() {
       let name
@@ -97,18 +107,13 @@ const SideDrawer = {
         return { name }
       }
     },
-    ...mapState(useAnnouncementsStore, [
-      'supportsAnnouncements',
-      'unreadAnnouncementCount',
-    ]),
-    ...mapState(useInstanceStore, ['private', 'federating']),
-    ...mapState(useInstanceStore, {
-      logo: (store) => store.instanceIdentity.logo,
-      sitename: (store) => store.instanceIdentity.name,
-      hideSitename: (store) => store.instanceIdentity.hideSitename,
-      pleromaChatMessagesAvailable: (store) =>
-        store.featureSet.pleromaChatMessagesAvailable,
-      suggestionsEnabled: (store) => store.featureSet.suggestionsEnabled,
+    ...mapPiniaState(useAnnouncementsStore, {
+      supportsAnnouncements: (store) => store.supportsAnnouncements,
+      unreadAnnouncementCount: 'unreadAnnouncementCount',
+    }),
+    ...mapState({
+      pleromaChatMessagesAvailable: (state) =>
+        state.instance.pleromaChatMessagesAvailable,
     }),
     ...mapGetters(['unreadChatCount', 'draftCount']),
   },
@@ -126,7 +131,12 @@ const SideDrawer = {
     touchMove(e) {
       GestureService.updateSwipe(e, this.closeGesture)
     },
-    ...mapActions(useInterfaceStore, ['openSettingsModal']),
+    openSettingsModal() {
+      useInterfaceStore().openSettingsModal('user')
+    },
+    openAdminModal() {
+      useInterfaceStore().openSettingsModal('admin')
+    },
   },
 }
 
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index c034edf91..eda60a96a 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -198,7 +198,7 @@
         <li @click="toggleDrawer">
           <button
             class="menu-item"
-            @click="openSettingsModal('user')"
+            @click="openSettingsModal"
           >
             <FAIcon
               fixed-width
@@ -225,7 +225,7 @@
         >
           <button
             class="menu-item"
-            @click.stop="openSettingsModal('admin')"
+            @click.stop="openAdminModal"
           >
             <FAIcon
               fixed-width
diff --git a/src/components/staff_panel/staff_panel.js b/src/components/staff_panel/staff_panel.js
index 3f271f4d3..0b7dc8b57 100644
--- a/src/components/staff_panel/staff_panel.js
+++ b/src/components/staff_panel/staff_panel.js
@@ -4,11 +4,9 @@ import { mapGetters, mapState } from 'vuex'
 
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-
 const StaffPanel = {
   created() {
-    const nicknames = useInstanceStore().staffAccounts
+    const nicknames = this.$store.state.instance.staffAccounts
     nicknames.forEach((nickname) =>
       this.$store.dispatch('fetchUserIfMissing', nickname),
     )
@@ -30,7 +28,7 @@ const StaffPanel = {
     },
     ...mapGetters(['findUserByName']),
     ...mapState({
-      staffAccounts: (state) => useInstanceStore().staffAccounts,
+      staffAccounts: (state) => state.instance.staffAccounts,
     }),
   },
 }
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 66acae0d3..1673a6933 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -4,6 +4,8 @@ import MentionLink from 'src/components/mention_link/mention_link.vue'
 import MentionsLine from 'src/components/mentions_line/mentions_line.vue'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
 import StatusActionButtons from 'src/components/status_action_buttons/status_action_buttons.vue'
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
 import { muteFilterHits } from '../../services/status_parser/status_parser.js'
 import {
   highlightClass,
@@ -20,11 +22,6 @@ import UserLink from '../user_link/user_link.vue'
 import UserListPopover from '../user_list_popover/user_list_popover.vue'
 import UserPopover from '../user_popover/user_popover.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
-
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faAngleDoubleRight,
@@ -497,7 +494,7 @@ const Status = {
       return this.status.edited_at !== null
     },
     editingAvailable() {
-      return useInstanceStore().featureSet.editingAvailable
+      return this.$store.state.instance.editingAvailable
     },
     hasVisibleQuote() {
       return this.status.quote_url && this.status.quote_visible
@@ -591,7 +588,7 @@ const Status = {
       return generateProfileLink(
         id,
         name,
-        useInstanceStore().restrictedNicknames,
+        this.$store.state.instance.restrictedNicknames,
       )
     },
     addMediaPlaying(id) {
diff --git a/src/components/status_action_buttons/action_button.js b/src/components/status_action_buttons/action_button.js
index f6946f7c2..5badd87e7 100644
--- a/src/components/status_action_buttons/action_button.js
+++ b/src/components/status_action_buttons/action_button.js
@@ -2,8 +2,6 @@ import EmojiPicker from 'src/components/emoji_picker/emoji_picker.vue'
 import Popover from 'src/components/popover/popover.vue'
 import StatusBookmarkFolderMenu from 'src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faBookmark as faBookmarkRegular,
@@ -93,7 +91,7 @@ export default {
       return this.status.thread_muted
     },
     hideCustomEmoji() {
-      return !useInstanceStore().pleromaCustomEmojiReactionsAvailable
+      return !this.$store.state.instance.pleromaCustomEmojiReactionsAvailable
     },
     buttonInnerClass() {
       return [
@@ -109,7 +107,7 @@ export default {
       ]
     },
     remoteInteractionLink() {
-      return useInstanceStore().getRemoteInteractionLink({
+      return this.$store.getters.remoteInteractionLink({
         statusId: this.status.id,
       })
     },
diff --git a/src/components/status_action_buttons/buttons_definitions.js b/src/components/status_action_buttons/buttons_definitions.js
index 4e0baaa61..d1a6845d1 100644
--- a/src/components/status_action_buttons/buttons_definitions.js
+++ b/src/components/status_action_buttons/buttons_definitions.js
@@ -1,5 +1,4 @@
 import { useEditStatusStore } from 'src/stores/editStatus.js'
-import { useInstanceStore } from 'src/stores/instance.js'
 import { useReportsStore } from 'src/stores/reports.js'
 import { useStatusHistoryStore } from 'src/stores/statusHistory.js'
 
@@ -160,10 +159,7 @@ export const BUTTONS = [
     icon: 'history',
     label: 'status.status_history',
     if({ status, state }) {
-      return (
-        useInstanceStore().featureSet.editingAvailable &&
-        status.edited_at !== null
-      )
+      return state.instance.editingAvailable && status.edited_at !== null
     },
     action({ status }) {
       const originalStatus = { ...status }
@@ -193,7 +189,7 @@ export const BUTTONS = [
     if({ status, loggedIn, currentUser, state }) {
       return (
         loggedIn &&
-        useInstanceStore().featureSet.editingAvailable &&
+        state.instance.editingAvailable &&
         status.user.id === currentUser.id
       )
     },
@@ -247,7 +243,7 @@ export const BUTTONS = [
     action({ state, status, router }) {
       navigator.clipboard.writeText(
         [
-          useInstanceStore().server,
+          state.instance.server,
           router.resolve({ name: 'conversation', params: { id: status.id } })
             .href,
         ].join(''),
diff --git a/src/components/status_action_buttons/status_action_buttons.js b/src/components/status_action_buttons/status_action_buttons.js
index 2e08797c8..8473a0db1 100644
--- a/src/components/status_action_buttons/status_action_buttons.js
+++ b/src/components/status_action_buttons/status_action_buttons.js
@@ -2,13 +2,11 @@ import { mapState } from 'pinia'
 
 import ConfirmModal from 'src/components/confirm_modal/confirm_modal.vue'
 import Popover from 'src/components/popover/popover.vue'
+import genRandomSeed from 'src/services/random_seed/random_seed.service.js'
+import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
 import ActionButtonContainer from './action_button_container.vue'
 import { BUTTONS } from './buttons_definitions.js'
 
-import { useServerSideStorageStore } from 'src/stores/serverSideStorage.js'
-
-import genRandomSeed from 'src/services/random_seed/random_seed.service.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faEllipsisH } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/status_body/status_body.js b/src/components/status_body/status_body.js
index 4a3872895..80f8400b6 100644
--- a/src/components/status_body/status_body.js
+++ b/src/components/status_body/status_body.js
@@ -1,7 +1,6 @@
 import { mapGetters } from 'vuex'
 
 import RichContent from 'src/components/rich_content/rich_content.jsx'
-
 import fileType from 'src/services/file_type/file_type.service'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
diff --git a/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.js b/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.js
index a3c97ffe6..4aa617832 100644
--- a/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.js
+++ b/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.js
@@ -2,8 +2,7 @@ import { mapState } from 'pinia'
 
 import Popover from 'src/components/popover/popover.vue'
 import StillImage from 'src/components/still-image/still-image.vue'
-
-import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
+import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronRight, faFolder } from '@fortawesome/free-solid-svg-icons'
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index a00792826..51bfe6f1e 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -1,13 +1,12 @@
 import { mapGetters, mapState } from 'vuex'
 
 import StatusBody from 'src/components/status_body/status_body.vue'
+import { useMediaViewerStore } from 'src/stores/media_viewer'
 import Attachment from '../attachment/attachment.vue'
 import Gallery from '../gallery/gallery.vue'
 import LinkPreview from '../link-preview/link-preview.vue'
 import Poll from '../poll/poll.vue'
 
-import { useMediaViewerStore } from 'src/stores/media_viewer.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faCircleNotch,
diff --git a/src/components/status_history_modal/status_history_modal.js b/src/components/status_history_modal/status_history_modal.js
index 2cf97d893..1ad48ace3 100644
--- a/src/components/status_history_modal/status_history_modal.js
+++ b/src/components/status_history_modal/status_history_modal.js
@@ -1,10 +1,9 @@
 import { get } from 'lodash'
 
+import { useStatusHistoryStore } from 'src/stores/statusHistory'
 import Modal from '../modal/modal.vue'
 import Status from '../status/status.vue'
 
-import { useStatusHistoryStore } from 'src/stores/statusHistory.js'
-
 const StatusHistoryModal = {
   components: {
     Modal,
diff --git a/src/components/sticker_picker/sticker_picker.js b/src/components/sticker_picker/sticker_picker.js
index 949d2ecf9..6a6aed862 100644
--- a/src/components/sticker_picker/sticker_picker.js
+++ b/src/components/sticker_picker/sticker_picker.js
@@ -1,11 +1,7 @@
 /* eslint-env browser */
-
 import statusPosterService from '../../services/status_poster/status_poster.service.js'
 import TabSwitcher from '../tab_switcher/tab_switcher.jsx'
 
-import { useEmojiStore } from 'src/stores/emoji.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-
 const StickerPicker = {
   components: {
     TabSwitcher,
@@ -20,7 +16,7 @@ const StickerPicker = {
   },
   computed: {
     pack() {
-      return useEmojiStore().stickers || []
+      return this.$store.state.instance.stickers || []
     },
   },
   methods: {
diff --git a/src/components/still-image/still-image-emoji-popover.vue b/src/components/still-image/still-image-emoji-popover.vue
index 4e087c094..f8ff89a6f 100644
--- a/src/components/still-image/still-image-emoji-popover.vue
+++ b/src/components/still-image/still-image-emoji-popover.vue
@@ -60,10 +60,8 @@ import Popover from 'components/popover/popover.vue'
 import SelectComponent from 'components/select/select.vue'
 import { assign } from 'lodash'
 
-import StillImage from './still-image.vue'
-
-import { useInstanceStore } from 'src/stores/instance.js'
 import { useInterfaceStore } from 'src/stores/interface'
+import StillImage from './still-image.vue'
 
 export default {
   components: { StillImage, Popover, SelectComponent },
@@ -127,7 +125,7 @@ export default {
       const allPacks = {}
 
       return listFunction({
-        instance: useInstanceStore().server,
+        instance: this.$store.state.instance.server,
         page: 1,
         pageSize: 0,
       })
@@ -142,7 +140,7 @@ export default {
             resultingPromise = resultingPromise
               .then(() =>
                 listFunction({
-                  instance: useInstanceStore().server,
+                  instance: this.$store.state.instance.server,
                   page: i,
                   pageSize,
                 }),
diff --git a/src/components/tab_switcher/tab_switcher.jsx b/src/components/tab_switcher/tab_switcher.jsx
index b485b3ff8..a495ddd51 100644
--- a/src/components/tab_switcher/tab_switcher.jsx
+++ b/src/components/tab_switcher/tab_switcher.jsx
@@ -7,7 +7,7 @@ import { FontAwesomeIcon as FAIcon } from '@fortawesome/vue-fontawesome'
 
 import './tab_switcher.scss'
 
-import { useInterfaceStore } from 'src/stores/interface.js'
+import { useInterfaceStore } from 'src/stores/interface'
 
 const findFirstUsable = (slots) => slots.findIndex((_) => _.props)
 
diff --git a/src/components/terms_of_service_panel/terms_of_service_panel.js b/src/components/terms_of_service_panel/terms_of_service_panel.js
index 64a745455..e250ba5af 100644
--- a/src/components/terms_of_service_panel/terms_of_service_panel.js
+++ b/src/components/terms_of_service_panel/terms_of_service_panel.js
@@ -1,12 +1,12 @@
-import { mapState } from 'pinia'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-
 const TermsOfServicePanel = {
-  computed: mapState(useInstanceStore, {
-    content: (store) => store.instanceIdentity.tos,
-    embedded: (store) => store.instanceIdentity.embeddedToS,
-  }),
+  computed: {
+    content() {
+      return this.$store.state.instance.tos
+    },
+    embedded() {
+      return this.$store.state.instance.embeddedToS
+    },
+  },
 }
 
 export default TermsOfServicePanel
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 4616a4111..afb1690e0 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -1,6 +1,8 @@
 import { debounce, keyBy, throttle } from 'lodash'
 import { mapState } from 'pinia'
 
+import timelineFetcher from 'src/services/timeline_fetcher/timeline_fetcher.service.js'
+import { useInterfaceStore } from 'src/stores/interface'
 import Conversation from '../conversation/conversation.vue'
 import QuickFilterSettings from '../quick_filter_settings/quick_filter_settings.vue'
 import QuickViewSettings from '../quick_view_settings/quick_view_settings.vue'
@@ -8,10 +10,6 @@ import ScrollTopButton from '../scroll_top_button/scroll_top_button.vue'
 import Status from '../status/status.vue'
 import TimelineMenu from '../timeline_menu/timeline_menu.vue'
 
-import { useInterfaceStore } from 'src/stores/interface.js'
-
-import timelineFetcher from 'src/services/timeline_fetcher/timeline_fetcher.service.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faArrowUp,
diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js
index ebbe803c7..97c4dbe35 100644
--- a/src/components/timeline_menu/timeline_menu.js
+++ b/src/components/timeline_menu/timeline_menu.js
@@ -1,18 +1,15 @@
-import { mapState as mapPiniaState } from 'pinia'
 import { mapState } from 'vuex'
 
 import { filterNavigation } from 'src/components/navigation/filter.js'
 import { TIMELINES } from 'src/components/navigation/navigation.js'
 import NavigationEntry from 'src/components/navigation/navigation_entry.vue'
+import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders'
+import { useInterfaceStore } from 'src/stores/interface'
+import { useListsStore } from 'src/stores/lists'
 import BookmarkFoldersMenuContent from '../bookmark_folders_menu/bookmark_folders_menu_content.vue'
 import ListsMenuContent from '../lists_menu/lists_menu_content.vue'
 import Popover from '../popover/popover.vue'
 
-import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface'
-import { useListsStore } from 'src/stores/lists'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronDown } from '@fortawesome/free-solid-svg-icons'
 
@@ -61,16 +58,13 @@ const TimelineMenu = {
         (route === 'bookmark-folder' || route === 'bookmarks')
       )
     },
-    ...mapPiniaState(useInstanceStore, ['private', 'federating']),
-    ...mapPiniaState(useInstanceStore, {
-      pleromaChatMessagesAvailable: (store) =>
-        store.featureSet.pleromaChatMessagesAvailable,
-      bookmarkFolders: (store) =>
-        store.featureSet.pleromaBookmarkFoldersAvailable,
-      bubbleTimeline: (store) => store.featureSet.localBubble,
-    }),
     ...mapState({
       currentUser: (state) => state.users.currentUser,
+      privateMode: (state) => state.instance.private,
+      federating: (state) => state.instance.federating,
+      bookmarkFolders: (state) =>
+        state.instance.pleromaBookmarkFoldersAvailable,
+      bubbleTimeline: (state) => state.instance.localBubbleInstances.length > 0,
     }),
     timelinesList() {
       return filterNavigation(
@@ -78,7 +72,7 @@ const TimelineMenu = {
         {
           hasChats: this.pleromaChatMessagesAvailable,
           isFederating: this.federating,
-          isPrivate: this.private,
+          isPrivate: this.privateMode,
           currentUser: this.currentUser,
           supportsBookmarkFolders: this.bookmarkFolders,
           supportsBubbleTimeline: this.bubbleTimeline,
diff --git a/src/components/update_notification/update_notification.js b/src/components/update_notification/update_notification.js
index a8bc60676..a2cb9e5c1 100644
--- a/src/components/update_notification/update_notification.js
+++ b/src/components/update_notification/update_notification.js
@@ -1,10 +1,7 @@
-import Modal from 'src/components/modal/modal.vue'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useServerSideStorageStore } from 'src/stores/serverSideStorage.js'
-
 import pleromaTanFoxMask from 'src/assets/pleromatan_apology_fox_mask.png'
 import pleromaTanMask from 'src/assets/pleromatan_apology_mask.png'
+import Modal from 'src/components/modal/modal.vue'
+import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faTimes } from '@fortawesome/free-solid-svg-icons'
@@ -39,7 +36,7 @@ const UpdateNotification = {
     },
     shouldShow() {
       return (
-        !useInstanceStore().disableUpdateNotification &&
+        !this.$store.state.instance.disableUpdateNotification &&
         this.$store.state.users.currentUser &&
         useServerSideStorageStore().flagStorage.updateCounter <
           CURRENT_UPDATE_COUNTER &&
diff --git a/src/components/user_avatar/user_avatar.js b/src/components/user_avatar/user_avatar.js
index fdf766f58..a8bd03d49 100644
--- a/src/components/user_avatar/user_avatar.js
+++ b/src/components/user_avatar/user_avatar.js
@@ -1,8 +1,6 @@
+import { useInterfaceStore } from 'src/stores/interface'
 import StillImage from '../still-image/still-image.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faPeopleGroup, faRobot } from '@fortawesome/free-solid-svg-icons'
 
@@ -37,7 +35,7 @@ const UserAvatar = {
   data() {
     return {
       showPlaceholder: false,
-      defaultAvatar: `${useInstanceStore().server + useInstanceStore().defaultAvatar}`,
+      defaultAvatar: `${this.$store.state.instance.server + this.$store.state.instance.defaultAvatar}`,
       betterShadow: useInterfaceStore().browserSupport.cssFilter,
     }
   },
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index 5cbb8b6d7..0786e5b35 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -11,6 +11,10 @@ import suggestor from 'src/components/emoji_input/suggestor.js'
 import ImageCropper from 'src/components/image_cropper/image_cropper.vue'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
 import UserTimedFilterModal from 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue'
+import { propsToNative } from 'src/services/attributes_helper/attributes_helper.service.js'
+import localeService from 'src/services/locale/locale.service.js'
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+import { usePostStatusStore } from 'src/stores/post_status'
 import { useInterfaceStore } from '../../stores/interface'
 import { useMediaViewerStore } from '../../stores/media_viewer'
 import AccountActions from '../account_actions/account_actions.vue'
@@ -23,14 +27,6 @@ import UserAvatar from '../user_avatar/user_avatar.vue'
 import UserLink from '../user_link/user_link.vue'
 import UserNote from '../user_note/user_note.vue'
 
-import { useEmojiStore } from 'src/stores/emoji.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { usePostStatusStore } from 'src/stores/post_status'
-
-import { propsToNative } from 'src/services/attributes_helper/attributes_helper.service.js'
-import localeService from 'src/services/locale/locale.service.js'
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faBell,
@@ -180,7 +176,7 @@ export default {
       return false
     },
     groupActorAvailable() {
-      return useInstanceStore().featureSet.groupActorAvailable
+      return this.$store.state.instance.groupActorAvailable
     },
     availableActorTypes() {
       return this.groupActorAvailable
@@ -213,7 +209,7 @@ export default {
       return Math.round(this.user.statuses_count / days)
     },
     emoji() {
-      return useEmojiStore().customEmoji.map((e) => ({
+      return this.$store.state.instance.customEmoji.map((e) => ({
         shortcode: e.displayText,
         static_url: e.imageUrl,
         url: e.imageUrl,
@@ -340,18 +336,18 @@ export default {
     },
     defaultAvatar() {
       return (
-        useInstanceStore().server +
-        useInstanceStore().instanceIdentity.defaultAvatar
+        this.$store.state.instance.server +
+        this.$store.state.instance.defaultAvatar
       )
     },
     defaultBanner() {
       return (
-        useInstanceStore().server +
-        useInstanceStore().instanceIdentity.defaultBanner
+        this.$store.state.instance.server +
+        this.$store.state.instance.defaultBanner
       )
     },
     isDefaultAvatar() {
-      const baseAvatar = useInstanceStore().defaultAvatar
+      const baseAvatar = this.$store.state.instance.defaultAvatar
       return (
         !this.$store.state.users.currentUser.profile_image_url ||
         this.$store.state.users.currentUser.profile_image_url.includes(
@@ -360,14 +356,14 @@ export default {
       )
     },
     isDefaultBanner() {
-      const baseBanner = useInstanceStore().defaultBanner
+      const baseBanner = this.$store.state.instance.defaultBanner
       return (
         !this.$store.state.users.currentUser.cover_photo ||
         this.$store.state.users.currentUser.cover_photo.includes(baseBanner)
       )
     },
     fieldsLimits() {
-      return useInstanceStore().limits.fieldsLimits
+      return this.$store.state.instance.fieldsLimits
     },
     maxFields() {
       return this.fieldsLimits ? this.fieldsLimits.maxFields : 0
@@ -376,7 +372,7 @@ export default {
       return suggestor({
         emoji: [
           ...this.$store.getters.standardEmojiList,
-          ...useEmojiStore().customEmoji,
+          ...this.$store.state.instance.customEmoji,
         ],
         store: this.$store,
       })
@@ -385,7 +381,7 @@ export default {
       return suggestor({
         emoji: [
           ...this.$store.getters.standardEmojiList,
-          ...useEmojiStore().customEmoji,
+          ...this.$store.state.instance.customEmoji,
         ],
       })
     },
@@ -416,7 +412,7 @@ export default {
       return generateProfileLink(
         user.id,
         user.screen_name,
-        useInstanceStore().restrictedNicknames,
+        this.$store.state.instance.restrictedNicknames,
       )
     },
     openProfileTab() {
diff --git a/src/components/user_link/user_link.vue b/src/components/user_link/user_link.vue
index e8a4ac4a7..059508f49 100644
--- a/src/components/user_link/user_link.vue
+++ b/src/components/user_link/user_link.vue
@@ -14,11 +14,8 @@
 </template>
 
 <script>
-import UnicodeDomainIndicator from '../unicode_domain_indicator/unicode_domain_indicator.vue'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+import UnicodeDomainIndicator from '../unicode_domain_indicator/unicode_domain_indicator.vue'
 
 const UserLink = {
   props: {
@@ -36,7 +33,7 @@ const UserLink = {
       return generateProfileLink(
         user.id,
         user.screen_name,
-        useInstanceStore().restrictedNicknames,
+        this.$store.state.instance.restrictedNicknames,
       )
     },
   },
diff --git a/src/components/user_list_menu/user_list_menu.js b/src/components/user_list_menu/user_list_menu.js
index 47a84a6bb..b30a8808f 100644
--- a/src/components/user_list_menu/user_list_menu.js
+++ b/src/components/user_list_menu/user_list_menu.js
@@ -1,10 +1,9 @@
 import { mapState } from 'pinia'
 
+import { useListsStore } from 'src/stores/lists'
 import DialogModal from '../dialog_modal/dialog_modal.vue'
 import Popover from '../popover/popover.vue'
 
-import { useListsStore } from 'src/stores/lists.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronRight } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index d40103293..73fc81a9e 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -9,8 +9,6 @@ import List from '../list/list.vue'
 import Timeline from '../timeline/timeline.vue'
 import UserCard from '../user_card/user_card.vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
 
@@ -89,7 +87,7 @@ const UserProfile = {
     favoritesTabVisible() {
       return (
         this.isUs ||
-        (useInstanceStore().featureSet.pleromaPublicFavouritesAvailable &&
+        (this.$store.state.instance.pleromaPublicFavouritesAvailable &&
           !this.user.hide_favorites)
       )
     },
diff --git a/src/components/user_reporting_modal/user_reporting_modal.js b/src/components/user_reporting_modal/user_reporting_modal.js
index 896167df0..39c264d5b 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.js
+++ b/src/components/user_reporting_modal/user_reporting_modal.js
@@ -1,11 +1,10 @@
+import { useReportsStore } from 'src/stores/reports'
 import Checkbox from '../checkbox/checkbox.vue'
 import List from '../list/list.vue'
 import Modal from '../modal/modal.vue'
 import Status from '../status/status.vue'
 import UserLink from '../user_link/user_link.vue'
 
-import { useReportsStore } from 'src/stores/reports.js'
-
 const UserReportingModal = {
   components: {
     Status,
diff --git a/src/components/user_timed_filter_modal/user_timed_filter_modal.js b/src/components/user_timed_filter_modal/user_timed_filter_modal.js
index 6c005ab4b..66bb6bda2 100644
--- a/src/components/user_timed_filter_modal/user_timed_filter_modal.js
+++ b/src/components/user_timed_filter_modal/user_timed_filter_modal.js
@@ -1,7 +1,6 @@
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import ConfirmModal from 'src/components/confirm_modal/confirm_modal.vue'
 import Select from 'src/components/select/select.vue'
-
 import { durationStrToMs } from 'src/services/date_utils/date_utils.js'
 
 const UserTimedFilterModal = {
diff --git a/src/components/who_to_follow_panel/who_to_follow_panel.js b/src/components/who_to_follow_panel/who_to_follow_panel.js
index 13787000e..5dbb1c3d1 100644
--- a/src/components/who_to_follow_panel/who_to_follow_panel.js
+++ b/src/components/who_to_follow_panel/who_to_follow_panel.js
@@ -1,17 +1,14 @@
 import { shuffle } from 'lodash'
 
-import apiService from '../../services/api/api.service.js'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+import apiService from '../../services/api/api.service.js'
 
 function showWhoToFollow(panel, reply) {
   const shuffled = shuffle(reply)
 
   panel.usersToFollow.forEach((toFollow, index) => {
     const user = shuffled[index]
-    const img = user.avatar || useInstanceStore().defaultAvatar
+    const img = user.avatar || this.$store.state.instance.defaultAvatar
     const name = user.acct
 
     toFollow.img = img
@@ -49,7 +46,7 @@ const WhoToFollowPanel = {
       return this.$store.state.users.currentUser.screen_name
     },
     suggestionsEnabled() {
-      return useInstanceStore().featureSet.suggestionsEnabled
+      return this.$store.state.instance.suggestionsEnabled
     },
   },
   methods: {
@@ -57,7 +54,7 @@ const WhoToFollowPanel = {
       return generateProfileLink(
         id,
         name,
-        useInstanceStore().restrictedNicknames,
+        this.$store.state.instance.restrictedNicknames,
       )
     },
   },
@@ -70,7 +67,7 @@ const WhoToFollowPanel = {
   },
   mounted: function () {
     this.usersToFollow = new Array(3).fill().map(() => ({
-      img: useInstanceStore().defaultAvatar,
+      img: this.$store.state.instance.defaultAvatar,
       name: '',
       id: 0,
     }))
diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index f7e2b0b08..90f602c40 100644
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@@ -1,9 +1,8 @@
 import { cloneDeep, each, get, set } from 'lodash'
 import merge from 'lodash.merge'
 
-import { storage } from './storage.js'
-
 import { useInterfaceStore } from 'src/stores/interface'
+import { storage } from './storage.js'
 
 let loaded = false
 
diff --git a/src/lib/push_notifications_plugin.js b/src/lib/push_notifications_plugin.js
index 9732a82c9..2cc55c3bb 100644
--- a/src/lib/push_notifications_plugin.js
+++ b/src/lib/push_notifications_plugin.js
@@ -1,9 +1,8 @@
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
+import { useInterfaceStore } from 'src/stores/interface'
 
 export default (store) => {
   store.subscribe((mutation, state) => {
-    const vapidPublicKey = useInstanceStore().vapidPublicKey
+    const vapidPublicKey = state.instance.vapidPublicKey
     const webPushNotification = state.config.webPushNotifications
     const permission = useInterfaceStore().notificationPermission === 'granted'
     const user = state.users.currentUser
diff --git a/src/modules/api.js b/src/modules/api.js
index d658433fe..cb8b72e10 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -1,13 +1,11 @@
 import { Socket } from 'phoenix'
 
+import { useInterfaceStore } from 'src/stores/interface.js'
+import { useShoutStore } from 'src/stores/shout.js'
 import { WSConnectionStatus } from '../services/api/api.service.js'
 import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
 import { maybeShowChatNotification } from '../services/chat_utils/chat_utils.js'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-import { useShoutStore } from 'src/stores/shout.js'
-
 const retryTimeout = (multiplier) => 1000 * multiplier
 
 const api = {
@@ -239,7 +237,7 @@ const api = {
     ) {
       if (
         timeline === 'favourites' &&
-        !useInstanceStore().featureSet.pleromaPublicFavouritesAvailable
+        !store.rootState.instance.pleromaPublicFavouritesAvailable
       )
         return
       if (store.state.fetchers[timeline]) return
@@ -324,7 +322,7 @@ const api = {
     // Bookmark folders
     startFetchingBookmarkFolders(store) {
       if (store.state.fetchers.bookmarkFolders) return
-      if (!useInstanceStore().featureSet.pleromaBookmarkFoldersAvailable) return
+      if (!store.rootState.instance.pleromaBookmarkFoldersAvailable) return
       const fetcher =
         store.state.backendInteractor.startFetchingBookmarkFolders({ store })
       store.commit('addFetcher', { fetcherName: 'bookmarkFolders', fetcher })
@@ -343,7 +341,7 @@ const api = {
       // Set up websocket connection
       const token = state.wsToken
       if (
-        useInstanceStore().shoutAvailable &&
+        rootState.instance.shoutAvailable &&
         typeof token !== 'undefined' &&
         state.socket === null
       ) {
diff --git a/src/modules/config.js b/src/modules/config.js
index 508ddafc6..cf144664a 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -1,16 +1,13 @@
 import Cookies from 'js-cookie'
 import { set } from 'lodash'
 
+import { useI18nStore } from 'src/stores/i18n.js'
+import { useInterfaceStore } from 'src/stores/interface.js'
 import messages from '../i18n/messages'
 import localeService from '../services/locale/locale.service.js'
 import { applyConfig } from '../services/style_setter/style_setter.js'
 import { defaultState, instanceDefaultConfig } from './default_config_state.js'
 
-import { useEmojiStore } from 'src/stores/emoji.js'
-import { useI18nStore } from 'src/stores/i18n.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-
 const BACKEND_LANGUAGE_COOKIE_NAME = 'userLanguage'
 const APPEARANCE_SETTINGS_KEYS = new Set([
   'sidebarColumnWidth',
@@ -46,27 +43,24 @@ export const instanceDefaultProperties = Object.keys(instanceDefaultConfig)
 const config = {
   state: { ...defaultState },
   getters: {
-    defaultConfig() {
+    defaultConfig(state, getters, rootState) {
+      const { instance } = rootState
       return {
         ...defaultState,
         ...Object.fromEntries(
-          instanceDefaultProperties.map((key) => [
-            key,
-            useInstanceStore().prefsStorage[key],
-          ]),
+          instanceDefaultProperties.map((key) => [key, instance[key]]),
         ),
       }
     },
-    mergedConfig(state) {
-      const instancePrefs = useInstanceStore().prefsStorage
-      console.log(state)
-      const result = Object.fromEntries(
-        Object.keys(defaultState).map((key) => [
-          key,
-          state[key] ?? instancePrefs[key],
-        ]),
-      )
-      return result
+    mergedConfig(state, getters, rootState, rootGetters) {
+      const { defaultConfig } = rootGetters
+      return {
+        ...defaultConfig,
+        // Do not override with undefined
+        ...Object.fromEntries(
+          Object.entries(state).filter(([, v]) => v !== undefined),
+        ),
+      }
     },
   },
   mutations: {
@@ -183,7 +177,7 @@ const config = {
           }
           case 'interfaceLanguage':
             messages.setLanguage(useI18nStore().i18n, value)
-            useEmojiStore().loadUnicodeEmojiData(value)
+            dispatch('loadUnicodeEmojiData', value)
             Cookies.set(
               BACKEND_LANGUAGE_COOKIE_NAME,
               localeService.internalToBackendLocaleMulti(value),
diff --git a/src/modules/default_config_state.js b/src/modules/default_config_state.js
index 3e39fb1fc..d5daef3d3 100644
--- a/src/modules/default_config_state.js
+++ b/src/modules/default_config_state.js
@@ -18,13 +18,9 @@ export const staticOrApiConfigDefault = {
   redirectRootLogin: '/main/friends',
   redirectRootNoLogin: '/main/all',
   hideSitename: false,
-  nsfwCensorImage: null,
+  nsfwCensorImage: undefined,
   showFeaturesPanel: true,
   showInstanceSpecificPanel: false,
-
-  // Html stuff
-  instanceSpecificPanelContent: '',
-  tos: '',
 }
 
 /// This object contains setting entries that makes sense
diff --git a/src/modules/index.js b/src/modules/index.js
index 15e57f716..ab9dd2418 100644
--- a/src/modules/index.js
+++ b/src/modules/index.js
@@ -3,12 +3,14 @@ import api from './api.js'
 import chats from './chats.js'
 import config from './config.js'
 import drafts from './drafts.js'
+import instance from './instance.js'
 import notifications from './notifications.js'
 import profileConfig from './profileConfig.js'
 import statuses from './statuses.js'
 import users from './users.js'
 
 export default {
+  instance,
   statuses,
   notifications,
   users,
diff --git a/src/stores/emoji.js b/src/modules/instance.js
similarity index 53%
rename from src/stores/emoji.js
rename to src/modules/instance.js
index 5c284064b..0f7009bc7 100644
--- a/src/stores/emoji.js
+++ b/src/modules/instance.js
@@ -1,25 +1,16 @@
-import { defineStore } from 'pinia'
+// See build/emojis_plugin for more details
 
-import { useInstanceStore } from 'src/stores/instance.js'
-
-import { ensureFinalFallback } from 'src/i18n/languages.js'
+import { useInterfaceStore } from 'src/stores/interface.js'
+import { ensureFinalFallback } from '../i18n/languages.js'
+import apiService from '../services/api/api.service.js'
+import { instanceDefaultProperties } from './config.js'
+import {
+  instanceDefaultConfig,
+  staticOrApiConfigDefault,
+} from './default_config_state.js'
 
 import { annotationsLoader } from 'virtual:pleroma-fe/emoji-annotations'
 
-const defaultState = {
-  // Custom emoji from server
-  customEmoji: [],
-  customEmojiFetched: false,
-
-  // Unicode emoji from bundle
-  emoji: {},
-  emojiFetched: false,
-  unicodeEmojiAnnotations: {},
-
-  // Stickers
-  stickers: null,
-}
-
 const SORTED_EMOJI_GROUP_IDS = [
   'smileys-and-emotion',
   'people-and-body',
@@ -52,6 +43,79 @@ const REGIONAL_INDICATORS = (() => {
   return res
 })()
 
+const REMOTE_INTERACTION_URL = '/main/ostatus'
+
+const defaultState = {
+  // Stuff from apiConfig
+  name: 'Pleroma FE',
+  registrationOpen: true,
+  server: 'http://localhost:4040/',
+  textlimit: 5000,
+  themesIndex: undefined,
+  stylesIndex: undefined,
+  palettesIndex: undefined,
+  themeData: undefined, // used for theme editor v2
+  vapidPublicKey: undefined,
+
+  // Stuff from static/config.json
+  loginMethod: 'password',
+  disableUpdateNotification: false,
+
+  fontsOverride: {},
+
+  // Instance-wide configurations that should not be changed by individual users
+  ...staticOrApiConfigDefault,
+  // Instance admins can override default settings for the whole instance
+  ...instanceDefaultConfig,
+
+  // Nasty stuff
+  customEmoji: [],
+  customEmojiFetched: false,
+  emoji: {},
+  emojiFetched: false,
+  unicodeEmojiAnnotations: {},
+  pleromaExtensionsAvailable: true,
+  postFormats: [],
+  restrictedNicknames: [],
+  safeDM: true,
+  knownDomains: [],
+  birthdayRequired: false,
+  birthdayMinAge: 0,
+
+  // Feature-set, apparently, not everything here is reported...
+  shoutAvailable: false,
+  pleromaChatMessagesAvailable: false,
+  pleromaCustomEmojiReactionsAvailable: false,
+  pleromaBookmarkFoldersAvailable: false,
+  pleromaPublicFavouritesAvailable: true,
+  statusNotificationTypeAvailable: true,
+  gopherAvailable: false,
+  mediaProxyAvailable: false,
+  suggestionsEnabled: false,
+  suggestionsWeb: '',
+  quotingAvailable: false,
+  groupActorAvailable: false,
+  blockExpiration: false,
+  localBubbleInstances: [], // Akkoma
+
+  // Html stuff
+  instanceSpecificPanelContent: '',
+  tos: '',
+
+  // Version Information
+  backendVersion: '',
+  backendRepository: '',
+  frontendVersion: '',
+
+  pollsAvailable: false,
+  pollLimits: {
+    max_options: 4,
+    max_option_chars: 255,
+    min_expiration: 60,
+    max_expiration: 60 * 60 * 24,
+  },
+}
+
 const loadAnnotations = (lang) => {
   return annotationsLoader[lang]().then((k) => k.default)
 }
@@ -73,9 +137,27 @@ const injectRegionalIndicators = (groups) => {
   return groups
 }
 
-export const useEmojiStore = defineStore('emoji', {
-  state: () => ({ ...defaultState }),
+const instance = {
+  state: defaultState,
+  mutations: {
+    setInstanceOption(state, { name, value }) {
+      if (typeof value !== 'undefined') {
+        state[name] = value
+      }
+    },
+    setKnownDomains(state, domains) {
+      state.knownDomains = domains
+    },
+    setUnicodeEmojiAnnotations(state, { lang, annotations }) {
+      state.unicodeEmojiAnnotations[lang] = annotations
+    },
+  },
   getters: {
+    instanceDefaultConfig(state) {
+      return instanceDefaultProperties
+        .map((key) => [key, state[key]])
+        .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {})
+    },
     groupedCustomEmojis(state) {
       const packsOf = (emoji) => {
         const packs = emoji.tags
@@ -99,7 +181,7 @@ export const useEmojiStore = defineStore('emoji', {
         }
       }
 
-      return this.customEmoji.reduce((res, emoji) => {
+      return state.customEmoji.reduce((res, emoji) => {
         packsOf(emoji).forEach(({ id: packId, text: packName }) => {
           if (!res[packId]) {
             res[packId] = {
@@ -116,27 +198,53 @@ export const useEmojiStore = defineStore('emoji', {
     },
     standardEmojiList(state) {
       return SORTED_EMOJI_GROUP_IDS.map((groupId) =>
-        (this.emoji[groupId] || []).map((k) =>
-          injectAnnotations(k, this.unicodeEmojiAnnotations),
+        (state.emoji[groupId] || []).map((k) =>
+          injectAnnotations(k, state.unicodeEmojiAnnotations),
         ),
       ).reduce((a, b) => a.concat(b), [])
     },
     standardEmojiGroupList(state) {
       return SORTED_EMOJI_GROUP_IDS.map((groupId) => ({
         id: groupId,
-        emojis: (this.emoji[groupId] || []).map((k) =>
-          injectAnnotations(k, this.unicodeEmojiAnnotations),
+        emojis: (state.emoji[groupId] || []).map((k) =>
+          injectAnnotations(k, state.unicodeEmojiAnnotations),
         ),
       }))
     },
+    instanceDomain(state) {
+      return new URL(state.server).hostname
+    },
+    remoteInteractionLink(state) {
+      const server = state.server.endsWith('/')
+        ? state.server.slice(0, -1)
+        : state.server
+      const link = server + REMOTE_INTERACTION_URL
+
+      return ({ statusId, nickname }) => {
+        if (statusId) {
+          return `${link}?status_id=${statusId}`
+        } else {
+          return `${link}?nickname=${nickname}`
+        }
+      }
+    },
   },
   actions: {
-    setStickers(stickers) {
-      this.stickers = stickers
+    setInstanceOption({ commit, dispatch }, { name, value }) {
+      commit('setInstanceOption', { name, value })
+      switch (name) {
+        case 'name':
+          useInterfaceStore().setPageTitle()
+          break
+        case 'shoutAvailable':
+          if (value) {
+            dispatch('initializeSocket')
+          }
+          break
+      }
     },
-    async getStaticEmoji() {
+    async getStaticEmoji({ commit }) {
       try {
-        // See build/emojis_plugin for more details
         const values = (await import('/src/assets/emoji.json')).default
 
         const emoji = Object.keys(values).reduce((res, groupId) => {
@@ -147,21 +255,24 @@ export const useEmojiStore = defineStore('emoji', {
           }))
           return res
         }, {})
-        this.emoji = injectRegionalIndicators(emoji)
+        commit('setInstanceOption', {
+          name: 'emoji',
+          value: injectRegionalIndicators(emoji),
+        })
       } catch (e) {
         console.warn("Can't load static emoji\n", e)
       }
     },
 
-    loadUnicodeEmojiData(language) {
+    loadUnicodeEmojiData({ commit, state }, language) {
       const langList = ensureFinalFallback(language)
 
       return Promise.all(
         langList.map(async (lang) => {
-          if (!this.unicodeEmojiAnnotations[lang]) {
+          if (!state.unicodeEmojiAnnotations[lang]) {
             try {
               const annotations = await loadAnnotations(lang)
-              this.unicodeEmojiAnnotations[lang] = annotations
+              commit('setUnicodeEmojiAnnotations', { lang, annotations })
             } catch (e) {
               console.warn(
                 `Error loading unicode emoji annotations for ${lang}: `,
@@ -174,7 +285,7 @@ export const useEmojiStore = defineStore('emoji', {
       )
     },
 
-    async getCustomEmoji() {
+    async getCustomEmoji({ commit, state }) {
       try {
         let res = await window.fetch('/api/v1/pleroma/emoji')
         if (!res.ok) {
@@ -220,9 +331,7 @@ export const useEmojiStore = defineStore('emoji', {
               const imageUrl = value.image_url
               return {
                 displayText: key,
-                imageUrl: imageUrl
-                  ? useInstanceStore().server + imageUrl
-                  : value,
+                imageUrl: imageUrl ? state.server + imageUrl : value,
                 tags: imageUrl
                   ? value.tags.sort((a, b) => (a > b ? 1 : 0))
                   : ['utf'],
@@ -232,7 +341,7 @@ export const useEmojiStore = defineStore('emoji', {
               // should have been "pack" field, that would be more useful
             })
             .sort(byPackThenByName)
-          this.customEmoji = emoji
+          commit('setInstanceOption', { name: 'customEmoji', value: emoji })
         } else {
           throw res
         }
@@ -240,13 +349,28 @@ export const useEmojiStore = defineStore('emoji', {
         console.warn("Can't load custom emojis\n", e)
       }
     },
-    fetchEmoji() {
-      if (!this.customEmojiFetched) {
-        this.getCustomEmoji().then(() => (this.customEmojiFetched = true))
+    fetchEmoji({ dispatch, state }) {
+      if (!state.customEmojiFetched) {
+        state.customEmojiFetched = true
+        dispatch('getCustomEmoji')
       }
-      if (!this.emojiFetched) {
-        this.getStaticEmoji().then(() => (this.emojiFetched = true))
+      if (!state.emojiFetched) {
+        state.emojiFetched = true
+        dispatch('getStaticEmoji')
+      }
+    },
+
+    async getKnownDomains({ commit, rootState }) {
+      try {
+        const result = await apiService.fetchKnownDomains({
+          credentials: rootState.users.currentUser.credentials,
+        })
+        commit('setKnownDomains', result)
+      } catch (e) {
+        console.warn("Can't load known domains\n", e)
       }
     },
   },
-})
+}
+
+export default instance
diff --git a/src/modules/notifications.js b/src/modules/notifications.js
index cb3d430db..7667a20d0 100644
--- a/src/modules/notifications.js
+++ b/src/modules/notifications.js
@@ -1,3 +1,5 @@
+import { useReportsStore } from 'src/stores/reports.js'
+import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
 import apiService from '../services/api/api.service.js'
 import {
   closeAllDesktopNotifications,
@@ -9,9 +11,6 @@ import {
   maybeShowNotification,
 } from '../services/notification_utils/notification_utils.js'
 
-import { useReportsStore } from 'src/stores/reports.js'
-import { useServerSideStorageStore } from 'src/stores/serverSideStorage.js'
-
 const emptyNotifications = () => ({
   desktopNotificationSilence: true,
   maxId: 0,
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 1dcfa213b..bf6500238 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -13,10 +13,9 @@ import {
   slice,
 } from 'lodash'
 
+import { useInterfaceStore } from 'src/stores/interface'
 import apiService from '../services/api/api.service.js'
 
-import { useInterfaceStore } from 'src/stores/interface.js'
-
 const emptyTl = (userId = 0) => ({
   statuses: [],
   statusesObject: {},
diff --git a/src/modules/users.js b/src/modules/users.js
index 04c444071..4e45d420f 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -9,6 +9,10 @@ import {
   uniq,
 } from 'lodash'
 
+import { declarations } from 'src/modules/config_declaration'
+import { useInterfaceStore } from 'src/stores/interface.js'
+import { useOAuthStore } from 'src/stores/oauth.js'
+import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
 import apiService from '../services/api/api.service.js'
 import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
 import oauthApi from '../services/new_api/oauth.js'
@@ -21,14 +25,6 @@ import {
   windowWidth,
 } from '../services/window_utils/window_utils'
 
-import { useEmojiStore } from 'src/stores/emoji.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
-import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
-
-import { declarations } from 'src/modules/config_declaration'
-
 // TODO: Unify with mergeOrAdd in statuses.js
 export const mergeOrAdd = (arr, obj, item) => {
   if (!item) {
@@ -551,7 +547,7 @@ const users = {
     },
     registerPushNotifications(store) {
       const token = store.state.currentUser.credentials
-      const vapidPublicKey = useInstanceStore().vapidPublicKey
+      const vapidPublicKey = store.rootState.instance.vapidPublicKey
       const isEnabled = store.rootState.config.webPushNotifications
       const notificationVisibility =
         store.rootState.config.notificationVisibility
@@ -648,6 +644,7 @@ const users = {
 
     logout(store) {
       const oauth = useOAuthStore()
+      const { instance } = store.rootState
 
       // NOTE: No need to verify the app still exists, because if it doesn't,
       // the token will be invalid too
@@ -656,7 +653,7 @@ const users = {
         .then((app) => {
           const params = {
             app,
-            instance: useInstanceStore().server,
+            instance: instance.server,
             token: oauth.userToken,
           }
 
@@ -688,6 +685,7 @@ const users = {
       return new Promise((resolve, reject) => {
         const commit = store.commit
         const dispatch = store.dispatch
+        const rootState = store.rootState
         commit('beginLogin')
         store.rootState.api.backendInteractor
           .verifyCredentials(accessToken)
@@ -704,7 +702,7 @@ const users = {
               useServerSideStorageStore().setServerSideStorage(user)
               commit('addNewUsers', [user])
 
-              useEmojiStore().fetchEmoji()
+              dispatch('fetchEmoji')
 
               getNotificationPermission().then((permission) =>
                 useInterfaceStore().setNotificationPermission(permission),
@@ -765,9 +763,7 @@ const users = {
                 // Start fetching notifications
                 dispatch('startFetchingNotifications')
 
-                if (
-                  useInstanceStore().featureSet.pleromaChatMessagesAvailable
-                ) {
+                if (rootState.instance.pleromaChatMessagesAvailable) {
                   // Start fetching chats
                   dispatch('startFetchingChats')
                 }
diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js
index adc18ef7f..ccbc76d2b 100644
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@@ -8,8 +8,6 @@ import apiService, {
 import notificationsFetcher from '../notifications_fetcher/notifications_fetcher.service.js'
 import timelineFetcher from '../timeline_fetcher/timeline_fetcher.service.js'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-
 const backendInteractorService = (credentials) => ({
   startFetchingTimeline({
     timeline,
@@ -57,7 +55,7 @@ const backendInteractorService = (credentials) => ({
   },
 
   startUserSocket({ store }) {
-    const serv = useInstanceStore().server.replace('http', 'ws')
+    const serv = store.rootState.instance.server.replace('http', 'ws')
     const url = getMastodonSocketURI({}, serv)
     return ProcessedWS({ url, id: 'Unified', credentials })
   },
diff --git a/src/services/bookmark_folders_fetcher/bookmark_folders_fetcher.service.js b/src/services/bookmark_folders_fetcher/bookmark_folders_fetcher.service.js
index 7b81c19dc..50afb4564 100644
--- a/src/services/bookmark_folders_fetcher/bookmark_folders_fetcher.service.js
+++ b/src/services/bookmark_folders_fetcher/bookmark_folders_fetcher.service.js
@@ -1,8 +1,7 @@
+import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
 import apiService from '../api/api.service.js'
 import { promiseInterval } from '../promise_interval/promise_interval.js'
 
-import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
-
 const fetchAndUpdate = ({ credentials }) => {
   return apiService
     .fetchBookmarkFolders({ credentials })
diff --git a/src/services/lists_fetcher/lists_fetcher.service.js b/src/services/lists_fetcher/lists_fetcher.service.js
index c395ef93b..6744fb696 100644
--- a/src/services/lists_fetcher/lists_fetcher.service.js
+++ b/src/services/lists_fetcher/lists_fetcher.service.js
@@ -1,8 +1,7 @@
+import { useListsStore } from 'src/stores/lists.js'
 import apiService from '../api/api.service.js'
 import { promiseInterval } from '../promise_interval/promise_interval.js'
 
-import { useListsStore } from 'src/stores/lists.js'
-
 const fetchAndUpdate = ({ credentials }) => {
   return apiService
     .fetchLists({ credentials })
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index 14785a685..b5c233ad9 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -1,10 +1,8 @@
-import { showDesktopNotification } from '../desktop_notification_utils/desktop_notification_utils.js'
-import { muteFilterHits } from '../status_parser/status_parser.js'
-
+import FaviconService from 'src/services/favicon_service/favicon_service.js'
 import { useAnnouncementsStore } from 'src/stores/announcements'
 import { useI18nStore } from 'src/stores/i18n.js'
-
-import FaviconService from 'src/services/favicon_service/favicon_service.js'
+import { showDesktopNotification } from '../desktop_notification_utils/desktop_notification_utils.js'
+import { muteFilterHits } from '../status_parser/status_parser.js'
 
 export const ACTIONABLE_NOTIFICATION_TYPES = new Set([
   'mention',
diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
index f82f98130..c8dca3159 100644
--- a/src/services/notifications_fetcher/notifications_fetcher.service.js
+++ b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -1,9 +1,7 @@
+import { useInterfaceStore } from 'src/stores/interface.js'
 import apiService from '../api/api.service.js'
 import { promiseInterval } from '../promise_interval/promise_interval.js'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-
 const update = ({ store, notifications, older }) => {
   store.dispatch('addNewNotifications', { notifications, older })
 }
@@ -30,7 +28,7 @@ const fetchAndUpdate = ({ store, credentials, older = false, since }) => {
   const timelineData = rootState.notifications
   const hideMutedPosts = getters.mergedConfig.hideMutedPosts
 
-  if (useInstanceStore().featureSet.pleromaChatMessagesAvailable) {
+  if (rootState.instance.pleromaChatMessagesAvailable) {
     mastoApiNotificationTypes.add('pleroma:chat_mention')
   }
 
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 08034d485..d44b0fc06 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -1,11 +1,10 @@
 import localforage from 'localforage'
 import { chunk, throttle } from 'lodash'
 
+import { defaultState } from 'src/modules/default_config_state.js'
 import { getCssRules } from '../theme_data/css_utils.js'
 import { getEngineChecksum, init } from '../theme_data/theme_data_3.service.js'
 
-import { defaultState } from 'src/modules/default_config_state.js'
-
 // On platforms where this is not supported, it will return undefined
 // Otherwise it will return an array
 const supportsAdoptedStyleSheets = !!document.adoptedStyleSheets
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index 0d993a1e3..aef724eda 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -1,11 +1,9 @@
 import { camelCase } from 'lodash'
 
+import { useInterfaceStore } from 'src/stores/interface.js'
 import apiService from '../api/api.service.js'
 import { promiseInterval } from '../promise_interval/promise_interval.js'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-
 const update = ({
   store,
   statuses,
@@ -78,7 +76,7 @@ const fetchAndUpdate = ({
     .then((response) => {
       if (response.errors) {
         if (timeline === 'favorites') {
-          useInstanceStore().featureSet.pleromaPublicFavouritesAvailable = false
+          rootState.instance.pleromaPublicFavouritesAvailable = false
           return
         }
         throw new Error(`${response.status} ${response.statusText}`)
diff --git a/src/stores/instance.js b/src/stores/instance.js
deleted file mode 100644
index 87bb00d12..000000000
--- a/src/stores/instance.js
+++ /dev/null
@@ -1,155 +0,0 @@
-import { get, set } from 'lodash'
-import { defineStore } from 'pinia'
-
-import { instanceDefaultProperties } from '../modules/config.js'
-import {
-  instanceDefaultConfig,
-  staticOrApiConfigDefault,
-} from '../modules/default_config_state.js'
-import apiService from '../services/api/api.service.js'
-
-import { useInterfaceStore } from 'src/stores/interface.js'
-
-import { ensureFinalFallback } from 'src/i18n/languages.js'
-
-const REMOTE_INTERACTION_URL = '/main/ostatus'
-
-const defaultState = {
-  // Stuff from apiConfig
-  name: 'Pleroma FE',
-  registrationOpen: true,
-  server: 'http://localhost:4040/',
-  textlimit: 5000,
-  private: false,
-  federating: true,
-  federationPolicy: null,
-  themesIndex: null,
-  stylesIndex: null,
-  palettesIndex: null,
-  themeData: null, // used for theme editor v2
-  vapidPublicKey: null,
-
-  // Stuff from static/config.json
-  loginMethod: 'password',
-  disableUpdateNotification: false,
-
-  // Instance-wide configurations that should not be changed by individual users
-  instanceIdentity: {
-    ...staticOrApiConfigDefault,
-  },
-
-  limits: {
-    bannerlimit: null,
-    avatarlimit: null,
-    backgroundlimit: null,
-    uploadlimit: null,
-    fieldsLimits: null,
-    pollLimits: {
-      max_options: 4,
-      max_option_chars: 255,
-      min_expiration: 60,
-      max_expiration: 60 * 60 * 24,
-    },
-  },
-
-  // Instance admins can override default settings for the whole instance
-  prefsStorage: {
-    ...instanceDefaultConfig,
-  },
-
-  // Known domains list for user's domain-muting
-  knownDomains: [],
-
-  // Moderation stuff
-  staffAccounts: [],
-  accountActivationRequired: null,
-  accountApprovalRequired: null,
-  birthdayRequired: false,
-  birthdayMinAge: 0,
-  restrictedNicknames: [],
-  localBubbleInstances: [], // Akkoma
-
-  // Feature-set, apparently, not everything here is reported...
-  featureSet: {
-    postFormats: [],
-    mailerEnabled: false,
-    safeDM: true,
-    shoutAvailable: false,
-    pleromaExtensionsAvailable: true,
-    pleromaChatMessagesAvailable: false,
-    pleromaCustomEmojiReactionsAvailable: false,
-    pleromaBookmarkFoldersAvailable: false,
-    pleromaPublicFavouritesAvailable: true,
-    statusNotificationTypeAvailable: true,
-    gopherAvailable: false,
-    editingAvailable: false,
-    mediaProxyAvailable: false,
-    suggestionsEnabled: false,
-    suggestionsWeb: '',
-    quotingAvailable: false,
-    groupActorAvailable: false,
-    blockExpiration: false,
-    tagPolicyAvailable: false,
-    pollsAvailable: false,
-    localBubble: false, // Akkoma
-  },
-
-  // Version Information
-  backendVersion: '',
-  backendRepository: '',
-  frontendVersion: '',
-}
-
-export const useInstanceStore = defineStore('instance', {
-  state: () => ({ ...defaultState }),
-  getters: {
-    instanceDefaultConfig(state) {
-      return instanceDefaultProperties
-        .map((key) => [key, state[key]])
-        .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {})
-    },
-    instanceDomain(state) {
-      return new URL(this.server).hostname
-    },
-  },
-  actions: {
-    set({ path, name, value }) {
-      if (get(defaultState, path ?? name) === undefined)
-        console.error(
-          `Unknown instance option ${path ?? name}, value: ${value}`,
-        )
-      set(this, path ?? name, value)
-      switch (name) {
-        case 'name':
-          useInterfaceStore().setPageTitle()
-          break
-        case 'shoutAvailable':
-          if (value) {
-            window.vuex.dispatch('initializeSocket')
-          }
-          break
-      }
-    },
-    async getKnownDomains() {
-      try {
-        this.knownDomains = await apiService.fetchKnownDomains({
-          credentials: window.vuex.state.users.currentUser.credentials,
-        })
-      } catch (e) {
-        console.warn("Can't load known domains\n", e)
-      }
-    },
-    getRemoteInteractionLink({ statusId, nickname }) {
-      const server = this.server.endsWith('/')
-        ? this.server.slice(0, -1)
-        : this.server
-      const link = server + REMOTE_INTERACTION_URL
-
-      if (statusId) {
-        return `${link}?status_id=${statusId}`
-      } else {
-        return `${link}?nickname=${nickname}`
-      }
-    },
-  },
-})
diff --git a/src/stores/interface.js b/src/stores/interface.js
index 8d05ce44b..d39a6d742 100644
--- a/src/stores/interface.js
+++ b/src/stores/interface.js
@@ -1,19 +1,16 @@
 import { defineStore } from 'pinia'
 
-import {
-  applyTheme,
-  getResourcesIndex,
-  tryLoadCache,
-} from '../services/style_setter/style_setter.js'
-import { deserialize } from '../services/theme_data/iss_deserializer.js'
-
-import { useInstanceStore } from 'src/stores/instance.js'
-
 import {
   CURRENT_VERSION,
   generatePreset,
 } from 'src/services/theme_data/theme_data.service.js'
 import { convertTheme2To3 } from 'src/services/theme_data/theme2_to_theme3.js'
+import {
+  applyTheme,
+  getResourcesIndex,
+  tryLoadCache,
+} from '../services/style_setter/style_setter.js'
+import { deserialize } from '../services/theme_data/iss_deserializer.js'
 
 export const useInterfaceStore = defineStore('interface', {
   state: () => ({
@@ -89,7 +86,7 @@ export const useInterfaceStore = defineStore('interface', {
     },
     setPageTitle(option = '') {
       try {
-        document.title = `${option} ${useInstanceStore().name}`
+        document.title = `${option} ${window.vuex.state.instance.name}`
       } catch (error) {
         console.error(`${error}`)
       }
@@ -224,14 +221,14 @@ export const useInterfaceStore = defineStore('interface', {
     async fetchPalettesIndex() {
       try {
         const value = await getResourcesIndex('/static/palettes/index.json')
-        useInstanceStore().set({
+        window.vuex.commit('setInstanceOption', {
           name: 'palettesIndex',
           value,
         })
         return value
       } catch (e) {
         console.error('Could not fetch palettes index', e)
-        useInstanceStore().set({
+        window.vuex.commit('setInstanceOption', {
           name: 'palettesIndex',
           value: { _error: e },
         })
@@ -260,11 +257,11 @@ export const useInterfaceStore = defineStore('interface', {
           '/static/styles/index.json',
           deserialize,
         )
-        useInstanceStore().set({ name: 'stylesIndex', value })
+        window.vuex.commit('setInstanceOption', { name: 'stylesIndex', value })
         return value
       } catch (e) {
         console.error('Could not fetch styles index', e)
-        useInstanceStore().set({
+        window.vuex.commit('setInstanceOption', {
           name: 'stylesIndex',
           value: { _error: e },
         })
@@ -298,11 +295,11 @@ export const useInterfaceStore = defineStore('interface', {
     async fetchThemesIndex() {
       try {
         const value = await getResourcesIndex('/static/styles.json')
-        useInstanceStore().set({ name: 'themesIndex', value })
+        window.vuex.commit('setInstanceOption', { name: 'themesIndex', value })
         return value
       } catch (e) {
         console.error('Could not fetch themes index', e)
-        useInstanceStore().set({
+        window.vuex.commit('setInstanceOption', {
           name: 'themesIndex',
           value: { _error: e },
         })
@@ -388,14 +385,14 @@ export const useInterfaceStore = defineStore('interface', {
       }
 
       const { style: instanceStyleName, palette: instancePaletteName } =
-        useInstanceStore()
+        window.vuex.state.instance
 
       let {
         theme: instanceThemeV2Name,
         themesIndex,
         stylesIndex,
         palettesIndex,
-      } = useInstanceStore()
+      } = window.vuex.state.instance
 
       const {
         style: userStyleName,
diff --git a/src/stores/oauth.js b/src/stores/oauth.js
index 2a79c2fa9..ea5a4bfac 100644
--- a/src/stores/oauth.js
+++ b/src/stores/oauth.js
@@ -1,7 +1,5 @@
 import { defineStore } from 'pinia'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-
 import {
   createApp,
   getClientToken,
@@ -63,7 +61,8 @@ export const useOAuthStore = defineStore('oauth', {
       this.userToken = false
     },
     async createApp() {
-      const instance = useInstanceStore().server
+      const { state } = window.vuex
+      const instance = state.instance.server
       const app = await createApp(instance)
       this.setClientData(app)
       return app
@@ -82,7 +81,8 @@ export const useOAuthStore = defineStore('oauth', {
       }
     },
     async getAppToken() {
-      const instance = useInstanceStore().server
+      const { state } = window.vuex
+      const instance = state.instance.server
       const res = await getClientToken({
         clientId: this.clientId,
         clientSecret: this.clientSecret,
@@ -94,10 +94,11 @@ export const useOAuthStore = defineStore('oauth', {
     /// Use this if you want to ensure the app is still valid to use.
     /// @return {string} The access token to the app (not attached to any user)
     async ensureAppToken() {
+      const { state } = window.vuex
       if (this.appToken) {
         try {
           await verifyAppToken({
-            instance: useInstanceStore().server,
+            instance: state.instance.server,
             appToken: this.appToken,
           })
           return this.appToken
diff --git a/src/stores/reports.js b/src/stores/reports.js
index d2cd4fd7c..52b67527d 100644
--- a/src/stores/reports.js
+++ b/src/stores/reports.js
@@ -1,7 +1,7 @@
 import filter from 'lodash/filter'
 import { defineStore } from 'pinia'
 
-import { useInterfaceStore } from 'src/stores/interface.js'
+import { useInterfaceStore } from 'src/stores/interface'
 
 export const useReportsStore = defineStore('reports', {
   state: () => ({
diff --git a/src/sw.js b/src/sw.js
index 38a2fe7b2..711aae6d0 100644
--- a/src/sw.js
+++ b/src/sw.js
@@ -4,12 +4,11 @@ import 'virtual:pleroma-fe/service_worker_env'
 
 import { createI18n } from 'vue-i18n'
 
+import { storage } from 'src/lib/storage.js'
 import { parseNotification } from './services/entity_normalizer/entity_normalizer.service.js'
 import { prepareNotificationObject } from './services/notification_utils/notification_utils.js'
 import { cacheKey, emojiCacheKey, shouldCache } from './services/sw/sw.js'
 
-import { storage } from 'src/lib/storage.js'
-
 // Collects all messages for service workers
 // Needed because service workers cannot use dynamic imports
 // See /build/sw_plugin.js for more information
diff --git a/test/fixtures/setup_test.js b/test/fixtures/setup_test.js
index 02c49eb60..082fdbe29 100644
--- a/test/fixtures/setup_test.js
+++ b/test/fixtures/setup_test.js
@@ -2,9 +2,8 @@ import { config } from '@vue/test-utils'
 import { createMemoryHistory, createRouter } from 'vue-router'
 import VueVirtualScroller from 'vue-virtual-scroller'
 
-import makeMockStore from './mock_store'
-
 import routes from 'src/boot/routes'
+import makeMockStore from './mock_store'
 
 export const $t = (msg) => msg
 const $i18n = { t: (msg) => msg }
diff --git a/test/unit/specs/components/user_profile.spec.js b/test/unit/specs/components/user_profile.spec.js
index 8b198420b..2b594b160 100644
--- a/test/unit/specs/components/user_profile.spec.js
+++ b/test/unit/specs/components/user_profile.spec.js
@@ -2,7 +2,6 @@ import { mount } from '@vue/test-utils'
 import { createStore } from 'vuex'
 
 import UserProfile from 'src/components/user_profile/user_profile.vue'
-
 import { getters } from 'src/modules/users.js'
 import backendInteractorService from 'src/services/backend_interactor_service/backend_interactor_service.js'
 
diff --git a/test/unit/specs/stores/lists.spec.js b/test/unit/specs/stores/lists.spec.js
index 083730856..192546981 100644
--- a/test/unit/specs/stores/lists.spec.js
+++ b/test/unit/specs/stores/lists.spec.js
@@ -1,9 +1,8 @@
 import { createPinia, setActivePinia } from 'pinia'
 import { createStore } from 'vuex'
 
-import { useListsStore } from 'src/stores/lists.js'
-
 import apiModule from 'src/modules/api.js'
+import { useListsStore } from 'src/stores/lists.js'
 
 setActivePinia(createPinia())
 const store = useListsStore()
diff --git a/test/unit/specs/stores/oauth.spec.js b/test/unit/specs/stores/oauth.spec.js
index 54a489479..c634ebb66 100644
--- a/test/unit/specs/stores/oauth.spec.js
+++ b/test/unit/specs/stores/oauth.spec.js
@@ -3,14 +3,13 @@ import { createPinia, setActivePinia } from 'pinia'
 import { createApp } from 'vue'
 import { createStore } from 'vuex'
 
+import { useOAuthStore } from 'src/stores/oauth.js'
 import {
   authApis,
   injectMswToTest,
   testServer,
 } from '/test/fixtures/mock_api.js'
 
-import { useOAuthStore } from 'src/stores/oauth.js'
-
 const test = injectMswToTest(authApis)
 
 const vuexStore = createStore({