diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3d38ea24..1eb5a9cb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ 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 d64639d52..6a464a0e5 100644
--- a/biome.json
+++ b/biome.json
@@ -132,7 +132,11 @@
             "groups": [
               [":NODE:", ":PACKAGE:", "!src/**", "!@fortawesome/**"],
               ":BLANK_LINE:",
-              [":PATH:", "src/**"],
+              [":PATH:", "src/components/**"],
+              ":BLANK_LINE:",
+              [":PATH:", "src/stores/**"],
+              ":BLANK_LINE:",
+              [":PATH:", "src/**", "src/stores/**", "src/components/**"],
               ":BLANK_LINE:",
               "@fortawesome/fontawesome-svg-core",
               "@fortawesome/*"
diff --git a/changelog.d/actor-type.fix b/changelog.d/actor-type.fix
deleted file mode 100644
index a2c873c1a..000000000
--- a/changelog.d/actor-type.fix
+++ /dev/null
@@ -1 +0,0 @@
-fixed being unable to set actor type from profile page
diff --git a/changelog.d/biome.skip b/changelog.d/biome.skip
deleted file mode 100644
index e69de29bb..000000000
diff --git a/changelog.d/e2e-tests.add b/changelog.d/e2e-tests.add
deleted file mode 100644
index ba62b25ac..000000000
--- a/changelog.d/e2e-tests.add
+++ /dev/null
@@ -1 +0,0 @@
-Add playwright E2E-tests with an optional docker-based backend
diff --git a/changelog.d/e2e.skip b/changelog.d/e2e.skip
deleted file mode 100644
index e84c25121..000000000
--- a/changelog.d/e2e.skip
+++ /dev/null
@@ -1 +0,0 @@
-fix e2e
diff --git a/package.json b/package.json
index b00ed545a..bdd1acfbe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pleroma_fe",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "description": "Pleroma frontend, the default frontend of Pleroma social network server",
   "author": "Pleroma contributors <https://git.pleroma.social/pleroma/pleroma-fe/-/blob/develop/CONTRIBUTORS.md>",
   "private": false,
diff --git a/src/App.js b/src/App.js
index 33645c63d..916b5b33a 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,4 +1,5 @@
 import { throttle } from 'lodash'
+import { mapState } from 'pinia'
 import { defineAsyncComponent } from 'vue'
 import { mapGetters } from 'vuex'
 
@@ -20,8 +21,10 @@ 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 { useInterfaceStore } from './stores/interface'
-import { useShoutStore } from './stores/shout'
+
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useInterfaceStore } from 'src/stores/interface.js'
+import { useShoutStore } from 'src/stores/shout.js'
 
 export default {
   name: 'app',
@@ -91,12 +94,9 @@ export default {
     this.scrollParent.removeEventListener('scroll', this.updateScrollState)
   },
   computed: {
-    themeApplied() {
-      return useInterfaceStore().themeApplied
-    },
     currentTheme() {
-      if (useInterfaceStore().styleDataUsed) {
-        const styleMeta = useInterfaceStore().styleDataUsed.find(
+      if (this.styleDataUsed) {
+        const styleMeta = this.styleDataUsed.find(
           (x) => x.component === '@meta',
         )
 
@@ -134,9 +134,7 @@ export default {
       return this.currentUser.background_image
     },
     instanceBackground() {
-      return this.mergedConfig.hideInstanceWallpaper
-        ? null
-        : this.$store.state.instance.background
+      return this.mergedConfig.hideInstanceWallpaper ? null : this.background
     },
     background() {
       return this.userBackground || this.instanceBackground
@@ -151,14 +149,11 @@ export default {
     shout() {
       return useShoutStore().joined
     },
-    suggestionsEnabled() {
-      return this.$store.state.instance.suggestionsEnabled
-    },
     showInstanceSpecificPanel() {
       return (
-        this.$store.state.instance.showInstanceSpecificPanel &&
+        this.showInstanceSpecificPanel &&
         !this.$store.getters.mergedConfig.hideISP &&
-        this.$store.state.instance.instanceSpecificPanelContent
+        this.instanceSpecificPanelContent
       )
     },
     isChats() {
@@ -175,24 +170,12 @@ 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
@@ -214,6 +197,22 @@ 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 1a2be5bd7..a970d25cc 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -14,16 +14,6 @@ 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'
@@ -35,6 +25,20 @@ 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 = () => {
@@ -78,29 +82,29 @@ const getInstanceConfig = async ({ store }) => {
       const textlimit = data.max_toot_chars
       const vapidPublicKey = data.pleroma.vapid_public_key
 
-      store.dispatch('setInstanceOption', {
-        name: 'pleromaExtensionsAvailable',
+      useInstanceStore().set({
+        name: 'featureSet.pleromaExtensionsAvailable',
         value: data.pleroma,
       })
-      store.dispatch('setInstanceOption', {
+      useInstanceStore().set({
         name: 'textlimit',
         value: textlimit,
       })
-      store.dispatch('setInstanceOption', {
+      useInstanceStore().set({
         name: 'accountApprovalRequired',
         value: data.approval_required,
       })
-      store.dispatch('setInstanceOption', {
+      useInstanceStore().set({
         name: 'birthdayRequired',
         value: !!data.pleroma?.metadata.birthday_required,
       })
-      store.dispatch('setInstanceOption', {
+      useInstanceStore().set({
         name: 'birthdayMinAge',
         value: data.pleroma?.metadata.birthday_min_age || 0,
       })
 
       if (vapidPublicKey) {
-        store.dispatch('setInstanceOption', {
+        useInstanceStore().set({
           name: 'vapidPublicKey',
           value: vapidPublicKey,
         })
@@ -161,14 +165,18 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
     config = Object.assign({}, staticConfig, apiConfig)
   }
 
-  const copyInstanceOption = (name) => {
-    if (typeof config[name] !== 'undefined') {
-      store.dispatch('setInstanceOption', { name, value: config[name] })
+  const copyInstanceOption = ({ source, destination }) => {
+    if (typeof config[source] !== 'undefined') {
+      useInstanceStore().set({ path: destination, value: config[source] })
     }
   }
 
-  Object.keys(staticOrApiConfigDefault).forEach(copyInstanceOption)
-  Object.keys(instanceDefaultConfig).forEach(copyInstanceOption)
+  Object.keys(staticOrApiConfigDefault)
+    .map((k) => ({ source: k, destination: `instanceIdentity.${k}` }))
+    .forEach(copyInstanceOption)
+  Object.keys(instanceDefaultConfig)
+    .map((k) => ({ source: k, destination: `prefsStorage.${k}` }))
+    .forEach(copyInstanceOption)
 
   useAuthFlowStore().setInitialStrategy(config.loginMethod)
 }
@@ -178,7 +186,7 @@ const getTOS = async ({ store }) => {
     const res = await window.fetch('/static/terms-of-service.html')
     if (res.ok) {
       const html = await res.text()
-      store.dispatch('setInstanceOption', { name: 'tos', value: html })
+      useInstanceStore().set({ name: 'instanceIdentity.tos', value: html })
     } else {
       throw res
     }
@@ -192,8 +200,8 @@ const getInstancePanel = async ({ store }) => {
     const res = await preloadFetch('/instance/panel.html')
     if (res.ok) {
       const html = await res.text()
-      store.dispatch('setInstanceOption', {
-        name: 'instanceSpecificPanelContent',
+      useInstanceStore().set({
+        name: 'instanceIdentity.instanceSpecificPanelContent',
         value: html,
       })
     } else {
@@ -227,7 +235,7 @@ const getStickers = async ({ store }) => {
       ).sort((a, b) => {
         return a.meta.title.localeCompare(b.meta.title)
       })
-      store.dispatch('setInstanceOption', { name: 'stickers', value: stickers })
+      useEmojiStore().setStickers(stickers)
     } else {
       throw res
     }
@@ -248,7 +256,7 @@ const getAppSecret = async ({ store }) => {
 
 const resolveStaffAccounts = ({ store, accounts }) => {
   const nicknames = accounts.map((uri) => uri.split('/').pop())
-  store.dispatch('setInstanceOption', {
+  useInstanceStore().set({
     name: 'staffAccounts',
     value: nicknames,
   })
@@ -262,159 +270,163 @@ const getNodeInfo = async ({ store }) => {
       const data = await res.json()
       const metadata = data.metadata
       const features = metadata.features
-      store.dispatch('setInstanceOption', {
-        name: 'name',
+      useInstanceStore().set({
+        path: 'name',
         value: metadata.nodeName,
       })
-      store.dispatch('setInstanceOption', {
-        name: 'registrationOpen',
+      useInstanceStore().set({
+        path: 'registrationOpen',
         value: data.openRegistrations,
       })
-      store.dispatch('setInstanceOption', {
-        name: 'mediaProxyAvailable',
+      useInstanceStore().set({
+        path: 'featureSet.mediaProxyAvailable',
         value: features.includes('media_proxy'),
       })
-      store.dispatch('setInstanceOption', {
-        name: 'safeDM',
+      useInstanceStore().set({
+        path: 'featureSet.safeDM',
         value: features.includes('safe_dm_mentions'),
       })
-      store.dispatch('setInstanceOption', {
-        name: 'shoutAvailable',
+      useInstanceStore().set({
+        path: 'featureSet.shoutAvailable',
         value: features.includes('chat'),
       })
-      store.dispatch('setInstanceOption', {
-        name: 'pleromaChatMessagesAvailable',
+      useInstanceStore().set({
+        path: 'featureSet.pleromaChatMessagesAvailable',
         value: features.includes('pleroma_chat_messages'),
       })
-      store.dispatch('setInstanceOption', {
-        name: 'pleromaCustomEmojiReactionsAvailable',
+      useInstanceStore().set({
+        path: 'featureSet.pleromaCustomEmojiReactionsAvailable',
         value:
           features.includes('pleroma_custom_emoji_reactions') ||
           features.includes('custom_emoji_reactions'),
       })
-      store.dispatch('setInstanceOption', {
-        name: 'pleromaBookmarkFoldersAvailable',
+      useInstanceStore().set({
+        path: 'featureSet.pleromaBookmarkFoldersAvailable',
         value: features.includes('pleroma:bookmark_folders'),
       })
-      store.dispatch('setInstanceOption', {
-        name: 'gopherAvailable',
+      useInstanceStore().set({
+        path: 'featureSet.gopherAvailable',
         value: features.includes('gopher'),
       })
-      store.dispatch('setInstanceOption', {
-        name: 'pollsAvailable',
+      useInstanceStore().set({
+        path: 'featureSet.pollsAvailable',
         value: features.includes('polls'),
       })
-      store.dispatch('setInstanceOption', {
-        name: 'editingAvailable',
+      useInstanceStore().set({
+        path: 'featureSet.editingAvailable',
         value: features.includes('editing'),
       })
-      store.dispatch('setInstanceOption', {
-        name: 'pollLimits',
-        value: metadata.pollLimits,
-      })
-      store.dispatch('setInstanceOption', {
-        name: 'mailerEnabled',
+      useInstanceStore().set({
+        path: 'featureSet.mailerEnabled',
         value: metadata.mailerEnabled,
       })
-      store.dispatch('setInstanceOption', {
-        name: 'quotingAvailable',
+      useInstanceStore().set({
+        path: 'featureSet.quotingAvailable',
         value: features.includes('quote_posting'),
       })
-      store.dispatch('setInstanceOption', {
-        name: 'groupActorAvailable',
+      useInstanceStore().set({
+        path: 'featureSet.groupActorAvailable',
         value: features.includes('pleroma:group_actors'),
       })
-      store.dispatch('setInstanceOption', {
-        name: 'blockExpiration',
+      useInstanceStore().set({
+        path: 'featureSet.blockExpiration',
         value: features.includes('pleroma:block_expiration'),
       })
-      store.dispatch('setInstanceOption', {
-        name: 'localBubbleInstances',
+      useInstanceStore().set({
+        path: 'localBubbleInstances',
         value: metadata.localBubbleInstances ?? [],
       })
+      useInstanceStore().set({
+        path: 'featureSet.localBubble',
+        value: (metadata.localBubbleInstances ?? []).length > 0,
+      })
 
+      useInstanceStore().set({
+        path: 'limits.pollLimits',
+        value: metadata.pollLimits,
+      })
       const uploadLimits = metadata.uploadLimits
-      store.dispatch('setInstanceOption', {
-        name: 'uploadlimit',
+      useInstanceStore().set({
+        name: 'limits.uploadlimit',
         value: parseInt(uploadLimits.general),
       })
-      store.dispatch('setInstanceOption', {
-        name: 'avatarlimit',
+      useInstanceStore().set({
+        name: 'limits.avatarlimit',
         value: parseInt(uploadLimits.avatar),
       })
-      store.dispatch('setInstanceOption', {
-        name: 'backgroundlimit',
+      useInstanceStore().set({
+        name: 'limits.backgroundlimit',
         value: parseInt(uploadLimits.background),
       })
-      store.dispatch('setInstanceOption', {
-        name: 'bannerlimit',
+      useInstanceStore().set({
+        name: 'limits.bannerlimit',
         value: parseInt(uploadLimits.banner),
       })
-      store.dispatch('setInstanceOption', {
-        name: 'fieldsLimits',
+      useInstanceStore().set({
+        name: 'limits.fieldsLimits',
         value: metadata.fieldsLimits,
       })
 
-      store.dispatch('setInstanceOption', {
+      useInstanceStore().set({
         name: 'restrictedNicknames',
         value: metadata.restrictedNicknames,
       })
-      store.dispatch('setInstanceOption', {
-        name: 'postFormats',
+      useInstanceStore().set({
+        name: 'featureSet.postFormats',
         value: metadata.postFormats,
       })
 
       const suggestions = metadata.suggestions
-      store.dispatch('setInstanceOption', {
-        name: 'suggestionsEnabled',
+      useInstanceStore().set({
+        name: 'featureSet.suggestionsEnabled',
         value: suggestions.enabled,
       })
-      store.dispatch('setInstanceOption', {
-        name: 'suggestionsWeb',
+      useInstanceStore().set({
+        name: 'featureSet.suggestionsWeb',
         value: suggestions.web,
       })
 
       const software = data.software
-      store.dispatch('setInstanceOption', {
+      useInstanceStore().set({
         name: 'backendVersion',
         value: software.version,
       })
-      store.dispatch('setInstanceOption', {
+      useInstanceStore().set({
         name: 'backendRepository',
         value: software.repository,
       })
 
       const priv = metadata.private
-      store.dispatch('setInstanceOption', { name: 'private', value: priv })
+      useInstanceStore().set({ name: 'private', value: priv })
 
       const frontendVersion = window.___pleromafe_commit_hash
-      store.dispatch('setInstanceOption', {
+      useInstanceStore().set({
         name: 'frontendVersion',
         value: frontendVersion,
       })
 
       const federation = metadata.federation
 
-      store.dispatch('setInstanceOption', {
-        name: 'tagPolicyAvailable',
+      useInstanceStore().set({
+        name: 'featureSet.tagPolicyAvailable',
         value:
           typeof federation.mrf_policies === 'undefined'
             ? false
             : metadata.federation.mrf_policies.includes('TagPolicy'),
       })
 
-      store.dispatch('setInstanceOption', {
+      useInstanceStore().set({
         name: 'federationPolicy',
         value: federation,
       })
-      store.dispatch('setInstanceOption', {
+      useInstanceStore().set({
         name: 'federating',
         value:
           typeof federation.enabled === 'undefined' ? true : federation.enabled,
       })
 
       const accountActivationRequired = metadata.accountActivationRequired
-      store.dispatch('setInstanceOption', {
+      useInstanceStore().set({
         name: 'accountActivationRequired',
         value: accountActivationRequired,
       })
@@ -526,7 +538,7 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => {
     typeof overrides.target !== 'undefined'
       ? overrides.target
       : window.location.origin
-  store.dispatch('setInstanceOption', { name: 'server', value: server })
+  useInstanceStore().set({ name: 'server', value: server })
 
   await setConfig({ store })
   try {
diff --git a/src/boot/routes.js b/src/boot/routes.js
index 3296755a1..c5876a3d4 100644
--- a/src/boot/routes.js
+++ b/src/boot/routes.js
@@ -32,12 +32,16 @@ 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(store.state.instance.redirectRootNoLogin || '/main/all')
+      next(
+        useInstanceStore().instanceIdentity.redirectRootNoLogin || '/main/all',
+      )
     }
   }
 
@@ -48,8 +52,9 @@ export default (store) => {
       redirect: () => {
         return (
           (store.state.users.currentUser
-            ? store.state.instance.redirectRootLogin
-            : store.state.instance.redirectRootNoLogin) || '/main/all'
+            ? useInstanceStore().instanceIdentity.redirectRootLogin
+            : useInstanceStore().instanceIdentity.redirectRootNoLogin) ||
+          '/main/all'
         )
       },
     },
@@ -200,7 +205,7 @@ export default (store) => {
     },
   ]
 
-  if (store.state.instance.pleromaChatMessagesAvailable) {
+  if (useInstanceStore().featureSet.pleromaChatMessagesAvailable) {
     routes = routes.concat([
       {
         name: 'chat',
diff --git a/src/components/about/about.js b/src/components/about/about.js
index d091dfd0a..f52d5c797 100644
--- a/src/components/about/about.js
+++ b/src/components/about/about.js
@@ -4,6 +4,8 @@ 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,
@@ -14,13 +16,13 @@ const About = {
   },
   computed: {
     showFeaturesPanel() {
-      return this.$store.state.instance.showFeaturesPanel
+      return useInstanceStore().instanceIdentity.showFeaturesPanel
     },
     showInstanceSpecificPanel() {
       return (
-        this.$store.state.instance.showInstanceSpecificPanel &&
+        useInstanceStore().instanceIdentity.showInstanceSpecificPanel &&
         !this.$store.getters.mergedConfig.hideISP &&
-        this.$store.state.instance.instanceSpecificPanelContent
+        useInstanceStore().instanceIdentity.instanceSpecificPanelContent
       )
     },
   },
diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js
index ee94dc544..1910d3544 100644
--- a/src/components/account_actions/account_actions.js
+++ b/src/components/account_actions/account_actions.js
@@ -1,12 +1,14 @@
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import UserListMenu from 'src/components/user_list_menu/user_list_menu.vue'
 import UserTimedFilterModal from 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue'
-import { 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'
 
@@ -92,10 +94,10 @@ const AccountActions = {
     shouldConfirmRemoveUserFromFollowers() {
       return this.$store.getters.mergedConfig.modalOnRemoveUserFromFollowers
     },
-    ...mapState({
-      blockExpirationSupported: (state) => state.instance.blockExpiration,
-      pleromaChatMessagesAvailable: (state) =>
-        state.instance.pleromaChatMessagesAvailable,
+    ...mapState(useInstanceStore, {
+      blockExpirationSupported: (store) => store.featureSet.blockExpiration,
+      pleromaChatMessagesAvailable: (store) =>
+        store.featureSet.pleromaChatMessagesAvailable,
     }),
   },
 }
diff --git a/src/components/announcement/announcement.js b/src/components/announcement/announcement.js
index 906b84ce2..13d55c159 100644
--- a/src/components/announcement/announcement.js
+++ b/src/components/announcement/announcement.js
@@ -1,10 +1,11 @@
 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 0c4383d2e..b8b1f000a 100644
--- a/src/components/announcements_page/announcements_page.js
+++ b/src/components/announcements_page/announcements_page.js
@@ -1,9 +1,10 @@
 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 31fceba60..d1884ba5c 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -1,12 +1,14 @@
 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,
@@ -53,7 +55,8 @@ const Attachment = {
   data() {
     return {
       localDescription: this.description || this.attachment.description,
-      nsfwImage: this.$store.state.instance.nsfwCensorImage || nsfwImage,
+      nsfwImage:
+        useInstanceStore().instanceIdentity.nsfwCensorImage || nsfwImage,
       hideNsfwLocal: this.$store.getters.mergedConfig.hideNsfw,
       preloadImage: this.$store.getters.mergedConfig.preloadImage,
       loading: false,
@@ -104,7 +107,9 @@ const Attachment = {
       return 'file'
     },
     referrerpolicy() {
-      return this.$store.state.instance.mediaProxyAvailable ? '' : 'no-referrer'
+      return useInstanceStore().featureSet.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 ce88aa6f9..9e05095ca 100644
--- a/src/components/auth_form/auth_form.js
+++ b/src/components/auth_form/auth_form.js
@@ -1,11 +1,12 @@
 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 aad157686..830b64219 100644
--- a/src/components/avatar_list/avatar_list.js
+++ b/src/components/avatar_list/avatar_list.js
@@ -1,6 +1,9 @@
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+
 const AvatarList = {
   props: ['users'],
   computed: {
@@ -16,7 +19,7 @@ const AvatarList = {
       return generateProfileLink(
         user.id,
         user.screen_name,
-        this.$store.state.instance.restrictedNicknames,
+        useInstanceStore().restrictedNicknames,
       )
     },
   },
diff --git a/src/components/basic_user_card/basic_user_card.js b/src/components/basic_user_card/basic_user_card.js
index cc4cbce44..0e45b140a 100644
--- a/src/components/basic_user_card/basic_user_card.js
+++ b/src/components/basic_user_card/basic_user_card.js
@@ -1,9 +1,12 @@
 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: {
@@ -17,7 +20,7 @@ const BasicUserCard = {
       return generateProfileLink(
         user.id,
         user.screen_name,
-        this.$store.state.instance.restrictedNicknames,
+        useInstanceStore().restrictedNicknames,
       )
     },
   },
diff --git a/src/components/block_card/block_card.js b/src/components/block_card/block_card.js
index 7301bf0c7..8101394dd 100644
--- a/src/components/block_card/block_card.js
+++ b/src/components/block_card/block_card.js
@@ -1,7 +1,9 @@
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
 const BlockCard = {
   props: ['userId'],
   computed: {
@@ -24,8 +26,8 @@ const BlockCard = {
             new Date(this.user.mute_expires_at).toLocaleString(),
           ])
     },
-    ...mapState({
-      blockExpirationSupported: (state) => state.instance.blockExpiration,
+    ...mapState(useInstanceStore, {
+      blockExpirationSupported: (store) => store.featureSet.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 a658a0f40..a036895bf 100644
--- a/src/components/bookmark_folder_edit/bookmark_folder_edit.js
+++ b/src/components/bookmark_folder_edit/bookmark_folder_edit.js
@@ -1,8 +1,9 @@
-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 8e09abb31..1147fd3a5 100644
--- a/src/components/bookmark_folders/bookmark_folders.js
+++ b/src/components/bookmark_folders/bookmark_folders.js
@@ -1,6 +1,7 @@
-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 e84b3bc85..be1fb06ea 100644
--- a/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js
+++ b/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js
@@ -2,7 +2,8 @@ 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'
+
+import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
 
 export const BookmarkFoldersMenuContent = {
   props: ['showPin'],
diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js
index 6dd69ada4..caeb2aea7 100644
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@@ -2,7 +2,6 @@ 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'
@@ -17,6 +16,8 @@ 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 0923a8568..4f4ea4955 100644
--- a/src/components/chat_list_item/chat_list_item.js
+++ b/src/components/chat_list_item/chat_list_item.js
@@ -1,12 +1,13 @@
 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 f3cc495c2..af3701ebf 100644
--- a/src/components/chat_message/chat_message.js
+++ b/src/components/chat_message/chat_message.js
@@ -2,7 +2,6 @@ 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'
@@ -11,6 +10,9 @@ 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'
 
@@ -74,7 +76,7 @@ const ChatMessage = {
     }),
     ...mapState({
       currentUser: (state) => state.users.currentUser,
-      restrictedNicknames: (state) => state.instance.restrictedNicknames,
+      restrictedNicknames: (state) => useInstanceStore().restrictedNicknames,
     }),
     popoverMarginStyle() {
       if (this.isCurrentUser) {
diff --git a/src/components/component_preview/component_preview.js b/src/components/component_preview/component_preview.js
index 70696f56b..1d54f58de 100644
--- a/src/components/component_preview/component_preview.js
+++ b/src/components/component_preview/component_preview.js
@@ -1,5 +1,6 @@
 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 3caf4add7..cb7cf4782 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -2,13 +2,14 @@ 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 8ab54b3df..a2c48ae53 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -1,8 +1,11 @@
 import SearchBar from 'components/search_bar/search_bar.vue'
+import { mapActions, mapState } from 'pinia'
 
-import { useInterfaceStore } from 'src/stores/interface'
 import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useInterfaceStore } from 'src/stores/interface'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faBell,
@@ -51,7 +54,7 @@ export default {
   }),
   computed: {
     enableMask() {
-      return this.supportsMask && this.$store.state.instance.logoMask
+      return this.supportsMask && this.logoMask
     },
     logoStyle() {
       return {
@@ -61,7 +64,7 @@ export default {
     logoMaskStyle() {
       return this.enableMask
         ? {
-            'mask-image': `url(${this.$store.state.instance.logo})`,
+            'mask-image': `url(${this.logo})`,
           }
         : {
             'background-color': this.enableMask ? '' : 'transparent',
@@ -70,7 +73,7 @@ export default {
     logoBgStyle() {
       return Object.assign(
         {
-          margin: `${this.$store.state.instance.logoMargin} 0`,
+          margin: `${this.logoMargin} 0`,
           opacity: this.searchBarHidden ? 1 : 0,
         },
         this.enableMask
@@ -80,24 +83,18 @@ export default {
             },
       )
     },
-    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
-    },
+    ...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,
+    }),
     currentUser() {
       return this.$store.state.users.currentUser
     },
-    privateMode() {
-      return this.$store.state.instance.private
-    },
     shouldConfirmLogout() {
       return this.$store.getters.mergedConfig.modalOnLogout
     },
@@ -127,11 +124,6 @@ export default {
     onSearchBarToggled(hidden) {
       this.searchBarHidden = hidden
     },
-    openSettingsModal() {
-      useInterfaceStore().openSettingsModal('user')
-    },
-    openAdminModal() {
-      useInterfaceStore().openSettingsModal('admin')
-    },
+    ...mapActions(useInterfaceStore, ['openSettingsModal']),
   },
 }
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index 49382f8ee..da427f2a1 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"
+          @click.stop="openSettingsModal('user')"
         >
           <FAIcon
             fixed-width
@@ -53,7 +53,7 @@
           class="button-unstyled nav-icon"
           target="_blank"
           :title="$t('nav.administration')"
-          @click.stop="openAdminModal"
+          @click.stop="openSettingsModal('admin')"
         >
           <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 8a16e4234..07836f161 100644
--- a/src/components/edit_status_modal/edit_status_modal.js
+++ b/src/components/edit_status_modal/edit_status_modal.js
@@ -1,9 +1,10 @@
 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 24794640e..22631dc1d 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -9,6 +9,8 @@ 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'
 
@@ -131,7 +133,7 @@ const EmojiInput = {
   },
   computed: {
     padEmoji() {
-      return this.$store.getters.mergedConfig.padEmoji
+      return useEmojiStore().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 79d97cff7..c478fea67 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.
- *   (getters.standardEmojiList + state.instance.customEmoji)
+ *   (useEmojiStore().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 e4221f706..79c0ab47e 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -6,6 +6,9 @@ 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,
@@ -349,8 +352,8 @@ const EmojiPicker = {
       return this.showingStickers ? '' : this.activeGroup
     },
     stickersAvailable() {
-      if (this.$store.state.instance.stickers) {
-        return this.$store.state.instance.stickers.length > 0
+      if (useEmojiStore().stickers) {
+        return useEmojiStore().stickers.length > 0
       }
       return 0
     },
@@ -358,7 +361,7 @@ const EmojiPicker = {
       if (this.hideCustomEmoji || this.hideCustomEmojiInPicker) {
         return {}
       }
-      const emojis = this.$store.getters.groupedCustomEmojis
+      const emojis = useEmojiStore().groupedCustomEmojis
       if (emojis.unpacked) {
         emojis.unpacked.text = this.$t('emoji.unpacked')
       }
@@ -368,7 +371,7 @@ const EmojiPicker = {
       return Object.keys(this.allCustomGroups)[0]
     },
     unicodeEmojiGroups() {
-      return this.$store.getters.standardEmojiGroupList.map((group) => ({
+      return useEmojiStore().standardEmojiGroupList.map((group) => ({
         id: `standard-${group.id}`,
         text: this.$t(`emoji.unicode_groups.${group.id}`),
         icon: UNICODE_EMOJI_GROUP_ICON[group.id],
@@ -381,7 +384,7 @@ const EmojiPicker = {
         .concat(this.unicodeEmojiGroups)
     },
     stickerPickerEnabled() {
-      return (this.$store.state.instance.stickers || []).length !== 0
+      return (useEmojiStore().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 1deebd878..85f4f72bd 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'
-import { useInterfaceStore } from 'src/stores/interface'
+import { useAnnouncementsStore } from 'src/stores/announcements.js'
+import { useInterfaceStore } from 'src/stores/interface.js'
 
 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 e92cb975e..dc46f5e6f 100644
--- a/src/components/features_panel/features_panel.js
+++ b/src/components/features_panel/features_panel.js
@@ -1,33 +1,23 @@
+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: {
-    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,
-      )
-    },
+    ...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),
+    }),
   },
 }
 
diff --git a/src/components/font_control/font_control.js b/src/components/font_control/font_control.js
index 08d25d52d..45e5fde81 100644
--- a/src/components/font_control/font_control.js
+++ b/src/components/font_control/font_control.js
@@ -1,8 +1,9 @@
 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 9934a7905..6015861f8 100644
--- a/src/components/gallery/gallery.js
+++ b/src/components/gallery/gallery.js
@@ -1,8 +1,9 @@
 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 4a2726d7b..f3a7eee42 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'
+import { useInterfaceStore } from 'src/stores/interface.js'
 
 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 eead52f40..1ab0eec61 100644
--- a/src/components/instance_specific_panel/instance_specific_panel.js
+++ b/src/components/instance_specific_panel/instance_specific_panel.js
@@ -1,7 +1,9 @@
+import { useInstanceStore } from 'src/stores/instance.js'
+
 const InstanceSpecificPanel = {
   computed: {
     instanceSpecificPanelContent() {
-      return this.$store.state.instance.instanceSpecificPanelContent
+      return useInstanceStore().instanceIdentity.instanceSpecificPanelContent
     },
   },
 }
diff --git a/src/components/lists/lists.js b/src/components/lists/lists.js
index 446178245..ae58960f5 100644
--- a/src/components/lists/lists.js
+++ b/src/components/lists/lists.js
@@ -1,6 +1,7 @@
-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 64a2e942c..83bd56de9 100644
--- a/src/components/lists_edit/lists_edit.js
+++ b/src/components/lists_edit/lists_edit.js
@@ -3,12 +3,13 @@ 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 7574c4c3f..2279ca6f0 100644
--- a/src/components/lists_menu/lists_menu_content.js
+++ b/src/components/lists_menu/lists_menu_content.js
@@ -3,7 +3,9 @@ import { mapState } from 'vuex'
 
 import { getListEntries } from 'src/components/navigation/filter.js'
 import NavigationEntry from 'src/components/navigation/navigation_entry.vue'
-import { useListsStore } from 'src/stores/lists'
+
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useListsStore } from 'src/stores/lists.js'
 
 export const ListsMenuContent = {
   props: ['showPin'],
@@ -16,8 +18,8 @@ export const ListsMenuContent = {
     }),
     ...mapState({
       currentUser: (state) => state.users.currentUser,
-      privateMode: (state) => state.instance.private,
-      federating: (state) => state.instance.federating,
+      privateMode: (state) => useInstanceStore().private,
+      federating: (state) => useInstanceStore().federating,
     }),
   },
 }
diff --git a/src/components/lists_timeline/lists_timeline.js b/src/components/lists_timeline/lists_timeline.js
index ae1554eb6..3d2cafa73 100644
--- a/src/components/lists_timeline/lists_timeline.js
+++ b/src/components/lists_timeline/lists_timeline.js
@@ -1,6 +1,7 @@
-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 7c43923c9..b16fb8d2f 100644
--- a/src/components/login_form/login_form.js
+++ b/src/components/login_form/login_form.js
@@ -1,10 +1,12 @@
 import { mapActions, mapState as mapPiniaState, mapStores } from 'pinia'
 import { mapState } from 'vuex'
 
-import { useAuthFlowStore } from 'src/stores/auth_flow.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
 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 { library } from '@fortawesome/fontawesome-svg-core'
 import { faTimes } from '@fortawesome/free-solid-svg-icons'
 
@@ -16,41 +18,34 @@ 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(useAuthFlowStore, [
-      'requiredPassword',
-      'requiredToken',
-      'requiredMFA',
-    ]),
+    ...mapPiniaState(useOAuthStore, ['clientId', 'clientSecret']),
+    ...mapPiniaState(useInstanceStore, ['server', 'registrationOpen']),
+    ...mapPiniaState(useAuthFlowStore, {
+      isTokenAuth: (store) => store.requiredToken,
+      isPasswordAuth: (store) => !store.requiredToken,
+    }),
   },
   methods: {
     ...mapActions(useAuthFlowStore, ['requireMFA', 'login']),
+    ...mapActions(useOAuthStore, ['ensureAppToken']),
     submit() {
       this.isTokenAuth ? this.submitToken() : this.submitPassword()
     },
     submitToken() {
       const data = {
-        instance: this.instance.server,
+        instance: this.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.oauthStore.ensureAppToken().then(() => {
+      this.ensureAppToken().then(() => {
         const app = {
-          clientId: this.oauthStore.clientId,
-          clientSecret: this.oauthStore.clientSecret,
+          clientId: this.clientId,
+          clientSecret: this.clientSecret,
         }
         oauthApi.login({ ...app, ...data })
       })
@@ -60,16 +55,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.oauthStore.ensureAppToken().then(() => {
+      this.ensureAppToken().then(() => {
         const app = {
-          clientId: this.oauthStore.clientId,
-          clientSecret: this.oauthStore.clientSecret,
+          clientId: this.clientId,
+          clientSecret: this.clientSecret,
         }
 
         oauthApi
           .getTokenWithCredentials({
             ...app,
-            instance: this.instance.server,
+            instance: this.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 6199a6e32..f0db02ffd 100644
--- a/src/components/media_modal/media_modal.js
+++ b/src/components/media_modal/media_modal.js
@@ -1,5 +1,4 @@
 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'
@@ -8,6 +7,8 @@ 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 8dc3d6c65..ee61fa369 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 > store.state.instance.uploadlimit) {
+      if (file.size > useInstanceStore().uploadlimit) {
         const filesize = fileSizeFormatService.fileSizeFormat(file.size)
         const allowedsize = fileSizeFormatService.fileSizeFormat(
-          store.state.instance.uploadlimit,
+          useInstanceStore().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 4c211b5e9..37c30355c 100644
--- a/src/components/mention_link/mention_link.js
+++ b/src/components/mention_link/mention_link.js
@@ -1,7 +1,6 @@
 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,
@@ -9,6 +8,8 @@ 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 5fa5c187a..f4ddcadd0 100644
--- a/src/components/mfa_form/recovery_form.js
+++ b/src/components/mfa_form/recovery_form.js
@@ -1,9 +1,10 @@
-import { mapActions, mapState as mapPiniaState, mapStores } from 'pinia'
-import { mapState } from 'vuex'
+import { mapActions, mapState, mapStores } from 'pinia'
+
+import mfaApi from '../../services/new_api/mfa.js'
 
 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'
@@ -16,13 +17,10 @@ export default {
     error: false,
   }),
   computed: {
-    ...mapPiniaState(useAuthFlowStore, {
-      authSettings: (store) => store.settings,
-    }),
     ...mapStores(useOAuthStore),
-    ...mapState({
-      instance: 'instance',
-    }),
+    ...mapState(useOAuthStore, ['clientId', 'clientSecret']),
+    ...mapState(useAuthFlowStore, ['settings']),
+    ...mapState(useInstanceStore, ['server']),
   },
   methods: {
     ...mapActions(useAuthFlowStore, ['requireTOTP', 'abortMFA', 'login']),
@@ -37,13 +35,11 @@ export default {
     },
 
     submit() {
-      const { clientId, clientSecret } = this.oauthStore
-
       const data = {
-        clientId,
-        clientSecret,
-        instance: this.instance.server,
-        mfaToken: this.authSettings.mfa_token,
+        clientId: this.clientId,
+        clientSecret: this.clientSecret,
+        instance: this.server,
+        mfaToken: this.settings.mfa_token,
         code: this.code,
       }
 
diff --git a/src/components/mfa_form/totp_form.js b/src/components/mfa_form/totp_form.js
index d1378b078..6d51cba94 100644
--- a/src/components/mfa_form/totp_form.js
+++ b/src/components/mfa_form/totp_form.js
@@ -1,9 +1,10 @@
-import { mapActions, mapState as mapPiniaState, mapStores } from 'pinia'
-import { mapState } from 'vuex'
+import { mapActions, mapState, mapStores } from 'pinia'
+
+import mfaApi from '../../services/new_api/mfa.js'
 
 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'
@@ -16,13 +17,11 @@ export default {
     error: false,
   }),
   computed: {
-    ...mapPiniaState(useAuthFlowStore, {
+    ...mapState(useAuthFlowStore, {
       authSettings: (store) => store.settings,
     }),
+    ...mapState(useInstanceStore, ['server']),
     ...mapStores(useOAuthStore),
-    ...mapState({
-      instance: 'instance',
-    }),
   },
   methods: {
     ...mapActions(useAuthFlowStore, ['requireRecovery', 'abortMFA', 'login']),
@@ -42,7 +41,7 @@ export default {
       const data = {
         clientId,
         clientSecret,
-        instance: this.instance.server,
+        instance: this.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 873bdc40d..c5b1d66f6 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -2,8 +2,6 @@ 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,
@@ -13,6 +11,10 @@ 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,
@@ -64,10 +66,10 @@ const MobileNav = {
       return `${this.unseenCount ? this.unseenCount : ''}`
     },
     hideSitename() {
-      return this.$store.state.instance.hideSitename
+      return useInstanceStore().hideSitename
     },
     sitename() {
-      return this.$store.state.instance.name
+      return useInstanceStore().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 dfa7b6fe2..83103c827 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'
+import { usePostStatusStore } from 'src/stores/post_status.js'
 
 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 fdb8a74b6..6628e02f8 100644
--- a/src/components/moderation_tools/moderation_tools.js
+++ b/src/components/moderation_tools/moderation_tools.js
@@ -1,6 +1,8 @@
 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'
 
@@ -54,7 +56,7 @@ const ModerationTools = {
     },
     canUseTagPolicy() {
       return (
-        this.$store.state.instance.tagPolicyAvailable &&
+        useInstanceStore().featureSet.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 d80cd0a5d..7eed379da 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -8,7 +8,9 @@ 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'
@@ -110,6 +112,14 @@ 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) =>
@@ -118,13 +128,6 @@ 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 75d4dffdd..3384534be 100644
--- a/src/components/navigation/navigation_entry.js
+++ b/src/components/navigation/navigation_entry.js
@@ -3,8 +3,9 @@ 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'
-import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
+
+import { useAnnouncementsStore } from 'src/stores/announcements.js'
+import { useServerSideStorageStore } from 'src/stores/serverSideStorage.js'
 
 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 e14edce14..a6845eee6 100644
--- a/src/components/navigation/navigation_pins.js
+++ b/src/components/navigation/navigation_pins.js
@@ -12,8 +12,10 @@ 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'
 
@@ -71,14 +73,16 @@ 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) {
@@ -92,7 +96,7 @@ const NavPanel = {
             hasChats: this.pleromaChatMessagesAvailable,
             hasAnnouncements: this.supportsAnnouncements,
             isFederating: this.federating,
-            isPrivate: this.privateMode,
+            isPrivate: this.private,
             currentUser: this.currentUser,
             supportsBubbleTimeline: this.bubbleTimeline,
             supportsBookmarkFolders: this.bookmarks,
@@ -116,7 +120,7 @@ const NavPanel = {
           supportsBubbleTimeline: this.bubbleTimeline,
           supportsBookmarkFolders: this.bookmarks,
           isFederating: this.federating,
-          isPrivate: this.privateMode,
+          isPrivate: this.private,
           currentUser: this.currentUser,
         },
       ).slice(0, this.limit)
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index 275827c43..16084dee4 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -1,7 +1,6 @@
 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,
@@ -17,6 +16,10 @@ 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,
@@ -107,7 +110,7 @@ const Notification = {
       return generateProfileLink(
         user.id,
         user.screen_name,
-        this.$store.state.instance.restrictedNicknames,
+        useInstanceStore().restrictedNicknames,
       )
     },
     getUser(notification) {
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index 9e349a2eb..6483a256e 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -2,8 +2,6 @@ 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,
@@ -17,6 +15,9 @@ 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 82c3db047..4bcb9803e 100644
--- a/src/components/oauth_callback/oauth_callback.js
+++ b/src/components/oauth_callback/oauth_callback.js
@@ -1,6 +1,8 @@
-import { useOAuthStore } from 'src/stores/oauth.js'
 import oauth from '../../services/new_api/oauth.js'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useOAuthStore } from 'src/stores/oauth.js'
+
 const oac = {
   props: ['code'],
   mounted() {
@@ -12,7 +14,7 @@ const oac = {
         .getToken({
           clientId,
           clientSecret,
-          instance: this.$store.state.instance.server,
+          instance: useInstanceStore().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 21b40bccb..eec9fe361 100644
--- a/src/components/palette_editor/palette_editor.vue
+++ b/src/components/palette_editor/palette_editor.vue
@@ -48,11 +48,13 @@
 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 4fd53f8dd..5a54d846b 100644
--- a/src/components/password_reset/password_reset.js
+++ b/src/components/password_reset/password_reset.js
@@ -1,7 +1,10 @@
+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'
 
@@ -20,11 +23,8 @@ const passwordReset = {
   computed: {
     ...mapState({
       signedIn: (state) => !!state.users.currentUser,
-      instance: (state) => state.instance,
     }),
-    mailerEnabled() {
-      return this.instance.mailerEnabled
-    },
+    ...mapPiniaState(useInstanceStore, ['server', 'mailerEnabled']),
   },
   created() {
     if (this.signedIn) {
@@ -44,9 +44,9 @@ const passwordReset = {
     submit() {
       this.isPending = true
       const email = this.user.email
-      const instance = this.instance.server
+      const server = this.server
 
-      passwordResetApi({ instance, email })
+      passwordResetApi({ server, email })
         .then(({ status }) => {
           this.isPending = false
           this.user.email = ''
diff --git a/src/components/poll/poll.js b/src/components/poll/poll.js
index 594a7be88..f8887e53f 100644
--- a/src/components/poll/poll.js
+++ b/src/components/poll/poll.js
@@ -2,9 +2,10 @@ 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 92b471314..1e132312f 100644
--- a/src/components/poll/poll_form.js
+++ b/src/components/poll/poll_form.js
@@ -1,6 +1,9 @@
+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'
@@ -52,7 +55,7 @@ export default {
       },
     },
     pollLimits() {
-      return this.$store.state.instance.pollLimits
+      return useInstanceStore().limits.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 396aa94f0..7b9512456 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -5,9 +5,6 @@ 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'
@@ -23,6 +20,13 @@ 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,
@@ -258,8 +262,8 @@ const PostStatusForm = {
     emojiUserSuggestor() {
       return suggestor({
         emoji: [
-          ...this.$store.getters.standardEmojiList,
-          ...this.$store.state.instance.customEmoji,
+          ...useEmojiStore().standardEmojiList,
+          ...useEmojiStore().customEmoji,
         ],
         store: this.$store,
       })
@@ -267,16 +271,16 @@ const PostStatusForm = {
     emojiSuggestor() {
       return suggestor({
         emoji: [
-          ...this.$store.getters.standardEmojiList,
-          ...this.$store.state.instance.customEmoji,
+          ...useEmojiStore().standardEmojiList,
+          ...useEmojiStore().customEmoji,
         ],
       })
     },
     emoji() {
-      return this.$store.getters.standardEmojiList || []
+      return useEmojiStore().standardEmojiList || []
     },
     customEmoji() {
-      return this.$store.state.instance.customEmoji || []
+      return useEmojiStore().customEmoji || []
     },
     statusLength() {
       return this.newStatus.status.length
@@ -285,7 +289,7 @@ const PostStatusForm = {
       return this.newStatus.spoilerText.length
     },
     statusLengthLimit() {
-      return this.$store.state.instance.textlimit
+      return useInstanceStore().textlimit
     },
     hasStatusLengthLimit() {
       return this.statusLengthLimit > 0
@@ -299,21 +303,21 @@ const PostStatusForm = {
       return this.hasStatusLengthLimit && this.charactersLeft < 0
     },
     minimalScopesMode() {
-      return this.$store.state.instance.minimalScopesMode
+      return useInstanceStore().minimalScopesMode
     },
     alwaysShowSubject() {
       return this.mergedConfig.alwaysShowSubjectInput
     },
     postFormats() {
-      return this.$store.state.instance.postFormats || []
+      return useInstanceStore().featureSet.postFormats || []
     },
     safeDMEnabled() {
-      return this.$store.state.instance.safeDM
+      return useInstanceStore().featureSet.safeDM
     },
     pollsAvailable() {
       return (
-        this.$store.state.instance.pollsAvailable &&
-        this.$store.state.instance.pollLimits.max_options >= 2 &&
+        useInstanceStore().featureSet.pollsAvailable &&
+        useInstanceStore().limits.pollLimits.max_options >= 2 &&
         this.disablePolls !== true
       )
     },
@@ -342,7 +346,7 @@ const PostStatusForm = {
       return typeof this.statusId !== 'undefined' && this.statusId.trim() !== ''
     },
     quotable() {
-      if (!this.$store.state.instance.quotingAvailable) {
+      if (!useInstanceStore().featureSet.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 2c643e9db..0fe51791e 100644
--- a/src/components/post_status_modal/post_status_modal.js
+++ b/src/components/post_status_modal/post_status_modal.js
@@ -1,9 +1,10 @@
 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 3572dbb18..84abeec72 100644
--- a/src/components/quick_filter_settings/quick_filter_settings.js
+++ b/src/components/quick_filter_settings/quick_filter_settings.js
@@ -1,9 +1,10 @@
 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 6c5a9f667..438d1405b 100644
--- a/src/components/quick_view_settings/quick_view_settings.js
+++ b/src/components/quick_view_settings/quick_view_settings.js
@@ -3,7 +3,8 @@ 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'
+
+import { useInterfaceStore } from 'src/stores/interface.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index 8d1081acb..9058963c6 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -1,12 +1,16 @@
 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() }
@@ -96,21 +100,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 a4df8eb6c..fcfb83c3a 100644
--- a/src/components/report/report.js
+++ b/src/components/report/report.js
@@ -1,10 +1,13 @@
 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: {
@@ -31,7 +34,7 @@ const Report = {
       return generateProfileLink(
         user.id,
         user.screen_name,
-        this.$store.state.instance.restrictedNicknames,
+        useInstanceStore().restrictedNicknames,
       )
     },
     setReportState(state) {
diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx
index 99dd8035d..3a6f0b1bc 100644
--- a/src/components/rich_content/rich_content.jsx
+++ b/src/components/rich_content/rich_content.jsx
@@ -5,6 +5,7 @@ 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 e53c2f219..115ef519b 100644
--- a/src/components/settings_modal/admin_tabs/emoji_tab.js
+++ b/src/components/settings_modal/admin_tabs/emoji_tab.js
@@ -6,12 +6,14 @@ 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,
@@ -102,7 +104,7 @@ const EmojiTab = {
         // Remote pack
         return `${this.pack.remote.instance}/emoji/${encodeURIComponent(this.pack.remote.baseName)}/${name}`
       } else {
-        return `${this.$store.state.instance.server}/emoji/${encodeURIComponent(this.packName)}/${name}`
+        return `${useInstanceStore().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 7563adae0..b76cd9015 100644
--- a/src/components/settings_modal/admin_tabs/frontends_tab.js
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.js
@@ -1,6 +1,5 @@
 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'
@@ -8,6 +7,8 @@ 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 61e00a353..7ba910950 100644
--- a/src/components/settings_modal/helpers/attachment_setting.js
+++ b/src/components/settings_modal/helpers/attachment_setting.js
@@ -1,8 +1,11 @@
 import Attachment from 'src/components/attachment/attachment.vue'
 import MediaUpload from 'src/components/media_upload/media_upload.vue'
-import { fileTypeExt } from 'src/services/file_type/file_type.service.js'
 import Setting from './setting.js'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
+import { fileTypeExt } from 'src/services/file_type/file_type.service.js'
+
 export default {
   ...Setting,
   props: {
@@ -24,9 +27,7 @@ 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
-        : this.$store.state.instance.server + path
+      const url = path.includes('://') ? path : useInstanceStore().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 6d6cdd121..5d90ccb1e 100644
--- a/src/components/settings_modal/helpers/pwa_manifest_icons_setting.js
+++ b/src/components/settings_modal/helpers/pwa_manifest_icons_setting.js
@@ -3,9 +3,12 @@ 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 { fileTypeExt } from 'src/services/file_type/file_type.service.js'
 import Setting from './setting.js'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
+import { fileTypeExt } from 'src/services/file_type/file_type.service.js'
+
 export default {
   ...Setting,
   components: {
@@ -34,9 +37,7 @@ export default {
           url: '',
         }
       }
-      const url = path.includes('://')
-        ? path
-        : this.$store.state.instance.server + path
+      const url = path.includes('://') ? path : useInstanceStore().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 a3238ce2f..1a8e13e18 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'
+import { useInterfaceStore } from 'src/stores/interface.js'
 
 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 4517c3295..f2c071045 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -6,13 +6,15 @@ 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 1a3f10e77..6cd760833 100644
--- a/src/components/settings_modal/settings_modal_admin_content.js
+++ b/src/components/settings_modal/settings_modal_admin_content.js
@@ -1,4 +1,3 @@
-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'
@@ -18,6 +17,8 @@ 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 f66099049..ddee812ca 100644
--- a/src/components/settings_modal/settings_modal_user_content.js
+++ b/src/components/settings_modal/settings_modal_user_content.js
@@ -1,4 +1,3 @@
-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'
@@ -16,6 +15,8 @@ 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 1110505cc..0a217a216 100644
--- a/src/components/settings_modal/tabs/appearance_tab.js
+++ b/src/components/settings_modal/tabs/appearance_tab.js
@@ -2,6 +2,18 @@ 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,
@@ -11,15 +23,6 @@ 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() {
@@ -83,7 +86,7 @@ const AppearanceTab = {
 
     const updateIndex = (resource) => {
       const capitalizedResource = resource[0].toUpperCase() + resource.slice(1)
-      const currentIndex = this.$store.state.instance[`${resource}sIndex`]
+      const currentIndex = useInstanceStore()[`${resource}sIndex`]
 
       let promise
       if (currentIndex) {
@@ -273,11 +276,11 @@ const AppearanceTab = {
       return !window.IntersectionObserver
     },
     instanceWallpaper() {
-      this.$store.state.instance.background
+      useInstanceStore().instanceIdentity.background
     },
     instanceWallpaperUsed() {
       return (
-        this.$store.state.instance.background &&
+        useInstanceStore().instanceIdentity.background &&
         !this.$store.state.users.currentUser.background_image
       )
     },
@@ -333,18 +336,21 @@ const AppearanceTab = {
     },
     isThemeActive(key) {
       return (
-        key === (this.mergedConfig.theme || this.$store.state.instance.theme)
+        key ===
+        (this.mergedConfig.theme || useInstanceStore().instanceIdentity.theme)
       )
     },
     isStyleActive(key) {
       return (
-        key === (this.mergedConfig.style || this.$store.state.instance.style)
+        key ===
+        (this.mergedConfig.style || useInstanceStore().instanceIdentity.style)
       )
     },
     isPaletteActive(key) {
       return (
         key ===
-        (this.mergedConfig.palette || this.$store.state.instance.palette)
+        (this.mergedConfig.palette ||
+          useInstanceStore().instanceIdentity.palette)
       )
     },
     ...mapActions(useInterfaceStore, ['setStyle', 'setTheme']),
@@ -431,10 +437,10 @@ const AppearanceTab = {
       if (!file) {
         return
       }
-      if (file.size > this.$store.state.instance[slot + 'limit']) {
+      if (file.size > useInstanceStore()[slot + 'limit']) {
         const filesize = fileSizeFormatService.fileSizeFormat(file.size)
         const allowedsize = fileSizeFormatService.fileSizeFormat(
-          this.$store.state.instance[slot + 'limit'],
+          useInstanceStore()[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 c0b7b33b2..eb7d64a53 100644
--- a/src/components/settings_modal/tabs/clutter_tab.js
+++ b/src/components/settings_modal/tabs/clutter_tab.js
@@ -1,10 +1,8 @@
 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'
@@ -12,6 +10,9 @@ 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,
@@ -24,7 +25,7 @@ const ClutterTab = {
   },
   computed: {
     instanceSpecificPanelPresent() {
-      return this.$store.state.instance.showInstanceSpecificPanel
+      return useInstanceStore().showInstanceSpecificPanel
     },
     ...SharedComputedObject(),
     ...mapState(useServerSideStorageStore, {
@@ -32,8 +33,8 @@ const ClutterTab = {
         Object.entries(store.prefsStorage.simple.muteFilters),
       muteFiltersObject: (store) => store.prefsStorage.simple.muteFilters,
     }),
-    ...mapVuexState({
-      blockExpirationSupported: (state) => state.instance.blockExpiration,
+    ...mapState(useInstanceStore, {
+      blockExpirationSupported: (store) => store.featureSet.blockExpiration,
     }),
     onMuteDefaultActionLv1: {
       get() {
diff --git a/src/components/settings_modal/tabs/composing_tab.js b/src/components/settings_modal/tabs/composing_tab.js
index 0b06922e0..ba3ddaca8 100644
--- a/src/components/settings_modal/tabs/composing_tab.js
+++ b/src/components/settings_modal/tabs/composing_tab.js
@@ -4,8 +4,6 @@ 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'
@@ -14,6 +12,11 @@ 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,
@@ -108,7 +111,7 @@ const ComposingTab = {
   },
   computed: {
     postFormats() {
-      return this.$store.state.instance.postFormats || []
+      return useInstanceStore().postFormats || []
     },
     postContentOptions() {
       return this.postFormats.map((format) => ({
@@ -129,8 +132,8 @@ const ComposingTab = {
       },
     },
     ...SharedComputedObject(),
-    ...mapState({
-      blockExpirationSupported: (state) => state.instance.blockExpiration,
+    ...mapState(useInstanceStore, {
+      blockExpirationSupported: (store) => store.featureSet.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 dcd63416b..cc41302c7 100644
--- a/src/components/settings_modal/tabs/data_import_export_tab.js
+++ b/src/components/settings_modal/tabs/data_import_export_tab.js
@@ -3,7 +3,8 @@ 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'
+
+import { useOAuthTokensStore } from 'src/stores/oauth_tokens.js'
 
 const DataImportExportTab = {
   data() {
diff --git a/src/components/settings_modal/tabs/developer_tab.js b/src/components/settings_modal/tabs/developer_tab.js
index 60f2ecb36..b500d2f03 100644
--- a/src/components/settings_modal/tabs/developer_tab.js
+++ b/src/components/settings_modal/tabs/developer_tab.js
@@ -1,13 +1,16 @@
-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 = this.$store.state.instance
+    const instance = useInstanceStore()
     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 8bd2b913d..0e6c6c725 100644
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -1,16 +1,9 @@
 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'
@@ -18,6 +11,15 @@ 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 = {
@@ -90,7 +92,7 @@ const FilteringTab = {
   },
   computed: {
     instanceSpecificPanelPresent() {
-      return this.$store.state.instance.showInstanceSpecificPanel
+      return useInstanceStore().instanceIdentity.showInstanceSpecificPanel
     },
     ...SharedComputedObject(),
     ...mapState(useServerSideStorageStore, {
@@ -98,8 +100,8 @@ const FilteringTab = {
         Object.entries(store.prefsStorage.simple.muteFilters),
       muteFiltersObject: (store) => store.prefsStorage.simple.muteFilters,
     }),
-    ...mapVuexState({
-      blockExpirationSupported: (state) => state.instance.blockExpiration,
+    ...mapState(useInstanceStore, {
+      blockExpirationSupported: (store) => store.featureSet.blockExpiration,
     }),
     onMuteDefaultActionLv1: {
       get() {
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index cf98fd182..3f2530278 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -1,8 +1,7 @@
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 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'
@@ -10,6 +9,10 @@ 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: {
@@ -49,8 +52,8 @@ const GeneralTab = {
       },
     },
     ...SharedComputedObject(),
-    ...mapState({
-      blockExpirationSupported: (state) => state.instance.blockExpiration,
+    ...mapState(useInstanceStore, {
+      blockExpirationSupported: (store) => store.featureSet.blockExpiration,
     }),
   },
   methods: {
diff --git a/src/components/settings_modal/tabs/layout_tab.js b/src/components/settings_modal/tabs/layout_tab.js
index 3fc18491c..9accd1979 100644
--- a/src/components/settings_modal/tabs/layout_tab.js
+++ b/src/components/settings_modal/tabs/layout_tab.js
@@ -4,6 +4,8 @@ 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: {
@@ -30,10 +32,10 @@ const GeneralTab = {
   },
   computed: {
     postFormats() {
-      return this.$store.state.instance.postFormats || []
+      return useInstanceStore().featureSet.postFormats || []
     },
     instanceShoutboxPresent() {
-      return this.$store.state.instance.shoutAvailable
+      return useInstanceStore().featureSet.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 55087d1e2..34474e605 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
@@ -12,7 +12,9 @@ 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 { useOAuthTokensStore } from 'src/stores/oauth_tokens'
+
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useOAuthTokensStore } from 'src/stores/oauth_tokens.js'
 
 const BlockList = withLoadMore({
   fetch: (props, $store) => $store.dispatch('fetchBlocks'),
@@ -64,7 +66,7 @@ const MutesAndBlocks = {
   },
   computed: {
     knownDomains() {
-      return this.$store.state.instance.knownDomains
+      return useInstanceStore().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 c79c72e70..549803265 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,6 +7,11 @@ 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,
@@ -41,8 +46,6 @@ 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 = [
@@ -125,7 +128,7 @@ export default {
     }
   },
   created() {
-    const currentIndex = this.$store.state.instance.themesIndex
+    const currentIndex = useInstanceStore().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 3bc02829a..c24ff8b6f 100644
--- a/src/components/settings_modal/tabs/security_tab/security_tab.js
+++ b/src/components/settings_modal/tabs/security_tab/security_tab.js
@@ -1,9 +1,12 @@
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import ProgressButton from 'src/components/progress_button/progress_button.vue'
-import localeService from 'src/services/locale/locale.service.js'
-import { useOAuthTokensStore } from 'src/stores/oauth_tokens'
 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'
+
 const SecurityTab = {
   data() {
     return {
@@ -42,7 +45,7 @@ const SecurityTab = {
       return this.$store.state.users.currentUser
     },
     pleromaExtensionsAvailable() {
-      return this.$store.state.instance.pleromaExtensionsAvailable
+      return useInstanceStore().featureSet.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 7fa55761a..6c2366999 100644
--- a/src/components/settings_modal/tabs/style_tab/style_tab.js
+++ b/src/components/settings_modal/tabs/style_tab/style_tab.js
@@ -20,6 +20,12 @@ 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,
@@ -43,10 +49,6 @@ 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 d52c0084c..70a24010b 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,6 +4,7 @@ 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 a7613923c..066fe9d71 100644
--- a/src/components/shadow_control/shadow_control.js
+++ b/src/components/shadow_control/shadow_control.js
@@ -7,6 +7,7 @@ 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 6cb6a53b0..fd0f6912b 100644
--- a/src/components/shout_panel/shout_panel.js
+++ b/src/components/shout_panel/shout_panel.js
@@ -1,5 +1,7 @@
+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'
@@ -32,7 +34,7 @@ const shoutPanel = {
       return generateProfileLink(
         user.id,
         user.username,
-        this.$store.state.instance.restrictedNicknames,
+        useInstanceStore().restrictedNicknames,
       )
     },
   },
diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
index b12cef86e..0f7b06990 100644
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@@ -1,14 +1,16 @@
-import { mapState as mapPiniaState } from 'pinia'
-import { mapGetters, mapState } from 'vuex'
+import { mapActions, mapState } from 'pinia'
+import { mapGetters } 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,
@@ -74,26 +76,14 @@ 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 this.$store.state.instance.private
+      return useInstanceStore().private
     },
     federating() {
-      return this.$store.state.instance.federating
+      return useInstanceStore().federating
     },
     timelinesRoute() {
       let name
@@ -107,13 +97,18 @@ const SideDrawer = {
         return { name }
       }
     },
-    ...mapPiniaState(useAnnouncementsStore, {
-      supportsAnnouncements: (store) => store.supportsAnnouncements,
-      unreadAnnouncementCount: 'unreadAnnouncementCount',
-    }),
-    ...mapState({
-      pleromaChatMessagesAvailable: (state) =>
-        state.instance.pleromaChatMessagesAvailable,
+    ...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,
     }),
     ...mapGetters(['unreadChatCount', 'draftCount']),
   },
@@ -131,12 +126,7 @@ const SideDrawer = {
     touchMove(e) {
       GestureService.updateSwipe(e, this.closeGesture)
     },
-    openSettingsModal() {
-      useInterfaceStore().openSettingsModal('user')
-    },
-    openAdminModal() {
-      useInterfaceStore().openSettingsModal('admin')
-    },
+    ...mapActions(useInterfaceStore, ['openSettingsModal']),
   },
 }
 
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index eda60a96a..c034edf91 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"
+            @click="openSettingsModal('user')"
           >
             <FAIcon
               fixed-width
@@ -225,7 +225,7 @@
         >
           <button
             class="menu-item"
-            @click.stop="openAdminModal"
+            @click.stop="openSettingsModal('admin')"
           >
             <FAIcon
               fixed-width
diff --git a/src/components/staff_panel/staff_panel.js b/src/components/staff_panel/staff_panel.js
index 0b7dc8b57..3f271f4d3 100644
--- a/src/components/staff_panel/staff_panel.js
+++ b/src/components/staff_panel/staff_panel.js
@@ -4,9 +4,11 @@ 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 = this.$store.state.instance.staffAccounts
+    const nicknames = useInstanceStore().staffAccounts
     nicknames.forEach((nickname) =>
       this.$store.dispatch('fetchUserIfMissing', nickname),
     )
@@ -28,7 +30,7 @@ const StaffPanel = {
     },
     ...mapGetters(['findUserByName']),
     ...mapState({
-      staffAccounts: (state) => state.instance.staffAccounts,
+      staffAccounts: (state) => useInstanceStore().staffAccounts,
     }),
   },
 }
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 1673a6933..66acae0d3 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -4,8 +4,6 @@ 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,
@@ -22,6 +20,11 @@ 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,
@@ -494,7 +497,7 @@ const Status = {
       return this.status.edited_at !== null
     },
     editingAvailable() {
-      return this.$store.state.instance.editingAvailable
+      return useInstanceStore().featureSet.editingAvailable
     },
     hasVisibleQuote() {
       return this.status.quote_url && this.status.quote_visible
@@ -588,7 +591,7 @@ const Status = {
       return generateProfileLink(
         id,
         name,
-        this.$store.state.instance.restrictedNicknames,
+        useInstanceStore().restrictedNicknames,
       )
     },
     addMediaPlaying(id) {
diff --git a/src/components/status_action_buttons/action_button.js b/src/components/status_action_buttons/action_button.js
index 5badd87e7..f6946f7c2 100644
--- a/src/components/status_action_buttons/action_button.js
+++ b/src/components/status_action_buttons/action_button.js
@@ -2,6 +2,8 @@ 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,
@@ -91,7 +93,7 @@ export default {
       return this.status.thread_muted
     },
     hideCustomEmoji() {
-      return !this.$store.state.instance.pleromaCustomEmojiReactionsAvailable
+      return !useInstanceStore().pleromaCustomEmojiReactionsAvailable
     },
     buttonInnerClass() {
       return [
@@ -107,7 +109,7 @@ export default {
       ]
     },
     remoteInteractionLink() {
-      return this.$store.getters.remoteInteractionLink({
+      return useInstanceStore().getRemoteInteractionLink({
         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 d1a6845d1..4e0baaa61 100644
--- a/src/components/status_action_buttons/buttons_definitions.js
+++ b/src/components/status_action_buttons/buttons_definitions.js
@@ -1,4 +1,5 @@
 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'
 
@@ -159,7 +160,10 @@ export const BUTTONS = [
     icon: 'history',
     label: 'status.status_history',
     if({ status, state }) {
-      return state.instance.editingAvailable && status.edited_at !== null
+      return (
+        useInstanceStore().featureSet.editingAvailable &&
+        status.edited_at !== null
+      )
     },
     action({ status }) {
       const originalStatus = { ...status }
@@ -189,7 +193,7 @@ export const BUTTONS = [
     if({ status, loggedIn, currentUser, state }) {
       return (
         loggedIn &&
-        state.instance.editingAvailable &&
+        useInstanceStore().featureSet.editingAvailable &&
         status.user.id === currentUser.id
       )
     },
@@ -243,7 +247,7 @@ export const BUTTONS = [
     action({ state, status, router }) {
       navigator.clipboard.writeText(
         [
-          state.instance.server,
+          useInstanceStore().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 8473a0db1..2e08797c8 100644
--- a/src/components/status_action_buttons/status_action_buttons.js
+++ b/src/components/status_action_buttons/status_action_buttons.js
@@ -2,11 +2,13 @@ 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 80f8400b6..4a3872895 100644
--- a/src/components/status_body/status_body.js
+++ b/src/components/status_body/status_body.js
@@ -1,6 +1,7 @@
 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 4aa617832..a3c97ffe6 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,7 +2,8 @@ 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'
+
+import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
 
 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 51bfe6f1e..a00792826 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -1,12 +1,13 @@
 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 1ad48ace3..2cf97d893 100644
--- a/src/components/status_history_modal/status_history_modal.js
+++ b/src/components/status_history_modal/status_history_modal.js
@@ -1,9 +1,10 @@
 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 6a6aed862..949d2ecf9 100644
--- a/src/components/sticker_picker/sticker_picker.js
+++ b/src/components/sticker_picker/sticker_picker.js
@@ -1,7 +1,11 @@
 /* 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,
@@ -16,7 +20,7 @@ const StickerPicker = {
   },
   computed: {
     pack() {
-      return this.$store.state.instance.stickers || []
+      return useEmojiStore().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 f8ff89a6f..4e087c094 100644
--- a/src/components/still-image/still-image-emoji-popover.vue
+++ b/src/components/still-image/still-image-emoji-popover.vue
@@ -60,9 +60,11 @@ import Popover from 'components/popover/popover.vue'
 import SelectComponent from 'components/select/select.vue'
 import { assign } from 'lodash'
 
-import { useInterfaceStore } from 'src/stores/interface'
 import StillImage from './still-image.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useInterfaceStore } from 'src/stores/interface'
+
 export default {
   components: { StillImage, Popover, SelectComponent },
   props: {
@@ -125,7 +127,7 @@ export default {
       const allPacks = {}
 
       return listFunction({
-        instance: this.$store.state.instance.server,
+        instance: useInstanceStore().server,
         page: 1,
         pageSize: 0,
       })
@@ -140,7 +142,7 @@ export default {
             resultingPromise = resultingPromise
               .then(() =>
                 listFunction({
-                  instance: this.$store.state.instance.server,
+                  instance: useInstanceStore().server,
                   page: i,
                   pageSize,
                 }),
diff --git a/src/components/tab_switcher/tab_switcher.jsx b/src/components/tab_switcher/tab_switcher.jsx
index a495ddd51..b485b3ff8 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'
+import { useInterfaceStore } from 'src/stores/interface.js'
 
 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 e250ba5af..64a745455 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: {
-    content() {
-      return this.$store.state.instance.tos
-    },
-    embedded() {
-      return this.$store.state.instance.embeddedToS
-    },
-  },
+  computed: mapState(useInstanceStore, {
+    content: (store) => store.instanceIdentity.tos,
+    embedded: (store) => store.instanceIdentity.embeddedToS,
+  }),
 }
 
 export default TermsOfServicePanel
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index afb1690e0..4616a4111 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -1,8 +1,6 @@
 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'
@@ -10,6 +8,10 @@ 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 97c4dbe35..ebbe803c7 100644
--- a/src/components/timeline_menu/timeline_menu.js
+++ b/src/components/timeline_menu/timeline_menu.js
@@ -1,15 +1,18 @@
+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'
 
@@ -58,13 +61,16 @@ 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(
@@ -72,7 +78,7 @@ const TimelineMenu = {
         {
           hasChats: this.pleromaChatMessagesAvailable,
           isFederating: this.federating,
-          isPrivate: this.privateMode,
+          isPrivate: this.private,
           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 a2cb9e5c1..a8bc60676 100644
--- a/src/components/update_notification/update_notification.js
+++ b/src/components/update_notification/update_notification.js
@@ -1,7 +1,10 @@
+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'
@@ -36,7 +39,7 @@ const UpdateNotification = {
     },
     shouldShow() {
       return (
-        !this.$store.state.instance.disableUpdateNotification &&
+        !useInstanceStore().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 a8bd03d49..fdf766f58 100644
--- a/src/components/user_avatar/user_avatar.js
+++ b/src/components/user_avatar/user_avatar.js
@@ -1,6 +1,8 @@
-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'
 
@@ -35,7 +37,7 @@ const UserAvatar = {
   data() {
     return {
       showPlaceholder: false,
-      defaultAvatar: `${this.$store.state.instance.server + this.$store.state.instance.defaultAvatar}`,
+      defaultAvatar: `${useInstanceStore().server + useInstanceStore().defaultAvatar}`,
       betterShadow: useInterfaceStore().browserSupport.cssFilter,
     }
   },
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index 0786e5b35..5cbb8b6d7 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -11,10 +11,6 @@ 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'
@@ -27,6 +23,14 @@ 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,
@@ -176,7 +180,7 @@ export default {
       return false
     },
     groupActorAvailable() {
-      return this.$store.state.instance.groupActorAvailable
+      return useInstanceStore().featureSet.groupActorAvailable
     },
     availableActorTypes() {
       return this.groupActorAvailable
@@ -209,7 +213,7 @@ export default {
       return Math.round(this.user.statuses_count / days)
     },
     emoji() {
-      return this.$store.state.instance.customEmoji.map((e) => ({
+      return useEmojiStore().customEmoji.map((e) => ({
         shortcode: e.displayText,
         static_url: e.imageUrl,
         url: e.imageUrl,
@@ -336,18 +340,18 @@ export default {
     },
     defaultAvatar() {
       return (
-        this.$store.state.instance.server +
-        this.$store.state.instance.defaultAvatar
+        useInstanceStore().server +
+        useInstanceStore().instanceIdentity.defaultAvatar
       )
     },
     defaultBanner() {
       return (
-        this.$store.state.instance.server +
-        this.$store.state.instance.defaultBanner
+        useInstanceStore().server +
+        useInstanceStore().instanceIdentity.defaultBanner
       )
     },
     isDefaultAvatar() {
-      const baseAvatar = this.$store.state.instance.defaultAvatar
+      const baseAvatar = useInstanceStore().defaultAvatar
       return (
         !this.$store.state.users.currentUser.profile_image_url ||
         this.$store.state.users.currentUser.profile_image_url.includes(
@@ -356,14 +360,14 @@ export default {
       )
     },
     isDefaultBanner() {
-      const baseBanner = this.$store.state.instance.defaultBanner
+      const baseBanner = useInstanceStore().defaultBanner
       return (
         !this.$store.state.users.currentUser.cover_photo ||
         this.$store.state.users.currentUser.cover_photo.includes(baseBanner)
       )
     },
     fieldsLimits() {
-      return this.$store.state.instance.fieldsLimits
+      return useInstanceStore().limits.fieldsLimits
     },
     maxFields() {
       return this.fieldsLimits ? this.fieldsLimits.maxFields : 0
@@ -372,7 +376,7 @@ export default {
       return suggestor({
         emoji: [
           ...this.$store.getters.standardEmojiList,
-          ...this.$store.state.instance.customEmoji,
+          ...useEmojiStore().customEmoji,
         ],
         store: this.$store,
       })
@@ -381,7 +385,7 @@ export default {
       return suggestor({
         emoji: [
           ...this.$store.getters.standardEmojiList,
-          ...this.$store.state.instance.customEmoji,
+          ...useEmojiStore().customEmoji,
         ],
       })
     },
@@ -412,7 +416,7 @@ export default {
       return generateProfileLink(
         user.id,
         user.screen_name,
-        this.$store.state.instance.restrictedNicknames,
+        useInstanceStore().restrictedNicknames,
       )
     },
     openProfileTab() {
diff --git a/src/components/user_link/user_link.vue b/src/components/user_link/user_link.vue
index 059508f49..e8a4ac4a7 100644
--- a/src/components/user_link/user_link.vue
+++ b/src/components/user_link/user_link.vue
@@ -14,9 +14,12 @@
 </template>
 
 <script>
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 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'
+
 const UserLink = {
   props: {
     user: Object,
@@ -33,7 +36,7 @@ const UserLink = {
       return generateProfileLink(
         user.id,
         user.screen_name,
-        this.$store.state.instance.restrictedNicknames,
+        useInstanceStore().restrictedNicknames,
       )
     },
   },
diff --git a/src/components/user_list_menu/user_list_menu.js b/src/components/user_list_menu/user_list_menu.js
index b30a8808f..47a84a6bb 100644
--- a/src/components/user_list_menu/user_list_menu.js
+++ b/src/components/user_list_menu/user_list_menu.js
@@ -1,9 +1,10 @@
 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 73fc81a9e..d40103293 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -9,6 +9,8 @@ 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'
 
@@ -87,7 +89,7 @@ const UserProfile = {
     favoritesTabVisible() {
       return (
         this.isUs ||
-        (this.$store.state.instance.pleromaPublicFavouritesAvailable &&
+        (useInstanceStore().featureSet.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 39c264d5b..896167df0 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.js
+++ b/src/components/user_reporting_modal/user_reporting_modal.js
@@ -1,10 +1,11 @@
-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 66bb6bda2..6c005ab4b 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,6 +1,7 @@
 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 5dbb1c3d1..13787000e 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,14 +1,17 @@
 import { shuffle } from 'lodash'
 
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 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'
+
 function showWhoToFollow(panel, reply) {
   const shuffled = shuffle(reply)
 
   panel.usersToFollow.forEach((toFollow, index) => {
     const user = shuffled[index]
-    const img = user.avatar || this.$store.state.instance.defaultAvatar
+    const img = user.avatar || useInstanceStore().defaultAvatar
     const name = user.acct
 
     toFollow.img = img
@@ -46,7 +49,7 @@ const WhoToFollowPanel = {
       return this.$store.state.users.currentUser.screen_name
     },
     suggestionsEnabled() {
-      return this.$store.state.instance.suggestionsEnabled
+      return useInstanceStore().featureSet.suggestionsEnabled
     },
   },
   methods: {
@@ -54,7 +57,7 @@ const WhoToFollowPanel = {
       return generateProfileLink(
         id,
         name,
-        this.$store.state.instance.restrictedNicknames,
+        useInstanceStore().restrictedNicknames,
       )
     },
   },
@@ -67,7 +70,7 @@ const WhoToFollowPanel = {
   },
   mounted: function () {
     this.usersToFollow = new Array(3).fill().map(() => ({
-      img: this.$store.state.instance.defaultAvatar,
+      img: useInstanceStore().defaultAvatar,
       name: '',
       id: 0,
     }))
diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index 90f602c40..f7e2b0b08 100644
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@@ -1,9 +1,10 @@
 import { cloneDeep, each, get, set } from 'lodash'
 import merge from 'lodash.merge'
 
-import { useInterfaceStore } from 'src/stores/interface'
 import { storage } from './storage.js'
 
+import { useInterfaceStore } from 'src/stores/interface'
+
 let loaded = false
 
 const defaultReducer = (state, paths) =>
diff --git a/src/lib/push_notifications_plugin.js b/src/lib/push_notifications_plugin.js
index 2cc55c3bb..9732a82c9 100644
--- a/src/lib/push_notifications_plugin.js
+++ b/src/lib/push_notifications_plugin.js
@@ -1,8 +1,9 @@
-import { useInterfaceStore } from 'src/stores/interface'
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useInterfaceStore } from 'src/stores/interface.js'
 
 export default (store) => {
   store.subscribe((mutation, state) => {
-    const vapidPublicKey = state.instance.vapidPublicKey
+    const vapidPublicKey = useInstanceStore().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 cb8b72e10..d658433fe 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -1,11 +1,13 @@
 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 = {
@@ -237,7 +239,7 @@ const api = {
     ) {
       if (
         timeline === 'favourites' &&
-        !store.rootState.instance.pleromaPublicFavouritesAvailable
+        !useInstanceStore().featureSet.pleromaPublicFavouritesAvailable
       )
         return
       if (store.state.fetchers[timeline]) return
@@ -322,7 +324,7 @@ const api = {
     // Bookmark folders
     startFetchingBookmarkFolders(store) {
       if (store.state.fetchers.bookmarkFolders) return
-      if (!store.rootState.instance.pleromaBookmarkFoldersAvailable) return
+      if (!useInstanceStore().featureSet.pleromaBookmarkFoldersAvailable) return
       const fetcher =
         store.state.backendInteractor.startFetchingBookmarkFolders({ store })
       store.commit('addFetcher', { fetcherName: 'bookmarkFolders', fetcher })
@@ -341,7 +343,7 @@ const api = {
       // Set up websocket connection
       const token = state.wsToken
       if (
-        rootState.instance.shoutAvailable &&
+        useInstanceStore().shoutAvailable &&
         typeof token !== 'undefined' &&
         state.socket === null
       ) {
diff --git a/src/modules/config.js b/src/modules/config.js
index cf144664a..508ddafc6 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -1,13 +1,16 @@
 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',
@@ -43,24 +46,27 @@ export const instanceDefaultProperties = Object.keys(instanceDefaultConfig)
 const config = {
   state: { ...defaultState },
   getters: {
-    defaultConfig(state, getters, rootState) {
-      const { instance } = rootState
+    defaultConfig() {
       return {
         ...defaultState,
         ...Object.fromEntries(
-          instanceDefaultProperties.map((key) => [key, instance[key]]),
+          instanceDefaultProperties.map((key) => [
+            key,
+            useInstanceStore().prefsStorage[key],
+          ]),
         ),
       }
     },
-    mergedConfig(state, getters, rootState, rootGetters) {
-      const { defaultConfig } = rootGetters
-      return {
-        ...defaultConfig,
-        // Do not override with undefined
-        ...Object.fromEntries(
-          Object.entries(state).filter(([, v]) => v !== undefined),
-        ),
-      }
+    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
     },
   },
   mutations: {
@@ -177,7 +183,7 @@ const config = {
           }
           case 'interfaceLanguage':
             messages.setLanguage(useI18nStore().i18n, value)
-            dispatch('loadUnicodeEmojiData', value)
+            useEmojiStore().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 d5daef3d3..3e39fb1fc 100644
--- a/src/modules/default_config_state.js
+++ b/src/modules/default_config_state.js
@@ -18,9 +18,13 @@ export const staticOrApiConfigDefault = {
   redirectRootLogin: '/main/friends',
   redirectRootNoLogin: '/main/all',
   hideSitename: false,
-  nsfwCensorImage: undefined,
+  nsfwCensorImage: null,
   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 ab9dd2418..15e57f716 100644
--- a/src/modules/index.js
+++ b/src/modules/index.js
@@ -3,14 +3,12 @@ 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/modules/notifications.js b/src/modules/notifications.js
index 7667a20d0..cb3d430db 100644
--- a/src/modules/notifications.js
+++ b/src/modules/notifications.js
@@ -1,5 +1,3 @@
-import { useReportsStore } from 'src/stores/reports.js'
-import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
 import apiService from '../services/api/api.service.js'
 import {
   closeAllDesktopNotifications,
@@ -11,6 +9,9 @@ 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 bf6500238..1dcfa213b 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -13,9 +13,10 @@ 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 4e45d420f..04c444071 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -9,10 +9,6 @@ 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'
@@ -25,6 +21,14 @@ 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) {
@@ -547,7 +551,7 @@ const users = {
     },
     registerPushNotifications(store) {
       const token = store.state.currentUser.credentials
-      const vapidPublicKey = store.rootState.instance.vapidPublicKey
+      const vapidPublicKey = useInstanceStore().vapidPublicKey
       const isEnabled = store.rootState.config.webPushNotifications
       const notificationVisibility =
         store.rootState.config.notificationVisibility
@@ -644,7 +648,6 @@ 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
@@ -653,7 +656,7 @@ const users = {
         .then((app) => {
           const params = {
             app,
-            instance: instance.server,
+            instance: useInstanceStore().server,
             token: oauth.userToken,
           }
 
@@ -685,7 +688,6 @@ 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)
@@ -702,7 +704,7 @@ const users = {
               useServerSideStorageStore().setServerSideStorage(user)
               commit('addNewUsers', [user])
 
-              dispatch('fetchEmoji')
+              useEmojiStore().fetchEmoji()
 
               getNotificationPermission().then((permission) =>
                 useInterfaceStore().setNotificationPermission(permission),
@@ -763,7 +765,9 @@ const users = {
                 // Start fetching notifications
                 dispatch('startFetchingNotifications')
 
-                if (rootState.instance.pleromaChatMessagesAvailable) {
+                if (
+                  useInstanceStore().featureSet.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 ccbc76d2b..adc18ef7f 100644
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@@ -8,6 +8,8 @@ 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,
@@ -55,7 +57,7 @@ const backendInteractorService = (credentials) => ({
   },
 
   startUserSocket({ store }) {
-    const serv = store.rootState.instance.server.replace('http', 'ws')
+    const serv = useInstanceStore().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 50afb4564..7b81c19dc 100644
--- a/src/services/bookmark_folders_fetcher/bookmark_folders_fetcher.service.js
+++ b/src/services/bookmark_folders_fetcher/bookmark_folders_fetcher.service.js
@@ -1,7 +1,8 @@
-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 6744fb696..c395ef93b 100644
--- a/src/services/lists_fetcher/lists_fetcher.service.js
+++ b/src/services/lists_fetcher/lists_fetcher.service.js
@@ -1,7 +1,8 @@
-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 b5c233ad9..14785a685 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -1,9 +1,11 @@
-import FaviconService from 'src/services/favicon_service/favicon_service.js'
-import { useAnnouncementsStore } from 'src/stores/announcements'
-import { useI18nStore } from 'src/stores/i18n.js'
 import { showDesktopNotification } from '../desktop_notification_utils/desktop_notification_utils.js'
 import { muteFilterHits } from '../status_parser/status_parser.js'
 
+import { useAnnouncementsStore } from 'src/stores/announcements'
+import { useI18nStore } from 'src/stores/i18n.js'
+
+import FaviconService from 'src/services/favicon_service/favicon_service.js'
+
 export const ACTIONABLE_NOTIFICATION_TYPES = new Set([
   'mention',
   'pleroma:report',
diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
index c8dca3159..f82f98130 100644
--- a/src/services/notifications_fetcher/notifications_fetcher.service.js
+++ b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -1,7 +1,9 @@
-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 })
 }
@@ -28,7 +30,7 @@ const fetchAndUpdate = ({ store, credentials, older = false, since }) => {
   const timelineData = rootState.notifications
   const hideMutedPosts = getters.mergedConfig.hideMutedPosts
 
-  if (rootState.instance.pleromaChatMessagesAvailable) {
+  if (useInstanceStore().featureSet.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 d44b0fc06..08034d485 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -1,10 +1,11 @@
 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 aef724eda..0d993a1e3 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -1,9 +1,11 @@
 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,
@@ -76,7 +78,7 @@ const fetchAndUpdate = ({
     .then((response) => {
       if (response.errors) {
         if (timeline === 'favorites') {
-          rootState.instance.pleromaPublicFavouritesAvailable = false
+          useInstanceStore().featureSet.pleromaPublicFavouritesAvailable = false
           return
         }
         throw new Error(`${response.status} ${response.statusText}`)
diff --git a/src/modules/instance.js b/src/stores/emoji.js
similarity index 53%
rename from src/modules/instance.js
rename to src/stores/emoji.js
index 0f7009bc7..5c284064b 100644
--- a/src/modules/instance.js
+++ b/src/stores/emoji.js
@@ -1,16 +1,25 @@
-// See build/emojis_plugin for more details
+import { defineStore } from 'pinia'
 
-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 { useInstanceStore } from 'src/stores/instance.js'
+
+import { ensureFinalFallback } from 'src/i18n/languages.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',
@@ -43,79 +52,6 @@ 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)
 }
@@ -137,27 +73,9 @@ const injectRegionalIndicators = (groups) => {
   return groups
 }
 
-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
-    },
-  },
+export const useEmojiStore = defineStore('emoji', {
+  state: () => ({ ...defaultState }),
   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
@@ -181,7 +99,7 @@ const instance = {
         }
       }
 
-      return state.customEmoji.reduce((res, emoji) => {
+      return this.customEmoji.reduce((res, emoji) => {
         packsOf(emoji).forEach(({ id: packId, text: packName }) => {
           if (!res[packId]) {
             res[packId] = {
@@ -198,53 +116,27 @@ const instance = {
     },
     standardEmojiList(state) {
       return SORTED_EMOJI_GROUP_IDS.map((groupId) =>
-        (state.emoji[groupId] || []).map((k) =>
-          injectAnnotations(k, state.unicodeEmojiAnnotations),
+        (this.emoji[groupId] || []).map((k) =>
+          injectAnnotations(k, this.unicodeEmojiAnnotations),
         ),
       ).reduce((a, b) => a.concat(b), [])
     },
     standardEmojiGroupList(state) {
       return SORTED_EMOJI_GROUP_IDS.map((groupId) => ({
         id: groupId,
-        emojis: (state.emoji[groupId] || []).map((k) =>
-          injectAnnotations(k, state.unicodeEmojiAnnotations),
+        emojis: (this.emoji[groupId] || []).map((k) =>
+          injectAnnotations(k, this.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: {
-    setInstanceOption({ commit, dispatch }, { name, value }) {
-      commit('setInstanceOption', { name, value })
-      switch (name) {
-        case 'name':
-          useInterfaceStore().setPageTitle()
-          break
-        case 'shoutAvailable':
-          if (value) {
-            dispatch('initializeSocket')
-          }
-          break
-      }
+    setStickers(stickers) {
+      this.stickers = stickers
     },
-    async getStaticEmoji({ commit }) {
+    async getStaticEmoji() {
       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) => {
@@ -255,24 +147,21 @@ const instance = {
           }))
           return res
         }, {})
-        commit('setInstanceOption', {
-          name: 'emoji',
-          value: injectRegionalIndicators(emoji),
-        })
+        this.emoji = injectRegionalIndicators(emoji)
       } catch (e) {
         console.warn("Can't load static emoji\n", e)
       }
     },
 
-    loadUnicodeEmojiData({ commit, state }, language) {
+    loadUnicodeEmojiData(language) {
       const langList = ensureFinalFallback(language)
 
       return Promise.all(
         langList.map(async (lang) => {
-          if (!state.unicodeEmojiAnnotations[lang]) {
+          if (!this.unicodeEmojiAnnotations[lang]) {
             try {
               const annotations = await loadAnnotations(lang)
-              commit('setUnicodeEmojiAnnotations', { lang, annotations })
+              this.unicodeEmojiAnnotations[lang] = annotations
             } catch (e) {
               console.warn(
                 `Error loading unicode emoji annotations for ${lang}: `,
@@ -285,7 +174,7 @@ const instance = {
       )
     },
 
-    async getCustomEmoji({ commit, state }) {
+    async getCustomEmoji() {
       try {
         let res = await window.fetch('/api/v1/pleroma/emoji')
         if (!res.ok) {
@@ -331,7 +220,9 @@ const instance = {
               const imageUrl = value.image_url
               return {
                 displayText: key,
-                imageUrl: imageUrl ? state.server + imageUrl : value,
+                imageUrl: imageUrl
+                  ? useInstanceStore().server + imageUrl
+                  : value,
                 tags: imageUrl
                   ? value.tags.sort((a, b) => (a > b ? 1 : 0))
                   : ['utf'],
@@ -341,7 +232,7 @@ const instance = {
               // should have been "pack" field, that would be more useful
             })
             .sort(byPackThenByName)
-          commit('setInstanceOption', { name: 'customEmoji', value: emoji })
+          this.customEmoji = emoji
         } else {
           throw res
         }
@@ -349,28 +240,13 @@ const instance = {
         console.warn("Can't load custom emojis\n", e)
       }
     },
-    fetchEmoji({ dispatch, state }) {
-      if (!state.customEmojiFetched) {
-        state.customEmojiFetched = true
-        dispatch('getCustomEmoji')
+    fetchEmoji() {
+      if (!this.customEmojiFetched) {
+        this.getCustomEmoji().then(() => (this.customEmojiFetched = 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)
+      if (!this.emojiFetched) {
+        this.getStaticEmoji().then(() => (this.emojiFetched = true))
       }
     },
   },
-}
-
-export default instance
+})
diff --git a/src/stores/instance.js b/src/stores/instance.js
new file mode 100644
index 000000000..87bb00d12
--- /dev/null
+++ b/src/stores/instance.js
@@ -0,0 +1,155 @@
+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 d39a6d742..8d05ce44b 100644
--- a/src/stores/interface.js
+++ b/src/stores/interface.js
@@ -1,10 +1,5 @@
 import { defineStore } from 'pinia'
 
-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,
@@ -12,6 +7,14 @@ import {
 } 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'
+
 export const useInterfaceStore = defineStore('interface', {
   state: () => ({
     localFonts: null,
@@ -86,7 +89,7 @@ export const useInterfaceStore = defineStore('interface', {
     },
     setPageTitle(option = '') {
       try {
-        document.title = `${option} ${window.vuex.state.instance.name}`
+        document.title = `${option} ${useInstanceStore().name}`
       } catch (error) {
         console.error(`${error}`)
       }
@@ -221,14 +224,14 @@ export const useInterfaceStore = defineStore('interface', {
     async fetchPalettesIndex() {
       try {
         const value = await getResourcesIndex('/static/palettes/index.json')
-        window.vuex.commit('setInstanceOption', {
+        useInstanceStore().set({
           name: 'palettesIndex',
           value,
         })
         return value
       } catch (e) {
         console.error('Could not fetch palettes index', e)
-        window.vuex.commit('setInstanceOption', {
+        useInstanceStore().set({
           name: 'palettesIndex',
           value: { _error: e },
         })
@@ -257,11 +260,11 @@ export const useInterfaceStore = defineStore('interface', {
           '/static/styles/index.json',
           deserialize,
         )
-        window.vuex.commit('setInstanceOption', { name: 'stylesIndex', value })
+        useInstanceStore().set({ name: 'stylesIndex', value })
         return value
       } catch (e) {
         console.error('Could not fetch styles index', e)
-        window.vuex.commit('setInstanceOption', {
+        useInstanceStore().set({
           name: 'stylesIndex',
           value: { _error: e },
         })
@@ -295,11 +298,11 @@ export const useInterfaceStore = defineStore('interface', {
     async fetchThemesIndex() {
       try {
         const value = await getResourcesIndex('/static/styles.json')
-        window.vuex.commit('setInstanceOption', { name: 'themesIndex', value })
+        useInstanceStore().set({ name: 'themesIndex', value })
         return value
       } catch (e) {
         console.error('Could not fetch themes index', e)
-        window.vuex.commit('setInstanceOption', {
+        useInstanceStore().set({
           name: 'themesIndex',
           value: { _error: e },
         })
@@ -385,14 +388,14 @@ export const useInterfaceStore = defineStore('interface', {
       }
 
       const { style: instanceStyleName, palette: instancePaletteName } =
-        window.vuex.state.instance
+        useInstanceStore()
 
       let {
         theme: instanceThemeV2Name,
         themesIndex,
         stylesIndex,
         palettesIndex,
-      } = window.vuex.state.instance
+      } = useInstanceStore()
 
       const {
         style: userStyleName,
diff --git a/src/stores/oauth.js b/src/stores/oauth.js
index ea5a4bfac..2a79c2fa9 100644
--- a/src/stores/oauth.js
+++ b/src/stores/oauth.js
@@ -1,5 +1,7 @@
 import { defineStore } from 'pinia'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
 import {
   createApp,
   getClientToken,
@@ -61,8 +63,7 @@ export const useOAuthStore = defineStore('oauth', {
       this.userToken = false
     },
     async createApp() {
-      const { state } = window.vuex
-      const instance = state.instance.server
+      const instance = useInstanceStore().server
       const app = await createApp(instance)
       this.setClientData(app)
       return app
@@ -81,8 +82,7 @@ export const useOAuthStore = defineStore('oauth', {
       }
     },
     async getAppToken() {
-      const { state } = window.vuex
-      const instance = state.instance.server
+      const instance = useInstanceStore().server
       const res = await getClientToken({
         clientId: this.clientId,
         clientSecret: this.clientSecret,
@@ -94,11 +94,10 @@ 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: state.instance.server,
+            instance: useInstanceStore().server,
             appToken: this.appToken,
           })
           return this.appToken
diff --git a/src/stores/reports.js b/src/stores/reports.js
index 52b67527d..d2cd4fd7c 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'
+import { useInterfaceStore } from 'src/stores/interface.js'
 
 export const useReportsStore = defineStore('reports', {
   state: () => ({
diff --git a/src/sw.js b/src/sw.js
index 711aae6d0..38a2fe7b2 100644
--- a/src/sw.js
+++ b/src/sw.js
@@ -4,11 +4,12 @@ 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 082fdbe29..02c49eb60 100644
--- a/test/fixtures/setup_test.js
+++ b/test/fixtures/setup_test.js
@@ -2,9 +2,10 @@ import { config } from '@vue/test-utils'
 import { createMemoryHistory, createRouter } from 'vue-router'
 import VueVirtualScroller from 'vue-virtual-scroller'
 
-import routes from 'src/boot/routes'
 import makeMockStore from './mock_store'
 
+import routes from 'src/boot/routes'
+
 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 2b594b160..8b198420b 100644
--- a/test/unit/specs/components/user_profile.spec.js
+++ b/test/unit/specs/components/user_profile.spec.js
@@ -2,6 +2,7 @@ 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 192546981..083730856 100644
--- a/test/unit/specs/stores/lists.spec.js
+++ b/test/unit/specs/stores/lists.spec.js
@@ -1,9 +1,10 @@
 import { createPinia, setActivePinia } from 'pinia'
 import { createStore } from 'vuex'
 
-import apiModule from 'src/modules/api.js'
 import { useListsStore } from 'src/stores/lists.js'
 
+import apiModule from 'src/modules/api.js'
+
 setActivePinia(createPinia())
 const store = useListsStore()
 window.vuex = createStore({
diff --git a/test/unit/specs/stores/oauth.spec.js b/test/unit/specs/stores/oauth.spec.js
index c634ebb66..54a489479 100644
--- a/test/unit/specs/stores/oauth.spec.js
+++ b/test/unit/specs/stores/oauth.spec.js
@@ -3,13 +3,14 @@ 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({