diff --git a/changelog.d/actions-extra-tap.fix b/changelog.d/actions-extra-tap.fix
deleted file mode 100644
index cb54c2e35..000000000
--- a/changelog.d/actions-extra-tap.fix
+++ /dev/null
@@ -1 +0,0 @@
-fixed tapping "Mute..." and "Change visiblity" (admin action) in extra status actions closing the dropdown
diff --git a/changelog.d/fix-domain-mute.fix b/changelog.d/fix-domain-mute.fix
deleted file mode 100644
index 1cb910d22..000000000
--- a/changelog.d/fix-domain-mute.fix
+++ /dev/null
@@ -1 +0,0 @@
-domain mute fixedw
diff --git a/changelog.d/followers-list.fix b/changelog.d/followers-list.fix
deleted file mode 100644
index 51e96f90c..000000000
--- a/changelog.d/followers-list.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fix followers list showing followed users as non-followed
diff --git a/changelog.d/moderation-tools.fix b/changelog.d/moderation-tools.fix
deleted file mode 100644
index 1417048a5..000000000
--- a/changelog.d/moderation-tools.fix
+++ /dev/null
@@ -1 +0,0 @@
-fix moderation tools button possibly not appearing for admins
diff --git a/changelog.d/moderation.fix b/changelog.d/moderation.fix
deleted file mode 100644
index c206a5ea8..000000000
--- a/changelog.d/moderation.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed moderation actions requiring confirmation closing user popover
diff --git a/changelog.d/streaming.add b/changelog.d/streaming.add
deleted file mode 100644
index c6e7de171..000000000
--- a/changelog.d/streaming.add
+++ /dev/null
@@ -1 +0,0 @@
-More timelines now can utilize WebSocket streaming
diff --git a/changelog.d/streaming.fix b/changelog.d/streaming.fix
deleted file mode 100644
index 660a6694f..000000000
--- a/changelog.d/streaming.fix
+++ /dev/null
@@ -1 +0,0 @@
-switches between streaming and polling should be more reliable now
diff --git a/changelog.d/streaming_indicator.add b/changelog.d/streaming_indicator.add
deleted file mode 100644
index 547307384..000000000
--- a/changelog.d/streaming_indicator.add
+++ /dev/null
@@ -1 +0,0 @@
-Added an indicator next to instance's name showing WebSocket connection status (if enabled)
diff --git a/changelog.d/theme-index-html-fallback.fix b/changelog.d/theme-index-html-fallback.fix
deleted file mode 100644
index 90a23cacc..000000000
--- a/changelog.d/theme-index-html-fallback.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fix theme lists failing to load when custom resource indexes are unavailable
diff --git a/changelog.d/themes2-font.fix b/changelog.d/themes2-font.fix
deleted file mode 100644
index 0842fae8a..000000000
--- a/changelog.d/themes2-font.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fix Themes 2.0 applying incorrect fonts
diff --git a/changelog.d/themes3.fix b/changelog.d/themes3.fix
deleted file mode 100644
index a3192b263..000000000
--- a/changelog.d/themes3.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed themes 3 not loading in appearance tab
diff --git a/src/App.js b/src/App.js
index ed3d43e4a..d7a63bd8a 100644
--- a/src/App.js
+++ b/src/App.js
@@ -21,7 +21,6 @@ import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.j
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useShoutStore } from 'src/stores/shout.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 // Helper to unwrap reactive proxies
 window.toValue = (x) => JSON.parse(JSON.stringify(x))
@@ -154,8 +153,11 @@ export default {
         ...(navbarColumnStretch ? ['-column-stretch'] : []),
       ]
     },
+    currentUser() {
+      return this.$store.state.users.currentUser
+    },
     userBackground() {
-      return this.currentUser?.background_image
+      return this.currentUser.background_image
     },
     foreignProfileBackground() {
       return (
@@ -244,7 +246,6 @@ export default {
       'styleDataUsed',
       'layoutType',
     ]),
-    ...mapState(useUsersStore, ['currentUser']),
     ...mapState(useInstanceStore, ['styleDataUsed']),
     ...mapState(useInstanceCapabilitiesStore, [
       'suggestionsEnabled',
diff --git a/src/App.vue b/src/App.vue
index bd19c5c10..84a6f7d3d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -26,7 +26,7 @@
         class="column -scrollable"
         :class="{ '-show-scrollbar': showScrollbars }"
       >
-        <UserPanel />
+        <user-panel />
         <template v-if="layoutType !== 'mobile'">
           <NavPanel />
           <InstanceSpecificPanel v-if="showInstanceSpecificPanel" />
diff --git a/src/api/helpers.js b/src/api/helpers.js
index f23960ed9..90956a4dc 100644
--- a/src/api/helpers.js
+++ b/src/api/helpers.js
@@ -63,11 +63,10 @@ export const paramsString = (params = {}) => {
 }
 
 export const promisedRequest = async ({
-  method = 'GET',
+  method,
   url,
   payload,
   formData,
-  forceContentType,
   cache,
   credentials,
   headers = {},
@@ -76,7 +75,7 @@ export const promisedRequest = async ({
     method,
     credentials: 'same-origin',
     headers: {
-      Accept: forceContentType ?? 'application/json',
+      Accept: 'application/json',
       ...headers,
     },
   }
@@ -111,7 +110,7 @@ export const promisedRequest = async ({
     )
     if (contentLength === 0) return null
 
-    switch (forceContentType ?? contentType) {
+    switch (contentType) {
       case 'text/plain':
         return await response.text()
       case 'application/json':
@@ -124,7 +123,7 @@ export const promisedRequest = async ({
   const { ok, status } = response
 
   if (ok) {
-    return { response, status, data, timestamp: Date.now() }
+    return { response, status, data }
   } else {
     throw new StatusCodeError(response.status, data, { url, options }, response)
   }
diff --git a/src/api/public.js b/src/api/public.js
index ef799566d..78db90bfe 100644
--- a/src/api/public.js
+++ b/src/api/public.js
@@ -13,12 +13,12 @@ const MASTODON_REGISTRATION_URL = '/api/v1/accounts'
 const MASTODON_PASSWORD_RESET_URL = ({ email }) =>
   `/auth/password${paramsString({ email })}`
 
-export const MASTODON_FOLLOWING_URL = (
+const MASTODON_FOLLOWING_URL = (
   id,
   { minId, maxId, sinceId, limit, withRelationships },
 ) =>
   `/api/v1/accounts/${id}/following${paramsString({ minId, maxId, sinceId, limit, withRelationships })}`
-export const MASTODON_FOLLOWERS_URL = (
+const MASTODON_FOLLOWERS_URL = (
   id,
   { minId, maxId, sinceId, limit, withRelationships },
 ) =>
@@ -26,17 +26,15 @@ export const MASTODON_FOLLOWERS_URL = (
 
 export const MASTODON_STATUS_URL = (id) => `/api/v1/statuses/${id}`
 const MASTODON_STATUS_CONTEXT_URL = (id) => `/api/v1/statuses/${id}/context`
-export const MASTODON_STATUS_SOURCE_URL = (id) =>
-  `/api/v1/statuses/${id}/source`
-export const MASTODON_STATUS_HISTORY_URL = (id) =>
-  `/api/v1/statuses/${id}/history`
+const MASTODON_STATUS_SOURCE_URL = (id) => `/api/v1/statuses/${id}/source`
+const MASTODON_STATUS_HISTORY_URL = (id) => `/api/v1/statuses/${id}/history`
 const MASTODON_USER_URL = '/api/v1/accounts'
 const MASTODON_USER_LOOKUP_URL = ({ acct }) =>
   `/api/v1/accounts/lookup${paramsString({ acct })}`
 const MASTODON_POLL_URL = (id = '') => `/api/v1/polls/${id}`
-export const MASTODON_STATUS_FAVORITEDBY_URL = (id) =>
+const MASTODON_STATUS_FAVORITEDBY_URL = (id) =>
   `/api/v1/statuses/${id}/favourited_by`
-export const MASTODON_STATUS_REBLOGGEDBY_URL = (id) =>
+const MASTODON_STATUS_REBLOGGEDBY_URL = (id) =>
   `/api/v1/statuses/${id}/reblogged_by`
 const MASTODON_SEARCH_2 = ({
   q,
@@ -53,7 +51,7 @@ const MASTODON_SEARCH_2 = ({
 const MASTODON_USER_SEARCH_URL = ({ q, resolve }) =>
   `/api/v1/accounts/search${paramsString({ q, resolve })}`
 const MASTODON_KNOWN_DOMAIN_LIST_URL = '/api/v1/instance/peers'
-export const PLEROMA_EMOJI_REACTIONS_URL = (id) =>
+const PLEROMA_EMOJI_REACTIONS_URL = (id) =>
   `/api/v1/pleroma/statuses/${id}/reactions`
 const PLEROMA_SCROBBLES_URL = (id, { maxId, sinceId, minId, limit, offset }) =>
   `/api/v1/pleroma/accounts/${id}/scrobbles${paramsString({ maxId, sinceId, minId, limit, offset })}`
@@ -119,17 +117,9 @@ export const fetchUserByName = ({ name, credentials }) =>
 
 export const fetchFriends = ({ id, maxId, sinceId, limit = 20, credentials }) =>
   promisedRequest({
-    url: MASTODON_FOLLOWING_URL(id, {
-      maxId,
-      sinceId,
-      limit,
-      withRelationships: true,
-    }),
+    url: MASTODON_FOLLOWING_URL(id, { maxId, sinceId, limit }),
     credentials,
-  }).then(({ data, ...rest }) => ({
-    ...rest,
-    data: data.map(parseUser),
-  }))
+  }).then(({ data, ...rest }) => ({ ...rest, data: data.map(parseUser) }))
 
 export const fetchFollowers = ({
   id,
@@ -146,10 +136,7 @@ export const fetchFollowers = ({
       withRelationships: true,
     }),
     credentials,
-  }).then(({ data, ...rest }) => ({
-    ...rest,
-    data: data.map(parseUser),
-  }))
+  }).then(({ data, ...rest }) => ({ ...rest, data: data.map(parseUser) }))
 
 export const fetchConversation = ({ id, credentials }) =>
   promisedRequest({
@@ -176,18 +163,15 @@ export const fetchStatusSource = ({ id, credentials }) =>
     credentials,
   }).then(({ data, ...rest }) => ({ ...rest, data: parseSource(data) }))
 
-export const fetchStatusHistory = ({ id, credentials }) =>
+export const fetchStatusHistory = ({ status, credentials }) =>
   promisedRequest({
-    url: MASTODON_STATUS_HISTORY_URL(id),
+    url: MASTODON_STATUS_HISTORY_URL(status.id),
     credentials,
   }).then(({ data, ...rest }) => {
-    return {
-      ...rest,
-      data: [...data].reverse().map((item) => {
-        item.originalStatus = status
-        return parseStatus(item)
-      }),
-    }
+    return [...data].reverse().map((item) => {
+      item.originalStatus = status
+      return { ...rest, data: parseStatus(item) }
+    })
   })
 
 export const listEmojiPacks = ({ page, pageSize, credentials }) =>
diff --git a/src/api/timelines.js b/src/api/timelines.js
index 568b97a4f..0679b1eec 100644
--- a/src/api/timelines.js
+++ b/src/api/timelines.js
@@ -115,7 +115,6 @@ export const fetchTimeline = ({
     publicAndExternal: MASTODON_PUBLIC_TIMELINE,
     dms: MASTODON_DIRECT_MESSAGES_TIMELINE_URL,
     user: MASTODON_USER_TIMELINE_URL,
-    userPinned: MASTODON_USER_TIMELINE_URL,
     media: MASTODON_USER_TIMELINE_URL,
     list: MASTODON_LIST_TIMELINE_URL,
     favorites: MASTODON_USER_FAVORITES_TIMELINE_URL,
@@ -131,7 +130,6 @@ export const fetchTimeline = ({
 
   const twoArgs = new Set([
     'user',
-    'userPinned',
     'media',
     'list',
     'publicFavorites',
@@ -149,7 +147,6 @@ export const fetchTimeline = ({
   const id = (() => {
     switch (timeline) {
       case 'user':
-      case 'userPinned':
       case 'media':
         return userId
       case 'list':
@@ -166,9 +163,6 @@ export const fetchTimeline = ({
   if (timeline === 'media') {
     params.onlyMedia = true
   }
-  if (timeline === 'userPinned') {
-    params.pinned = true
-  }
   if (timeline === 'public') {
     params.local = true
   }
diff --git a/src/api/user.js b/src/api/user.js
index ec1763bb4..8086d6d7f 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -18,7 +18,7 @@ const CHANGE_PASSWORD_URL = '/api/pleroma/change_password'
 const MOVE_ACCOUNT_URL = '/api/pleroma/move_account'
 const ALIASES_URL = '/api/pleroma/aliases'
 const NOTIFICATION_SETTINGS_URL = '/api/pleroma/notification_settings'
-export const NOTIFICATION_READ_URL = '/api/v1/pleroma/notifications/read'
+const NOTIFICATION_READ_URL = '/api/v1/pleroma/notifications/read'
 
 const MFA_SETTINGS_URL = '/api/pleroma/accounts/mfa'
 const MFA_BACKUP_CODES_URL = '/api/pleroma/accounts/mfa/backup_codes'
@@ -27,16 +27,15 @@ const MFA_SETUP_OTP_URL = '/api/pleroma/accounts/mfa/setup/totp'
 const MFA_CONFIRM_OTP_URL = '/api/pleroma/accounts/mfa/confirm/totp'
 const MFA_DISABLE_OTP_URL = '/api/pleroma/accounts/mfa/totp'
 
-export const MASTODON_DISMISS_NOTIFICATION_URL = (id) =>
+const MASTODON_DISMISS_NOTIFICATION_URL = (id) =>
   `/api/v1/notifications/${id}/dismiss`
-export const MASTODON_FAVORITE_URL = (id) => `/api/v1/statuses/${id}/favourite`
-export const MASTODON_UNFAVORITE_URL = (id) =>
-  `/api/v1/statuses/${id}/unfavourite`
-export const MASTODON_RETWEET_URL = (id) => `/api/v1/statuses/${id}/reblog`
-export const MASTODON_UNRETWEET_URL = (id) => `/api/v1/statuses/${id}/unreblog`
-export const MASTODON_DELETE_URL = (id) => `/api/v1/statuses/${id}`
-export const MASTODON_FOLLOW_URL = (id) => `/api/v1/accounts/${id}/follow`
-export const MASTODON_UNFOLLOW_URL = (id) => `/api/v1/accounts/${id}/unfollow`
+const MASTODON_FAVORITE_URL = (id) => `/api/v1/statuses/${id}/favourite`
+const MASTODON_UNFAVORITE_URL = (id) => `/api/v1/statuses/${id}/unfavourite`
+const MASTODON_RETWEET_URL = (id) => `/api/v1/statuses/${id}/reblog`
+const MASTODON_UNRETWEET_URL = (id) => `/api/v1/statuses/${id}/unreblog`
+const MASTODON_DELETE_URL = (id) => `/api/v1/statuses/${id}`
+const MASTODON_FOLLOW_URL = (id) => `/api/v1/accounts/${id}/follow`
+const MASTODON_UNFOLLOW_URL = (id) => `/api/v1/accounts/${id}/unfollow`
 
 const MASTODON_FOLLOW_REQUESTS_URL = '/api/v1/follow_requests'
 const MASTODON_APPROVE_USER_URL = (id) =>
@@ -44,54 +43,49 @@ const MASTODON_APPROVE_USER_URL = (id) =>
 const MASTODON_DENY_USER_URL = (id) => `/api/v1/follow_requests/${id}/reject`
 const MASTODON_USER_RELATIONSHIPS_URL = ({ id, withSuspended }) =>
   `/api/v1/accounts/relationships/${paramsString({ id, withSuspended })}`
-export const MASTODON_USER_IN_LISTS = (id) => `/api/v1/accounts/${id}/lists`
+const MASTODON_USER_IN_LISTS = (id) => `/api/v1/accounts/${id}/lists`
 export const MASTODON_LIST_URL = (id = '') => `/api/v1/lists/${id}`
 export const MASTODON_LIST_ACCOUNTS_URL = (id) => `/api/v1/lists/${id}/accounts`
-export const MASTODON_USER_BLOCKS_URL = ({
+const MASTODON_USER_BLOCKS_URL = ({
   maxId,
   sinceId,
   limit,
   withRelationships,
 }) =>
   `/api/v1/blocks/${paramsString({ maxId, sinceId, limit, withRelationships })}`
-export const MASTODON_USER_MUTES_URL = ({
+const MASTODON_USER_MUTES_URL = ({
   maxId,
   sinceId,
   limit,
   withRelationships,
 }) =>
   `/api/v1/mutes/${paramsString({ maxId, sinceId, limit, withRelationships })}`
-export const MASTODON_BLOCK_USER_URL = (id) => `/api/v1/accounts/${id}/block`
-export const MASTODON_UNBLOCK_USER_URL = (id) =>
-  `/api/v1/accounts/${id}/unblock`
-export const MASTODON_MUTE_USER_URL = (id) => `/api/v1/accounts/${id}/mute`
-export const MASTODON_UNMUTE_USER_URL = (id) => `/api/v1/accounts/${id}/unmute`
-export const MASTODON_REMOVE_USER_FROM_FOLLOWERS_URL = (id) =>
+const MASTODON_BLOCK_USER_URL = (id) => `/api/v1/accounts/${id}/block`
+const MASTODON_UNBLOCK_USER_URL = (id) => `/api/v1/accounts/${id}/unblock`
+const MASTODON_MUTE_USER_URL = (id) => `/api/v1/accounts/${id}/mute`
+const MASTODON_UNMUTE_USER_URL = (id) => `/api/v1/accounts/${id}/unmute`
+const MASTODON_REMOVE_USER_FROM_FOLLOWERS = (id) =>
   `/api/v1/accounts/${id}/remove_from_followers`
-export const MASTODON_USER_NOTE_URL = (id) => `/api/v1/accounts/${id}/note`
-export const MASTODON_BOOKMARK_STATUS_URL = (id) =>
-  `/api/v1/statuses/${id}/bookmark`
-export const MASTODON_UNBOOKMARK_STATUS_URL = (id) =>
+const MASTODON_USER_NOTE_URL = (id) => `/api/v1/accounts/${id}/note`
+const MASTODON_BOOKMARK_STATUS_URL = (id) => `/api/v1/statuses/${id}/bookmark`
+const MASTODON_UNBOOKMARK_STATUS_URL = (id) =>
   `/api/v1/statuses/${id}/unbookmark`
 const MASTODON_POST_STATUS_URL = '/api/v1/statuses'
 const MASTODON_MEDIA_UPLOAD_URL = '/api/v1/media'
 const MASTODON_VOTE_URL = (id) => `/api/v1/polls/${id}/votes`
 const MASTODON_PROFILE_UPDATE_URL = '/api/v1/accounts/update_credentials'
 const MASTODON_REPORT_USER_URL = '/api/v1/reports'
-export const MASTODON_PIN_OWN_STATUS_URL = (id) => `/api/v1/statuses/${id}/pin`
-export const MASTODON_UNPIN_OWN_STATUS_URL = (id) =>
-  `/api/v1/statuses/${id}/unpin`
-export const MASTODON_MUTE_CONVERSATION_URL = (id) =>
-  `/api/v1/statuses/${id}/mute`
-export const MASTODON_UNMUTE_CONVERSATION_URL = (id) =>
-  `/api/v1/statuses/${id}/unmute`
-export const MASTODON_DOMAIN_BLOCKS_URL = '/api/v1/domain_blocks'
+const MASTODON_PIN_OWN_STATUS = (id) => `/api/v1/statuses/${id}/pin`
+const MASTODON_UNPIN_OWN_STATUS = (id) => `/api/v1/statuses/${id}/unpin`
+const MASTODON_MUTE_CONVERSATION = (id) => `/api/v1/statuses/${id}/mute`
+const MASTODON_UNMUTE_CONVERSATION = (id) => `/api/v1/statuses/${id}/unmute`
+const MASTODON_DOMAIN_BLOCKS_URL = '/api/v1/domain_blocks'
 const MASTODON_ANNOUNCEMENTS_URL = '/api/v1/announcements'
 const MASTODON_ANNOUNCEMENTS_DISMISS_URL = (id) =>
   `/api/v1/announcements/${id}/dismiss`
-export const PLEROMA_EMOJI_REACT_URL = (id, emoji) =>
+const PLEROMA_EMOJI_REACT_URL = (id, emoji) =>
   `/api/v1/pleroma/statuses/${id}/reactions/${emoji}`
-export const PLEROMA_EMOJI_UNREACT_URL = (id, emoji) =>
+const PLEROMA_EMOJI_UNREACT_URL = (id, emoji) =>
   `/api/v1/pleroma/statuses/${id}/reactions/${emoji}`
 const PLEROMA_BACKUP_URL = '/api/v1/pleroma/backups'
 const PLEROMA_BOOKMARK_FOLDERS_URL = '/api/v1/pleroma/bookmark_folders'
@@ -149,39 +143,39 @@ export const bookmarkStatus = ({ id, credentials, ...options }) =>
     payload: {
       folder_id: options.folder_id,
     },
-  }).then(({ data, ...rest }) => ({ ...rest, data: parseStatus(data) }))
+  })
 
 export const unbookmarkStatus = ({ id, credentials }) =>
   promisedRequest({
     url: MASTODON_UNBOOKMARK_STATUS_URL(id),
     credentials,
     method: 'POST',
-  }).then(({ data, ...rest }) => ({ ...rest, data: parseStatus(data) }))
+  })
 
 export const pinOwnStatus = ({ id, credentials }) =>
   promisedRequest({
-    url: MASTODON_PIN_OWN_STATUS_URL(id),
+    url: MASTODON_PIN_OWN_STATUS(id),
     credentials,
     method: 'POST',
   }).then(({ data, ...rest }) => ({ ...rest, data: parseStatus(data) }))
 
 export const unpinOwnStatus = ({ id, credentials }) =>
   promisedRequest({
-    url: MASTODON_UNPIN_OWN_STATUS_URL(id),
+    url: MASTODON_UNPIN_OWN_STATUS(id),
     credentials,
     method: 'POST',
   }).then(({ data, ...rest }) => ({ ...rest, data: parseStatus(data) }))
 
 export const muteConversation = ({ id, credentials }) =>
   promisedRequest({
-    url: MASTODON_MUTE_CONVERSATION_URL(id),
+    url: MASTODON_MUTE_CONVERSATION(id),
     credentials,
     method: 'POST',
   }).then(({ data, ...rest }) => ({ ...rest, data: parseStatus(data) }))
 
 export const unmuteConversation = ({ id, credentials }) =>
   promisedRequest({
-    url: MASTODON_UNMUTE_CONVERSATION_URL(id),
+    url: MASTODON_UNMUTE_CONVERSATION(id),
     credentials,
     method: 'POST',
   }).then(({ data, ...rest }) => ({ ...rest, data: parseStatus(data) }))
@@ -416,6 +410,7 @@ export const exportFriends = ({ id, credentials }) => {
           id,
           maxId,
           credentials,
+          withRelationships: true,
         })
         friends = [...friends, ...users]
         if (users.length === 0) {
@@ -662,7 +657,7 @@ export const fetchUserInLists = ({ id, credentials }) =>
 
 export const removeUserFromFollowers = ({ id, credentials }) =>
   promisedRequest({
-    url: MASTODON_REMOVE_USER_FROM_FOLLOWERS_URL(id),
+    url: MASTODON_REMOVE_USER_FROM_FOLLOWERS(id),
     credentials,
     method: 'POST',
   })
diff --git a/src/api/websocket.js b/src/api/websocket.js
index 6f6cfa605..ae2e5358f 100644
--- a/src/api/websocket.js
+++ b/src/api/websocket.js
@@ -26,26 +26,8 @@ const PLEROMA_STREAMING_EVENTS = new Set([
   'pleroma:respond',
 ])
 
-export const WSConnectionStatus = Object.freeze({
-  JOINED: 1,
-  CLOSED: 2,
-  ERROR: 3,
-  DISABLED: 4,
-  STARTING: 5,
-  STARTING_INITIAL: 6,
-})
-
-export class WSEvent extends Event {
-  data
-
-  constructor(name, data, original) {
-    super(name)
-    this.data = data
-  }
-}
-
 // A thin wrapper around WebSocket API that allows adding a pre-processor to it
-// Uses EventTarget and a WSEvent to proxy events
+// Uses EventTarget and a CustomEvent to proxy events
 export const ProcessedWS = ({
   url,
   preprocessor = handleMastoWS,
@@ -57,7 +39,9 @@ export const ProcessedWS = ({
   if (!socket) throw new Error(`Failed to create socket ${id}`)
   const proxy = (original, eventName, processor = (a) => a) => {
     original.addEventListener(eventName, (eventData) => {
-      eventTarget.dispatchEvent(new WSEvent(eventName, processor(eventData)))
+      eventTarget.dispatchEvent(
+        new CustomEvent(eventName, { detail: processor(eventData) }),
+      )
     })
   }
   socket.addEventListener('open', (wsEvent) => {
@@ -91,7 +75,7 @@ export const ProcessedWS = ({
   /**/
 
   const onAuthenticated = () => {
-    eventTarget.dispatchEvent(new WSEvent('pleroma:authenticated'))
+    eventTarget.dispatchEvent(new CustomEvent('pleroma:authenticated'))
   }
 
   proxy(socket, 'open')
@@ -142,14 +126,14 @@ export const handleMastoWS = (
   const { data } = wsEvent
   if (!data) return
   const parsedEvent = JSON.parse(data)
-  const { event, stream, payload } = parsedEvent
+  const { event, payload } = parsedEvent
   if (
     MASTODON_STREAMING_EVENTS.has(event) ||
     PLEROMA_STREAMING_EVENTS.has(event)
   ) {
     // MastoBE and PleromaBE both send payload for delete as a PLAIN string
     if (event === 'delete') {
-      return { event, stream, id: payload }
+      return { event, id: payload }
     }
     const data = payload ? JSON.parse(payload) : null
     if (event === 'pleroma:respond') {
@@ -166,16 +150,25 @@ export const handleMastoWS = (
       }
       return null
     } else if (event === 'update') {
-      return { event, stream, status: parseStatus(data) }
+      return { event, status: parseStatus(data) }
     } else if (event === 'status.update') {
-      return { event, stream, status: parseStatus(data) }
+      return { event, status: parseStatus(data) }
     } else if (event === 'notification') {
-      return { event, stream, notification: parseNotification(data) }
+      return { event, notification: parseNotification(data) }
     } else if (event === 'pleroma:chat_update') {
-      return { event, stream, chatUpdate: parseChat(data) }
+      return { event, chatUpdate: parseChat(data) }
     }
   } else {
     console.warn('Unknown event', wsEvent)
     return null
   }
 }
+
+export const WSConnectionStatus = Object.freeze({
+  JOINED: 1,
+  CLOSED: 2,
+  ERROR: 3,
+  DISABLED: 4,
+  STARTING: 5,
+  STARTING_INITIAL: 6,
+})
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 32c1a65e2..986586a80 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -37,10 +37,8 @@ import { useInterfaceStore } from 'src/stores/interface.js'
 import { useLocalConfigStore } from 'src/stores/local_config.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import { useUserHighlightStore } from 'src/stores/user_highlight.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import VBodyScrollLock from 'src/directives/body_scroll_lock'
 import {
@@ -456,7 +454,7 @@ const setConfig = async ({ store }) => {
 const checkOAuthToken = async ({ store }) => {
   const oauth = useOAuthStore()
   if (oauth.userToken) {
-    return useUsersStore().loginUser(oauth.userToken)
+    return store.dispatch('loginUser', oauth.userToken)
   }
   return
 }
@@ -543,7 +541,7 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => {
   window.highlightConfig = useUserHighlightStore()
 
   FaviconService.initFaviconService()
-  initServiceWorker()
+  initServiceWorker(store)
 
   window.addEventListener('focus', () => updateFocus())
 
@@ -591,10 +589,6 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => {
 
   useI18nStore().setI18n(i18n)
 
-  // Global WS handlers
-  useInterfaceStore().attachSocket()
-  useStatusesStore().attachSocket()
-
   app.use(router)
   app.use(store)
   app.use(i18n)
diff --git a/src/boot/routes.js b/src/boot/routes.js
index 04ad81000..5897fad92 100644
--- a/src/boot/routes.js
+++ b/src/boot/routes.js
@@ -1,16 +1,22 @@
 import AuthForm from 'src/components/auth_form/auth_form.js'
+import BookmarkTimeline from 'src/components/bookmark_timeline/bookmark_timeline.vue'
+import BubbleTimeline from 'src/components/bubble_timeline/bubble_timeline.vue'
 import ConversationPage from 'src/components/conversation-page/conversation-page.vue'
+import DMs from 'src/components/dm_timeline/dm_timeline.vue'
+import FriendsTimeline from 'src/components/friends_timeline/friends_timeline.vue'
 import NavPanel from 'src/components/nav_panel/nav_panel.vue'
+import PublicAndExternalTimeline from 'src/components/public_and_external_timeline/public_and_external_timeline.vue'
+import PublicTimeline from 'src/components/public_timeline/public_timeline.vue'
+import QuotesTimeline from 'src/components/quotes_timeline/quotes_timeline.vue'
 import RemoteUserResolver from 'src/components/remote_user_resolver/remote_user_resolver.vue'
-import Timeline from 'src/components/timeline/timeline.vue'
+import TagTimeline from 'src/components/tag_timeline/tag_timeline.vue'
 
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
-import { useUsersStore } from 'src/stores/users.js'
 
-export default () => {
+export default (store) => {
   const validateAuthenticatedRoute = (to, from, next) => {
-    if (useUsersStore().currentUser) {
+    if (store.state.users.currentUser) {
       next()
     } else {
       next(
@@ -25,7 +31,7 @@ export default () => {
       path: '/',
       redirect: () => {
         return (
-          (useUsersStore().currentUser
+          (store.state.users.currentUser
             ? useInstanceStore().instanceIdentity.redirectRootLogin
             : useInstanceStore().instanceIdentity.redirectRootNoLogin) ||
           '/main/all'
@@ -35,52 +41,22 @@ export default () => {
     {
       name: 'public-external-timeline',
       path: '/main/all',
-      component: Timeline,
-      props: () => ({
-        timelineRef: { name: 'publicAndExternal' },
-      }),
+      component: PublicAndExternalTimeline,
     },
     {
       name: 'public-timeline',
       path: '/main/public',
-      component: Timeline,
-      props: () => ({
-        timelineRef: { name: 'public' },
-      }),
+      component: PublicTimeline,
     },
     {
       name: 'friends',
       path: '/main/friends',
-      component: Timeline,
+      component: FriendsTimeline,
       beforeEnter: validateAuthenticatedRoute,
-      props: () => ({
-        timelineRef: { name: 'friends' },
-      }),
-    },
-    {
-      name: 'tag-timeline',
-      path: '/tag/:id',
-      component: Timeline,
-      props: (route) => ({
-        timelineRef: { name: 'tag', argument: route.params.id },
-      }),
-    },
-    {
-      name: 'bookmarks',
-      path: '/bookmarks',
-      component: Timeline,
-      props: (route) => ({
-        timelineRef: { name: 'bookmarks', argument: null },
-      }),
-    },
-    {
-      name: 'bubble',
-      path: '/bubble',
-      component: Timeline,
-      props: () => ({
-        timelineRef: { name: 'bubble' },
-      }),
     },
+    { name: 'tag-timeline', path: '/tag/:tag', component: TagTimeline },
+    { name: 'bookmarks', path: '/bookmarks', component: BookmarkTimeline },
+    { name: 'bubble', path: '/bubble', component: BubbleTimeline },
     {
       name: 'conversation',
       path: '/notice/:id',
@@ -95,14 +71,7 @@ export default () => {
       meta: { dontScroll: true },
       beforeEnter: validateAuthenticatedRoute,
     },
-    {
-      name: 'quotes',
-      path: '/notice/:id/quotes',
-      component: Timeline,
-      props: (route) => ({
-        timelineRef: { name: 'quotes', argument: route.params.id },
-      }),
-    },
+    { name: 'quotes', path: '/notice/:id/quotes', component: QuotesTimeline },
     {
       name: 'remote-user-profile-acct',
       path: '/remote-users/:_(@)?:username([^/@]+)@:hostname([^/@]+)',
@@ -135,11 +104,8 @@ export default () => {
     {
       name: 'dms',
       path: '/users/:username/dms',
-      component: Timeline,
+      component: DMs,
       beforeEnter: validateAuthenticatedRoute,
-      props: () => ({
-        timelineRef: { name: 'dms' },
-      }),
     },
     {
       name: 'registration',
@@ -236,10 +202,8 @@ export default () => {
     {
       name: 'lists-timeline',
       path: '/lists/:id',
-      component: Timeline,
-      props: (route) => ({
-        timelineRef: { name: 'list', argument: route.params.id },
-      }),
+      component: () =>
+        import('src/components/lists_timeline/lists_timeline.vue'),
     },
     {
       name: 'lists-edit',
@@ -273,10 +237,7 @@ export default () => {
     {
       name: 'bookmark-folder',
       path: '/bookmarks/:id',
-      component: Timeline,
-      props: (route) => ({
-        timelineRef: { name: 'bookmarks', argument: route.params.id },
-      }),
+      component: BookmarkTimeline,
     },
     {
       name: 'bookmark-folder-edit',
diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js
index 1af3e6e4c..9b4775b97 100644
--- a/src/components/account_actions/account_actions.js
+++ b/src/components/account_actions/account_actions.js
@@ -8,7 +8,6 @@ import UserListMenu from 'src/components/user_list_menu/user_list_menu.vue'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useReportsStore } from 'src/stores/reports'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faEllipsisV } from '@fortawesome/free-solid-svg-icons'
@@ -48,10 +47,10 @@ const AccountActions = {
       this.showingConfirmBlock = false
     },
     showRepeats() {
-      useUsersStore().showReblogs(this.user.id)
+      this.$store.dispatch('showReblogs', this.user.id)
     },
     hideRepeats() {
-      useUsersStore().hideReblogs(this.user.id)
+      this.$store.dispatch('hideReblogs', this.user.id)
     },
     blockUser() {
       if (this.$refs.timedBlockDialog) {
@@ -65,11 +64,11 @@ const AccountActions = {
       }
     },
     doBlockUser() {
-      useUsersStore().blockUser(this.user.id)
+      this.$store.dispatch('blockUser', { id: this.user.id })
       this.hideConfirmBlock()
     },
     unblockUser() {
-      useUsersStore().unblockUser(this.user.id)
+      this.$store.dispatch('unblockUser', this.user.id)
     },
     removeUserFromFollowers() {
       if (!this.shouldConfirmRemoveUserFromFollowers) {
@@ -79,7 +78,7 @@ const AccountActions = {
       }
     },
     doRemoveUserFromFollowers() {
-      useUsersStore().removeUserFromFollowers(this.user.id)
+      this.$store.dispatch('removeUserFromFollowers', this.user.id)
       this.hideConfirmRemoveUserFromFollowers()
     },
     reportUser() {
@@ -89,7 +88,7 @@ const AccountActions = {
       this.$router.push({
         name: 'chat',
         params: {
-          username: useUsersStore().currentUser.screen_name,
+          username: this.$store.state.users.currentUser.screen_name,
           recipient_id: this.user.id,
         },
       })
diff --git a/src/components/announcement/announcement.js b/src/components/announcement/announcement.js
index e7d3d62cf..6b45b2b90 100644
--- a/src/components/announcement/announcement.js
+++ b/src/components/announcement/announcement.js
@@ -1,10 +1,9 @@
-import { mapState } from 'pinia'
+import { mapState } from 'vuex'
 
 import AnnouncementEditor from 'src/components/announcement_editor/announcement_editor.vue'
 import localeService from '../../services/locale/locale.service.js'
 
 import { useAnnouncementsStore } from 'src/stores/announcements.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 const Announcement = {
   components: {
@@ -26,7 +25,9 @@ const Announcement = {
     announcement: Object,
   },
   computed: {
-    ...mapState(useUsersStore, ['currentUser']),
+    ...mapState({
+      currentUser: (state) => state.users.currentUser,
+    }),
     canEditAnnouncement() {
       return this.currentUser?.privileges.has(
         'announcements_manage_announcements',
diff --git a/src/components/announcements_page/announcements_page.js b/src/components/announcements_page/announcements_page.js
index 1d4966df3..802e90cf6 100644
--- a/src/components/announcements_page/announcements_page.js
+++ b/src/components/announcements_page/announcements_page.js
@@ -1,10 +1,9 @@
-import { mapState } from 'pinia'
+import { mapState } from 'vuex'
 
 import Announcement from 'src/components/announcement/announcement.vue'
 import AnnouncementEditor from 'src/components/announcement_editor/announcement_editor.vue'
 
 import { useAnnouncementsStore } from 'src/stores/announcements.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 const AnnouncementsPage = {
   components: {
@@ -27,7 +26,9 @@ const AnnouncementsPage = {
     useAnnouncementsStore().fetchAnnouncements()
   },
   computed: {
-    ...mapState(useUsersStore, ['currentUser']),
+    ...mapState({
+      currentUser: (state) => state.users.currentUser,
+    }),
     announcements() {
       return useAnnouncementsStore().announcements
     },
diff --git a/src/components/avatar_list/avatar_list.vue b/src/components/avatar_list/avatar_list.vue
index fde4e14c9..9252ba324 100644
--- a/src/components/avatar_list/avatar_list.vue
+++ b/src/components/avatar_list/avatar_list.vue
@@ -7,7 +7,7 @@
       class="avatars-item"
     >
       <UserAvatar
-        :user-id="user.id"
+        :user="user"
         class="avatar-small"
       />
     </router-link>
diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index 8946e4cb1..39b269ea8 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -11,7 +11,7 @@
       >
         <UserAvatar
           class="user-avatar avatar"
-          :user-id="user.id"
+          :user="user"
           @click.prevent
         />
       </UserPopover>
diff --git a/src/components/block_card/block_card.js b/src/components/block_card/block_card.js
index 2ee578520..6484accff 100644
--- a/src/components/block_card/block_card.js
+++ b/src/components/block_card/block_card.js
@@ -4,16 +4,15 @@ import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue'
 import UserTimedFilterModal from 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue'
 
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 const BlockCard = {
   props: ['userId'],
   computed: {
     user() {
-      return useUsersStore().findUser(this.userId)
+      return this.$store.getters.findUser(this.userId)
     },
     relationship() {
-      return useUsersStore().relationship(this.userId)
+      return this.$store.getters.relationship(this.userId)
     },
     blocked() {
       return this.relationship.blocking
@@ -36,13 +35,13 @@ const BlockCard = {
   },
   methods: {
     unblockUser() {
-      useUsersStore().unblockUser(this.user.id)
+      this.$store.dispatch('unblockUser', this.user.id)
     },
     blockUser() {
       if (this.blockExpiration) {
         this.$refs.timedBlockDialog.optionallyPrompt()
       } else {
-        useUsersStore().blockUser(this.user.id)
+        this.$store.dispatch('blockUser', { id: this.user.id })
       }
     },
   },
diff --git a/src/components/bookmark_timeline/bookmark_timeline.js b/src/components/bookmark_timeline/bookmark_timeline.js
new file mode 100644
index 000000000..bf633c18c
--- /dev/null
+++ b/src/components/bookmark_timeline/bookmark_timeline.js
@@ -0,0 +1,38 @@
+import Timeline from 'src/components/timeline/timeline.vue'
+
+const Bookmarks = {
+  created() {
+    this.$store.commit('clearTimeline', { timeline: 'bookmarks' })
+    this.$store.dispatch('startFetchingTimeline', {
+      timeline: 'bookmarks',
+      bookmarkFolderId: this.folderId || null,
+    })
+  },
+  components: {
+    Timeline,
+  },
+  computed: {
+    folderId() {
+      return this.$route.params.id
+    },
+    timeline() {
+      return this.$store.state.statuses.timelines.bookmarks
+    },
+  },
+  watch: {
+    folderId() {
+      this.$store.commit('clearTimeline', { timeline: 'bookmarks' })
+      this.$store.dispatch('stopFetchingTimeline', 'bookmarks')
+      this.$store.dispatch('startFetchingTimeline', {
+        timeline: 'bookmarks',
+        bookmarkFolderId: this.folderId || null,
+      })
+    },
+  },
+  unmounted() {
+    this.$store.commit('clearTimeline', { timeline: 'bookmarks' })
+    this.$store.dispatch('stopFetchingTimeline', 'bookmarks')
+  },
+}
+
+export default Bookmarks
diff --git a/src/components/bookmark_timeline/bookmark_timeline.vue b/src/components/bookmark_timeline/bookmark_timeline.vue
new file mode 100644
index 000000000..cc86cf12e
--- /dev/null
+++ b/src/components/bookmark_timeline/bookmark_timeline.vue
@@ -0,0 +1,10 @@
+<template>
+  <Timeline
+    :title="$t('nav.bookmarks')"
+    :timeline="timeline"
+    :timeline-name="'bookmarks'"
+    :bookmark-folder-id="folderId"
+  />
+</template>
+
+<script src="./bookmark_timeline.js"></script>
diff --git a/src/components/bubble_timeline/bubble_timeline.js b/src/components/bubble_timeline/bubble_timeline.js
new file mode 100644
index 000000000..fcbc31ad2
--- /dev/null
+++ b/src/components/bubble_timeline/bubble_timeline.js
@@ -0,0 +1,20 @@
+import Timeline from 'src/components/timeline/timeline.vue'
+
+const BubbleTimeline = {
+  components: {
+    Timeline,
+  },
+  computed: {
+    timeline() {
+      return this.$store.state.statuses.timelines.bubble
+    },
+  },
+  created() {
+    this.$store.dispatch('startFetchingTimeline', { timeline: 'bubble' })
+  },
+  unmounted() {
+    this.$store.dispatch('stopFetchingTimeline', 'bubble')
+  },
+}
+
+export default BubbleTimeline
diff --git a/src/components/bubble_timeline/bubble_timeline.vue b/src/components/bubble_timeline/bubble_timeline.vue
new file mode 100644
index 000000000..4aefa2729
--- /dev/null
+++ b/src/components/bubble_timeline/bubble_timeline.vue
@@ -0,0 +1,9 @@
+<template>
+  <Timeline
+    :title="$t('nav.bubble')"
+    :timeline="timeline"
+    :timeline-name="'bubble'"
+  />
+</template>
+
+<script src="./bubble_timeline.js"></script>
diff --git a/src/components/chat_list/chat_list.js b/src/components/chat_list/chat_list.js
index 0b0c241e8..446ccb70a 100644
--- a/src/components/chat_list/chat_list.js
+++ b/src/components/chat_list/chat_list.js
@@ -1,11 +1,11 @@
-import { mapState } from 'pinia'
+import { mapState as mapPiniaState } from 'pinia'
+import { mapState } from 'vuex'
 
 import ChatListItem from 'src/components/chat_list_item/chat_list_item.vue'
 import ChatNew from 'src/components/chat_new/chat_new.vue'
 import List from 'src/components/list/list.vue'
 
 import { useChatsStore } from 'src/stores/chats.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 const ChatList = {
   components: {
@@ -14,8 +14,10 @@ const ChatList = {
     ChatNew,
   },
   computed: {
-    ...mapState(useUsersStore, ['currentUser']),
-    ...mapState(useChatsStore, ['sortedChatList']),
+    ...mapState({
+      currentUser: (state) => state.users.currentUser,
+    }),
+    ...mapPiniaState(useChatsStore, ['sortedChatList']),
   },
   data() {
     return {
diff --git a/src/components/chat_list_item/chat_list_item.js b/src/components/chat_list_item/chat_list_item.js
index 09d5290a9..8bb2afd93 100644
--- a/src/components/chat_list_item/chat_list_item.js
+++ b/src/components/chat_list_item/chat_list_item.js
@@ -1,4 +1,4 @@
-import { mapState } from 'pinia'
+import { mapState } from 'vuex'
 
 import AvatarList from 'src/components/avatar_list/avatar_list.vue'
 import ChatTitle from 'src/components/chat_title/chat_title.vue'
@@ -6,8 +6,6 @@ import StatusBody from 'src/components/status_content/status_content.vue'
 import Timeago from 'src/components/timeago/timeago.vue'
 import UserAvatar from 'src/components/user_avatar/user_avatar.vue'
 
-import { useUsersStore } from 'src/stores/users.js'
-
 const ChatListItem = {
   name: 'ChatListItem',
   props: ['chat'],
@@ -19,7 +17,9 @@ const ChatListItem = {
     StatusBody,
   },
   computed: {
-    ...mapState(useUsersStore, ['currentUser']),
+    ...mapState({
+      currentUser: (state) => state.users.currentUser,
+    }),
     attachmentInfo() {
       if (this.chat.lastMessage.attachments.length === 0) {
         return
diff --git a/src/components/chat_list_item/chat_list_item.vue b/src/components/chat_list_item/chat_list_item.vue
index 8f38f518f..236562df0 100644
--- a/src/components/chat_list_item/chat_list_item.vue
+++ b/src/components/chat_list_item/chat_list_item.vue
@@ -5,7 +5,7 @@
   >
     <div class="chat-list-item-left">
       <UserAvatar
-        :user-id="chat.account.id"
+        :user="chat.account"
         height="48px"
         width="48px"
       />
diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js
index 5d086aade..aabdec31f 100644
--- a/src/components/chat_message/chat_message.js
+++ b/src/components/chat_message/chat_message.js
@@ -1,5 +1,6 @@
-import { mapState } from 'pinia'
+import { mapState as mapPiniaState } from 'pinia'
 import { defineAsyncComponent } from 'vue'
+import { mapState } from 'vuex'
 
 import Attachment from 'src/components/attachment/attachment.vue'
 import ChatMessageDate from 'src/components/chat_message_date/chat_message_date.vue'
@@ -19,8 +20,6 @@ import UserPopover from 'src/components/user_popover/user_popover.vue'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInterfaceStore } from 'src/stores/interface'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -80,7 +79,7 @@ const ChatMessage = {
       return this.isStatus ? this.message.user.id : this.message.account_id
     },
     author() {
-      return useUsersStore().findUser(this.authorId)
+      return this.$store.getters.findUser(this.authorId)
     },
     isCurrentUser() {
       // mini-hack/optimizaiton:
@@ -101,21 +100,25 @@ const ChatMessage = {
       return !this.message.in_reply_to_status_id
     },
     customReplyTo() {
-      return useStatusesStore().allStatuses.get(
-        this.message.in_reply_to_status_id,
-      )
+      return this.$store.state.statuses.allStatusesObject[
+        this.message.in_reply_to_status_id
+      ]
     },
     replyToName() {
       if (this.message.in_reply_to_screen_name) {
         return this.message.in_reply_to_screen_name
       } else {
-        const user = useUsersStore().findUser(this.message.in_reply_to_user_id)
+        const user = this.$store.getters.findUser(
+          this.message.in_reply_to_user_id,
+        )
         return user?.screen_name_ui
       }
     },
     replyProfileLink() {
       if (this.isCustomReply) {
-        const user = useUsersStore().findUser(this.message.in_reply_to_user_id)
+        const user = this.$store.getters.findUser(
+          this.message.in_reply_to_user_id,
+        )
         // FIXME Why user not found sometimes???
         return user ? user.statusnet_profile_url : 'NOT_FOUND'
       }
@@ -164,12 +167,14 @@ const ChatMessage = {
     },
 
     // Global stuff
-    ...mapState(useInterfaceStore, {
+    ...mapPiniaState(useInterfaceStore, {
       betterShadow: (store) => store.browserSupport.cssFilter,
     }),
-    ...mapState(useUsersStore, ['currentUser']),
-    ...mapState(useInstanceStore, ['restrictedNicknames']),
-    ...mapState(useMergedConfigStore, ['mergedConfig']),
+    ...mapState({
+      currentUser: (state) => state.users.currentUser,
+      restrictedNicknames: (state) => useInstanceStore().restrictedNicknames,
+    }),
+    ...mapPiniaState(useMergedConfigStore, ['mergedConfig']),
   },
   data() {
     return {
diff --git a/src/components/chat_message/chat_message.vue b/src/components/chat_message/chat_message.vue
index a6700201d..88ab2fc0a 100644
--- a/src/components/chat_message/chat_message.vue
+++ b/src/components/chat_message/chat_message.vue
@@ -83,7 +83,7 @@
           <UserAvatar
             v-if="author"
             :compact="true"
-            :user-id="author.id"
+            :user="author"
           />
         </UserPopover>
         <div
diff --git a/src/components/chat_new/chat_new.js b/src/components/chat_new/chat_new.js
index 1e26d24fb..00826ce66 100644
--- a/src/components/chat_new/chat_new.js
+++ b/src/components/chat_new/chat_new.js
@@ -1,10 +1,9 @@
-import { mapState } from 'pinia'
+import { mapGetters, mapState } from 'vuex'
 
 import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue'
 import UserAvatar from 'src/components/user_avatar/user_avatar.vue'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { chats } from 'src/api/chats.js'
 
@@ -43,7 +42,10 @@ const chatNew = {
         return this.suggestions
       }
     },
-    ...mapState(useUsersStore, ['currentUser', 'findUser']),
+    ...mapState({
+      currentUser: (state) => state.users.currentUser,
+    }),
+    ...mapGetters(['findUser']),
   },
   methods: {
     goBack() {
@@ -71,8 +73,7 @@ const chatNew = {
       this.loading = true
       this.userIds = []
       this.$store
-      this.useSearchStore()
-        .search({ q: query, resolve: true, type: 'accounts' })
+        .dispatch('search', { q: query, resolve: true, type: 'accounts' })
         .then((data) => {
           this.loading = false
           this.userIds = data.accounts.map((a) => a.id)
diff --git a/src/components/chat_title/chat_title.vue b/src/components/chat_title/chat_title.vue
index cae9064d2..905a32d85 100644
--- a/src/components/chat_title/chat_title.vue
+++ b/src/components/chat_title/chat_title.vue
@@ -10,7 +10,7 @@
     >
       <UserAvatar
         class="titlebar-avatar"
-        :user-id="user.id"
+        :user="user"
       />
     </UserPopover>
     <RichContent
diff --git a/src/components/chat_view/chat_view.js b/src/components/chat_view/chat_view.js
index 41dd038a9..16b2ae1d7 100644
--- a/src/components/chat_view/chat_view.js
+++ b/src/components/chat_view/chat_view.js
@@ -1,6 +1,7 @@
 import { get, maxBy, minBy, sortBy, throttle } from 'lodash'
-import { mapState } from 'pinia'
+import { mapState as mapPiniaState } from 'pinia'
 import { nextTick } from 'vue'
+import { mapState } from 'vuex'
 
 import ChatMessageList from 'src/components/chat_message_list/chat_message_list.vue'
 import ChatTitle from 'src/components/chat_title/chat_title.vue'
@@ -18,9 +19,6 @@ import { useChatsStore } from 'src/stores/chats.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
-import { useStreamingStore } from 'src/stores/streaming.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import {
   chatMessages,
@@ -87,8 +85,6 @@ const Chat = {
 
       // Internal network stuff
       fetcher: null,
-      socket: null,
-      streaming: false,
       errorLoadingChat: false,
       messageRetriers: {},
       idempotencyKeyIndex: {},
@@ -96,8 +92,7 @@ const Chat = {
   },
   created() {
     if (this.testMode) return
-    this.activate()
-    this.attachSocket()
+    this.startFetching()
   },
   mounted() {
     window.addEventListener('resize', this.handleResize)
@@ -123,13 +118,10 @@ const Chat = {
         this.handleVisibilityChange,
         false,
       )
-
-    if (this.testMode) return
-    this.deactivate()
   },
   computed: {
     conversationId() {
-      const status = useStatusesStore().allStatuses.get(this.statusId)
+      const status = this.$store.state.statuses.allStatusesObject[this.statusId]
       return get(
         status,
         'retweeted_status.statusnet_conversation_id',
@@ -165,14 +157,17 @@ const Chat = {
       if (this.isConversation) return false // Unsupported
       return (
         this.mergedConfig.useStreamingApi &&
-        useStreamingStore().state === WSConnectionStatus.JOINED
+        this.mastoUserSocketStatus === WSConnectionStatus.JOINED
       )
     },
-    ...mapState(useInterfaceStore, {
+    ...mapPiniaState(useInterfaceStore, {
       mobileLayout: (store) => store.layoutType === 'mobile',
     }),
-    ...mapState(useMergedConfigStore, ['mergedConfig']),
-    ...mapState(useUsersStore, ['currentUser']),
+    ...mapPiniaState(useMergedConfigStore, ['mergedConfig']),
+    ...mapState({
+      mastoUserSocketStatus: (state) => state.api.mastoUserSocketStatus,
+      currentUser: (state) => state.users.currentUser,
+    }),
   },
   watch: {
     messages(old, neu) {
@@ -231,85 +226,16 @@ const Chat = {
         return
       }
 
-      this.deactivate()
-      this.activate()
+      this.clear()
+      this.startFetching()
+    },
+    mastoUserSocketStatus(newValue) {
+      if (newValue === WSConnectionStatus.JOINED) {
+        this.fetchChat({ isFirstFetch: true })
+      }
     },
   },
   methods: {
-    async activate() {
-      if (!this.isConversation) {
-        try {
-          const result = await getOrCreateChat({
-            accountId: this.chatUserId,
-            credentials: useOAuthStore().token,
-          })
-          useUsersStore().addNewUsers(result)
-          const { data } = result
-          data.account = useUsersStore().findUser(data.account.id)
-          this.chat = data
-        } catch (e) {
-          console.error('Error creating or getting a chat', e)
-          this.errorLoadingChat = true
-        }
-      }
-
-      if (this.isConversation || this.chat) {
-        this.$nextTick(() => {
-          this.scrollDown({ forceRead: true })
-        })
-        this.startFetching('Chat activated', true)
-      }
-    },
-    deactivate() {
-      this.clear()
-      if (!this.streaming) {
-        this.stopFetching()
-      }
-    },
-    attachSocket() {
-      const et = new EventTarget()
-      const socket = { et }
-
-      et.addEventListener('update', this.onStreamMessage)
-      et.addEventListener('open', this.onStreamConnect)
-      et.addEventListener('close', this.onStreamDisconnect)
-
-      useStreamingStore().addSubscriber(socket)
-      this.socket = socket
-    },
-    detachSocket() {
-      const { et } = this.socket
-
-      et.removeEventListener('update', this.onStreamMessage)
-      et.removeEventListener('open', this.onStreamConnect)
-      et.removeEventListener('close', this.onStreamDisconnect)
-
-      useStreamingStore().removeSubscriber(this.socket)
-    },
-
-    // Poll & Push
-    onStreamConnect() {
-      this.streaming = true
-      this.stopFetching('Socket connected')
-    },
-    onStreamDisconnect(closeEvent) {
-      this.streaming = false
-      this.startFetching('Socket disconnected')
-    },
-    startFetching(reason, isFirstFetch) {
-      console.debug('[Chat View] Started fetching', 'Reason:', reason)
-      this.fetcher = promiseInterval(
-        () => this.fetchChat({ fetchLatest: true }),
-        5000,
-      )
-      this.fetchChat({ isFirstFetch })
-    },
-    stopFetching(reason) {
-      console.debug('[Chat View] Stopped fetching', 'Reason:', reason)
-      this.fetcher.stop()
-      this.fetcher = null
-    },
-
     // Actions
     async readChat() {
       if (this.conversationId) return // Unsupported
@@ -333,8 +259,18 @@ const Chat = {
       this.lastReadMessageId = this.maxId
       this.newMessageCount = 0
     },
-
-    // Clears
+    scrollDown(options = {}) {
+      const { behavior = 'auto', forceRead = false } = options
+      this.$nextTick(() => {
+        window.scrollTo({
+          top: document.documentElement.scrollHeight,
+          behavior,
+        })
+      })
+      if (forceRead) {
+        this.readChat()
+      }
+    },
     cullOlder() {
       const maxIndex = this.messages.length
       const minIndex = maxIndex - 50
@@ -430,12 +366,35 @@ const Chat = {
         })
       }
     },
-    onStreamMessage({ data }) {
-      const messages = data.filter(
-        ({ statusnet_conversation_id }) =>
-          statusnet_conversation_id === this.conversationId,
+    async startFetching() {
+      if (!this.isConversation) {
+        try {
+          const { data } = await getOrCreateChat({
+            accountId: this.chatUserId,
+            credentials: useOAuthStore().token,
+          })
+          this.$store.commit('addNewUsers', [data.account])
+          data.account = this.$store.getters.findUser(data.account.id)
+          this.chat = data
+        } catch (e) {
+          console.error('Error creating or getting a chat', e)
+          this.errorLoadingChat = true
+        }
+      }
+
+      if (this.isConversation || this.chat) {
+        this.$nextTick(() => {
+          this.scrollDown({ forceRead: true })
+        })
+        this.doStartFetching()
+      }
+    },
+    doStartFetching() {
+      this.fetcher = promiseInterval(
+        () => this.fetchChat({ fetchLatest: true }),
+        5000,
       )
-      this.addMessages({ messages })
+      this.fetchChat({ isFirstFetch: true })
     },
     addMessages({ messages: newMessages }) {
       for (let i = 0; i < newMessages.length; i++) {
@@ -479,6 +438,9 @@ const Chat = {
         }
       }
     },
+    goBack() {
+      this.$router.back()
+    },
 
     // Optimistic posting (chats only)
     async sendMessage({ status, media, idempotencyKey }) {
@@ -656,23 +618,6 @@ const Chat = {
       })
     },
 
-    // Misc
-    scrollDown(options = {}) {
-      const { behavior = 'auto', forceRead = false } = options
-      this.$nextTick(() => {
-        window.scrollTo({
-          top: document.documentElement.scrollHeight,
-          behavior,
-        })
-      })
-      if (forceRead) {
-        this.readChat()
-      }
-    },
-    goBack() {
-      this.$router.back()
-    },
-
     // Ugly
     // TODO move to ChatMessage
     async deleteChatMessage({ chatId, messageId }) {
diff --git a/src/components/confirm_modal/mute_confirm.js b/src/components/confirm_modal/mute_confirm.js
index 2247c2e91..c2f5ff888 100644
--- a/src/components/confirm_modal/mute_confirm.js
+++ b/src/components/confirm_modal/mute_confirm.js
@@ -4,8 +4,6 @@ import { defineAsyncComponent } from 'vue'
 import Select from 'src/components/select/select.vue'
 
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 export default {
   props: ['type', 'user', 'status'],
@@ -35,7 +33,9 @@ export default {
       return this.status.conversation_muted
     },
     domainIsMuted() {
-      return new Set(useUsersStore().currentUser.domainMutes).has(this.domain)
+      return new Set(this.$store.state.users.currentUser.domainMutes).has(
+        this.domain,
+      )
     },
     shouldConfirm() {
       switch (this.type) {
@@ -70,17 +70,17 @@ export default {
       switch (this.type) {
         case 'domain': {
           if (!this.domainIsMuted) {
-            useUsersStore().muteDomain(this.domain)
+            this.$store.dispatch('muteDomain', this.domain)
           } else {
-            useUsersStore().unmuteDomain(this.domain)
+            this.$store.dispatch('unmuteDomain', this.domain)
           }
           break
         }
         case 'conversation': {
           if (!this.conversationIsMuted) {
-            useStatusesStore().muteConversation(this.status.id)
+            this.$store.dispatch('muteConversation', { id: this.status.id })
           } else {
-            useStatusesStore().unmuteConversation(this.status.id)
+            this.$store.dispatch('unmuteConversation', { id: this.status.id })
           }
           break
         }
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index cc4aecfe3..ea5637944 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -1,4 +1,4 @@
-import { get, reduce } from 'lodash'
+import { clone, filter, findIndex, get, reduce } from 'lodash'
 import { mapState as mapPiniaState } from 'pinia'
 import { mapState } from 'vuex'
 
@@ -9,10 +9,9 @@ import QuickViewSettings from 'src/components/quick_view_settings/quick_view_set
 import RichContent from 'src/components/rich_content/rich_content.jsx'
 import ThreadTree from 'src/components/thread_tree/thread_tree.vue'
 
-import { useInterfaceStore } from 'src/stores/interface.js'
+import { useInterfaceStore } from 'src/stores/interface'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
 
 import { fetchConversation, fetchStatus } from 'src/api/public.js'
 import { WSConnectionStatus } from 'src/api/websocket.js'
@@ -52,6 +51,20 @@ const sortById = (a, b) => {
   }
 }
 
+const sortAndFilterConversation = (conversation, statusoid) => {
+  if (statusoid.type === 'retweet') {
+    conversation = filter(
+      conversation,
+      (status) =>
+        status.type === 'retweet' ||
+        status.id !== statusoid.retweeted_status.id,
+    )
+  } else {
+    conversation = filter(conversation, (status) => status.type !== 'retweet')
+  }
+  return conversation.filter(Boolean).sort(sortById)
+}
+
 const conversation = {
   props: {
     statusId: {
@@ -109,9 +122,6 @@ const conversation = {
     }
   },
   computed: {
-    status() {
-      return useStatusesStore().allStatuses.get(this.statusId)
-    },
     maxDepthToShowByDefault() {
       // maxDepthInThread = max number of depths that is *visible*
       // since our depth starts with 0 and "showing" means "showing children"
@@ -155,6 +165,9 @@ const conversation = {
     hideStatus() {
       return this.virtualHidden && this.suspendable
     },
+    status() {
+      return this.$store.state.statuses.allStatusesObject[this.statusId]
+    },
     originalStatusId() {
       if (this.status.retweeted_status) {
         return this.status.retweeted_status.id
@@ -174,13 +187,15 @@ const conversation = {
         return [this.status]
       }
 
-      const conversation = useStatusesStore().conversations.get(
-        this.conversationId,
+      const conversation = clone(
+        this.$store.state.statuses.conversationsObject[this.conversationId],
       )
+      const statusIndex = findIndex(conversation, { id: this.originalStatusId })
+      if (statusIndex !== -1) {
+        conversation[statusIndex] = this.status
+      }
 
-      return [...conversation.keys()]
-        .map((k) => useStatusesStore().allStatuses.get(k))
-        .toSorted(sortById)
+      return sortAndFilterConversation(conversation, this.status)
     },
     statusMap() {
       return this.conversation.reduce((res, s) => {
@@ -426,7 +441,7 @@ const conversation = {
       }
     },
     virtualHidden() {
-      useStatusesStore().setVirtualHeight({
+      this.$store.dispatch('setVirtualHeight', {
         statusId: this.statusId,
         height: `${this.$el.clientHeight}px`,
       })
@@ -438,12 +453,9 @@ const conversation = {
         fetchConversation({
           id: this.statusId,
           credentials: useOAuthStore().token,
-        }).then(({ data: { ancestors, descendants }, timestamp }) => {
-          useStatusesStore().addNewStatuses({ statuses: ancestors, timestamp })
-          useStatusesStore().addNewStatuses({
-            statuses: descendants,
-            timestamp,
-          })
+        }).then(({ data: { ancestors, descendants } }) => {
+          this.$store.dispatch('addNewStatuses', { statuses: ancestors })
+          this.$store.dispatch('addNewStatuses', { statuses: descendants })
           this.setFocused(this.originalStatusId)
         })
       } else {
@@ -453,7 +465,7 @@ const conversation = {
           credentials: useOAuthStore().token,
         })
           .then(({ data: status }) => {
-            useStatusesStore().addNewStatuses({ statuses: [status] })
+            this.$store.dispatch('addNewStatuses', { statuses: [status] })
             this.fetchConversation()
           })
           .catch((error) => {
@@ -470,17 +482,17 @@ const conversation = {
       this.focused = id
 
       if (!this.streamingEnabled) {
-        useStatusesStore().fetchStatus(id)
+        this.$store.dispatch('fetchStatus', id)
       }
 
-      useStatusesStore().fetchFavsAndRepeats(id)
-      useStatusesStore().fetchEmojiReactions(id)
+      this.$store.dispatch('fetchFavsAndRepeats', id)
+      this.$store.dispatch('fetchEmojiReactionsBy', id)
     },
     toggleExpanded() {
       this.expanded = !this.expanded
     },
     getConversationId(statusId) {
-      const status = useStatusesStore().allStatuses.get(statusId)
+      const status = this.$store.state.statuses.allStatusesObject[statusId]
       return get(
         status,
         'retweeted_status.statusnet_conversation_id',
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index ae6e3a0ce..0833c4f89 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -99,7 +99,7 @@
               ref="statusComponent"
               class="conversation-status status-fadein panel-body"
 
-              :status-id="status.id"
+              :statusoid="status"
               :replies="getReplies(status.id)"
 
               :expandable="!isExpanded"
@@ -152,7 +152,7 @@
           ref="statusComponent"
           :depth="0"
 
-          :status-id="status.id"
+          :status="status"
           :in-profile="inProfile"
           :conversation="conversation"
           :collapsable="collapsable"
@@ -186,7 +186,7 @@
             :key="status.id"
             ref="statusComponent"
             class="conversation-status status-fadein panel-body"
-            :status-id="status.id"
+            :statusoid="status"
             :replies="getReplies(status.id)"
 
             :expandable="!isExpanded"
diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
index 32d0b37a9..cc2c5aca9 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -5,10 +5,6 @@ import { defineAsyncComponent } from 'vue'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInterfaceStore } from 'src/stores/interface'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useStreamingStore } from 'src/stores/streaming.js'
-import { useUsersStore } from 'src/stores/users.js'
-
-import { WSConnectionStatus } from 'src/api/websocket.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -18,8 +14,6 @@ import {
   faComments,
   faHome,
   faInfoCircle,
-  faPlug,
-  faPlugCircleXmark,
   faSearch,
   faSignInAlt,
   faSignOutAlt,
@@ -39,8 +33,6 @@ library.add(
   faTachometerAlt,
   faCog,
   faInfoCircle,
-  faPlug,
-  faPlugCircleXmark,
 )
 
 export default {
@@ -99,23 +91,11 @@ export default {
       sitename: (store) => store.instanceIdentity.name,
       hideSitename: (store) => store.instanceIdentity.hideSitename,
     }),
-    ...mapState(useUsersStore, ['currentUser']),
-    ...mapState(useStreamingStore, {
-      streamingConnected: (store) => store.state === WSConnectionStatus.JOINED,
-    }),
-    ...mapState(useMergedConfigStore, ['mergedConfig']),
+    currentUser() {
+      return this.$store.state.users.currentUser
+    },
     shouldConfirmLogout() {
-      return this.mergedConfig.modalOnLogout
-    },
-    streamingEnabled() {
-      return this.mergedConfig.useStreamingApi
-    },
-    streamingTooltip() {
-      if (this.streamingConnected) {
-        return this.$t('timeline.socket_reconnected')
-      } else {
-        return this.$t('timeline.socket_disconnected')
-      }
+      return useMergedConfigStore().mergedConfig.modalOnLogout
     },
   },
   methods: {
@@ -137,7 +117,7 @@ export default {
     },
     doLogout() {
       this.$router.replace('/main/public')
-      useUsersStore().logout()
+      this.$store.dispatch('logout')
       this.hideConfirmLogout()
     },
     onSearchBarToggled(hidden) {
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index 52370a57f..3883b3c6f 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -15,24 +15,6 @@
         >
           {{ sitename }}
         </router-link>
-        <div
-          class="nav-icon"
-          v-if="streamingEnabled"
-          :title="streamingTooltip"
-        >
-          <FAIcon
-            v-if="streamingConnected"
-            fixed-width
-            class="fa-scale-110 fa-old-padding"
-            icon="plug"
-          />
-          <FAIcon
-            v-else
-            fixed-width
-            class="fa-scale-110 fa-old-padding"
-            icon="plug-circle-xmark"
-          />
-        </div>
       </div>
       <router-link
         class="logo"
diff --git a/src/components/dm_timeline/dm_timeline.js b/src/components/dm_timeline/dm_timeline.js
new file mode 100644
index 000000000..d54044ff7
--- /dev/null
+++ b/src/components/dm_timeline/dm_timeline.js
@@ -0,0 +1,14 @@
+import Timeline from 'src/components/timeline/timeline.vue'
+
+const DMs = {
+  computed: {
+    timeline() {
+      return this.$store.state.statuses.timelines.dms
+    },
+  },
+  components: {
+    Timeline,
+  },
+}
+
+export default DMs
diff --git a/src/components/dm_timeline/dm_timeline.vue b/src/components/dm_timeline/dm_timeline.vue
new file mode 100644
index 000000000..c4e4d0703
--- /dev/null
+++ b/src/components/dm_timeline/dm_timeline.vue
@@ -0,0 +1,9 @@
+<template>
+  <Timeline
+    :title="$t('nav.dms')"
+    :timeline="timeline"
+    :timeline-name="'dms'"
+  />
+</template>
+
+<script src="./dm_timeline.js"></script>
diff --git a/src/components/domain_mute_card/domain_mute_card.js b/src/components/domain_mute_card/domain_mute_card.js
index 274679b8d..d83896618 100644
--- a/src/components/domain_mute_card/domain_mute_card.js
+++ b/src/components/domain_mute_card/domain_mute_card.js
@@ -1,7 +1,5 @@
 import ProgressButton from 'src/components/progress_button/progress_button.vue'
 
-import { useUsersStore } from 'src/stores/users.js'
-
 const DomainMuteCard = {
   props: ['domain'],
   components: {
@@ -9,7 +7,7 @@ const DomainMuteCard = {
   },
   computed: {
     user() {
-      return useUsersStore().currentUser
+      return this.$store.state.users.currentUser
     },
     muted() {
       return this.user.domainMutes.includes(this.domain)
@@ -17,10 +15,10 @@ const DomainMuteCard = {
   },
   methods: {
     unmuteDomain() {
-      return useUsersStore().unmuteDomain(this.domain)
+      return this.$store.dispatch('unmuteDomain', this.domain)
     },
     muteDomain() {
-      return useUsersStore().muteDomain(this.domain)
+      return this.$store.dispatch('muteDomain', this.domain)
     },
   },
 }
diff --git a/src/components/draft/draft.js b/src/components/draft/draft.js
index 1c7f419c6..49e186eae 100644
--- a/src/components/draft/draft.js
+++ b/src/components/draft/draft.js
@@ -6,7 +6,6 @@ import PostStatusForm from 'src/components/post_status_form/post_status_form.vue
 import StatusContent from 'src/components/status_content/status_content.vue'
 
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faPollH } from '@fortawesome/free-solid-svg-icons'
@@ -66,7 +65,7 @@ const Draft = {
     },
     refStatus() {
       return this.draft.refId
-        ? useStatusesStore().allStatuses.get(this.draft.refId)
+        ? this.$store.state.statuses.allStatusesObject[this.draft.refId]
         : undefined
     },
     localCollapseSubjectDefault() {
diff --git a/src/components/edit_status_modal/edit_status_modal.js b/src/components/edit_status_modal/edit_status_modal.js
index 12072d7a2..59c142d08 100644
--- a/src/components/edit_status_modal/edit_status_modal.js
+++ b/src/components/edit_status_modal/edit_status_modal.js
@@ -4,7 +4,6 @@ import { defineAsyncComponent } from 'vue'
 import Modal from 'src/components/modal/modal.vue'
 
 import { useEditStatusStore } from 'src/stores/editStatus.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 const EditStatusModal = {
   components: {
@@ -20,7 +19,7 @@ const EditStatusModal = {
   },
   computed: {
     isLoggedIn() {
-      return !!useUsersStore().currentUser
+      return !!this.$store.state.users.currentUser
     },
     modalActivated() {
       return useEditStatusStore().modalActivated
diff --git a/src/components/emoji_input/suggestor.js b/src/components/emoji_input/suggestor.js
index 6a7dbff9a..c31cb6717 100644
--- a/src/components/emoji_input/suggestor.js
+++ b/src/components/emoji_input/suggestor.js
@@ -1,5 +1,3 @@
-import { useSearchStore } from 'src/stores/search.js'
-
 /**
  * suggest - generates a suggestor function to be used by emoji-input
  * data: object providing source information for specific types of suggestions:
@@ -79,7 +77,7 @@ export const suggestUsers = ({ dispatch, state }) => {
   let timeout = null
   let cancelUserSearch = null
 
-  const userSearch = (query) => useSearchStore().searchUsers({ query })
+  const userSearch = (query) => dispatch('searchUsers', { query })
   const debounceUserSearch = (query) => {
     cancelUserSearch?.()
     return new Promise((resolve, reject) => {
diff --git a/src/components/emoji_reactions/emoji_reactions.js b/src/components/emoji_reactions/emoji_reactions.js
index 3077ed212..acb5404c0 100644
--- a/src/components/emoji_reactions/emoji_reactions.js
+++ b/src/components/emoji_reactions/emoji_reactions.js
@@ -3,8 +3,6 @@ import UserListPopover from 'src/components/user_list_popover/user_list_popover.
 
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCheck, faMinus, faPlus } from '@fortawesome/free-solid-svg-icons'
@@ -42,7 +40,7 @@ const EmojiReactions = {
       }, {})
     },
     loggedIn() {
-      return !!useUsersStore().currentUser
+      return !!this.$store.state.users.currentUser
     },
     remoteInteractionLink() {
       return useInstanceStore().getRemoteInteractionLink({
@@ -60,22 +58,25 @@ const EmojiReactions = {
     reactedWith(emoji) {
       return this.status.emoji_reactions.find((r) => r.name === emoji).me
     },
-    async fetchEmojiReactionsIfMissing() {
+    async fetchEmojiReactionsByIfMissing() {
       const hasNoAccounts = this.status.emoji_reactions.find((r) => !r.accounts)
-      if (!hasNoAccounts) {
-        return await useStatusesStore().fetchEmojiReactions(this.status.id)
+      if (hasNoAccounts) {
+        return await this.$store.dispatch(
+          'fetchEmojiReactionsBy',
+          this.status.id,
+        )
       }
     },
     reactWith(emoji) {
-      useStatusesStore().reactWithEmoji(this.status.id, emoji)
+      this.$store.dispatch('reactWithEmoji', { id: this.status.id, emoji })
     },
     unreact(emoji) {
-      useStatusesStore().unreactWithEmoji(this.status.id, emoji)
+      this.$store.dispatch('unreactWithEmoji', { id: this.status.id, emoji })
     },
     async emojiOnClick(emoji) {
       if (!this.loggedIn) return
 
-      await this.fetchEmojiReactionsIfMissing()
+      await this.fetchEmojiReactionsByIfMissing()
       if (this.reactedWith(emoji)) {
         this.unreact(emoji)
       } else {
diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index a8100c0d4..16c69fa40 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -56,7 +56,7 @@
         class="emoji-reaction-popover"
         :normal-button="true"
         :trigger-attrs="counterTriggerAttrs(reaction)"
-        @show="fetchEmojiReactionsIfMissing()"
+        @show="fetchEmojiReactionsByIfMissing()"
       >
         <span class="emoji-reaction-counts">{{ reaction.count }}</span>
       </UserListPopover>
diff --git a/src/components/extra_notifications/extra_notifications.js b/src/components/extra_notifications/extra_notifications.js
index 851656ae5..24ed074af 100644
--- a/src/components/extra_notifications/extra_notifications.js
+++ b/src/components/extra_notifications/extra_notifications.js
@@ -6,7 +6,6 @@ import { useChatsStore } from 'src/stores/chats.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -53,7 +52,7 @@ const ExtraNotifications = {
       )
     },
     currentUser() {
-      return useUsersStore().currentUser
+      return this.$store.state.users.currentUser
     },
     ...mapGetters(['followRequestCount']),
     ...mapState(useAnnouncementsStore, {
diff --git a/src/components/follow_button/follow_button.js b/src/components/follow_button/follow_button.js
index e4d243ff9..3fecc025f 100644
--- a/src/components/follow_button/follow_button.js
+++ b/src/components/follow_button/follow_button.js
@@ -1,8 +1,11 @@
 import { defineAsyncComponent } from 'vue'
 
-import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useUsersStore } from 'src/stores/users.js'
+import {
+  requestFollow,
+  requestUnfollow,
+} from '../../services/follow_manipulate/follow_manipulate'
 
+import { useMergedConfigStore } from 'src/stores/merged_config.js'
 export default {
   props: ['relationship', 'user', 'labelFollowing', 'buttonClass'],
   components: {
@@ -61,11 +64,9 @@ export default {
     },
     follow() {
       this.inProgress = true
-      useUsersStore()
-        .followUser(this.relationship.id)
-        .finally(() => {
-          this.inProgress = false
-        })
+      requestFollow(this.relationship.id, this.$store).then(() => {
+        this.inProgress = false
+      })
     },
     unfollow() {
       if (this.shouldConfirmUnfollow) {
@@ -75,12 +76,15 @@ export default {
       }
     },
     doUnfollow() {
+      const store = this.$store
       this.inProgress = true
-      useUsersStore()
-        .unfollowUser(this.relationship.id)
-        .finally(() => {
-          this.inProgress = false
+      requestUnfollow(this.relationship.id, store).then(() => {
+        this.inProgress = false
+        store.commit('removeStatus', {
+          timeline: 'friends',
+          userId: this.relationship.id,
         })
+      })
 
       this.hideConfirmUnfollow()
     },
diff --git a/src/components/follow_card/follow_card.js b/src/components/follow_card/follow_card.js
index 9a8b8746f..8fffbf730 100644
--- a/src/components/follow_card/follow_card.js
+++ b/src/components/follow_card/follow_card.js
@@ -3,8 +3,6 @@ import FollowButton from 'src/components/follow_button/follow_button.vue'
 import RemoteFollow from 'src/components/remote_follow/remote_follow.vue'
 import RemoveFollowerButton from 'src/components/remove_follower_button/remove_follower_button.vue'
 
-import { useUsersStore } from 'src/stores/users.js'
-
 const FollowCard = {
   props: ['user', 'noFollowsYou'],
   components: {
@@ -15,13 +13,13 @@ const FollowCard = {
   },
   computed: {
     isMe() {
-      return useUsersStore().currentUser.id === this.user.id
+      return this.$store.state.users.currentUser.id === this.user.id
     },
     loggedIn() {
-      return useUsersStore().currentUser
+      return this.$store.state.users.currentUser
     },
     relationship() {
-      return useUsersStore().relationships.get(this.user.id)
+      return this.$store.getters.relationship(this.user.id)
     },
   },
 }
diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue
index d9a508a95..bdb6b8092 100644
--- a/src/components/follow_card/follow_card.vue
+++ b/src/components/follow_card/follow_card.vue
@@ -1,5 +1,5 @@
 <template>
-  <BasicUserCard :user="user">
+  <basic-user-card :user="user">
     <div class="follow-card-content-container">
       <span
         v-if="isMe || (!noFollowsYou && relationship.followed_by)"
@@ -30,7 +30,7 @@
         />
       </template>
     </div>
-  </BasicUserCard>
+  </basic-user-card>
 </template>
 
 <script src="./follow_card.js"></script>
diff --git a/src/components/follow_request_card/follow_request_card.js b/src/components/follow_request_card/follow_request_card.js
index c4b43811a..294dd2472 100644
--- a/src/components/follow_request_card/follow_request_card.js
+++ b/src/components/follow_request_card/follow_request_card.js
@@ -1,9 +1,9 @@
 import { defineAsyncComponent } from 'vue'
 
+import { notificationsFromStore } from '../../services/notification_utils/notification_utils.js'
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useNotificationsStore } from 'src/stores/notifications.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 
 import { approveUser, denyUser } from 'src/api/user.js'
@@ -24,7 +24,7 @@ const FollowRequestCard = {
   },
   methods: {
     findFollowRequestNotificationId() {
-      const notif = useNotificationsStore().data.find(
+      const notif = notificationsFromStore(this.$store).find(
         (notif) =>
           notif.from_profile.id === this.user.id &&
           notif.type === 'follow_request',
@@ -55,11 +55,16 @@ const FollowRequestCard = {
         id: this.user.id,
         credentials: useOAuthStore().token,
       })
-      // TODO fix
       this.$store.dispatch('removeFollowRequest', this.user)
 
       const notifId = this.findFollowRequestNotificationId()
-      useNotificationsStore().markSingleNotificationAsSeen(notifId)
+      this.$store.dispatch('markSingleNotificationAsSeen', { id: notifId })
+      this.$store.dispatch('updateNotification', {
+        id: notifId,
+        updater: (notification) => {
+          notification.type = 'follow'
+        },
+      })
       this.hideApproveConfirmDialog()
     },
     denyUser() {
@@ -76,8 +81,7 @@ const FollowRequestCard = {
         id: this.user.id,
         credentials: useOAuthStore().token,
       }).then(() => {
-        useNotificationsStore().dismissNotificationLocal(notifId)
-        // TODO fix
+        this.$store.dispatch('dismissNotificationLocal', { id: notifId })
         this.$store.dispatch('removeFollowRequest', this.user)
       })
       this.hideDenyConfirmDialog()
diff --git a/src/components/friends_timeline/friends_timeline.js b/src/components/friends_timeline/friends_timeline.js
new file mode 100644
index 000000000..b6bee7305
--- /dev/null
+++ b/src/components/friends_timeline/friends_timeline.js
@@ -0,0 +1,14 @@
+import Timeline from 'src/components/timeline/timeline.vue'
+
+const FriendsTimeline = {
+  components: {
+    Timeline,
+  },
+  computed: {
+    timeline() {
+      return this.$store.state.statuses.timelines.friends
+    },
+  },
+}
+
+export default FriendsTimeline
diff --git a/src/components/friends_timeline/friends_timeline.vue b/src/components/friends_timeline/friends_timeline.vue
new file mode 100644
index 000000000..01a568123
--- /dev/null
+++ b/src/components/friends_timeline/friends_timeline.vue
@@ -0,0 +1,9 @@
+<template>
+  <Timeline
+    :title="$t('nav.timeline')"
+    :timeline="timeline"
+    :timeline-name="'friends'"
+  />
+</template>
+
+<script src="./friends_timeline.js"></script>
diff --git a/src/components/interactions/interactions.js b/src/components/interactions/interactions.js
index 37873605f..d008c4b30 100644
--- a/src/components/interactions/interactions.js
+++ b/src/components/interactions/interactions.js
@@ -1,8 +1,6 @@
 import Notifications from 'src/components/notifications/notifications.vue'
 import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
 
-import { useUsersStore } from 'src/stores/users.js'
-
 const tabModeDict = {
   mentions: ['mention'],
   statuses: ['status'],
@@ -16,9 +14,10 @@ const tabModeDict = {
 const Interactions = {
   data() {
     return {
-      allowFollowingMove: useUsersStore().currentUser.allow_following_move,
+      allowFollowingMove:
+        this.$store.state.users.currentUser.allow_following_move,
       filterMode: tabModeDict.mentions,
-      canSeeReports: useUsersStore().currentUser.privileges.has(
+      canSeeReports: this.$store.state.users.currentUser.privileges.has(
         'reports_manage_reports',
       ),
     }
diff --git a/src/components/list/list.js b/src/components/list/list.js
index 20b7c5a78..c7b924258 100644
--- a/src/components/list/list.js
+++ b/src/components/list/list.js
@@ -98,13 +98,12 @@ const List = {
 
       this.fetchFunction(this.page)
         .then((result) => {
-          console.log(result)
           this.loading = false
-          this.bottomedOut = isEmpty(result)
+          this.bottomedOut = isEmpty(result.items)
           if (this.externalItems) return
           this.page += 1
-          this.total = result.length
-          this.items.push(...result)
+          this.total = result.count
+          this.items.push(...result.items)
         })
         .catch((error) => {
           this.loading = false
diff --git a/src/components/lists_edit/lists_edit.js b/src/components/lists_edit/lists_edit.js
index cea9236a5..7eb035091 100644
--- a/src/components/lists_edit/lists_edit.js
+++ b/src/components/lists_edit/lists_edit.js
@@ -1,4 +1,5 @@
-import { mapState } from 'pinia'
+import { mapState as mapPiniaState } from 'pinia'
+import { mapGetters, mapState } from 'vuex'
 
 import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue'
 import ListsUserSearch from 'src/components/lists_user_search/lists_user_search.vue'
@@ -8,7 +9,6 @@ import UserAvatar from 'src/components/user_avatar/user_avatar.vue'
 
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useListsStore } from 'src/stores/lists.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronLeft, faSearch } from '@fortawesome/free-solid-svg-icons'
@@ -47,8 +47,8 @@ const ListsNew = {
       .fetchListAccounts({ listId: this.id })
       .then(() => {
         this.membersUserIds = this.findListAccounts(this.id)
-        this.membersUserIds.forEach((id) => {
-          useUsersStore().fetchUserIfMissing({ id })
+        this.membersUserIds.forEach((userId) => {
+          this.$store.dispatch('fetchUserIfMissing', userId)
         })
       })
   },
@@ -66,8 +66,11 @@ const ListsNew = {
         .map((userId) => this.findUser(userId))
         .filter(Boolean)
     },
-    ...mapState(useUsersStore, ['currentUser', 'findUser']),
-    ...mapState(useListsStore, ['findListTitle', 'findListAccounts']),
+    ...mapState({
+      currentUser: (state) => state.users.currentUser,
+    }),
+    ...mapPiniaState(useListsStore, ['findListTitle', 'findListAccounts']),
+    ...mapGetters(['findUser']),
   },
   methods: {
     onInput() {
diff --git a/src/components/lists_menu/lists_menu_content.js b/src/components/lists_menu/lists_menu_content.js
index 7c422d033..337ee4d4f 100644
--- a/src/components/lists_menu/lists_menu_content.js
+++ b/src/components/lists_menu/lists_menu_content.js
@@ -1,10 +1,10 @@
-import { mapState } from 'pinia'
+import { mapState as mapPiniaState } from 'pinia'
+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.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 export const ListsMenuContent = {
   props: ['showPin'],
@@ -12,10 +12,12 @@ export const ListsMenuContent = {
     NavigationEntry,
   },
   computed: {
-    ...mapState(useListsStore, {
+    ...mapPiniaState(useListsStore, {
       lists: getListEntries,
     }),
-    ...mapState(useUsersStore, ['currentUser']),
+    ...mapState({
+      currentUser: (state) => state.users.currentUser,
+    }),
   },
 }
 
diff --git a/src/components/lists_timeline/lists_timeline.js b/src/components/lists_timeline/lists_timeline.js
new file mode 100644
index 000000000..a06220a37
--- /dev/null
+++ b/src/components/lists_timeline/lists_timeline.js
@@ -0,0 +1,47 @@
+import Timeline from 'src/components/timeline/timeline.vue'
+
+import { useListsStore } from 'src/stores/lists.js'
+
+const ListsTimeline = {
+  data() {
+    return {
+      listId: null,
+    }
+  },
+  components: {
+    Timeline,
+  },
+  computed: {
+    timeline() {
+      return this.$store.state.statuses.timelines.list
+    },
+  },
+  watch: {
+    $route: function (route) {
+      if (route.name === 'lists-timeline' && route.params.id !== this.listId) {
+        this.listId = route.params.id
+        this.$store.dispatch('stopFetchingTimeline', 'list')
+        this.$store.commit('clearTimeline', { timeline: 'list' })
+        useListsStore().fetchList({ listId: this.listId })
+        this.$store.dispatch('startFetchingTimeline', {
+          timeline: 'list',
+          listId: this.listId,
+        })
+      }
+    },
+  },
+  created() {
+    this.listId = this.$route.params.id
+    useListsStore().fetchList({ listId: this.listId })
+    this.$store.dispatch('startFetchingTimeline', {
+      timeline: 'list',
+      listId: this.listId,
+    })
+  },
+  unmounted() {
+    this.$store.dispatch('stopFetchingTimeline', 'list')
+    this.$store.commit('clearTimeline', { timeline: 'list' })
+  },
+}
+
+export default ListsTimeline
diff --git a/src/components/lists_timeline/lists_timeline.vue b/src/components/lists_timeline/lists_timeline.vue
new file mode 100644
index 000000000..18156b812
--- /dev/null
+++ b/src/components/lists_timeline/lists_timeline.vue
@@ -0,0 +1,10 @@
+<template>
+  <Timeline
+    title="list.name"
+    :timeline="timeline"
+    :list-id="listId"
+    timeline-name="list"
+  />
+</template>
+
+<script src="./lists_timeline.js"></script>
diff --git a/src/components/lists_user_search/lists_user_search.js b/src/components/lists_user_search/lists_user_search.js
index 5ac6e679a..aed3f1ce7 100644
--- a/src/components/lists_user_search/lists_user_search.js
+++ b/src/components/lists_user_search/lists_user_search.js
@@ -32,8 +32,8 @@ const ListsUserSearch = {
       this.loading = true
       this.$emit('loading')
       this.userIds = []
-      this.useSearchStore()
-        .search({
+      this.$store
+        .dispatch('search', {
           q: query,
           resolve: true,
           type: 'accounts',
diff --git a/src/components/mention_link/mention_link.js b/src/components/mention_link/mention_link.js
index 374e62259..0309079e8 100644
--- a/src/components/mention_link/mention_link.js
+++ b/src/components/mention_link/mention_link.js
@@ -1,4 +1,5 @@
-import { mapState } from 'pinia'
+import { mapState as mapPiniaState } from 'pinia'
+import { mapState } from 'vuex'
 
 import UnicodeDomainIndicator from 'src/components/unicode_domain_indicator/unicode_domain_indicator.vue'
 import UserAvatar from 'src/components/user_avatar/user_avatar.vue'
@@ -11,7 +12,6 @@ import {
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useUserHighlightStore } from 'src/stores/user_highlight.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
@@ -75,7 +75,7 @@ const MentionLink = {
   },
   computed: {
     user() {
-      return this.url && useUsersStore().findUserByUrl(this.url)
+      return this.url && this.$store?.getters.findUserByUrl(this.url)
     },
     isYou() {
       // FIXME why user !== currentUser???
@@ -156,9 +156,11 @@ const MentionLink = {
     shouldFadeDomain() {
       return this.mergedConfig.mentionLinkFadeDomain
     },
-    ...mapState(useMergedConfigStore, ['mergedConfig']),
-    ...mapState(useUserHighlightStore, ['highlight']),
-    ...mapState(useUsersStore, ['currentUser']),
+    ...mapPiniaState(useMergedConfigStore, ['mergedConfig']),
+    ...mapPiniaState(useUserHighlightStore, ['highlight']),
+    ...mapState({
+      currentUser: (state) => state.users.currentUser,
+    }),
   },
 }
 
diff --git a/src/components/mention_link/mention_link.vue b/src/components/mention_link/mention_link.vue
index 33f0d9db7..0452cad58 100644
--- a/src/components/mention_link/mention_link.vue
+++ b/src/components/mention_link/mention_link.vue
@@ -31,7 +31,7 @@
           <UserAvatar
             v-if="shouldShowAvatar"
             class="mention-avatar"
-            :user-id="user.id"
+            :user="user"
           /><span
             class="shortName"
           >@<span
diff --git a/src/components/mentions/mentions.js b/src/components/mentions/mentions.js
new file mode 100644
index 000000000..48e06a950
--- /dev/null
+++ b/src/components/mentions/mentions.js
@@ -0,0 +1,14 @@
+import Timeline from 'src/components/timeline/timeline.vue'
+
+const Mentions = {
+  computed: {
+    timeline() {
+      return this.$store.state.statuses.timelines.mentions
+    },
+  },
+  components: {
+    Timeline,
+  },
+}
+
+export default Mentions
diff --git a/src/components/mentions/mentions.vue b/src/components/mentions/mentions.vue
new file mode 100644
index 000000000..70f60bafe
--- /dev/null
+++ b/src/components/mentions/mentions.vue
@@ -0,0 +1,9 @@
+<template>
+  <Timeline
+    :title="$t('nav.interactions')"
+    :timeline="timeline"
+    :timeline-name="'mentions'"
+  />
+</template>
+
+<script src="./mentions.js"></script>
diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index 163c0e9aa..4eb956f64 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -5,15 +5,13 @@ import NavigationPins from 'src/components/navigation/navigation_pins.vue'
 import GestureService from '../../services/gesture_service/gesture_service'
 import {
   countExtraNotifications,
-  unseenNotifications,
+  unseenNotificationsFromStore,
 } from '../../services/notification_utils/notification_utils'
 
 import { useAnnouncementsStore } from 'src/stores/announcements.js'
 import { useChatsStore } from 'src/stores/chats.js'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useNotificationsStore } from 'src/stores/notifications.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -55,10 +53,11 @@ const MobileNav = {
   },
   computed: {
     currentUser() {
-      return useUsersStore().currentUser
+      return this.$store.state.users.currentUser
     },
     unseenNotifications() {
-      return unseenNotifications(
+      return unseenNotificationsFromStore(
+        this.$store,
         useMergedConfigStore().mergedConfig.notificationVisibility,
         useMergedConfigStore().mergedConfig.ignoreInactionableSeen,
       )
@@ -146,11 +145,11 @@ const MobileNav = {
     },
     doLogout() {
       this.$router.replace('/main/public')
-      useUsersStore().logout()
+      this.$store.dispatch('logout')
       this.hideConfirmLogout()
     },
     markNotificationsAsSeen() {
-      useNotificationsStore().markNotificationsAsSeen()
+      this.$store.dispatch('markNotificationsAsSeen')
     },
     onScroll({ target: { scrollTop, clientHeight, scrollHeight } }) {
       this.notificationsAtTop = scrollTop > 0
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 d137331c9..4969352f6 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
@@ -2,7 +2,6 @@ import { debounce } from 'lodash'
 
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { usePostStatusStore } from 'src/stores/post_status.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faPen } from '@fortawesome/free-solid-svg-icons'
@@ -35,7 +34,7 @@ const MobilePostStatusButton = {
   },
   computed: {
     isLoggedIn() {
-      return useUsersStore().loggedIn
+      return !!this.$store.state.users.currentUser
     },
     isHidden() {
       if (HIDDEN_FOR_PAGES.has(this.$route.name)) {
diff --git a/src/components/moderation_tools/moderation_tools.js b/src/components/moderation_tools/moderation_tools.js
index 9b948e306..ba13afc8b 100644
--- a/src/components/moderation_tools/moderation_tools.js
+++ b/src/components/moderation_tools/moderation_tools.js
@@ -5,7 +5,6 @@ import Popover from 'src/components/popover/popover.vue'
 
 import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronDown } from '@fortawesome/free-solid-svg-icons'
@@ -406,7 +405,7 @@ const ModerationTools = {
       )
     },
     isAdmin() {
-      return useUsersStore().currentUser.role === 'admin'
+      return this.$store.state.users.currentUser.role === 'admin'
     },
   },
   methods: {
@@ -453,7 +452,7 @@ const ModerationTools = {
     },
     privileged(privilege) {
       if (this.isAdmin) return true
-      return useUsersStore().currentUser.privileges.has(privilege)
+      return this.$store.state.users.currentUser.privileges.has(privilege)
     },
     setTag(tag, value) {
       useAdminSettingsStore().setUsersTags({
@@ -517,7 +516,8 @@ const ModerationTools = {
     setOpen(value) {
       this.open = value
     },
-    maybeShowConfirm({ group, name, action, value }) {
+    maybeShowConfirm(close, { group, name, action, value }) {
+      close()
       this.confirmDialogName = name
       this.confirmDialogGroup = group
       this.confirmDialogAction = () => action()
diff --git a/src/components/moderation_tools/moderation_tools.vue b/src/components/moderation_tools/moderation_tools.vue
index e3da1a84d..4da0be0ee 100644
--- a/src/components/moderation_tools/moderation_tools.vue
+++ b/src/components/moderation_tools/moderation_tools.vue
@@ -9,7 +9,7 @@
       @show="setOpen(true)"
       @close="setOpen(false)"
     >
-      <template #content>
+      <template #content="{close}">
         <div class="dropdown-menu">
           <template v-for="(entry, index) in entries">
             <div
@@ -26,7 +26,7 @@
             >
               <button
                 class="main-button"
-                @click="() => maybeShowConfirm(entry)"
+                @click="() => maybeShowConfirm(close, entry)"
               >
                 <span
                   v-if="entry.checkbox"
diff --git a/src/components/mute_card/mute_card.js b/src/components/mute_card/mute_card.js
index ca14eb9ca..0d247930a 100644
--- a/src/components/mute_card/mute_card.js
+++ b/src/components/mute_card/mute_card.js
@@ -1,16 +1,14 @@
 import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue'
 import UserTimedFilterModal from 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue'
 
-import { useUsersStore } from 'src/stores/users.js'
-
 const MuteCard = {
   props: ['userId'],
   computed: {
     user() {
-      return useUsersStore().findUser(this.userId)
+      return this.$store.getters.findUser(this.userId)
     },
     relationship() {
-      return useUsersStore().relationship(this.userId)
+      return this.$store.getters.relationship(this.userId)
     },
     muted() {
       return this.relationship.muting
@@ -32,7 +30,7 @@ const MuteCard = {
   },
   methods: {
     unmuteUser() {
-      useUsersStore().unmuteUser(this.user.id)
+      this.$store.dispatch('unmuteUser', this.userId)
     },
     muteUser() {
       this.$refs.timedMuteDialog.optionallyPrompt()
diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
index 3e88ea564..5a4a78ec4 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -14,7 +14,6 @@ import { useChatsStore } from 'src/stores/chats.js'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -129,8 +128,8 @@ const NavPanel = {
       pinnedItems: (store) =>
         new Set(store.prefsStorage.collections.pinnedNavItems),
     }),
-    ...mapPiniaState(useUsersStore, ['currentUser']),
     ...mapState({
+      currentUser: (state) => state.users.currentUser,
       followRequestCount: (state) => state.api.followRequests.length,
     }),
     ...mapPiniaState(useChatsStore, ['unreadChatsCount']),
diff --git a/src/components/navigation/navigation_entry.js b/src/components/navigation/navigation_entry.js
index 31bc28eb5..7a43000ce 100644
--- a/src/components/navigation/navigation_entry.js
+++ b/src/components/navigation/navigation_entry.js
@@ -1,11 +1,11 @@
-import { mapState, mapStores } from 'pinia'
+import { mapState as mapPiniaState, mapStores } from 'pinia'
+import { mapState } from 'vuex'
 
 import { routeTo } from 'src/components/navigation/navigation.js'
 import OptionalRouterLink from 'src/components/optional_router_link/optional_router_link.vue'
 
 import { useAnnouncementsStore } from 'src/stores/announcements.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faThumbtack } from '@fortawesome/free-solid-svg-icons'
@@ -44,8 +44,10 @@ const NavigationEntry = {
       return this.$store.getters
     },
     ...mapStores(useAnnouncementsStore),
-    ...mapState(useUsersStore, ['currentUser']),
-    ...mapState(useSyncConfigStore, {
+    ...mapState({
+      currentUser: (state) => state.users.currentUser,
+    }),
+    ...mapPiniaState(useSyncConfigStore, {
       pinnedItems: (store) =>
         new Set(store.prefsStorage.collections.pinnedNavItems),
     }),
diff --git a/src/components/navigation/navigation_pins.js b/src/components/navigation/navigation_pins.js
index d1be73819..c3649e4b3 100644
--- a/src/components/navigation/navigation_pins.js
+++ b/src/components/navigation/navigation_pins.js
@@ -18,7 +18,6 @@ import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useListsStore } from 'src/stores/lists'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -77,8 +76,8 @@ const NavPanel = {
       'pleromaChatMessagesAvailable',
       'localBubble',
     ]),
-    ...mapPiniaState(useUsersStore, ['currentUser']),
     ...mapState({
+      currentUser: (state) => state.users.currentUser,
       followRequestCount: (state) => state.api.followRequests.length,
     }),
     pinnedList() {
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index a589c0cf6..1bfe540a0 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -1,5 +1,5 @@
-import { mapState } from 'pinia'
 import { defineAsyncComponent } from 'vue'
+import { mapState } from 'vuex'
 
 import Report from 'src/components/report/report.vue'
 import StatusContent from 'src/components/status_content/status_content.vue'
@@ -7,7 +7,7 @@ import Timeago from 'src/components/timeago/timeago.vue'
 import UserAvatar from 'src/components/user_avatar/user_avatar.vue'
 import UserLink from 'src/components/user_link/user_link.vue'
 import UserPopover from 'src/components/user_popover/user_popover.vue'
-import { isStatusNotification } from '../../services/notification_utils/notification_utils_sw.js'
+import { isStatusNotification } from '../../services/notification_utils/notification_utils.js'
 import {
   highlightClass,
   highlightStyle,
@@ -15,11 +15,8 @@ import {
 
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useNotificationsStore } from 'src/stores/notifications.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
 import { useUserHighlightStore } from 'src/stores/user_highlight.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { approveUser, denyUser } from 'src/api/user.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
@@ -151,9 +148,16 @@ const Notification = {
         id: this.user.id,
         credentials: useOAuthStore().token,
       })
-      // TODO Fix this
       this.$store.dispatch('removeFollowRequest', this.user)
-      useNotificationsStore().markSingleNotificationAsSeen(this.notification.id)
+      this.$store.dispatch('markSingleNotificationAsSeen', {
+        id: this.notification.id,
+      })
+      this.$store.dispatch('updateNotification', {
+        id: this.notification.id,
+        updater: (notification) => {
+          notification.type = 'follow'
+        },
+      })
       this.hideApproveConfirmDialog()
     },
     denyUser() {
@@ -168,20 +172,15 @@ const Notification = {
         id: this.user.id,
         credentials: useOAuthStore().token,
       }).then(() => {
-        useNotificationsStore().dismissNotificationLocal(this.notification.id)
-        // TODO Fix this
+        this.$store.dispatch('dismissNotificationLocal', {
+          id: this.notification.id,
+        })
         this.$store.dispatch('removeFollowRequest', this.user)
       })
       this.hideDenyConfirmDialog()
     },
   },
   computed: {
-    status() {
-      // Used for StatusContent
-      if (this.notification.status) {
-        return useStatusesStore().allStatuses.get(this.notification.status.id)
-      }
-    },
     userClass() {
       return highlightClass(this.notification.from_profile)
     },
@@ -195,19 +194,19 @@ const Notification = {
       )
     },
     user() {
-      return useUsersStore().findUser(this.notification.from_profile.id)
+      return this.$store.getters.findUser(this.notification.from_profile.id)
     },
     userProfileLink() {
       return this.generateUserProfileLink(this.user)
     },
     targetUser() {
-      return useUsersStore().findUser(this.notification.target.id)
+      return this.$store.getters.findUser(this.notification.target.id)
     },
     targetUserProfileLink() {
       return this.generateUserProfileLink(this.targetUser)
     },
     needMute() {
-      return useUsersStore().relationship(this.user.id).muting
+      return this.$store.getters.relationship(this.user.id).muting
     },
     isStatusNotification() {
       return isStatusNotification(this.notification.type)
@@ -230,7 +229,9 @@ const Notification = {
     shouldConfirmDeny() {
       return this.mergedConfig.modalOnDenyFollow
     },
-    ...mapState(useUsersStore, ['currentUser']),
+    ...mapState({
+      currentUser: (state) => state.users.currentUser,
+    }),
   },
 }
 
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index d2f370928..c526eef79 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -6,7 +6,7 @@
     <Status
       class="Notification panel-body"
       :compact="true"
-      :status-id="notification.status?.id"
+      :statusoid="notification.status"
       @click="interacted"
     />
   </article>
@@ -57,7 +57,7 @@
           <UserAvatar
             class="post-avatar"
             :compact="true"
-            :user-id="notification.from_profile.id"
+            :user="notification.from_profile"
           />
         </UserPopover>
       </a>
@@ -261,7 +261,7 @@
           <StatusContent
             class="status-content"
             :compact="!statusExpanded"
-            :status="status"
+            :status="notification.status"
             :collapse="!statusExpanded"
             @click="onContentClick"
           />
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index e642fc554..feb59857e 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -7,16 +7,17 @@ import FaviconService from '../../services/favicon_service/favicon_service.js'
 import {
   ACTIONABLE_NOTIFICATION_TYPES,
   countExtraNotifications,
-  filteredNotifications,
-  unseenNotifications,
+  filteredNotificationsFromStore,
+  notificationsFromStore,
+  unseenNotificationsFromStore,
 } from '../../services/notification_utils/notification_utils.js'
+import notificationsFetcher from '../../services/notifications_fetcher/notifications_fetcher.service.js'
 import NotificationFilters from './notification_filters.vue'
 
 import { useAnnouncementsStore } from 'src/stores/announcements.js'
 import { useChatsStore } from 'src/stores/chats.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useNotificationsStore } from 'src/stores/notifications.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -52,6 +53,7 @@ const Notifications = {
   data() {
     return {
       showScrollTop: false,
+      bottomedOut: false,
       // How many seen notifications to display in the list. The more there are,
       // the heavier the page becomes. This count is increased when loading
       // older notifications, and cut back to default whenever hitting "Read!".
@@ -68,13 +70,14 @@ const Notifications = {
       return this.minimalMode ? '' : 'panel panel-default'
     },
     notifications() {
-      return useNotificationsStore().data
+      return notificationsFromStore(this.$store)
     },
     error() {
-      return useNotificationsStore().error
+      return this.$store.state.notifications.error
     },
     unseenNotifications() {
-      return unseenNotifications(
+      return unseenNotificationsFromStore(
+        this.$store,
         useMergedConfigStore().mergedConfig.notificationVisibility,
         useMergedConfigStore().mergedConfig.ignoreInactionableSeen,
       )
@@ -82,15 +85,18 @@ const Notifications = {
     filteredNotifications() {
       if (this.unseenAtTop) {
         return [
-          ...filteredNotifications(
+          ...filteredNotificationsFromStore(
+            this.$store,
             useMergedConfigStore().mergedConfig.notificationVisibility,
           ).filter((n) => this.shouldShowUnseen(n)),
-          ...filteredNotifications(
+          ...filteredNotificationsFromStore(
+            this.$store,
             useMergedConfigStore().mergedConfig.notificationVisibility,
           ).filter((n) => !this.shouldShowUnseen(n)),
         ]
       } else {
-        return filteredNotifications(
+        return filteredNotificationsFromStore(
+          this.$store,
           useMergedConfigStore().mergedConfig.notificationVisibility,
           this.filterMode,
         )
@@ -121,10 +127,7 @@ const Notifications = {
       )
     },
     loading() {
-      return useNotificationsStore().fetcher.loading.value
-    },
-    bottomedOut() {
-      return useNotificationsStore().fetcher.bottomedOut.value
+      return this.$store.state.notifications.loading
     },
     noHeading() {
       const { layoutType } = useInterfaceStore()
@@ -221,14 +224,14 @@ const Notifications = {
      */
     notificationClicked(notification) {
       const { id } = notification
-      useNotificationsStore().notificationClicked(id)
+      this.$store.dispatch('notificationClicked', { id })
     },
     notificationInteracted(notification) {
       const { id } = notification
-      useNotificationsStore().markSingleNotificationAsSeen(id)
+      this.$store.dispatch('markSingleNotificationAsSeen', { id })
     },
     markAsSeen() {
-      useNotificationsStore().markNotificationsAsSeen()
+      this.$store.dispatch('markNotificationsAsSeen')
       this.seenToDisplayCount = DEFAULT_SEEN_TO_DISPLAY_COUNT
     },
     fetchOlderNotifications() {
@@ -247,7 +250,22 @@ const Notifications = {
         this.seenToDisplayCount = seenCount
       }
 
-      useNotificationsStore().fetcher.fetchOlder()
+      const store = this.$store
+      const credentials = store.state.users.currentUser.credentials
+      store.commit('setNotificationsLoading', { value: true })
+      notificationsFetcher
+        .fetchAndUpdate({
+          store,
+          credentials,
+          older: true,
+        })
+        .then((notifs) => {
+          store.commit('setNotificationsLoading', { value: false })
+          if (notifs.length === 0) {
+            this.bottomedOut = true
+          }
+          this.seenToDisplayCount += notifs.length
+        })
     },
   },
 }
diff --git a/src/components/oauth_callback/oauth_callback.js b/src/components/oauth_callback/oauth_callback.js
index bf6e03c9e..04f79425e 100644
--- a/src/components/oauth_callback/oauth_callback.js
+++ b/src/components/oauth_callback/oauth_callback.js
@@ -1,6 +1,5 @@
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { getToken } from 'src/api/oauth.js'
 
@@ -18,8 +17,7 @@ const oac = {
         code: this.code,
       }).then(({ data: result }) => {
         oauthStore.setToken(result.access_token)
-
-        useUsersStore().loginUser(result.access_token)
+        this.$store.dispatch('loginUser', result.access_token)
         this.$router.push({ name: 'friends' })
       })
     }
diff --git a/src/components/password_reset/password_reset.js b/src/components/password_reset/password_reset.js
index 54ad5c194..b2e6e1093 100644
--- a/src/components/password_reset/password_reset.js
+++ b/src/components/password_reset/password_reset.js
@@ -1,7 +1,7 @@
-import { mapState } from 'pinia'
+import { mapState as mapPiniaState } from 'pinia'
+import { mapState } from 'vuex'
 
 import { useInstanceStore } from 'src/stores/instance.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { resetPassword } from 'src/api/public.js'
 
@@ -21,11 +21,13 @@ const passwordReset = {
     error: null,
   }),
   computed: {
-    ...mapState(useUsersStore, ['loggedIn']),
-    ...mapState(useInstanceStore, ['mailerEnabled']),
+    ...mapState({
+      signedIn: (state) => !!state.users.currentUser,
+    }),
+    ...mapPiniaState(useInstanceStore, ['mailerEnabled']),
   },
   created() {
-    if (this.loggedIn) {
+    if (this.signedIn) {
       this.$router.push({ name: 'root' })
     }
   },
diff --git a/src/components/poll/poll.js b/src/components/poll/poll.js
index ace31e8b8..0ce304a0a 100644
--- a/src/components/poll/poll.js
+++ b/src/components/poll/poll.js
@@ -5,7 +5,6 @@ import genRandomSeed from '../../services/random_seed/random_seed.service.js'
 
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { usePollsStore } from 'src/stores/polls.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 export default {
   name: 'Poll',
@@ -65,7 +64,7 @@ export default {
       return useMergedConfigStore().mergedConfig.scaleMfm
     },
     loggedIn() {
-      return useUsersStore().currentUser
+      return this.$store.state.users.currentUser
     },
     showResults() {
       return this.poll.voted || this.expired || !this.loggedIn
diff --git a/src/components/poll/poll_form.vue b/src/components/poll/poll_form.vue
index e01acf9a2..b5db1314a 100644
--- a/src/components/poll/poll_form.vue
+++ b/src/components/poll/poll_form.vue
@@ -78,8 +78,8 @@
           v-model="expiryUnit"
           unstyled="true"
           class="expiry-unit"
-          :aria-label="$t('polls.expiry_unit')"
           @change="expiryAmountChange"
+          :aria-label="$t('polls.expiry_unit')"
         >
           <option
             v-for="unit in expiryUnits"
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 1cea48670..f36987efb 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -31,7 +31,6 @@ import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMediaViewerStore } from 'src/stores/media_viewer.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { pollFormToMasto } from 'src/services/poll/poll.service.js'
 
@@ -571,18 +570,17 @@ const PostStatusForm = {
     },
 
     // Global stuff
-    ...mapState(useUsersStore, ['currentUser']),
+    currentUser() {
+      return this.$store.state.users.currentUser
+    },
     ...mapState(useMergedConfigStore, ['mergedConfig']),
     ...mapState(useInterfaceStore, {
       mobileLayout: (store) => store.mobileLayout,
     }),
   },
   watch: {
-    newStatus: {
-      deep: true,
-      handler() {
-        this.statusChanged()
-      },
+    isDirty(newVal, oldVal) {
+      this.statusChanged()
     },
     saveable(val) {
       // https://developer.mozilla.org/en-US/docs/Web/API/Window/beforeunload_event#usage_notes
diff --git a/src/components/post_status_modal/post_status_modal.js b/src/components/post_status_modal/post_status_modal.js
index 9be1df4a4..e7001db9a 100644
--- a/src/components/post_status_modal/post_status_modal.js
+++ b/src/components/post_status_modal/post_status_modal.js
@@ -4,7 +4,6 @@ import Modal from 'src/components/modal/modal.vue'
 import PostStatusForm from 'src/components/post_status_form/post_status_form.vue'
 
 import { usePostStatusStore } from 'src/stores/post_status.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 const PostStatusModal = {
   components: {
@@ -18,7 +17,7 @@ const PostStatusModal = {
   },
   computed: {
     isLoggedIn() {
-      return !!useUsersStore().currentUser
+      return !!this.$store.state.users.currentUser
     },
     modalActivated() {
       return usePostStatusStore().modalActivated
diff --git a/src/components/public_and_external_timeline/public_and_external_timeline.js b/src/components/public_and_external_timeline/public_and_external_timeline.js
new file mode 100644
index 000000000..6dc8df02a
--- /dev/null
+++ b/src/components/public_and_external_timeline/public_and_external_timeline.js
@@ -0,0 +1,22 @@
+import Timeline from 'src/components/timeline/timeline.vue'
+
+const PublicAndExternalTimeline = {
+  components: {
+    Timeline,
+  },
+  computed: {
+    timeline() {
+      return this.$store.state.statuses.timelines.publicAndExternal
+    },
+  },
+  created() {
+    this.$store.dispatch('startFetchingTimeline', {
+      timeline: 'publicAndExternal',
+    })
+  },
+  unmounted() {
+    this.$store.dispatch('stopFetchingTimeline', 'publicAndExternal')
+  },
+}
+
+export default PublicAndExternalTimeline
diff --git a/src/components/public_and_external_timeline/public_and_external_timeline.vue b/src/components/public_and_external_timeline/public_and_external_timeline.vue
new file mode 100644
index 000000000..fcd915acb
--- /dev/null
+++ b/src/components/public_and_external_timeline/public_and_external_timeline.vue
@@ -0,0 +1,9 @@
+<template>
+  <Timeline
+    :title="$t('nav.twkn')"
+    :timeline="timeline"
+    :timeline-name="'publicAndExternal'"
+  />
+</template>
+
+<script src="./public_and_external_timeline.js"></script>
diff --git a/src/components/public_timeline/public_timeline.js b/src/components/public_timeline/public_timeline.js
new file mode 100644
index 000000000..bbeae47af
--- /dev/null
+++ b/src/components/public_timeline/public_timeline.js
@@ -0,0 +1,20 @@
+import Timeline from 'src/components/timeline/timeline.vue'
+
+const PublicTimeline = {
+  components: {
+    Timeline,
+  },
+  computed: {
+    timeline() {
+      return this.$store.state.statuses.timelines.public
+    },
+  },
+  created() {
+    this.$store.dispatch('startFetchingTimeline', { timeline: 'public' })
+  },
+  unmounted() {
+    this.$store.dispatch('stopFetchingTimeline', 'public')
+  },
+}
+
+export default PublicTimeline
diff --git a/src/components/public_timeline/public_timeline.vue b/src/components/public_timeline/public_timeline.vue
new file mode 100644
index 000000000..5720068df
--- /dev/null
+++ b/src/components/public_timeline/public_timeline.vue
@@ -0,0 +1,9 @@
+<template>
+  <Timeline
+    :title="$t('nav.public_tl')"
+    :timeline="timeline"
+    :timeline-name="'public'"
+  />
+</template>
+
+<script src="./public_timeline.js"></script>
diff --git a/src/components/quick_filter_settings/quick_filter_settings.js b/src/components/quick_filter_settings/quick_filter_settings.js
index 089cb1d26..6c27f7e0a 100644
--- a/src/components/quick_filter_settings/quick_filter_settings.js
+++ b/src/components/quick_filter_settings/quick_filter_settings.js
@@ -5,9 +5,7 @@ import Popover from 'src/components/popover/popover.vue'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useLocalConfigStore } from 'src/stores/local_config.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faFilter, faFont, faWrench } from '@fortawesome/free-solid-svg-icons'
@@ -28,7 +26,7 @@ const QuickFilterSettings = {
         path: 'replyVisibility',
         value: visibility,
       })
-      useStatusesStore().queueFlushAll()
+      this.$store.dispatch('queueFlushAll')
     },
     openTab(tab) {
       useInterfaceStore().openSettingsModalTab(tab)
@@ -56,7 +54,7 @@ const QuickFilterSettings = {
       }
     },
     loggedIn() {
-      return !!useUsersStore().currentUser
+      return !!this.$store.state.users.currentUser
     },
     replyVisibilitySelf: {
       get() {
diff --git a/src/components/quick_view_settings/quick_view_settings.js b/src/components/quick_view_settings/quick_view_settings.js
index b0fc9610b..f809d241c 100644
--- a/src/components/quick_view_settings/quick_view_settings.js
+++ b/src/components/quick_view_settings/quick_view_settings.js
@@ -6,7 +6,6 @@ import QuickFilterSettings from 'src/components/quick_filter_settings/quick_filt
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -37,7 +36,7 @@ const QuickViewSettings = {
       mobileLayout: (state) => state.layoutType === 'mobile',
     }),
     loggedIn() {
-      return !!useUsersStore().currentUser
+      return !!this.$store.state.users.currentUser
     },
     conversationDisplay: {
       get() {
diff --git a/src/components/quote/quote.js b/src/components/quote/quote.js
index 1f230b488..439d3440a 100644
--- a/src/components/quote/quote.js
+++ b/src/components/quote/quote.js
@@ -1,5 +1,3 @@
-import { useStatusesStore } from 'src/stores/statuses.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
 
@@ -47,7 +45,7 @@ export default {
   computed: {
     quotedStatus() {
       return this.statusId
-        ? useStatusesStore().allStatuses.get(this.statusId)
+        ? this.$store.state.statuses.allStatusesObject[this.statusId]
         : undefined
     },
     shouldDisplayQuote() {
@@ -81,8 +79,8 @@ export default {
       this.fetchAttempted = true
       this.fetching = true
       this.$emit('loading', true)
-      useStatusesStore()
-        .fetchStatus(this.statusId)
+      this.$store
+        .dispatch('fetchStatus', this.statusId)
         .then(() => {
           this.displayQuote = true
         })
diff --git a/src/components/quote/quote_form.js b/src/components/quote/quote_form.js
index 61abf743b..b350fb0e3 100644
--- a/src/components/quote/quote_form.js
+++ b/src/components/quote/quote_form.js
@@ -93,8 +93,8 @@ export default {
         this.$emit('update:id', notice[3])
       } else if (value) {
         this.loading = true
-        this.useSearchStore()
-          .search({
+        this.$store
+          .dispatch('search', {
             q: value,
             resolve: true,
             offset: 0,
diff --git a/src/components/quotes_timeline/quotes_timeline.js b/src/components/quotes_timeline/quotes_timeline.js
new file mode 100644
index 000000000..f92f109be
--- /dev/null
+++ b/src/components/quotes_timeline/quotes_timeline.js
@@ -0,0 +1,36 @@
+import Timeline from 'src/components/timeline/timeline.vue'
+
+const QuotesTimeline = {
+  created() {
+    this.$store.commit('clearTimeline', { timeline: 'quotes' })
+    this.$store.dispatch('startFetchingTimeline', {
+      timeline: 'quotes',
+      statusId: this.statusId,
+    })
+  },
+  components: {
+    Timeline,
+  },
+  computed: {
+    statusId() {
+      return this.$route.params.id
+    },
+    timeline() {
+      return this.$store.state.statuses.timelines.quotes
+    },
+  },
+  watch: {
+    statusId() {
+      this.$store.commit('clearTimeline', { timeline: 'quotes' })
+      this.$store.dispatch('startFetchingTimeline', {
+        timeline: 'quotes',
+        statusId: this.statusId,
+      })
+    },
+  },
+  unmounted() {
+    this.$store.dispatch('stopFetchingTimeline', 'quotes')
+  },
+}
+
+export default QuotesTimeline
diff --git a/src/components/quotes_timeline/quotes_timeline.vue b/src/components/quotes_timeline/quotes_timeline.vue
new file mode 100644
index 000000000..835abd12e
--- /dev/null
+++ b/src/components/quotes_timeline/quotes_timeline.vue
@@ -0,0 +1,10 @@
+<template>
+  <Timeline
+    :title="$t('nav.quotes')"
+    :timeline="timeline"
+    :timeline-name="'quotes'"
+    :status-id="statusId"
+  />
+</template>
+
+<script src='./quotes_timeline.js'></script>
diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index 1dbc99859..ea07c662b 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -1,16 +1,14 @@
 import useVuelidate from '@vuelidate/core'
 import { required, requiredIf, sameAs } from '@vuelidate/validators'
-import { mapActions, mapState } from 'pinia'
+import { mapState as mapPiniaState } from 'pinia'
+import { mapActions, mapState } from 'vuex'
 
 import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
 import TermsOfServicePanel from 'src/components/terms_of_service_panel/terms_of_service_panel.vue'
 import localeService from '../../services/locale/locale.service.js'
 
 import { useInstanceStore } from 'src/stores/instance.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
-import { useUsersStore } from 'src/stores/users.js'
 
-import { getCaptcha, register } from 'src/api/public.js'
 import { DAY } from 'src/services/date_utils/date_utils.js'
 
 const registration = {
@@ -28,9 +26,6 @@ const registration = {
       reason: '',
       language: [''],
     },
-    signUpPending: false,
-    signUpErrors: [],
-    signUpNotice: {},
     captcha: {},
   }),
   components: {
@@ -63,7 +58,7 @@ const registration = {
     }
   },
   created() {
-    if ((!this.registrationOpen && !this.token) || this.loggedIn) {
+    if ((!this.registrationOpen && !this.token) || this.signedIn) {
       this.$router.push({ name: 'root' })
     }
 
@@ -105,10 +100,7 @@ const registration = {
         )
       )
     },
-    hasSignUpNotice(state) {
-      return this.signUpNotice.message
-    },
-    ...mapState(useInstanceStore, {
+    ...mapPiniaState(useInstanceStore, {
       registrationOpen: (store) => store.registrationOpen,
       embeddedToS: (store) => store.embeddedToS,
       termsOfService: (store) => store.tos,
@@ -117,49 +109,16 @@ const registration = {
       birthdayRequired: (store) => store.birthdayRequired,
       birthdayMinAge: (store) => store.birthdayMinAge,
     }),
-    ...mapState(useUsersStore, ['loggedIn']),
+    ...mapState({
+      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,
+    }),
   },
   methods: {
-    ...mapActions(useUsersStore, ['loginUser']),
-    getCaptcha(store) {
-      return getCaptcha({
-        credentials: useOAuthStore().token,
-      }).then(({ data }) => data)
-    },
-    async signUp(userInfo) {
-      const oauthStore = useOAuthStore()
-
-      this.signUpPending = true
-      this.signUpErrors = []
-      this.signUpNotice = {}
-
-      try {
-        const token = await oauthStore.ensureAppToken()
-        const { data } = await register({
-          credentials: token,
-          params: { ...userInfo },
-        })
-
-        if (data.access_token) {
-          this.signUpPending = false
-          oauthStore.setToken(data.access_token)
-          await this.loginUser(data.access_token)
-          return 'ok'
-        } else {
-          // Request succeeded, but user cannot login yet.
-          this.signUpErrors = []
-          this.signUpNotice = data
-          return 'request_sent'
-        }
-      } catch (e) {
-        const errors = e.message
-        this.signUpErrors = errors
-        this.signUpNotice = {}
-        throw e
-      } finally {
-        this.signUpPending = false
-      }
-    },
+    ...mapActions(['signUp', 'getCaptcha']),
     async submit() {
       this.user.nickname = this.user.username
       this.user.token = this.token
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index 0abcfe656..b969a416e 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -28,7 +28,7 @@
                 <input
                   id="sign-up-username"
                   v-model.trim="v$.user.username.$model"
-                  :disabled="signUpPending"
+                  :disabled="isPending"
                   class="input form-control"
                   :aria-required="true"
                   :placeholder="$t('registration.username_placeholder')"
@@ -56,7 +56,7 @@
                 <input
                   id="sign-up-fullname"
                   v-model.trim="v$.user.fullname.$model"
-                  :disabled="signUpPending"
+                  :disabled="isPending"
                   class="input form-control"
                   :aria-required="true"
                   :placeholder="$t('registration.fullname_placeholder')"
@@ -84,7 +84,7 @@
                 <input
                   id="email"
                   v-model="v$.user.email.$model"
-                  :disabled="signUpPending"
+                  :disabled="isPending"
                   class="input form-control"
                   type="email"
                   :aria-required="accountActivationRequired"
@@ -109,7 +109,7 @@
                 <textarea
                   id="bio"
                   v-model="user.bio"
-                  :disabled="signUpPending"
+                  :disabled="isPending"
                   class="input form-control"
                   :placeholder="bioPlaceholder"
                 />
@@ -126,7 +126,7 @@
                 <input
                   id="sign-up-password"
                   v-model="user.password"
-                  :disabled="signUpPending"
+                  :disabled="isPending"
                   class="input form-control"
                   type="password"
                   :aria-required="true"
@@ -154,7 +154,7 @@
                 <input
                   id="sign-up-password-confirmation"
                   v-model="user.confirm"
-                  :disabled="signUpPending"
+                  :disabled="isPending"
                   class="input form-control"
                   type="password"
                   :aria-required="true"
@@ -187,7 +187,7 @@
                 <input
                   id="sign-up-birthday"
                   v-model="user.birthday"
-                  :disabled="signUpPending"
+                  :disabled="isPending"
                   class="input form-control"
                   type="date"
                   :max="birthdayRequired ? birthdayMinAttr : undefined"
@@ -232,7 +232,7 @@
                 <textarea
                   id="reason"
                   v-model="user.reason"
-                  :disabled="signUpPending"
+                  :disabled="isPending"
                   class="input form-control"
                   :placeholder="reasonPlaceholder"
                 />
@@ -259,7 +259,7 @@
                   <input
                     id="captcha-answer"
                     v-model="captcha.solution"
-                    :disabled="signUpPending"
+                    :disabled="isPending"
                     class="input form-control"
                     type="text"
                     autocomplete="off"
@@ -285,7 +285,7 @@
               </div>
               <div class="form-group">
                 <button
-                  :disabled="signUpPending"
+                  :disabled="isPending"
                   type="submit"
                   class="btn button-default"
                 >
@@ -308,7 +308,7 @@
           >
             <div class="alert error">
               <span
-                v-for="error in signUpErrors"
+                v-for="error in serverValidationErrors"
                 :key="error"
               >{{ error }}</span>
             </div>
diff --git a/src/components/remote_user_resolver/remote_user_resolver.js b/src/components/remote_user_resolver/remote_user_resolver.js
index 109b92761..75304fe52 100644
--- a/src/components/remote_user_resolver/remote_user_resolver.js
+++ b/src/components/remote_user_resolver/remote_user_resolver.js
@@ -1,5 +1,4 @@
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { fetchUser } from 'src/api/public.js'
 
@@ -17,14 +16,17 @@ const RemoteUserResolver = {
         id,
         credentials: useOAuthStore().token,
       })
-        .then((result) => {
-          const { data: externalUser } = result
-          useUsersStore().addNewUsers(result)
-          const id = externalUser.id
-          this.$router.replace({
-            name: 'external-user-profile',
-            params: { id },
-          })
+        .then(({ data: externalUser }) => {
+          if (externalUser.error) {
+            this.error = true
+          } else {
+            this.$store.commit('addNewUsers', [externalUser])
+            const id = externalUser.id
+            this.$router.replace({
+              name: 'external-user-profile',
+              params: { id },
+            })
+          }
         })
         .catch(() => {
           this.error = true
diff --git a/src/components/remove_follower_button/remove_follower_button.js b/src/components/remove_follower_button/remove_follower_button.js
index a0e7a0f13..cbe92dce1 100644
--- a/src/components/remove_follower_button/remove_follower_button.js
+++ b/src/components/remove_follower_button/remove_follower_button.js
@@ -1,7 +1,6 @@
 import { defineAsyncComponent } from 'vue'
 
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 export default {
   props: ['user', 'relationship'],
@@ -44,9 +43,9 @@ export default {
     },
     doRemoveUserFromFollowers() {
       this.inProgress = true
-      useUsersStore()
-        .removeUserFromFollowers(this.relationship.id)
-        .finally(() => {
+      this.$store
+        .dispatch('removeUserFromFollowers', this.relationship.id)
+        .then(() => {
           this.inProgress = false
         })
       this.hideConfirmRemoveUserFromFollowers()
diff --git a/src/components/search/search.js b/src/components/search/search.js
index 43a9b4f73..1a5f8b51d 100644
--- a/src/components/search/search.js
+++ b/src/components/search/search.js
@@ -4,10 +4,6 @@ import Conversation from 'src/components/conversation/conversation.vue'
 import FollowCard from 'src/components/follow_card/follow_card.vue'
 import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
 
-import { useSearchStore } from 'src/stores/search.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
-import { useUsersStore } from 'src/stores/users.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircleNotch, faSearch } from '@fortawesome/free-solid-svg-icons'
 
@@ -38,14 +34,14 @@ const Search = {
   },
   computed: {
     users() {
-      return this.userIds.map((userId) => useUsersStore().findUser(userId))
+      return this.userIds.map((userId) => this.$store.getters.findUser(userId))
     },
     visibleStatuses() {
-      const allStatuses = useStatusesStore().allStatuses
+      const allStatusesObject = this.$store.state.statuses.allStatusesObject
 
       return this.statuses.filter(
         (status) =>
-          allStatuses.has(status.id) && !allStatuses.get(status.id).deleted,
+          allStatusesObject[status.id] && !allStatusesObject[status.id].deleted,
       )
     },
   },
@@ -80,8 +76,8 @@ const Search = {
         this.lastStatusFetchCount = 0
       }
 
-      useSearchStore()
-        .search({
+      this.$store
+        .dispatch('search', {
           q: query,
           resolve: true,
           offset: this.statusesOffset,
diff --git a/src/components/settings_modal/admin_tabs/admin_user_card.js b/src/components/settings_modal/admin_tabs/admin_user_card.js
index ae20d4cfe..ba0f0e9f7 100644
--- a/src/components/settings_modal/admin_tabs/admin_user_card.js
+++ b/src/components/settings_modal/admin_tabs/admin_user_card.js
@@ -1,8 +1,6 @@
 import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue'
 import ModerationTools from 'src/components/moderation_tools/moderation_tools.vue'
 
-import { useUsersStore } from 'src/stores/users.js'
-
 const AdminUserCard = {
   props: {
     userId: {
@@ -15,7 +13,7 @@ const AdminUserCard = {
   },
   computed: {
     user() {
-      return useUsersStore().findUser(this.userId)
+      return this.$store.getters.findUser(this.userId)
     },
     isAdmin() {
       return this.user.rights.admin
diff --git a/src/components/settings_modal/helpers/shared_computed_object.js b/src/components/settings_modal/helpers/shared_computed_object.js
index 123e77879..4a3b9d4f8 100644
--- a/src/components/settings_modal/helpers/shared_computed_object.js
+++ b/src/components/settings_modal/helpers/shared_computed_object.js
@@ -1,20 +1,20 @@
-import { mapState } from 'pinia'
+import { mapState as mapPiniaState } from 'pinia'
+import { mapState } from 'vuex'
 
 import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 const SharedComputedObject = () => ({
-  ...mapState(useMergedConfigStore, ['mergedConfig']),
-  ...mapState(useMergedConfigStore, {
+  ...mapPiniaState(useMergedConfigStore, ['mergedConfig']),
+  ...mapPiniaState(useMergedConfigStore, {
     expertLevel: (store) => store.mergedConfig.expertLevel,
   }),
-  ...mapState(useAdminSettingsStore, {
+  ...mapPiniaState(useAdminSettingsStore, {
     adminConfig: (store) => store.config,
     adminDraft: (store) => store.draft,
   }),
-  ...mapState(useUsersStore, {
-    user: (store) => store.currentUser,
+  ...mapState({
+    user: (state) => state.users.currentUser,
   }),
 })
 
diff --git a/src/components/settings_modal/settings_modal_admin_content.js b/src/components/settings_modal/settings_modal_admin_content.js
index f6b67c7c6..22ba0e16c 100644
--- a/src/components/settings_modal/settings_modal_admin_content.js
+++ b/src/components/settings_modal/settings_modal_admin_content.js
@@ -20,7 +20,6 @@ import VerticalTabSwitcher from './helpers/vertical_tab_switcher.jsx'
 
 import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -98,10 +97,10 @@ const SettingsModalAdminContent = {
   },
   computed: {
     user() {
-      return useUsersStore().currentUser
+      return this.$store.state.users.currentUser
     },
     isLoggedIn() {
-      return !!useUsersStore().currentUser
+      return !!this.$store.state.users.currentUser
     },
     open() {
       return useInterfaceStore().settingsModalState !== 'hidden'
diff --git a/src/components/settings_modal/settings_modal_user_content.js b/src/components/settings_modal/settings_modal_user_content.js
index 0b6f2a385..6e5d2addc 100644
--- a/src/components/settings_modal/settings_modal_user_content.js
+++ b/src/components/settings_modal/settings_modal_user_content.js
@@ -17,7 +17,6 @@ import StyleTab from './tabs/style_tab/style_tab.vue'
 
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -76,7 +75,7 @@ const SettingsModalContent = {
   },
   computed: {
     isLoggedIn() {
-      return !!useUsersStore().currentUser
+      return !!this.$store.state.users.currentUser
     },
     open() {
       return useInterfaceStore().settingsModalState !== 'hidden'
diff --git a/src/components/settings_modal/tabs/appearance_tab.js b/src/components/settings_modal/tabs/appearance_tab.js
index 68c498624..647c90c47 100644
--- a/src/components/settings_modal/tabs/appearance_tab.js
+++ b/src/components/settings_modal/tabs/appearance_tab.js
@@ -13,7 +13,6 @@ 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 { useOAuthStore } from 'src/stores/oauth.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { updateProfileImages } from 'src/api/user.js'
 import { newImporter } from 'src/services/export_import/export_import.js'
@@ -221,7 +220,7 @@ const AppearanceTab = {
   },
   computed: {
     isDefaultBackground() {
-      return !useUsersStore().currentUser.background_image
+      return !this.$store.state.users.currentUser.background_image
     },
     switchInProgress() {
       return useInterfaceStore().themeChangeInProgress
@@ -283,7 +282,7 @@ const AppearanceTab = {
     instanceWallpaperUsed() {
       return (
         useInstanceStore().instanceIdentity.background &&
-        !useUsersStore().currentUser.background_image
+        !this.$store.state.users.currentUser.background_image
       )
     },
     customThemeVersion() {
@@ -491,8 +490,9 @@ const AppearanceTab = {
         background,
         credentials: useOAuthStore().token,
       })
-        .then((result) => {
-          useUsersStore().addNewUsers(result)
+        .then(({ data }) => {
+          this.$store.commit('addNewUsers', [data])
+          this.$store.commit('setCurrentUser', data)
           this.backgroundPreview = null
           this.backgroundError = null
         })
diff --git a/src/components/settings_modal/tabs/clutter_tab.js b/src/components/settings_modal/tabs/clutter_tab.js
index a3f6e77a5..87269eb99 100644
--- a/src/components/settings_modal/tabs/clutter_tab.js
+++ b/src/components/settings_modal/tabs/clutter_tab.js
@@ -11,7 +11,6 @@ import UnitSetting from '../helpers/unit_setting.vue'
 
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
 
 const ClutterTab = {
   components: {
@@ -36,7 +35,7 @@ const ClutterTab = {
   // Updating nested properties
   watch: {
     replyVisibility() {
-      useStatusesStore().queueFlushAll()
+      this.$store.dispatch('queueFlushAll')
     },
   },
 }
diff --git a/src/components/settings_modal/tabs/composing_tab.js b/src/components/settings_modal/tabs/composing_tab.js
index 3e734e6e9..1586c87bf 100644
--- a/src/components/settings_modal/tabs/composing_tab.js
+++ b/src/components/settings_modal/tabs/composing_tab.js
@@ -13,11 +13,9 @@ import UnitSetting from '../helpers/unit_setting.vue'
 
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { updateProfile } from 'src/api/user.js'
 import localeService from 'src/services/locale/locale.service.js'
@@ -94,7 +92,7 @@ const ComposingTab = {
           HTMLMediaElement.prototype,
           'audioTracks',
         ),
-      emailLanguage: useUsersStore().currentUser.language || [''],
+      emailLanguage: this.$store.state.users.currentUser.language || [''],
     }
   },
   components: {
@@ -140,10 +138,10 @@ const ComposingTab = {
     clearCache(key) {
       clearCache(key)
         .then(() => {
-          useInterfaceStore().settingsSaved({ success: true })
+          this.$store.dispatch('settingsSaved', { success: true })
         })
         .catch((error) => {
-          useInterfaceStore().settingsSaved({ error })
+          this.$store.dispatch('settingsSaved', { error })
         })
     },
     tooSmall() {
@@ -171,8 +169,9 @@ const ComposingTab = {
       updateProfile({
         params,
         credentials: useOAuthStore().token,
-      }).then((result) => {
-        useUsersStore().addNewUsers(result)
+      }).then(({ data: user }) => {
+        this.$store.commit('addNewUsers', [user])
+        this.$store.commit('setCurrentUser', user)
       })
     },
     updateFont(key, value) {
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 243ff5888..7fc6adefd 100644
--- a/src/components/settings_modal/tabs/data_import_export_tab.js
+++ b/src/components/settings_modal/tabs/data_import_export_tab.js
@@ -1,4 +1,4 @@
-import { mapState } from 'pinia'
+import { mapState } from 'vuex'
 
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import Exporter from 'src/components/exporter/exporter.vue'
@@ -6,7 +6,6 @@ import Importer from 'src/components/importer/importer.vue'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useOAuthTokensStore } from 'src/stores/oauth_tokens.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import {
   addBackup,
@@ -40,7 +39,9 @@ const DataImportExportTab = {
     Checkbox,
   },
   computed: {
-    ...mapState(useUsersStore, ['currentUser']),
+    ...mapState({
+      user: (state) => state.users.currentUser,
+    }),
   },
   methods: {
     getFollowsContent() {
diff --git a/src/components/settings_modal/tabs/developer_tab.js b/src/components/settings_modal/tabs/developer_tab.js
index 9697233d5..9a6258638 100644
--- a/src/components/settings_modal/tabs/developer_tab.js
+++ b/src/components/settings_modal/tabs/developer_tab.js
@@ -4,7 +4,6 @@ import BooleanSetting from '../helpers/boolean_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 
 import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
 
 import { cacheKey, clearCache, emojiCacheKey } from 'src/services/sw/sw.js'
 
@@ -36,10 +35,10 @@ const VersionTab = {
     clearCache(key) {
       clearCache(key)
         .then(() => {
-          useInterfaceStore().settingsSaved({ success: true })
+          this.$store.dispatch('settingsSaved', { success: true })
         })
         .catch((error) => {
-          useInterfaceStore().settingsSaved({ error })
+          this.$store.dispatch('settingsSaved', { error })
         })
     },
   },
diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js
index 9d49eca81..3a9cad6d2 100644
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -14,7 +14,6 @@ import UnitSetting from '../helpers/unit_setting.vue'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useInterfaceStore } from 'src/stores/interface'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 
 import {
@@ -266,7 +265,7 @@ const FilteringTab = {
   // Updating nested properties
   watch: {
     replyVisibility() {
-      useStatusesStore().queueFlushAll()
+      this.$store.dispatch('queueFlushAll')
     },
     muteFiltersObject() {
       this.muteFiltersDraftObject = cloneDeep(
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index c090557cf..3ab3846d2 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -12,9 +12,7 @@ import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.j
 import { useLocalConfigStore } from 'src/stores/local_config.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useStreamingStore } from 'src/stores/streaming.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { updateProfile } from 'src/api/user.js'
 import localeService from 'src/services/locale/locale.service.js'
@@ -27,7 +25,7 @@ const GeneralTab = {
         value: mode,
         label: this.$t(`settings.absolute_time_format_12h_${mode}`),
       })),
-      emailLanguage: useUsersStore().currentUser.language || [''],
+      emailLanguage: this.$store.state.users.currentUser.language || [''],
     }
   },
   components: {
@@ -64,20 +62,14 @@ const GeneralTab = {
       updateProfile({
         params,
         credentials: useOAuthStore().token,
-      }).then((result) => {
-        useUsersStore().addNewUsers(result)
+      }).then(({ data: user }) => {
+        this.$store.commit('addNewUsers', [user])
+        this.$store.commit('setCurrentUser', user)
       })
     },
     updateFont(path, value) {
       useLocalConfigStore().set({ path, value })
     },
-    toggleStreaming(value) {
-      if (value) {
-        useStreamingStore().initSocket()
-      } else {
-        useStreamingStore().stopSocket()
-      }
-    },
   },
 }
 
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 208777fda..9ccde0b2c 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -129,7 +129,6 @@
             path="useStreamingApi"
             :local="true"
             expert="1"
-            @update:model-value="toggleStreaming"
           >
             {{ $t('settings.useStreamingApi') }}
           </BooleanSetting>
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 824ec6a2e..61d3e42f7 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
@@ -12,8 +12,6 @@ import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useOAuthTokensStore } from 'src/stores/oauth_tokens.js'
-import { useSearchStore } from 'src/stores/search.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { importBlocks, importFollows } from 'src/api/user.js'
 
@@ -42,21 +40,21 @@ const MutesAndBlocks = {
       return useInstanceStore().knownDomains
     },
     user() {
-      return useUsersStore().currentUser
+      return this.$store.state.users.currentUser
     },
     blocks() {
-      return get(this.user, 'blockIds', [])
+      return get(this.$store.state.users.currentUser, 'blockIds', [])
     },
     mutes() {
-      return get(this.user, 'muteIds', [])
+      return get(this.$store.state.users.currentUser, 'muteIds', [])
     },
     domains() {
-      return get(this.user, 'domainMutes', [])
+      return get(this.$store.state.users.currentUser, 'domainMutes', [])
     },
   },
   methods: {
     fetchItems(group) {
-      return () => useUsersStore()['fetch' + group](this.userId)
+      return () => this.$store.dispatch('fetch' + group, this.userId)
     },
     importFollows(file) {
       return importFollows({
@@ -96,32 +94,32 @@ const MutesAndBlocks = {
     },
     filterUnblockedUsers(userIds) {
       return reject(userIds, (userId) => {
-        const relationship = useUsersStore().relationship(this.userId)
+        const relationship = this.$store.getters.relationship(this.userId)
         return relationship.blocking || userId === this.user.id
       })
     },
     filterUnMutedUsers(userIds) {
       return reject(userIds, (userId) => {
-        const relationship = useUsersStore().relationship(this.userId)
+        const relationship = this.$store.getters.relationship(this.userId)
         return relationship.muting || userId === this.user.id
       })
     },
     queryUserIds(query) {
-      return useSearchStore()
-        .searchUsers({ query })
+      return this.$store
+        .dispatch('searchUsers', { query })
         .then((users) => map(users, 'id'))
     },
     blockUsers(ids) {
-      return useUsersStore().blockUsers(ids)
+      return this.$store.dispatch('blockUsers', ids)
     },
     unblockUsers(ids) {
-      return useUsersStore().unblockUsers(ids)
+      return this.$store.dispatch('unblockUsers', ids)
     },
     muteUsers(ids) {
-      return useUsersStore().muteUsers(ids)
+      return this.$store.dispatch('muteUsers', ids)
     },
     unmuteUsers(ids) {
-      return useUsersStore().unmuteUsers(ids)
+      return this.$store.dispatch('unmuteUsers', ids)
     },
     filterUnMutedDomains(urls) {
       return urls.filter((url) => !this.user.domainMutes.includes(url))
@@ -134,7 +132,7 @@ const MutesAndBlocks = {
       })
     },
     unmuteDomains(domains) {
-      return useUsersStore().unmuteDomains(domains)
+      return this.$store.dispatch('unmuteDomains', domains)
     },
   },
 }
diff --git a/src/components/settings_modal/tabs/notifications_tab.js b/src/components/settings_modal/tabs/notifications_tab.js
index 468ede0ce..a666d42e3 100644
--- a/src/components/settings_modal/tabs/notifications_tab.js
+++ b/src/components/settings_modal/tabs/notifications_tab.js
@@ -2,7 +2,6 @@ import BooleanSetting from '../helpers/boolean_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { updateNotificationSettings } from 'src/api/user.js'
 
@@ -10,7 +9,8 @@ const NotificationsTab = {
   data() {
     return {
       activeTab: 'profile',
-      notificationSettings: useUsersStore().currentUser.notification_settings,
+      notificationSettings:
+        this.$store.state.users.currentUser.notification_settings,
       newDomainToMute: '',
     }
   },
@@ -19,7 +19,7 @@ const NotificationsTab = {
   },
   computed: {
     user() {
-      return useUsersStore().currentUser
+      return this.$store.state.users.currentUser
     },
     canReceiveReports() {
       if (!this.user) {
diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index 07a77f308..844e223c9 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -4,7 +4,6 @@ import BooleanSetting from '../helpers/boolean_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { updateProfile } from 'src/api/user.js'
 
@@ -21,7 +20,7 @@ const ProfileTab = {
   data() {
     return {
       // Whether user is locked or not
-      locked: useUsersStore().currentUser.locked,
+      locked: this.$store.state.users.currentUser.locked,
     }
   },
   components: {
@@ -31,7 +30,7 @@ const ProfileTab = {
   },
   computed: {
     user() {
-      return useUsersStore().currentUser
+      return this.$store.state.users.currentUser
     },
     ...SharedComputedObject(),
   },
@@ -44,8 +43,9 @@ const ProfileTab = {
         params,
         credentials: useOAuthStore().token,
       })
-        .then((result) => {
-          useUsersStore().addNewUsers(result)
+        .then(({ data: user }) => {
+          this.$store.commit('addNewUsers', [user])
+          this.$store.commit('setCurrentUser', user)
         })
         .catch((error) => {
           this.displayUploadError(error)
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 b0b72a4e9..a2571bd54 100644
--- a/src/components/settings_modal/tabs/security_tab/security_tab.js
+++ b/src/components/settings_modal/tabs/security_tab/security_tab.js
@@ -5,7 +5,6 @@ import Mfa from './mfa.vue'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useOAuthTokensStore } from 'src/stores/oauth_tokens'
-import { useUsersStore } from 'src/stores/users.js'
 
 import {
   addAlias,
@@ -53,7 +52,7 @@ const SecurityTab = {
   },
   computed: {
     user() {
-      return useUsersStore().currentUser
+      return this.$store.state.users.currentUser
     },
     pleromaExtensionsAvailable() {
       return useInstanceCapabilitiesStore().pleromaExtensionsAvailable
@@ -80,7 +79,7 @@ const SecurityTab = {
         password: this.deleteAccountConfirmPasswordInput,
       }).then(({ data: res }) => {
         if (res.status === 'success') {
-          useUsersStore().logout()
+          this.$store.dispatch('logout')
           this.$router.push({ name: 'root' })
         } else {
           this.deleteAccountError = res.error
@@ -172,7 +171,7 @@ const SecurityTab = {
         })
     },
     logout() {
-      useUsersStore().logout()
+      this.$store.dispatch('logout')
       this.$router.replace('/')
     },
     revokeToken(id) {
diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
index 2d2886d58..a1dca8161 100644
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@@ -4,7 +4,7 @@ import { mapGetters } from 'vuex'
 import { USERNAME_ROUTES } from 'src/components/navigation/navigation.js'
 import UserCard from 'src/components/user_card/user_card.vue'
 import GestureService from '../../services/gesture_service/gesture_service'
-import { unseenNotifications } from '../../services/notification_utils/notification_utils'
+import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
 
 import { useAnnouncementsStore } from 'src/stores/announcements'
 import { useChatsStore } from 'src/stores/chats.js'
@@ -13,7 +13,6 @@ import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.j
 import { useInterfaceStore } from 'src/stores/interface'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useShoutStore } from 'src/stores/shout'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -71,13 +70,14 @@ const SideDrawer = {
   },
   computed: {
     currentUser() {
-      return useUsersStore().currentUser
+      return this.$store.state.users.currentUser
     },
     shout() {
       return useShoutStore().joined
     },
     unseenNotifications() {
-      return unseenNotifications(
+      return unseenNotificationsFromStore(
+        this.$store,
         useMergedConfigStore().mergedConfig.notificationVisibility,
         useMergedConfigStore().mergedConfig.ignoreInactionableSeen,
       )
diff --git a/src/components/staff_panel/staff_panel.js b/src/components/staff_panel/staff_panel.js
index 7ceda1e41..b736bb9f9 100644
--- a/src/components/staff_panel/staff_panel.js
+++ b/src/components/staff_panel/staff_panel.js
@@ -1,15 +1,16 @@
 import { groupBy, map } from 'lodash'
-import { mapState } from 'pinia'
+import { mapGetters, mapState } from 'vuex'
 
 import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue'
 
 import { useInstanceStore } from 'src/stores/instance.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 const StaffPanel = {
   created() {
     const nicknames = useInstanceStore().staffAccounts
-    nicknames.forEach((name) => useUsersStore().fetchUserIfMissing({ name }))
+    nicknames.forEach((nickname) =>
+      this.$store.dispatch('fetchUserIfMissing', nickname),
+    )
   },
   components: {
     BasicUserCard,
@@ -26,8 +27,10 @@ const StaffPanel = {
         { role: 'moderator', users: groupedStaffAccounts.moderator },
       ].filter((group) => group.users)
     },
-    ...mapState(useUsersStore, ['findUserByName']),
-    ...mapState(useInstanceStore, ['staffAccounts']),
+    ...mapGetters(['findUserByName']),
+    ...mapState({
+      staffAccounts: (state) => useInstanceStore().staffAccounts,
+    }),
   },
 }
 
diff --git a/src/components/status/status.js b/src/components/status/status.js
index d807b64ff..a33d29525 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -23,11 +23,8 @@ import {
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useScrobblesStore } from 'src/stores/scrobbles.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import { useUserHighlightStore } from 'src/stores/user_highlight.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
@@ -95,7 +92,6 @@ const Status = {
     StatusActionButtons,
   },
   props: {
-    statusId: String,
     statusoid: Object,
     replies: Array,
 
@@ -129,23 +125,10 @@ const Status = {
       headTailLinks: null,
     }
   },
-  created() {
-    useScrobblesStore().getLatestScrobble(this.status.user.id)
-  },
   computed: {
-    status() {
-      return this.statusoid ?? useStatusesStore().allStatuses.get(this.statusId)
-    },
-    repeater() {
-      return useUsersStore().findUser(this.status.user.id)
-    },
-    user() {
-      return useUsersStore().findUser(this.mainStatus.user.id)
-    },
     showReasonMutedThread() {
       return (
-        (this.mainStatus.thread_muted ||
-          this.smainSatus.reblog?.thread_muted) &&
+        (this.status.thread_muted || this.status.reblog?.thread_muted) &&
         !this.inConversation
       )
     },
@@ -159,57 +142,73 @@ const Status = {
       return this.mergedConfig.scaleMfm
     },
     repeaterClass() {
-      return highlightClass(this.repeater)
+      const user = this.statusoid.user
+      return highlightClass(user)
     },
     userClass() {
-      return highlightClass(this.user)
+      const user = this.retweet
+        ? this.statusoid.retweeted_status.user
+        : this.statusoid.user
+      return highlightClass(user)
     },
     deleted() {
-      return this.status.deleted
+      return this.statusoid.deleted
     },
     repeaterStyle() {
-      return highlightStyle(
-        useUserHighlightStore().get(this.repeater.screen_name),
-      )
+      const user = this.statusoid.user
+      return highlightStyle(useUserHighlightStore().get(user.screen_name))
     },
     userStyle() {
       if (this.noHeading) return
-      return highlightStyle(useUserHighlightStore().get(this.user.screen_name))
+      const user = this.retweet
+        ? this.statusoid.retweeted_status.user
+        : this.statusoid.user
+      return highlightStyle(useUserHighlightStore().get(user.screen_name))
     },
     userProfileLink() {
-      return this.generateUserProfileLink(this.user.id, this.user.screen_name)
+      return this.generateUserProfileLink(
+        this.status.user.id,
+        this.status.user.screen_name,
+      )
     },
     replyProfileLink() {
       if (this.isReply) {
-        const user = useUsersStore().findUser(
-          this.mainStatus.in_reply_to_user_id,
+        const user = this.$store.getters.findUser(
+          this.status.in_reply_to_user_id,
         )
         // FIXME Why user not found sometimes???
         return user ? user.statusnet_profile_url : 'NOT_FOUND'
       }
     },
     retweet() {
-      return !!this.status.retweeted_status
+      return !!this.statusoid.retweeted_status
     },
-    repeaterName() {
-      return this.status.user.name || this.status.user.screen_name_ui
+    retweeterUser() {
+      return this.statusoid.user
     },
-    repeaterHtml() {
-      return this.status.user.name
+    retweeter() {
+      return this.statusoid.user.name || this.statusoid.user.screen_name_ui
     },
-    repeaterProfileLink() {
+    retweeterHtml() {
+      return this.statusoid.user.name
+    },
+    retweeterProfileLink() {
       return this.generateUserProfileLink(
-        this.repeater.id,
-        this.repeater.screen_name,
+        this.statusoid.user.id,
+        this.statusoid.user.screen_name,
       )
     },
-    mainStatus() {
+    status() {
       if (this.retweet) {
-        return this.status.retweeted_status
+        return this.statusoid.retweeted_status
       } else {
-        return this.status
+        return this.statusoid
       }
     },
+    statusFromGlobalRepository() {
+      // NOTE: Consider to replace status with statusFromGlobalRepository
+      return this.$store.state.statuses.allStatusesObject[this.status.id]
+    },
     loggedIn() {
       return !!this.currentUser
     },
@@ -224,6 +223,9 @@ const Status = {
     botStatus() {
       return this.status.user.actor_type === 'Service'
     },
+    showActorTypeIndicator() {
+      return !this.hideBotIndication
+    },
     sensitiveStatus() {
       return this.status.nsfw
     },
@@ -232,14 +234,14 @@ const Status = {
       const writtenSet = new Set(
         this.headTailLinks.writtenMentions.map((_) => _.url),
       )
-      return this.mainStatus.attentions
+      return this.status.attentions
         .filter((attn) => {
           // no reply user
           return (
-            attn.id !== this.mainStatus.in_reply_to_user_id &&
+            attn.id !== this.status.in_reply_to_user_id &&
             // no self-replies
             attn.statusnet_profile_url !==
-              this.mainStatus.user.statusnet_profile_url &&
+              this.status.user.statusnet_profile_url &&
             // don't include if mentions is written
             !writtenSet.has(attn.statusnet_profile_url)
           )
@@ -256,7 +258,7 @@ const Status = {
     muteReasons() {
       return [
         this.userIsMuted ? 'user' : null,
-        this.mainStatus.thread_muted ? 'thread' : null,
+        this.status.thread_muted ? 'thread' : null,
         this.muteFilterHits.length > 0 ? 'filtered' : null,
         this.muteBotStatuses && this.botStatus ? 'bot' : null,
         this.muteSensitiveStatuses && this.sensitiveStatus ? 'nsfw' : null,
@@ -300,15 +302,16 @@ const Status = {
     },
     muted() {
       if (this.ignoreMute) return false
-      if (this.status.user.id === this.currentUser?.id) return false
+      if (this.statusoid.user.id === this.currentUser.id) return false
       return !this.unmuted && !this.shouldNotMute && this.muteReasons.length > 0
     },
     userIsMuted() {
-      if (this.status.user.id === this.currentUser?.id) return false
-      const { reblog } = this.status
-      const relationship = useUsersStore().relationship(this.status.user.id)
+      if (this.statusoid.user.id === this.currentUser.id) return false
+      const { status } = this
+      const { reblog } = status
+      const relationship = this.$store.getters.relationship(status.user.id)
       const relationshipReblog =
-        reblog && useUsersStore().relationship(reblog.user.id)
+        reblog && this.$store.getters.relationship(reblog.user.id)
       return (
         (status.muted && !status.thread_muted) ||
         // Reprööt of a muted post according to BE
@@ -322,15 +325,16 @@ const Status = {
     shouldNotMute() {
       if (this.ignoreMute) return true
       if (this.focused) return true
-      const { reblog } = this.mainStatus
+      const { status } = this
+      const { reblog } = status
       return (
         ((this.inProfile &&
           // Don't mute user's posts on user timeline (except reblogs)
-          ((!reblog && this.mainStatus.user.id === this.profileUserId) ||
+          ((!reblog && status.user.id === this.profileUserId) ||
             // Same as above but also allow self-reblogs
             reblog?.user.id === this.profileUserId)) ||
           // Don't mute statuses in muted conversation when said conversation is opened
-          (this.inConversation && this.mainStatus.thread_muted)) &&
+          (this.inConversation && status.thread_muted)) &&
         // No excuses if post has muted words
         !this.muteFilterHits.length > 0
       )
@@ -359,16 +363,15 @@ const Status = {
     },
     isReply() {
       return !!(
-        this.mainStatus.in_reply_to_status_id &&
-        this.mainStatus.in_reply_to_user_id
+        this.status.in_reply_to_status_id && this.status.in_reply_to_user_id
       )
     },
     replyToName() {
-      if (this.mainStatus.in_reply_to_screen_name) {
+      if (this.status.in_reply_to_screen_name) {
         return this.status.in_reply_to_screen_name
       } else {
-        const user = useUsersStore().findUser(
-          this.mainStatus.in_reply_to_user_id,
+        const user = this.$store.getters.findUser(
+          this.status.in_reply_to_user_id,
         )
         return user?.screen_name_ui
       }
@@ -376,8 +379,8 @@ const Status = {
     combinedFavsAndRepeatsUsers() {
       // Use the status from the global status repository since favs and repeats are saved in it
       const combinedUsers = [].concat(
-        this.mainStatus.favoritedBy,
-        this.mainStatus.rebloggedBy,
+        this.statusFromGlobalRepository.favoritedBy,
+        this.statusFromGlobalRepository.rebloggedBy,
       )
       return uniqBy(combinedUsers, 'id')
     },
@@ -395,7 +398,7 @@ const Status = {
         !this.hidePostStats &&
         this.focused &&
         (this.combinedFavsAndRepeatsUsers.length > 0 ||
-          this.mainStatus.quotes_count)
+          this.statusFromGlobalRepository.quotes_count)
       )
     },
     muteBotStatuses() {
@@ -408,7 +411,7 @@ const Status = {
       return this.mergedConfig.hideBotIndication
     },
     currentUser() {
-      return useUsersStore().currentUser
+      return this.$store.state.users.currentUser
     },
     mergedConfig() {
       return useMergedConfigStore().mergedConfig
@@ -426,7 +429,7 @@ const Status = {
       return this.$i18n.t('general.scope_in_timeline.' + this.status.visibility)
     },
     isEdited() {
-      return this.mainStatus.edited_at !== null
+      return this.status.edited_at !== null
     },
     editingAvailable() {
       return useInstanceCapabilitiesStore().editingAvailable
@@ -557,28 +560,28 @@ const Status = {
     focused: function (id) {
       this.scrollIfFocused(id)
     },
-    'mainStatus.repeat_num': function (num) {
+    'status.repeat_num': function (num) {
       // refetch repeats when repeat_num is changed in any way
       if (
         this.focused &&
-        this.mainStatus.rebloggedBy &&
-        this.mainStatus.rebloggedBy.length !== num
+        this.statusFromGlobalRepository.rebloggedBy &&
+        this.statusFromGlobalRepository.rebloggedBy.length !== num
       ) {
-        useStatusesStore().fetchRepeats(this.status.id)
+        this.$store.dispatch('fetchRepeats', this.status.id)
       }
     },
-    'mainStatus.fave_num': function (num) {
+    'status.fave_num': function (num) {
       // refetch favs when fave_num is changed in any way
       if (
         this.focused &&
-        this.mainStatus.favoritedBy &&
-        this.mainStatus.favoritedBy.length !== num
+        this.statusFromGlobalRepository.favoritedBy &&
+        this.statusFromGlobalRepository.favoritedBy.length !== num
       ) {
-        useStatusesStore().fetchFavs(this.status.id)
+        this.$store.dispatch('fetchFavs', this.status.id)
       }
     },
     isSuspendable: function (suspend) {
-      this.$emit('suspendableStateChange', { id: this.status.id, suspend })
+      this.$emit('suspendableStateChange', { id: this.statusoid.id, suspend })
     },
   },
 }
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index a42432f25..c1d340975 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -27,7 +27,7 @@
             icon="retweet"
           />
           <user-link
-            :user="repeater"
+            :user="status.user"
             :at="false"
           />
         </small>
@@ -53,31 +53,33 @@
         class="status-container repeat-info"
       >
         <UserAvatar
+          v-if="retweet"
           class="left-side repeater-avatar"
-          :user-id="repeater.id"
+          :show-actor-type-indicator="showActorTypeIndicator"
+          :user="statusoid.user"
         />
         <div class="right-side faint">
           <bdi
             class="status-username repeater-name"
-            :title="repeaterName"
+            :title="retweeter"
           >
             <router-link
-              v-if="repeaterHtml"
-              :to="repeaterProfileLink"
+              v-if="retweeterHtml"
+              :to="retweeterProfileLink"
             >
               <RichContent
-                :html="repeaterHtml"
-                :emoji="repeater.emoji"
+                :html="retweeterHtml"
+                :emoji="retweeterUser.emoji"
                 :allow-non-square-emoji="allowNonSquareEmoji"
                 :pause-mfm="pauseMfm"
                 :scale-mfm="scaleMfm"
-                :is-local="repeater.is_local"
+                :is-local="retweeterUser.is_local"
               />
             </router-link>
             <router-link
               v-else
-              :to="repeaterProfileLink"
-            >{{ repeaterName }}</router-link>
+              :to="retweeterProfileLink"
+            >{{ retweeter }}</router-link>
           </bdi>
           <div class="repeat-label">
             <FAIcon
@@ -102,24 +104,25 @@
           class="left-side"
         >
           <a
-            v-if="user.name"
+            v-if="status.user?.name"
             :href="$router.resolve(userProfileLink).href"
             @click.prevent
           >
             <UserPopover
-              :user-id="user.id"
+              :user-id="status.user.id"
               :overlay-centers="true"
             >
               <UserAvatar
                 class="post-avatar"
+                :show-actor-type-indicator="showActorTypeIndicator"
                 :compact="compact"
-                :user-id="user.id"
+                :user="status?.user"
               />
             </UserPopover>
           </a>
           <UserAvatar
             v-else
-            :user-id="user.id"
+            :user="status?.user"
             class="post-avatar"
             :compact="compact"
             :title="$t('status.unknown_user_info')"
@@ -132,38 +135,38 @@
           >
             <div class="heading-name-row">
               <div
-                v-if="user"
+                v-if="status.user"
                 class="heading-left"
               >
                 <h4
-                  v-if="user.name_html"
+                  v-if="status.user.name_html"
                   class="status-username"
-                  :title="user.name"
+                  :title="status.user.name"
                 >
                   <RichContent
-                    :html="user.name"
-                    :emoji="user.emoji"
+                    :html="status.user.name"
+                    :emoji="status.user.emoji"
                     :allow-non-square-emoji="allowNonSquareEmoji"
-                    :is-local="user.is_local"
+                    :is-local="status.user.is_local"
                   />
                 </h4>
                 <h4
                   v-else
                   class="status-username"
-                  :title="user.name"
+                  :title="status.user.name"
                 >
-                  {{ user.name }}
+                  {{ status.user.name }}
                 </h4>
                 <user-link
                   class="account-name"
-                  :title="user.screen_name_ui"
-                  :user="user"
+                  :title="status.user.screen_name_ui"
+                  :user="status.user"
                   :at="false"
                 />
                 <img
-                  v-if="!!(user && user.favicon)"
+                  v-if="!!(status.user && status.user.favicon)"
                   class="status-favicon"
-                  :src="user.favicon"
+                  :src="status.user.favicon"
                 >
               </div>
 
@@ -183,12 +186,12 @@
                   :to="{ name: 'conversation', params: { id: status.id } }"
                 >
                   <Timeago
-                    :time="mainStatus.created_at"
+                    :time="status.created_at"
                     :auto-update="60"
                   />
                 </router-link>
                 <span
-                  v-if="mainStatus.visibility"
+                  v-if="status.visibility"
                   class="visibility-icon"
                   :title="visibilityLocalized"
                 >
@@ -304,10 +307,10 @@
                   <template #replyToWithIcon>
                     <StatusPopover
                       v-if="!isPreview"
-                      :status-id="mainStatus.parent_visible && mainStatus.in_reply_to_status_id"
+                      :status-id="status.parent_visible && status.in_reply_to_status_id"
                       class="reply-to-popover"
                       style="min-width: 0;"
-                      :class="{ '-strikethrough': !mainStatus.parent_visible }"
+                      :class="{ '-strikethrough': !status.parent_visible }"
                     >
                       <button
                         class="button-unstyled reply-to"
@@ -396,7 +399,7 @@
                 <template #time>
                   <Timeago
                     template-key="time.in_past"
-                    :time="mainStatus.edited_at"
+                    :time="status.edited_at"
                     :auto-update="60"
                     :long-format="true"
                   />
@@ -407,7 +410,7 @@
 
           <StatusContent
             ref="content"
-            :status="mainStatus"
+            :status="status"
             :focused="focused"
             :in-conversation="inConversation"
             @mediaplay="addMediaPlaying($event)"
@@ -461,31 +464,31 @@
             >
               <div class="stats">
                 <UserListPopover
-                  v-if="mainStatus.rebloggedBy && mainStatus.rebloggedBy.length > 0"
-                  :users="mainStatus.rebloggedBy"
+                  v-if="statusFromGlobalRepository.rebloggedBy && statusFromGlobalRepository.rebloggedBy.length > 0"
+                  :users="statusFromGlobalRepository.rebloggedBy"
                 >
                   <div class="stat-count">
                     <a class="stat-title">{{ $t('status.repeats') }}</a>
                     <div class="stat-number">
-                      {{ mainStatus.rebloggedBy.length }}
+                      {{ statusFromGlobalRepository.rebloggedBy.length }}
                     </div>
                   </div>
                 </UserListPopover>
                 <UserListPopover
-                  v-if="mainStatus.favoritedBy && mainStatus.favoritedBy.length > 0"
-                  :users="mainStatus.favoritedBy"
+                  v-if="statusFromGlobalRepository.favoritedBy && statusFromGlobalRepository.favoritedBy.length > 0"
+                  :users="statusFromGlobalRepository.favoritedBy"
                 >
                   <div
                     class="stat-count"
                   >
                     <a class="stat-title">{{ $t('status.favorites') }}</a>
                     <div class="stat-number">
-                      {{ mainStatus.favoritedBy.length }}
+                      {{ statusFromGlobalRepository.favoritedBy.length }}
                     </div>
                   </div>
                 </UserListPopover>
                 <router-link
-                  v-if="mainStatus.quotes_count > 0"
+                  v-if="statusFromGlobalRepository.quotes_count > 0"
                   :to="{ name: 'quotes', params: { id: status.id } }"
                 >
                   <div
@@ -493,7 +496,7 @@
                   >
                     <a class="stat-title">{{ $t('status.quotes') }}</a>
                     <div class="stat-number">
-                      {{ mainStatus.quotes_count }}
+                      {{ statusFromGlobalRepository.quotes_count }}
                     </div>
                   </div>
                 </router-link>
@@ -506,13 +509,13 @@
 
           <EmojiReactions
             v-if="(mergedConfig.emojiReactionsOnTimeline || focused) && (!noHeading && !isPreview)"
-            :status="mainStatus"
+            :status="status"
           />
 
           <StatusActionButtons
             v-if="!noHeading && !isPreview"
             class="status-action-buttons"
-            :status="mainStatus"
+            :status="status"
             :replying="replying"
             @toggle-replying="toggleReplyForm"
           />
@@ -526,6 +529,7 @@
           <UserAvatar
             class="post-avatar"
             :compact="compact"
+            :show-actor-type-indicator="showActorTypeIndicator"
           />
         </div>
         <div class="right-side">
diff --git a/src/components/status_action_buttons/action_button.js b/src/components/status_action_buttons/action_button.js
index 97c9ac692..1a5b85301 100644
--- a/src/components/status_action_buttons/action_button.js
+++ b/src/components/status_action_buttons/action_button.js
@@ -5,8 +5,6 @@ import EmojiPicker from '../emoji_picker/emoji_picker.vue'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -100,7 +98,7 @@ export default {
       ]
     },
     userIsMuted() {
-      return useUsersStore().relationship(this.status.user.id).muting
+      return this.$store.getters.relationship(this.status.user.id).muting
     },
     threadIsMuted() {
       return this.status.thread_muted
@@ -141,9 +139,9 @@ export default {
         (r) => r.name === emoji,
       )
       if (existingReaction?.me) {
-        useStatusesStore().unreactWithEmoji(this.status.id, emoji)
+        this.$store.dispatch('unreactWithEmoji', { id: this.status.id, emoji })
       } else {
-        useStatusesStore().reactWithEmoji(this.status.id, emoji)
+        this.$store.dispatch('reactWithEmoji', { id: this.status.id, emoji })
       }
     },
     onShowEmojiPicker() {
@@ -170,7 +168,7 @@ export default {
         setTimeout(() => {
           this.animationState = false
         }, 500)
-        if (!this.button.dropdown) close()
+        close()
       }
     },
   },
diff --git a/src/components/status_action_buttons/action_button_container.js b/src/components/status_action_buttons/action_button_container.js
index fce80d9f0..d031bd6e9 100644
--- a/src/components/status_action_buttons/action_button_container.js
+++ b/src/components/status_action_buttons/action_button_container.js
@@ -4,8 +4,6 @@ import Popover from 'src/components/popover/popover.vue'
 import ActionButton from './action_button.vue'
 
 import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import genRandomSeed from 'src/services/random_seed/random_seed.service.js'
 
@@ -50,7 +48,7 @@ export default {
   emits: ['emojiPickerShown'],
   mounted() {
     if (this.button.name === 'mute') {
-      useUsersStore().fetchDomainMutes()
+      this.$store.dispatch('fetchDomainMutes')
     }
   },
   data() {
@@ -73,7 +71,7 @@ export default {
       return this.status.user
     },
     userIsMuted() {
-      return useUsersStore().relationship(this.user.id).muting
+      return this.$store.getters.relationship(this.user.id).muting
     },
     conversationIsMuted() {
       return this.status.thread_muted
@@ -82,7 +80,9 @@ export default {
       return this.user.fqn.split('@')[1]
     },
     domainIsMuted() {
-      return new Set(useUsersStore().currentUser.domainMutes).has(this.domain)
+      return new Set(this.$store.state.users.currentUser.domainMutes).has(
+        this.domain,
+      )
     },
     availableScopes() {
       return ['private', 'unlisted', 'direct', 'public'].filter((scope) => {
@@ -106,13 +106,13 @@ export default {
       }
     },
     unmuteUser() {
-      return useUsersStore().unmuteUser(this.user.id)
+      return this.$store.dispatch('unmuteUser', this.user.id)
     },
     unmuteConversation() {
-      return useStatusesStore().unmuteConversation(this.status.id)
+      return this.$store.dispatch('unmuteConversation', { id: this.status.id })
     },
     unmuteDomain() {
-      return useUsersStore().unmuteDomain(this.domain)
+      return this.$store.dispatch('unmuteDomain', this.domain)
     },
     toggleUserMute() {
       if (this.userIsMuted) {
diff --git a/src/components/status_action_buttons/buttons_definitions.js b/src/components/status_action_buttons/buttons_definitions.js
index 399fad395..6c94b43a5 100644
--- a/src/components/status_action_buttons/buttons_definitions.js
+++ b/src/components/status_action_buttons/buttons_definitions.js
@@ -3,7 +3,6 @@ import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useReportsStore } from 'src/stores/reports.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
 import { useStatusHistoryStore } from 'src/stores/statusHistory.js'
 
 const PRIVATE_SCOPES = new Set(['private', 'direct'])
@@ -35,10 +34,9 @@ export const BUTTONS = [
     name: 'retweet',
     label: ({ status }) =>
       status.repeated ? 'tool_tip.unrepeat' : 'tool_tip.repeat',
-    icon({ status, loggedIn, currentUser }) {
+    icon({ status, currentUser }) {
       if (
-        loggedIn &&
-        status.user.id !== currentUser.id &&
+        currentUser.id !== status.user.id &&
         PRIVATE_SCOPES.has(status.visibility)
       ) {
         return 'lock'
@@ -54,7 +52,7 @@ export const BUTTONS = [
       (currentUser.id === status.user.id ||
         !PRIVATE_SCOPES.has(status.visibility)),
     toggleable: true,
-    confirm: ({ status }) =>
+    confirm: ({ status, getters }) =>
       !status.repeated && useMergedConfigStore().mergedConfig.modalOnRepeat,
     confirmStrings: {
       title: 'status.repeat_confirm_title',
@@ -62,11 +60,11 @@ export const BUTTONS = [
       confirm: 'status.repeat_confirm_accept_button',
       cancel: 'status.repeat_confirm_cancel_button',
     },
-    action({ status }) {
+    action({ status, dispatch }) {
       if (!status.repeated) {
-        return useStatusesStore().retweet(status.id)
+        return dispatch('retweet', { id: status.id })
       } else {
-        return useStatusesStore().unretweet(status.id)
+        return dispatch('unretweet', { id: status.id })
       }
     },
   },
@@ -84,11 +82,11 @@ export const BUTTONS = [
     counter: ({ status }) => status.fave_num,
     anonLink: true,
     toggleable: true,
-    action({ status }) {
+    action({ status, dispatch }) {
       if (!status.favorited) {
-        return useStatusesStore().favorite(status.id)
+        return dispatch('favorite', { id: status.id })
       } else {
-        return useStatusesStore().unfavorite(status.id)
+        return dispatch('unfavorite', { id: status.id })
       }
     },
   },
@@ -114,7 +112,7 @@ export const BUTTONS = [
     if: ({ loggedIn }) => loggedIn,
     toggleable: false,
     dropdown: true,
-    action({ status, emit }) {
+    action({ status, dispatch, emit }) {
       /* prevent hiding */
     },
   },
@@ -132,11 +130,11 @@ export const BUTTONS = [
         PUBLIC_SCOPES.has(status.visibility)
       )
     },
-    action({ status }) {
+    action({ status, dispatch }) {
       if (status.pinned) {
-        return useStatusesStore().unpinStatus(status.id)
+        return dispatch('unpinStatus', status.id)
       } else {
-        return useStatusesStore().pinStatus(status.id)
+        return dispatch('pinStatus', status.id)
       }
     },
   },
@@ -152,11 +150,11 @@ export const BUTTONS = [
     label: ({ status }) =>
       status.bookmarked ? 'status.unbookmark' : 'status.bookmark',
     if: ({ loggedIn }) => loggedIn,
-    action({ status }) {
+    action({ status, dispatch }) {
       if (status.bookmarked) {
-        return useStatusesStore().unbookmark(status.id)
+        return dispatch('unbookmark', { id: status.id })
       } else {
-        return useStatusesStore().bookmark(status.id)
+        return dispatch('bookmark', { id: status.id })
       }
     },
   },
@@ -167,7 +165,7 @@ export const BUTTONS = [
     name: 'editHistory',
     icon: 'history',
     label: 'status.status_history',
-    if({ status }) {
+    if({ status, state }) {
       return (
         useInstanceCapabilitiesStore().editingAvailable &&
         status.edited_at !== null
@@ -187,7 +185,7 @@ export const BUTTONS = [
         'summary_raw_html',
       ]
       stripFieldsList.forEach((p) => delete originalStatus[p])
-      useStatusHistoryStore().openModal(originalStatus.id)
+      useStatusHistoryStore().openStatusHistoryModal(originalStatus)
       return Promise.resolve()
     },
   },
@@ -198,28 +196,26 @@ export const BUTTONS = [
     name: 'edit',
     icon: 'pen',
     label: 'status.edit',
-    if({ status, loggedIn, currentUser }) {
+    if({ status, loggedIn, currentUser, state }) {
       return (
         loggedIn &&
         useInstanceCapabilitiesStore().editingAvailable &&
         status.user.id === currentUser.id
       )
     },
-    action({ status }) {
-      return useStatusesStore()
-        .fetchStatusSource(status.id)
-        .then((data) =>
-          useEditStatusStore().openEditStatusModal({
-            statusId: status.id,
-            statusSubject: data.spoiler_text,
-            statusText: data.text,
-            statusIsSensitive: status.nsfw,
-            statusPoll: status.poll,
-            statusFiles: [...status.attachments],
-            statusVisibility: status.visibility,
-            statusContentType: data.content_type,
-          }),
-        )
+    action({ dispatch, status }) {
+      return dispatch('fetchStatusSource', { id: status.id }).then((data) =>
+        useEditStatusStore().openEditStatusModal({
+          statusId: status.id,
+          statusSubject: data.spoiler_text,
+          statusText: data.text,
+          statusIsSensitive: status.nsfw,
+          statusPoll: status.poll,
+          statusFiles: [...status.attachments],
+          statusVisibility: status.visibility,
+          statusContentType: data.content_type,
+        }),
+      )
     },
   },
   {
@@ -264,15 +260,15 @@ export const BUTTONS = [
           currentUser.privileges.has('messages_delete'))
       )
     },
-    confirm: () => useMergedConfigStore().mergedConfig.modalOnDelete,
+    confirm: ({ getters }) => useMergedConfigStore().mergedConfig.modalOnDelete,
     confirmStrings: {
       title: 'status.delete_confirm_title',
       body: 'status.delete_confirm',
       confirm: 'status.delete_confirm_accept_button',
       cancel: 'status.delete_confirm_cancel_button',
     },
-    action({ status }) {
-      return useStatusesStore().deleteStatus(status.id)
+    action({ dispatch, status }) {
+      return dispatch('deleteStatus', { id: status.id })
     },
   },
   {
@@ -291,7 +287,7 @@ export const BUTTONS = [
     },
     toggleable: false,
     dropdown: true,
-    action({ status, emit }) {
+    action({ status, dispatch, emit }) {
       /* prevent hiding */
     },
   },
@@ -302,7 +298,7 @@ export const BUTTONS = [
     name: 'share',
     icon: 'share-alt',
     label: 'status.copy_link',
-    action({ status, router }) {
+    action({ state, status, router }) {
       navigator.clipboard.writeText(
         [
           useInstanceStore().server,
diff --git a/src/components/status_action_buttons/status_action_buttons.js b/src/components/status_action_buttons/status_action_buttons.js
index bbbdb79e5..73ac6ff7e 100644
--- a/src/components/status_action_buttons/status_action_buttons.js
+++ b/src/components/status_action_buttons/status_action_buttons.js
@@ -6,7 +6,6 @@ import ActionButtonContainer from './action_button_container.vue'
 import { BUTTONS } from './buttons_definitions.js'
 
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import genRandomSeed from 'src/services/random_seed/random_seed.service.js'
 
@@ -89,7 +88,7 @@ const StatusActionButtons = {
       return this.buttons.filter((x) => !this.pinnedItems.has(x.name))
     },
     currentUser() {
-      return useUsersStore().currentUser
+      return this.$store.state.users.currentUser
     },
     funcArg() {
       return {
@@ -169,7 +168,7 @@ const StatusActionButtons = {
       useSyncConfigStore().pushSyncConfig()
     },
     getComponent(button) {
-      if (!useUsersStore().currentUser && button.anonLink) {
+      if (!this.$store.state.users.currentUser && button.anonLink) {
         return 'a'
       } else if (button.action == null && button.link != null) {
         return 'a'
diff --git a/src/components/status_body/status_body.js b/src/components/status_body/status_body.js
index d361f3a9a..dc74426ca 100644
--- a/src/components/status_body/status_body.js
+++ b/src/components/status_body/status_body.js
@@ -3,7 +3,6 @@ import { mapState } from 'pinia'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
 
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -155,7 +154,7 @@ const StatusBody = {
   mounted() {
     this.status.attentions?.forEach((attn) => {
       const { id } = attn
-      useUsersStore().fetchUserIfMissing({ id })
+      this.$store.dispatch('fetchUserIfMissing', id)
     })
   },
   methods: {
@@ -172,7 +171,7 @@ const StatusBody = {
           if (!cleanedString.startsWith('@')) return
           const handle = cleanedString.slice(1)
           const host = url.replace(/^https?:\/\//, '').replace(/\/.+?$/, '')
-          useUsersStore().fetchUserIfMissing({ name: `${handle}@${host}` })
+          this.$store.dispatch('fetchUserIfMissing', `${handle}@${host}`)
         })
       /* This is a bit of a hack to make current tall status detector work
        * with rich mentions. Invisible mentions are detected at RichContent level
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 5e2c71b65..c2f070b6d 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
@@ -3,7 +3,6 @@ import { mapState } from 'pinia'
 import Popover from 'src/components/popover/popover.vue'
 
 import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronRight, faFolder } from '@fortawesome/free-solid-svg-icons'
@@ -31,8 +30,8 @@ const StatusBookmarkFolderMenu = {
     toggleFolder(id) {
       const value = id === this.folderId ? null : id
 
-      useStatusesStore()
-        .bookmark(this.status.id, value)
+      this.$store
+        .dispatch('bookmark', { id: this.status.id, bookmark_folder_id: value })
         .then(() => this.$emit('success'))
         .catch((err) => this.$emit('error', err.error.error))
     },
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index 60e2f8522..209abee99 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -1,4 +1,5 @@
-import { mapState } from 'pinia'
+import { mapState as mapPiniaState } from 'pinia'
+import { mapState } from 'vuex'
 
 import Attachment from 'src/components/attachment/attachment.vue'
 import Gallery from 'src/components/gallery/gallery.vue'
@@ -8,7 +9,6 @@ import StatusBody from 'src/components/status_body/status_body.vue'
 
 import { useMediaViewerStore } from 'src/stores/media_viewer.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -84,8 +84,10 @@ const StatusContent = {
     maxThumbnails() {
       return this.mergedConfig.maxThumbnails
     },
-    ...mapState(useMergedConfigStore, ['mergedConfig']),
-    ...mapState(useUsersStore, ['currentUser']),
+    ...mapPiniaState(useMergedConfigStore, ['mergedConfig']),
+    ...mapState({
+      currentUser: (state) => state.users.currentUser,
+    }),
   },
   components: {
     Attachment,
diff --git a/src/components/status_history_modal/status_history_modal.js b/src/components/status_history_modal/status_history_modal.js
index 5a3fc2a41..c165fe411 100644
--- a/src/components/status_history_modal/status_history_modal.js
+++ b/src/components/status_history_modal/status_history_modal.js
@@ -1,14 +1,12 @@
-import { mapState } from 'pinia'
+import { get } from 'lodash'
 
 import Modal from 'src/components/modal/modal.vue'
-import StatusContent from 'src/components/status_content/status_content.vue'
 
 import { useStatusHistoryStore } from 'src/stores/statusHistory.js'
 
 const StatusHistoryModal = {
   components: {
     Modal,
-    StatusContent,
   },
   data() {
     return {
@@ -16,14 +14,48 @@ const StatusHistoryModal = {
     }
   },
   computed: {
-    historyCount() {
-      return this.history.length
+    modalActivated() {
+      return useStatusHistoryStore().modalActivated
+    },
+    params() {
+      return useStatusHistoryStore().params
+    },
+    statusId() {
+      return this.params.id
+    },
+    historyCount() {
+      return this.statuses.length
+    },
+    history() {
+      return this.statuses
+    },
+  },
+  watch: {
+    params(newVal, oldVal) {
+      const newStatusId = get(newVal, 'id') !== get(oldVal, 'id')
+      if (newStatusId) {
+        this.resetHistory()
+      }
+
+      if (
+        newStatusId ||
+        get(newVal, 'edited_at') !== get(oldVal, 'edited_at')
+      ) {
+        this.fetchStatusHistory()
+      }
     },
-    ...mapState(useStatusHistoryStore, ['modalActivated', 'history']),
   },
   methods: {
+    resetHistory() {
+      this.statuses = []
+    },
+    fetchStatusHistory() {
+      this.$store.dispatch('fetchStatusHistory', this.params).then((data) => {
+        this.statuses = data
+      })
+    },
     closeModal() {
-      useStatusHistoryStore().closeModal()
+      useStatusHistoryStore().closeStatusHistoryModal()
     },
   },
 }
diff --git a/src/components/status_history_modal/status_history_modal.vue b/src/components/status_history_modal/status_history_modal.vue
index a78e04c96..282878b52 100644
--- a/src/components/status_history_modal/status_history_modal.vue
+++ b/src/components/status_history_modal/status_history_modal.vue
@@ -15,10 +15,10 @@
           v-if="historyCount > 0"
           class="history-body"
         >
-          <StatusContent
+          <status
             v-for="status in history"
             :key="status.id"
-            :status="status"
+            :statusoid="status"
             :is-preview="true"
             class="conversation-status status-fadein panel-body"
           />
diff --git a/src/components/status_popover/status_popover.js b/src/components/status_popover/status_popover.js
index e9fc2398d..95da91ba7 100644
--- a/src/components/status_popover/status_popover.js
+++ b/src/components/status_popover/status_popover.js
@@ -1,6 +1,6 @@
-import Popover from 'src/components/popover/popover.vue'
+import { find } from 'lodash'
 
-import { useStatusesStore } from 'src/stores/statuses.js'
+import Popover from 'src/components/popover/popover.vue'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
@@ -17,7 +17,7 @@ const StatusPopover = {
   },
   computed: {
     status() {
-      return useStatusesStore().allStatuses.get(this.statusId)
+      return find(this.$store.state.statuses.allStatuses, { id: this.statusId })
     },
   },
   components: {
@@ -30,8 +30,8 @@ const StatusPopover = {
           this.error = true
           return
         }
-        useStatusesStore()
-          .fetchStatus(this.statusId)
+        this.$store
+          .dispatch('fetchStatus', this.statusId)
           .then(() => (this.error = false))
           .catch(() => (this.error = true))
       }
diff --git a/src/components/status_popover/status_popover.vue b/src/components/status_popover/status_popover.vue
index a17b41675..ccfb06c02 100644
--- a/src/components/status_popover/status_popover.vue
+++ b/src/components/status_popover/status_popover.vue
@@ -14,7 +14,7 @@
       <Status
         v-if="status"
         :is-preview="true"
-        :status-id="statusId"
+        :statusoid="status"
         :compact="true"
         :ignore-mute="true"
       />
diff --git a/src/components/still-image/still-image-emoji-popover.js b/src/components/still-image/still-image-emoji-popover.js
index fc3f3bc0a..6db72c49f 100644
--- a/src/components/still-image/still-image-emoji-popover.js
+++ b/src/components/still-image/still-image-emoji-popover.js
@@ -5,7 +5,6 @@ import { mapState } from 'pinia'
 import { useAdminSettingsStore } from 'src/stores/admin_settings'
 import { useEmojiStore } from 'src/stores/emoji'
 import { useInterfaceStore } from 'src/stores/interface'
-import { useUsersStore } from 'src/stores/users.js'
 
 export default {
   components: { Popover, SelectComponent },
@@ -26,7 +25,7 @@ export default {
   },
   computed: {
     isUserAdmin() {
-      return useUsersStore().currentUser?.rights.admin
+      return this.$store.state.users.currentUser?.rights.admin
     },
     ...mapState(useEmojiStore, ['adminPacksLocal', 'adminPacksLocalLoading']),
   },
diff --git a/src/components/tag_timeline/tag_timeline.js b/src/components/tag_timeline/tag_timeline.js
new file mode 100644
index 000000000..e82e86cfd
--- /dev/null
+++ b/src/components/tag_timeline/tag_timeline.js
@@ -0,0 +1,36 @@
+import Timeline from 'src/components/timeline/timeline.vue'
+
+const TagTimeline = {
+  created() {
+    this.$store.commit('clearTimeline', { timeline: 'tag' })
+    this.$store.dispatch('startFetchingTimeline', {
+      timeline: 'tag',
+      tag: this.tag,
+    })
+  },
+  components: {
+    Timeline,
+  },
+  computed: {
+    tag() {
+      return this.$route.params.tag
+    },
+    timeline() {
+      return this.$store.state.statuses.timelines.tag
+    },
+  },
+  watch: {
+    tag() {
+      this.$store.commit('clearTimeline', { timeline: 'tag' })
+      this.$store.dispatch('startFetchingTimeline', {
+        timeline: 'tag',
+        tag: this.tag,
+      })
+    },
+  },
+  unmounted() {
+    this.$store.dispatch('stopFetchingTimeline', 'tag')
+  },
+}
+
+export default TagTimeline
diff --git a/src/components/thread_tree/thread_tree.js b/src/components/thread_tree/thread_tree.js
index 491fab78f..75232a259 100644
--- a/src/components/thread_tree/thread_tree.js
+++ b/src/components/thread_tree/thread_tree.js
@@ -11,7 +11,7 @@ const ThreadTree = {
   name: 'ThreadTree',
   props: {
     depth: Number,
-    statusId: String,
+    status: Object,
     inProfile: Boolean,
     conversation: Array,
     collapsable: Boolean,
@@ -32,11 +32,29 @@ const ThreadTree = {
   },
   emits: ['suspendableStateChange', 'goto', 'dive'],
   computed: {
+    reverseLookupTable() {
+      return this.conversation.reduce(
+        (table, status, index) => {
+          table[status.id] = index
+          return table
+        },
+        {
+          /* no-op */
+        },
+      )
+    },
     currentReplies() {
-      return this.getReplies(this.statusId).map(({ id }) => id)
+      return this.getReplies(this.status.id).map(({ id }) =>
+        this.statusById(id),
+      )
     },
     threadShowing() {
-      return this.threadDisplayStatus[this.statusId] === 'showing'
+      return this.threadDisplayStatus[this.status.id] === 'showing'
+    },
+  },
+  methods: {
+    statusById(id) {
+      return this.conversation[this.reverseLookupTable[id]]
     },
   },
 }
diff --git a/src/components/thread_tree/thread_tree.vue b/src/components/thread_tree/thread_tree.vue
index 2dae7beee..556858ad7 100644
--- a/src/components/thread_tree/thread_tree.vue
+++ b/src/components/thread_tree/thread_tree.vue
@@ -1,25 +1,25 @@
 <template>
   <article class="thread-tree">
     <Status
-      :key="statusId"
+      :key="status.id"
       ref="statusComponent"
-      :status-id="statusId"
-      :replies="getReplies(statusId)"
+      :statusoid="status"
+      :replies="getReplies(status.id)"
       :inline-expanded="collapsable && isExpanded"
       :expandable="!isExpanded"
       :show-pinned="pinnedStatusIdsObject && pinnedStatusIdsObject[status.id]"
       :in-conversation="isExpanded"
-      :focused="focused === statusId"
+      :focused="focused === status.id || focused === status.retweeted_status?.id"
       :in-profile="inProfile"
       :profile-user-id="profileUserId"
       class="conversation-status conversation-status-treeview status-fadein panel-body"
 
       :simple-tree="simple"
-      :thread-display-status="threadDisplayStatus[statusId]"
+      :thread-display-status="threadDisplayStatus[status.id]"
       :can-dive="canDive"
 
-      @dive="$emit('dive', statusId)"
-      @goto="$emit('goto', statusId)"
+      @dive="$emit('dive', status.id)"
+      @goto="$emit('goto', status.id)"
       @toggle-expanded="toggleExpanded"
       @suspendable-state-change="e => $emit('suspendableStateChange', e)"
     />
@@ -28,11 +28,11 @@
       class="thread-tree-replies"
     >
       <ThreadTree
-        v-for="replyStatusId in currentReplies"
-        :key="replyStatusId"
+        v-for="replyStatus in currentReplies"
+        :key="replyStatus.id"
         ref="childComponent"
         :depth="depth + 1"
-        :status-id="replyStatusId"
+        :status="replyStatus"
 
         :in-profile="inProfile"
         :conversation="conversation"
@@ -67,7 +67,7 @@
         tag="button"
         keypath="status.thread_follow_with_icon"
         class="button-unstyled -link thread-tree-show-replies-button"
-        @click.prevent="$emit('dive', statusId)"
+        @click.prevent="$emit('dive', status.id)"
       >
         <template #icon>
           <FAIcon
@@ -76,7 +76,7 @@
         </template>
         <template #text>
           <span>
-            {{ $t('status.thread_follow', { numStatus: totalReplyCount[statusId] }, totalReplyCount[statusId]) }}
+            {{ $t('status.thread_follow', { numStatus: totalReplyCount[status.id] }, totalReplyCount[status.id]) }}
           </span>
         </template>
       </i18n-t>
@@ -86,7 +86,7 @@
         tag="button"
         keypath="status.thread_show_full_with_icon"
         class="button-unstyled -link thread-tree-show-replies-button"
-        @click.prevent="showThreadRecursively(statusId)"
+        @click.prevent="showThreadRecursively(status.id)"
       >
         <template #icon>
           <FAIcon
@@ -95,7 +95,7 @@
         </template>
         <template #text>
           <span>
-            {{ $t('status.thread_show_full', { numStatus: totalReplyCount[statusId], depth: totalReplyDepth[statusId] }, totalReplyCount[statusId]) }}
+            {{ $t('status.thread_show_full', { numStatus: totalReplyCount[status.id], depth: totalReplyDepth[status.id] }, totalReplyCount[status.id]) }}
           </span>
         </template>
       </i18n-t>
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index a76438ad0..c3f4d381d 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -1,4 +1,4 @@
-import { debounce, throttle } from 'lodash'
+import { debounce, keyBy, throttle } from 'lodash'
 import { mapState } from 'pinia'
 
 import Conversation from 'src/components/conversation/conversation.vue'
@@ -9,8 +9,8 @@ import TimelineMenu from 'src/components/timeline_menu/timeline_menu.vue'
 
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
-import { useTimelinesStore } from 'src/stores/timelines.js'
+
+import timelineFetcher from 'src/services/timeline_fetcher/timeline_fetcher.service.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -25,19 +25,27 @@ import {
 library.add(faCircleNotch, faCog, faMinus, faArrowUp, faCirclePlus, faCheck)
 
 const Timeline = {
-  props: {
-    timelineRef: Object,
-    count: Number,
-    footerSlipgate: Object, // reference to an element where we should put our footer
-    embedded: Boolean,
-    inProfile: Boolean,
-    skipPinned: Boolean,
-  },
+  props: [
+    'timeline',
+    'timelineName',
+    'title',
+    'userId',
+    'listId',
+    'statusId',
+    'bookmarkFolderId',
+    'tag',
+    'embedded',
+    'count',
+    'pinnedStatusIds',
+    'inProfile',
+    'footerSlipgate', // reference to an element where we should put our footer
+  ],
   data() {
     return {
       showScrollTop: false,
       paused: false,
       unfocused: false,
+      bottomedOut: false,
       virtualScrollIndex: 0,
       blockingClicks: false,
     }
@@ -50,14 +58,18 @@ const Timeline = {
     QuickViewSettings,
   },
   computed: {
-    timeline() {
-      return useTimelinesStore()[this.timelineRef.name]
-    },
     filteredVisibleStatuses() {
-      return this.timeline.order
-        .filter((id) => this.timeline.visibleStatusIds.has(id))
-        .map((id) => useStatusesStore().allStatuses.get(id))
-        .filter(({ pinned }) => (this.skipPinned ? !pinned : true))
+      return this.timeline.visibleStatuses.filter(
+        (status) =>
+          this.timelineName !== 'user' ||
+          (status.id >= this.timeline.minId &&
+            status.id <= this.timeline.maxId),
+      )
+    },
+    filteredPinnedStatusIds() {
+      return (this.pinnedStatusIds || []).filter(
+        (statusId) => this.timeline.statusesObject[statusId],
+      )
     },
     newStatusCount() {
       return this.timeline.newStatusCount
@@ -98,12 +110,18 @@ const Timeline = {
         ),
       }
     },
+    // id map of statuses which need to be hidden in the main list due to pinning logic
+    pinnedStatusIdsObject() {
+      return keyBy(this.pinnedStatusIds)
+    },
     statusesToDisplay() {
-      const amount = this.timeline.visibleStatusIds.size
+      const amount = this.timeline.visibleStatuses.length
       const statusesPerSide = Math.ceil(Math.max(3, window.innerHeight / 80))
-      const min = Math.max(0, this.virtualScrollIndex - statusesPerSide)
-      const max = Math.min(amount, this.virtualScrollIndex + statusesPerSide)
-      return new Set(this.timeline.order.slice(min, max))
+      const nonPinnedIndex =
+        this.virtualScrollIndex - this.filteredPinnedStatusIds.length
+      const min = Math.max(0, nonPinnedIndex - statusesPerSide)
+      const max = Math.min(amount, nonPinnedIndex + statusesPerSide)
+      return this.timeline.visibleStatuses.slice(min, max).map((_) => _.id)
     },
     virtualScrollingEnabled() {
       return useMergedConfigStore().mergedConfig.virtualScrolling
@@ -113,7 +131,27 @@ const Timeline = {
     }),
   },
   created() {
-    this.timelineChange(this.timelineRef)
+    const store = this.$store
+    const credentials = store.state.users.currentUser.credentials
+    const showImmediately = this.timeline.visibleStatuses.length === 0
+
+    window.addEventListener('scroll', this.handleScroll)
+
+    if (store.state.api.fetchers[this.timelineName]) {
+      return false
+    }
+
+    timelineFetcher.fetchAndUpdate({
+      store,
+      credentials,
+      timeline: this.timelineName,
+      showImmediately,
+      userId: this.userId,
+      listId: this.listId,
+      statusId: this.statusId,
+      bookmarkFolderId: this.bookmarkFolderId,
+      tag: this.tag,
+    })
   },
   mounted() {
     if (document.hidden !== undefined) {
@@ -125,11 +163,9 @@ const Timeline = {
       this.unfocused = document.hidden
     }
     window.addEventListener('keydown', this.handleShortKey)
-    window.addEventListener('scroll', this.handleScroll)
     setTimeout(this.determineVisibleStatuses, 250)
   },
   unmounted() {
-    this.timelineChange(null, this.timelineRef)
     window.removeEventListener('scroll', this.handleScroll)
     window.removeEventListener('keydown', this.handleShortKey)
     if (document.hidden !== undefined)
@@ -138,20 +174,12 @@ const Timeline = {
         this.handleVisibilityChange,
         false,
       )
+    this.$store.commit('setLoading', {
+      timeline: this.timelineName,
+      value: false,
+    })
   },
   methods: {
-    timelineChange(newTimeline, oldTimeline) {
-      const sameName = newTimeline?.name === oldTimeline?.name
-      const sameArgument = newTimeline?.argument === oldTimeline?.argument
-      if (sameName && sameArgument) return
-
-      if (oldTimeline) {
-        useTimelinesStore().deactivate(oldTimeline.name)
-      }
-      if (newTimeline) {
-        useTimelinesStore().activate(newTimeline.name, newTimeline.argument)
-      }
-    },
     stopBlockingClicks: debounce(function () {
       this.blockingClicks = false
     }, 1000),
@@ -168,19 +196,51 @@ const Timeline = {
     },
     showNewStatuses() {
       if (this.timeline.flushMarker !== 0) {
-        useTimelinesStore().clearTimeline(this.timelineRef.name)
-        useTimelinesStore().queueFlush(this.timelineRef.name, '')
+        this.$store.commit('clearTimeline', {
+          timeline: this.timelineName,
+          excludeUserId: true,
+        })
+        this.$store.commit('queueFlush', { timeline: this.timelineName, id: 0 })
+        if (this.timelineName === 'user') {
+          this.$store.dispatch('fetchPinnedStatuses', this.userId)
+        }
         this.fetchOlderStatuses()
       } else {
         this.blockClicksTemporarily()
-        useTimelinesStore().showNewStatuses(this.timelineRef.name)
+        this.$store.commit('showNewStatuses', { timeline: this.timelineName })
         this.paused = false
       }
       window.scrollTo({ top: 0 })
     },
     fetchOlderStatuses: throttle(
       function () {
-        this.timeline.fetcher.fetchOlder()
+        const store = this.$store
+        const credentials = store.state.users.currentUser.credentials
+        store.commit('setLoading', { timeline: this.timelineName, value: true })
+        timelineFetcher
+          .fetchAndUpdate({
+            store,
+            credentials,
+            timeline: this.timelineName,
+            older: true,
+            showImmediately: true,
+            userId: this.userId,
+            listId: this.listId,
+            statusId: this.statusId,
+            bookmarkFolderId: this.bookmarkFolderId,
+            tag: this.tag,
+          })
+          .then(({ statuses }) => {
+            if (statuses?.length === 0) {
+              this.bottomedOut = true
+            }
+          })
+          .finally(() =>
+            store.commit('setLoading', {
+              timeline: this.timelineName,
+              value: false,
+            }),
+          )
       },
       1000,
       this,
@@ -210,6 +270,7 @@ const Timeline = {
       let err = statuses[approxIndex].getBoundingClientRect().y
 
       // if we have a previous scroll index that can be used, test if it's
+      // closer than the previous approximation, use it if so
 
       const virtualScrollIndexY =
         statuses[cappedScrollIndex].getBoundingClientRect().y
@@ -237,7 +298,7 @@ const Timeline = {
       const bodyBRect = document.body.getBoundingClientRect()
       const height = Math.max(bodyBRect.height, -bodyBRect.y)
       if (
-        !this.timeline.fetcher.loading.value &&
+        this.timeline.loading === false &&
         this.$el.offsetHeight > 0 &&
         window.innerHeight + window.pageYOffset >= height - 750
       ) {
@@ -253,9 +314,6 @@ const Timeline = {
     },
   },
   watch: {
-    timelineRef(newTimeline, oldTimeline) {
-      this.timelineChange(newTimeline, oldTimeline)
-    },
     filteredVisibleStatuses() {
       this.determineVisibleStatuses()
     },
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 745d8c399..287934657 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -6,7 +6,7 @@
     >
       <TimelineMenu
         v-if="!embedded"
-        :timeline-name="timelineRef.name"
+        :timeline-name="timelineName"
       />
       <ScrollTopButton />
       <template v-if="mobileLayout">
@@ -71,6 +71,17 @@
         class="timeline"
         role="feed"
       >
+        <Conversation
+          v-for="statusId in filteredPinnedStatusIds"
+          :key="statusId + '-pinned'"
+          role="listitem"
+          class="status-fadein"
+          :status-id="statusId"
+          :pinned-status-ids-object="pinnedStatusIdsObject"
+          :in-profile="inProfile"
+          :profile-user-id="userId"
+          collapsable
+        />
         <Conversation
           v-for="status in filteredVisibleStatuses"
           :key="status.id"
@@ -78,8 +89,8 @@
           class="status-fadein"
           :status-id="status.id"
           :in-profile="inProfile"
-          :profile-user-id="timelineRef.argument"
-          :virtual-hidden="virtualScrollingEnabled && !statusesToDisplay.has(status.id)"
+          :profile-user-id="userId"
+          :virtual-hidden="virtualScrollingEnabled && !statusesToDisplay.includes(status.id)"
           collapsable
         />
       </div>
@@ -90,19 +101,19 @@
         :disabled="!embedded || !footerSlipgate"
       >
         <div
-          v-if="count === 0"
+          v-if="count===0"
           class="new-status-notification text-center faint"
         >
           {{ $t('timeline.no_statuses') }}
         </div>
         <div
-          v-else-if="timeline.fetcher.bottomedOut"
+          v-else-if="bottomedOut"
           class="new-status-notification text-center faint"
         >
           {{ $t('timeline.no_more_statuses') }}
         </div>
         <button
-          v-else-if="!timeline.fetcher.loading"
+          v-else-if="!timeline.loading"
           class="button-unstyled -link"
           @click.prevent="fetchOlderStatuses()"
         >
diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js
index 6b93f0af0..ee6fa8f20 100644
--- a/src/components/timeline_menu/timeline_menu.js
+++ b/src/components/timeline_menu/timeline_menu.js
@@ -1,4 +1,5 @@
-import { mapState } from 'pinia'
+import { mapState as mapPiniaState } from 'pinia'
+import { mapState } from 'vuex'
 
 import BookmarkFoldersMenuContent from 'src/components/bookmark_folders_menu/bookmark_folders_menu_content.vue'
 import ListsMenuContent from 'src/components/lists_menu/lists_menu_content.vue'
@@ -12,7 +13,6 @@ import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useInterfaceStore } from 'src/stores/interface'
 import { useListsStore } from 'src/stores/lists'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronDown } from '@fortawesome/free-solid-svg-icons'
@@ -62,14 +62,16 @@ const TimelineMenu = {
         (route === 'bookmark-folder' || route === 'bookmarks')
       )
     },
-    ...mapState(useInstanceCapabilitiesStore, [
+    ...mapPiniaState(useInstanceCapabilitiesStore, [
       'pleromaChatMessagesAvailable',
       'pleromaBookmarkFoldersAvailable',
       'bookmarkFolders',
       'localBubble',
     ]),
-    ...mapState(useInstanceStore, ['privateMode', 'federating']),
-    ...mapState(useUsersStore, ['currentUser']),
+    ...mapPiniaState(useInstanceStore, ['privateMode', 'federating']),
+    ...mapState({
+      currentUser: (state) => state.users.currentUser,
+    }),
     timelinesList() {
       return filterNavigation(
         Object.entries(TIMELINES).map(([k, v]) => ({ ...v, name: k })),
diff --git a/src/components/update_notification/update_notification.js b/src/components/update_notification/update_notification.js
index 6e60a6457..2a9fb7f60 100644
--- a/src/components/update_notification/update_notification.js
+++ b/src/components/update_notification/update_notification.js
@@ -3,7 +3,6 @@ import Modal from 'src/components/modal/modal.vue'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import pleromaTanFoxMask from 'src/assets/pleromatan_apology_fox_mask.png'
 import pleromaTanMask from 'src/assets/pleromatan_apology_mask.png'
@@ -42,7 +41,7 @@ const UpdateNotification = {
     shouldShow() {
       return (
         !useInstanceStore().disableUpdateNotification &&
-        useUsersStore().currentUser &&
+        this.$store.state.users.currentUser &&
         useSyncConfigStore().flagStorage.updateCounter <
           CURRENT_UPDATE_COUNTER &&
         !useMergedConfigStore().mergedConfig.dontShowUpdateNotifs
diff --git a/src/components/user_avatar/user_avatar.js b/src/components/user_avatar/user_avatar.js
index b80aa8fb8..3ab0ee9e7 100644
--- a/src/components/user_avatar/user_avatar.js
+++ b/src/components/user_avatar/user_avatar.js
@@ -1,7 +1,5 @@
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
-import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faPeopleGroup, faRobot } from '@fortawesome/free-solid-svg-icons'
@@ -10,10 +8,10 @@ library.add(faRobot, faPeopleGroup)
 
 const UserAvatar = {
   props: {
-    // UserID of a user to show avatar of
-    userId: {
+    // User object to show avatar of
+    user: {
       required: true,
-      type: String,
+      type: Object,
     },
     // Use less space and use alternative roundness
     compact: {
@@ -21,6 +19,12 @@ const UserAvatar = {
       type: Boolean,
       default: false,
     },
+    // Show small icon indicating if account is a bot or group
+    showActorTypeIndicator: {
+      required: false,
+      type: Boolean,
+      default: false,
+    },
     // Override avatar image URL, useful for profile editing
     url: {
       required: false,
@@ -35,14 +39,7 @@ const UserAvatar = {
       betterShadow: useInterfaceStore().browserSupport.cssFilter,
     }
   },
-  computed: {
-    user() {
-      return useUsersStore().findUser(this.userId)
-    },
-    showActorTypeIndicator() {
-      return useMergedConfigStore().mergedConfig.hideBotIndication
-    },
-  },
+  components: {},
   methods: {
     imgSrc(src) {
       return !src || this.showPlaceholder ? this.defaultAvatar : src
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index 5304608b8..b6e720c6f 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -25,7 +25,6 @@ import { useMediaViewerStore } from 'src/stores/media_viewer'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { usePostStatusStore } from 'src/stores/post_status'
 import { useUserHighlightStore } from 'src/stores/user_highlight.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { updateProfile } from 'src/api/user.js'
 import { propsToNative } from 'src/services/attributes_helper/attributes_helper.service.js'
@@ -159,7 +158,7 @@ export default {
     ),
   },
   data() {
-    const user = useUsersStore().findUser(this.userId)
+    const user = this.$store.getters.findUser(this.userId)
 
     return {
       followRequestInProgress: false,
@@ -193,7 +192,7 @@ export default {
     }
   },
   created() {
-    useUsersStore().fetchUserRelationship(this.user.id)
+    this.$store.dispatch('fetchUserRelationship', this.user.id)
   },
   computed: {
     escapedNewBio() {
@@ -229,23 +228,23 @@ export default {
         : ['Person', 'Service']
     },
     user() {
-      return useUsersStore().findUser(this.userId)
+      return this.$store.getters.findUser(this.userId)
     },
     role() {
       return this.user.role
     },
     relationship() {
-      return useUsersStore().relationship(this.userId)
+      return this.$store.getters.relationship(this.userId)
     },
     isOtherUser() {
-      return this.user.id !== useUsersStore().currentUser.id
+      return this.user.id !== this.$store.state.users.currentUser.id
     },
     subscribeUrl() {
       const serverUrl = new URL(this.user.statusnet_profile_url)
       return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus`
     },
     loggedIn() {
-      return useUsersStore().currentUser
+      return this.$store.state.users.currentUser
     },
     dailyAvg() {
       const days = Math.ceil(
@@ -395,15 +394,17 @@ export default {
     isDefaultAvatar() {
       const baseAvatar = useInstanceStore().instanceIdenitity.defaultAvatar
       return (
-        !useUsersStore().currentUser.profile_image_url ||
-        useUsersStore().currentUser.profile_image_url.includes(baseAvatar)
+        !this.$store.state.users.currentUser.profile_image_url ||
+        this.$store.state.users.currentUser.profile_image_url.includes(
+          baseAvatar,
+        )
       )
     },
     isDefaultBanner() {
       const baseBanner = useInstanceStore().instanceIdentity.defaultBanner
       return (
-        !useUsersStore().currentUser.cover_photo ||
-        useUsersStore().currentUser.cover_photo.includes(baseBanner)
+        !this.$store.state.users.currentUser.cover_photo ||
+        this.$store.state.users.currentUser.cover_photo.includes(baseBanner)
       )
     },
     fieldsLimits() {
@@ -454,13 +455,13 @@ export default {
       this.$refs.timedMuteDialog.optionallyPrompt()
     },
     unmuteUser() {
-      return useUsersStore().unmuteUser(this.user.id)
+      this.$store.dispatch('unmuteUser', this.user.id)
     },
     subscribeUser() {
-      return useUsersStore().subscribeUser(this.user.id)
+      return this.$store.dispatch('subscribeUser', this.user.id)
     },
     unsubscribeUser() {
-      return useUsersStore().unsubscribeUser(this.user.id)
+      return this.$store.dispatch('unsubscribeUser', this.user.id)
     },
     linkClicked({ target }) {
       if (target.tagName === 'SPAN') {
@@ -556,7 +557,7 @@ export default {
       return
     },
     resetState() {
-      const user = useUsersStore().currentUser
+      const user = this.$store.state.users.currentUser
 
       this.newName = user.name_unescaped
       this.newBio = ldUnescape(user.description)
@@ -602,10 +603,11 @@ export default {
       }
 
       updateProfile({ params })
-        .then(({ data: user, ...rest }) => {
+        .then(({ data: user }) => {
           this.newFields.splice(this.newFields.length)
           merge(this.newFields, user.fields)
-          useUsersStore().addNewUsers({ data: user, ...rest })
+          this.$store.commit('addNewUsers', [user])
+          this.$store.commit('setCurrentUser', user)
           this.resetState()
         })
         .catch((error) => {
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 525a22833..e6c6485f7 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -23,7 +23,7 @@
             class="user-info-avatar -link"
             @click="zoomAvatar"
           >
-            <UserAvatar :user-id="user.id" />
+            <UserAvatar :user="user" />
             <div class="user-info-avatar -link -overlay">
               <FAIcon
                 class="fa-scale-110 fa-old-padding"
@@ -38,7 +38,7 @@
             @click="changeAvatar"
           >
             <UserAvatar
-              :user-id="user.id"
+              :user="user"
               :url="avatarImgSrc"
             />
             <div class="user-info-avatar -link -overlay">
@@ -51,7 +51,7 @@
           <UserAvatar
             v-else-if="typeof avatarAction === 'function'"
             class="user-info-avatar"
-            :user-id="user.id"
+            :user="user"
             @click="avatarAction"
           />
           <router-link
@@ -59,7 +59,7 @@
             class="user-info-avatar"
             :to="userProfileLink(user)"
           >
-            <UserAvatar :user-id="user.id" />
+            <UserAvatar :user="user" />
           </router-link>
           <div class="user-summary">
             <div class="top-line">
diff --git a/src/components/user_list_menu/user_list_menu.js b/src/components/user_list_menu/user_list_menu.js
index d04cdf692..b36175276 100644
--- a/src/components/user_list_menu/user_list_menu.js
+++ b/src/components/user_list_menu/user_list_menu.js
@@ -3,7 +3,6 @@ import { mapState } from 'pinia'
 import Popover from 'src/components/popover/popover.vue'
 
 import { useListsStore } from 'src/stores/lists.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronRight } from '@fortawesome/free-solid-svg-icons'
@@ -19,7 +18,7 @@ const UserListMenu = {
     Popover,
   },
   created() {
-    useUsersStore().fetchUserInLists(this.user.id)
+    this.$store.dispatch('fetchUserInLists', this.user.id)
   },
   computed: {
     ...mapState(useListsStore, {
@@ -50,7 +49,7 @@ const UserListMenu = {
             if (!response.ok) {
               return
             }
-            useUsersStore().fetchUserInLists(this.user.id)
+            this.$store.dispatch('fetchUserInLists', this.user.id)
           })
       } else {
         useListsStore()
@@ -59,7 +58,7 @@ const UserListMenu = {
             if (!response.ok) {
               return
             }
-            useUsersStore().fetchUserInLists(this.user.id)
+            this.$store.dispatch('fetchUserInLists', this.user.id)
           })
       }
     },
diff --git a/src/components/user_list_popover/user_list_popover.vue b/src/components/user_list_popover/user_list_popover.vue
index 8f774a9b1..ddeb6f6f6 100644
--- a/src/components/user_list_popover/user_list_popover.vue
+++ b/src/components/user_list_popover/user_list_popover.vue
@@ -17,7 +17,7 @@
             class="user-list-row"
           >
             <UserAvatar
-              :user-id="user.id"
+              :user="user"
               class="avatar-small"
               :compact="true"
             />
diff --git a/src/components/user_note/user_note.js b/src/components/user_note/user_note.js
index dab3ac9f6..bd246e9b3 100644
--- a/src/components/user_note/user_note.js
+++ b/src/components/user_note/user_note.js
@@ -1,7 +1,5 @@
 import PanelLoading from 'src/components/panel_loading/panel_loading.vue'
 
-import { useUsersStore } from 'src/stores/users.js'
-
 const UserNote = {
   props: {
     user: Object,
@@ -31,8 +29,11 @@ const UserNote = {
     finalizeEditing() {
       this.frozen = true
 
-      useUsersStore()
-        .editUserNote(this.user.id, this.localNote)
+      this.$store
+        .dispatch('editUserNote', {
+          id: this.user.id,
+          comment: this.localNote,
+        })
         .then(() => {
           this.frozen = false
           this.editing = false
diff --git a/src/components/user_panel/user_panel.js b/src/components/user_panel/user_panel.js
index ed74c86c7..08270a1c6 100644
--- a/src/components/user_panel/user_panel.js
+++ b/src/components/user_panel/user_panel.js
@@ -1,14 +1,15 @@
-import { mapState } from 'pinia'
+import { mapState } from 'vuex'
 
 import AuthForm from 'src/components/auth_form/auth_form.js'
 import PostStatusForm from 'src/components/post_status_form/post_status_form.vue'
 import UserCard from 'src/components/user_card/user_card.vue'
 
-import { useUsersStore } from 'src/stores/users.js'
-
 const UserPanel = {
   computed: {
-    ...mapState(useUsersStore, ['currentUser', 'loggedIn']),
+    signedIn() {
+      return this.user
+    },
+    ...mapState({ user: (state) => state.users.currentUser }),
   },
   components: {
     PostStatusForm,
diff --git a/src/components/user_panel/user_panel.vue b/src/components/user_panel/user_panel.vue
index 3dc1ef933..0f9260c4a 100644
--- a/src/components/user_panel/user_panel.vue
+++ b/src/components/user_panel/user_panel.vue
@@ -1,12 +1,12 @@
 <template>
   <aside class="user-panel">
     <div
-      v-if="loggedIn"
+      v-if="signedIn"
       key="user-panel-signed"
       class="panel panel-default signed-in"
     >
       <UserCard
-        :user-id="currentUser.id"
+        :user-id="user.id"
         :hide-bio="true"
       />
       <PostStatusForm />
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 774ecd479..eb1d8e068 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -9,8 +9,6 @@ import UserCard from 'src/components/user_card/user_card.vue'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useTimelinesStore } from 'src/stores/timelines.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
@@ -38,25 +36,30 @@ const UserProfile = {
     useInterfaceStore().setForeignProfileBackground(this.user?.background_image)
   },
   unmounted() {
+    this.stopFetching()
     useInterfaceStore().setForeignProfileBackground(null)
-    useUsersStore().clearFollowLists(this.userId)
+    this.$store.dispatch('clearFollowers', this.userId)
+    this.$store.dispatch('clearFriends', this.userId)
   },
   computed: {
+    timeline() {
+      return this.$store.state.statuses.timelines.user
+    },
     favorites() {
-      return useTimelinesStore().favorites
+      return this.$store.state.statuses.timelines.favorites
     },
     media() {
-      return useTimelinesStore().media
+      return this.$store.state.statuses.timelines.media
     },
     isUs() {
       return (
         this.userId &&
-        useUsersStore().currentUser.id &&
-        this.userId === useUsersStore().currentUser.id
+        this.$store.state.users.currentUser.id &&
+        this.userId === this.$store.state.users.currentUser.id
       )
     },
     user() {
-      return useUsersStore().findUser(this.userId)
+      return this.$store.getters.findUser(this.userId)
     },
     isExternal() {
       return this.$route.name === 'external-user-profile'
@@ -78,14 +81,18 @@ const UserProfile = {
       return useMergedConfigStore().mergedConfig.compactProfiles
     },
     friends() {
-      return [
-        ...useUsersStore().relationshipsLists.friends.get(this.user).keys(),
-      ].map((id) => useUsersStore().findUser(id))
+      return get(
+        this.$store.getters.findUser(this.userId),
+        'friendIds',
+        [],
+      ).map((id) => this.$store.getters.findUser(id))
     },
     followers() {
-      return [
-        ...useUsersStore().relationshipsLists.followers.get(this.user).keys(),
-      ].map((id) => useUsersStore().findUser(id))
+      return get(
+        this.$store.getters.findUser(this.userId),
+        'followerIds',
+        [],
+      ).map((id) => this.$store.getters.findUser(id))
     },
   },
   methods: {
@@ -94,14 +101,30 @@ const UserProfile = {
     },
     fetchUsers(group) {
       return () =>
-        useUsersStore()
-          ['fetch' + group](this.userId)
+        this.$store
+          .dispatch('fetch' + group, this.userId)
           .then((result) => ({ items: result }))
     },
     load(userNameOrId) {
+      const startFetchingTimeline = (timeline, userId) => {
+        // Clear timeline only if load another user's profile
+        if (userId !== this.$store.state.statuses.timelines[timeline].userId) {
+          this.$store.commit('clearTimeline', { timeline })
+        }
+        this.$store.dispatch('startFetchingTimeline', { timeline, userId })
+      }
+
       const loadById = (userId) => {
-        console.log('LOAD', userId)
         this.userId = userId
+        startFetchingTimeline('user', userId)
+        startFetchingTimeline('media', userId)
+        if (this.isUs) {
+          startFetchingTimeline('favorites')
+        } else if (!this.user.hide_favorites) {
+          startFetchingTimeline('favorites', userId)
+        }
+        // Fetch all pinned statuses immediately
+        this.$store.dispatch('fetchPinnedStatuses', userId)
       }
 
       // Reset view
@@ -113,17 +136,15 @@ const UserProfile = {
 
       // Check if user data is already loaded in store
       const user = maybeId
-        ? useUsersStore().findUser(maybeId)
-        : useUsersStore().findUserByName(maybeName)
-
+        ? this.$store.getters.findUser(maybeId)
+        : this.$store.getters.findUserByName(maybeName)
       if (user) {
         loadById(user.id)
       } else {
-        const promise = maybeId
-          ? useUsersStore().fetchUser(maybeId)
-          : useUsersStore().fetchUserByName(maybeName)
-
-        promise
+        ;(maybeId
+          ? this.$store.dispatch('fetchUser', maybeId)
+          : this.$store.dispatch('fetchUserByName', maybeName)
+        )
           .then(({ id }) => loadById(id))
           .catch((reason) => {
             const errorMessage = get(reason, 'error.error')
@@ -138,8 +159,13 @@ const UserProfile = {
           })
       }
     },
+    stopFetching() {
+      this.$store.dispatch('stopFetchingTimeline', 'user')
+      this.$store.dispatch('stopFetchingTimeline', 'favorites')
+      this.$store.dispatch('stopFetchingTimeline', 'media')
+    },
     switchUser(userNameOrId) {
-      console.log('USER SWITCH')
+      this.stopFetching()
       this.load(userNameOrId)
     },
     onTabSwitch(tab) {
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index fbad5c42d..6ca0c39bd 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -8,43 +8,32 @@
         <UserCard
           :user-id="userId"
           :switcher="true"
+          :selected="timeline.viewing"
           :compact="compactProfiles"
           avatar-action="zoom"
           :has-note-editor="true"
         />
       </div>
       <tab-switcher
-        v-if="userId"
         :active-tab="tab"
         :render-only-focused="true"
         :on-switch="onTabSwitch"
       >
-        <div
+        <Timeline
           key="statuses"
-          class="statuses"
           :label="$t('user_card.statuses')"
           :count="user.statuses_count"
+          :embedded="true"
           :title="$t('user_profile.timeline_title')"
-        >
-          <!--
-          <Timeline
-            key="statuses"
-            :timeline-ref="{ name: 'userPinned', argument: userId }"
-            embedded
-            in-profile
-            :footer-slipgate="footerRef"
-          />
-          -->
-          <Timeline
-            :timeline-ref="{ name: 'user', argument: userId }"
-            embedded
-            in-profile
-            skip-pinned
-            :footer-slipgate="footerRef"
-          />
-        </div>
+          :timeline="timeline"
+          timeline-name="user"
+          :user-id="userId"
+          :pinned-status-ids="user.pinnedStatusIds"
+          :in-profile="true"
+          :footer-slipgate="footerRef"
+        />
         <div
-          v-if="followsTabVisible && user"
+          v-if="followsTabVisible"
           key="followees"
           class="panel-body"
           :label="$t('user_card.followees')"
@@ -60,7 +49,7 @@
           </List>
         </div>
         <div
-          v-if="followersTabVisible && user"
+          v-if="followersTabVisible"
           key="followers"
           class="panel-body"
           :label="$t('user_card.followers')"
@@ -81,23 +70,26 @@
         <Timeline
           key="media"
           :label="$t('user_card.media')"
-          :disabled="media.visibleStatusIds.size === 0"
+          :disabled="!media.visibleStatuses.length"
+          :embedded="true"
           :title="$t('user_card.media')"
-          :timeline-ref="{ name: 'media', argument: userId }"
-          embedded
-          in-profile
+          timeline-name="media"
+          :timeline="media"
+          :user-id="userId"
+          :in-profile="true"
           :footer-slipgate="footerRef"
         />
         <Timeline
           v-if="favoritesTabVisible"
           key="favorites"
           :label="$t('user_card.favorites')"
-          :disabled="favorites.visibleStatusIds.size === 0"
+          :disabled="!favorites.visibleStatuses.length"
+          :embedded="true"
           :title="$t('user_card.favorites')"
-          :timeline-ref="{ name: 'favorites', argument: userId }"
-          :argument="isUs ? undefined : userId"
-          embedded
-          in-profile
+          timeline-name="favorites"
+          :timeline="favorites"
+          :user-id="isUs ? undefined : userId"
+          :in-profile="true"
           :footer-slipgate="footerRef"
         />
       </tab-switcher>
diff --git a/src/components/user_profile/user_profile_admin_view.js b/src/components/user_profile/user_profile_admin_view.js
index da0a05372..da2c6c322 100644
--- a/src/components/user_profile/user_profile_admin_view.js
+++ b/src/components/user_profile/user_profile_admin_view.js
@@ -5,7 +5,6 @@ import UserCard from 'src/components/user_card/user_card.vue'
 
 import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
@@ -20,7 +19,7 @@ const UserProfileAdminView = {
     }
   },
   created() {
-    useUsersStore().fetchUserIfMissing({ id: this.userId })
+    this.$store.dispatch('fetchUserIfMissing', this.userId)
     useInterfaceStore().setForeignProfileBackground(this.user?.background_image)
   },
   updated() {
@@ -39,7 +38,7 @@ const UserProfileAdminView = {
       }
     },
     user() {
-      return useUsersStore().findUser(this.userId)
+      return this.$store.getters.findUser(this.userId)
     },
     userId() {
       return this.$route.params.id
diff --git a/src/components/user_reporting_modal/user_reporting_modal.js b/src/components/user_reporting_modal/user_reporting_modal.js
index 232305415..017a17efa 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.js
+++ b/src/components/user_reporting_modal/user_reporting_modal.js
@@ -7,7 +7,6 @@ import UserLink from 'src/components/user_link/user_link.vue'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useReportsStore } from 'src/stores/reports.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { reportUser } from 'src/api/user.js'
 
@@ -29,7 +28,7 @@ const UserReportingModal = {
   },
   computed: {
     isLoggedIn() {
-      return !!useUsersStore().currentUser
+      return !!this.$store.state.users.currentUser
     },
     isOpen() {
       return this.isLoggedIn && this.reportModal.activated
@@ -38,7 +37,7 @@ const UserReportingModal = {
       return this.reportModal.userId
     },
     user() {
-      return useUsersStore().findUser(this.userId)
+      return this.$store.getters.findUser(this.userId)
     },
     remoteInstance() {
       return (
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 360c73ee8..f0c150999 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
@@ -5,7 +5,6 @@ import Select from 'src/components/select/select.vue'
 
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { durationStrToMs } from 'src/services/date_utils/date_utils.js'
 
@@ -65,6 +64,13 @@ const UserTimedFilterModal = {
     expirySeconds() {
       return Math.floor(durationStrToMs(this.expiryString) / 1000)
     },
+    requestBody() {
+      const object = { id: this.user.id }
+      if (!this.forever) {
+        object.expiresIn = this.expirySeconds
+      }
+      return object
+    },
   },
   watch: {
     expiration(newVal) {
@@ -83,10 +89,7 @@ const UserTimedFilterModal = {
     },
     accept() {
       if (this.isMute) {
-        useUsersStore().muteUser(
-          this.user.id,
-          this.forever ? undefined : this.expirySeconds,
-        )
+        this.$store.dispatch('muteUser', this.requestBody)
         if (this.dontAskAgain) {
           useSyncConfigStore().setSimplePrefAndSave({
             path: 'onMuteDefaultAction',
@@ -94,10 +97,7 @@ const UserTimedFilterModal = {
           })
         }
       } else {
-        useUsersStore().blockUser(
-          this.user.id,
-          this.forever ? undefined : this.expirySeconds,
-        )
+        this.$store.dispatch('blockUser', this.requestBody)
         if (this.dontAskAgain) {
           useSyncConfigStore().setSimplePrefAndSave({
             path: 'onBlockDefaultAction',
diff --git a/src/components/who_to_follow/who_to_follow.js b/src/components/who_to_follow/who_to_follow.js
index 44581f313..28b63c973 100644
--- a/src/components/who_to_follow/who_to_follow.js
+++ b/src/components/who_to_follow/who_to_follow.js
@@ -1,7 +1,6 @@
 import FollowCard from 'src/components/follow_card/follow_card.vue'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { fetchUser, suggestions } from 'src/api/public.js'
 
@@ -23,10 +22,9 @@ const WhoToFollow = {
         fetchUser({
           id,
           credentials: useOAuthStore().token,
-        }).then((result) => {
-          const { data: externalUser } = result
+        }).then(({ data: externalUser }) => {
           if (!externalUser.error) {
-            useUsersStore().addNewUsers(result)
+            this.$store.commit('addNewUsers', [externalUser])
             this.users.push(externalUser)
           }
         })
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 b87004e44..7a65ba39d 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
@@ -3,7 +3,6 @@ import { shuffle } from 'lodash'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { fetchUser, suggestions } from 'src/api/public.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
@@ -22,16 +21,17 @@ function showWhoToFollow(panel, reply) {
     fetchUser({
       id: name,
       credentials: useOAuthStore().token,
-    }).then((result) => {
-      const { data: externalUser } = result
-      useUsersStore().addNewUsers(result)
-      toFollow.id = externalUser.id
+    }).then(({ data: externalUser }) => {
+      if (!externalUser.error) {
+        panel.$store.commit('addNewUsers', [externalUser])
+        toFollow.id = externalUser.id
+      }
     })
   })
 }
 
 function getWhoToFollow(panel) {
-  const credentials = panel.$useUsersStore().currentUser.credentials
+  const credentials = panel.$store.state.users.currentUser.credentials
   if (credentials) {
     panel.usersToFollow.forEach((toFollow) => {
       toFollow.name = 'Loading...'
@@ -48,7 +48,7 @@ const WhoToFollowPanel = {
   }),
   computed: {
     user: function () {
-      return useUsersStore().currentUser.screen_name
+      return this.$store.state.users.currentUser.screen_name
     },
     suggestionsEnabled() {
       return useInstanceCapabilitiesStore().suggestionsEnabled
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 8c7379742..4b257be9f 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1633,8 +1633,6 @@
     "no_more_statuses": "No more statuses",
     "no_statuses": "No statuses",
     "socket_reconnected": "Realtime connection established",
-    "socket_disconnected": "Realtime connection unavaialable",
-    "socket_closed": "Realtime connection closed",
     "socket_broke": "Realtime connection lost: CloseEvent code {0}",
     "quick_view_settings": "Quick view settings",
     "quick_filter_settings": "Quick filter settings",
@@ -1732,7 +1730,6 @@
     "more_actions": "More actions on this status",
     "loading": "Loading...",
     "load_error": "Unable to load status: {error}",
-    "interact_error": "Error interacting with status: {error}",
     "admin_change_scope": "Change visibility",
     "mark_as_sensitive": "Sensitive",
     "mark_as_non-sensitive": "Non-sensitive"
diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index a4dfe7d00..5fcf259aa 100644
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@@ -16,6 +16,8 @@ const defaultReducer = (state, paths) =>
 
 const saveImmedeatelyActions = [
   'markNotificationsAsSeen',
+  'clearCurrentUser',
+  'setCurrentUser',
   'setHighlight',
   'setOption',
   'setClientData',
@@ -73,13 +75,19 @@ export default function createPersistedState({
             setState(key, reducer(cloneDeep(state), paths), storage).then(
               (success) => {
                 if (success !== undefined) {
-                  if (mutation.type === 'setOption') {
+                  if (
+                    mutation.type === 'setOption' ||
+                    mutation.type === 'setCurrentUser'
+                  ) {
                     useInterfaceStore().settingsSaved({ success })
                   }
                 }
               },
               (error) => {
-                if (mutation.type === 'setOption') {
+                if (
+                  mutation.type === 'setOption' ||
+                  mutation.type === 'setCurrentUser'
+                ) {
                   useInterfaceStore().settingsSaved({ error })
                 }
               },
diff --git a/src/lib/push_notifications_plugin.js b/src/lib/push_notifications_plugin.js
index 951eb2c4b..f4dcb1dbc 100644
--- a/src/lib/push_notifications_plugin.js
+++ b/src/lib/push_notifications_plugin.js
@@ -1,18 +1,22 @@
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 export const piniaPushNotificationsPlugin = ({ store }) => {
-  const validActions = {
-    sync_config: new Set(['setPreference']),
-    interface: new Set(['setNotificationPermission', 'setLoginStatus']),
-  }
-
-  if (!validActions[store.$id]) return // Not applicable to the store
+  if (
+    store.$id !== 'sync_config' &&
+    store.$id !== 'instance' &&
+    store.$id !== 'interface'
+  )
+    return
 
   store.$onAction(({ name: actionName, args }) => {
-    if (!validActions[store.$id].has(actionName)) return // Not applicable to action
+    if (
+      store.$id === 'interface' &&
+      actionName !== 'setNotificationPermission' &&
+      actionName !== 'setLoginStatus'
+    )
+      return
 
     // Initial state
     let vapidPublicKey = useInstanceStore().vapidPublicKey
@@ -21,7 +25,7 @@ export const piniaPushNotificationsPlugin = ({ store }) => {
       useInterfaceStore().notificationPermission === 'granted'
     let permissionPresent =
       useInterfaceStore().notificationPermission !== undefined
-    let user = !!useUsersStore().currentUser
+    let user = !!window.vuex.state.users.currentUser
 
     if (store.$id === 'instance') {
       if (actionName === 'set' && args[0].path === 'vapidPublicKey') {
@@ -55,9 +59,35 @@ export const piniaPushNotificationsPlugin = ({ store }) => {
     }
 
     if (permissionGranted && enabled && user) {
-      return useInterfaceStore().registerPushNotifications()
+      return window.vuex.dispatch('registerPushNotifications')
     } else {
-      return useInterfaceStore().unregisterPushNotifications()
+      return window.vuex.dispatch('unregisterPushNotifications')
+    }
+  })
+}
+
+export const vuexPushNotificationsPlugin = (store) => {
+  store.subscribe((mutation, state) => {
+    // Initial state
+    const vapidPublicKey = useInstanceStore().vapidPublicKey
+    const enabled = useMergedConfigStore().mergedConfig.webPushNotifications
+    const permissionGranted =
+      useInterfaceStore().notificationPermission === 'granted'
+    const permissionPresent =
+      useInterfaceStore().notificationPermission !== undefined
+    const user = state.users.currentUser
+
+    if (!permissionPresent || !vapidPublicKey) return
+
+    if (
+      mutation.type === 'setCurrentUser' ||
+      mutation.type === 'clearCurrentUser'
+    ) {
+      if (user && permissionGranted && enabled) {
+        return store.dispatch('registerPushNotifications')
+      } else {
+        return store.dispatch('unregisterPushNotifications')
+      }
     }
   })
 }
diff --git a/src/main.js b/src/main.js
index 735725250..44b01aabb 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,7 +20,10 @@ import messages from './i18n/messages.js'
 import createPersistedState, {
   piniaPersistPlugin,
 } from './lib/persisted_state.js'
-import { piniaPushNotificationsPlugin } from './lib/push_notifications_plugin.js'
+import {
+  piniaPushNotificationsPlugin,
+  vuexPushNotificationsPlugin,
+} from './lib/push_notifications_plugin.js'
 import vuexModules from './modules/index.js'
 
 import { piniaLanguagePlugin } from 'src/lib/language.js'
@@ -38,7 +41,7 @@ const i18n = createI18n({
 messages.setLanguage(i18n.global, currentLocale)
 
 const persistedStateOptions = {
-  paths: ['oauth', 'config'],
+  paths: ['users.lastLoginName', 'oauth', 'config'],
 }
 
 ;(async () => {
@@ -69,7 +72,7 @@ const persistedStateOptions = {
 
   try {
     let storageError
-    const plugins = []
+    const plugins = [vuexPushNotificationsPlugin]
     const pinia = createPinia()
     pinia.use(piniaPersistPlugin())
     pinia.use(piniaLanguagePlugin)
diff --git a/src/modules/api.js b/src/modules/api.js
index 290fbfc27..d2c578c9c 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -1,15 +1,32 @@
 import { Socket } from 'phoenix'
 
+import { maybeShowChatNotification } from '../services/chat_utils/chat_utils.js'
+
+import { useChatsStore } from 'src/stores/chats.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
+import { useInterfaceStore } from 'src/stores/interface.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useShoutStore } from 'src/stores/shout.js'
 
+import { fetchTimeline } from 'src/api/timelines.js'
+import {
+  getMastodonSocketURI,
+  ProcessedWS,
+  WSConnectionStatus,
+} from 'src/api/websocket.js'
 import followRequestFetcher from 'src/services/follow_request_fetcher/follow_request_fetcher.service'
+import notificationsFetcher from 'src/services/notifications_fetcher/notifications_fetcher.service.js'
+import timelineFetcher from 'src/services/timeline_fetcher/timeline_fetcher.service.js'
+
+const retryTimeout = (multiplier) => 1000 * multiplier
 
 const api = {
   state: {
+    retryMultiplier: 1,
     fetchers: {},
     socket: null,
+    mastoUserSocket: null,
+    mastoUserSocketStatus: null,
     followRequests: [],
   },
   getters: {
@@ -32,8 +49,257 @@ const api = {
     setFollowRequests(state, value) {
       state.followRequests = value
     },
+    setMastoUserSocketStatus(state, value) {
+      state.mastoUserSocketStatus = value
+    },
+    incrementRetryMultiplier(state) {
+      state.retryMultiplier = Math.max(++state.retryMultiplier, 3)
+    },
+    resetRetryMultiplier(state) {
+      state.retryMultiplier = 1
+    },
   },
   actions: {
+    /**
+     * Global MastoAPI socket control, in future should disable ALL sockets/(re)start relevant sockets
+     *
+     * @param {Boolean} [initial] - whether this enabling happened at boot time or not
+     */
+    enableMastoSockets(store, initial) {
+      const { state, dispatch, commit } = store
+      // Do not initialize unless nonexistent or closed
+      if (
+        state.mastoUserSocket &&
+        ![WebSocket.CLOSED, WebSocket.CLOSING].includes(
+          state.mastoUserSocket.getState(),
+        )
+      ) {
+        return
+      }
+      if (initial) {
+        commit('setMastoUserSocketStatus', WSConnectionStatus.STARTING_INITIAL)
+      } else {
+        commit('setMastoUserSocketStatus', WSConnectionStatus.STARTING)
+      }
+      return dispatch('startMastoUserSocket')
+    },
+    disableMastoSockets(store) {
+      const { state, dispatch, commit } = store
+      if (!state.mastoUserSocket) return
+      commit('setMastoUserSocketStatus', WSConnectionStatus.DISABLED)
+      return dispatch('stopMastoUserSocket')
+    },
+
+    // MastoAPI 'User' sockets
+    startMastoUserSocket(store) {
+      return new Promise((resolve, reject) => {
+        try {
+          const { state, commit, dispatch, rootState } = store
+          const timelineData = rootState.statuses.timelines.friends
+
+          const credentials = useOAuthStore().token
+          const url = getMastodonSocketURI({ credentials })
+
+          state.mastoUserSocket = ProcessedWS({
+            url,
+            id: 'Unified',
+            credentials,
+          })
+
+          state.mastoUserSocket.addEventListener(
+            'pleroma:authenticated',
+            () => {
+              state.mastoUserSocket.subscribe('user')
+            },
+          )
+          state.mastoUserSocket.addEventListener(
+            'message',
+            ({ detail: message }) => {
+              if (!message) return // pings
+              if (message.event === 'notification') {
+                dispatch('addNewNotifications', {
+                  notifications: [message.notification],
+                  older: false,
+                })
+              } else if (message.event === 'update') {
+                dispatch('addNewStatuses', {
+                  statuses: [message.status],
+                  userId: false,
+                  showImmediately: timelineData.visibleStatuses.length === 0,
+                  timeline: 'friends',
+                })
+              } else if (message.event === 'status.update') {
+                dispatch('addNewStatuses', {
+                  statuses: [message.status],
+                  userId: false,
+                  showImmediately:
+                    message.status.id in timelineData.visibleStatusesObject,
+                  timeline: 'friends',
+                })
+              } else if (message.event === 'delete') {
+                dispatch('deleteStatusById', message.id)
+              } else if (message.event === 'pleroma:chat_update') {
+                // The setTimeout wrapper is a temporary band-aid to avoid duplicates for the user's own messages when doing optimistic sending.
+                // The cause of the duplicates is the WS event arriving earlier than the HTTP response.
+                // This setTimeout wrapper can be removed once the commit `8e41baff` is in the stable Pleroma release.
+                // (`8e41baff` adds the idempotency key to the chat message entity, which PleromaFE uses when it's available, and it makes this artificial delay unnecessary).
+                setTimeout(() => {
+                  dispatch('addChatMessages', {
+                    chatId: message.chatUpdate.id,
+                    messages: [message.chatUpdate.lastMessage],
+                  })
+                  dispatch('updateChat', { chat: message.chatUpdate })
+                  maybeShowChatNotification(store, message.chatUpdate)
+                }, 100)
+              }
+            },
+          )
+          state.mastoUserSocket.addEventListener('open', () => {
+            // Do not show notification when we just opened up the page
+            if (
+              state.mastoUserSocketStatus !==
+              WSConnectionStatus.STARTING_INITIAL
+            ) {
+              useInterfaceStore().pushGlobalNotice({
+                level: 'success',
+                messageKey: 'timeline.socket_reconnected',
+                timeout: 5000,
+              })
+            }
+            // Stop polling if we were errored or disabled
+            if (
+              new Set([
+                WSConnectionStatus.ERROR,
+                WSConnectionStatus.DISABLED,
+              ]).has(state.mastoUserSocketStatus)
+            ) {
+              dispatch('stopFetchingTimeline', { timeline: 'friends' })
+              dispatch('stopFetchingNotifications')
+              useChatsStore().stopFetchingChats()
+            }
+            commit('resetRetryMultiplier')
+            commit('setMastoUserSocketStatus', WSConnectionStatus.JOINED)
+          })
+          state.mastoUserSocket.addEventListener(
+            'error',
+            ({ detail: error }) => {
+              console.error('Error in MastoAPI websocket:', error)
+              // TODO is this needed?
+              dispatch('clearOpenedChats')
+            },
+          )
+          state.mastoUserSocket.addEventListener(
+            'close',
+            ({ detail: closeEvent }) => {
+              const ignoreCodes = new Set([
+                1000, // Normal (intended) closure
+                1001, // Going away
+              ])
+              const { code } = closeEvent
+              if (ignoreCodes.has(code)) {
+                console.debug(
+                  `Not restarting socket becasue of closure code ${code} is in ignore list`,
+                )
+                commit('setMastoUserSocketStatus', WSConnectionStatus.CLOSED)
+              } else {
+                console.warn(
+                  `MastoAPI websocket disconnected, restarting. CloseEvent code: ${code}`,
+                )
+                setTimeout(() => {
+                  dispatch('startMastoUserSocket')
+                }, retryTimeout(state.retryMultiplier))
+                commit('incrementRetryMultiplier')
+                if (state.mastoUserSocketStatus !== WSConnectionStatus.ERROR) {
+                  dispatch('startFetchingTimeline', { timeline: 'friends' })
+                  dispatch('startFetchingNotifications')
+                  dispatch('startFetchingChats')
+                  useInterfaceStore().pushGlobalNotice({
+                    level: 'error',
+                    messageKey: 'timeline.socket_broke',
+                    messageArgs: [code],
+                    timeout: 5000,
+                  })
+                }
+                commit('setMastoUserSocketStatus', WSConnectionStatus.ERROR)
+              }
+              dispatch('clearOpenedChats')
+            },
+          )
+          resolve()
+        } catch (e) {
+          reject(e)
+        }
+      })
+    },
+    stopMastoUserSocket({ state, dispatch }) {
+      dispatch('startFetchingTimeline', { timeline: 'friends' })
+      dispatch('startFetchingNotifications')
+      dispatch('startFetchingChats')
+      state.mastoUserSocket.close()
+    },
+
+    // Timelines
+    startFetchingTimeline(
+      store,
+      {
+        timeline = 'friends',
+        tag = false,
+        userId = false,
+        listId = false,
+        statusId = false,
+        bookmarkFolderId = false,
+      },
+    ) {
+      if (
+        timeline === 'favourites' &&
+        !useInstanceCapabilitiesStore().pleromaPublicFavouritesAvailable
+      )
+        return
+      if (store.state.fetchers[timeline]) return
+
+      const fetcher = timelineFetcher.startFetching({
+        timeline,
+        store,
+        userId,
+        listId,
+        statusId,
+        bookmarkFolderId,
+        tag,
+        credentials: useOAuthStore().token,
+      })
+
+      store.commit('addFetcher', { fetcherName: timeline, fetcher })
+    },
+    stopFetchingTimeline(store, timeline) {
+      const fetcher = store.state.fetchers[timeline]
+      if (!fetcher) return
+      store.commit('removeFetcher', { fetcherName: timeline, fetcher })
+    },
+
+    fetchTimeline(store, { timeline, ...rest }) {
+      fetchTimeline({
+        store,
+        timeline,
+        ...rest,
+        credentials: useOAuthStore().token,
+      })
+    },
+
+    // Notifications
+    startFetchingNotifications(store) {
+      if (store.state.fetchers.notifications) return
+      const fetcher = notificationsFetcher.startFetching({
+        store,
+        credentials: useOAuthStore().token,
+      })
+      store.commit('addFetcher', { fetcherName: 'notifications', fetcher })
+    },
+    stopFetchingNotifications(store) {
+      const fetcher = store.state.fetchers.notifications
+      if (!fetcher) return
+      store.commit('removeFetcher', { fetcherName: 'notifications', fetcher })
+    },
+
     // Follow requests
     startFetchingFollowRequests(store) {
       if (store.state.fetchers.followRequests) return
diff --git a/src/modules/index.js b/src/modules/index.js
index 6aa236257..c8f3dce39 100644
--- a/src/modules/index.js
+++ b/src/modules/index.js
@@ -1,8 +1,14 @@
 import api from './api.js'
 import drafts from './drafts.js'
+import notifications from './notifications.js'
 import profileConfig from './profileConfig.js'
+import statuses from './statuses.js'
+import users from './users.js'
 
 export default {
+  statuses,
+  notifications,
+  users,
   api,
   profileConfig,
   drafts,
diff --git a/src/modules/notifications.js b/src/modules/notifications.js
new file mode 100644
index 000000000..b77683811
--- /dev/null
+++ b/src/modules/notifications.js
@@ -0,0 +1,192 @@
+import {
+  closeAllDesktopNotifications,
+  closeDesktopNotification,
+} from '../services/desktop_notification_utils/desktop_notification_utils.js'
+import {
+  isStatusNotification,
+  isValidNotification,
+  maybeShowNotification,
+} from '../services/notification_utils/notification_utils.js'
+
+import { useI18nStore } from 'src/stores/i18n.js'
+import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useOAuthStore } from 'src/stores/oauth.js'
+import { useReportsStore } from 'src/stores/reports.js'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
+import { dismissNotification, markNotificationsAsSeen } from 'src/api/user.js'
+
+const emptyNotifications = () => ({
+  desktopNotificationSilence: true,
+  maxId: 0,
+  minId: Number.POSITIVE_INFINITY,
+  data: [],
+  idStore: {},
+  loading: false,
+})
+
+export const defaultState = () => ({
+  ...emptyNotifications(),
+})
+
+export const notifications = {
+  state: defaultState(),
+  mutations: {
+    addNewNotifications(state, { notifications }) {
+      notifications.forEach((notification) => {
+        state.data.push(notification)
+        state.idStore[notification.id] = notification
+      })
+    },
+    clearNotifications(state) {
+      const blankState = defaultState()
+      Object.keys(state).forEach((k) => {
+        state[k] = blankState[k]
+      })
+    },
+    updateNotificationsMinMaxId(state, id) {
+      state.maxId = id > state.maxId ? id : state.maxId
+      state.minId = id < state.minId ? id : state.minId
+    },
+    setNotificationsLoading(state, { value }) {
+      state.loading = value
+    },
+    setNotificationsSilence(state, { value }) {
+      state.desktopNotificationSilence = value
+    },
+    markNotificationsAsSeen(state) {
+      state.data.forEach((notification) => {
+        notification.seen = true
+      })
+    },
+    markSingleNotificationAsSeen(state, { id }) {
+      const notification = state.idStore[id]
+      if (notification) notification.seen = true
+    },
+    dismissNotification(state, { id }) {
+      state.data = state.data.filter((n) => n.id !== id)
+      delete state.idStore[id]
+    },
+    updateNotification(state, { id, updater }) {
+      const notification = state.idStore[id]
+      notification && updater(notification)
+    },
+  },
+  actions: {
+    addNewNotifications(store, { notifications }) {
+      const { commit, dispatch, state, rootState } = store
+      const validNotifications = notifications.filter((notification) => {
+        // If invalid notification, update ids but don't add it to store
+        if (!isValidNotification(notification)) {
+          console.error('Invalid notification:', notification)
+          commit('updateNotificationsMinMaxId', notification.id)
+          return false
+        }
+        return true
+      })
+
+      const statusNotifications = validNotifications.filter(
+        (notification) =>
+          isStatusNotification(notification.type) && notification.status,
+      )
+
+      // Synchronous commit to add all the statuses
+      commit('addNewStatuses', {
+        statuses: statusNotifications.map(
+          (notification) => notification.status,
+        ),
+      })
+
+      // Update references to statuses in notifications to ones in the store
+      statusNotifications.forEach((notification) => {
+        const id = notification.status.id
+        const referenceStatus = rootState.statuses.allStatusesObject[id]
+
+        if (referenceStatus) {
+          notification.status = referenceStatus
+        }
+      })
+
+      validNotifications.forEach((notification) => {
+        if (notification.type === 'pleroma:report') {
+          useReportsStore().addReport(notification.report)
+        }
+
+        if (notification.type === 'pleroma:emoji_reaction') {
+          dispatch('fetchEmojiReactionsBy', notification.status.id)
+        }
+
+        // Only add a new notification if we don't have one for the same action
+        if (!Object.hasOwn(state.idStore, notification.id)) {
+          commit('updateNotificationsMinMaxId', notification.id)
+          commit('addNewNotifications', { notifications: [notification] })
+
+          maybeShowNotification(
+            store,
+            useMergedConfigStore().mergedConfig.notificationVisibility,
+            Object.values(useSyncConfigStore().prefsStorage.simple.muteFilters),
+            notification,
+            useI18nStore().i18n,
+          )
+        } else if (notification.seen) {
+          state.idStore[notification.id].seen = true
+        }
+      })
+    },
+    notificationClicked({ state, dispatch }, { id }) {
+      const notification = state.idStore[id]
+      const { type, seen } = notification
+
+      if (!seen) {
+        switch (type) {
+          case 'mention':
+          case 'pleroma:report':
+          case 'follow_request':
+            break
+          default:
+            dispatch('markSingleNotificationAsSeen', { id })
+        }
+      }
+    },
+    setNotificationsLoading({ commit }, { value }) {
+      commit('setNotificationsLoading', { value })
+    },
+    setNotificationsSilence({ commit }, { value }) {
+      commit('setNotificationsSilence', { value })
+    },
+    markNotificationsAsSeen({ rootState, state, commit }) {
+      commit('markNotificationsAsSeen')
+      markNotificationsAsSeen({
+        id: state.maxId,
+        credentials: rootState.users.currentUser.credentials,
+      }).then(() => {
+        closeAllDesktopNotifications(rootState)
+      })
+    },
+    markSingleNotificationAsSeen({ rootState, commit }, { id }) {
+      commit('markSingleNotificationAsSeen', { id })
+      markNotificationsAsSeen({
+        single: true,
+        id,
+        credentials: rootState.users.currentUser.credentials,
+      }).then(() => {
+        closeDesktopNotification(rootState, { id })
+      })
+    },
+    dismissNotificationLocal({ commit }, { id }) {
+      commit('dismissNotification', { id })
+    },
+    dismissNotification({ rootState, commit }, { id }) {
+      commit('dismissNotification', { id })
+      dismissNotification({
+        id,
+        credentials: useOAuthStore().token,
+      })
+    },
+    updateNotification({ commit }, { id, updater }) {
+      commit('updateNotification', { id, updater })
+    },
+  },
+}
+
+export default notifications
diff --git a/src/modules/profileConfig.js b/src/modules/profileConfig.js
index 8b9c77425..3fca7d6a8 100644
--- a/src/modules/profileConfig.js
+++ b/src/modules/profileConfig.js
@@ -1,7 +1,6 @@
 import { get, set } from 'lodash'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { updateNotificationSettings, updateProfile } from 'src/api/user.js'
 
@@ -11,8 +10,9 @@ const defaultApi = ({ rootState, commit }, { path, value }) => {
   return updateProfile({
     params,
     credentials: useOAuthStore().token,
-  }).then((result) => {
-    useUsersStore().addNewUsers(result)
+  }).then(({ data: result }) => {
+    commit('addNewUsers', [result])
+    commit('setCurrentUser', result)
   })
 }
 
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
new file mode 100644
index 000000000..f39da5b3f
--- /dev/null
+++ b/src/modules/statuses.js
@@ -0,0 +1,901 @@
+import {
+  each,
+  find,
+  findIndex,
+  first,
+  last,
+  maxBy,
+  merge,
+  minBy,
+  omitBy,
+  remove,
+} from 'lodash'
+
+import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
+import { useInterfaceStore } from 'src/stores/interface.js'
+import { useOAuthStore } from 'src/stores/oauth.js'
+
+import {
+  fetchEmojiReactions,
+  fetchFavoritedByUsers,
+  fetchPinnedStatuses,
+  fetchRebloggedByUsers,
+  fetchScrobbles,
+  fetchStatus,
+  fetchStatusHistory,
+  fetchStatusSource,
+  search2,
+} from 'src/api/public.js'
+import {
+  bookmarkStatus,
+  deleteStatus,
+  favorite,
+  muteConversation,
+  pinOwnStatus,
+  reactWithEmoji,
+  retweet,
+  unbookmarkStatus,
+  unfavorite,
+  unmuteConversation,
+  unpinOwnStatus,
+  unreactWithEmoji,
+  unretweet,
+} from 'src/api/user.js'
+
+const emptyTl = (userId = 0) => ({
+  statuses: [],
+  statusesObject: {},
+  faves: [],
+  visibleStatuses: [],
+  visibleStatusesObject: {},
+  newStatusCount: 0,
+  maxId: '',
+  minId: '',
+  minVisibleId: 0,
+  loading: false,
+  followers: [],
+  friends: [],
+  userId,
+  flushMarker: 0,
+})
+
+export const defaultState = () => ({
+  allStatuses: [],
+  scrobblesNextFetch: {},
+  allStatusesObject: {},
+  conversationsObject: {},
+  maxId: '',
+  favorites: new Set(),
+  timelines: {
+    mentions: emptyTl(),
+    public: emptyTl(),
+    user: emptyTl(),
+    favorites: emptyTl(),
+    media: emptyTl(),
+    publicAndExternal: emptyTl(),
+    friends: emptyTl(),
+    tag: emptyTl(),
+    dms: emptyTl(),
+    bookmarks: emptyTl(),
+    list: emptyTl(),
+    bubble: emptyTl(),
+  },
+})
+
+export const prepareStatus = (status) => {
+  // Set deleted flag
+  status.deleted = false
+
+  // To make the array reactive
+  status.attachments = status.attachments || []
+
+  return status
+}
+
+const mergeOrAdd = (arr, obj, item) => {
+  const oldItem = obj[item.id]
+
+  if (oldItem) {
+    // We already have this, so only merge the new info.
+    // We ignore null values to avoid overwriting existing properties with missing data
+    // we also skip 'user' because that is handled by users module
+    merge(
+      oldItem,
+      omitBy(item, (v, k) => v === null || k === 'user'),
+    )
+    // Reactivity fix.
+    oldItem.attachments.splice(oldItem.attachments.length)
+    return { item: oldItem, new: false }
+  } else {
+    // This is a new item, prepare it
+    prepareStatus(item)
+    arr.push(item)
+    obj[item.id] = item
+    return { item, new: true }
+  }
+}
+
+const sortById = (a, b) => {
+  const seqA = Number(a.id)
+  const seqB = Number(b.id)
+  const isSeqA = !Number.isNaN(seqA)
+  const isSeqB = !Number.isNaN(seqB)
+  if (isSeqA && isSeqB) {
+    return seqA > seqB ? -1 : 1
+  } else if (isSeqA && !isSeqB) {
+    return 1
+  } else if (!isSeqA && isSeqB) {
+    return -1
+  } else {
+    return a.id > b.id ? -1 : 1
+  }
+}
+
+const sortTimeline = (timeline) => {
+  timeline.visibleStatuses = timeline.visibleStatuses.sort(sortById)
+  timeline.statuses = timeline.statuses.sort(sortById)
+  timeline.minVisibleId = last(timeline.visibleStatuses)?.id
+  return timeline
+}
+
+const getLatestScrobble = (state, user) => {
+  const scrobblesSupport =
+    useInstanceCapabilitiesStore().pleromaScrobblesAvailable
+
+  if (!scrobblesSupport || !user.name || user.id === 'undefined') {
+    return
+  }
+
+  if (
+    state.scrobblesNextFetch[user.id] &&
+    state.scrobblesNextFetch[user.id] > Date.now()
+  ) {
+    return
+  }
+
+  state.scrobblesNextFetch[user.id] = Date.now() + 24 * 60 * 60 * 1000
+  if (!scrobblesSupport) return
+  fetchScrobbles({ accountId: user.id })
+    .then(({ data: scrobbles }) => {
+      if (scrobbles?.error) {
+        useInstanceCapabilitiesStore().set('pleromaScrobblesAvailable', false)
+        return
+      }
+
+      if (scrobbles.length > 0) {
+        user.latestScrobble = scrobbles[0]
+
+        state.scrobblesNextFetch[user.id] = Date.now() + 60 * 1000
+      }
+    })
+    .catch((e) => {
+      console.warn('cannot fetch scrobbles', e)
+    })
+}
+
+// Add status to the global storages (arrays and objects maintaining statuses) except timelines
+const addStatusToGlobalStorage = (state, data) => {
+  getLatestScrobble(state, data.user)
+  const result = mergeOrAdd(state.allStatuses, state.allStatusesObject, data)
+  if (result.new) {
+    // Add to conversation
+    const status = result.item
+    const conversationsObject = state.conversationsObject
+    const conversationId = status.statusnet_conversation_id
+    if (conversationsObject[conversationId]) {
+      conversationsObject[conversationId].push(status)
+    } else {
+      conversationsObject[conversationId] = [status]
+    }
+  }
+  return result
+}
+
+const addNewStatuses = (
+  state,
+  {
+    statuses,
+    showImmediately = false,
+    timeline,
+    user = {},
+    noIdUpdate = false,
+    userId,
+    pagination = {},
+  },
+) => {
+  // Sanity check
+  if (!Array.isArray(statuses)) {
+    return false
+  }
+
+  const allStatuses = state.allStatuses
+  const timelineObject = state.timelines[timeline]
+
+  // Mismatch between API pagination and our internal minId/maxId tracking systems:
+  // pagination.maxId is the oldest of the returned statuses when fetching older,
+  // and pagination.minId is the newest when fetching newer. The names come directly
+  // from the arguments they're supposed to be passed as for the next fetch.
+  const minNew =
+    pagination.maxId || (statuses.length > 0 ? minBy(statuses, 'id').id : 0)
+  const maxNew =
+    pagination.minId || (statuses.length > 0 ? maxBy(statuses, 'id').id : 0)
+
+  const newer =
+    timeline &&
+    (maxNew > timelineObject.maxId || timelineObject.maxId === '') &&
+    statuses.length > 0
+  const older =
+    timeline &&
+    (minNew < timelineObject.minId || timelineObject.minId === '') &&
+    statuses.length > 0
+
+  if (!noIdUpdate && newer) {
+    timelineObject.maxId = maxNew
+  }
+  if (!noIdUpdate && older) {
+    timelineObject.minId = minNew
+  }
+
+  // This makes sure that user timeline won't get data meant for other
+  // user. I.e. opening different user profiles makes request which could
+  // return data late after user already viewing different user profile
+  if (
+    (timeline === 'user' || timeline === 'media') &&
+    timelineObject.userId !== userId
+  ) {
+    return
+  }
+
+  const addStatus = (data, showImmediately, addToTimeline = true) => {
+    const result = addStatusToGlobalStorage(state, data)
+    const status = result.item
+
+    if (result.new) {
+      // We are mentioned in a post
+      if (
+        status.type === 'status' &&
+        find(status.attentions, { id: user.id })
+      ) {
+        const mentions = state.timelines.mentions
+
+        // Add the mention to the mentions timeline
+        if (timelineObject !== mentions) {
+          mergeOrAdd(mentions.statuses, mentions.statusesObject, status)
+          mentions.newStatusCount += 1
+
+          sortTimeline(mentions)
+        }
+      }
+      if (status.visibility === 'direct') {
+        const dms = state.timelines.dms
+
+        mergeOrAdd(dms.statuses, dms.statusesObject, status)
+        dms.newStatusCount += 1
+
+        sortTimeline(dms)
+      }
+    }
+
+    // Decide if we should treat the status as new for this timeline.
+    let resultForCurrentTimeline
+    // Some statuses should only be added to the global status repository.
+    if (timeline && addToTimeline) {
+      resultForCurrentTimeline = mergeOrAdd(
+        timelineObject.statuses,
+        timelineObject.statusesObject,
+        status,
+      )
+    }
+
+    if (timeline && showImmediately) {
+      // Add it directly to the visibleStatuses, don't change
+      // newStatusCount
+      mergeOrAdd(
+        timelineObject.visibleStatuses,
+        timelineObject.visibleStatusesObject,
+        status,
+      )
+    } else if (timeline && addToTimeline && resultForCurrentTimeline.new) {
+      // Just change newStatuscount
+      timelineObject.newStatusCount += 1
+    }
+
+    if (status.quote) {
+      addStatus(
+        status.quote,
+        /* showImmediately = */ false,
+        /* addToTimeline = */ false,
+      )
+    }
+
+    return status
+  }
+
+  const favoriteStatus = (favorite) => {
+    const status = find(allStatuses, { id: favorite.in_reply_to_status_id })
+    if (status) {
+      // This is our favorite, so the relevant bit.
+      if (favorite.user.id === user.id) {
+        status.favorited = true
+      } else {
+        status.fave_num += 1
+      }
+    }
+    return status
+  }
+
+  const processors = {
+    status: (status) => {
+      addStatus(status, showImmediately)
+    },
+    edit: (status) => {
+      addStatus(status, showImmediately)
+    },
+    retweet: (status) => {
+      // RetweetedStatuses are never shown immediately
+      const retweetedStatus = addStatus(status.retweeted_status, false, false)
+
+      let retweet
+      // If the retweeted status is already there, don't add the retweet
+      // to the timeline.
+      if (
+        timeline &&
+        find(timelineObject.statuses, (s) => {
+          if (s.retweeted_status) {
+            return (
+              s.id === retweetedStatus.id ||
+              s.retweeted_status.id === retweetedStatus.id
+            )
+          } else {
+            return s.id === retweetedStatus.id
+          }
+        })
+      ) {
+        // Already have it visible (either as the original or another RT), don't add to timeline, don't show.
+        retweet = addStatus(status, false, false)
+      } else {
+        retweet = addStatus(status, showImmediately)
+      }
+
+      retweet.retweeted_status = retweetedStatus
+    },
+    favorite: (favorite) => {
+      // Only update if this is a new favorite.
+      // Ignore our own favorites because we get info about likes as response to like request
+      if (!state.favorites.has(favorite.id)) {
+        state.favorites.add(favorite.id)
+        favoriteStatus(favorite)
+      }
+    },
+    follow: () => {
+      // NOOP, it is known status but we don't do anything about it for now
+    },
+    default: (unknown) => {
+      console.warn('unknown status type', unknown)
+    },
+  }
+
+  each(statuses, (status) => {
+    const type = status.type
+    const processor = processors[type] || processors.default
+    processor(status)
+  })
+
+  // Keep the visible statuses sorted
+  if (timeline && !(timeline === 'bookmarks')) {
+    sortTimeline(timelineObject)
+  }
+}
+
+const removeStatus = (state, { timeline, userId }) => {
+  const timelineObject = state.timelines[timeline]
+  if (userId) {
+    remove(timelineObject.statuses, { user: { id: userId } })
+    remove(timelineObject.visibleStatuses, { user: { id: userId } })
+    timelineObject.minVisibleId =
+      timelineObject.visibleStatuses.length > 0
+        ? last(timelineObject.visibleStatuses).id
+        : 0
+    timelineObject.maxId =
+      timelineObject.statuses.length > 0 ? first(timelineObject.statuses).id : 0
+  }
+}
+
+export const mutations = {
+  addNewStatuses,
+  removeStatus,
+  showNewStatuses(state, { timeline }) {
+    const oldTimeline = state.timelines[timeline]
+
+    oldTimeline.newStatusCount = 0
+    oldTimeline.visibleStatuses = oldTimeline.statuses.slice(0, 50)
+    oldTimeline.minVisibleId = last(oldTimeline.visibleStatuses).id
+    oldTimeline.minId = oldTimeline.minVisibleId
+    oldTimeline.visibleStatusesObject = {}
+    each(oldTimeline.visibleStatuses, (status) => {
+      oldTimeline.visibleStatusesObject[status.id] = status
+    })
+  },
+  resetStatuses(state) {
+    const emptyState = defaultState()
+    Object.entries(emptyState).forEach(([key, value]) => {
+      state[key] = value
+    })
+  },
+  clearTimeline(state, { timeline, excludeUserId = false }) {
+    const userId = excludeUserId ? state.timelines[timeline].userId : undefined
+    state.timelines[timeline] = emptyTl(userId)
+  },
+  setFavorited(state, { status, value }) {
+    const newStatus = state.allStatusesObject[status.id]
+
+    if (newStatus.favorited !== value) {
+      if (value) {
+        newStatus.fave_num++
+      } else {
+        newStatus.fave_num--
+      }
+    }
+
+    newStatus.favorited = value
+  },
+  setFavoritedConfirm(state, { status, user }) {
+    const newStatus = state.allStatusesObject[status.id]
+    newStatus.favorited = status.favorited
+    newStatus.fave_num = status.fave_num
+    const index = findIndex(newStatus.favoritedBy, { id: user.id })
+    if (index !== -1 && !newStatus.favorited) {
+      newStatus.favoritedBy.splice(index, 1)
+    } else if (index === -1 && newStatus.favorited) {
+      newStatus.favoritedBy.push(user)
+    }
+  },
+  setMutedStatus(state, status) {
+    const newStatus = state.allStatusesObject[status.id]
+    newStatus.thread_muted = status.thread_muted
+
+    if (newStatus.thread_muted !== undefined) {
+      state.conversationsObject[newStatus.statusnet_conversation_id].forEach(
+        (status) => {
+          status.thread_muted = newStatus.thread_muted
+        },
+      )
+    }
+  },
+  setRetweeted(state, { status, value }) {
+    const newStatus = state.allStatusesObject[status.id]
+
+    if (newStatus.repeated !== value) {
+      if (value) {
+        newStatus.repeat_num++
+      } else {
+        newStatus.repeat_num--
+      }
+    }
+
+    newStatus.repeated = value
+  },
+  setRetweetedConfirm(state, { status, user }) {
+    const newStatus = state.allStatusesObject[status.id]
+    newStatus.repeated = status.repeated
+    newStatus.repeat_num = status.repeat_num
+    const index = findIndex(newStatus.rebloggedBy, { id: user.id })
+    if (index !== -1 && !newStatus.repeated) {
+      newStatus.rebloggedBy.splice(index, 1)
+    } else if (index === -1 && newStatus.repeated) {
+      newStatus.rebloggedBy.push(user)
+    }
+  },
+  setBookmarked(state, { status, value }) {
+    const newStatus = state.allStatusesObject[status.id]
+    newStatus.bookmarked = value
+    newStatus.bookmark_folder_id = status.bookmark_folder_id
+  },
+  setBookmarkedConfirm(state, { status }) {
+    const newStatus = state.allStatusesObject[status.id]
+    newStatus.bookmarked = status.bookmarked
+    if (status.pleroma)
+      newStatus.bookmark_folder_id = status.pleroma.bookmark_folder
+  },
+  setDeleted(state, { status }) {
+    const newStatus = state.allStatusesObject[status.id]
+    if (newStatus) newStatus.deleted = true
+  },
+  setManyDeleted(state, condition) {
+    Object.values(state.allStatusesObject).forEach((status) => {
+      if (condition(status)) {
+        status.deleted = true
+      }
+    })
+  },
+  setLoading(state, { timeline, value }) {
+    state.timelines[timeline].loading = value
+  },
+  setNsfw(state, { id, nsfw }) {
+    const newStatus = state.allStatusesObject[id]
+    newStatus.nsfw = nsfw
+  },
+  queueFlush(state, { timeline, id }) {
+    state.timelines[timeline].flushMarker = id
+  },
+  queueFlushAll(state) {
+    Object.keys(state.timelines).forEach((timeline) => {
+      state.timelines[timeline].flushMarker = state.timelines[timeline].maxId
+    })
+  },
+  addRepeats(state, { id, rebloggedByUsers, currentUser }) {
+    const newStatus = state.allStatusesObject[id]
+    newStatus.rebloggedBy = rebloggedByUsers.filter(Boolean)
+    // repeats stats can be incorrect based on polling condition, let's update them using the most recent data
+    newStatus.repeat_num = newStatus.rebloggedBy.length
+    newStatus.repeated = !!newStatus.rebloggedBy.find(
+      ({ id }) => currentUser.id === id,
+    )
+  },
+  addFavs(state, { id, favoritedByUsers, currentUser }) {
+    const newStatus = state.allStatusesObject[id]
+    newStatus.favoritedBy = favoritedByUsers.filter(Boolean)
+    // favorites stats can be incorrect based on polling condition, let's update them using the most recent data
+    newStatus.fave_num = newStatus.favoritedBy.length
+    newStatus.favorited = !!newStatus.favoritedBy.find(
+      ({ id }) => currentUser.id === id,
+    )
+  },
+  addEmojiReactionsBy(state, { id, emojiReactions }) {
+    const status = state.allStatusesObject[id]
+    status.emoji_reactions = emojiReactions
+  },
+  addOwnReaction(state, { id, emoji, currentUser }) {
+    const status = state.allStatusesObject[id]
+    const reactionIndex = findIndex(status.emoji_reactions, { name: emoji })
+    const reaction = status.emoji_reactions[reactionIndex] || {
+      name: emoji,
+      count: 0,
+      accounts: [],
+    }
+
+    const newReaction = {
+      ...reaction,
+      count: reaction.count + 1,
+      me: true,
+      accounts: [...reaction.accounts, currentUser],
+    }
+
+    // Update count of existing reaction if it exists, otherwise append at the end
+    if (reactionIndex >= 0) {
+      status.emoji_reactions[reactionIndex] = newReaction
+    } else {
+      status.emoji_reactions = [...status.emoji_reactions, newReaction]
+    }
+  },
+  removeOwnReaction(state, { id, emoji, currentUser }) {
+    const status = state.allStatusesObject[id]
+    const reactionIndex = findIndex(status.emoji_reactions, { name: emoji })
+    if (reactionIndex < 0) return
+
+    const reaction = status.emoji_reactions[reactionIndex]
+    const accounts = reaction.accounts || []
+
+    const newReaction = {
+      ...reaction,
+      count: reaction.count - 1,
+      me: false,
+      accounts: accounts.filter((acc) => acc.id !== currentUser.id),
+    }
+
+    if (newReaction.count > 0) {
+      status.emoji_reactions[reactionIndex] = newReaction
+    } else {
+      status.emoji_reactions = status.emoji_reactions.filter(
+        (r) => r.name !== emoji,
+      )
+    }
+  },
+  updateStatusWithPoll(state, { id, poll }) {
+    const status = state.allStatusesObject[id]
+    status.poll = poll
+  },
+  setVirtualHeight(state, { statusId, height }) {
+    state.allStatusesObject[statusId].virtualHeight = height
+  },
+}
+
+const statuses = {
+  state: defaultState(),
+  actions: {
+    addNewStatuses(
+      { rootState, commit },
+      {
+        statuses,
+        showImmediately = false,
+        timeline = false,
+        noIdUpdate = false,
+        userId,
+        pagination,
+      },
+    ) {
+      return commit('addNewStatuses', {
+        statuses,
+        showImmediately,
+        timeline,
+        noIdUpdate,
+        user: rootState.users.currentUser,
+        userId,
+        pagination,
+      })
+    },
+    fetchStatus({ rootState, dispatch }, id) {
+      return fetchStatus({ id }).then(({ data: status }) =>
+        dispatch('addNewStatuses', { statuses: [status] }),
+      )
+    },
+    fetchStatusSource({ rootState }, status) {
+      return fetchStatusSource({
+        id: status.id,
+        credentials: useOAuthStore().token,
+      }).then(({ data }) => data)
+    },
+    fetchStatusHistory(_, status) {
+      return fetchStatusHistory({ status }).then(({ data }) => data)
+    },
+    deleteStatus({ rootState, commit }, status) {
+      deleteStatus({
+        id: status.id,
+        credentials: useOAuthStore().token,
+      })
+        .then(() => {
+          commit('setDeleted', { status })
+        })
+        .catch((e) => {
+          useInterfaceStore().pushGlobalNotice({
+            level: 'error',
+            messageKey: 'status.delete_error',
+            messageArgs: [e.message],
+            timeout: 5000,
+          })
+        })
+    },
+    deleteStatusById({ rootState, commit }, id) {
+      const status = rootState.statuses.allStatusesObject[id]
+      commit('setDeleted', { status })
+    },
+    markStatusesAsDeleted({ commit }, condition) {
+      commit('setManyDeleted', condition)
+    },
+    favorite({ rootState, commit }, status) {
+      // Optimistic favoriting...
+      commit('setFavorited', { status, value: true })
+      favorite({
+        id: status.id,
+        credentials: useOAuthStore().token,
+      }).then(({ data: status }) =>
+        commit('setFavoritedConfirm', {
+          status,
+          user: rootState.users.currentUser,
+        }),
+      )
+    },
+    unfavorite({ rootState, commit }, status) {
+      // Optimistic unfavoriting...
+      commit('setFavorited', { status, value: false })
+      unfavorite({
+        id: status.id,
+        credentials: useOAuthStore().token,
+      }).then(({ data: status }) =>
+        commit('setFavoritedConfirm', {
+          status,
+          user: rootState.users.currentUser,
+        }),
+      )
+    },
+    fetchPinnedStatuses({ rootState, dispatch }, userId) {
+      fetchPinnedStatuses({
+        id: userId,
+        credentials: useOAuthStore().token,
+      }).then(({ data: statuses }) =>
+        dispatch('addNewStatuses', {
+          statuses,
+          timeline: 'user',
+          userId,
+          showImmediately: true,
+          noIdUpdate: true,
+        }),
+      )
+    },
+    pinStatus({ rootState, dispatch }, statusId) {
+      return pinOwnStatus({
+        id: statusId,
+        credentials: useOAuthStore().token,
+      }).then(({ data: status }) =>
+        dispatch('addNewStatuses', { statuses: [status] }),
+      )
+    },
+    unpinStatus({ rootState, dispatch }, statusId) {
+      return unpinOwnStatus({
+        id: statusId,
+        credentials: useOAuthStore().token,
+      }).then(({ data: status }) =>
+        dispatch('addNewStatuses', { statuses: [status] }),
+      )
+    },
+    muteConversation({ rootState, commit }, { id: statusId }) {
+      return muteConversation({
+        id: statusId,
+        credentials: useOAuthStore().token,
+      }).then(({ data: status }) => commit('setMutedStatus', status))
+    },
+    unmuteConversation({ rootState, commit }, { id: statusId }) {
+      return unmuteConversation({
+        id: statusId,
+        credentials: useOAuthStore().token,
+      }).then(({ data: status }) => commit('setMutedStatus', status))
+    },
+    retweet({ rootState, commit }, status) {
+      // Optimistic retweeting...
+      commit('setRetweeted', { status, value: true })
+      retweet({
+        id: status.id,
+        credentials: useOAuthStore().token,
+      }).then(({ data: status }) =>
+        commit('setRetweetedConfirm', {
+          status: status.retweeted_status,
+          user: rootState.users.currentUser,
+        }),
+      )
+    },
+    unretweet({ rootState, commit }, status) {
+      // Optimistic unretweeting...
+      commit('setRetweeted', { status, value: false })
+      unretweet({
+        id: status.id,
+        credentials: useOAuthStore().token,
+      }).then(({ data: status }) =>
+        commit('setRetweetedConfirm', {
+          status,
+          user: rootState.users.currentUser,
+        }),
+      )
+    },
+    bookmark({ rootState, commit }, status) {
+      commit('setBookmarked', { status, value: true })
+      bookmarkStatus({
+        id: status.id,
+        folder_id: status.bookmark_folder_id,
+        credentials: useOAuthStore().token,
+      }).then(({ data: status }) => {
+        commit('setBookmarkedConfirm', { status })
+      })
+    },
+    unbookmark({ rootState, commit }, status) {
+      commit('setBookmarked', { status, value: false })
+      unbookmarkStatus({
+        id: status.id,
+        credentials: useOAuthStore().token,
+      }).then(({ data: status }) => {
+        commit('setBookmarkedConfirm', { status })
+      })
+    },
+    queueFlush({ commit }, { timeline, id }) {
+      commit('queueFlush', { timeline, id })
+    },
+    queueFlushAll({ commit }) {
+      commit('queueFlushAll')
+    },
+    fetchFavsAndRepeats({ rootState, commit }, id) {
+      Promise.all([
+        fetchFavoritedByUsers({
+          id,
+          credentials: useOAuthStore().token,
+        }).then(({ data }) => data),
+        fetchRebloggedByUsers({
+          id,
+          credentials: useOAuthStore().token,
+        }).then(({ data }) => data),
+      ]).then(([favoritedByUsers, rebloggedByUsers]) => {
+        commit('addFavs', {
+          id,
+          favoritedByUsers,
+          currentUser: rootState.users.currentUser,
+        })
+        commit('addRepeats', {
+          id,
+          rebloggedByUsers,
+          currentUser: rootState.users.currentUser,
+        })
+      })
+    },
+    reactWithEmoji({ rootState, dispatch, commit }, { id, emoji }) {
+      const currentUser = rootState.users.currentUser
+      if (!currentUser) return
+
+      commit('addOwnReaction', { id, emoji, currentUser })
+      reactWithEmoji({
+        id,
+        emoji,
+        credentials: useOAuthStore().token,
+      }).then(() => {
+        dispatch('fetchEmojiReactionsBy', id)
+      })
+    },
+    unreactWithEmoji({ rootState, dispatch, commit }, { id, emoji }) {
+      const currentUser = rootState.users.currentUser
+      if (!currentUser) return
+
+      commit('removeOwnReaction', { id, emoji, currentUser })
+      unreactWithEmoji({
+        id,
+        emoji,
+        currentUser: rootState.users.currentUser,
+      }).then(() => {
+        dispatch('fetchEmojiReactionsBy', id)
+      })
+    },
+    fetchEmojiReactionsBy({ rootState, commit }, id) {
+      return fetchEmojiReactions({
+        id,
+        credentials: useOAuthStore().token,
+      }).then(({ data: emojiReactions }) => {
+        commit('addEmojiReactionsBy', {
+          id,
+          emojiReactions,
+          currentUser: rootState.users.currentUser,
+        })
+      })
+    },
+    fetchFavs({ rootState, commit }, id) {
+      fetchFavoritedByUsers({
+        id,
+        credentials: useOAuthStore().token,
+      }).then(({ data: favoritedByUsers }) =>
+        commit('addFavs', {
+          id,
+          favoritedByUsers,
+          currentUser: rootState.users.currentUser,
+        }),
+      )
+    },
+    fetchRepeats({ rootState, commit }, id) {
+      fetchRebloggedByUsers({
+        id,
+        credentials: useOAuthStore().token,
+      }).then(({ data: rebloggedByUsers }) =>
+        commit('addRepeats', {
+          id,
+          rebloggedByUsers,
+          currentUser: rootState.users.currentUser,
+        }),
+      )
+    },
+    search(store, { q, resolve, limit, offset, following, type }) {
+      return search2({
+        q,
+        resolve,
+        limit,
+        offset,
+        following,
+        type,
+        credentials: useOAuthStore().token,
+      }).then(({ data }) => {
+        store.commit('addNewUsers', data.accounts)
+        store.commit(
+          'addNewUsers',
+          data.statuses.map((s) => s.user).filter(Boolean),
+        )
+        store.commit('addNewStatuses', {
+          statuses: data.statuses,
+        })
+
+        data.statuses = data.statuses.map(
+          (s) => store.state.allStatusesObject[s.id],
+        )
+        return data
+      })
+    },
+    setVirtualHeight({ commit }, { statusId, height }) {
+      commit('setVirtualHeight', { statusId, height })
+    },
+  },
+  mutations,
+}
+
+export default statuses
diff --git a/src/modules/users.js b/src/modules/users.js
new file mode 100644
index 000000000..bfa4f0f41
--- /dev/null
+++ b/src/modules/users.js
@@ -0,0 +1,872 @@
+import Cookies from 'js-cookie'
+import { compact, each, last, map, mergeWith } from 'lodash'
+
+import {
+  registerPushNotifications,
+  unregisterPushNotifications,
+} from '../services/sw/sw.js'
+import {
+  windowHeight,
+  windowWidth,
+} from '../services/window_utils/window_utils'
+
+import { useAnnouncementsStore } from 'src/stores/announcements.js'
+import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
+import { useChatsStore } from 'src/stores/chats.js'
+import { useEmojiStore } from 'src/stores/emoji.js'
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
+import { useInterfaceStore } from 'src/stores/interface.js'
+import { useListsStore } from 'src/stores/lists.js'
+import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useOAuthStore } from 'src/stores/oauth.js'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+import { useUserHighlightStore } from 'src/stores/user_highlight.js'
+
+import { revokeToken } from 'src/api/oauth.js'
+import {
+  fetchFollowers,
+  fetchFriends,
+  fetchUser,
+  fetchUserByName,
+  getCaptcha,
+  register,
+  searchUsers,
+  verifyCredentials,
+} from 'src/api/public.js'
+import {
+  blockUser as apiBlockUser,
+  editUserNote as apiEditUserNote,
+  muteDomain as apiMuteDomain,
+  muteUser as apiMuteUser,
+  unblockUser as apiUnblockUser,
+  unmuteDomain as apiUnmuteDomain,
+  unmuteUser as apiUnmuteUser,
+  fetchBlocks,
+  fetchDomainMutes,
+  fetchMutes,
+  fetchUserInLists,
+  fetchUserRelationship,
+  followUser,
+} from 'src/api/user.js'
+
+// TODO: Unify with mergeOrAdd in statuses.js
+export const mergeOrAdd = (arr, obj, item) => {
+  if (!item) {
+    return false
+  }
+  const oldItem = obj[item.id]
+  if (oldItem) {
+    // We already have this, so only merge the new info.
+    mergeWith(oldItem, item, mergeArrayLength)
+    return { item: oldItem, new: false }
+  } else {
+    // This is a new item, prepare it
+    arr.push(item)
+    obj[item.id] = item
+    return { item, new: true }
+  }
+}
+
+const mergeArrayLength = (oldValue, newValue) => {
+  if (Array.isArray(oldValue) && Array.isArray(newValue)) {
+    oldValue.length = newValue.length
+    return mergeWith(oldValue, newValue, mergeArrayLength)
+  }
+}
+
+const getNotificationPermission = async () => {
+  const Notification = window.Notification
+
+  if (!Notification) return null
+  if (Notification.permission === 'default')
+    return Notification.requestPermission()
+  return Notification.permission
+}
+
+const blockUser = (store, args) => {
+  const id = args.id
+  const expiresIn = typeof args === 'object' ? args.expiresIn : 0
+
+  const predictedRelationship = store.state.relationships[id] || { id }
+  store.commit('updateUserRelationship', [predictedRelationship])
+  store.commit('addBlockId', id)
+
+  return apiBlockUser({ id, expiresIn }).then(({ data: relationship }) => {
+    store.commit('updateUserRelationship', [relationship])
+    store.commit('addBlockId', id)
+
+    store.commit('removeStatus', { timeline: 'friends', userId: id })
+    store.commit('removeStatus', { timeline: 'public', userId: id })
+    store.commit('removeStatus', {
+      timeline: 'publicAndExternal',
+      userId: id,
+    })
+  })
+}
+
+const unblockUser = (store, id) => {
+  return apiUnblockUser({ id }).then(({ data: relationship }) =>
+    store.commit('updateUserRelationship', [relationship]),
+  )
+}
+
+const removeUserFromFollowers = (store, id) => {
+  return removeUserFromFollowers({ id }).then((relationship) =>
+    store.commit('updateUserRelationship', [relationship]),
+  )
+}
+
+const editUserNote = (store, { id, comment }) => {
+  return apiEditUserNote({ id, comment }).then((relationship) =>
+    store.commit('updateUserRelationship', [relationship]),
+  )
+}
+
+const muteUser = (store, args) => {
+  const id = typeof args === 'object' ? args.id : args
+  const expiresIn = typeof args === 'object' ? args.expiresIn : 0
+
+  const predictedRelationship = store.state.relationships[id] || { id }
+  store.commit('updateUserRelationship', [predictedRelationship])
+  store.commit('addMuteId', id)
+
+  return apiMuteUser({
+    id,
+    expiresIn,
+    credentials: useOAuthStore().token,
+  }).then(({ data: relationship }) => {
+    store.commit('updateUserRelationship', [relationship])
+    store.commit('addMuteId', id)
+  })
+}
+
+const unmuteUser = (store, id) => {
+  const predictedRelationship = store.state.relationships[id] || { id }
+  predictedRelationship.muting = false
+  store.commit('updateUserRelationship', [predictedRelationship])
+
+  return apiUnmuteUser({ id }).then(({ data: relationship }) =>
+    store.commit('updateUserRelationship', [relationship]),
+  )
+}
+
+const hideReblogs = (store, userId) => {
+  return followUser({
+    id: userId,
+    reblogs: false,
+    credentials: useOAuthStore().token,
+  }).then(({ data: relationship }) =>
+    store.commit('updateUserRelationship', [relationship]),
+  )
+}
+
+const showReblogs = (store, userId) => {
+  return followUser({
+    id: userId,
+    reblogs: true,
+    credentials: useOAuthStore().token,
+  }).then(({ data: relationship }) =>
+    store.commit('updateUserRelationship', [relationship]),
+  )
+}
+
+const muteDomain = (store, domain) => {
+  return apiMuteDomain({
+    domain,
+    credentials: useOAuthStore().token,
+  }).then(() => store.commit('addDomainMute', domain))
+}
+
+const unmuteDomain = (store, domain) => {
+  return apiUnmuteDomain({
+    domain,
+    credentials: useOAuthStore().token,
+  }).then(() => store.commit('removeDomainMute', domain))
+}
+
+export const mutations = {
+  tagUser(state, { user: { id }, tag }) {
+    const user = state.usersObject[id]
+    user.tags.add(tag)
+  },
+  untagUser(state, { user: { id }, tag }) {
+    const user = state.usersObject[id]
+    user.tags.delete(tag)
+  },
+  updateRight(state, { user: { id }, right, value }) {
+    const user = state.usersObject[id]
+    const newRights = user.rights
+    newRights[right] = value
+    user.rights = newRights
+  },
+  updateUserAdminData(state, { user }) {
+    const { id } = user
+    const localUser = state.usersObject[id]
+    localUser.adminData = user
+    localUser.deactivated = !user.is_active
+    localUser.tags = new Set(user.tags)
+  },
+  setCurrentUser(state, user) {
+    state.lastLoginName = user.screen_name
+    state.currentUser = mergeWith(
+      state.currentUser || {},
+      user,
+      mergeArrayLength,
+    )
+  },
+  clearCurrentUser(state) {
+    state.currentUser = false
+    state.lastLoginName = false
+  },
+  beginLogin(state) {
+    state.loggingIn = true
+  },
+  endLogin(state) {
+    state.loggingIn = false
+  },
+  saveFriendIds(state, { id, friendIds }) {
+    const user = state.usersObject[id]
+    user.friendIds = [...new Set([...(user.friendIds || []), ...friendIds])]
+  },
+  saveFollowerIds(state, { id, followerIds }) {
+    const user = state.usersObject[id]
+    user.followerIds = [...new Set([user.followerIds || [], ...followerIds])]
+  },
+  // Because frontend doesn't have a reason to keep these stuff in memory
+  // outside of viewing someones user profile.
+  clearFriends(state, userId) {
+    const user = state.usersObject[userId]
+    if (user) {
+      user.friendIds = []
+    }
+  },
+  clearFollowers(state, userId) {
+    const user = state.usersObject[userId]
+    if (user) {
+      user.followerIds = []
+    }
+  },
+  addNewUsers(state, users) {
+    each(users, (user) => {
+      if (user.relationship) {
+        state.relationships[user.relationship.id] = user.relationship
+      }
+      const res = mergeOrAdd(state.users, state.usersObject, user)
+      const item = res.item
+      if (res.new && item.screen_name && !item.screen_name.includes('@')) {
+        state.usersByNameObject[item.screen_name.toLowerCase()] = item
+      }
+    })
+  },
+  updateUserRelationship(state, relationships) {
+    relationships.forEach((relationship) => {
+      state.relationships[relationship.id] = relationship
+    })
+  },
+  updateUserInLists(state, { id, inLists }) {
+    state.usersObject[id].inLists = inLists
+  },
+  saveBlockIds(state, blockIds) {
+    state.currentUser.blockIds = blockIds
+  },
+  addBlockId(state, blockId) {
+    if (state.currentUser.blockIds.includes(blockId)) {
+      state.currentUser.blockIds.push(blockId)
+    }
+  },
+  setBlockIdsMaxId(state, blockIdsMaxId) {
+    state.currentUser.blockIdsMaxId = blockIdsMaxId
+  },
+  saveMuteIds(state, muteIds) {
+    state.currentUser.muteIds = muteIds
+  },
+  setMuteIdsMaxId(state, muteIdsMaxId) {
+    state.currentUser.muteIdsMaxId = muteIdsMaxId
+  },
+  addMuteId(state, muteId) {
+    if (state.currentUser.muteIds.includes(muteId)) {
+      state.currentUser.muteIds.push(muteId)
+    }
+  },
+  saveDomainMutes(state, domainMutes) {
+    state.currentUser.domainMutes = domainMutes
+  },
+  addDomainMute(state, domain) {
+    if (state.currentUser.domainMutes.includes(domain)) {
+      state.currentUser.domainMutes.push(domain)
+    }
+  },
+  removeDomainMute(state, domain) {
+    const index = state.currentUser.domainMutes.indexOf(domain)
+    if (index !== -1) {
+      state.currentUser.domainMutes.splice(index, 1)
+    }
+  },
+  setPinnedToUser(state, status) {
+    const user = state.usersObject[status.user.id]
+    user.pinnedStatusIds = user.pinnedStatusIds || []
+    const index = user.pinnedStatusIds.indexOf(status.id)
+
+    if (status.pinned && index === -1) {
+      user.pinnedStatusIds.push(status.id)
+    } else if (!status.pinned && index !== -1) {
+      user.pinnedStatusIds.splice(index, 1)
+    }
+  },
+  setUserForStatus(state, status) {
+    status.user = state.usersObject[status.user.id]
+  },
+  setUserForNotification(state, notification) {
+    if (notification.type !== 'follow') {
+      notification.action.user = state.usersObject[notification.action.user.id]
+    }
+    notification.from_profile = state.usersObject[notification.from_profile.id]
+  },
+  setColor(state, { user: { id }, highlighted }) {
+    const user = state.usersObject[id]
+    user.highlight = highlighted
+  },
+  signUpPending(state) {
+    state.signUpPending = true
+    state.signUpErrors = []
+    state.signUpNotice = {}
+  },
+  signUpSuccess(state) {
+    state.signUpPending = false
+  },
+  signUpFailure(state, errors) {
+    state.signUpPending = false
+    state.signUpErrors = errors
+    state.signUpNotice = {}
+  },
+  signUpNotice(state, notice) {
+    state.signUpPending = false
+    state.signUpErrors = []
+    state.signUpNotice = notice
+  },
+}
+
+export const getters = {
+  findUser: (state) => (query) => {
+    return state.usersObject[query]
+  },
+  findUserByName: (state) => (query) => {
+    return state.usersByNameObject[query.toLowerCase()]
+  },
+  findUserByUrl: (state) => (query) => {
+    return state.users.find(
+      (u) =>
+        u.statusnet_profile_url &&
+        u.statusnet_profile_url.toLowerCase() === query.toLowerCase(),
+    )
+  },
+  relationship: (state) => (id) => {
+    const rel = id && state.relationships[id]
+    return rel || { id, loading: true }
+  },
+}
+
+export const defaultState = {
+  loggingIn: false,
+  lastLoginName: false,
+  currentUser: false,
+  users: [],
+  usersObject: {},
+  usersByNameObject: {},
+  signUpPending: false,
+  signUpErrors: [],
+  signUpNotice: {},
+  relationships: {},
+}
+
+const users = {
+  state: defaultState,
+  mutations,
+  getters,
+  actions: {
+    async fetchUserIfMissing(store, id) {
+      const user = store.getters.findUser(id)
+      if (!user) {
+        return store.dispatch('fetchUser', id)
+      } else {
+        return user
+      }
+    },
+    updateUserAdminData(store, { userAdminData }) {
+      return store
+        .dispatch('fetchUserIfMissing', userAdminData.id)
+        .then((user) => {
+          user.adminData = userAdminData
+          store.commit('addNewUsers', [user])
+          return user
+        })
+    },
+    fetchUser(store, id) {
+      return fetchUser({
+        id,
+        credentials: useOAuthStore().token,
+      })
+        .then(({ data: user }) => {
+          store.commit('addNewUsers', [user])
+          return user
+        })
+        .catch((error) => {
+          if (error.statusCode === 404) {
+            console.warn(`User ${id} not found`)
+          } else {
+            throw error
+          }
+        })
+    },
+    fetchUserByName(store, name) {
+      return fetchUserByName({
+        name,
+        credentials: useOAuthStore().token,
+      }).then(({ data: user }) => {
+        store.commit('addNewUsers', [user])
+        return user
+      })
+    },
+    fetchUserRelationship(store, id) {
+      if (store.state.currentUser) {
+        fetchUserRelationship({
+          id,
+          credentials: useOAuthStore().token,
+        }).then(({ data: relationships }) =>
+          store.commit('updateUserRelationship', relationships),
+        )
+      }
+    },
+    fetchUserInLists(store, id) {
+      if (store.state.currentUser) {
+        fetchUserInLists({
+          id,
+          credentials: useOAuthStore().token,
+        }).then(({ data: inLists }) =>
+          store.commit('updateUserInLists', { id, inLists }),
+        )
+      }
+    },
+    fetchBlocks(store, args) {
+      const { reset } = args || {}
+
+      const maxId = store.state.currentUser.blockIdsMaxId
+      return fetchBlocks({
+        maxId,
+        credentials: useOAuthStore().token,
+      }).then(({ data: blocks }) => {
+        if (reset) {
+          store.commit('saveBlockIds', map(blocks, 'id'))
+        } else {
+          map(blocks, 'id').map((id) => store.commit('addBlockId', id))
+        }
+        if (blocks.length) {
+          store.commit('setBlockIdsMaxId', last(blocks).id)
+        }
+        store.commit('addNewUsers', blocks)
+        return blocks
+      })
+    },
+    blockUser(store, data) {
+      return blockUser(store, data)
+    },
+    unblockUser(store, data) {
+      return unblockUser(store, data)
+    },
+    removeUserFromFollowers(store, id) {
+      return removeUserFromFollowers(store, id)
+    },
+    blockUsers(store, data = []) {
+      return Promise.all(data.map((d) => blockUser(store, d)))
+    },
+    unblockUsers(store, data = []) {
+      return Promise.all(data.map((d) => unblockUser(store, d)))
+    },
+    editUserNote(store, args) {
+      return editUserNote(store, args)
+    },
+    fetchMutes(store, args) {
+      const { reset } = args || {}
+
+      const maxId = store.state.currentUser.muteIdsMaxId
+      return fetchMutes({
+        maxId,
+        credentials: useOAuthStore().token,
+      }).then(({ data: mutes }) => {
+        if (reset) {
+          store.commit('saveMuteIds', map(mutes, 'id'))
+        } else {
+          map(mutes, 'id').map((id) => store.commit('addMuteId', id))
+        }
+        if (mutes.length) {
+          store.commit('setMuteIdsMaxId', last(mutes).id)
+        }
+        store.commit('addNewUsers', mutes)
+        return mutes
+      })
+    },
+    muteUser(store, data) {
+      return muteUser(store, data)
+    },
+    unmuteUser(store, id) {
+      return unmuteUser(store, id)
+    },
+    hideReblogs(store, id) {
+      return hideReblogs(store, id)
+    },
+    showReblogs(store, id) {
+      return showReblogs(store, id)
+    },
+    muteUsers(store, data = []) {
+      return Promise.all(data.map((d) => muteUser(store, d)))
+    },
+    unmuteUsers(store, ids = []) {
+      return Promise.all(ids.map((d) => unmuteUser(store, d)))
+    },
+    fetchDomainMutes(store) {
+      return fetchDomainMutes({
+        credentials: useOAuthStore().token,
+      }).then(({ data: domainMutes }) => {
+        store.commit('saveDomainMutes', domainMutes)
+        return domainMutes
+      })
+    },
+    muteDomain(store, domain) {
+      return muteDomain(store, domain)
+    },
+    unmuteDomain(store, domain) {
+      return unmuteDomain(store, domain)
+    },
+    muteDomains(store, domains = []) {
+      return Promise.all(domains.map((domain) => muteDomain(store, domain)))
+    },
+    unmuteDomains(store, domain = []) {
+      return Promise.all(domain.map((domain) => unmuteDomain(store, domain)))
+    },
+    fetchFriends({ rootState, commit }, id) {
+      const user = rootState.users.usersObject[id]
+      const maxId = last(user.friendIds)
+      return fetchFriends({
+        id,
+        maxId,
+        credentials: useOAuthStore().token,
+      }).then(({ data: friends }) => {
+        commit('addNewUsers', friends)
+        commit('saveFriendIds', { id, friendIds: map(friends, 'id') })
+        return friends
+      })
+    },
+    fetchFollowers({ rootState, commit }, id) {
+      const user = rootState.users.usersObject[id]
+      const maxId = last(user.followerIds)
+      return fetchFollowers({
+        id,
+        maxId,
+        credentials: useOAuthStore().token,
+      }).then(({ data: followers }) => {
+        commit('addNewUsers', followers)
+        commit('saveFollowerIds', { id, followerIds: map(followers, 'id') })
+        return followers
+      })
+    },
+    clearFriends({ commit }, userId) {
+      commit('clearFriends', userId)
+    },
+    clearFollowers({ commit }, userId) {
+      commit('clearFollowers', userId)
+    },
+    subscribeUser({ rootState, commit }, id) {
+      return followUser({
+        id,
+        notify: true,
+        credentials: useOAuthStore().token,
+      }).then(({ data: relationship }) =>
+        commit('updateUserRelationship', [relationship]),
+      )
+    },
+    unsubscribeUser({ rootState, commit }, id) {
+      return followUser({
+        id,
+        notify: false,
+        credentials: useOAuthStore().token,
+      }).then(({ data: relationship }) =>
+        commit('updateUserRelationship', [relationship]),
+      )
+    },
+    registerPushNotifications(store) {
+      const token = store.state.currentUser.credentials
+      const vapidPublicKey = useInstanceStore().vapidPublicKey
+      const isEnabled = useMergedConfigStore().mergedConfig.webPushNotifications
+      const notificationVisibility =
+        useMergedConfigStore().mergedConfig.notificationVisibility
+
+      registerPushNotifications(
+        isEnabled,
+        vapidPublicKey,
+        token,
+        notificationVisibility,
+      )
+    },
+    unregisterPushNotifications(store) {
+      const token = store.state.currentUser.credentials
+
+      unregisterPushNotifications(token)
+    },
+    addNewUsers({ commit }, users) {
+      commit('addNewUsers', users)
+    },
+    addNewStatuses(store, { statuses }) {
+      const users = map(statuses, 'user')
+      const retweetedUsers = compact(map(statuses, 'retweeted_status.user'))
+      store.commit('addNewUsers', users)
+      store.commit('addNewUsers', retweetedUsers)
+
+      each(statuses, (status) => {
+        // Reconnect users to statuses
+        store.commit('setUserForStatus', status)
+        // Set pinned statuses to user
+        store.commit('setPinnedToUser', status)
+      })
+      each(compact(map(statuses, 'retweeted_status')), (status) => {
+        // Reconnect users to retweets
+        store.commit('setUserForStatus', status)
+        // Set pinned retweets to user
+        store.commit('setPinnedToUser', status)
+      })
+    },
+    addNewNotifications(store, { notifications }) {
+      const users = map(notifications, 'from_profile')
+      const targetUsers = map(notifications, 'target').filter(Boolean)
+      const notificationIds = notifications.map((_) => _.id)
+      store.commit('addNewUsers', users)
+      store.commit('addNewUsers', targetUsers)
+
+      const notificationsObject = store.rootState.notifications.idStore
+      const relevantNotifications = Object.entries(notificationsObject)
+        .filter(([k]) => notificationIds.includes(k))
+        .map(([, val]) => val)
+
+      // Reconnect users to notifications
+      each(relevantNotifications, (notification) => {
+        store.commit('setUserForNotification', notification)
+      })
+    },
+    searchUsers({ rootState, commit }, { query }) {
+      return searchUsers({
+        query,
+        credentials: useOAuthStore().token,
+      }).then(({ data: users }) => {
+        commit('addNewUsers', users)
+        return users
+      })
+    },
+    async signUp(store, userInfo) {
+      const oauthStore = useOAuthStore()
+      store.commit('signUpPending')
+
+      try {
+        const token = await oauthStore.ensureAppToken()
+        const { data } = await register({
+          credentials: token,
+          params: { ...userInfo },
+        })
+
+        if (data.access_token) {
+          store.commit('signUpSuccess')
+          oauthStore.setToken(data.access_token)
+          await store.dispatch('loginUser', data.access_token)
+          return 'ok'
+        } else {
+          // Request succeeded, but user cannot login yet.
+          store.commit('signUpNotice', data)
+          return 'request_sent'
+        }
+      } catch (e) {
+        const errors = e.message
+        store.commit('signUpFailure', errors)
+        throw e
+      }
+    },
+    getCaptcha(store) {
+      return getCaptcha({
+        credentials: useOAuthStore().token,
+      }).then(({ data }) => data)
+    },
+
+    logout(store) {
+      const oauth = useOAuthStore()
+
+      // NOTE: No need to verify the app still exists, because if it doesn't,
+      // the token will be invalid too
+      return oauth
+        .ensureApp()
+        .then((app) => {
+          const params = {
+            app,
+            instance: useInstanceStore().server,
+            token: oauth.userToken,
+          }
+
+          return revokeToken(params)
+        })
+        .then(() => {
+          store.commit('clearCurrentUser')
+          store.dispatch('disconnectFromSocket')
+          store.dispatch('stopFetchingTimeline', 'friends')
+          store.dispatch('stopFetchingNotifications')
+          useListsStore().stopFetching()
+          useBookmarkFoldersStore().stopFetching()
+          store.dispatch('stopFetchingFollowRequests')
+          store.commit('clearNotifications')
+          store.commit('resetStatuses')
+          useChatsStore().resetChats()
+          oauth.clearToken()
+          Cookies.remove('__Host-pleroma_key', { path: '/' })
+          useInterfaceStore().setLastTimeline('public-timeline')
+          useInterfaceStore().setLayoutWidth(windowWidth())
+          useInterfaceStore().setLayoutHeight(windowHeight())
+        })
+    },
+    loginUser(store, accessToken) {
+      return new Promise((resolve, reject) => {
+        const commit = store.commit
+        const dispatch = store.dispatch
+
+        commit('beginLogin')
+
+        verifyCredentials({
+          credentials: useOAuthStore().token,
+        })
+          .then(({ data: user }) => {
+            // user.credentials = userCredentials
+            user.credentials = accessToken
+            user.blockIds = []
+            user.muteIds = []
+            user.domainMutes = []
+            commit('setCurrentUser', user)
+
+            useSyncConfigStore()
+              .initSyncConfig(user)
+              .then(() => {
+                useInterfaceStore()
+                  .applyTheme()
+                  .catch((e) => {
+                    console.error('Error setting theme', e)
+                  })
+              })
+            useUserHighlightStore().initUserHighlight(user)
+            commit('addNewUsers', [user])
+
+            useEmojiStore().fetchEmoji()
+
+            getNotificationPermission().then((permission) =>
+              useInterfaceStore().setNotificationPermission(permission),
+            )
+
+            // Do server-side storage migrations
+
+            // Debug snippet to clean up storage and reset migrations
+            /*
+            // Reset wordfilter
+            Object.keys(
+              useSyncConfigStore().prefsStorage.simple.muteFilters
+            ).forEach(key => {
+              useSyncConfigStore().unsetSimplePrefAndSave({ path: 'muteFilters.' + key, value: null })
+            })
+
+            // Reset flag to 0 to re-run migrations
+            useSyncConfigStore().setFlag({ flag: 'configMigration', value: 0 })
+            /**/
+
+            if (user.token) {
+              dispatch('setWsToken', user.token)
+
+              // Initialize the shout socket.
+              dispatch('initializeSocket')
+            }
+
+            const startPolling = () => {
+              // Start getting fresh posts.
+              dispatch('startFetchingTimeline', { timeline: 'friends' })
+
+              // Start fetching notifications
+              dispatch('startFetchingNotifications')
+
+              if (useInstanceCapabilitiesStore().pleromaChatMessagesAvailable) {
+                // Start fetching chats
+                dispatch('startFetchingChats')
+              }
+            }
+
+            useListsStore().startFetching()
+            useBookmarkFoldersStore().startFetching()
+
+            if (user.locked) {
+              dispatch('startFetchingFollowRequests')
+            }
+
+            if (useMergedConfigStore().mergedConfig.useStreamingApi) {
+              dispatch('fetchTimeline', {
+                timeline: 'friends',
+                sinceId: null,
+              })
+              dispatch('fetchNotifications', { sinceId: null })
+              dispatch('enableMastoSockets', true)
+                .catch((error) => {
+                  console.error(
+                    'Failed initializing MastoAPI Streaming socket',
+                    error,
+                  )
+                })
+                .then(() => {
+                  dispatch('fetchChats', { latest: true })
+                  setTimeout(
+                    () => dispatch('setNotificationsSilence', false),
+                    10000,
+                  )
+                })
+            } else {
+              startPolling()
+            }
+
+            // Start fetching things that don't need to block the UI
+            useAnnouncementsStore().startFetchingAnnouncements()
+
+            dispatch('fetchMutes')
+            dispatch('loadDrafts')
+
+            useInterfaceStore().setLayoutWidth(windowWidth())
+            useInterfaceStore().setLayoutHeight(windowHeight())
+
+            // Fetch our friends
+            fetchFriends({ id: user.id }).then(({ data: friends }) =>
+              commit('addNewUsers', friends),
+            )
+            commit('endLogin')
+            resolve()
+          })
+          .catch((error) => {
+            console.error(error)
+
+            // Authentication failed
+            commit('endLogin')
+
+            // remove authentication token on client/authentication errors
+            if ([400, 401, 403, 422].includes(error.statusCode)) {
+              useOAuthStore().clearToken()
+            }
+
+            commit('endLogin')
+            if (error.tatusCode === 401) {
+              throw new Error('Wrong username or password', error)
+            } else {
+              throw new Error('An error occurred, please try again', error)
+            }
+          })
+      })
+    },
+  },
+}
+
+export default users
diff --git a/src/services/chat_utils/chat_utils.js b/src/services/chat_utils/chat_utils.js
index d99c17ed8..bc02981cd 100644
--- a/src/services/chat_utils/chat_utils.js
+++ b/src/services/chat_utils/chat_utils.js
@@ -1,10 +1,9 @@
 import { showDesktopNotification } from '../desktop_notification_utils/desktop_notification_utils.js'
 
-import { useUsersStore } from 'src/stores/users.js'
-
 export const maybeShowChatNotification = (chat) => {
   if (!chat.lastMessage) return
-  if (useUsersStore().currentUser.id === chat.lastMessage.account_id) return
+  if (window.vuex.state.users.currentUser.id === chat.lastMessage.account_id)
+    return
 
   const opts = {
     tag: chat.lastMessage.id,
diff --git a/src/services/desktop_notification_utils/desktop_notification_utils.js b/src/services/desktop_notification_utils/desktop_notification_utils.js
index aa5793080..cf393aa77 100644
--- a/src/services/desktop_notification_utils/desktop_notification_utils.js
+++ b/src/services/desktop_notification_utils/desktop_notification_utils.js
@@ -4,16 +4,14 @@ import {
   showDesktopNotification as swDesktopNotification,
 } from '../sw/sw.js'
 
-import { useNotificationsStore } from 'src/stores/notifications.js'
-
 const state = { failCreateNotif: false }
 
-export const showDesktopNotification = (desktopNotificationOpts) => {
+export const showDesktopNotification = (rootState, desktopNotificationOpts) => {
   if (
     !('Notification' in window && window.Notification.permission === 'granted')
   )
     return
-  if (useNotificationsStore().desktopNotificationSilence) {
+  if (rootState.notifications.desktopNotificationSilence) {
     return
   }
 
@@ -32,7 +30,7 @@ export const showDesktopNotification = (desktopNotificationOpts) => {
   }
 }
 
-export const closeDesktopNotification = (id) => {
+export const closeDesktopNotification = (rootState, { id }) => {
   if (
     !('Notification' in window && window.Notification.permission === 'granted')
   )
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 239d31e8b..5b8fa5b57 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -4,7 +4,7 @@ import { unescape as lodashUnescape } from 'lodash'
 import punycode from 'punycode.js'
 
 import { fileType } from '../file_type/file_type.service.js'
-import { isStatusNotification } from '../notification_utils/notification_utils_sw.js'
+import { isStatusNotification } from '../notification_utils/notification_utils.js'
 
 /** NOTICE! **
  * Do not initialize UI-generated data here.
@@ -27,7 +27,6 @@ export const parseUser = (data) => {
 
   output.screen_name = data.acct
   output.fqn = data.fqn
-  output.url = data.url
   output.statusnet_profile_url = data.url
 
   if (Object.hasOwn(data, 'mute_expires_at')) {
@@ -81,9 +80,6 @@ export const parseUser = (data) => {
 
   output.privileges = []
 
-  output.friendIds = new Set()
-  output.followerIds = new Set()
-
   if (data.pleroma) {
     if (data.pleroma.settings_store) {
       output.storage = data.pleroma.settings_store['pleroma-fe']
@@ -332,7 +328,6 @@ export const parseStatus = (data) => {
   output.attentions = (data.mentions || []).map(parseUser)
 
   output.attachments = (data.media_attachments || []).map(parseAttachment)
-  output.deleted = false
 
   const retweetedStatus = data.reblog
   if (retweetedStatus) {
diff --git a/src/services/follow_manipulate/follow_manipulate.js b/src/services/follow_manipulate/follow_manipulate.js
new file mode 100644
index 000000000..759ba67d9
--- /dev/null
+++ b/src/services/follow_manipulate/follow_manipulate.js
@@ -0,0 +1,67 @@
+import { useOAuthStore } from 'src/stores/oauth.js'
+
+import {
+  fetchUserRelationship,
+  followUser,
+  unfollowUser,
+} from 'src/api/user.js'
+
+const fetchRelationship = (attempt, userId, store) =>
+  new Promise((resolve, reject) => {
+    setTimeout(() => {
+      fetchUserRelationship({
+        id: userId,
+        credentials: useOAuthStore().token,
+      })
+        .then(({ data: relationship }) => {
+          store.commit('updateUserRelationship', [relationship])
+          return relationship
+        })
+        .then((relationship) =>
+          resolve([
+            relationship.following,
+            relationship.requested,
+            relationship.locked,
+            attempt,
+          ]),
+        )
+        .catch((e) => reject(e))
+    }, 500)
+  }).then(([following, sent, locked, attempt]) => {
+    if (!following && !(locked && sent) && attempt <= 3) {
+      // If we BE reports that we still not following that user - retry,
+      // increment attempts by one
+      fetchRelationship(++attempt, userId, store)
+    }
+  })
+
+export const requestFollow = async (userId, store) => {
+  const { data: updated } = await followUser({
+    id: userId,
+    credentials: useOAuthStore().token,
+  })
+
+  store.commit('updateUserRelationship', [updated])
+
+  if (updated.following || (updated.locked && updated.requested)) {
+    // If we get result immediately or the account is locked, just stop.
+    return
+  }
+
+  // But usually we don't get result immediately, so we ask server
+  // for updated user profile to confirm if we are following them
+  // Sometimes it takes several tries. Sometimes we end up not following
+  // user anyway, probably because they locked themselves and we
+  // don't know that yet.
+  // Recursive Promise, it will call itself up to 3 times.
+  return await fetchRelationship(1, updated, store)
+}
+
+export const requestUnfollow = async (userId, store) => {
+  const { data: updated } = await unfollowUser({
+    id: userId,
+    credentials: useOAuthStore().token,
+  })
+
+  return await store.commit('updateUserRelationship', [updated])
+}
diff --git a/src/services/follow_request_fetcher/follow_request_fetcher.service.js b/src/services/follow_request_fetcher/follow_request_fetcher.service.js
index 492c4e648..e49206fcd 100644
--- a/src/services/follow_request_fetcher/follow_request_fetcher.service.js
+++ b/src/services/follow_request_fetcher/follow_request_fetcher.service.js
@@ -1,15 +1,12 @@
-import { useUsersStore } from 'src/stores/users.js'
-
 import { fetchFollowRequests } from 'src/api/user.js'
 import { promiseInterval } from 'src/services/promise_interval/promise_interval.js'
 
 const fetchAndUpdate = ({ store, credentials }) => {
   return fetchFollowRequests({ credentials })
     .then(
-      (result) => {
-        const { data: requests } = result
+      ({ data: requests }) => {
         store.commit('setFollowRequests', requests)
-        useUsersStore().addNewUsers(result)
+        store.commit('addNewUsers', requests)
       },
       (rej) => {
         console.error(rej)
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index 1fdb7bec1..9e443bf8b 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -1,11 +1,7 @@
 import { showDesktopNotification } from '../desktop_notification_utils/desktop_notification_utils.js'
 import { muteFilterHits } from '../status_parser/status_parser.js'
-import {
-  isStatusNotification,
-  prepareNotificationObject,
-} from './notification_utils_sw.js'
 
-import { useNotificationsStore } from 'src/stores/notifications.js'
+import FaviconService from 'src/services/favicon_service/favicon_service.js'
 
 export const ACTIONABLE_NOTIFICATION_TYPES = new Set([
   'mention',
@@ -13,6 +9,10 @@ export const ACTIONABLE_NOTIFICATION_TYPES = new Set([
   'follow_request',
 ])
 
+let cachedBadgeUrl = null
+
+export const notificationsFromStore = (store) => store.state.notifications.data
+
 const visibleTypes = (notificationVisibility) => {
   return [
     notificationVisibility.likes && 'like',
@@ -28,6 +28,17 @@ const visibleTypes = (notificationVisibility) => {
   ].filter(Boolean)
 }
 
+const statusNotifications = new Set([
+  'like',
+  'mention',
+  'status',
+  'repeat',
+  'pleroma:emoji_reaction',
+  'poll',
+])
+
+export const isStatusNotification = (type) => statusNotifications.has(type)
+
 export const isValidNotification = (notification) => {
   if (isStatusNotification(notification.type) && !notification.status) {
     return false
@@ -58,11 +69,14 @@ const isMutedNotification = (muteFilters, notification) => {
 }
 
 export const maybeShowNotification = (
+  store,
   notificationVisibility,
   muteFilters,
   notification,
   i18n,
 ) => {
+  const rootState = store.rootState || store.state
+
   if (notification.seen) return
   if (!visibleTypes(notificationVisibility).includes(notification.type)) return
   if (
@@ -72,23 +86,28 @@ export const maybeShowNotification = (
     return
 
   const notificationObject = prepareNotificationObject(notification, i18n)
-  showDesktopNotification(notificationObject)
+  showDesktopNotification(rootState, notificationObject)
 }
 
-export const filteredNotifications = (notificationVisibility, types) => {
+export const filteredNotificationsFromStore = (
+  store,
+  notificationVisibility,
+  types,
+) => {
   // map is just to clone the array since sort mutates it and it causes some issues
-  const sortedNotifications = useNotificationsStore().data.sort(sortById)
+  const sortedNotifications = notificationsFromStore(store).sort(sortById)
   // TODO implement sorting elsewhere and make it optional
   return sortedNotifications.filter((notification) =>
     (types || visibleTypes(notificationVisibility)).includes(notification.type),
   )
 }
 
-export const unseenNotifications = (
+export const unseenNotificationsFromStore = (
+  store,
   notificationVisibility,
   ignoreInactionableSeen,
 ) => {
-  return filteredNotifications(notificationVisibility).filter(
+  return filteredNotificationsFromStore(store, notificationVisibility).filter(
     ({ seen, type }) => {
       if (!ignoreInactionableSeen) return !seen
       if (seen) return false
@@ -97,6 +116,70 @@ export const unseenNotifications = (
   )
 }
 
+export const prepareNotificationObject = (notification, i18n) => {
+  if (cachedBadgeUrl === null) {
+    const favicons = FaviconService.getOriginalFavicons()
+    const favicon = favicons[favicons.length - 1]
+    if (!favicon) {
+      cachedBadgeUrl = 'about:blank'
+    } else {
+      cachedBadgeUrl = favicon.favimg.src
+    }
+  }
+
+  const notifObj = {
+    tag: notification.id,
+    type: notification.type,
+    badge: cachedBadgeUrl,
+  }
+  const status = notification.status
+  const title = notification.from_profile.name
+  notifObj.title = title
+  notifObj.icon = notification.from_profile.profile_image_url
+  let i18nString
+  switch (notification.type) {
+    case 'like':
+      i18nString = 'favorited_you'
+      break
+    case 'status':
+      i18nString = 'subscribed_status'
+      break
+    case 'repeat':
+      i18nString = 'repeated_you'
+      break
+    case 'follow':
+      i18nString = 'followed_you'
+      break
+    case 'move':
+      i18nString = 'migrated_to'
+      break
+    case 'follow_request':
+      i18nString = 'follow_request'
+      break
+    case 'pleroma:report':
+      i18nString = 'submitted_report'
+      break
+    case 'poll':
+      i18nString = 'poll_ended'
+      break
+  }
+
+  if (notification.type === 'pleroma:emoji_reaction') {
+    notifObj.body = i18n.t('notifications.reacted_with', [notification.emoji])
+  } else if (i18nString) {
+    notifObj.body = i18n.t('notifications.' + i18nString)
+  } else if (isStatusNotification(notification.type)) {
+    notifObj.body = notification.status.text
+  }
+
+  // Shows first attached non-nsfw image, if any. Should add configuration for this somehow...
+  if (!status.nsfw && status?.attachments?.[0]?.mimetype.startsWith('image/')) {
+    notifObj.image = status.attachments[0].url
+  }
+
+  return notifObj
+}
+
 export const countExtraNotifications = (
   store,
   mergedConfig,
diff --git a/src/services/notification_utils/notification_utils_sw.js b/src/services/notification_utils/notification_utils_sw.js
deleted file mode 100644
index ca66df281..000000000
--- a/src/services/notification_utils/notification_utils_sw.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import FaviconService from 'src/services/favicon_service/favicon_service.js'
-
-const statusNotifications = new Set([
-  'like',
-  'mention',
-  'status',
-  'repeat',
-  'pleroma:emoji_reaction',
-  'poll',
-])
-
-let cachedBadgeUrl = null
-
-export const isStatusNotification = (type) => statusNotifications.has(type)
-
-export const prepareNotificationObject = (notification, i18n) => {
-  if (cachedBadgeUrl === null) {
-    const favicons = FaviconService.getOriginalFavicons()
-    const favicon = favicons[favicons.length - 1]
-    if (!favicon) {
-      cachedBadgeUrl = 'about:blank'
-    } else {
-      cachedBadgeUrl = favicon.favimg.src
-    }
-  }
-
-  const notifObj = {
-    tag: notification.id,
-    type: notification.type,
-    badge: cachedBadgeUrl,
-  }
-  const status = notification.status
-  const title = notification.from_profile.name
-  notifObj.title = title
-  notifObj.icon = notification.from_profile.profile_image_url
-  let i18nString
-  switch (notification.type) {
-    case 'like':
-      i18nString = 'favorited_you'
-      break
-    case 'status':
-      i18nString = 'subscribed_status'
-      break
-    case 'repeat':
-      i18nString = 'repeated_you'
-      break
-    case 'follow':
-      i18nString = 'followed_you'
-      break
-    case 'move':
-      i18nString = 'migrated_to'
-      break
-    case 'follow_request':
-      i18nString = 'follow_request'
-      break
-    case 'pleroma:report':
-      i18nString = 'submitted_report'
-      break
-    case 'poll':
-      i18nString = 'poll_ended'
-      break
-  }
-
-  if (notification.type === 'pleroma:emoji_reaction') {
-    notifObj.body = i18n.t('notifications.reacted_with', [notification.emoji])
-  } else if (i18nString) {
-    notifObj.body = i18n.t('notifications.' + i18nString)
-  } else if (isStatusNotification(notification.type)) {
-    notifObj.body = notification.status.text
-  }
-
-  // Shows first attached non-nsfw image, if any. Should add configuration for this somehow...
-  if (!status.nsfw && status?.attachments?.[0]?.mimetype.startsWith('image/')) {
-    notifObj.image = status.attachments[0].url
-  }
-
-  return notifObj
-}
diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
new file mode 100644
index 000000000..0e0bc0277
--- /dev/null
+++ b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -0,0 +1,128 @@
+import { promiseInterval } from '../promise_interval/promise_interval.js'
+
+import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
+import { useInterfaceStore } from 'src/stores/interface.js'
+import { useMergedConfigStore } from 'src/stores/merged_config.js'
+
+import { fetchTimeline } from 'src/api/timelines.js'
+
+const update = ({ store, notifications, older }) => {
+  store.dispatch('addNewNotifications', { notifications, older })
+}
+//
+// For using include_types when fetching notifications.
+// Note: chat_mention excluded as pleroma-fe polls them separately
+const mastoApiNotificationTypes = new Set([
+  'mention',
+  'status',
+  'favourite',
+  'reblog',
+  'follow',
+  'follow_request',
+  'move',
+  'poll',
+  'pleroma:emoji_reaction',
+  'pleroma:report',
+])
+
+const fetchAndUpdate = ({ store, credentials, older = false, sinceId }) => {
+  const args = { credentials }
+  const rootState = store.rootState || store.state
+  const timelineData = rootState.notifications
+  const hideMutedPosts = useMergedConfigStore().mergedConfig.hideMutedPosts
+
+  if (useInstanceCapabilitiesStore().pleromaChatMessagesAvailable) {
+    mastoApiNotificationTypes.add('pleroma:chat_mention')
+  }
+
+  args.includeTypes = [...mastoApiNotificationTypes]
+  args.withMuted = !hideMutedPosts
+
+  args.timeline = 'notifications'
+  if (older) {
+    if (timelineData.minId !== Number.POSITIVE_INFINITY) {
+      args.maxId = timelineData.minId
+    }
+    return fetchNotifications({ store, args, older })
+  } else {
+    // fetch new notifications
+    if (
+      sinceId === undefined &&
+      timelineData.maxId !== Number.POSITIVE_INFINITY
+    ) {
+      args.sinceId = timelineData.maxId
+    } else if (sinceId !== null) {
+      args.sinceId = sinceId
+    }
+    const result = fetchNotifications({ store, args, older })
+
+    // If there's any unread notifications, try fetch notifications since
+    // the newest read notification to check if any of the unread notifs
+    // have changed their 'seen' state (marked as read in another session), so
+    // we can update the state in this session to mark them as read as well.
+    // The normal maxId-check does not tell if older notifications have changed
+    const notifications = timelineData.data
+    const readNotifsIds = notifications.filter((n) => n.seen).map((n) => n.id)
+    const unreadNotifsIds = notifications
+      .filter((n) => !n.seen)
+      .map((n) => n.id)
+
+    if (readNotifsIds.length > 0 && unreadNotifsIds.length > 0) {
+      const minId = Math.min(...unreadNotifsIds) // Oldest known unread notification
+      if (minId !== Infinity) {
+        args.sinceId = null // Don't use since_id since it sorta conflicts with min_id
+        args.minId = minId - 1 // go beyond
+        fetchNotifications({ store, args, older })
+      }
+    }
+
+    return result
+  }
+}
+
+const fetchNotifications = ({ store, args, older }) => {
+  return fetchTimeline(args)
+    .then((response) => {
+      const notifications = response.data
+      update({ store, notifications, older })
+      return notifications
+    })
+    .catch((error) => {
+      if (
+        error.statusCode === 400 &&
+        error.statusText.includes('Invalid value for enum')
+      ) {
+        error.statusText
+          .matchAll(/(\w+) - Invalid value for enum./g)
+          .toArray()
+          .map((x) => x[1])
+          .forEach((x) => mastoApiNotificationTypes.delete(x))
+        return fetchNotifications({ store, args, older })
+      }
+
+      useInterfaceStore().pushGlobalNotice({
+        level: 'error',
+        messageKey: 'notifications.error',
+        messageArgs: [error.message],
+        timeout: 5000,
+      })
+      console.error(error)
+    })
+}
+
+const startFetching = ({ credentials, store }) => {
+  // Initially there's set flag to silence all desktop notifications so
+  // that there won't spam of them when user just opened up the FE we
+  // reset that flag after a while to show new notifications once again.
+  setTimeout(() => store.dispatch('setNotificationsSilence', false), 10000)
+  const boundFetchAndUpdate = () => fetchAndUpdate({ credentials, store })
+  boundFetchAndUpdate()
+  return promiseInterval(boundFetchAndUpdate, 10000)
+}
+
+const notificationsFetcher = {
+  fetchAndUpdate,
+  startFetching,
+}
+
+export default notificationsFetcher
diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js
index 371632ece..9a26bd12f 100644
--- a/src/services/status_poster/status_poster.service.js
+++ b/src/services/status_poster/status_poster.service.js
@@ -1,9 +1,5 @@
 import { map } from 'lodash'
 
-import { useStatusesStore } from 'src/stores/statuses.js'
-import { useTimelinesStore } from 'src/stores/timelines.js'
-import { useUsersStore } from 'src/stores/users.js'
-
 import {
   editStatus as apiEditStatus,
   postStatus as apiPostStatus,
@@ -28,7 +24,7 @@ const postStatus = ({
   const mediaIds = map(media, 'id')
 
   return apiPostStatus({
-    credentials: useUsersStore().currentUser.credentials,
+    credentials: store.state.users.currentUser.credentials,
     status,
     spoilerText,
     visibility,
@@ -40,10 +36,9 @@ const postStatus = ({
     poll,
     preview,
     idempotencyKey,
-  }).then(({ data, timestamp }) => {
+  }).then(({ data }) => {
     if (!preview)
-      useStatusesStore().addNewStatuses({
-        timestamp,
+      store.dispatch('addNewStatuses', {
         statuses: [data],
         timeline: 'friends',
         showImmediately: true,
@@ -68,7 +63,7 @@ const editStatus = ({
 
   return apiEditStatus({
     id: statusId,
-    credentials: useUsersStore().currentUser.credentials,
+    credentials: store.state.users.currentUser.credentials,
     status,
     spoilerText,
     sensitive,
@@ -76,13 +71,10 @@ const editStatus = ({
     mediaIds,
     contentType,
   })
-    .then(({ data, timestamp }) => {
-      useStatusesStore().addNewStatuses({
-        statuses: [data],
-        timestamp,
-      })
-      useTimelinesStore().addStatusesToTimeline('friends', undefined, {
+    .then(({ data }) => {
+      store.dispatch('addNewStatuses', {
         statuses: [data],
+        timeline: 'friends',
         showImmediately: true,
         noIdUpdate: true, // To prevent missing notices on next pull.
       })
@@ -98,12 +90,12 @@ const editStatus = ({
 }
 
 const uploadMedia = ({ store, formData }) => {
-  const credentials = useUsersStore().currentUser.credentials
+  const credentials = store.state.users.currentUser.credentials
   return apiUploadMedia({ credentials, formData }).then(({ data }) => data)
 }
 
 const setMediaDescription = ({ store, id, description }) => {
-  const credentials = useUsersStore().currentUser.credentials
+  const credentials = store.state.users.currentUser.credentials
   return apiSetMediaDescription({ credentials, id, description }).then(
     ({ data }) => data,
   )
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 5acd124b4..d42c5793f 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -313,9 +313,7 @@ export const applyStyleConfig = (input) => {
   adoptStyleSheets()
 }
 
-const noop = (x) => x
-
-export const getResourcesIndex = async (url, parser = noop) => {
+export const getResourcesIndex = async (url, parser = (x) => x) => {
   const cache = 'no-store'
   const customUrl = url.replace(/\.(\w+)$/, '.custom.$1')
   let builtin
@@ -332,7 +330,6 @@ export const getResourcesIndex = async (url, parser = noop) => {
             promisedRequest({
               url: v,
               cache,
-              forceContentType: parser === noop ? null : 'text/plain',
             })
               .then(({ data: text }) => parser(text))
               .catch((e) => {
@@ -348,11 +345,7 @@ export const getResourcesIndex = async (url, parser = noop) => {
   }
 
   try {
-    const { data: builtinData } = await promisedRequest({
-      url,
-      cache,
-      forceContentType: 'application/json',
-    })
+    const { data: builtinData } = await promisedRequest({ url, cache })
     builtin = resourceTransform(builtinData)
   } catch {
     builtin = []
@@ -363,7 +356,6 @@ export const getResourcesIndex = async (url, parser = noop) => {
     const { data: customData } = await promisedRequest({
       url: customUrl,
       cache,
-      forceContentType: 'application/json',
     })
     custom = resourceTransform(customData)
   } catch {
diff --git a/src/services/sw/sw.js b/src/services/sw/sw.js
index 9040f0cf5..ef8200a4d 100644
--- a/src/services/sw/sw.js
+++ b/src/services/sw/sw.js
@@ -1,5 +1,3 @@
-import { useNotificationsStore } from 'src/stores/notifications.js'
-
 /* global process */
 function urlBase64ToUint8Array(base64String) {
   const padding = '='.repeat((4 - (base64String.length % 4)) % 4)
@@ -96,15 +94,16 @@ function sendSubscriptionToBackEnd(
       return responseData
     })
 }
-export async function initServiceWorker() {
+export async function initServiceWorker(store) {
   if (!isSWSupported()) return
   await getOrCreateServiceWorker()
   navigator.serviceWorker.addEventListener('message', (event) => {
+    const { dispatch } = store
     const { type, ...rest } = event.data
 
     switch (type) {
       case 'notificationClicked':
-        useNotificationsStore().notificationClicked(rest.id)
+        dispatch('notificationClicked', { id: rest.id })
     }
   })
 }
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
new file mode 100644
index 000000000..80dbc75d0
--- /dev/null
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -0,0 +1,160 @@
+import { camelCase } from 'lodash'
+
+import { promiseInterval } from '../promise_interval/promise_interval.js'
+
+import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
+import { useInterfaceStore } from 'src/stores/interface.js'
+import { useMergedConfigStore } from 'src/stores/merged_config.js'
+
+import { fetchTimeline } from 'src/api/timelines.js'
+
+const update = ({
+  store,
+  statuses,
+  timeline,
+  showImmediately,
+  userId,
+  listId,
+  pagination,
+}) => {
+  const ccTimeline = camelCase(timeline)
+
+  store.dispatch('addNewStatuses', {
+    timeline: ccTimeline,
+    userId,
+    listId,
+    statuses,
+    showImmediately,
+    pagination,
+  })
+}
+
+const fetchAndUpdate = ({
+  store,
+  credentials,
+  timeline = 'friends',
+  older = false,
+  showImmediately = false,
+  userId,
+  listId,
+  statusId,
+  bookmarkFolderId,
+  tag,
+  maxId,
+  sinceId,
+}) => {
+  const args = { timeline, credentials }
+  const rootState = store.rootState || store.state
+  const timelineData = rootState.statuses.timelines[camelCase(timeline)]
+  const { hideMutedPosts, replyVisibility } =
+    useMergedConfigStore().mergedConfig
+  const loggedIn = !!rootState.users.currentUser
+
+  if (older) {
+    // When minId = 0 we need to fetch without maxId param
+    args.maxId = maxId || timelineData.minId || null
+  } else {
+    if (sinceId === undefined) {
+      args.sinceId = timelineData.maxId
+    } else if (sinceId !== null) {
+      args.sinceId = sinceId
+    }
+  }
+
+  args.userId = userId
+  args.listId = listId
+  args.statusId = statusId
+  args.bookmarkFolderId = bookmarkFolderId
+  args.tag = tag
+  args.withMuted = !hideMutedPosts
+  if (
+    loggedIn &&
+    ['friends', 'public', 'publicAndExternal', 'bubble'].includes(timeline)
+  ) {
+    args.replyVisibility = replyVisibility
+  }
+
+  const numStatusesBeforeFetch = timelineData.statuses.length
+
+  return fetchTimeline(args)
+    .then((response) => {
+      const { data: statuses, pagination } = response
+      if (
+        !older &&
+        statuses.length >= 20 &&
+        !timelineData.loading &&
+        numStatusesBeforeFetch > 0
+      ) {
+        store.dispatch('queueFlush', { timeline, id: timelineData.maxId })
+      }
+      update({
+        store,
+        statuses,
+        timeline,
+        showImmediately,
+        userId,
+        listId,
+        pagination,
+      })
+      return { statuses, pagination }
+    })
+    .catch((error) => {
+      if (error.statusCode === 403 && timeline === 'favorites') {
+        useInstanceCapabilitiesStore().pleromaPublicFavouritesAvailable = false
+        return
+      }
+      useInterfaceStore().pushGlobalNotice({
+        level: 'error',
+        messageKey: 'timeline.error',
+        messageArgs: [error.message],
+        timeout: 5000,
+      })
+    })
+}
+
+const startFetching = ({
+  timeline = 'friends',
+  credentials,
+  store,
+  userId,
+  listId,
+  statusId,
+  bookmarkFolderId,
+  tag,
+}) => {
+  const rootState = store.rootState || store.state
+  const timelineData = rootState.statuses.timelines[camelCase(timeline)]
+  const showImmediately = timelineData.visibleStatuses.length === 0
+  timelineData.userId = userId
+  timelineData.listId = listId
+  timelineData.bookmarkFolderId = bookmarkFolderId
+  fetchAndUpdate({
+    timeline,
+    credentials,
+    store,
+    showImmediately,
+    userId,
+    listId,
+    statusId,
+    bookmarkFolderId,
+    tag,
+  })
+  const boundFetchAndUpdate = () =>
+    fetchAndUpdate({
+      timeline,
+      credentials,
+      store,
+      userId,
+      listId,
+      statusId,
+      bookmarkFolderId,
+      tag,
+    })
+  return promiseInterval(boundFetchAndUpdate, 10000)
+}
+const timelineFetcher = {
+  fetchAndUpdate,
+  startFetching,
+}
+
+export default timelineFetcher
diff --git a/src/stores/admin_settings.js b/src/stores/admin_settings.js
index 70850e5f6..766da26fb 100644
--- a/src/stores/admin_settings.js
+++ b/src/stores/admin_settings.js
@@ -2,8 +2,6 @@ import { cloneDeep, differenceWith, get, isEqual, set } from 'lodash'
 import { defineStore } from 'pinia'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import {
   addNewEmojiFile,
@@ -364,7 +362,6 @@ export const useAdminSettingsStore = defineStore('adminSettings', {
     async fetchStatuses(opts) {
       const {
         data: { total, activities },
-        timestamp,
       } = await listStatuses({
         credentials: useOAuthStore().token,
         opts,
@@ -372,7 +369,7 @@ export const useAdminSettingsStore = defineStore('adminSettings', {
 
       const statuses = activities.map(parseStatus)
 
-      useStatusesStore().addNewStatuses({ statuses, timestamp })
+      await window.vuex.dispatch('addNewStatuses', { statuses })
 
       return {
         items: statuses,
@@ -380,13 +377,13 @@ export const useAdminSettingsStore = defineStore('adminSettings', {
       }
     },
     async changeStatusScope(opts) {
-      const { data, timestamp } = await changeStatusScope({
+      const { data } = await changeStatusScope({
         credentials: useOAuthStore().token,
         opts,
       })
       const status = parseStatus(data)
 
-      useStatusesStore().addNewStatuses({ statuses: [status], timestamp })
+      await window.vuex.dispatch('addNewStatuses', { statuses: [status] })
     },
 
     // Users stuff
@@ -400,10 +397,12 @@ export const useAdminSettingsStore = defineStore('adminSettings', {
 
       return {
         items: await Promise.all(
-          users.map((user) => {
-            useUsersStore().updateUserAdminData(user.id, user)
-            return useUsersStore().findUser(user.id)
-          }),
+          users.map(
+            async (userAdminData) =>
+              await window.vuex.dispatch('updateUserAdminData', {
+                userAdminData,
+              }),
+          ),
         ),
         count,
       }
@@ -417,8 +416,7 @@ export const useAdminSettingsStore = defineStore('adminSettings', {
         screen_name,
       })
 
-      const { data } = result
-      useUsersStore().updateUserAdminData(data.id, data)
+      window.vuex.commit('updateUserAdminData', { user: result.data })
     },
     async deleteUsers({ users }) {
       const screen_names = users.map((u) => u.screen_name)
@@ -491,7 +489,7 @@ export const useAdminSettingsStore = defineStore('adminSettings', {
       })
 
       users.forEach((user) => {
-        useUsersStore().updateRight(user.id, right, value)
+        window.vuex.commit('updateRight', { user, right, value })
       })
     },
     async setUsersActivationStatus({ users, value }) {
@@ -505,7 +503,7 @@ export const useAdminSettingsStore = defineStore('adminSettings', {
       })
 
       resultUsers.data.forEach((user) => {
-        useUsersStore().updateUserAdminData(user.id, user)
+        window.vuex.commit('updateUserAdminData', { user })
       })
     },
     async setUsersSuggestionStatus({ users, value }) {
@@ -519,7 +517,7 @@ export const useAdminSettingsStore = defineStore('adminSettings', {
       })
 
       resultUsers.data.forEach((user) => {
-        useUsersStore().updateUserAdminData(user.id, user)
+        window.vuex.commit('updateUserAdminData', { user })
       })
     },
     async setUsersConfirmationStatus({ users }) {
@@ -545,7 +543,7 @@ export const useAdminSettingsStore = defineStore('adminSettings', {
       })
 
       resultUsers.data.forEach((user) => {
-        useUsersStore().updateUserAdminData(user.id, user)
+        window.vuex.commit('updateUserAdminData', { user })
       })
     },
     reloadEmoji() {
diff --git a/src/stores/announcements.js b/src/stores/announcements.js
index c78e79853..b09655755 100644
--- a/src/stores/announcements.js
+++ b/src/stores/announcements.js
@@ -1,7 +1,6 @@
 import { defineStore } from 'pinia'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { dismissAnnouncement, getAnnouncements } from 'src/api/user.js'
 
@@ -17,7 +16,7 @@ export const useAnnouncementsStore = defineStore('announcements', {
   }),
   getters: {
     unreadAnnouncementCount() {
-      if (!useUsersStore().currentUser) {
+      if (!window.vuex.state.users.currentUser) {
         return 0
       }
 
@@ -31,7 +30,7 @@ export const useAnnouncementsStore = defineStore('announcements', {
     async fetchAnnouncements() {
       if (!this.supportsAnnouncements) return
 
-      const currentUser = useUsersStore().currentUser
+      const currentUser = window.vuex.state.users.currentUser
       const isAdmin =
         currentUser &&
         currentUser.privileges.has('announcements_manage_announcements')
@@ -96,7 +95,7 @@ export const useAnnouncementsStore = defineStore('announcements', {
         this.announcements[index].read = true
       })
     },
-    startFetching() {
+    startFetchingAnnouncements() {
       if (this.fetchAnnouncementsTimer) {
         return
       }
@@ -109,7 +108,7 @@ export const useAnnouncementsStore = defineStore('announcements', {
 
       return this.fetchAnnouncements()
     },
-    stopFetching() {
+    stopFetchingAnnouncements() {
       const interval = this.fetchAnnouncementsTimer
       this.fetchAnnouncementsTimer = undefined
       clearInterval(interval)
diff --git a/src/stores/auth_flow.js b/src/stores/auth_flow.js
index 0841dc558..64df30f2a 100644
--- a/src/stores/auth_flow.js
+++ b/src/stores/auth_flow.js
@@ -1,7 +1,6 @@
 import { defineStore } from 'pinia'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 const PASSWORD_STRATEGY = 'password'
 const TOKEN_STRATEGY = 'token'
@@ -64,7 +63,7 @@ export const useAuthFlowStore = defineStore('authFlow', {
     },
     async login({ access_token: accessToken }) {
       useOAuthStore().setToken(accessToken)
-      useUsersStore().loginUser(accessToken, { root: true })
+      await window.vuex.dispatch('loginUser', accessToken, { root: true })
       this.resetState()
     },
   },
diff --git a/src/stores/chats.js b/src/stores/chats.js
index 9da01c76b..5ade0c126 100644
--- a/src/stores/chats.js
+++ b/src/stores/chats.js
@@ -5,8 +5,6 @@ import { maybeShowChatNotification } from '../services/chat_utils/chat_utils.js'
 import { promiseInterval } from '../services/promise_interval/promise_interval.js'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useStreamingStore } from 'src/stores/streaming.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { chats } from 'src/api/chats.js'
 
@@ -35,27 +33,19 @@ export const useChatsStore = defineStore('chats', {
     },
   },
   actions: {
-    attachSocket() {
-      const et = new EventTarget()
-      const socket = { et }
-
-      et.addEventListener('pleroma:chat_update', this.updateChat)
-
-      useStreamingStore().addSubscriber(socket)
-    },
-    startFetching() {
+    startFetchingChats() {
       const fetcher = () => this.fetchChats()
       this.setChatListFetcher(() => promiseInterval(fetcher, 5000))
     },
-    stopFetching() {
+    stopFetchingChats() {
       this.setChatListFetcher(null)
     },
     async fetchChats() {
-      this.addNewChats(
-        await chats({
-          credentials: useOAuthStore().token,
-        }),
-      )
+      const { data } = await chats({
+        credentials: useOAuthStore().token,
+      })
+
+      this.addNewChats(data)
     },
     setChatListFetcher(fetcher) {
       const prevFetcher = this.chatListFetcher
@@ -68,13 +58,13 @@ export const useChatsStore = defineStore('chats', {
       this.chatList = emptyChatList()
       this.setChatListFetcher(null)
     },
-    addNewChats(result) {
-      useUsersStore().addNewUsers({
-        ...result,
-        data: result.data.map((k) => k.account).filter(Boolean),
-      })
+    addNewChats(chats) {
+      window.vuex.commit(
+        'addNewUsers',
+        chats.map((k) => k.account).filter(Boolean),
+      )
 
-      result.data.forEach((updatedChat) => {
+      chats.forEach((updatedChat) => {
         const chat = getChatById(this, updatedChat.id)
 
         if (chat) {
diff --git a/src/stores/emoji.js b/src/stores/emoji.js
index 1471f3dfb..8135a483e 100644
--- a/src/stores/emoji.js
+++ b/src/stores/emoji.js
@@ -3,7 +3,6 @@ import { defineStore } from 'pinia'
 
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { listEmojiPacks } from 'src/api/public.js'
 import { ensureFinalFallback } from 'src/i18n/languages.js'
@@ -195,7 +194,7 @@ export const useEmojiStore = defineStore('emoji', {
     },
 
     async getAdminPacks(instance, listFunction) {
-      const currentUser = useUsersStore().currentUser
+      const currentUser = window.vuex.state.users.currentUser
 
       if (!currentUser.rights.admin) return
 
diff --git a/src/stores/fetchers/notifications_fetcher.js b/src/stores/fetchers/notifications_fetcher.js
deleted file mode 100644
index a31877072..000000000
--- a/src/stores/fetchers/notifications_fetcher.js
+++ /dev/null
@@ -1,143 +0,0 @@
-import { ref } from 'vue'
-
-import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useNotificationsStore } from 'src/stores/notifications.js'
-
-import { fetchTimeline } from 'src/api/timelines.js'
-import { promiseInterval } from 'src/services/promise_interval/promise_interval.js'
-
-// For using include_types when fetching notifications.
-// Note: chat_mention excluded as pleroma-fe polls them separately
-const mastoApiNotificationTypes = new Set([
-  'mention',
-  'status',
-  'favourite',
-  'reblog',
-  'follow',
-  'follow_request',
-  'move',
-  'poll',
-  'pleroma:emoji_reaction',
-  'pleroma:report',
-])
-
-const notificationsFetcher = (credentials) => {
-  const interval = ref(null)
-  const loading = ref(false)
-  const bottomedOut = ref(false)
-
-  const fetchNotifications = async ({ args, older }) => {
-    loading.value = true
-
-    try {
-      const response = await fetchTimeline(args)
-      const notifications = response.data
-      if (older && notifications.length === 0) bottomedOut.value = true
-
-      useNotificationsStore().addNewNotifications(response)
-    } catch (error) {
-      if (
-        error.statusCode === 400 &&
-        error.statusText.includes('Invalid value for enum')
-      ) {
-        error.statusText
-          .matchAll(/(\w+) - Invalid value for enum./g)
-          .toArray()
-          .map((x) => x[1])
-          .forEach((x) => mastoApiNotificationTypes.delete(x))
-
-        // Retry
-        return await fetchNotifications({ args, older })
-      }
-
-      console.error('Notifications Error', error)
-      useInterfaceStore().pushGlobalNotice({
-        level: 'error',
-        messageKey: 'notifications.error',
-        messageArgs: [error.message],
-        timeout: 5000,
-      })
-    } finally {
-      loading.value = false
-    }
-  }
-
-  const fetchAndUpdate = async ({ older = false, sinceId } = {}) => {
-    const args = { credentials }
-    const timelineData = useNotificationsStore()
-    const hideMutedPosts = useMergedConfigStore().mergedConfig.hideMutedPosts
-
-    if (useInstanceCapabilitiesStore().pleromaChatMessagesAvailable) {
-      mastoApiNotificationTypes.add('pleroma:chat_mention')
-    }
-
-    args.includeTypes = [...mastoApiNotificationTypes]
-    args.withMuted = !hideMutedPosts
-
-    args.timeline = 'notifications'
-    if (older) {
-      if (timelineData.minId !== Number.POSITIVE_INFINITY) {
-        args.maxId = timelineData.minId
-      }
-      return await fetchNotifications({ args, older })
-    } else {
-      // fetch new notifications
-      if (
-        sinceId === undefined &&
-        timelineData.maxId !== Number.POSITIVE_INFINITY
-      ) {
-        args.sinceId = timelineData.maxId
-      } else if (sinceId !== null) {
-        args.sinceId = sinceId
-      }
-      const result = await fetchNotifications({ args, older })
-
-      // If there's any unread notifications, try fetch notifications since
-      // the newest read notification to check if any of the unread notifs
-      // have changed their 'seen' state (marked as read in another session), so
-      // we can update the state in this session to mark them as read as well.
-      // The normal maxId-check does not tell if older notifications have changed
-      const notifications = timelineData.data
-      const readNotifsIds = notifications.filter((n) => n.seen).map((n) => n.id)
-      const unreadNotifsIds = notifications
-        .filter((n) => !n.seen)
-        .map((n) => n.id)
-
-      if (readNotifsIds.length > 0 && unreadNotifsIds.length > 0) {
-        const minId = Math.min(...unreadNotifsIds) // Oldest known unread notification
-        if (minId !== Infinity) {
-          args.sinceId = null // Don't use since_id since it sorta conflicts with min_id
-          args.minId = minId - 1 // go beyond
-          fetchNotifications({ args, older })
-        }
-      }
-
-      return result
-    }
-  }
-
-  const startFetching = () => {
-    if (interval.value) throw new Error('Interval already exists!')
-
-    fetchAndUpdate()
-
-    interval.value = promiseInterval(fetchAndUpdate, 10000)
-  }
-
-  const stopFetching = () => {
-    interval.value.stop()
-    interval.value = null
-  }
-
-  return {
-    loading,
-    bottomedOut,
-    startFetching,
-    stopFetching,
-    fetchOlder: () => fetchAndUpdate({ older: true }),
-  }
-}
-
-export default notificationsFetcher
diff --git a/src/stores/fetchers/timeline_fetcher.js b/src/stores/fetchers/timeline_fetcher.js
deleted file mode 100644
index 25e6e895f..000000000
--- a/src/stores/fetchers/timeline_fetcher.js
+++ /dev/null
@@ -1,115 +0,0 @@
-import { ref } from 'vue'
-
-import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
-import { ARGUMENT_MAP, useTimelinesStore } from 'src/stores/timelines.js'
-import { useUsersStore } from 'src/stores/users.js'
-
-import { fetchTimeline } from 'src/api/timelines.js'
-import { promiseInterval } from 'src/services/promise_interval/promise_interval.js'
-
-const REPLY_VISIBILITY_TIMELINES = new Set([
-  'friends',
-  'public',
-  'publicAndExternal',
-  'bubble',
-])
-
-const timelineFetcher = (timeline, argument, credentials) => {
-  const loading = ref(false)
-  const bottomedOut = ref(false)
-  const interval = ref(null)
-
-  const fetchAndUpdate = ({ older = false, showImmediately = false } = {}) => {
-    loading.value = true
-
-    const { hideMutedPosts, replyVisibility } =
-      useMergedConfigStore().mergedConfig
-    const loggedIn = useUsersStore().loggedIn
-
-    const args = { timeline: timeline.name, credentials }
-    const mainArg = ARGUMENT_MAP[timeline.name]
-    if (mainArg) args[mainArg] = argument
-
-    if (older) {
-      // When minId = 0 we need to fetch without maxId param
-      args.maxId = timeline.minId || null
-    } else {
-      args.sinceId = timeline.maxId || null
-    }
-
-    args.withMuted = !hideMutedPosts
-    if (loggedIn && REPLY_VISIBILITY_TIMELINES.has(timeline)) {
-      args.replyVisibility = replyVisibility
-    }
-
-    const numStatusesBeforeFetch = timeline.statusIds.size
-
-    return fetchTimeline(args)
-      .then(({ data: statuses, pagination, timestamp }) => {
-        if (!older && statuses.length >= 20 && numStatusesBeforeFetch > 0) {
-          useTimelinesStore().queueFlush(timeline.name, timeline.maxId)
-        }
-
-        if (older && statuses.length === 0) {
-          bottomedOut.value = true
-        }
-
-        const processed = useStatusesStore()
-          .addNewStatuses({ statuses, timestamp })
-          .map(({ id }) => id)
-
-        useTimelinesStore().addStatusesToTimeline(timeline.name, argument, {
-          statuses: processed,
-          showImmediately,
-          older,
-          pagination,
-        })
-
-        return { statuses, pagination }
-      })
-      .catch((error) => {
-        if (error.statusCode === 403 && timeline === 'favorites') {
-          useInstanceCapabilitiesStore().pleromaPublicFavouritesAvailable = false
-          return
-        }
-        console.error('Timeline Error', error)
-        useInterfaceStore().pushGlobalNotice({
-          level: 'error',
-          messageKey: 'timeline.error',
-          messageArgs: [error.message],
-          timeout: 5000,
-        })
-      })
-      .finally(() => {
-        loading.value = false
-      })
-  }
-
-  const startFetching = () => {
-    if (interval.value) throw new Error('Interval already exists!')
-
-    fetchAndUpdate({
-      showImmediately: timeline.visibleStatusIds.size === 0,
-    })
-
-    interval.value = promiseInterval(fetchAndUpdate, 10000)
-  }
-
-  const stopFetching = () => {
-    interval.value.stop()
-    interval.value = null
-  }
-
-  return {
-    startFetching,
-    stopFetching,
-    fetchOlder: () => fetchAndUpdate({ showImmediately: true, older: true }),
-    loading,
-    bottomedOut,
-  }
-}
-
-export default timelineFetcher
diff --git a/src/stores/instance.js b/src/stores/instance.js
index 123f0b819..02edd1235 100644
--- a/src/stores/instance.js
+++ b/src/stores/instance.js
@@ -13,7 +13,6 @@ import {
 } from '../modules/default_config_state.js'
 
 import { useInterfaceStore } from 'src/stores/interface.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { fetchKnownDomains } from 'src/api/public.js'
 
@@ -213,7 +212,7 @@ export const useInstanceStore = defineStore('instance', {
     async getKnownDomains() {
       try {
         const { data } = await fetchKnownDomains({
-          credentials: useUsersStore().currentUser.credentials,
+          credentials: window.vuex.state.users.currentUser.credentials,
         })
         this.knownDomains = data
       } catch (e) {
diff --git a/src/stores/interface.js b/src/stores/interface.js
index 0eba6f158..7be72a8d2 100644
--- a/src/stores/interface.js
+++ b/src/stores/interface.js
@@ -6,38 +6,17 @@ import {
   tryLoadCache,
 } from '../services/style_setter/style_setter.js'
 import { deserialize } from '../services/theme_data/iss_deserializer.js'
-import {
-  windowHeight,
-  windowWidth,
-} from '../services/window_utils/window_utils'
 
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
-import { useStreamingStore } from 'src/stores/streaming.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
-import { WSConnectionStatus } from 'src/api/websocket.js'
-import {
-  registerPushNotifications,
-  unregisterPushNotifications,
-} from 'src/services/sw/sw.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'
 
-const getNotificationPermission = async () => {
-  const Notification = window.Notification
-
-  if (!Notification) return null
-  if (Notification.permission === 'default')
-    return Notification.requestPermission()
-  return Notification.permission
-}
-
 const GENERIC_FONT_NAMES = new Set([
   'serif',
   'sans-serif',
@@ -94,59 +73,6 @@ export const useInterfaceStore = defineStore('interface', {
     foreignProfileBackground: null,
   }),
   actions: {
-    attachSocket() {
-      const et = new EventTarget()
-      const socket = { et }
-
-      et.addEventListener('open', this.onStreamConnect)
-      et.addEventListener('close', this.onStreamDisconnect)
-
-      useStreamingStore().addSubscriber(socket)
-    },
-    onLogin() {
-      getNotificationPermission().then((permission) =>
-        useInterfaceStore().setNotificationPermission(permission),
-      )
-
-      this.setLayoutWidth(windowWidth())
-      this.setLayoutHeight(windowHeight())
-    },
-    onLogout() {
-      this.setLastTimeline('public-timeline')
-      this.setLayoutWidth(windowWidth())
-      this.setLayoutHeight(windowHeight())
-    },
-    onStreamConnect() {
-      if (useStreamingStore().state !== WSConnectionStatus.STARTING_INITIAL) {
-        this.pushGlobalNotice({
-          level: 'success',
-          messageKey: 'timeline.socket_reconnected',
-          timeout: 5000,
-        })
-      }
-    },
-    onStreamDisconnect(closeEvent) {
-      const intendedCodes = new Set([
-        1000, // Normal (intended) closure
-        1001, // Going away
-      ])
-      const { code } = closeEvent.original
-      if (intendedCodes.has(code)) {
-        this.pushGlobalNotice({
-          level: 'success',
-          messageKey: 'timeline.socket_closed',
-          messageArgs: [code],
-          timeout: 5000,
-        })
-      } else {
-        this.pushGlobalNotice({
-          level: 'error',
-          messageKey: 'timeline.socket_broke',
-          messageArgs: [code],
-          timeout: 5000,
-        })
-      }
-    },
     setTemporaryChanges({ confirm, revert }) {
       this.temporaryChangesCountdown = 10
       this.temporaryChangesConfirm = confirm
@@ -319,7 +245,7 @@ export const useInterfaceStore = defineStore('interface', {
       const mobileLayout = width <= 800
       const normalOrMobile = mobileLayout ? 'mobile' : 'normal'
       const { thirdColumnMode } = useMergedConfigStore().mergedConfig
-      if (thirdColumnMode === 'none' || !useUsersStore().currentUser) {
+      if (thirdColumnMode === 'none' || !window.vuex.state.users.currentUser) {
         this.layoutType = normalOrMobile
       } else {
         const wideLayout = width >= 1300
@@ -836,28 +762,6 @@ export const useInterfaceStore = defineStore('interface', {
         window.splashError(e)
       }
     },
-
-    // Push notifications
-    registerPushNotifications() {
-      const token = useOAuthStore().token
-      const vapidPublicKey = useInstanceStore().vapidPublicKey
-      const isEnabled = useMergedConfigStore().mergedConfig.webPushNotifications
-      const notificationVisibility =
-        useMergedConfigStore().mergedConfig.notificationVisibility
-
-      registerPushNotifications(
-        isEnabled,
-        vapidPublicKey,
-        token,
-        notificationVisibility,
-      )
-    },
-
-    unregisterPushNotifications() {
-      const token = this.currentUser.credentials
-
-      unregisterPushNotifications(token)
-    },
   },
 })
 
diff --git a/src/stores/notifications.js b/src/stores/notifications.js
deleted file mode 100644
index 99d56e0d0..000000000
--- a/src/stores/notifications.js
+++ /dev/null
@@ -1,288 +0,0 @@
-import { defineStore } from 'pinia'
-
-import notificationsFetcher from 'src/stores/fetchers/notifications_fetcher.js'
-import { useI18nStore } from 'src/stores/i18n.js'
-import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
-import { useReportsStore } from 'src/stores/reports.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
-import { useStreamingStore } from 'src/stores/streaming.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { useUsersStore } from 'src/stores/users.js'
-
-import { dismissNotification, markNotificationsAsSeen } from 'src/api/user.js'
-import {
-  closeAllDesktopNotifications,
-  closeDesktopNotification,
-} from 'src/services/desktop_notification_utils/desktop_notification_utils.js'
-import {
-  isValidNotification,
-  maybeShowNotification,
-} from 'src/services/notification_utils/notification_utils.js'
-import { isStatusNotification } from 'src/services/notification_utils/notification_utils_sw.js'
-
-export const defaultState = () => ({
-  desktopNotificationSilence: true,
-  maxId: '',
-  minId: '',
-  data: [],
-  statusNotificationRelations: new WeakMap(),
-  idStore: new Map(),
-  statusIdStore: new Set(),
-  socket: null,
-  streaming: false,
-  fetcher: null,
-})
-
-export const useNotificationsStore = defineStore('notifications', {
-  state: defaultState,
-  actions: {
-    // Init
-    attachSocket() {
-      const et = new EventTarget()
-      const socket = { et }
-
-      et.addEventListener('notification', this.addNewNotifications)
-      et.addEventListener('open', this.onStreamConnect)
-      et.addEventListener('close', this.onStreamDisconnect)
-
-      useStreamingStore().addSubscriber(socket)
-      this.socket = socket
-    },
-    activate() {
-      this.attachSocket()
-
-      // Initially there's set flag to silence all desktop notifications so
-      // that there won't spam of them when user just opened up the FE we
-      // reset that flag after a while to show new notifications once again.
-      setTimeout(() => (this.desktopNotificationSilence = false), 10000)
-
-      if (this.fetcher) throw new Error('Fetcher already exists!')
-      this.fetcher = notificationsFetcher(useOAuthStore().token)
-      this.startFetching('Notifications activated')
-    },
-    deactivate() {
-      if (!this.streaming) {
-        this.stopFetching('Notifications deactivated')
-      }
-
-      useStreamingStore().removeSubscriber(this.socket)
-
-      const { et } = this.socket
-      et.removeEventListener('notification', this.addNewNotifications)
-      et.removeEventListener('open', this.onStreamConnect)
-      et.removeEventListener('close', this.onStreamDisconnect)
-
-      const blankState = defaultState()
-      Object.keys(blankState).forEach((k) => {
-        this[k] = blankState[k]
-      })
-    },
-
-    // Poll & Push
-    onStreamConnect() {
-      console.debug('[Notifications] Notifications stream connected')
-      this.streaming = true
-      this.stopFetching('Socket connected')
-    },
-    onStreamDisconnect() {
-      console.debug('[Notifications] Notifications stream disconnected')
-      this.streaming = false
-      this.startFetching('Socket disconnected')
-    },
-    startFetching(reason) {
-      console.debug(
-        '[Notifications] Starting fetching notifications',
-        'Reason:',
-        reason,
-      )
-      this.fetcher.startFetching()
-    },
-    stopFetching(reason) {
-      console.debug(
-        '[Notifications] Stopped fetching notifications',
-        'Reason:',
-        reason,
-      )
-      this.fetcher.stopFetching()
-    },
-
-    // Updates
-    updateExtremes(id) {
-      if (this.maxId === '' || id > this.maxId) {
-        this.maxId = id
-      }
-      if (this.minId === '' || id < this.minId) {
-        this.minId = id
-      }
-    },
-    addNewNotifications(result, older) {
-      const { timestamp, data } = result
-
-      const notifications = older ? data : [...data].reverse()
-
-      useUsersStore().addNewUsers({
-        timestamp,
-        data: notifications.map((n) => n.from_profile),
-      })
-
-      notifications.forEach((n) => {
-        n.from_profile = useUsersStore().findUser(n.from_profile.id)
-      })
-
-      const validNotifications = notifications.filter((notification) => {
-        // If invalid notification, update ids but don't add it to store
-        if (!isValidNotification(notification)) {
-          console.error('Invalid notification:', notification)
-          this.updateExtremes(notification.id)
-          return false
-        }
-        return true
-      })
-
-      useUsersStore().addNewUsers({
-        timestamp,
-        data: validNotifications.map(
-          (notification) => notification.from_profile,
-        ),
-      })
-
-      const statusNotifications = validNotifications.filter(
-        (notification) =>
-          isStatusNotification(notification.type) && notification.status,
-      )
-
-      // Synchronous commit to add all the statuses
-      useStatusesStore().addNewStatuses({
-        timestamp,
-        statuses: statusNotifications.map(
-          (notification) => notification.status,
-        ),
-      })
-
-      // Update references to statuses in notifications to ones in the store
-      statusNotifications.forEach((notification) => {
-        const id = notification.status.id
-        const referenceStatus = useStatusesStore().allStatuses.get(id)
-
-        if (referenceStatus) {
-          notification.status = referenceStatus
-        }
-      })
-
-      validNotifications.forEach((notification) => {
-        if (notification.type === 'pleroma:report') {
-          useReportsStore().addReport(notification.report)
-        }
-
-        if (notification.type === 'pleroma:emoji_reaction') {
-          useStatusesStore().fetchEmojiReactions(notification.status.id)
-        }
-
-        // Only add a new notification if we don't have one for the same action
-        if (!this.idStore.has(notification.id)) {
-          this.updateExtremes(notification.id)
-
-          if (older) {
-            this.data.push(notification)
-          } else {
-            this.data.unshift(notification)
-          }
-          this.idStore.set(notification.id, notification)
-
-          this.statusNotificationRelations.set(
-            notification.status,
-            this.idStore.get(notification.id),
-          )
-
-          maybeShowNotification(
-            useMergedConfigStore().mergedConfig.notificationVisibility,
-            Object.values(
-              useSyncConfigStore().prefsStorage.simple.muteFilters ?? {},
-            ),
-            notification,
-            useI18nStore().i18n,
-          )
-        } else if (notification.seen) {
-          this.idStore.get(notification.id).seen = true
-        }
-      })
-    },
-
-    // Seen / Dismiss
-    notificationClicked(id) {
-      const notification = this.idStore.get(id)
-      const { type, seen } = notification
-
-      if (!seen) {
-        switch (type) {
-          case 'mention':
-          case 'pleroma:report':
-          case 'follow_request':
-            break
-          default:
-            this.markSingleNotificationAsSeen({ id })
-        }
-      }
-    },
-    markNotificationsAsSeen() {
-      this.data.forEach((notification) => {
-        notification.seen = true
-      })
-
-      markNotificationsAsSeen({
-        id: this.maxId,
-        credentials: useOAuthStore().token,
-      }).then(() => {
-        closeAllDesktopNotifications()
-      })
-    },
-    markSingleNotificationAsSeen(id) {
-      const notification = this.idStore.get(id)
-      if (notification) notification.seen = true
-
-      markNotificationsAsSeen({
-        single: true,
-        id,
-        credentials: useOAuthStore().token,
-      }).then(() => {
-        closeDesktopNotification(id)
-      })
-    },
-    dismissNotificationLocal(id) {
-      this.idStore.delete(id)
-      this.syncOrder()
-    },
-    dismissNotification(id) {
-      this.dismissNotificationLocal(id)
-
-      dismissNotification({
-        id,
-        credentials: useOAuthStore().token,
-      })
-    },
-    syncOrder() {
-      this.minId = ''
-      this.maxId = ''
-      this.data = this.data.filter(({ id }) => {
-        const present = this.idStore.has(id)
-        if (present) {
-          this.updateExtremes(id) // Side-effect
-        }
-        return present
-      })
-    },
-    wipeStatuses(ids) {
-      const set = new Set(ids)
-      this.data.forEach((notification) => {
-        const status =
-          isStatusNotification(notification.type) && notification.status
-        if (status && set.has(status.id)) {
-          this.idStore.delete(notification.id)
-        }
-      })
-
-      this.syncOrder()
-    },
-  },
-})
diff --git a/src/stores/reports.js b/src/stores/reports.js
index 1c4d89bca..7d319d8e3 100644
--- a/src/stores/reports.js
+++ b/src/stores/reports.js
@@ -3,7 +3,6 @@ import { defineStore } from 'pinia'
 
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
 
 import { setReportState } from 'src/api/admin.js'
 
@@ -19,8 +18,8 @@ export const useReportsStore = defineStore('reports', {
   }),
   actions: {
     openUserReportingModal({ userId, statusIds = [] }) {
-      const preTickedStatuses = statusIds.map((id) =>
-        useStatusesStore().allStatuses.get(id),
+      const preTickedStatuses = statusIds.map(
+        (id) => window.vuex.state.statuses.allStatusesObject[id],
       )
       const preTickedIds = statusIds
       const statuses = preTickedStatuses.concat(
diff --git a/src/stores/scrobbles.js b/src/stores/scrobbles.js
deleted file mode 100644
index 180f433b7..000000000
--- a/src/stores/scrobbles.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import { defineStore } from 'pinia'
-
-import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
-import { useUsersStore } from 'src/stores/users.js'
-
-import { fetchScrobbles } from 'src/api/public.js'
-
-export const defaultState = () => ({
-  scrobblesNextFetch: new Map(),
-})
-
-export const useScrobblesStore = defineStore('scrobbles', {
-  state: defaultState,
-  actions: {
-    getLatestScrobble(userId) {
-      const scrobblesSupport =
-        useInstanceCapabilitiesStore().pleromaScrobblesAvailable
-
-      if (!scrobblesSupport) {
-        return
-      }
-
-      if (this.scrobblesNextFetch.get(userId) > Date.now()) {
-        return
-      }
-
-      this.scrobblesNextFetch.set(userId, Date.now() + 24 * 60 * 60 * 1000)
-
-      fetchScrobbles({ accountId: userId })
-        .then(({ data: scrobbles }) => {
-          useUsersStore().findUser(userId).latestScrobble = scrobbles[0]
-
-          this.scrobblesNextFetch.set(userId, Date.now() + 60 * 1000)
-        })
-        .catch((e) => {
-          useInstanceCapabilitiesStore().set('pleromaScrobblesAvailable', false)
-          console.warn('cannot fetch scrobbles', e)
-        })
-    },
-  },
-})
diff --git a/src/stores/search.js b/src/stores/search.js
deleted file mode 100644
index ad85712c4..000000000
--- a/src/stores/search.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import { defineStore } from 'pinia'
-
-import { useOAuthStore } from 'src/stores/oauth.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
-import { useUsersStore } from 'src/stores/users.js'
-
-import { search2, searchUsers } from 'src/api/public.js'
-
-export const useSearchStore = defineStore('search', {
-  actions: {
-    async search({ q, resolve, limit, offset, following, type }) {
-      const { data, ...rest } = await search2({
-        q,
-        resolve,
-        limit,
-        offset,
-        following,
-        type,
-        credentials: useOAuthStore().token,
-      })
-
-      const { accounts, statuses } = data
-
-      useUsersStore().addNewUsers({
-        ...rest,
-        data: accounts,
-      })
-
-      useStatusesStore().addNewStatuses({
-        ...rest,
-        statuses,
-      })
-
-      const output = {}
-      output.statuses = statuses.map((s) =>
-        useStatusesStore().allStatuses.get(s.id),
-      )
-      output.accounts = accounts.map((s) => useUsersStore().findUser(s.id))
-      return output
-    },
-
-    // Search
-    searchUsers({ query }) {
-      return searchUsers({
-        query,
-        credentials: useOAuthStore().token,
-      }).then((result) => {
-        const { data } = result
-        useUsersStore().addNewUsers(result)
-
-        return data.map((s) => useUsersStore().findUser(s.id))
-      })
-    },
-  },
-})
diff --git a/src/stores/statusHistory.js b/src/stores/statusHistory.js
index e2a69c36d..9868b22c5 100644
--- a/src/stores/statusHistory.js
+++ b/src/stores/statusHistory.js
@@ -1,34 +1,17 @@
 import { defineStore } from 'pinia'
 
-import { useOAuthStore } from 'src/stores/oauth.js'
-
-import { fetchStatusHistory } from 'src/api/public.js'
-
 export const useStatusHistoryStore = defineStore('statusHistory', {
   state: () => ({
-    id: null,
+    params: {},
     modalActivated: false,
-    history: null,
   }),
   actions: {
-    openModal(id) {
-      this.fetchStatusHistory(id).then(() => {
-        this.id = id
-        this.modalActivated = true
-      })
+    openStatusHistoryModal(params) {
+      this.params = params
+      this.modalActivated = true
     },
-    closeModal() {
-      this.id = null
+    closeStatusHistoryModal() {
       this.modalActivated = false
-      this.history = null
-    },
-    fetchStatusHistory(id) {
-      return fetchStatusHistory({
-        id,
-        credentials: useOAuthStore().token,
-      }).then(({ data }) => {
-        this.history = data
-      })
     },
   },
 })
diff --git a/src/stores/statuses.js b/src/stores/statuses.js
deleted file mode 100644
index 91a3448a8..000000000
--- a/src/stores/statuses.js
+++ /dev/null
@@ -1,545 +0,0 @@
-import { defineStore } from 'pinia'
-
-import { useInterfaceStore } from 'src/stores/interface.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
-import { useStreamingStore } from 'src/stores/streaming.js'
-import { useUsersStore } from 'src/stores/users.js'
-
-import {
-  fetchEmojiReactions,
-  fetchFavoritedByUsers,
-  fetchRebloggedByUsers,
-  fetchStatus,
-  fetchStatusSource,
-} from 'src/api/public.js'
-import {
-  bookmarkStatus,
-  deleteStatus,
-  favorite,
-  muteConversation,
-  pinOwnStatus,
-  reactWithEmoji,
-  retweet,
-  unbookmarkStatus,
-  unfavorite,
-  unmuteConversation,
-  unpinOwnStatus,
-  unreactWithEmoji,
-  unretweet,
-} from 'src/api/user.js'
-
-export const defaultState = () => ({
-  allStatuses: new Map(),
-  timestamps: new WeakMap(),
-  scrobblesNextFetch: {},
-  conversations: new Map(),
-  favorites: new Set(),
-  socket: null,
-})
-
-export const useStatusesStore = defineStore('statuses', {
-  state: defaultState,
-  actions: {
-    // Init
-    attachSocket() {
-      const et = new EventTarget()
-      const handleUpdate = ({ data, timestamp }) =>
-        this.addNewStatuses({ statuses: data, timestamp })
-      const handleDelete = ({ data }) =>
-        data.forEach((id) => this.setDeleted(id))
-
-      const socket = {
-        et,
-        handlers: {
-          handleUpdate,
-          handleDelete,
-        },
-      }
-
-      et.addEventListener('update', handleUpdate)
-      et.addEventListener('status.update', handleUpdate)
-      et.addEventListener('delete', handleDelete)
-
-      useStreamingStore().addSubscriber(socket)
-      this.socket = socket
-    },
-    resetStatuses() {
-      this.socket.et.removeEventListener('update', this.socket.handleUpdate)
-      this.socket.et.removeEventListener(
-        'status.update',
-        this.socket.handleUpdate,
-      )
-      this.socket.et.removeEventListener('delete', this.socket.handleDelete)
-
-      const emptyState = defaultState()
-      Object.entries(emptyState).forEach(([key, value]) => {
-        this[key] = value
-      })
-    },
-
-    addNewStatuses({ statuses, timestamp }) {
-      // Sanity check
-      if (!Array.isArray(statuses)) {
-        throw new TypeError("Statuses aren't an array!")
-      }
-
-      // addStatus should always return "main" status,
-      // not "sub-status" i.e. retweeted/quoted/liked status
-      // in case of likes (which are not statuses) it should return null
-      const addStatus = (data) => {
-        const [status] = this.mergeOrAdd(this.allStatuses, data, timestamp)
-
-        // Add to conversation
-        const conversations = this.conversations
-        const conversationId = status.statusnet_conversation_id
-
-        if (conversations.has(conversationId)) {
-          conversations.get(conversationId).add(status.id)
-        } else {
-          conversations.set(conversationId, new Set([status.id]))
-        }
-
-        // Work on quote
-        if (status.quote) {
-          status.quote = addStatus(status.quote)
-        }
-
-        return status
-      }
-
-      const processors = {
-        status: (status) => {
-          return addStatus(status)
-        },
-        edit: (status) => {
-          return addStatus(status)
-        },
-        retweet: (status) => {
-          // RetweetedStatuses are never shown immediately
-          if (status.retweeted_status) addStatus(status.retweeted_status)
-          return addStatus(status)
-        },
-        default: (unknown) => {
-          console.warn('unknown status type', unknown)
-          return null
-        },
-      }
-
-      return statuses.map((status) => {
-        const type = status.type
-        const processor = processors[type] ?? processors.default
-        return processor(status)
-      })
-    },
-    mergeOrAdd(map, status, timestamp) {
-      const existing = map.get(status.id) ?? {}
-      const oldTimestamp = this.timestamps.get(existing)
-
-      const { user: unused0, ...old } = existing
-      const { user: statusUser, ...neu } = status
-
-      const [user] = useUsersStore().addNewUsers({
-        data: statusUser,
-        timestamp,
-      })
-
-      existing.user = user // reactive update in case we return old
-
-      // implicit: if oldTimestamp is undefined this will still be false
-      if (oldTimestamp > timestamp) return [existing, false] // not overwriting old data with new
-
-      const newStatus = {
-        ...old,
-        ...neu,
-        user,
-      }
-
-      map.set(newStatus.id, newStatus)
-
-      this.timestamps.set(newStatus, timestamp)
-
-      return [map.get(newStatus.id), true]
-    },
-
-    // Fetches
-    fetchStatus(id) {
-      return fetchStatus({
-        id,
-        credentials: useOAuthStore().token,
-      }).then(({ data: status, timestamp }) =>
-        this.addNewStatuses({ statuses: [status], timestamp }),
-      )
-    },
-    fetchStatusSource(id) {
-      return fetchStatusSource({
-        id,
-        credentials: useOAuthStore().token,
-      }).then(({ data }) => data)
-    },
-    fetchEmojiReactions(id) {
-      return fetchEmojiReactions({
-        id,
-        credentials: useOAuthStore().token,
-      }).then(({ data: emojiReactions }) => {
-        this.addEmojiReactionsBy({
-          id,
-          emojiReactions,
-        })
-      })
-    },
-    fetchFavs(id) {
-      return fetchFavoritedByUsers({
-        id,
-        credentials: useOAuthStore().token,
-      }).then(({ data: favoritedByUsers }) =>
-        this.addFavs({
-          id,
-          favoritedByUsers,
-        }),
-      )
-    },
-    fetchRepeats(id) {
-      return fetchRebloggedByUsers({
-        id,
-        credentials: useOAuthStore().token,
-      }).then(({ data: rebloggedByUsers }) =>
-        this.addRepeats({
-          id,
-          rebloggedByUsers,
-        }),
-      )
-    },
-    fetchFavsAndRepeats(id) {
-      return Promise.all([this.fetchFavs(id), this.fetchRepeats(id)])
-    },
-
-    // Updates
-    addRepeats({ id, rebloggedByUsers }) {
-      const currentUser = useUsersStore().currentUser
-      const newStatus = this.allStatuses.get(id)
-      newStatus.rebloggedBy = rebloggedByUsers.filter(Boolean)
-      // repeats stats can be incorrect based on polling condition, let's update them using the most recent data
-      newStatus.repeat_num = newStatus.rebloggedBy.length
-      newStatus.repeated = !!newStatus.rebloggedBy.find(
-        ({ id }) => currentUser?.id === id,
-      )
-    },
-    addFavs({ id, favoritedByUsers }) {
-      const currentUser = useUsersStore().currentUser
-      const newStatus = this.allStatuses.get(id)
-      newStatus.favoritedBy = favoritedByUsers.filter(Boolean)
-      // favorites stats can be incorrect based on polling condition, let's update them using the most recent data
-      newStatus.fave_num = newStatus.favoritedBy.length
-      newStatus.favorited = !!newStatus.favoritedBy.find(
-        ({ id }) => currentUser?.id === id,
-      )
-    },
-    addEmojiReactionsBy({ id, emojiReactions }) {
-      const status = this.allStatuses.get(id)
-      status.emoji_reactions = emojiReactions
-    },
-    updateStatusWithPoll(id, poll) {
-      const status = this.allStatuses.get(id)
-      status.poll = poll
-    },
-
-    // Actions
-    requestInteract({ name, id, optimisticCall, apiCall, argument, value }) {
-      const oldValue = !value // Assumption
-
-      const apiArgs = (() => {
-        switch (name) {
-          case 'emoji':
-            return { emoji: argument }
-          case 'bookmark':
-            return { folder_id: argument }
-          default:
-            return {}
-        }
-      })()
-
-      // Optimistic
-      optimisticCall(id, value, argument)
-
-      return apiCall({
-        id,
-        ...apiArgs,
-        credentials: useOAuthStore().token,
-      })
-        .then(({ data: status, timestamp }) => {
-          this.addNewStatuses({
-            statuses: [status],
-            timestamp,
-          })
-        })
-        .catch((error) => {
-          optimisticCall(id, oldValue, argument)
-
-          console.error('Interact Error', error)
-          useInterfaceStore().pushGlobalNotice({
-            level: 'error',
-            messageKey: 'status.interact_error',
-            messageArgs: [error],
-            timeout: 5000,
-          })
-        })
-    },
-
-    /// Favorite
-    favorite(id) {
-      return this.requestInteract({
-        name: 'favorite',
-        id,
-        apiCall: favorite,
-        optimisticCall: this.setFavorited,
-        value: true,
-      })
-    },
-    unfavorite(id) {
-      return this.requestInteract({
-        name: 'favorite',
-        id,
-        apiCall: unfavorite,
-        optimisticCall: this.setFavorited,
-        value: false,
-      })
-    },
-    setFavorited(id, value) {
-      const newStatus = this.allStatuses.get(id)
-
-      if (newStatus.favorited !== value) {
-        if (value) {
-          newStatus.fave_num++
-        } else {
-          newStatus.fave_num--
-        }
-      }
-
-      newStatus.favorited = value
-    },
-
-    /// Reprööt
-    retweet(id) {
-      return this.requestInteract({
-        name: 'retweet',
-        id,
-        apiCall: retweet,
-        optimisticCall: this.setRetweeted,
-        value: true,
-      })
-    },
-    unretweet(id) {
-      return this.requestInteract({
-        name: 'retweet',
-        id,
-        apiCall: unretweet,
-        optimisticCall: this.setRetweeted,
-        value: false,
-      })
-    },
-    setRetweeted(id, value) {
-      const newStatus = this.allStatuses.get(id)
-
-      if (newStatus.repeated !== value) {
-        if (value) {
-          newStatus.repeat_num++
-        } else {
-          newStatus.repeat_num--
-        }
-      }
-
-      newStatus.repeated = value
-    },
-
-    // React
-    reactWithEmoji(id, emoji) {
-      return this.requestInteract({
-        name: 'emoji',
-        id,
-        apiCall: reactWithEmoji,
-        optimisticCall: this.setOwnReaction,
-        argument: emoji,
-        value: true,
-      })
-    },
-    unreactWithEmoji(id, emoji) {
-      return this.requestInteract({
-        name: 'emoji',
-        id,
-        apiCall: unreactWithEmoji,
-        optimisticCall: this.setOwnReaction,
-        argument: emoji,
-        value: false,
-      })
-    },
-    setOwnReaction(id, value, emoji) {
-      const currentUser = useUsersStore().currentUser
-      const status = this.allStatuses.get(id)
-      const reactionIndex = status.emoji_reactions.findIndex(
-        (react) => react.name === emoji,
-      )
-      const reactionPresent = reactionIndex >= 0
-      if (!value && !reactionPresent) return
-
-      const reaction = status.emoji_reactions[reactionIndex] || {
-        name: emoji,
-        count: 0,
-        accounts: [],
-      }
-
-      const count = value ? reaction.count + 1 : reaction.count - 1
-
-      const accounts = value
-        ? [...reaction.accounts, currentUser]
-        : reaction.accounts.filter((acc) => acc.id !== currentUser.id)
-
-      const newReaction = {
-        ...reaction,
-        count,
-        me: value,
-        accounts,
-      }
-
-      if (reactionPresent && count > 0) {
-        status.emoji_reactions[reactionIndex] = newReaction
-      } else if (count === 0) {
-        status.emoji_reactions = status.emoji_reactions.filter(
-          (r) => r.name !== emoji,
-        )
-      } else {
-        status.emoji_reactions.push(newReaction)
-      }
-    },
-
-    /// Bookmark
-    bookmark(id, bookmark_folder_id) {
-      return this.requestInteract({
-        name: 'bookmark',
-        id,
-        apiCall: bookmarkStatus,
-        optimisticCall: this.setBookmarked,
-        argument: bookmark_folder_id,
-        value: true,
-      })
-    },
-    unbookmark(id) {
-      return this.requestInteract({
-        name: 'bookmark',
-        id,
-        apiCall: unbookmarkStatus,
-        optimisticCall: this.setBookmarked,
-        value: false,
-      })
-    },
-    setBookmarked(id, value, bookmark_folder_id) {
-      const status = this.allStatuses.get(id)
-      status.bookmarked = value
-
-      // When unbookmarking we don't specify folder so we wanna keep
-      // reference to the folder even when setting bookmarked to false
-      // the proper reference will be updated when api call resolves
-      if (bookmark_folder_id) {
-        status.bookmark_folder_id = value ? bookmark_folder_id : null
-      }
-    },
-
-    /// Mute
-    muteConversation(id) {
-      return this.requestInteract({
-        name: 'mute',
-        id,
-        apiCall: muteConversation,
-        optimisticCall: this.setMutedStatus,
-        value: true,
-      })
-    },
-    unmuteConversation(id) {
-      return this.requestInteract({
-        name: 'mute',
-        id,
-        apiCall: unmuteConversation,
-        optimisticCall: this.setMutedStatus,
-        value: false,
-      })
-    },
-    setMutedStatus(id, value) {
-      // Setting thread_muted flag on all other known statuses
-      // belonging to same conversation
-      const newStatus = this.allStatuses.get(id)
-      newStatus.thread_muted = value
-
-      if (newStatus.thread_muted !== undefined) {
-        this.conversations
-          .get(newStatus.statusnet_conversation_id)
-          .forEach((statusId) => {
-            this.allStatuses.get(statusId).thread_muted = value
-          })
-      }
-    },
-
-    /// Pin
-    pinStatus(id) {
-      return this.requestInteract({
-        name: 'pin',
-        id,
-        apiCall: pinOwnStatus,
-        optimisticCall: () => {
-          /* no-op */
-        },
-        value: true,
-      })
-    },
-    unpinStatus(id) {
-      return this.requestInteract({
-        name: 'pin',
-        id,
-        apiCall: unpinOwnStatus,
-        optimisticCall: () => {
-          /* no-op */
-        },
-        value: false,
-      })
-    },
-
-    /// Delete
-    deleteStatus(id) {
-      return deleteStatus({
-        id,
-        credentials: useOAuthStore().token,
-      })
-        .then(() => {
-          this.setDeleted(id)
-        })
-        .catch((e) => {
-          useInterfaceStore().pushGlobalNotice({
-            level: 'error',
-            messageKey: 'status.delete_error',
-            messageArgs: [e.message],
-            timeout: 5000,
-          })
-        })
-    },
-    setDeleted(id) {
-      const newStatus = this.allStatuses.get(id)
-      if (newStatus) newStatus.deleted = true
-    },
-
-    // For when blocking a user
-    wipeUserStatuses(userId) {
-      const removed = new Set()
-      this.allStatuses.forEach((status) => {
-        if (status.user.id === userId) {
-          this.allStatuses.delete(status.id)
-
-          removed.add(status.id)
-        }
-      })
-      return removed
-    },
-
-    // Misc
-    setVirtualHeight({ statusId, height }) {
-      this.allStatuses.get(statusId).virtualHeight = height
-    },
-  },
-})
diff --git a/src/stores/streaming.js b/src/stores/streaming.js
deleted file mode 100644
index cce3c175b..000000000
--- a/src/stores/streaming.js
+++ /dev/null
@@ -1,247 +0,0 @@
-import { defineStore } from 'pinia'
-
-import { useOAuthStore } from 'src/stores/oauth.js'
-
-import {
-  getMastodonSocketURI,
-  ProcessedWS,
-  WSConnectionStatus,
-} from 'src/api/websocket.js'
-
-const ARGUMENT_MAP = {
-  tag: 'tag',
-  list: 'list',
-}
-
-export const TIMELINE_STREAM_MAP = {
-  friends: 'user',
-  public: 'public',
-  tag: 'hashtag',
-  list: 'list',
-  dms: 'direct',
-}
-
-const retryTimeout = (multiplier) => 1000 * multiplier
-
-export class StreamStateEvent extends Event {
-  original
-
-  constructor(name, original) {
-    super(name)
-    this.original = original
-  }
-}
-
-export class StreamErrorEvent extends Event {
-  error
-
-  constructor(error) {
-    super('error', error)
-    this.error = error
-  }
-}
-
-export class StreamMessageEvent extends Event {
-  data
-  stream
-  timestamp
-
-  constructor(name, stream, data) {
-    super(name)
-    this.data = data
-    this.stream = stream
-    this.timestamp = Date.now()
-  }
-}
-
-export const useStreamingStore = defineStore('streaming', {
-  state: () => ({
-    socket: null,
-    error: null,
-    state: null,
-    retryMultiplier: 1,
-    retrying: false,
-    subscribers: new Set(),
-    subscriptions: new Map(),
-    globalSubscriptions: new Set(),
-  }),
-  actions: {
-    addSubscriber(subscriber) {
-      const { stream, et } = subscriber
-
-      if (stream) {
-        if (!this.subscriptions.has(stream.name)) {
-          this.subscriptions.set(stream.name, new Map())
-        }
-
-        const streamSubs = this.subscriptions.get(stream.name)
-
-        if (streamSubs.has(stream.argument)) {
-          throw new Error('Subscription already exists!')
-        }
-
-        streamSubs.set(stream.argument, subscriber)
-      } else {
-        this.globalSubscriptions.add(subscriber)
-      }
-
-      this.subscribers.add(subscriber)
-      if (this.state === WSConnectionStatus.JOINED) {
-        if (stream) {
-          this.socket.subscribe(...this.getSubArgs(stream))
-        }
-        et.dispatchEvent(new StreamStateEvent('open'))
-      }
-    },
-    removeSubscriber(subscriber) {
-      const { stream } = subscriber
-
-      this.subscribers.delete(subscriber)
-      if (stream) {
-        this.subscriptions.get(stream.name).delete(stream.argument)
-      }
-
-      if (this.state === WSConnectionStatus.JOINED) {
-        this.socket.unsubscribe(...this.getSubArgs(stream))
-      }
-    },
-    initSocket(initial) {
-      this.state = initial
-        ? WSConnectionStatus.STARTING_INITIAL
-        : WSConnectionStatus.STARTING
-
-      const credentials = useOAuthStore().token
-      const url = getMastodonSocketURI({ credentials })
-
-      this.socket = ProcessedWS({
-        url,
-        id: 'Unified',
-        credentials,
-      })
-
-      this.socket.addEventListener('pleroma:authenticated', this.onAuth)
-      this.socket.addEventListener('open', this.onOpen)
-      this.socket.addEventListener('close', this.onClose)
-      this.socket.addEventListener('message', this.onMessage)
-      this.socket.addEventListener('error', this.onError)
-    },
-    stopSocket() {
-      this.socket.close()
-      this.state = WSConnectionStatus.CLOSED
-    },
-
-    getSubArgs(stream) {
-      const argumentKey = ARGUMENT_MAP[stream.name]
-      const args = argumentKey
-        ? {
-            [argumentKey]: stream.argument,
-          }
-        : null
-
-      return [stream.name, args]
-    },
-    onAuth() {
-      this.subscribers.forEach(({ stream, et }) => {
-        et.dispatchEvent(new StreamStateEvent('authenticated'))
-
-        if (stream) {
-          this.socket.subscribe(...this.getSubArgs(stream))
-        }
-      })
-      this.state = WSConnectionStatus.JOINED
-    },
-    onOpen() {
-      this.retryMultiplier = 1
-      this.retrying = false
-      this.error = null
-      this.subscribers.forEach(({ stream, et }) => {
-        et.dispatchEvent(new StreamStateEvent('open'))
-      })
-    },
-    onMessage({ data: message }) {
-      if (!message) return // pings
-      const { event: eventName, stream: eventStream, ...data } = message
-      const [streamName, streamArgument] = eventStream ?? []
-
-      const subscriber = this.subscriptions.get(streamName)?.get(streamArgument)
-
-      const totalSubs = [
-        ...this.globalSubscriptions.values(),
-        subscriber,
-      ].filter(Boolean)
-
-      const eventData = (() => {
-        switch (eventName) {
-          case 'status.update':
-          case 'update':
-            return [data.status]
-          case 'notification':
-            return [data.notification]
-          case 'delete':
-            return [data.id]
-          default:
-            console.log('UNKNOWN', eventName, eventStream, data)
-            return data
-        }
-      })()
-
-      const event = new StreamMessageEvent(
-        eventName,
-        { name: streamName, argument: streamArgument },
-        eventData,
-      )
-
-      totalSubs.forEach(({ stream, et }) => {
-        et.dispatchEvent(event)
-      })
-    },
-    onError({ data: error }) {
-      this.subscribers.forEach(({ stream, et }) => {
-        et.dispatchEvent(new StreamErrorEvent(error))
-      })
-      this.error = error
-      console.error('Error in MastoAPI websocket:', error)
-    },
-    onClose({ data: closeEvent }) {
-      const ignoreCodes = new Set([
-        1000, // Normal (intended) closure
-        1001, // Going away
-      ])
-      const { code } = closeEvent
-
-      if (ignoreCodes.has(code)) {
-        console.debug(
-          `Not restarting socket becasue of closure code ${code} is in ignore list`,
-        )
-
-        this.state = WSConnectionStatus.CLOSED
-        this.retrying = false
-        this.error = null
-        this.retryMultiplier = 1
-
-        this.subscribers.forEach(({ et }) => {
-          et.dispatchEvent(new StreamStateEvent('close', closeEvent))
-        })
-      } else {
-        console.warn(
-          `MastoAPI websocket disconnected, restarting. CloseEvent code: ${code}`,
-        )
-
-        setTimeout(() => {
-          this.initSocket()
-        }, retryTimeout(this.retryMultiplier))
-
-        this.retryMultiplier += 1
-
-        if (!this.retrying) {
-          this.subscribers.forEach(({ et }) => {
-            et.dispatchEvent(new StreamStateEvent('close', closeEvent))
-          })
-        }
-
-        this.retrying = true
-        this.state = WSConnectionStatus.ERROR
-      }
-    },
-  },
-})
diff --git a/src/stores/sync_config.js b/src/stores/sync_config.js
index 17a60d3ef..9464ffb68 100644
--- a/src/stores/sync_config.js
+++ b/src/stores/sync_config.js
@@ -21,7 +21,6 @@ import { CURRENT_UPDATE_COUNTER } from 'src/components/update_notification/updat
 
 import { useLocalConfigStore } from 'src/stores/local_config.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { updateProfileJSON } from 'src/api/user.js'
 import { storage } from 'src/lib/storage.js'
@@ -808,7 +807,7 @@ export const useSyncConfigStore = defineStore('sync_config', {
     pushSyncConfig({ force = false } = {}) {
       const needPush = this.dirty || force
       if (!needPush) return
-      this.updateCache({ username: useUsersStore().currentUser.fqn })
+      this.updateCache({ username: window.vuex.state.users.currentUser.fqn })
       const params = { pleroma_settings_store: { 'pleroma-fe': this.cache } }
       updateProfileJSON({
         params,
diff --git a/src/stores/timelines.js b/src/stores/timelines.js
deleted file mode 100644
index df1c41a69..000000000
--- a/src/stores/timelines.js
+++ /dev/null
@@ -1,310 +0,0 @@
-import { first, last } from 'lodash'
-import { defineStore } from 'pinia'
-
-import timelineFetcher from 'src/stores/fetchers/timeline_fetcher.js'
-import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
-import { TIMELINE_STREAM_MAP, useStreamingStore } from 'src/stores/streaming.js'
-
-const emptyTl = (name, argument = null) => {
-  const result = {
-    name,
-    order: [],
-    statusIds: new Set(),
-    visibleStatusIds: new Set(),
-    newStatusCount: 0,
-    maxId: '',
-    minId: '',
-    streaming: false,
-    flushMarker: 0,
-    fetcher: null,
-    socket: null,
-  }
-
-  const property = ARGUMENT_MAP[name]
-
-  if (property) {
-    result[property] = argument
-  }
-
-  if (name === 'dms' || name === 'friends') {
-    result.persistent = true
-  }
-
-  return result
-}
-
-export const ARGUMENT_MAP = {
-  tag: 'tag',
-  list: 'listId',
-  bookmarks: 'bookmarkFolderId',
-  quotes: 'statusId',
-  search: 'query',
-  user: 'userId',
-  userPinned: 'userId',
-  media: 'userId',
-}
-
-const TIMELINES = new Set([
-  'mentions',
-  'public',
-  'user',
-  'userPinned',
-  'media',
-  'favorites',
-  'publicAndExternal',
-  'friends',
-  'tag',
-  'dms',
-  'bookmarks',
-  'list',
-  'bubble',
-  'quotes',
-  'search',
-])
-
-export const defaultState = () => {
-  return Object.fromEntries([...TIMELINES].map((name) => [name, emptyTl(name)]))
-}
-
-//const CUSTOM_SORT = new Set(['bookmarks', 'favorites'])
-
-export const useTimelinesStore = defineStore('timelines', {
-  state: defaultState,
-  actions: {
-    // (De)Initialization stuff
-    activate(timelineName, argument, persistent) {
-      const timeline = this[timelineName]
-      if (timeline.persistent && !persistent) return
-
-      if (
-        timelineName === 'favourites' &&
-        !useInstanceCapabilitiesStore().pleromaPublicFavouritesAvailable
-      ) {
-        console.warn("Instance doesn't support public favorites timeline")
-        return
-      }
-
-      const property = ARGUMENT_MAP[timelineName]
-      if (property) {
-        timeline[property] = argument
-      }
-
-      timeline.fetcher = timelineFetcher(
-        timeline,
-        argument,
-        useOAuthStore().token,
-      )
-
-      this.startFetchingTimeline(timelineName, argument, 'Timeline activated')
-
-      const streamName = TIMELINE_STREAM_MAP[timelineName]
-
-      if (streamName) {
-        const et = new EventTarget()
-        const openHandler = () => this.onStreamConnect(timelineName, argument)
-        const closeHandler = () =>
-          this.onStreamDisconnect(timelineName, argument)
-        const messageHandler =
-          () =>
-          ({ detail: message }) =>
-            this.onStreamMessage(timelineName, argument, message)
-
-        et.addEventListener('open', openHandler)
-        et.addEventListener('close', closeHandler)
-        et.addEventListener('update', messageHandler)
-
-        timeline.socket = {
-          stream: {
-            name: streamName,
-            argument,
-          },
-          et,
-          handlers: {
-            openHandler,
-            closeHandler,
-            messageHandler,
-          },
-        }
-
-        useStreamingStore().addSubscriber(timeline.socket)
-      }
-    },
-    deactivate(timelineName, persistent) {
-      const timeline = this[timelineName]
-      if (timeline.persistent && !persistent) return
-      if (!timeline.streaming) {
-        this.stopFetchingTimeline(timelineName, 'Timeline deactivation')
-      }
-
-      if (timeline.socket) {
-        useStreamingStore().removeSubscriber(timeline.socket)
-
-        const { openHandler, closeHandler, messageHandler } =
-          timeline.socket.handlers
-        timeline.socket.et.removeEventListener('open', openHandler)
-        timeline.socket.et.removeEventListener('close', closeHandler)
-        timeline.socket.et.removeEventListener('message', messageHandler)
-      }
-
-      this[timelineName] = emptyTl(timelineName)
-    },
-    activatePersistents() {
-      TIMELINES.forEach((name) => {
-        if (this[name].persistent) {
-          this.activate(name, undefined, true)
-        }
-      })
-    },
-    deactivateAll() {
-      TIMELINES.forEach((name) => {
-        try {
-          this.deactivate(name, true)
-        } catch (e) {
-          console.error(`Failed to deactivate timeline ${name}:`, e)
-        }
-      })
-    },
-
-    // Update stuff
-    addStatusesToTimeline(
-      timelineName,
-      argument,
-      {
-        statuses,
-        showImmediately = false,
-        noIdUpdate = false,
-        pagination = {},
-        older = false,
-      },
-    ) {
-      if (statuses.length === 0) return
-      const timeline = this[timelineName]
-
-      // This makes sure that user timeline won't get data meant for other
-      // user. I.e. opening different user profiles makes request which could
-      // return data late after user already viewing different user profile
-      // Same can happen with tags etc.
-      const property = ARGUMENT_MAP[timelineName]
-
-      if (property && timeline[property] !== argument) {
-        return
-      }
-
-      if (!noIdUpdate) {
-        this.updateTimelineExtremes(timeline, pagination)
-      }
-
-      const filtered = statuses.filter((id) => !timeline.statusIds.has(id))
-      if (older) {
-        timeline.order.push(...filtered)
-      } else {
-        timeline.order.unshift(...filtered)
-      }
-
-      statuses.forEach((statusId) => {
-        const isNew = !timeline.statusIds.has(statusId)
-        timeline.statusIds.add(statusId)
-
-        if (isNew) {
-          if (showImmediately) {
-            // Add it directly to the visibleStatuses, don't change
-            // newStatusCount
-            timeline.visibleStatusIds.add(statusId)
-          } else {
-            // Just change newStatuscount
-            timeline.newStatusCount += 1
-          }
-        }
-      })
-    },
-    onStreamMessage(timeline, argument, event) {
-      this.addStatusesToTimeline(timeline, argument, {
-        statuses: [event.data.status.id],
-      })
-    },
-
-    // Poll & Push
-    onStreamConnect(timeline) {
-      console.debug('[Timelines] Stream connected', timeline)
-      this[timeline].streaming = true
-      this.stopFetchingTimeline(timeline, 'Socket connected')
-    },
-    onStreamDisconnect(timeline, argument) {
-      console.debug('[Timelines] Stream disconnected', timeline, argument)
-      this[timeline].streaming = false
-      this.startFetchingTimeline(timeline, argument, 'Socket disconnected')
-    },
-    startFetchingTimeline(timelineName, argument, reason) {
-      console.debug(
-        '[Timelines] Starting fetching timeline',
-        timelineName,
-        argument,
-        'Reason:',
-        reason,
-      )
-      const timeline = this[timelineName]
-      timeline.fetcher.startFetching()
-    },
-    stopFetchingTimeline(timelineName, reason) {
-      console.debug(
-        '[Timelines] Stopped fetching timeline',
-        timelineName,
-        'Reason:',
-        reason,
-      )
-      const timeline = this[timelineName]
-      timeline.fetcher.stopFetching()
-    },
-
-    // Queues & Timeline manip
-    updateTimelineExtremes(timeline, pagination = {}) {
-      // Can't use Math.min/max because it doesn't work with string (duh)
-      const minNew = pagination.maxId ?? last(timeline.order) ?? ''
-      const maxNew = pagination.minId ?? first(timeline.order) ?? ''
-
-      const newer = maxNew > timeline.maxId
-      const older = minNew < timeline.minId
-
-      if (newer || timeline.maxId === '') {
-        timeline.maxId = maxNew
-      }
-      if (older || timeline.minId === '') {
-        timeline.minId = minNew
-      }
-
-      this.syncOrder(timeline)
-    },
-    showNewStatuses(timelineName) {
-      const timeline = this[timelineName]
-
-      timeline.newStatusCount = 0
-      timeline.visibleStatusIds = new Set([...timeline.statusIds])
-    },
-    syncOrder(timeline) {
-      timeline.order = timeline.order.filter((id) => timeline.statusIds.has(id))
-    },
-    queueFlush(timeline, id) {
-      this[timeline].flushMarker = id
-    },
-    queueFlushAll() {
-      Object.keys(this).forEach((timeline) => {
-        this[timeline].flushMarker = this[timeline].maxId
-      })
-    },
-
-    // Misc
-    wipeStatuses(ids) {
-      TIMELINES.forEach((timelineName) => {
-        const timeline = this[timelineName]
-
-        ids.forEach((id) => {
-          timeline.statusIds.delete(id)
-          timeline.visibleStatusIds.delete(id)
-        })
-
-        this.syncOrder(timeline)
-      })
-    },
-  },
-})
diff --git a/src/stores/user_highlight.js b/src/stores/user_highlight.js
index a4cbacd6e..3cd3bfe7d 100644
--- a/src/stores/user_highlight.js
+++ b/src/stores/user_highlight.js
@@ -10,7 +10,6 @@ import { defineStore } from 'pinia'
 import { toRaw } from 'vue'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 import { updateProfileJSON } from 'src/api/user.js'
 import { storage } from 'src/lib/storage.js'
@@ -329,7 +328,7 @@ export const useUserHighlightStore = defineStore('user_highlight', {
     pushHighlight({ force = false } = {}) {
       const needPush = this.dirty || force
       if (!needPush) return
-      this.updateCache({ username: useUsersStore().currentUser.fqn })
+      this.updateCache({ username: window.vuex.state.users.currentUser.fqn })
       const params = {
         pleroma_settings_store: { user_highlight: this.cache },
       }
diff --git a/src/stores/users.js b/src/stores/users.js
deleted file mode 100644
index 10d9222c9..000000000
--- a/src/stores/users.js
+++ /dev/null
@@ -1,752 +0,0 @@
-import Cookies from 'js-cookie'
-import { last } from 'lodash'
-import { defineStore } from 'pinia'
-
-import { useAnnouncementsStore } from 'src/stores/announcements.js'
-import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
-import { useChatsStore } from 'src/stores/chats.js'
-import { useEmojiStore } from 'src/stores/emoji.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-import { useListsStore } from 'src/stores/lists.js'
-import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useNotificationsStore } from 'src/stores/notifications.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
-import { useStreamingStore } from 'src/stores/streaming.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { useTimelinesStore } from 'src/stores/timelines.js'
-import { useUserHighlightStore } from 'src/stores/user_highlight.js'
-
-import { revokeToken } from 'src/api/oauth.js'
-import {
-  fetchFollowers,
-  fetchFriends,
-  fetchUser,
-  fetchUserByName,
-  verifyCredentials,
-} from 'src/api/public.js'
-import {
-  blockUser,
-  editUserNote,
-  fetchBlocks,
-  fetchDomainMutes,
-  fetchMutes,
-  fetchUserInLists,
-  fetchUserRelationship,
-  followUser,
-  muteDomain,
-  muteUser,
-  removeUserFromFollowers,
-  unblockUser,
-  unfollowUser,
-  unmuteDomain,
-  unmuteUser,
-} from 'src/api/user.js'
-import { promiseInterval } from 'src/services/promise_interval/promise_interval.js'
-
-export const useUsersStore = defineStore('users', {
-  state: () => ({
-    loggingIn: false,
-    lastLoginName: null,
-    currentUser: null,
-    users: new Map(),
-    usersByName: new Map(),
-    usersByURL: new Map(),
-    relationships: new Map(),
-    relationshipsLists: {
-      friends: new WeakMap(),
-      followers: new WeakMap(),
-    },
-    timestamps: new WeakMap(),
-    fetchesIds: new Map(),
-    fetchesNames: new Map(),
-    followPollers: new Map(),
-    followPollersAttempts: new Map(),
-  }),
-  getters: {
-    loggedIn: (state) => !!state.currentUser,
-    findUser: (state) => (query) => {
-      return state.users.get(query)
-    },
-    findUserByName: (state) => (query) => {
-      return state.usersByName.get(query.toLowerCase())
-    },
-    findUserByUrl: (state) => (query) => {
-      return state.usersByURL.get(query.toLowerCase())
-    },
-    relationship: (state) => (id) => {
-      const rel = id && state.relationships.get(id)
-      return rel || { id, loading: true }
-    },
-  },
-  actions: {
-    // Main updates
-    addNewUsers(response) {
-      const { data, timestamp } = response
-      const users = Array.isArray(data) ? data : [data]
-
-      return users.map((user) => {
-        const existing = this.users.get(user.id) ?? {}
-        const oldTimestamp = this.timestamps.get(existing)
-        //
-        // Relationship might have different timestamp and
-        // might need updating separate from user
-        const oldRelationship = this.relationships.get(user.id)
-        const oldRelationshipTimestamp = this.timestamps.get(oldRelationship)
-        let relationship
-
-        // Only need an update if new user data has relationship
-        if (user.relationship) {
-          // Only update if there is no old data or if it's outdated
-          if (
-            oldRelationship === undefined ||
-            timestamp > oldRelationshipTimestamp
-          ) {
-            relationship = this.updateUserRelationships({
-              timestamp,
-              data: { id: user.id, ...user.relationship },
-            })[0]
-          }
-        } else {
-          relationship = oldRelationship
-        }
-
-        // implicit: if oldTimestamp is undefined this will still be false
-        if (oldTimestamp > timestamp) return existing // not overwriting old data with new
-
-        const { relationship: unused1, ...newUser } = user
-
-        let reactive = this.users.get(user.id)
-        // Initializing reactivity & avoiding excessive Map mutation
-        if (!reactive) {
-          this.users.set(user.id, existing)
-
-          reactive = this.users.get(user.id)
-          this.usersByName.set(user.screen_name.toLowerCase(), reactive)
-          this.usersByURL.set(user.url.toLowerCase(), reactive)
-        }
-
-        // Relying on object reactivity to avoid mutating the Map
-        reactive.relationship = relationship ?? reactive.relationship
-
-        Object.entries(newUser).forEach(([k, v]) => {
-          reactive[k] = v
-        })
-
-        // Updating the timestamp
-        this.timestamps.set(reactive, timestamp)
-
-        if (user.id === this.currentUser?.id) {
-          this.currentUser = reactive
-        }
-
-        // Initialize some stuff
-        const { friends, followers } = this.relationshipsLists
-        if (!friends.has(reactive)) friends.set(reactive, new Set())
-        if (!followers.has(reactive)) followers.set(reactive, new Set())
-
-        return reactive
-      })
-    },
-    updateUserRelationships({ timestamp, optimism, data }) {
-      const relationships = Array.isArray(data) ? data : [data]
-
-      return relationships.map((relationship) => {
-        const { id } = relationship
-        const existing = this.relationships.get(id) ?? {}
-        const oldTimestamp = this.timestamps.get(existing)
-
-        // implicit: if oldTimestamp is undefined this will still be false
-        if (!optimism && oldTimestamp > timestamp) return existing
-
-        // Initializing reactivity
-        if (!this.relationships.has(id)) this.relationships.set(id, existing)
-        const reactive = this.relationships.get(id)
-
-        // Relying on reactivity
-        Object.entries(relationship).forEach(([k, v]) => {
-          reactive[k] = v
-        })
-
-        if (timestamp) {
-          this.timestamps.set(reactive, timestamp)
-        }
-
-        // Updating user property if there is such a user
-        if (this.users.has(id)) {
-          this.users.get(id).relationship = reactive
-        }
-
-        // Update block/mute lists
-        if (this.currentUser && id !== this.currentUser.id) {
-          ;[
-            ['muting', this.currentUser.muteIds],
-            ['blocking', this.currentUser.blockIds],
-            [
-              'following',
-              this.relationshipsLists.friends.get(this.currentUser),
-            ],
-            [
-              'followed_by',
-              this.relationshipsLists.followers.get(this.currentUser),
-            ],
-          ].forEach(([relationshipName, list]) => {
-            if (relationship[relationshipName]) {
-              list?.add(id)
-            } else {
-              list?.delete(id)
-            }
-          })
-        }
-
-        return reactive
-      })
-    },
-
-    // Misc updates
-    updateUserAdminData(id, data) {
-      const user = this.users.get(id)
-
-      user.adminData = data
-      user.deactivated = !data.is_active
-      user.tags = new Set(data.tags)
-    },
-    updateRight(id, right, value) {
-      const user = this.users.get(id)
-      const newRights = user.rights ?? {}
-      newRights[right] = value
-      user.rights = newRights
-    },
-
-    // Because frontend doesn't have a reason to keep these stuff in memory
-    // outside of viewing someones user profile.
-    clearFollowLists(userId) {
-      const user = this.users.get(userId)
-      if (user) {
-        this.relationshipsLists.friends.set(user, new Set())
-        this.relationshipsLists.followers.set(user, new Set())
-      }
-    },
-
-    // Fetches
-    async fetchUserIfMissing({ id, name }) {
-      let findFunc
-      let fetchFunc
-      let map
-      let identifier
-
-      if (id) {
-        findFunc = this.findUser
-        fetchFunc = this.fetchUser
-        map = this.fetchesIds
-        identifier = id
-      } else if (name) {
-        findFunc = this.findUserByName
-        fetchFunc = this.fetchUserByName
-        map = this.fetchesNames
-        identifier = name
-      } else {
-        throw new TypeError('No identifier provided')
-      }
-
-      // Search in cache
-      const user = findFunc(identifier)
-
-      if (user) return user
-      // not found => fetch
-      let promise
-
-      // Did we already search for this user?
-      if (map.has(identifier)) {
-        // if so, reuse the promise
-        promise = map.get(identifier)
-      } else {
-        // if not, make a new one
-        promise = fetchFunc(identifier)
-      }
-
-      map.set(identifier, promise)
-
-      const result = await promise
-
-      if (result) {
-        const { id, screen_name } = result
-
-        // Save promise for future use
-        this.fetchesIds.set(id, promise)
-        this.fetchesNames.set(screen_name, promise)
-        return this.users.get(id)
-      } else {
-        return null
-      }
-    },
-    async fetchUser(id) {
-      try {
-        const result = await fetchUser({
-          id,
-          credentials: useOAuthStore().token,
-        })
-
-        this.addNewUsers(result)
-
-        return this.users.get(result.data.id)
-      } catch (error) {
-        if (error.name === 'StatusCodeError' && error.statusCode === 404) {
-          console.warn(`User ${id} not found`)
-          return null
-        } else {
-          throw error
-        }
-      }
-    },
-    async fetchUserByName(name) {
-      try {
-        const result = await fetchUserByName({
-          name,
-          credentials: useOAuthStore().token,
-        })
-
-        this.addNewUsers(result)
-
-        return this.users.get(result.data.id)
-      } catch (error) {
-        if (error.name === 'StatusCodeError' && error.statusCode === 404) {
-          console.warn(`User ${name} not found`)
-          return null
-        } else {
-          throw error
-        }
-      }
-    },
-    fetchUserRelationship(id) {
-      return fetchUserRelationship({
-        id,
-        credentials: useOAuthStore().token,
-      }).then((result) => this.updateUserRelationships(result))
-    },
-    fetchFriends(id) {
-      const user = this.users.get(id)
-      const maxId = last([...this.relationshipsLists.friends.get(user)])
-      return fetchFriends({
-        id,
-        maxId,
-        credentials: useOAuthStore().token,
-      }).then((result) => {
-        const users = this.addNewUsers(result)
-        const list = this.relationshipsLists.friends.get(user)
-        users.forEach(({ id }) => list.add(id))
-        return result.data
-      })
-    },
-    fetchFollowers(id) {
-      const user = this.users.get(id)
-      const maxId = last([...this.relationshipsLists.followers.get(user)])
-      return fetchFollowers({
-        id,
-        maxId,
-        credentials: useOAuthStore().token,
-      }).then((result) => {
-        const users = this.addNewUsers(result)
-        const list = this.relationshipsLists.followers.get(user)
-        users.forEach(({ id }) => list.add(id))
-        return result.data
-      })
-    },
-    fetchUserInLists(id) {
-      if (this.currentUser) {
-        return fetchUserInLists({
-          id,
-          credentials: useOAuthStore().token,
-        }).then(({ data: inLists }) => {
-          this.users.get(id).inLists = inLists
-        })
-      }
-    },
-    fetchMutes(args) {
-      const { reset } = args || {}
-
-      const maxId = this.currentUser.muteIdsMaxId
-      return fetchMutes({
-        maxId,
-        credentials: useOAuthStore().token,
-      }).then((result) => {
-        const { data: mutes } = result
-        if (reset) {
-          this.currentUser.muteIds = new Set(mutes.map(({ id }) => id))
-        } else {
-          mutes.forEach(({ id }) => this.currentUser.muteIds.add(id))
-        }
-        if (mutes.length) {
-          this.currentUser.muteIdsMaxId = last(mutes).id
-        }
-        this.addNewUsers(result)
-        return mutes
-      })
-    },
-    fetchBlocks(args) {
-      const { reset } = args || {}
-
-      const maxId = this.currentUser.blockIdsMaxId
-      return fetchBlocks({
-        maxId,
-        credentials: useOAuthStore().token,
-      }).then((result) => {
-        const { data: blocks } = result
-        if (reset) {
-          this.currentUser.blockIds = new Set(blocks.map(({ id }) => id))
-        } else {
-          blocks.forEach(({ id }) => this.currentUser.blockIds.add(id))
-        }
-        if (blocks.length) {
-          this.currentUser.blockIdsMaxId = last(blocks).id
-        }
-        this.addNewUsers(result)
-        return blocks
-      })
-    },
-    fetchDomainMutes() {
-      return fetchDomainMutes({
-        credentials: useOAuthStore().token,
-      }).then(({ data: domainMutes }) => {
-        this.currentUser.domainMutes = new Set(domainMutes)
-        return domainMutes
-      })
-    },
-
-    // Actions
-    /// Follow
-    async followUser(id) {
-      // Don't spam follow requests if we are already polling
-      if (this.followPollers.has(id)) return
-
-      const followFunc = () =>
-        followUser({
-          id,
-          credentials: useOAuthStore().token,
-        }).then((result) => this.updateUserRelationships(result))
-
-      const checker = async (func = () => this.fetchUserRelationship(id)) => {
-        await func() // Either fetch relationships or follow request
-        const relationship = this.relationships.get(id)
-
-        return (
-          relationship.following ||
-          (relationship.locked && relationship.requested)
-        )
-      }
-
-      const immediate = await checker(followFunc)
-      if (immediate) return // If follow goes through immediately don'd to looping
-
-      const loop = async () => {
-        const attempts = this.followPollersAttempts.get(id)
-        const result = await checker()
-
-        if (result || attempts === 1) {
-          this.followPollersAttempts.delete(id)
-          this.followPollers.get(id).stop()
-          this.followPollers.delete(id)
-        } else {
-          this.followPollersAttempts.set(id, attempts - 1)
-        }
-      }
-
-      this.followPollersAttempts.set(id, 3)
-      this.followPollers.set(id, promiseInterval(loop, 500))
-    },
-    async unfollowUser(id) {
-      const result = await unfollowUser({
-        id,
-        credentials: useOAuthStore().token,
-      })
-
-      return this.updateUserRelationships(result)
-    },
-
-    /// Subscribe
-    subscribeUser(id) {
-      return followUser({
-        id,
-        notify: true,
-        credentials: useOAuthStore().token,
-      }).then((result) => this.updateUserRelationships(result))
-    },
-    unsubscribeUser(id) {
-      return followUser({
-        id,
-        notify: false,
-        credentials: useOAuthStore().token,
-      }).then((result) => this.updateUserRelationships(result))
-    },
-
-    /// User Note
-    editUserNote(id, comment) {
-      return editUserNote({ id, comment }).then((result) =>
-        this.updateUserRelationships(result),
-      )
-    },
-
-    /// Hide reblogs
-    hideReblogs(id) {
-      return followUser({
-        id,
-        reblogs: false,
-        credentials: useOAuthStore().token,
-      }).then((result) => this.updateUserRelationships(result))
-    },
-    showReblogs(id) {
-      return followUser({
-        id,
-        reblogs: true,
-        credentials: useOAuthStore().token,
-      }).then((result) => this.updateUserRelationships(result))
-    },
-
-    /// Remove follower
-    removeUserFromFollowers(id) {
-      return removeUserFromFollowers({ id }).then((result) =>
-        this.updateUserRelationships(result),
-      )
-    },
-
-    /// Mute
-    muteUser(id, expiresIn = 0) {
-      const predictedRelationship = this.relationships[id] || { id }
-      predictedRelationship.muting = true
-      this.updateUserRelationships({
-        optimism: true,
-        data: [predictedRelationship],
-      })
-
-      return muteUser({
-        id,
-        expiresIn,
-        credentials: useOAuthStore().token,
-      }).then((result) => {
-        this.updateUserRelationships(result)
-      })
-    },
-    muteUsers(data = []) {
-      return Promise.all(data.map((d) => this.muteUser(d)))
-    },
-    unmuteUser(id) {
-      const predictedRelationship = this.relationships[id] || { id }
-      predictedRelationship.muting = false
-      this.updateUserRelationships({
-        optimism: true,
-        data: [predictedRelationship],
-      })
-
-      return unmuteUser({ id }).then((result) =>
-        this.updateUserRelationships(result),
-      )
-    },
-    unmuteUsers(ids = []) {
-      return Promise.all(ids.map((d) => this.unmuteUser(d)))
-    },
-
-    /// Block
-    blockUser(id, expiresIn = 0) {
-      const predictedRelationship = this.relationships[id] || { id }
-      this.updateUserRelationships({
-        optimism: true,
-        data: [predictedRelationship],
-      })
-
-      return blockUser({ id, expiresIn }).then((result) => {
-        this.updateUserRelationships(result)
-
-        const ids = useStatusesStore().wipeUserStatuses(id)
-        useTimelinesStore().wipeStatuses(ids)
-      })
-    },
-    blockUsers(data = []) {
-      return Promise.all(data.map((d) => this.blockUser(d)))
-    },
-    unblockUser(id) {
-      return unblockUser({ id }).then((result) => {
-        this.updateUserRelationships(result)
-      })
-    },
-    unblockUsers(data = []) {
-      return Promise.all(data.map((d) => this.unblockUser(d)))
-    },
-
-    /// Domain Mute
-    muteDomain(domain) {
-      return muteDomain({
-        domain,
-        credentials: useOAuthStore().token,
-      }).then(() => this.currentUser.domainMutes.add(domain))
-    },
-    unmuteDomain(domain) {
-      return unmuteDomain({
-        domain,
-        credentials: useOAuthStore().token,
-      }).then(() => this.currentUser.domainMutes.delete(domain))
-    },
-    muteDomains(domains = []) {
-      return Promise.all(domains.map((domain) => this.muteDomain(domain)))
-    },
-    unmuteDomains(domain = []) {
-      return Promise.all(domain.map((domain) => this.unmuteDomain(domain)))
-    },
-
-    // Login/Logout
-    async loginUser(accessToken) {
-      const store = window.vuex
-      const dispatch =
-        store?.dispatch ??
-        (() => {
-          /* no-op */
-        }) // for tests
-
-      this.loggingIn = true
-
-      try {
-        const { data: user, ...rest } = await verifyCredentials({
-          credentials: useOAuthStore().token,
-        })
-
-        user.blockIds = new Set()
-        user.muteIds = new Set()
-        user.domainMutes = new Set()
-
-        this.lastLoginName = user.screen_name
-        this.currentUser = user
-
-        this.users = new Map()
-        this.usersByName = new Map()
-        this.usersByURL = new Map()
-        this.relationships = new Map()
-
-        useInterfaceStore().onLogin()
-        useSyncConfigStore()
-          .initSyncConfig(user)
-          .then(() => {
-            useInterfaceStore()
-              .applyTheme()
-              .catch((e) => {
-                console.error('Error setting theme', e)
-              })
-          })
-
-        useUserHighlightStore().initUserHighlight(user)
-        this.addNewUsers({ data: user, ...rest })
-
-        useEmojiStore().fetchEmoji()
-
-        // Do server-side storage migrations
-
-        // Debug snippet to clean up storage and reset migrations
-        /*
-        // Reset wordfilter
-        Object.keys(
-        useSyncConfigStore().prefsStorage.simple.muteFilters
-        ).forEach(key => {
-        useSyncConfigStore().unsetSimplePrefAndSave({ path: 'muteFilters.' + key, value: null })
-        })
-
-        // Reset flag to 0 to re-run migrations
-        useSyncConfigStore().setFlag({ flag: 'configMigration', value: 0 })
-        /**/
-
-        if (user.token) {
-          // Shoutbox
-          dispatch('setWsToken', user.token)
-          dispatch('initializeSocket')
-        }
-
-        // DMs and Home
-        useNotificationsStore().activate()
-        useTimelinesStore().activatePersistents()
-
-        if (useInstanceCapabilitiesStore().pleromaChatMessagesAvailable) {
-          // Start fetching chats
-          useChatsStore().startFetching()
-        }
-
-        useListsStore().startFetching()
-        useBookmarkFoldersStore().startFetching()
-
-        if (user.locked) {
-          dispatch('startFetchingFollowRequests')
-        }
-
-        if (useMergedConfigStore().mergedConfig.useStreamingApi) {
-          useStreamingStore().initSocket(true)
-        }
-
-        // Start fetching things that don't need to block the UI
-        useAnnouncementsStore().startFetching()
-
-        this.fetchMutes()
-        dispatch('loadDrafts')
-      } catch (error) {
-        console.error(error)
-
-        // Authentication failed
-        this.loggingIn = false
-
-        // remove authentication token on client/authentication errors
-        if ([400, 401, 403, 422].includes(error.statusCode)) {
-          useOAuthStore().clearToken()
-        }
-
-        if (error.tatusCode === 401) {
-          throw new Error('Wrong username or password', error)
-        } else {
-          throw new Error('An error occurred, please try again', error)
-        }
-      } finally {
-        this.loggingIn = false
-      }
-    },
-    logout() {
-      const store = window.vuex
-      const oauth = useOAuthStore()
-
-      // NOTE: No need to verify the app still exists, because if it doesn't,
-      // the token will be invalid too
-      return oauth
-        .ensureApp()
-        .then((app) => {
-          const params = {
-            app,
-            instance: useInstanceStore().server,
-            token: oauth.userToken,
-          }
-
-          return revokeToken(params)
-        })
-        .then(() => {
-          this.currentUser = null
-          this.lastLoginName = null
-
-          this.users = new Map()
-          this.usersByName = new Map()
-          this.usersByURL = new Map()
-          this.relationships = new Map()
-          useNotificationsStore().deactivate()
-          useAnnouncementsStore().stopFetching()
-          useListsStore().stopFetching()
-          useBookmarkFoldersStore().stopFetching()
-          store?.dispatch('stopFetchingFollowRequests')
-          useTimelinesStore().deactivateAll()
-          useStatusesStore().resetStatuses()
-          if (useMergedConfigStore().mergedConfig.useStreamingApi) {
-            useStreamingStore().stopSocket()
-          }
-          useChatsStore().resetChats()
-          oauth.clearToken()
-          Cookies.remove('__Host-pleroma_key', { path: '/' })
-          useInterfaceStore().onLogout()
-        })
-    },
-  },
-  persist: {
-    paths: ['lastLoginName'],
-  },
-})
diff --git a/src/sw.js b/src/sw.js
index 48a4c5e60..908e86567 100644
--- a/src/sw.js
+++ b/src/sw.js
@@ -8,7 +8,7 @@ import { createI18n } from 'vue-i18n'
 import { storage } from 'src/lib/storage.js'
 import { INSTANCE_DEFAULT_CONFIG } from 'src/modules/default_config_state.js'
 import { parseNotification } from 'src/services/entity_normalizer/entity_normalizer.service.js'
-import { prepareNotificationObject } from 'src/services/notification_utils/notification_utils_sw.js'
+import { prepareNotificationObject } from 'src/services/notification_utils/notification_utils.js'
 import { cacheKey, emojiCacheKey, shouldCache } from 'src/services/sw/sw.js'
 
 // Collects all messages for service workers
diff --git a/test/fixtures/setup_test.js b/test/fixtures/setup_test.js
index 3da0231a4..b3804b102 100644
--- a/test/fixtures/setup_test.js
+++ b/test/fixtures/setup_test.js
@@ -1,3 +1,4 @@
+import { createTestingPinia } from '@pinia/testing'
 import { config } from '@vue/test-utils'
 import { createMemoryHistory, createRouter } from 'vue-router'
 import VueVirtualScroller from 'vue-virtual-scroller'
@@ -25,6 +26,7 @@ const getDefaultOpts = ({
   global: {
     plugins: [
       applyAfterStore(makeMockStore(), afterStore),
+      createTestingPinia(),
       VueVirtualScroller,
       createRouter({
         history: createMemoryHistory(),
diff --git a/test/unit/specs/boot/routes.spec.js b/test/unit/specs/boot/routes.spec.js
index 068bedabe..98bb9a61d 100644
--- a/test/unit/specs/boot/routes.spec.js
+++ b/test/unit/specs/boot/routes.spec.js
@@ -3,13 +3,20 @@ import { createTestingPinia } from '@pinia/testing'
 createTestingPinia()
 
 import { createMemoryHistory, createRouter } from 'vue-router'
+import { createStore } from 'vuex'
 
 import routes from 'src/boot/routes'
 
+const store = createStore({
+  state: {
+    instance: {},
+  },
+})
+
 describe('routes', () => {
   const router = createRouter({
     history: createMemoryHistory(),
-    routes: routes(),
+    routes: routes(store),
   })
 
   it('root path', async () => {
@@ -17,9 +24,12 @@ describe('routes', () => {
 
     const matchedComponents = router.currentRoute.value.matched
 
-    expect(matchedComponents[0].components.default.__file).to.contain(
-      '/timeline.vue',
-    )
+    expect(
+      Object.hasOwn(
+        matchedComponents[0].components.default.components,
+        'Timeline',
+      ),
+    ).to.eql(true)
   })
 
   it("user's profile", async () => {
@@ -28,7 +38,7 @@ describe('routes', () => {
     const matchedComponents = router.currentRoute.value.matched
 
     expect(matchedComponents[0].components.default.__file).to.contain(
-      '/user_profile.vue',
+      'user_profile.vue',
     )
   })
 
@@ -38,7 +48,7 @@ describe('routes', () => {
     const matchedComponents = router.currentRoute.value.matched
 
     expect(matchedComponents[0].components.default.__file).to.contain(
-      '/user_profile.vue',
+      'user_profile.vue',
     )
   })
 
@@ -47,7 +57,7 @@ describe('routes', () => {
 
     const matchedComponents = router.currentRoute.value.matched
     expect(matchedComponents[0].components.default.__file).to.contain(
-      '/lists.vue',
+      'lists.vue',
     )
   })
 
@@ -57,7 +67,7 @@ describe('routes', () => {
     const matchedComponents = router.currentRoute.value.matched
 
     expect(matchedComponents[0].components.default.__file).to.contain(
-      '/timeline.vue',
+      'lists_timeline.vue',
     )
   })
 
@@ -67,7 +77,7 @@ describe('routes', () => {
     const matchedComponents = router.currentRoute.value.matched
 
     expect(matchedComponents[0].components.default.__file).to.contain(
-      '/lists_edit.vue',
+      'lists_edit.vue',
     )
   })
 })
diff --git a/test/unit/specs/components/draft.spec.js b/test/unit/specs/components/draft.spec.js
index 40d63419b..b69d2323e 100644
--- a/test/unit/specs/components/draft.spec.js
+++ b/test/unit/specs/components/draft.spec.js
@@ -7,7 +7,6 @@ import PostStatusForm from 'src/components/post_status_form/post_status_form.vue
 import { $t, mountOpts, waitForEvent } from '../../../fixtures/setup_test'
 
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 const autoSaveOrNot = (caseFn, caseTitle, runFn) => {
   caseFn(`${caseTitle} with auto-save`, function () {
@@ -35,20 +34,13 @@ const saveManually = async (wrapper) => {
 
 const waitSaveTime = 4000
 
-const currentUser = {
-  id: 'current-user',
-  default_scope: 'public',
-  locked: false,
-}
+afterEach(() => {
+  vi.useRealTimers()
+})
 
 describe('Draft saving', () => {
   beforeEach(() => {
     setActivePinia(createTestingPinia())
-    useUsersStore().currentUser = currentUser
-  })
-
-  afterEach(() => {
-    vi.useRealTimers()
   })
 
   autoSaveOrNot(
diff --git a/test/unit/specs/components/post_status_form.spec.js b/test/unit/specs/components/post_status_form.spec.js
index 981a6d020..f89102504 100644
--- a/test/unit/specs/components/post_status_form.spec.js
+++ b/test/unit/specs/components/post_status_form.spec.js
@@ -1,6 +1,4 @@
-import { createTestingPinia } from '@pinia/testing'
 import { mount } from '@vue/test-utils'
-import { setActivePinia } from 'pinia'
 import { vi } from 'vitest'
 
 import PostStatusForm from 'src/components/post_status_form/post_status_form.vue'
@@ -8,8 +6,6 @@ import { mountOpts } from '../../../fixtures/setup_test'
 
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 const currentUser = {
   id: 'current-user',
@@ -35,18 +31,24 @@ const repliedStatus2 = {
   user: repliedUser,
 }
 
+const replyMountOpts = (props) =>
+  mountOpts({
+    props,
+    afterStore(store) {
+      store.state.users.currentUser = currentUser
+      store.state.statuses.allStatusesObject = {
+        [repliedStatus.id]: repliedStatus,
+      }
+    },
+  })
+
 describe('PostStatusForm', () => {
   beforeEach(() => {
     vi.useFakeTimers()
-    setActivePinia(createTestingPinia())
-    useUsersStore().currentUser = currentUser
-    useStatusesStore().allStatuses = new Map([
-      [repliedStatus.id, repliedStatus],
-    ])
   })
 
   it('Clean empty initial state', () => {
-    const wrapper = mount(PostStatusForm, mountOpts())
+    const wrapper = mount(PostStatusForm, replyMountOpts())
 
     expect(wrapper.vm.statusType).to.equal('new')
     expect(wrapper.vm.newStatus.spoilerText).to.eql('')
@@ -55,7 +57,7 @@ describe('PostStatusForm', () => {
   })
 
   it('Reset cleans form to pristine state equal to state form was when created', () => {
-    const wrapper = mount(PostStatusForm, mountOpts())
+    const wrapper = mount(PostStatusForm, replyMountOpts())
 
     const initial = { ...wrapper.vm.newStatus }
     wrapper.vm.clearStatus()
@@ -66,10 +68,8 @@ describe('PostStatusForm', () => {
   it('Initializes a reply form', () => {
     const wrapper = mount(
       PostStatusForm,
-      mountOpts({
-        props: {
-          repliedStatus: repliedStatus,
-        },
+      replyMountOpts({
+        repliedStatus: repliedStatus,
       }),
     )
 
@@ -91,10 +91,8 @@ describe('PostStatusForm', () => {
   it('Copies scope and subject line, disables quoting for locked posts', () => {
     const wrapper = mount(
       PostStatusForm,
-      mountOpts({
-        props: {
-          repliedStatus: repliedStatus2,
-        },
+      replyMountOpts({
+        repliedStatus: repliedStatus2,
       }),
     )
 
@@ -123,10 +121,8 @@ describe('PostStatusForm', () => {
 
   it('Forces direct mode when replying to a DM, mastodon style subject handling', () => {
     // We need to initialize pinia first which is happening here...
-    const options = mountOpts({
-      props: {
-        repliedStatus: { ...repliedStatus2, visibility: 'direct' },
-      },
+    const options = replyMountOpts({
+      repliedStatus: { ...repliedStatus2, visibility: 'direct' },
     })
 
     // ...set our settings...
@@ -154,12 +150,10 @@ describe('PostStatusForm', () => {
   it('Sets status to statusText without mentions if mentions line is enabled', () => {
     const wrapper = mount(
       PostStatusForm,
-      mountOpts({
-        props: {
-          repliedStatus: repliedStatus2,
-          statusText: 'testing',
-          mentionsLine: true,
-        },
+      replyMountOpts({
+        repliedStatus: repliedStatus2,
+        statusText: 'testing',
+        mentionsLine: true,
       }),
     )
 
@@ -172,10 +166,8 @@ describe('PostStatusForm', () => {
   it('Sets mention when asked for it', () => {
     const wrapper = mount(
       PostStatusForm,
-      mountOpts({
-        props: {
-          profileMention: repliedUser,
-        },
+      replyMountOpts({
+        profileMention: repliedUser,
       }),
     )
 
@@ -188,10 +180,8 @@ describe('PostStatusForm', () => {
   it('Initializes quote when reply/quote toggled to quote', () => {
     const wrapper = mount(
       PostStatusForm,
-      mountOpts({
-        props: {
-          repliedStatus: repliedStatus2,
-        },
+      replyMountOpts({
+        repliedStatus: repliedStatus2,
       }),
     )
 
@@ -206,10 +196,8 @@ describe('PostStatusForm', () => {
   it('Resets quote when reply/quote toggled to reply', () => {
     const wrapper = mount(
       PostStatusForm,
-      mountOpts({
-        props: {
-          repliedStatus: repliedStatus2,
-        },
+      replyMountOpts({
+        repliedStatus: repliedStatus2,
       }),
     )
 
@@ -225,10 +213,8 @@ describe('PostStatusForm', () => {
   it('Initializes and reset quote when toggling quote attachment', () => {
     const wrapper = mount(
       PostStatusForm,
-      mountOpts({
-        props: {
-          repliedStatus: repliedStatus2,
-        },
+      replyMountOpts({
+        repliedStatus: repliedStatus2,
       }),
     )
 
@@ -248,19 +234,17 @@ describe('PostStatusForm', () => {
   it('Status editing', () => {
     const wrapper = mount(
       PostStatusForm,
-      mountOpts({
-        props: {
-          statusId: 'edited',
-          statusText: 'text',
-          statusSubject: 'heading',
-          statusIsSensitive: true,
-          statusPoll: {},
-          statusQuote: {},
-          statusFiles: [],
-          statusMediaDescriptions: {},
-          statusVisibility: 'unlisted',
-          statusContentType: 'text/markdown',
-        },
+      replyMountOpts({
+        statusId: 'edited',
+        statusText: 'text',
+        statusSubject: 'heading',
+        statusIsSensitive: true,
+        statusPoll: {},
+        statusQuote: {},
+        statusFiles: [],
+        statusMediaDescriptions: {},
+        statusVisibility: 'unlisted',
+        statusContentType: 'text/markdown',
       }),
     )
 
@@ -280,7 +264,7 @@ describe('PostStatusForm', () => {
 
   it('Posting should reset idempotency key', async () => {
     vi.setSystemTime(new Date(2027, 1, 1, 13))
-    const wrapper = mount(PostStatusForm, mountOpts())
+    const wrapper = mount(PostStatusForm, replyMountOpts())
     const oldIdempotency = wrapper.vm.idempotencyKey
 
     vi.setSystemTime(new Date(2028, 1, 1, 13))
@@ -294,7 +278,7 @@ describe('PostStatusForm', () => {
   // TODO Probably better to separate attachment upload/manipulation into its own component?
   // we need to upload-on-submit for compression setting anyway
   it('Attachments manipulations (moving, adding, removing)', () => {
-    const wrapper = mount(PostStatusForm, mountOpts())
+    const wrapper = mount(PostStatusForm, replyMountOpts())
 
     const i1 = { id: '1', url: 'a' }
     const i2 = { id: '2', url: 'b' }
@@ -324,7 +308,7 @@ describe('PostStatusForm', () => {
   })
 
   it('Attachment descriptions', () => {
-    const wrapper = mount(PostStatusForm, mountOpts())
+    const wrapper = mount(PostStatusForm, replyMountOpts())
 
     const i1 = { id: '1', url: 'a' }
 
diff --git a/test/unit/specs/components/rich_content.spec.js b/test/unit/specs/components/rich_content.spec.js
index 19bfdc035..cc79fe377 100644
--- a/test/unit/specs/components/rich_content.spec.js
+++ b/test/unit/specs/components/rich_content.spec.js
@@ -1,11 +1,24 @@
-import { createTestingPinia } from '@pinia/testing'
 import { mount, shallowMount } from '@vue/test-utils'
-import { setActivePinia } from 'pinia'
 
 import RichContent from 'src/components/rich_content/rich_content.jsx'
-import { mountOpts } from '../../../fixtures/setup_test'
 
 const attentions = []
+const global = {
+  mocks: {
+    $store: {
+      state: {},
+      getters: {
+        mergedConfig: () => ({
+          mentionLinkShowTooltip: true,
+        }),
+        findUserByUrl: () => null,
+      },
+    },
+  },
+  stubs: {
+    FAIcon: true,
+  },
+}
 
 const makeMention = (who, noClass) => {
   attentions.push({ statusnet_profile_url: `https://fake.tld/@${who}` })
@@ -24,24 +37,18 @@ const mentionsLine = (times) =>
   ].join('')
 
 describe('RichContent', () => {
-  beforeEach(() => {
-    setActivePinia(createTestingPinia())
-  })
-
   it('renders simple post without exploding', () => {
     const html = p('Hello world!')
-    const wrapper = shallowMount(
-      RichContent,
-      mountOpts({
-        props: {
-          attentions,
-          handleLinks: true,
-          greentext: true,
-          emoji: [],
-          html,
-        },
-      }),
-    )
+    const wrapper = shallowMount(RichContent, {
+      global,
+      props: {
+        attentions,
+        handleLinks: true,
+        greentext: true,
+        emoji: [],
+        html,
+      },
+    })
 
     expect(wrapper.html().replaceAll('\n', '')).to.eql(compwrap(html))
   })
@@ -49,36 +56,32 @@ describe('RichContent', () => {
   it('unescapes everything as needed', () => {
     const html = [p('Testing &#39;em all'), 'Testing &#39;em all'].join('')
     const expected = [p("Testing 'em all"), "Testing 'em all"].join('')
-    const wrapper = shallowMount(
-      RichContent,
-      mountOpts({
-        props: {
-          attentions,
-          handleLinks: true,
-          greentext: true,
-          emoji: [],
-          html,
-        },
-      }),
-    )
+    const wrapper = shallowMount(RichContent, {
+      global,
+      props: {
+        attentions,
+        handleLinks: true,
+        greentext: true,
+        emoji: [],
+        html,
+      },
+    })
 
     expect(wrapper.html().replaceAll('\n', '')).to.eql(compwrap(expected))
   })
 
   it('replaces mention with mentionsline', () => {
     const html = p(makeMention('John'), ' how are you doing today?')
-    const wrapper = shallowMount(
-      RichContent,
-      mountOpts({
-        props: {
-          attentions,
-          handleLinks: true,
-          greentext: true,
-          emoji: [],
-          html,
-        },
-      }),
-    )
+    const wrapper = shallowMount(RichContent, {
+      global,
+      props: {
+        attentions,
+        handleLinks: true,
+        greentext: true,
+        emoji: [],
+        html,
+      },
+    })
 
     expect(wrapper.html().replaceAll('\n', '')).to.eql(
       compwrap(p(mentionsLine(1), ' how are you doing today?')),
@@ -102,18 +105,16 @@ describe('RichContent', () => {
       ),
     ].join('')
 
-    const wrapper = shallowMount(
-      RichContent,
-      mountOpts({
-        props: {
-          attentions,
-          handleLinks: true,
-          greentext: true,
-          emoji: [],
-          html,
-        },
-      }),
-    )
+    const wrapper = shallowMount(RichContent, {
+      global,
+      props: {
+        attentions,
+        handleLinks: true,
+        greentext: true,
+        emoji: [],
+        html,
+      },
+    })
 
     expect(wrapper.html().replaceAll('\n', '')).to.eql(compwrap(expected))
   })
@@ -140,18 +141,16 @@ describe('RichContent', () => {
       ].join(''),
     ].join('\n')
 
-    const wrapper = shallowMount(
-      RichContent,
-      mountOpts({
-        props: {
-          attentions,
-          handleLinks: false,
-          greentext: true,
-          emoji: [],
-          html,
-        },
-      }),
-    )
+    const wrapper = shallowMount(RichContent, {
+      global,
+      props: {
+        attentions,
+        handleLinks: false,
+        greentext: true,
+        emoji: [],
+        html,
+      },
+    })
 
     expect(wrapper.html()).to.eql(compwrap(strippedHtml))
   })
@@ -163,18 +162,16 @@ describe('RichContent', () => {
       '<span class="greentext">&gt;any year</span>',
     ].join('\n')
 
-    const wrapper = shallowMount(
-      RichContent,
-      mountOpts({
-        props: {
-          attentions,
-          handleLinks: false,
-          greentext: true,
-          emoji: [],
-          html,
-        },
-      }),
-    )
+    const wrapper = shallowMount(RichContent, {
+      global,
+      props: {
+        attentions,
+        handleLinks: false,
+        greentext: true,
+        emoji: [],
+        html,
+      },
+    })
 
     expect(wrapper.html()).to.eql(compwrap(expected))
   })
@@ -182,18 +179,16 @@ describe('RichContent', () => {
   it('Does not add greentext and cyantext if setting is set to false', () => {
     const html = ['&gt;preordering videogames', '&gt;any year'].join('\n')
 
-    const wrapper = shallowMount(
-      RichContent,
-      mountOpts({
-        props: {
-          attentions,
-          handleLinks: false,
-          greentext: false,
-          emoji: [],
-          html,
-        },
-      }),
-    )
+    const wrapper = shallowMount(RichContent, {
+      global,
+      props: {
+        attentions,
+        handleLinks: false,
+        greentext: false,
+        emoji: [],
+        html,
+      },
+    })
 
     expect(wrapper.html()).to.eql(compwrap(html))
   })
@@ -205,18 +200,16 @@ describe('RichContent', () => {
       '<anonymous-stub shortcode="spurdo" islocal="true" class="emoji img" src="about:blank" title=":spurdo:" alt=":spurdo:"></anonymous-stub>',
     )
 
-    const wrapper = shallowMount(
-      RichContent,
-      mountOpts({
-        props: {
-          attentions,
-          handleLinks: false,
-          greentext: false,
-          emoji: [{ url: 'about:blank', shortcode: 'spurdo' }],
-          html,
-        },
-      }),
-    )
+    const wrapper = shallowMount(RichContent, {
+      global,
+      props: {
+        attentions,
+        handleLinks: false,
+        greentext: false,
+        emoji: [{ url: 'about:blank', shortcode: 'spurdo' }],
+        html,
+      },
+    })
 
     expect(wrapper.html().replaceAll('\n', '')).to.eql(compwrap(expected))
   })
@@ -224,18 +217,16 @@ describe('RichContent', () => {
   it("Doesn't add nonexistent emoji to post", () => {
     const html = p('Lol :lol:')
 
-    const wrapper = shallowMount(
-      RichContent,
-      mountOpts({
-        props: {
-          attentions,
-          handleLinks: false,
-          greentext: false,
-          emoji: [],
-          html,
-        },
-      }),
-    )
+    const wrapper = shallowMount(RichContent, {
+      global,
+      props: {
+        attentions,
+        handleLinks: false,
+        greentext: false,
+        emoji: [],
+        html,
+      },
+    })
 
     expect(wrapper.html().replaceAll('\n', '')).to.eql(compwrap(html))
   })
@@ -254,18 +245,16 @@ describe('RichContent', () => {
       '<span class="greentext">&gt;quote</span>',
     ].join('\n')
 
-    const wrapper = shallowMount(
-      RichContent,
-      mountOpts({
-        props: {
-          attentions,
-          handleLinks: true,
-          greentext: true,
-          emoji: [],
-          html,
-        },
-      }),
-    )
+    const wrapper = shallowMount(RichContent, {
+      global,
+      props: {
+        attentions,
+        handleLinks: true,
+        greentext: true,
+        emoji: [],
+        html,
+      },
+    })
 
     expect(wrapper.html()).to.eql(compwrap(expected))
   })
@@ -279,18 +268,16 @@ describe('RichContent', () => {
     ].join('<br>')
     const expected = ['Bruh', 'Bruh', mentionsLine(3), 'Bruh'].join('<br>')
 
-    const wrapper = shallowMount(
-      RichContent,
-      mountOpts({
-        props: {
-          attentions,
-          handleLinks: true,
-          greentext: true,
-          emoji: [],
-          html,
-        },
-      }),
-    )
+    const wrapper = shallowMount(RichContent, {
+      global,
+      props: {
+        attentions,
+        handleLinks: true,
+        greentext: true,
+        emoji: [],
+        html,
+      },
+    })
 
     expect(wrapper.html().replaceAll('\n', '')).to.eql(compwrap(expected))
   })
@@ -317,18 +304,16 @@ describe('RichContent', () => {
       ' </p>',
     ].join('')
 
-    const wrapper = shallowMount(
-      RichContent,
-      mountOpts({
-        props: {
-          attentions,
-          handleLinks: true,
-          greentext: true,
-          emoji: [],
-          html,
-        },
-      }),
-    )
+    const wrapper = shallowMount(RichContent, {
+      global,
+      props: {
+        attentions,
+        handleLinks: true,
+        greentext: true,
+        emoji: [],
+        html,
+      },
+    })
 
     expect(wrapper.html().replaceAll('\n', '')).to.eql(compwrap(expected))
   })
@@ -366,18 +351,16 @@ describe('RichContent', () => {
       p('Testing'),
     ].join('')
 
-    const wrapper = mount(
-      RichContent,
-      mountOpts({
-        props: {
-          attentions,
-          handleLinks: true,
-          greentext: true,
-          emoji: [],
-          html,
-        },
-      }),
-    )
+    const wrapper = mount(RichContent, {
+      global,
+      props: {
+        attentions,
+        handleLinks: true,
+        greentext: true,
+        emoji: [],
+        html,
+      },
+    })
 
     expect(
       wrapper
@@ -441,18 +424,16 @@ describe('RichContent', () => {
       'Testing',
     ].join('')
 
-    const wrapper = mount(
-      RichContent,
-      mountOpts({
-        props: {
-          attentions,
-          handleLinks: true,
-          greentext: true,
-          emoji: [],
-          html,
-        },
-      }),
-    )
+    const wrapper = mount(RichContent, {
+      global,
+      props: {
+        attentions,
+        handleLinks: true,
+        greentext: true,
+        emoji: [],
+        html,
+      },
+    })
 
     expect(
       wrapper
@@ -492,18 +473,16 @@ describe('RichContent', () => {
       '</p>',
     ].join('')
 
-    const wrapper = shallowMount(
-      RichContent,
-      mountOpts({
-        props: {
-          attentions,
-          handleLinks: true,
-          greentext: true,
-          emoji: [],
-          html,
-        },
-      }),
-    )
+    const wrapper = shallowMount(RichContent, {
+      global,
+      props: {
+        attentions,
+        handleLinks: true,
+        greentext: true,
+        emoji: [],
+        html,
+      },
+    })
 
     expect(wrapper.html().replaceAll('\n', '')).to.eql(compwrap(expected))
   })
@@ -540,16 +519,14 @@ describe('RichContent', () => {
     const ptest = (handleLinks, vhtml) => {
       const t0 = performance.now()
 
-      const wrapper = mount(
-        TestComponent,
-        mountOpts({
-          props: {
-            attentions,
-            handleLinks,
-            vhtml,
-          },
-        }),
-      )
+      const wrapper = mount(TestComponent, {
+        global,
+        props: {
+          attentions,
+          handleLinks,
+          vhtml,
+        },
+      })
 
       const t1 = performance.now()
 
diff --git a/test/unit/specs/components/user_profile.spec.js b/test/unit/specs/components/user_profile.spec.js
new file mode 100644
index 000000000..36d323575
--- /dev/null
+++ b/test/unit/specs/components/user_profile.spec.js
@@ -0,0 +1,212 @@
+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'
+
+const mutations = {
+  clearTimeline: () => {
+    /* no-op */
+  },
+}
+
+const actions = {
+  fetchUser: () => {
+    /* no-op */
+  },
+  fetchUserByScreenName: () => {
+    /* no-op */
+  },
+}
+
+const testGetters = {
+  findUser: (state) => getters.findUser(state.users),
+  findUserByName: (state) => getters.findUserByName(state.users),
+  relationship: (state) => getters.relationship(state.users),
+  mergedConfig: () => ({
+    colors: '',
+    highlight: {},
+    customTheme: {
+      colors: [],
+    },
+  }),
+}
+
+const localUser = {
+  id: 100,
+  is_local: true,
+  screen_name: 'testUser',
+  screen_name_ui: 'testUser',
+}
+
+const extUser = {
+  id: 100,
+  is_local: false,
+  screen_name: 'testUser@test.instance',
+  screen_name_ui: 'testUser@test.instance',
+}
+
+const externalProfileStore = createStore({
+  mutations,
+  actions,
+  getters: testGetters,
+  state: {
+    interface: {
+      browserSupport: '',
+    },
+    instance: {
+      hideUserStats: true,
+    },
+    statuses: {
+      timelines: {
+        user: {
+          statuses: [],
+          statusesObject: {},
+          faves: [],
+          visibleStatuses: [],
+          visibleStatusesObject: {},
+          newStatusCount: 0,
+          maxId: 0,
+          minVisibleId: 0,
+          loading: false,
+          followers: [],
+          friends: [],
+          viewing: 'statuses',
+          userId: 100,
+          flushMarker: 0,
+        },
+        media: {
+          statuses: [],
+          statusesObject: {},
+          faves: [],
+          visibleStatuses: [],
+          visibleStatusesObject: {},
+          newStatusCount: 0,
+          maxId: 0,
+          minVisibleId: 0,
+          loading: false,
+          followers: [],
+          friends: [],
+          viewing: 'statuses',
+          userId: 100,
+          flushMarker: 0,
+        },
+      },
+    },
+    users: {
+      currentUser: {
+        credentials: '',
+      },
+      usersObject: { 100: extUser },
+      usersByNameObject: {},
+      users: [extUser],
+      relationships: {},
+    },
+  },
+})
+
+const localProfileStore = createStore({
+  mutations,
+  actions,
+  getters: testGetters,
+  state: {
+    interface: {
+      browserSupport: '',
+    },
+    config: {
+      colors: '',
+      highlight: {},
+      customTheme: {
+        colors: [],
+      },
+    },
+    instance: {
+      hideUserStats: true,
+    },
+    statuses: {
+      timelines: {
+        user: {
+          statuses: [],
+          statusesObject: {},
+          faves: [],
+          visibleStatuses: [],
+          visibleStatusesObject: {},
+          newStatusCount: 0,
+          maxId: 0,
+          minVisibleId: 0,
+          loading: false,
+          followers: [],
+          friends: [],
+          viewing: 'statuses',
+          userId: 100,
+          flushMarker: 0,
+        },
+        media: {
+          statuses: [],
+          statusesObject: {},
+          faves: [],
+          visibleStatuses: [],
+          visibleStatusesObject: {},
+          newStatusCount: 0,
+          maxId: 0,
+          minVisibleId: 0,
+          loading: false,
+          followers: [],
+          friends: [],
+          viewing: 'statuses',
+          userId: 100,
+          flushMarker: 0,
+        },
+      },
+    },
+    users: {
+      currentUser: {
+        credentials: '',
+      },
+      usersObject: { 100: localUser },
+      usersByNameObject: { testuser: localUser },
+      users: [localUser],
+      relationships: {},
+    },
+  },
+})
+
+// https://github.com/vuejs/test-utils/issues/1382
+describe.skip('UserProfile', () => {
+  it('renders external profile', () => {
+    const wrapper = mount(UserProfile, {
+      global: {
+        plugins: [externalProfileStore],
+        mocks: {
+          $route: {
+            params: { id: 100 },
+            name: 'external-user-profile',
+          },
+          $t: (msg) => msg,
+        },
+      },
+    })
+
+    expect(wrapper.find('.user-screen-name').text()).to.eql(
+      '@testUser@test.instance',
+    )
+  })
+
+  it('renders local profile', () => {
+    const wrapper = mount(UserProfile, {
+      global: {
+        plugins: [localProfileStore],
+        mocks: {
+          $route: {
+            params: { name: 'testUser' },
+            name: 'user-profile',
+          },
+          $t: (msg) => msg,
+        },
+      },
+    })
+
+    expect(wrapper.find('.user-screen-name').text()).to.eql('@testUser')
+  })
+})
diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
new file mode 100644
index 000000000..04bd07ffe
--- /dev/null
+++ b/test/unit/specs/modules/statuses.spec.js
@@ -0,0 +1,447 @@
+import { createTestingPinia } from '@pinia/testing'
+
+import {
+  defaultState,
+  mutations,
+  prepareStatus,
+} from '../../../../src/modules/statuses.js'
+
+createTestingPinia()
+
+const makeMockStatus = ({ id, text, type = 'status' }) => {
+  return {
+    id,
+    user: { id: '0' },
+    name: 'status',
+    text: text || `Text number ${id}`,
+    fave_num: 0,
+    uri: '',
+    type,
+    attentions: [],
+  }
+}
+
+describe('Statuses module', () => {
+  describe('prepareStatus', () => {
+    it('sets deleted flag to false', () => {
+      const aStatus = makeMockStatus({ id: '1', text: 'Hello oniichan' })
+      expect(prepareStatus(aStatus).deleted).to.eq(false)
+    })
+  })
+
+  describe('addNewStatuses', () => {
+    it('adds the status to allStatuses and to the given timeline', () => {
+      const state = defaultState()
+      const status = makeMockStatus({ id: '1' })
+
+      mutations.addNewStatuses(state, {
+        statuses: [status],
+        timeline: 'public',
+      })
+
+      expect(state.allStatuses).to.eql([status])
+      expect(state.timelines.public.statuses).to.eql([status])
+      expect(state.timelines.public.visibleStatuses).to.eql([])
+      expect(state.timelines.public.newStatusCount).to.equal(1)
+    })
+
+    it('counts the status as new if it has not been seen on this timeline', () => {
+      const state = defaultState()
+      const status = makeMockStatus({ id: '1' })
+
+      mutations.addNewStatuses(state, {
+        statuses: [status],
+        timeline: 'public',
+      })
+      mutations.addNewStatuses(state, {
+        statuses: [status],
+        timeline: 'friends',
+      })
+
+      expect(state.allStatuses).to.eql([status])
+      expect(state.timelines.public.statuses).to.eql([status])
+      expect(state.timelines.public.visibleStatuses).to.eql([])
+      expect(state.timelines.public.newStatusCount).to.equal(1)
+
+      expect(state.allStatuses).to.eql([status])
+      expect(state.timelines.friends.statuses).to.eql([status])
+      expect(state.timelines.friends.visibleStatuses).to.eql([])
+      expect(state.timelines.friends.newStatusCount).to.equal(1)
+    })
+
+    it('add the statuses to allStatuses if no timeline is given', () => {
+      const state = defaultState()
+      const status = makeMockStatus({ id: '1' })
+
+      mutations.addNewStatuses(state, { statuses: [status] })
+
+      expect(state.allStatuses).to.eql([status])
+      expect(state.timelines.public.statuses).to.eql([])
+      expect(state.timelines.public.visibleStatuses).to.eql([])
+      expect(state.timelines.public.newStatusCount).to.equal(0)
+    })
+
+    it('adds the status to allStatuses and to the given timeline, directly visible', () => {
+      const state = defaultState()
+      const status = makeMockStatus({ id: '1' })
+
+      mutations.addNewStatuses(state, {
+        statuses: [status],
+        showImmediately: true,
+        timeline: 'public',
+      })
+
+      expect(state.allStatuses).to.eql([status])
+      expect(state.timelines.public.statuses).to.eql([status])
+      expect(state.timelines.public.visibleStatuses).to.eql([status])
+      expect(state.timelines.public.newStatusCount).to.equal(0)
+    })
+
+    it('does not update the maxId when the noIdUpdate flag is set', () => {
+      const state = defaultState()
+      const status = makeMockStatus({ id: '1' })
+      const secondStatus = makeMockStatus({ id: '2' })
+
+      mutations.addNewStatuses(state, {
+        statuses: [status],
+        showImmediately: true,
+        timeline: 'public',
+      })
+      expect(state.timelines.public.maxId).to.equal('1')
+
+      mutations.addNewStatuses(state, {
+        statuses: [secondStatus],
+        showImmediately: true,
+        timeline: 'public',
+        noIdUpdate: true,
+      })
+      expect(state.timelines.public.statuses).to.eql([secondStatus, status])
+      expect(state.timelines.public.visibleStatuses).to.eql([
+        secondStatus,
+        status,
+      ])
+      expect(state.timelines.public.maxId).to.equal('1')
+    })
+
+    it('keeps a descending by id order in timeline.visibleStatuses and timeline.statuses', () => {
+      const state = defaultState()
+      const nonVisibleStatus = makeMockStatus({ id: '1' })
+      const status = makeMockStatus({ id: '3' })
+      const statusTwo = makeMockStatus({ id: '2' })
+      const statusThree = makeMockStatus({ id: '4' })
+
+      mutations.addNewStatuses(state, {
+        statuses: [nonVisibleStatus],
+        showImmediately: false,
+        timeline: 'public',
+      })
+
+      mutations.addNewStatuses(state, {
+        statuses: [status],
+        showImmediately: true,
+        timeline: 'public',
+      })
+      mutations.addNewStatuses(state, {
+        statuses: [statusTwo],
+        showImmediately: true,
+        timeline: 'public',
+      })
+
+      expect(state.timelines.public.minVisibleId).to.equal('2')
+
+      mutations.addNewStatuses(state, {
+        statuses: [statusThree],
+        showImmediately: true,
+        timeline: 'public',
+      })
+
+      expect(state.timelines.public.statuses).to.eql([
+        statusThree,
+        status,
+        statusTwo,
+        nonVisibleStatus,
+      ])
+      expect(state.timelines.public.visibleStatuses).to.eql([
+        statusThree,
+        status,
+        statusTwo,
+      ])
+    })
+
+    it('splits retweets from their status and links them', () => {
+      const state = defaultState()
+      const status = makeMockStatus({ id: '1' })
+      const retweet = makeMockStatus({ id: '2', type: 'retweet' })
+      const modStatus = makeMockStatus({ id: '1', text: 'something else' })
+
+      retweet.retweeted_status = status
+
+      // It adds both statuses, but only the retweet to visible.
+      mutations.addNewStatuses(state, {
+        statuses: [retweet],
+        timeline: 'public',
+        showImmediately: true,
+      })
+      expect(state.timelines.public.visibleStatuses).to.have.length(1)
+      expect(state.timelines.public.statuses).to.have.length(1)
+      expect(state.allStatuses).to.have.length(2)
+      expect(state.allStatuses[0].id).to.equal('1')
+      expect(state.allStatuses[1].id).to.equal('2')
+
+      // It refers to the modified status.
+      mutations.addNewStatuses(state, {
+        statuses: [modStatus],
+        timeline: 'public',
+      })
+      expect(state.allStatuses).to.have.length(2)
+      expect(state.allStatuses[0].id).to.equal('1')
+      expect(state.allStatuses[0].text).to.equal(modStatus.text)
+      expect(state.allStatuses[1].id).to.equal('2')
+      expect(retweet.retweeted_status.text).to.eql(modStatus.text)
+    })
+
+    it('replaces existing statuses with the same id', () => {
+      const state = defaultState()
+      const status = makeMockStatus({ id: '1' })
+      const modStatus = makeMockStatus({ id: '1', text: 'something else' })
+
+      // Add original status
+      mutations.addNewStatuses(state, {
+        statuses: [status],
+        showImmediately: true,
+        timeline: 'public',
+      })
+      expect(state.timelines.public.visibleStatuses).to.have.length(1)
+      expect(state.allStatuses).to.have.length(1)
+
+      // Add new version of status
+      mutations.addNewStatuses(state, {
+        statuses: [modStatus],
+        showImmediately: true,
+        timeline: 'public',
+      })
+      expect(state.timelines.public.visibleStatuses).to.have.length(1)
+      expect(state.allStatuses).to.have.length(1)
+      expect(state.allStatuses[0].text).to.eql(modStatus.text)
+    })
+
+    it('replaces existing statuses with the same id, coming from a retweet', () => {
+      const state = defaultState()
+      const status = makeMockStatus({ id: '1' })
+      const modStatus = makeMockStatus({ id: '1', text: 'something else' })
+      const retweet = makeMockStatus({ id: '2', type: 'retweet' })
+      retweet.retweeted_status = modStatus
+
+      // Add original status
+      mutations.addNewStatuses(state, {
+        statuses: [status],
+        showImmediately: true,
+        timeline: 'public',
+      })
+      expect(state.timelines.public.visibleStatuses).to.have.length(1)
+      expect(state.allStatuses).to.have.length(1)
+
+      // Add new version of status
+      mutations.addNewStatuses(state, {
+        statuses: [retweet],
+        showImmediately: false,
+        timeline: 'public',
+      })
+      expect(state.timelines.public.visibleStatuses).to.have.length(1)
+      // Don't add the retweet itself if the tweet is visible
+      expect(state.timelines.public.statuses).to.have.length(1)
+      expect(state.allStatuses).to.have.length(2)
+      expect(state.allStatuses[0].text).to.eql(modStatus.text)
+    })
+
+    it('handles favorite actions', () => {
+      const state = defaultState()
+      const status = makeMockStatus({ id: '1' })
+
+      const favorite = {
+        id: '2',
+        type: 'favorite',
+        in_reply_to_status_id: '1', // The API uses strings here...
+        uri: 'tag:shitposter.club,2016-08-21:fave:3895:note:773501:2016-08-21T16:52:15+00:00',
+        text: 'a favorited something by b',
+        user: { id: '99' },
+      }
+
+      mutations.addNewStatuses(state, {
+        statuses: [status],
+        showImmediately: true,
+        timeline: 'public',
+      })
+      mutations.addNewStatuses(state, {
+        statuses: [favorite],
+        showImmediately: true,
+        timeline: 'public',
+      })
+
+      expect(state.timelines.public.visibleStatuses).to.have.length(1)
+      expect(state.timelines.public.visibleStatuses[0].fave_num).to.eql(1)
+      expect(state.timelines.public.maxId).to.eq(favorite.id)
+
+      // Adding it again does nothing
+      mutations.addNewStatuses(state, {
+        statuses: [favorite],
+        showImmediately: true,
+        timeline: 'public',
+      })
+
+      expect(state.timelines.public.visibleStatuses).to.have.length(1)
+      expect(state.timelines.public.visibleStatuses[0].fave_num).to.eql(1)
+      expect(state.timelines.public.maxId).to.eq(favorite.id)
+
+      // If something is favorited by the current user, it also sets the 'favorited' property but does not increment counter to avoid over-counting. Counter is incremented (updated, really) via response to the favorite request.
+      const user = {
+        id: '1',
+      }
+
+      const ownFavorite = {
+        id: '3',
+        type: 'favorite',
+        in_reply_to_status_id: '1', // The API uses strings here...
+        uri: 'tag:shitposter.club,2016-08-21:fave:3895:note:773501:2016-08-21T16:52:15+00:00',
+        text: 'a favorited something by b',
+        user,
+      }
+
+      mutations.addNewStatuses(state, {
+        statuses: [ownFavorite],
+        showImmediately: true,
+        timeline: 'public',
+        user,
+      })
+
+      expect(state.timelines.public.visibleStatuses).to.have.length(1)
+      expect(state.timelines.public.visibleStatuses[0].fave_num).to.eql(1)
+      expect(state.timelines.public.visibleStatuses[0].favorited).to.eql(true)
+    })
+  })
+
+  describe('emojiReactions', () => {
+    it('increments count in existing reaction', () => {
+      const state = defaultState()
+      const status = makeMockStatus({ id: '1' })
+      status.emoji_reactions = [{ name: '😂', count: 1, accounts: [] }]
+
+      mutations.addNewStatuses(state, {
+        statuses: [status],
+        showImmediately: true,
+        timeline: 'public',
+      })
+      mutations.addOwnReaction(state, {
+        id: '1',
+        emoji: '😂',
+        currentUser: { id: 'me' },
+      })
+      expect(state.allStatusesObject['1'].emoji_reactions[0].count).to.eql(2)
+      expect(state.allStatusesObject['1'].emoji_reactions[0].me).to.eql(true)
+      expect(
+        state.allStatusesObject['1'].emoji_reactions[0].accounts[0].id,
+      ).to.equal('me')
+    })
+
+    it('adds a new reaction', () => {
+      const state = defaultState()
+      const status = makeMockStatus({ id: '1' })
+      status.emoji_reactions = []
+
+      mutations.addNewStatuses(state, {
+        statuses: [status],
+        showImmediately: true,
+        timeline: 'public',
+      })
+      mutations.addOwnReaction(state, {
+        id: '1',
+        emoji: '😂',
+        currentUser: { id: 'me' },
+      })
+      expect(state.allStatusesObject['1'].emoji_reactions[0].count).to.eql(1)
+      expect(state.allStatusesObject['1'].emoji_reactions[0].me).to.eql(true)
+      expect(
+        state.allStatusesObject['1'].emoji_reactions[0].accounts[0].id,
+      ).to.equal('me')
+    })
+
+    it('decreases count in existing reaction', () => {
+      const state = defaultState()
+      const status = makeMockStatus({ id: '1' })
+      status.emoji_reactions = [
+        { name: '😂', count: 2, accounts: [{ id: 'me' }] },
+      ]
+
+      mutations.addNewStatuses(state, {
+        statuses: [status],
+        showImmediately: true,
+        timeline: 'public',
+      })
+      mutations.removeOwnReaction(state, {
+        id: '1',
+        emoji: '😂',
+        currentUser: { id: 'me' },
+      })
+      expect(state.allStatusesObject['1'].emoji_reactions[0].count).to.eql(1)
+      expect(state.allStatusesObject['1'].emoji_reactions[0].me).to.eql(false)
+      expect(state.allStatusesObject['1'].emoji_reactions[0].accounts).to.eql(
+        [],
+      )
+    })
+
+    it('removes a reaction', () => {
+      const state = defaultState()
+      const status = makeMockStatus({ id: '1' })
+      status.emoji_reactions = [
+        { name: '😂', count: 1, accounts: [{ id: 'me' }] },
+      ]
+
+      mutations.addNewStatuses(state, {
+        statuses: [status],
+        showImmediately: true,
+        timeline: 'public',
+      })
+      mutations.removeOwnReaction(state, {
+        id: '1',
+        emoji: '😂',
+        currentUser: { id: 'me' },
+      })
+      expect(state.allStatusesObject['1'].emoji_reactions).to.have.length(0)
+    })
+  })
+
+  describe('showNewStatuses', () => {
+    it('resets the minId to the min of the visible statuses when adding new to visible statuses', () => {
+      const state = defaultState()
+      const status = makeMockStatus({ id: '10' })
+      mutations.addNewStatuses(state, {
+        statuses: [status],
+        showImmediately: true,
+        timeline: 'public',
+      })
+      const newStatus = makeMockStatus({ id: '20' })
+      mutations.addNewStatuses(state, {
+        statuses: [newStatus],
+        showImmediately: false,
+        timeline: 'public',
+      })
+      state.timelines.public.minId = '5'
+      mutations.showNewStatuses(state, { timeline: 'public' })
+
+      expect(state.timelines.public.visibleStatuses).to.have.length(2)
+      expect(state.timelines.public.minVisibleId).to.equal('10')
+      expect(state.timelines.public.minId).to.equal('10')
+    })
+  })
+
+  describe('clearTimeline', () => {
+    it('keeps userId when clearing user timeline when excludeUserId param is true', () => {
+      const state = defaultState()
+      state.timelines.user.userId = 123
+
+      mutations.clearTimeline(state, { timeline: 'user', excludeUserId: true })
+
+      expect(state.timelines.user.userId).to.eql(123)
+    })
+  })
+})
diff --git a/test/unit/specs/modules/users.spec.js b/test/unit/specs/modules/users.spec.js
new file mode 100644
index 000000000..1b33f8c4e
--- /dev/null
+++ b/test/unit/specs/modules/users.spec.js
@@ -0,0 +1,120 @@
+import { cloneDeep } from 'lodash'
+
+import {
+  defaultState,
+  getters,
+  mutations,
+} from '../../../../src/modules/users.js'
+
+describe('The users module', () => {
+  describe('mutations', () => {
+    it('adds new users to the set, merging in new information for old users', () => {
+      const state = cloneDeep(defaultState)
+      const user = { id: '1', name: 'Guy' }
+      const modUser = { id: '1', name: 'Dude' }
+
+      mutations.addNewUsers(state, [user])
+      expect(state.users).to.have.length(1)
+      expect(state.users).to.eql([user])
+
+      mutations.addNewUsers(state, [modUser])
+      expect(state.users).to.have.length(1)
+      expect(state.users).to.eql([user])
+      expect(state.users[0].name).to.eql('Dude')
+    })
+
+    it('merging array field in new information for old users', () => {
+      const state = cloneDeep(defaultState)
+      const user = {
+        id: '1',
+        fields: [{ name: 'Label 1', value: 'Content 1' }],
+      }
+      const firstModUser = {
+        id: '1',
+        fields: [
+          { name: 'Label 2', value: 'Content 2' },
+          { name: 'Label 3', value: 'Content 3' },
+        ],
+      }
+      const secondModUser = {
+        id: '1',
+        fields: [{ name: 'Label 4', value: 'Content 4' }],
+      }
+
+      mutations.addNewUsers(state, [user])
+      expect(state.users[0].fields).to.have.length(1)
+      expect(state.users[0].fields[0].name).to.eql('Label 1')
+
+      mutations.addNewUsers(state, [firstModUser])
+      expect(state.users[0].fields).to.have.length(2)
+      expect(state.users[0].fields[0].name).to.eql('Label 2')
+      expect(state.users[0].fields[1].name).to.eql('Label 3')
+
+      mutations.addNewUsers(state, [secondModUser])
+      expect(state.users[0].fields).to.have.length(1)
+      expect(state.users[0].fields[0].name).to.eql('Label 4')
+    })
+  })
+
+  describe('findUser', () => {
+    it('does not return user with matching screen_name', () => {
+      const user = { screen_name: 'Guy', id: '1' }
+      const state = {
+        usersObject: {
+          1: user,
+        },
+        usersByNameObject: {
+          guy: user,
+        },
+      }
+      const name = 'Guy'
+      expect(getters.findUser(state)(name)).to.be.undefined
+    })
+
+    it('returns user with matching id', () => {
+      const user = { screen_name: 'Guy', id: '1' }
+      const state = {
+        usersObject: {
+          1: user,
+        },
+        usersByNameObject: {
+          guy: user,
+        },
+      }
+      const id = '1'
+      const expected = { screen_name: 'Guy', id: '1' }
+      expect(getters.findUser(state)(id)).to.eql(expected)
+    })
+  })
+
+  describe('findUserByName', () => {
+    it('returns user with matching screen_name', () => {
+      const user = { screen_name: 'Guy', id: '1' }
+      const state = {
+        usersObject: {
+          1: user,
+        },
+        usersByNameObject: {
+          guy: user,
+        },
+      }
+      const name = 'Guy'
+      const expected = { screen_name: 'Guy', id: '1' }
+      expect(getters.findUserByName(state)(name)).to.eql(expected)
+    })
+
+    it('does not return user with matching id', () => {
+      const user = { screen_name: 'Guy', id: '1' }
+      const state = {
+        usersObject: {
+          1: user,
+        },
+        usersByNameObject: {
+          guy: user,
+        },
+      }
+      const id = '1'
+      expect(getters.findUserByName(state)(id)).to.be.undefined
+    })
+  })
+})
diff --git a/test/unit/specs/services/notification_utils/notification_utils.spec.js b/test/unit/specs/services/notification_utils/notification_utils.spec.js
index 09d39f704..20c9379c6 100644
--- a/test/unit/specs/services/notification_utils/notification_utils.spec.js
+++ b/test/unit/specs/services/notification_utils/notification_utils.spec.js
@@ -1,15 +1,13 @@
 import { createTestingPinia } from '@pinia/testing'
-import { setActivePinia } from 'pinia'
 
-import { useNotificationsStore } from 'src/stores/notifications.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 
 import * as NotificationUtils from 'src/services/notification_utils/notification_utils.js'
 
 describe('NotificationUtils', () => {
   beforeEach(() => {
-    setActivePinia(createTestingPinia())
-    useSyncConfigStore().mergedConfig = {
+    const store = useSyncConfigStore(createTestingPinia())
+    store.mergedConfig = {
       notificationVisibility: {
         likes: true,
         repeats: true,
@@ -18,26 +16,31 @@ describe('NotificationUtils', () => {
     }
   })
 
-  describe('filteredNotifications', () => {
+  describe('filteredNotificationsFromStore', () => {
     it('should return sorted notifications with configured types', () => {
-      useNotificationsStore().data = [
-        {
-          id: 1,
-          action: { id: '1' },
-          type: 'like',
+      const store = {
+        state: {
+          notifications: {
+            data: [
+              {
+                id: 1,
+                action: { id: '1' },
+                type: 'like',
+              },
+              {
+                id: 2,
+                action: { id: '2' },
+                type: 'mention',
+              },
+              {
+                id: 3,
+                action: { id: '3' },
+                type: 'repeat',
+              },
+            ],
+          },
         },
-        {
-          id: 2,
-          action: { id: '2' },
-          type: 'mention',
-        },
-        {
-          id: 3,
-          action: { id: '3' },
-          type: 'repeat',
-        },
-      ]
-
+      }
       const expected = [
         {
           action: { id: '3' },
@@ -51,7 +54,7 @@ describe('NotificationUtils', () => {
         },
       ]
       expect(
-        NotificationUtils.filteredNotifications({
+        NotificationUtils.filteredNotificationsFromStore(store, {
           mentions: false,
           likes: true,
           repeats: true,
@@ -60,21 +63,26 @@ describe('NotificationUtils', () => {
     })
   })
 
-  describe('unseenNotifications', () => {
+  describe('unseenNotificationsFromStore', () => {
     it('should return only notifications not marked as seen', () => {
-      useNotificationsStore().data = [
-        {
-          action: { id: '1' },
-          type: 'like',
-          seen: false,
+      const store = {
+        state: {
+          notifications: {
+            data: [
+              {
+                action: { id: '1' },
+                type: 'like',
+                seen: false,
+              },
+              {
+                action: { id: '2' },
+                type: 'mention',
+                seen: true,
+              },
+            ],
+          },
         },
-        {
-          action: { id: '2' },
-          type: 'mention',
-          seen: true,
-        },
-      ]
-
+      }
       const expected = [
         {
           action: { id: '1' },
@@ -83,7 +91,7 @@ describe('NotificationUtils', () => {
         },
       ]
       expect(
-        NotificationUtils.unseenNotifications({
+        NotificationUtils.unseenNotificationsFromStore(store, {
           likes: true,
           repeats: true,
           mentions: false,
diff --git a/test/unit/specs/services/style_setter/style_setter.spec.js b/test/unit/specs/services/style_setter/style_setter.spec.js
index ff8e11dce..c1bacdfa1 100644
--- a/test/unit/specs/services/style_setter/style_setter.spec.js
+++ b/test/unit/specs/services/style_setter/style_setter.spec.js
@@ -1,38 +1,4 @@
-import {
-  getResourcesIndex,
-  hasInvalidCachedThemeRules,
-} from 'src/services/style_setter/style_setter.js'
-
-describe('resource index', () => {
-  afterEach(() => {
-    vi.restoreAllMocks()
-    vi.unstubAllGlobals()
-  })
-
-  it('ignores an HTML fallback returned for a missing custom index', async () => {
-    vi.spyOn(console, 'warn').mockImplementation(() => undefined)
-    vi.stubGlobal(
-      'fetch',
-      vi
-        .fn()
-        .mockResolvedValueOnce(
-          new Response(JSON.stringify({ builtin: { version: 1 } }), {
-            headers: { 'Content-Type': 'application/json' },
-          }),
-        )
-        .mockResolvedValueOnce(
-          new Response('<!doctype html><title>Pleroma</title>', {
-            headers: { 'Content-Type': 'text/html' },
-          }),
-        ),
-    )
-
-    const resources = await getResourcesIndex('/static/styles.json')
-
-    expect(Object.keys(resources)).to.deep.equal(['builtin'])
-    expect(resources.builtin()).to.deep.equal({ version: 1 })
-  })
-})
+import { hasInvalidCachedThemeRules } from 'src/services/style_setter/style_setter.js'
 
 describe('style setter cache', () => {
   it('rejects cached rules containing serialized objects', () => {
diff --git a/test/unit/specs/stores/notifications.spec.js b/test/unit/specs/stores/notifications.spec.js
deleted file mode 100644
index ad8b6bf44..000000000
--- a/test/unit/specs/stores/notifications.spec.js
+++ /dev/null
@@ -1,390 +0,0 @@
-import { createTestingPinia } from '@pinia/testing'
-import { setActivePinia } from 'pinia'
-
-import { useI18nStore } from 'src/stores/i18n.js'
-import { useNotificationsStore } from 'src/stores/notifications.js'
-import { useReportsStore } from 'src/stores/reports.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
-import { useStreamingStore } from 'src/stores/streaming.js'
-import { useUsersStore } from 'src/stores/users.js'
-
-import * as USER_API from 'src/api/user.js'
-
-const userId = '1'
-const userScreenName = 'user'
-const userName = 'Guy'
-const userUrl = 'http://localhost/user'
-
-const mockMastoAPIUser = ({
-  screen_name = userScreenName,
-  name = userName,
-  url = userUrl,
-  id = userId,
-} = {}) => ({
-  id,
-  acct: screen_name,
-  display_name: name,
-  fields: [],
-  avatar: '',
-  url,
-  pleroma: {
-    emoji_reactions: [],
-  },
-})
-
-const mockUser = ({
-  screen_name = userScreenName,
-  id = userId,
-  name = userName,
-  url = userUrl,
-} = {}) => ({
-  _original: mockMastoAPIUser({
-    screen_name,
-    id,
-    name,
-    url,
-  }),
-  id,
-  name,
-  screen_name,
-  url,
-  relationship: undefined,
-})
-
-const mockStatus = ({
-  id = '1',
-  text,
-  summary,
-  type = 'status',
-  statusUser = mockUser(),
-} = {}) => ({
-  id,
-  user: statusUser,
-  summary: summary ?? `Summary number ${id}`,
-  name: 'status',
-  text: text ?? `Text number ${id}`,
-  uri: '',
-  type,
-  attentions: [],
-  statusnet_conversation_id: 'c1',
-  emoji_reactions: [],
-})
-
-const mockStatusNotification = ({
-  id = '1',
-  type = 'like',
-  status = mockStatus({ id }),
-  seen = false,
-  user = mockUser(),
-} = {}) => ({
-  type,
-  id,
-  status,
-  seen,
-  user,
-  from_profile: user,
-})
-
-describe('Notifications store', () => {
-  beforeEach(() => {
-    vi.useFakeTimers()
-    setActivePinia(createTestingPinia({ stubActions: false }))
-    useI18nStore().i18n = {
-      t: () => {
-        /* no-op */
-      },
-    }
-  })
-
-  afterEach(() => {
-    vi.useRealTimers()
-  })
-
-  it('activate', () => {
-    const store = useNotificationsStore()
-    const sub = vi.fn()
-    useStreamingStore().addSubscriber = sub
-
-    store.activate()
-
-    expect(sub).to.have.been.called
-    expect(store.fetcher).to.not.be.null
-    expect(store.socket).to.not.be.null
-
-    store.deactivate()
-  })
-
-  it('deactivate', () => {
-    const store = useNotificationsStore()
-    const unsub = vi.fn()
-    useStreamingStore().removeSubscriber = unsub
-
-    store.activate()
-    // Checking so that they were set properly before
-    // since reset changes them to ''
-    store.maxId = '2'
-    store.minId = '1'
-    store.idStore = new Map()
-    store.idStore.set('1', {})
-    store.idStore.set('2', {})
-    store.deactivate()
-
-    expect(unsub).to.have.been.called
-    expect(store.fetcher).to.be.null
-    expect(store.socket).to.be.null
-    expect(store.idStore).to.have.length(0)
-    expect(store).to.have.property('maxId', '')
-    expect(store).to.have.property('minId', '')
-  })
-
-  it('updateExtremes should update min and max ids', () => {
-    const store = useNotificationsStore()
-    store.maxId = '10'
-    store.minId = '05'
-
-    store.updateExtremes('04')
-    store.updateExtremes('11')
-
-    expect(store).to.have.property('maxId', '11')
-    expect(store).to.have.property('minId', '04')
-  })
-
-  describe('addNewNotifications', () => {
-    it('adds notifications to the list', () => {
-      const store = useNotificationsStore()
-
-      store.addNewNotifications({
-        timestamp: 1,
-        data: [
-          mockStatusNotification({ id: 'a' }),
-          mockStatusNotification({ id: 'b' }),
-        ],
-      })
-
-      // must be ordered
-      expect(store.data.map(({ id }) => id)).to.eql(['a', 'b'])
-      expect(store.idStore).to.have.keys(['a', 'b'])
-      expect(store).to.have.property('maxId', 'b')
-      expect(store).to.have.property('minId', 'a')
-    })
-
-    it('ignores duplicates', () => {
-      const store = useNotificationsStore()
-
-      store.addNewNotifications({
-        timestamp: 1,
-        data: [
-          mockStatusNotification({ id: '2' }),
-          mockStatusNotification({ id: '1' }),
-        ],
-      })
-
-      store.addNewNotifications({
-        timestamp: 1,
-        data: [
-          mockStatusNotification({ id: '3' }),
-          mockStatusNotification({ id: '2' }),
-        ],
-      })
-
-      // must be ordered
-      expect(store.data.map(({ id }) => id)).to.eql(['3', '2', '1'])
-      expect(store.idStore).to.have.keys(['1', '2', '3'])
-      expect(store).to.have.property('maxId', '3')
-      expect(store).to.have.property('minId', '1')
-    })
-
-    it('appends notifications if fetching older', () => {
-      const store = useNotificationsStore()
-
-      store.addNewNotifications({
-        timestamp: 1,
-        data: [
-          mockStatusNotification({ id: '4' }),
-          mockStatusNotification({ id: '3' }),
-        ],
-      })
-
-      store.addNewNotifications(
-        {
-          timestamp: 1,
-          data: [
-            mockStatusNotification({ id: '2' }),
-            mockStatusNotification({ id: '1' }),
-          ],
-        },
-        true,
-      )
-
-      // must be ordered
-      expect(store.data.map(({ id }) => id)).to.eql(['4', '3', '2', '1'])
-      expect(store.idStore).to.have.keys(['1', '2', '3', '4'])
-      expect(store).to.have.property('maxId', '4')
-      expect(store).to.have.property('minId', '1')
-    })
-
-    it('should update usersStore', () => {
-      const store = useNotificationsStore()
-      const mock = vi.spyOn(useUsersStore(), 'addNewUsers')
-      const mockedNotification = mockStatusNotification({ type: 'follow' })
-
-      store.addNewNotifications({
-        timestamp: 1337,
-        data: [mockedNotification],
-      })
-
-      expect(mock).to.have.been.called
-      expect(mock.mock.calls[0][0]).to.have.property('timestamp', 1337)
-      expect(mock.mock.calls[0][0].data[0]).to.eql(
-        mockedNotification.from_profile,
-      )
-    })
-
-    it('should update reportsStore', (notificationType) => {
-      const store = useNotificationsStore()
-      const mock = vi.spyOn(useReportsStore(), 'addReport')
-      const mockedNotification = mockStatusNotification({
-        type: 'pleroma:report',
-      })
-      mockedNotification.report = { data: '123' }
-
-      store.addNewNotifications({
-        timestamp: 1337,
-        data: [mockedNotification],
-      })
-
-      expect(mock).to.have.been.calledWith({ data: '123' })
-    })
-
-    it.each([
-      'like',
-      'mention',
-      'status',
-      'repeat',
-      'pleroma:emoji_reaction',
-      'poll',
-    ])('should update statusesStore on %s notification', (notificationType) => {
-      const store = useNotificationsStore()
-      const mock = vi.fn()
-      useStatusesStore().addNewStatuses = mock
-      const mockedNotification = mockStatusNotification({
-        type: notificationType,
-      })
-
-      store.addNewNotifications({
-        timestamp: 1337,
-        data: [mockedNotification],
-      })
-
-      expect(mock).to.have.been.called
-      expect(mock.mock.calls[0][0]).to.have.property('timestamp', 1337)
-      expect(mock.mock.calls[0][0].statuses[0]).to.eql(
-        mockedNotification.status,
-      )
-    })
-  })
-
-  describe('wipeStatuses', () => {
-    it('clears all statuses', () => {
-      const store = useNotificationsStore()
-
-      store.addNewNotifications({
-        timestamp: 1,
-        data: [
-          mockStatusNotification({
-            id: 'n2',
-            status: mockStatus({ id: 's2' }),
-          }),
-          mockStatusNotification({
-            id: 'n1',
-            status: mockStatus({ id: 's1' }),
-          }),
-        ],
-      })
-
-      store.wipeStatuses(['s2'])
-      expect(store.idStore).to.not.have.members('n2')
-      expect(store.data.map(({ id }) => id)).to.eql(['n1'])
-    })
-  })
-
-  describe('read/dismiss', () => {
-    it('read single', () => {
-      const mockFetch = vi.fn()
-      mockFetch.mockResolvedValueOnce(
-        new Response(JSON.stringify({ ok: 'ok' }), {
-          headers: { 'Content-Type': 'application/json' },
-        }),
-      )
-
-      vi.stubGlobal('fetch', mockFetch)
-
-      const store = useNotificationsStore()
-
-      store.addNewNotifications({
-        timestamp: 1337,
-        data: [
-          mockStatusNotification({ id: 'n3' }),
-          mockStatusNotification({ id: 'n2' }),
-          mockStatusNotification({ id: 'n1' }),
-        ],
-      })
-
-      expect(store.data[1]).to.have.property('seen', false)
-
-      store.markSingleNotificationAsSeen('n2')
-
-      expect(store.data[0]).to.have.property('seen', false)
-      expect(store.data[1]).to.have.property('seen', true)
-      expect(store.data[0]).to.have.property('seen', false)
-
-      const calls = mockFetch.mock.calls
-      expect(calls).to.have.length(1)
-      const callOne = calls[0]
-      expect(callOne[0]).to.eql(USER_API.NOTIFICATION_READ_URL)
-      const formData = Object.fromEntries(callOne[1].body.entries())
-      expect(formData).to.eql({ id: 'n2' })
-    })
-
-    it('read all', () => {
-      const mockFetch = vi.fn()
-      mockFetch.mockResolvedValueOnce(
-        new Response(JSON.stringify({ ok: 'ok' }), {
-          headers: { 'Content-Type': 'application/json' },
-        }),
-      )
-
-      vi.stubGlobal('fetch', mockFetch)
-
-      const store = useNotificationsStore()
-
-      // FormData is weird to test
-      store.addNewNotifications({
-        timestamp: 1337,
-        data: [
-          mockStatusNotification({ id: 'n3' }),
-          mockStatusNotification({ id: 'n2' }),
-          mockStatusNotification({ id: 'n1' }),
-        ],
-      })
-
-      expect(store.data[0]).to.have.property('seen', false)
-      expect(store.data[1]).to.have.property('seen', false)
-      expect(store.data[2]).to.have.property('seen', false)
-
-      store.markNotificationsAsSeen()
-
-      expect(store.data[0]).to.have.property('seen', true)
-      expect(store.data[1]).to.have.property('seen', true)
-      expect(store.data[2]).to.have.property('seen', true)
-
-      // FormData is weird to test
-      const calls = mockFetch.mock.calls
-      expect(calls).to.have.length(1)
-      const callOne = calls[0]
-      expect(callOne[0]).to.eql(USER_API.NOTIFICATION_READ_URL)
-      const formData = Object.fromEntries(callOne[1].body.entries())
-      expect(formData).to.eql({ max_id: 'n3' })
-    })
-  })
-})
diff --git a/test/unit/specs/stores/statuses.spec.js b/test/unit/specs/stores/statuses.spec.js
deleted file mode 100644
index 9be47145c..000000000
--- a/test/unit/specs/stores/statuses.spec.js
+++ /dev/null
@@ -1,634 +0,0 @@
-import { createTestingPinia } from '@pinia/testing'
-import { snakeCase } from 'lodash'
-import { setActivePinia } from 'pinia'
-
-import { useStatusesStore } from 'src/stores/statuses.js'
-import { useStreamingStore } from 'src/stores/streaming.js'
-import { useUsersStore } from 'src/stores/users.js'
-
-import * as PUBLIC_API from 'src/api/public.js'
-import * as USER_API from 'src/api/user.js'
-
-const userId = '1'
-const userScreenName = 'user'
-const userName = 'Guy'
-const userUrl = 'http://localhost/user'
-
-const mockMastoAPIUser = ({
-  screen_name = userScreenName,
-  name = userName,
-  url = userUrl,
-  id = userId,
-} = {}) => ({
-  id,
-  acct: screen_name,
-  display_name: name,
-  fields: [],
-  avatar: '',
-  url,
-  pleroma: {
-    emoji_reactions: [],
-  },
-})
-
-const mockUser = ({
-  screen_name = userScreenName,
-  id = userId,
-  name = userName,
-  url = userUrl,
-} = {}) => ({
-  _original: mockMastoAPIUser({
-    screen_name,
-    id,
-    name,
-    url,
-  }),
-  id,
-  name,
-  screen_name,
-  url,
-  relationship: undefined,
-})
-
-const mockStatus = ({
-  id = '1',
-  text,
-  type = 'status',
-  statusUser = mockUser(),
-} = {}) => ({
-  id,
-  user: statusUser,
-  name: 'status',
-  text: text ?? `Text number ${id}`,
-  uri: '',
-  type,
-  attentions: [],
-  statusnet_conversation_id: 'c1',
-  emoji_reactions: [],
-})
-
-const mockMastoAPIStatus = ({
-  id = '1',
-  text,
-  type = 'status',
-  statusUser = mockMastoAPIUser(),
-} = {}) => ({
-  id,
-  account: statusUser,
-  name: 'status',
-  content: text ?? `Text number ${id}`,
-  uri: '',
-  type,
-  attentions: [],
-  statusnet_conversation_id: 'c1',
-})
-
-const DEFAULT_OPTIONS = (method = 'GET') => ({
-  method,
-  credentials: 'same-origin',
-  headers: {
-    Accept: 'application/json',
-    'Content-Type': 'application/json',
-  },
-})
-
-describe('Statuses store', () => {
-  beforeEach(() => {
-    setActivePinia(createTestingPinia({ stubActions: false }))
-  })
-
-  it('init', () => {
-    const store = useStatusesStore()
-    const sub = vi.fn()
-    useStreamingStore().addSubscriber = sub
-
-    store.attachSocket()
-
-    expect(store.socket).to.not.be.null
-    expect(sub).to.have.been.called
-  })
-
-  it('resetStatuses', () => {
-    const store = useStatusesStore()
-    const statuses = [...new Array(20)].map((empty, index) =>
-      mockStatus({
-        id: 's' + index,
-        statusUser: mockUser({ id: 'u' + index }),
-      }),
-    )
-
-    store.attachSocket()
-    store.addNewStatuses({
-      statuses,
-      timestamp: 1,
-    })
-    store.resetStatuses()
-    expect(store.allStatuses).to.have.length(0)
-  })
-
-  describe('addNewStatuses', () => {
-    beforeEach(() => {
-      const usersStore = useUsersStore()
-      usersStore.addNewUsers = vi.fn().mockReturnValue([mockUser()])
-    })
-
-    it('adds the status to allStatuses', () => {
-      const store = useStatusesStore()
-      const usersStore = useUsersStore()
-      const status = mockStatus({ id: '1' })
-
-      store.addNewStatuses({
-        statuses: [status],
-        timestamp: 1,
-      })
-
-      expect(store.allStatuses).to.eql(new Map([['1', status]]))
-      expect(store.conversations).to.eql(new Map([['c1', new Set(['1'])]]))
-      expect(usersStore.addNewUsers).to.have.callCount(1)
-    })
-
-    it('splits retweets from their status and links them', () => {
-      const store = useStatusesStore()
-      const usersStore = useUsersStore()
-      const status = mockStatus({ id: '1' })
-      const retweet = mockStatus({
-        id: '2',
-        type: 'retweet',
-        user: mockUser({ id: '2' }),
-      })
-      retweet.type = 'retweet'
-      retweet.retweeted_status = status
-
-      store.addNewStatuses({
-        statuses: [retweet],
-        timestamp: 1,
-      })
-
-      expect(store.allStatuses).to.eql(
-        new Map([
-          ['1', status],
-          ['2', retweet],
-        ]),
-      )
-      expect(usersStore.addNewUsers).to.have.callCount(2)
-    })
-
-    it('splits quotes from their status and links them', () => {
-      const store = useStatusesStore()
-      const usersStore = useUsersStore()
-      const status = mockStatus({ id: '1' })
-      const quote = mockStatus({ id: '2' })
-      quote.quote = status
-
-      store.addNewStatuses({
-        statuses: [quote],
-        timestamp: 1,
-      })
-
-      expect(store.allStatuses).to.eql(
-        new Map([
-          ['1', status],
-          ['2', quote],
-        ]),
-      )
-      expect(usersStore.addNewUsers).to.have.callCount(2)
-    })
-
-    it('replaces existing statuses with the same id', () => {
-      const store = useStatusesStore()
-      const usersStore = useUsersStore()
-      const status = mockStatus({ id: '1' })
-      const modStatus = mockStatus({ id: '1', text: 'something else' })
-
-      store.addNewStatuses({
-        statuses: [status],
-        timestamp: 1991,
-      })
-      expect(store.allStatuses).to.eql(new Map([['1', status]]))
-
-      store.addNewStatuses({
-        statuses: [modStatus],
-        timestamp: 2000,
-      })
-      expect(store.allStatuses).to.eql(new Map([['1', modStatus]]))
-      expect(usersStore.addNewUsers).to.have.callCount(2)
-    })
-
-    it('handles edits', () => {
-      const store = useStatusesStore()
-      const usersStore = useUsersStore()
-      const status = mockStatus({ id: '1' })
-      const modStatus = mockStatus({
-        id: '1',
-        text: 'something else',
-        type: 'edit',
-      })
-
-      store.addNewStatuses({
-        statuses: [status],
-        timestamp: 1991,
-      })
-      expect(store.allStatuses).to.eql(new Map([['1', status]]))
-
-      store.addNewStatuses({
-        statuses: [modStatus],
-        timestamp: 2000,
-      })
-      expect(store.allStatuses).to.eql(new Map([['1', modStatus]]))
-      expect(usersStore.addNewUsers).to.have.callCount(2)
-    })
-
-    it('ignores updates with older timestamp', () => {
-      const store = useStatusesStore()
-      const usersStore = useUsersStore()
-      const status = mockStatus({ id: '1' })
-      const modStatus = mockStatus({ id: '1', text: 'something else' })
-
-      store.addNewStatuses({
-        statuses: [status],
-        timestamp: 2000,
-      })
-      expect(store.allStatuses).to.eql(new Map([['1', status]]))
-
-      store.addNewStatuses({
-        statuses: [modStatus],
-        timestamp: 1991,
-      })
-      expect(store.allStatuses).to.eql(new Map([['1', status]]))
-      expect(usersStore.addNewUsers).to.have.callCount(2)
-    })
-
-    it('calls useUsersStore().addNewUsers() even on older timestamp', () => {
-      const store = useStatusesStore()
-      const usersStore = useUsersStore()
-      const status = mockStatus({ id: '1' })
-      const modStatus = mockStatus({ id: '1', text: 'something else' })
-
-      store.addNewStatuses({
-        statuses: [status],
-        timestamp: 2000,
-      })
-      store.addNewStatuses({
-        statuses: [modStatus],
-        timestamp: 1991,
-      })
-      expect(usersStore.addNewUsers).to.have.callCount(2)
-    })
-  })
-
-  describe('fetchers', () => {
-    it.each([
-      [
-        'StatusSource',
-        {
-          content_type: 'text/plain',
-          text: 'Text',
-          spoiler_text: 'Text',
-        },
-      ],
-      [
-        'EmojiReactions',
-        [
-          {
-            accounts: [mockMastoAPIUser()],
-            count: 1,
-            me: false,
-            name: 'cofe',
-            url: '',
-          },
-        ],
-      ],
-      ['Favs', [mockMastoAPIUser()]],
-      ['Repeats', [mockMastoAPIUser()]],
-    ])('fetch%s', async (group, mockedResponse) => {
-      const mockFetch = vi.fn()
-      mockFetch.mockResolvedValueOnce(
-        new Response(JSON.stringify(mockedResponse), {
-          headers: { 'Content-Type': 'application/json' },
-        }),
-      )
-
-      vi.stubGlobal('fetch', mockFetch)
-
-      let urlKey
-      let prefix = 'MASTODON'
-      if (group === 'Favs') {
-        urlKey = 'STATUS_FAVORITEDBY'
-      } else if (group === 'Repeats') {
-        urlKey = 'STATUS_REBLOGGEDBY'
-      } else {
-        urlKey = snakeCase(group).toUpperCase()
-      }
-      if (group === 'EmojiReactions') {
-        prefix = 'PLEROMA'
-      }
-
-      const url = PUBLIC_API[`${prefix}_${urlKey}_URL`]('id')
-
-      const store = useStatusesStore()
-      const status = mockStatus({ id: 'id' })
-      store.addNewStatuses({
-        statuses: [status],
-        timestamp: 2000,
-      })
-
-      const result = await store[`fetch${group}`]('id')
-      const updated = store.allStatuses.get('id')
-
-      expect(mockFetch).to.have.been.calledWith(url, DEFAULT_OPTIONS())
-      if (group === 'Favs') {
-        expect(updated.favoritedBy).to.have.length(1)
-        expect(updated.fave_num).to.eql(1)
-      } else if (group === 'Repeats') {
-        expect(updated.rebloggedBy).to.have.length(1)
-        expect(updated.repeat_num).to.eql(1)
-      } else if (group === 'EmojiReactions') {
-        expect(updated.emoji_reactions).to.have.length(mockedResponse.length)
-        expect(updated.emoji_reactions[0].name).to.eql(mockedResponse[0].name)
-      } else {
-        expect(result).to.eql(mockedResponse)
-      }
-    })
-
-    it('fetchFavsAndRepeats', async () => {
-      const store = useStatusesStore()
-      store.fetchFavs = vi.fn().mockResolvedValue(async () => {
-        /* no-op */
-      })
-      store.fetchRepeats = vi.fn().mockResolvedValue(async () => {
-        /* no-op */
-      })
-
-      await store.fetchFavsAndRepeats('id')
-      expect(store.fetchFavs).to.have.been.calledWith('id')
-      expect(store.fetchRepeats).to.have.been.calledWith('id')
-    })
-
-    it('fetchStatus', async () => {
-      const mockFetch = vi.fn()
-      mockFetch.mockResolvedValueOnce(
-        new Response(JSON.stringify(mockMastoAPIStatus()), {
-          headers: { 'Content-Type': 'application/json' },
-        }),
-      )
-
-      vi.stubGlobal('fetch', mockFetch)
-
-      const store = useStatusesStore()
-      await store.fetchStatus('id')
-
-      expect(mockFetch).to.have.been.calledWith(
-        PUBLIC_API.MASTODON_STATUS_URL('id'),
-        DEFAULT_OPTIONS(),
-      )
-      expect(store.allStatuses).to.have.length(1)
-    })
-  })
-
-  describe('interactions', () => {
-    it.each([
-      ['favorite', 'MASTODON_FAVORITE_URL'],
-      ['unfavorite', 'MASTODON_UNFAVORITE_URL'],
-      ['retweet', 'MASTODON_RETWEET_URL'],
-      ['unretweet', 'MASTODON_UNRETWEET_URL'],
-      ['reactWithEmoji', 'PLEROMA_EMOJI_REACT_URL', 'PUT'],
-      ['unreactWithEmoji', 'PLEROMA_EMOJI_UNREACT_URL', 'DELETE'],
-      [
-        'bookmark',
-        'MASTODON_BOOKMARK_STATUS_URL',
-        undefined,
-        { folder_id: 'argument' },
-      ],
-      ['unbookmark', 'MASTODON_UNBOOKMARK_STATUS_URL'],
-      ['pinStatus', 'MASTODON_PIN_OWN_STATUS_URL'],
-      ['unpinStatus', 'MASTODON_UNPIN_OWN_STATUS_URL'],
-      ['muteConversation', 'MASTODON_MUTE_CONVERSATION_URL'],
-      ['unmuteConversation', 'MASTODON_UNMUTE_CONVERSATION_URL'],
-      ['deleteStatus', 'MASTODON_DELETE_URL', 'DELETE'],
-    ])('%s - api call', async (interaction, urlKey, method = 'POST', body) => {
-      const url = USER_API[urlKey]('1', 'argument')
-
-      const status = mockStatus()
-      const store = useStatusesStore()
-      store.addNewStatuses({
-        statuses: [status],
-        timestamp: 1,
-      })
-
-      const mockFetch = vi.fn()
-      mockFetch.mockResolvedValueOnce(
-        new Response(JSON.stringify(mockMastoAPIStatus({ text: 'Updated' })), {
-          headers: { 'Content-Type': 'application/json' },
-        }),
-      )
-
-      vi.stubGlobal('fetch', mockFetch)
-      await store[interaction]('1', 'argument')
-      const expectedArg = DEFAULT_OPTIONS(method)
-
-      if (body) {
-        expectedArg.body = JSON.stringify(body)
-      }
-
-      expect(mockFetch).to.have.been.calledWith(url, expectedArg)
-      if (interaction === 'deleteStatus') {
-        expect(store.allStatuses.get('1').deleted).to.be.true
-      } else {
-        expect(store.allStatuses.get('1').text).to.eql('Updated')
-      }
-    })
-
-    const optimismInteractions = [
-      ['favorite', 'favorited', 'fave_num'],
-      ['retweet', 'repeated', 'repeat_num'],
-      ['bookmark', 'bookmarked'],
-      ['muteConversation', 'thread_muted'],
-    ]
-      .map(([method, property, count]) => [
-        [method, property, count],
-        ['un' + method, property, count],
-      ])
-      .flat()
-
-    it.each(
-      optimismInteractions,
-    )('%s - optimism call', async (method, property, count) => {
-      // Prepare our status
-      const status = mockStatus()
-      const negate = method.startsWith('un')
-      const oldCount = 9
-      const newCount = negate ? 8 : 10
-      status[property] = negate
-      if (count) {
-        status[count] = oldCount
-      }
-      if (method === 'unbookmark') {
-        status.bookmark_folder_id = 'argument'
-      }
-
-      // Insert it
-      const store = useStatusesStore()
-      store.addNewStatuses({
-        statuses: [status],
-        timestamp: 1,
-      })
-
-      const mockFetch = vi.fn()
-      mockFetch.mockResolvedValueOnce(
-        new Response(JSON.stringify(mockMastoAPIStatus({ text: 'Updated' })), {
-          headers: { 'Content-Type': 'application/json' },
-        }),
-      )
-
-      expect(store.allStatuses.get('1')).to.have.property(property, negate)
-      if (count) {
-        expect(store.allStatuses.get('1')).to.have.property(count, oldCount)
-      }
-      vi.stubGlobal('fetch', mockFetch)
-
-      store[method]('1', 'argument')
-      expect(store.allStatuses.get('1')).to.have.property(property, !negate)
-      if (count) {
-        expect(store.allStatuses.get('1')).to.have.property(count, newCount)
-      }
-      if (property === 'bookmarked') {
-        expect(store.allStatuses.get('1')).to.have.property(
-          'bookmark_folder_id',
-          'argument',
-        )
-      }
-    })
-
-    it.each(
-      optimismInteractions,
-    )('%s - optimism fail', async (method, property, count) => {
-      // Prepare our status
-      const status = mockStatus()
-      const negate = method.startsWith('un')
-      const oldCount = 9
-      status[property] = negate
-      if (count) {
-        status[count] = oldCount
-      }
-      if (method === 'unbookmark') {
-        status.bookmark_folder_id = 'argument'
-      }
-
-      // Insert it
-      const store = useStatusesStore()
-      store.addNewStatuses({
-        statuses: [status],
-        timestamp: 1,
-      })
-
-      const mockFetch = vi.fn()
-      mockFetch.mockRejectedValueOnce(new Error('Failure!'))
-
-      expect(store.allStatuses.get('1')).to.have.property(property, negate)
-      if (count) {
-        expect(store.allStatuses.get('1')).to.have.property(count, oldCount)
-      }
-      vi.stubGlobal('fetch', mockFetch)
-
-      await store[method]('1', 'argument')
-      expect(store.allStatuses.get('1')).to.have.property(property, negate)
-      if (count) {
-        expect(store.allStatuses.get('1')).to.have.property(count, oldCount)
-      }
-
-      // Failing 'bookmark' method SHOULD clear folder id
-      if (method === 'unbookmark') {
-        expect(store.allStatuses.get('1')).to.have.property(
-          'bookmark_folder_id',
-          'argument',
-        )
-      }
-    })
-
-    it.each([
-      ['reactWithEmoji', 0],
-      ['unreactWithEmoji', 1],
-      ['reactWithEmoji', 1],
-      ['unreactWithEmoji', 2],
-    ])('%s count: %s - optimism call', async (method, oldCount) => {
-      // Prepare our status
-      const status = mockStatus()
-      const negate = method.startsWith('un')
-      const newCount = negate ? oldCount - 1 : oldCount + 1
-
-      useUsersStore().currentUser = mockUser()
-
-      if (oldCount > 0) {
-        const reactors = [...new Array(oldCount)].map((empty, index) =>
-          mockUser({ id: 'o' + index }),
-        )
-        if (negate) {
-          // Replace one of reactors with ourselves
-          reactors[0] = useUsersStore().currentUser
-        }
-        status.emoji_reactions = [
-          {
-            name: 'hyperlol',
-            count: oldCount,
-            accounts: reactors,
-          },
-        ]
-      } else {
-        status.emoji_reactions = []
-      }
-
-      // Insert it
-      const store = useStatusesStore()
-      store.addNewStatuses({
-        statuses: [status],
-        timestamp: 1,
-      })
-
-      const mockFetch = vi.fn()
-      mockFetch.mockResolvedValueOnce(
-        new Response(JSON.stringify(mockMastoAPIStatus({ text: 'Updated' })), {
-          headers: { 'Content-Type': 'application/json' },
-        }),
-      )
-
-      vi.stubGlobal('fetch', mockFetch)
-      const expected = store.allStatuses.get('1')
-
-      expect(expected.emoji_reactions).to.have.length(oldCount === 0 ? 0 : 1)
-      if (oldCount !== 0) {
-        expect(expected.emoji_reactions[0].name).to.eql('hyperlol')
-        expect(expected.emoji_reactions[0].count).to.eql(oldCount)
-        expect(expected.emoji_reactions[0].accounts).to.have.length(oldCount)
-      }
-
-      store[method]('1', 'hyperlol')
-
-      expect(expected.emoji_reactions).to.have.length(newCount === 0 ? 0 : 1)
-      if (newCount !== 0) {
-        expect(expected.emoji_reactions[0].name).to.eql('hyperlol')
-        expect(expected.emoji_reactions[0].count).to.eql(newCount)
-        expect(expected.emoji_reactions[0].accounts).to.have.length(newCount)
-      }
-    })
-  })
-
-  it('wipeUserStatuses', () => {
-    const store = useStatusesStore()
-    const statuses = [...new Array(20)].map((empty, index) =>
-      mockStatus({
-        id: 's' + index,
-        statusUser: mockUser({ id: 'u' + index }),
-      }),
-    )
-
-    store.addNewStatuses({
-      statuses,
-      timestamp: 1,
-    })
-
-    const result = store.wipeUserStatuses('u19')
-
-    expect(store.allStatuses).to.have.length(19)
-    expect(result).to.eql(new Set(['s19']))
-  })
-})
diff --git a/test/unit/specs/stores/timelines.spec.js b/test/unit/specs/stores/timelines.spec.js
deleted file mode 100644
index f810c029d..000000000
--- a/test/unit/specs/stores/timelines.spec.js
+++ /dev/null
@@ -1,304 +0,0 @@
-import { createTestingPinia } from '@pinia/testing'
-import { setActivePinia } from 'pinia'
-
-import { useStreamingStore } from 'src/stores/streaming.js'
-import { useTimelinesStore } from 'src/stores/timelines.js'
-
-describe('Timelines store', () => {
-  beforeEach(() => {
-    vi.useFakeTimers()
-    setActivePinia(createTestingPinia({ stubActions: false }))
-  })
-
-  afterEach(() => {
-    useTimelinesStore().deactivateAll()
-    vi.useRealTimers()
-  })
-
-  describe('activate', () => {
-    it('streamable', () => {
-      const store = useTimelinesStore()
-      const sub = vi.fn()
-      useStreamingStore().addSubscriber = sub
-
-      console.log(store.activate)
-      store.activate('friends', undefined, true)
-
-      expect(sub).to.have.been.called
-      expect(store.friends.fetcher).to.not.be.null
-      expect(store.friends.socket).to.not.be.null
-    })
-
-    it('non-streamable', () => {
-      const store = useTimelinesStore()
-      const sub = vi.fn()
-      useStreamingStore().addSubscriber = sub
-
-      console.log(store.activate)
-      store.activate('user', '1')
-
-      expect(sub).to.not.have.been.called
-      expect(store.user.fetcher).to.not.be.null
-      expect(store.user.socket).to.be.null
-    })
-  })
-
-  describe('deactivate', () => {
-    it('streamable', () => {
-      const store = useTimelinesStore()
-      const unsub = vi.fn()
-      useStreamingStore().removeSubscriber = unsub
-      useStreamingStore().addSubscriber = vi.fn()
-
-      store.activate('friends', undefined, true)
-      // Checking so that they were set properly before
-      // since reset changes them to ''
-      store.friends.maxId = '3'
-      store.friends.minId = '4'
-      store.friends.statusIds = new Set(['3', '4'])
-      store.friends.visibleStausIds = new Set(['3', '4'])
-      store.deactivate('friends', true)
-
-      expect(unsub).to.have.been.called
-      expect(store.friends.fetcher).to.be.null
-      expect(store.friends.socket).to.be.null
-      expect(store.friends.statusIds).to.have.length(0)
-      expect(store.friends.visibleStatusIds).to.have.length(0)
-      expect(store.friends).to.have.property('maxId', '')
-      expect(store.friends).to.have.property('minId', '')
-    })
-
-    it('non-streamable', () => {
-      const store = useTimelinesStore()
-      const unsub = vi.fn()
-      useStreamingStore().removeSubscriber = unsub
-      useStreamingStore().addSubscriber = vi.fn()
-
-      store.activate('user', '1')
-      // Checking so that they were set properly before
-      // since reset changes them to ''
-      store.user.maxId = '3'
-      store.user.minId = '4'
-      store.user.statusIds = new Set(['3', '4'])
-      store.user.visibleStausIds = new Set(['3', '4'])
-      store.deactivate('user')
-
-      expect(unsub).to.not.have.been.called
-      expect(store.user.fetcher).to.be.null
-      expect(store.user.socket).to.be.null
-      expect(store.user.statusIds).to.have.length(0)
-      expect(store.user.visibleStatusIds).to.have.length(0)
-      expect(store.user).to.have.property('maxId', '')
-      expect(store.user).to.have.property('minId', '')
-    })
-  })
-
-  describe('updateTimelineExtremes', () => {
-    it('should derive extremes from data', () => {
-      const store = useTimelinesStore()
-      const timeline = useTimelinesStore().friends
-      timeline.order = ['4', '1', '3', '2']
-      timeline.statusesIds = new Set(timeline.order)
-      store.updateTimelineExtremes(timeline)
-
-      expect(store.friends).to.have.property('maxId', '4')
-      expect(store.friends).to.have.property('minId', '2')
-    })
-
-    it('should use extremes from pagination', () => {
-      const store = useTimelinesStore()
-      const timeline = useTimelinesStore().friends
-      store.updateTimelineExtremes(timeline, { maxId: '1', minId: '2' })
-
-      // Min and max are swapped!
-      expect(store.friends).to.have.property('maxId', '2')
-      expect(store.friends).to.have.property('minId', '1')
-    })
-  })
-
-  describe('addStatusesToTimeline', () => {
-    it('adds the status to the given timeline', () => {
-      const store = useTimelinesStore()
-      const statuses = ['1', '2', '3']
-
-      store.activate('list', '1')
-      store.addStatusesToTimeline('list', '1', {
-        statuses,
-        pagination: { minId: '1', maxId: '3' },
-      })
-
-      expect(store.list.order).to.eql(statuses)
-      expect(store.list.statusIds).to.eql(new Set(statuses))
-      expect(store.list.visibleStatusIds).to.eql(new Set())
-      expect(store.list.newStatusCount).to.equal(3)
-      expect(store.list).to.have.property('maxId', '1')
-      expect(store.list).to.have.property('minId', '3')
-    })
-
-    it('ignores duplicates', () => {
-      const store = useTimelinesStore()
-      const statuses = ['1', '2', '3']
-
-      store.activate('list', '1')
-      store.addStatusesToTimeline('list', '1', {
-        statuses,
-        pagination: { minId: '1', maxId: '3' },
-      })
-      store.addStatusesToTimeline('list', '1', {
-        statuses,
-        pagination: { minId: '1', maxId: '3' },
-      })
-
-      expect(store.list.order).to.eql(statuses)
-      expect(store.list.statusIds).to.eql(new Set(statuses))
-      expect(store.list.visibleStatusIds).to.eql(new Set())
-      expect(store.list.newStatusCount).to.equal(3)
-      expect(store.list).to.have.property('maxId', '1')
-      expect(store.list).to.have.property('minId', '3')
-    })
-
-    it('adds the status the given timeline, directly visible', () => {
-      const store = useTimelinesStore()
-      const statuses = ['1', '2', '3']
-
-      store.activate('list', '1')
-      store.addStatusesToTimeline('list', '1', {
-        statuses,
-        showImmediately: true,
-        pagination: { minId: '1', maxId: '3' },
-      })
-
-      expect(store.list.order).to.eql(statuses)
-      expect(store.list.statusIds).to.eql(new Set(statuses))
-      expect(store.list.visibleStatusIds).to.eql(new Set(statuses))
-      expect(store.list.newStatusCount).to.equal(0)
-      expect(store.list).to.have.property('maxId', '1')
-      expect(store.list).to.have.property('minId', '3')
-    })
-
-    it('does not update the maxId when the noIdUpdate flag is set', () => {
-      const store = useTimelinesStore()
-      const statuses = ['1', '2', '3']
-
-      store.activate('list', '1')
-      store.addStatusesToTimeline('list', '1', {
-        statuses,
-        noIdUpdate: true,
-        pagination: { minId: '1', maxId: '3' },
-      })
-
-      expect(store.list.order).to.eql(statuses)
-      expect(store.list.statusIds).to.eql(new Set(statuses))
-      expect(store.list.visibleStatusIds).to.eql(new Set())
-      expect(store.list.newStatusCount).to.equal(3)
-      expect(store.list).to.have.property('maxId', '')
-      expect(store.list).to.have.property('minId', '')
-    })
-
-    it('does not update timeline if it belongs to a different arugment', () => {
-      const store = useTimelinesStore()
-      const statuses = ['1', '2', '3']
-
-      store.activate('list', '1')
-      store.addStatusesToTimeline('list', '2', {
-        statuses,
-        noIdUpdate: true,
-        pagination: { minId: '1', maxId: '3' },
-      })
-
-      expect(store.list.order).to.eql([])
-      expect(store.list.statusIds).to.eql(new Set())
-      expect(store.list.visibleStatusIds).to.eql(new Set())
-      expect(store.list.newStatusCount).to.equal(0)
-      expect(store.list).to.have.property('maxId', '')
-      expect(store.list).to.have.property('minId', '')
-    })
-
-    it('prepends timeline with new statuses', () => {
-      const store = useTimelinesStore()
-      const statuses1 = ['3', '2', '1']
-      const statuses2 = ['6', '5', '4']
-
-      store.activate('list', '1')
-      store.addStatusesToTimeline('list', '1', {
-        statuses: statuses1,
-        pagination: { minId: '3', maxId: '1' },
-      })
-      store.addStatusesToTimeline('list', '1', {
-        statuses: statuses2,
-        pagination: { minId: '6', maxId: '4' },
-      })
-
-      const newOrder = [...statuses2, ...statuses1]
-      expect(store.list.order).to.eql(newOrder)
-      expect(store.list.statusIds).to.eql(new Set(newOrder))
-      expect(store.list.visibleStatusIds).to.eql(new Set())
-      expect(store.list.newStatusCount).to.equal(6)
-      expect(store.list).to.have.property('maxId', '6')
-      expect(store.list).to.have.property('minId', '1')
-    })
-
-    it('appends timeline with new statuses if fetching older', () => {
-      const store = useTimelinesStore()
-      const statuses1 = ['6', '5', '4']
-      const statuses2 = ['3', '2', '1']
-
-      store.activate('list', '1')
-      store.addStatusesToTimeline('list', '1', {
-        statuses: statuses1,
-        pagination: { minId: '6', maxId: '4' },
-      })
-      store.addStatusesToTimeline('list', '1', {
-        statuses: statuses2,
-        pagination: { minId: '3', maxId: '1' },
-        older: true,
-      })
-
-      const newOrder = [...statuses1, ...statuses2]
-      expect(store.list.order).to.eql(newOrder)
-      expect(store.list.statusIds).to.eql(new Set(newOrder))
-      expect(store.list.visibleStatusIds).to.eql(new Set())
-      expect(store.list.newStatusCount).to.equal(6)
-      expect(store.list).to.have.property('maxId', '6')
-      expect(store.list).to.have.property('minId', '1')
-    })
-  })
-
-  describe('showNewStatuses', () => {
-    it('resets counter and makes all ids visible', () => {
-      const store = useTimelinesStore()
-      const statuses = ['1', '2', '3']
-
-      store.activate('public')
-      store.addStatusesToTimeline('public', undefined, {
-        statuses,
-        pagination: { minId: '1', maxId: '3' },
-      })
-
-      expect(store.public.statusIds).to.eql(new Set(statuses))
-      expect(store.public.visibleStatusIds).to.eql(new Set())
-      expect(store.public.newStatusCount).to.equal(3)
-      store.showNewStatuses('public')
-      expect(store.public.visibleStatusIds).to.eql(new Set(statuses))
-      expect(store.public.newStatusCount).to.equal(0)
-    })
-  })
-
-  describe('wipeStatuses', () => {
-    it('clears all statuses', () => {
-      const store = useTimelinesStore()
-
-      store.activate('friends')
-      store.activate('public')
-      store.addStatusesToTimeline('public', undefined, {
-        statuses: ['1', '2', '3', '0'],
-      })
-      store.addStatusesToTimeline('friends', undefined, {
-        statuses: ['5', '0', '9', '1'],
-      })
-      store.wipeStatuses(['0'])
-      expect(store.friends.statusIds).to.not.have.members('0')
-      expect(store.public.statusIds).to.not.have.members('0')
-    })
-  })
-})
diff --git a/test/unit/specs/stores/users.spec.js b/test/unit/specs/stores/users.spec.js
deleted file mode 100644
index e9e557960..000000000
--- a/test/unit/specs/stores/users.spec.js
+++ /dev/null
@@ -1,1257 +0,0 @@
-import { createTestingPinia } from '@pinia/testing'
-import { snakeCase } from 'lodash'
-import { setActivePinia } from 'pinia'
-
-import { useAnnouncementsStore } from 'src/stores/announcements.js'
-import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
-import { useChatsStore } from 'src/stores/chats.js'
-import { useEmojiStore } from 'src/stores/emoji.js'
-import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-import { useListsStore } from 'src/stores/lists.js'
-import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useNotificationsStore } from 'src/stores/notifications.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
-import { useStatusesStore } from 'src/stores/statuses.js'
-import { useStreamingStore } from 'src/stores/streaming.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { useTimelinesStore } from 'src/stores/timelines.js'
-import { useUserHighlightStore } from 'src/stores/user_highlight.js'
-import { useUsersStore } from 'src/stores/users.js'
-
-import * as PUBLIC_API from 'src/api/public.js'
-import * as USER_API from 'src/api/user.js'
-
-const DEFAULT_OPTIONS = (method = 'POST') => ({
-  method,
-  credentials: 'same-origin',
-  headers: {
-    Accept: 'application/json',
-    'Content-Type': 'application/json',
-  },
-})
-
-const actionKeys = (action) => {
-  const result = {}
-  if (action === 'removeUserFromFollowers') {
-    result.storeAction = action
-  } else {
-    result.storeAction = action + 'User'
-  }
-
-  result.apiUrl = `MASTODON_${snakeCase(result.storeAction).toUpperCase()}_URL`
-  return result
-}
-
-const userId = '1'
-const userScreenName = 'user'
-const userName = 'Guy'
-const userUrl = 'http://localhost/user'
-
-const mockMastoAPIUser = ({
-  screen_name = userScreenName,
-  name = userName,
-  url = userUrl,
-  id = userId,
-} = {}) => ({
-  id,
-  acct: screen_name,
-  display_name: name,
-  fields: [],
-  avatar: '',
-  url,
-})
-
-const mockUser = ({
-  screen_name = userScreenName,
-  id = userId,
-  name = userName,
-  url = userUrl,
-} = {}) => ({
-  _original: mockMastoAPIUser({
-    screen_name,
-    id,
-    name,
-    url,
-  }),
-  id,
-  name,
-  screen_name,
-  url,
-  relationship: undefined,
-})
-
-describe('Users store', () => {
-  beforeEach(() => {
-    setActivePinia(createTestingPinia({ stubActions: false }))
-  })
-
-  describe('addNewUsers', () => {
-    describe('users', () => {
-      it('adds new users to the set, merging in new information for old users', () => {
-        const store = useUsersStore()
-
-        const modUser = mockUser({ name: 'Dude' })
-
-        store.addNewUsers({ data: [mockUser()], timestamp: 1 })
-        expect(store.users).to.have.length(1)
-        expect(store.users).to.have.all.keys(userId)
-
-        store.addNewUsers({ data: [modUser], timestamp: 2 })
-        expect(store.users).to.have.length(1)
-        expect(store.users).to.have.all.keys(userId)
-        expect(store.users.get(userId).name).to.eql('Dude')
-      })
-
-      it('ignores new users if timestamp is older', () => {
-        const store = useUsersStore()
-
-        const modUser = mockUser({ name: 'Old guy' })
-
-        store.addNewUsers({ data: [mockUser()], timestamp: 2000 })
-        expect(store.users).to.have.length(1)
-        expect(store.users).to.have.all.keys(userId)
-        expect(store.users.get(userId).name).to.eql('Guy')
-
-        store.addNewUsers({ data: [modUser], timestamp: 1991 })
-        expect(store.users).to.have.length(1)
-        expect(store.users).to.have.all.keys(userId)
-        expect(store.users.get(userId).name).to.eql('Guy')
-      })
-
-      it('merging array field in new information for old users', () => {
-        const store = useUsersStore()
-
-        const userFields = {
-          ...mockUser(),
-          fields: [{ name: 'Label 1', value: 'Content 1' }],
-        }
-        const firstModUser = {
-          ...mockUser(),
-          fields: [
-            { name: 'Label 2', value: 'Content 2' },
-            { name: 'Label 3', value: 'Content 3' },
-          ],
-        }
-        const secondModUser = {
-          ...mockUser(),
-          fields: [{ name: 'Label 4', value: 'Content 4' }],
-        }
-
-        store.addNewUsers({ data: [userFields], timestamp: 1 })
-        const reactive = store.users.get(userId)
-        expect(reactive.fields).to.have.length(1)
-        expect(reactive.fields[0].name).to.eql('Label 1')
-
-        store.addNewUsers({ data: [firstModUser], timestamp: 2 })
-        expect(reactive.fields).to.have.length(2)
-        expect(reactive.fields[0].name).to.eql('Label 2')
-        expect(reactive.fields[1].name).to.eql('Label 3')
-
-        store.addNewUsers({ data: [secondModUser], timestamp: 3 })
-        expect(reactive.fields).to.have.length(1)
-        expect(reactive.fields[0].name).to.eql('Label 4')
-      })
-    })
-
-    describe('relationships', () => {
-      it('updates relationship information if present', () => {
-        const store = useUsersStore()
-
-        const modUser = {
-          ...mockUser(),
-          relationship: {
-            id: userId,
-            following: true,
-          },
-        }
-
-        store.addNewUsers({ data: [mockUser()], timestamp: 1 })
-        store.addNewUsers({ data: [modUser], timestamp: 2 })
-
-        expect(store.relationships).to.have.length(1)
-        expect(store.relationships).to.have.all.keys(userId)
-        expect(store.relationship(userId).following).to.eql(true)
-        expect(store.findUser(userId).relationship.following).to.eql(true)
-      })
-
-      it('updates relationship information if present even if user timestamp is older', () => {
-        const store = useUsersStore()
-
-        const modUser = {
-          ...mockUser({ name: 'Old Dude' }),
-          relationship: {
-            id: userId,
-            following: true,
-          },
-        }
-
-        store.addNewUsers({ data: [mockUser()], timestamp: 2000 })
-        store.addNewUsers({ data: [modUser], timestamp: 1991 })
-
-        expect(store.relationships).to.have.length(1)
-        expect(store.relationships).to.have.all.keys(userId)
-        expect(store.relationship(userId).following).to.eql(true)
-        expect(store.findUser(userId).relationship.following).to.eql(true)
-      })
-
-      it("doesn't erase relationship information if new data has it missing", () => {
-        const store = useUsersStore()
-
-        const modUser = mockUser({ name: 'Dude' })
-
-        store.addNewUsers({
-          data: [
-            { ...mockUser(), relationship: { id: userId, following: true } },
-          ],
-          timestamp: 1,
-        })
-        store.addNewUsers({ data: [modUser], timestamp: 2 })
-
-        expect(store.relationships).to.have.length(1)
-        expect(store.relationships).to.have.all.keys(userId)
-        expect(store.relationship(userId).following).to.eql(true)
-        expect(store.findUser(userId).relationship.following).to.eql(true)
-      })
-    })
-  })
-
-  describe('updateUserRelationships', () => {
-    it('updates existing user relationship', () => {
-      const store = useUsersStore()
-      const relationship = { id: userId, following: true }
-
-      store.addNewUsers({ data: [mockUser()], timestamp: 1 })
-      store.updateUserRelationships({ data: relationship, timestamp: 2 })
-
-      expect(store.relationship(userId)).to.eql({ id: userId, following: true })
-      expect(store.findUser(userId).relationship.following).to.eql(true)
-    })
-
-    it('stores relationship for missing user', () => {
-      const store = useUsersStore()
-      const relationship = { id: userId, following: true }
-
-      store.updateUserRelationships({ data: relationship, timestamp: 1 })
-
-      expect(store.relationship(userId)).to.eql({ id: userId, following: true })
-    })
-
-    it('assigns relationship for missing user when it becomes available', () => {
-      const store = useUsersStore()
-      const relationship = { id: userId, following: true }
-
-      store.updateUserRelationships({ data: relationship, timestamp: 1 })
-      store.addNewUsers({ data: [mockUser()], timestamp: 2 })
-
-      expect(store.relationship(userId)).to.eql({ id: userId, following: true })
-      expect(store.findUser(userId).relationship).to.eql({
-        id: userId,
-        following: true,
-      })
-    })
-
-    it('ignores relationship update if timestamp is older than existing', () => {
-      const store = useUsersStore()
-      const oldRelationship = { id: userId, following: true }
-      const newRelationship = { id: userId, following: false }
-
-      store.addNewUsers({
-        data: [{ ...mockUser(), relationship: newRelationship }],
-        timestamp: 2000,
-      })
-      store.updateUserRelationships({ data: oldRelationship, timestamp: 1991 })
-
-      expect(store.relationship(userId)).to.eql({
-        id: userId,
-        following: false,
-      })
-      expect(store.findUser(userId).relationship.following).to.eql(false)
-    })
-  })
-
-  describe('fetchers', () => {
-    describe('fetchUserIfMissing', () => {
-      it('should fetch requested user, add it to store and return it', async () => {
-        vi.stubGlobal(
-          'fetch',
-          vi.fn().mockResolvedValueOnce(
-            new Response(JSON.stringify(mockMastoAPIUser()), {
-              headers: { 'Content-Type': 'application/json' },
-            }),
-          ),
-        )
-
-        const expected = mockUser()
-        const store = useUsersStore()
-        const resultUser = await store.fetchUserIfMissing({ id: '1' })
-
-        expect(resultUser).to.deep.include(expected)
-        expect(store.findUser(userId)).to.deep.include(expected)
-      })
-
-      it('Should re-use existing promise for other fetches', async () => {
-        vi.stubGlobal(
-          'fetch',
-          vi
-            .fn()
-            .mockResolvedValueOnce(
-              new Response(JSON.stringify({ id: '1' }), {
-                headers: { 'Content-Type': 'application/json' },
-              }),
-            )
-            // fetch by name yields user id which we request next
-            .mockResolvedValueOnce(
-              new Response(JSON.stringify(mockMastoAPIUser()), {
-                headers: { 'Content-Type': 'application/json' },
-              }),
-            )
-            .mockThrowOnce(new Error("Shouldn't be called more than once")),
-        )
-
-        const expected = mockUser()
-        const store = useUsersStore()
-        const resultUser1 = await store.fetchUserIfMissing({ name: 'user' })
-        const resultUser2 = await store.fetchUserIfMissing({ id: '1' })
-
-        expect(resultUser1).to.deep.include(expected)
-        expect(resultUser2).to.deep.include(expected)
-        expect(store.findUser(userId)).to.deep.include(expected)
-      })
-
-      it('Should use cached data if present', async () => {
-        vi.stubGlobal(
-          'fetch',
-          vi.fn().mockThrowOnce(new Error("Shouldn't be called at all")),
-        )
-        const store = useUsersStore()
-        store.addNewUsers({ data: [mockUser()], timestamp: 1 })
-
-        const resultUser1 = await store.fetchUserIfMissing({ id: '1' })
-        const resultUser2 = await store.fetchUserIfMissing({ name: 'user' })
-        const expected = mockUser()
-
-        expect(resultUser1).to.deep.include(expected)
-        expect(resultUser2).to.deep.include(expected)
-        expect(store.findUser(userId)).to.deep.include(expected)
-      })
-
-      it('Should handle 404 gracefully', async () => {
-        vi.stubGlobal(
-          'fetch',
-          vi.fn().mockResolvedValueOnce(
-            new Response(JSON.stringify(mockMastoAPIUser()), {
-              status: 404,
-              statusText: 'Not Found',
-              headers: { 'Content-Type': 'application/json' },
-            }),
-          ),
-        )
-        const store = useUsersStore()
-
-        const resultUser = await store.fetchUserIfMissing({ id: '1' })
-
-        expect(resultUser).to.be.null
-      })
-
-      it('Should throw if no identifier is provided', async () => {
-        const store = useUsersStore()
-
-        await expect(
-          async () => await store.fetchUserIfMissing({}),
-        ).rejects.to.throw(TypeError)
-        await expect(
-          async () => await store.fetchUserIfMissing(),
-        ).rejects.to.throw(TypeError)
-      })
-    })
-
-    describe('relationships', () => {
-      it.each(['Friends', 'Followers'])('fetch%s', async (group) => {
-        const mockFetch = vi
-          .fn()
-          .mockResolvedValueOnce(
-            new Response(
-              JSON.stringify([
-                mockMastoAPIUser({
-                  screen_name: 'snake',
-                  name: 'John',
-                  id: '2',
-                }),
-                mockMastoAPIUser({
-                  screen_name: 'zero',
-                  name: 'David Oh',
-                  id: '3',
-                }),
-              ]),
-              {
-                headers: { 'Content-Type': 'application/json' },
-              },
-            ),
-          )
-          .mockResolvedValueOnce(
-            new Response(
-              JSON.stringify([
-                mockMastoAPIUser({
-                  screen_name: 'sigint',
-                  name: 'Mr.Anderson',
-                  id: '4',
-                }),
-                mockMastoAPIUser({
-                  screen_name: 'paramedic',
-                  name: 'Dr.Clark',
-                  id: '5',
-                }),
-              ]),
-              {
-                headers: { 'Content-Type': 'application/json' },
-              },
-            ),
-          )
-
-        vi.stubGlobal('fetch', mockFetch)
-
-        const store = useUsersStore()
-        store.addNewUsers({ timestamp: 1, data: mockUser() })
-
-        const urlGroup = group === 'Friends' ? 'Following' : group
-        const us = store.users.get(userId)
-
-        await store[`fetch${group}`](userId)
-        expect(mockFetch).to.have.been.calledWith(
-          PUBLIC_API[`MASTODON_${urlGroup.toUpperCase()}_URL`](userId, {
-            limit: 20,
-            withRelationships: true,
-          }),
-          DEFAULT_OPTIONS('GET'),
-        )
-        expect(
-          store.relationshipsLists[group.toLowerCase()].get(us),
-        ).to.have.length(2)
-
-        await store[`fetch${group}`](userId)
-        expect(mockFetch).to.have.been.calledWith(
-          PUBLIC_API[`MASTODON_${urlGroup.toUpperCase()}_URL`](userId, {
-            maxId: '3',
-            limit: 20,
-            withRelationships: true,
-          }),
-          DEFAULT_OPTIONS('GET'),
-        )
-        expect(
-          store.relationshipsLists[group.toLowerCase()].get(us),
-        ).to.have.length(4)
-      })
-
-      it.each(['Mutes', 'Blocks'])('fetch%s', async (group) => {
-        const mockFetch = vi
-          .fn()
-          .mockResolvedValueOnce(
-            new Response(
-              JSON.stringify([
-                mockMastoAPIUser({
-                  screen_name: 'snake',
-                  name: 'John',
-                  id: '2',
-                }),
-                mockMastoAPIUser({
-                  screen_name: 'zero',
-                  name: 'David Oh',
-                  id: '3',
-                }),
-              ]),
-              {
-                headers: { 'Content-Type': 'application/json' },
-              },
-            ),
-          )
-          .mockResolvedValueOnce(
-            new Response(
-              JSON.stringify([
-                mockMastoAPIUser({
-                  screen_name: 'sigint',
-                  name: 'Mr.Anderson',
-                  id: '4',
-                }),
-                mockMastoAPIUser({
-                  screen_name: 'paramedic',
-                  name: 'Dr.Clark',
-                  id: '5',
-                }),
-              ]),
-              {
-                headers: { 'Content-Type': 'application/json' },
-              },
-            ),
-          )
-
-        vi.stubGlobal('fetch', mockFetch)
-
-        const store = useUsersStore()
-        store.addNewUsers({ timestamp: 1, data: mockUser() })
-
-        const us = store.users.get(userId)
-
-        store.currentUser = us
-        const ids = group === 'Mutes' ? 'muteIds' : 'blockIds'
-
-        await store[`fetch${group}`]({ reset: true })
-        expect(mockFetch).to.have.been.calledWith(
-          USER_API[`MASTODON_USER_${group.toUpperCase()}_URL`]({
-            withRelationships: true,
-          }),
-          DEFAULT_OPTIONS('GET'),
-        )
-        expect(us[ids]).to.have.length(2)
-
-        await store[`fetch${group}`]()
-        expect(mockFetch).to.have.been.calledWith(
-          USER_API[`MASTODON_USER_${group.toUpperCase()}_URL`]({
-            withRelationships: true,
-          }),
-          DEFAULT_OPTIONS('GET'),
-        )
-        expect(us[ids]).to.have.length(4)
-      })
-
-      it('fetchDomainMutes', async () => {
-        const mockFetch = vi.fn().mockResolvedValueOnce(
-          new Response(JSON.stringify(['example.com', 'example.org']), {
-            headers: { 'Content-Type': 'application/json' },
-          }),
-        )
-
-        vi.stubGlobal('fetch', mockFetch)
-
-        const store = useUsersStore()
-        store.addNewUsers({ timestamp: 1, data: mockUser() })
-
-        const us = store.users.get(userId)
-        store.currentUser = us
-
-        await store.fetchDomainMutes()
-
-        expect(mockFetch).to.have.been.calledWith(
-          USER_API.MASTODON_DOMAIN_BLOCKS_URL,
-          DEFAULT_OPTIONS('GET'),
-        )
-
-        expect(us.domainMutes).to.have.eql(
-          new Set(['example.com', 'example.org']),
-        )
-      })
-
-      it('fetchInLists', async () => {
-        const inLists = [
-          { exclusive: false, id: '1', title: 'Operatives' },
-          { exclusive: true, id: '2', title: 'Agents' },
-        ]
-        const mockFetch = vi.fn().mockResolvedValueOnce(
-          new Response(JSON.stringify(inLists), {
-            headers: { 'Content-Type': 'application/json' },
-          }),
-        )
-
-        vi.stubGlobal('fetch', mockFetch)
-
-        const store = useUsersStore()
-        store.addNewUsers({
-          timestamp: 1,
-          data: [
-            mockUser(),
-            { ...mockUser({ name: 'John', screen_name: 'snake', id: '2' }) },
-            { ...mockUser({ name: 'David Oh', screen_name: 'zero', id: '3' }) },
-          ],
-        })
-
-        const us = store.users.get(userId)
-        store.currentUser = us
-
-        await store.fetchUserInLists('2')
-
-        expect(mockFetch).to.have.been.calledWith(
-          USER_API.MASTODON_USER_IN_LISTS('2'),
-          DEFAULT_OPTIONS('GET'),
-        )
-
-        expect(store.users.get('2').inLists).to.have.eql(inLists)
-      })
-    })
-  })
-
-  describe('misc updates', () => {
-    it('updateUserAdminData', () => {
-      const store = useUsersStore()
-      store.addNewUsers({ data: [mockUser()], timestamp: 1 })
-      const adminData = { is_active: true, tags: ['one', 'two'] }
-      store.updateUserAdminData(userId, adminData)
-
-      const userData = store.users.get(userId)
-      expect(userData.deactivated).to.eql(false)
-      expect(userData.tags).to.eql(new Set(['one', 'two']))
-    })
-
-    it('updateRight', () => {
-      const store = useUsersStore()
-      store.addNewUsers({ data: [mockUser()], timestamp: 1 })
-      store.updateRight(userId, 'right1', true)
-      store.updateRight(userId, 'right2', false)
-
-      const userData = store.users.get(userId)
-      expect(userData.rights.right1).to.eql(true)
-      expect(userData.rights.right2).to.eql(false)
-    })
-
-    it('clearFollowLists', () => {
-      const store = useUsersStore()
-      store.addNewUsers({ data: [mockUser()], timestamp: 1 })
-      const userData = store.users.get(userId)
-      store.relationshipsLists.friends.get(userData).add('2')
-      store.relationshipsLists.friends.get(userData).add('3')
-      store.relationshipsLists.followers.get(userData).add('4')
-      store.relationshipsLists.followers.get(userData).add('5')
-      store.clearFollowLists(userId)
-
-      expect(store.relationshipsLists.friends.get(userData)).to.have.length(0)
-      expect(store.relationshipsLists.followers.get(userData)).to.have.length(0)
-    })
-  })
-
-  describe('login/logout', () => {
-    describe('login', () => {
-      it('normal login', async () => {
-        vi.stubGlobal(
-          'fetch',
-          vi.fn().mockResolvedValueOnce(
-            new Response(JSON.stringify(mockMastoAPIUser()), {
-              headers: { 'Content-Type': 'application/json' },
-            }),
-          ),
-        )
-
-        const spies = [
-          // Misc initialization
-          vi.spyOn(useSyncConfigStore(), 'initSyncConfig'),
-          vi.spyOn(useUserHighlightStore(), 'initUserHighlight'),
-          vi.spyOn(useInterfaceStore(), 'applyTheme'),
-          vi.spyOn(useInterfaceStore(), 'onLogin'),
-          vi.spyOn(useEmojiStore(), 'fetchEmoji'),
-
-          // Timeline / Notifications
-          vi.spyOn(useNotificationsStore(), 'activate'),
-          vi.spyOn(useTimelinesStore(), 'activatePersistents'),
-
-          // Fetchers
-          vi.spyOn(useChatsStore(), 'startFetching'),
-          vi.spyOn(useListsStore(), 'startFetching'),
-          vi.spyOn(useAnnouncementsStore(), 'startFetching'),
-          vi.spyOn(useBookmarkFoldersStore(), 'startFetching'),
-          vi.spyOn(useStreamingStore(), 'initSocket'),
-        ]
-
-        spies.forEach((spy) => {
-          spy.mockImplementation(async () => {
-            /* no-op */
-          })
-        })
-
-        useInstanceCapabilitiesStore().pleromaChatMessagesAvailable = true
-        useMergedConfigStore().mergedConfig = { useStreamingApi: true }
-
-        const store = useUsersStore()
-
-        // Adding some users to verify they are getting cleaned afterwards
-        store.addNewUsers({
-          data: [
-            mockUser(),
-            { ...mockUser({ name: 'John', screen_name: 'snake' }) },
-            { ...mockUser({ name: 'David Oh', screen_name: 'zero' }) },
-          ],
-          timestamp: 2000,
-        })
-
-        expect(store.loggedIn).to.eql(false)
-        await store.loginUser('ACCESS_TOKEN')
-        expect(store.loggedIn).to.eql(true)
-
-        // We should be in the store ourselves
-        expect(store.users).to.have.length(1)
-        expect(store.usersByName).to.have.length(1)
-        expect(store.usersByURL).to.have.length(1)
-        expect(store.relationships).to.have.length(0)
-        expect(store.lastLoginName).to.eql(userScreenName)
-        spies.forEach((spy, index) => {
-          expect(spy, `Spy ${index} has failed`).to.have.been.called
-        })
-      })
-
-      it('bad credentials', async () => {
-        vi.stubGlobal(
-          'fetch',
-          vi.fn().mockResolvedValueOnce(
-            new Response(JSON.stringify(mockMastoAPIUser()), {
-              status: 403,
-              statusText: 'Forbidden',
-              headers: { 'Content-Type': 'application/json' },
-            }),
-          ),
-        )
-
-        const spies = [vi.spyOn(useOAuthStore(), 'clearToken')]
-
-        spies.forEach((spy) => {
-          spy.mockImplementation(async () => {
-            /* no-op */
-          })
-        })
-
-        const store = useUsersStore()
-        const exec = async () => {
-          await store.loginUser('ACCESS_TOKEN')
-        }
-
-        await expect(exec).rejects.to.throw(Error)
-
-        expect(store.loggedIn).to.eql(false)
-
-        spies.forEach((spy, index) => {
-          expect(spy, `Spy ${index} has failed`).to.have.been.called
-        })
-      })
-    })
-
-    describe('logout', () => {
-      it('normal logout', async () => {
-        const revokeApi = vi
-          .fn()
-          .mockResolvedValueOnce(
-            // Ensure APP
-            new Response(JSON.stringify('ok'), {
-              headers: { 'Content-Type': 'application/json' },
-            }),
-          )
-          .mockResolvedValueOnce(
-            // Revoke Token
-            new Response(JSON.stringify('ok'), {
-              headers: { 'Content-Type': 'application/json' },
-            }),
-          )
-
-        vi.stubGlobal('fetch', revokeApi)
-
-        const spies = [
-          // Misc initialization
-          vi.spyOn(useStatusesStore(), 'resetStatuses'),
-          vi.spyOn(useInterfaceStore(), 'onLogout'),
-
-          // Timeline / Notifications
-          vi.spyOn(useNotificationsStore(), 'deactivate'),
-          vi.spyOn(useTimelinesStore(), 'deactivateAll'),
-
-          // Fetchers
-          vi.spyOn(useChatsStore(), 'resetChats'),
-          vi.spyOn(useListsStore(), 'stopFetching'),
-          vi.spyOn(useAnnouncementsStore(), 'stopFetching'),
-          vi.spyOn(useBookmarkFoldersStore(), 'stopFetching'),
-          vi.spyOn(useStreamingStore(), 'stopSocket'),
-        ]
-
-        spies.forEach((spy) => {
-          spy.mockImplementation(async () => {
-            /* no-op */
-          })
-        })
-
-        useInstanceCapabilitiesStore().pleromaChatMessagesAvailable = true
-        useMergedConfigStore().mergedConfig = { useStreamingApi: true }
-
-        const store = useUsersStore()
-        store.currentUser = mockUser()
-
-        // Adding some users to verify they are getting cleaned afterwards
-        store.addNewUsers({
-          data: [
-            mockUser(),
-            {
-              ...mockUser({ name: 'John', screen_name: 'snake' }),
-              relationship: { id: userId, following: true },
-            },
-            { ...mockUser({ name: 'David Oh', screen_name: 'zero' }) },
-          ],
-          timestamp: 2000,
-        })
-        expect(store.loggedIn).to.eql(true)
-        await store.logout()
-        expect(store.loggedIn).to.eql(false)
-        expect(store.lastLoginName).to.eql(null)
-        expect(revokeApi).to.have.been.called
-        expect(store.users).to.have.length(0)
-        expect(store.usersByName).to.have.length(0)
-        expect(store.usersByURL).to.have.length(0)
-        expect(store.relationships).to.have.length(0)
-        spies.forEach((spy, index) => {
-          expect(spy, `Spy ${index} has failed`).to.have.been.called
-        })
-      })
-    })
-  })
-
-  describe('actions', () => {
-    describe('follow', () => {
-      beforeEach(() => {
-        vi.useFakeTimers()
-      })
-
-      afterEach(() => {
-        vi.useRealTimers()
-      })
-
-      it('instant follow case', async () => {
-        const followApi = vi.fn().mockResolvedValueOnce(
-          new Response(
-            JSON.stringify({
-              id: userId,
-              following: true,
-              requested: true,
-            }),
-            {
-              headers: { 'Content-Type': 'application/json' },
-            },
-          ),
-        )
-
-        vi.stubGlobal('fetch', followApi)
-        const store = useUsersStore()
-
-        await store.followUser(userId)
-        expect(followApi).to.have.been.called
-
-        expect(store.followPollers).to.have.length(0)
-        expect(store.followPollersAttempts).to.have.length(0)
-        expect(followApi).to.have.been.calledWith(
-          USER_API.MASTODON_FOLLOW_URL(userId),
-          {
-            body: '{}',
-            ...DEFAULT_OPTIONS(),
-          },
-        )
-      })
-
-      it('delayed follow case', async () => {
-        const followApi = vi
-          .fn()
-          .mockResolvedValueOnce(
-            // Follow
-            new Response(
-              JSON.stringify({
-                id: userId,
-                following: false,
-                requested: true,
-              }),
-              {
-                headers: { 'Content-Type': 'application/json' },
-              },
-            ),
-          )
-          .mockResolvedValueOnce(
-            // Check relationship
-            new Response(
-              JSON.stringify({
-                id: userId,
-                following: true,
-                requested: true,
-              }),
-              {
-                headers: { 'Content-Type': 'application/json' },
-              },
-            ),
-          )
-
-        vi.stubGlobal('fetch', followApi)
-
-        const store = useUsersStore()
-
-        await store.followUser(userId)
-        expect(followApi).to.have.been.called
-
-        expect(store.followPollers).to.have.length(1)
-        expect(store.followPollersAttempts).to.have.length(1)
-        expect(store.followPollersAttempts.get(userId)).to.eql(3)
-
-        await vi.runAllTimersAsync()
-        expect(followApi).to.have.been.called
-        expect(store.followPollers).to.have.length(0)
-        expect(store.followPollersAttempts).to.have.length(0)
-      })
-
-      it('unresolved follow case', async () => {
-        const followApi = vi.fn().mockResolvedValueOnce(
-          // Follow
-          new Response(
-            JSON.stringify({
-              id: userId,
-              following: false,
-              requested: true,
-            }),
-            {
-              headers: { 'Content-Type': 'application/json' },
-            },
-          ),
-        )
-
-        followApi // mockImplementation because we need to re-create Response
-          .mockImplementation(
-            () =>
-              // Check relationship
-              new Response(
-                JSON.stringify({
-                  id: userId,
-                  following: false,
-                  requested: true,
-                }),
-                {
-                  headers: { 'Content-Type': 'application/json' },
-                },
-              ),
-          )
-
-        vi.stubGlobal('fetch', followApi)
-
-        const store = useUsersStore()
-
-        await store.followUser(userId)
-        expect(store.followPollers).to.have.length(1)
-        expect(store.followPollersAttempts).to.have.length(1)
-        expect(store.followPollersAttempts.get(userId)).to.eql(3)
-
-        await vi.runAllTimersAsync()
-        expect(store.followPollersAttempts.get(userId)).to.eql(2)
-
-        await vi.runAllTimersAsync()
-        expect(store.followPollersAttempts.get(userId)).to.eql(1)
-
-        await vi.runAllTimersAsync()
-        expect(store.followPollers).to.have.length(0)
-        expect(store.followPollersAttempts).to.have.length(0)
-
-        expect(followApi).to.have.callCount(4) // 1 follow + 3 retries
-      })
-    })
-
-    it('unfollow', async () => {
-      const mockFetch = vi.fn().mockResolvedValueOnce(
-        new Response(
-          JSON.stringify({
-            id: userId,
-            following: false,
-            requested: true,
-          }),
-          {
-            headers: { 'Content-Type': 'application/json' },
-          },
-        ),
-      )
-
-      vi.stubGlobal('fetch', mockFetch)
-
-      const store = useUsersStore()
-      await store.unfollowUser(userId)
-
-      expect(mockFetch).to.have.been.calledWith(
-        USER_API.MASTODON_UNFOLLOW_URL(userId),
-        DEFAULT_OPTIONS(),
-      )
-    })
-
-    it('subscribe', async () => {
-      const mockFetch = vi.fn().mockResolvedValueOnce(
-        new Response(
-          JSON.stringify({
-            id: userId,
-            following: false,
-            requested: true,
-            subscribing: true,
-          }),
-          {
-            headers: { 'Content-Type': 'application/json' },
-          },
-        ),
-      )
-
-      vi.stubGlobal('fetch', mockFetch)
-
-      const store = useUsersStore()
-      await store.subscribeUser(userId)
-
-      expect(mockFetch).to.have.been.calledWith(
-        USER_API.MASTODON_FOLLOW_URL(userId),
-        {
-          body: JSON.stringify({ notify: true }),
-          ...DEFAULT_OPTIONS(),
-        },
-      )
-    })
-
-    it('unsubscribe', async () => {
-      const mockFetch = vi.fn().mockResolvedValueOnce(
-        new Response(
-          JSON.stringify({
-            id: userId,
-            following: false,
-            requested: true,
-            subscribing: false,
-          }),
-          {
-            headers: { 'Content-Type': 'application/json' },
-          },
-        ),
-      )
-
-      vi.stubGlobal('fetch', mockFetch)
-
-      const store = useUsersStore()
-      await store.unsubscribeUser(userId)
-
-      expect(mockFetch).to.have.been.calledWith(
-        USER_API.MASTODON_FOLLOW_URL(userId),
-        {
-          body: JSON.stringify({ notify: false }),
-          ...DEFAULT_OPTIONS(),
-        },
-      )
-    })
-
-    it('showReblogs', async () => {
-      const mockFetch = vi.fn().mockResolvedValueOnce(
-        new Response(
-          JSON.stringify({
-            id: userId,
-            following: false,
-            requested: true,
-            showing_reblogs: true,
-          }),
-          {
-            headers: { 'Content-Type': 'application/json' },
-          },
-        ),
-      )
-
-      vi.stubGlobal('fetch', mockFetch)
-
-      const store = useUsersStore()
-      await store.showReblogs(userId)
-
-      expect(mockFetch).to.have.been.calledWith(
-        USER_API.MASTODON_FOLLOW_URL(userId),
-        {
-          body: JSON.stringify({ reblogs: true }),
-          ...DEFAULT_OPTIONS(),
-        },
-      )
-    })
-
-    it('hideReblogs', async () => {
-      const mockFetch = vi.fn().mockResolvedValueOnce(
-        new Response(
-          JSON.stringify({
-            id: userId,
-            following: false,
-            requested: true,
-            showing_reblogs: false,
-          }),
-          {
-            headers: { 'Content-Type': 'application/json' },
-          },
-        ),
-      )
-
-      vi.stubGlobal('fetch', mockFetch)
-
-      const store = useUsersStore()
-      await store.hideReblogs(userId)
-
-      expect(mockFetch).to.have.been.calledWith(
-        USER_API.MASTODON_FOLLOW_URL(userId),
-        {
-          body: JSON.stringify({ reblogs: false }),
-          ...DEFAULT_OPTIONS(),
-        },
-      )
-    })
-
-    it.each([
-      'unmute',
-      'unblock',
-      'removeUserFromFollowers',
-    ])('%s', async (action) => {
-      const mockFetch = vi.fn().mockResolvedValueOnce(
-        new Response(JSON.stringify({ id: userId }), {
-          headers: { 'Content-Type': 'application/json' },
-        }),
-      )
-
-      vi.stubGlobal('fetch', mockFetch)
-
-      const store = useUsersStore()
-      const { storeAction, apiUrl } = actionKeys(action)
-      await store[storeAction](userId)
-      console.log(apiUrl)
-
-      expect(mockFetch).to.have.been.calledWith(
-        USER_API[apiUrl](userId),
-        DEFAULT_OPTIONS(),
-      )
-    })
-
-    describe.each(['mute', 'block'])('%s', (action) => {
-      it('normal', async () => {
-        const mockFetch = vi.fn().mockResolvedValueOnce(
-          new Response(JSON.stringify({ id: userId }), {
-            headers: { 'Content-Type': 'application/json' },
-          }),
-        )
-
-        vi.stubGlobal('fetch', mockFetch)
-
-        vi.spyOn(useStatusesStore(), 'wipeUserStatuses').mockImplementation(
-          async () => {
-            /* no-op */
-          },
-        )
-
-        vi.spyOn(useTimelinesStore(), 'wipeStatuses').mockImplementation(
-          async () => {
-            /* no-op */
-          },
-        )
-
-        const store = useUsersStore()
-        const { storeAction, apiUrl } = actionKeys(action)
-        await store[storeAction](userId)
-
-        expect(mockFetch).to.have.been.calledWith(USER_API[apiUrl](userId), {
-          body: '{}',
-          ...DEFAULT_OPTIONS(),
-        })
-      })
-
-      it('with expiration', async () => {
-        const mockFetch = vi.fn().mockResolvedValueOnce(
-          new Response(JSON.stringify({ id: userId }), {
-            headers: { 'Content-Type': 'application/json' },
-          }),
-        )
-
-        vi.stubGlobal('fetch', mockFetch)
-
-        vi.spyOn(useStatusesStore(), 'wipeUserStatuses').mockImplementation(
-          async () => {
-            /* no-op */
-          },
-        )
-
-        vi.spyOn(useTimelinesStore(), 'wipeStatuses').mockImplementation(
-          async () => {
-            /* no-op */
-          },
-        )
-
-        const store = useUsersStore()
-        const { storeAction, apiUrl } = actionKeys(action)
-        await store[storeAction](userId, 20)
-        const argument = action === 'mute' ? 'expires_in' : 'duration'
-
-        expect(mockFetch).to.have.been.calledWith(USER_API[apiUrl](userId), {
-          body: `{"${argument}":20}`,
-          ...DEFAULT_OPTIONS(),
-        })
-      })
-    })
-
-    it.each(['mute', 'unmute'])('%s domain', async (action) => {
-      const mockFetch = vi.fn().mockResolvedValueOnce(
-        new Response(JSON.stringify({ id: userId }), {
-          headers: { 'Content-Type': 'application/json' },
-        }),
-      )
-
-      vi.stubGlobal('fetch', mockFetch)
-
-      const store = useUsersStore()
-      store.currentUser = mockUser()
-      store.currentUser.domainMutes = new Set()
-      if (action === 'unmute') {
-        store.currentUser.domainMutes.add('example.com')
-      }
-      await store[action + 'Domain']('example.com')
-
-      expect(mockFetch).to.have.been.calledWith(
-        USER_API.MASTODON_DOMAIN_BLOCKS_URL,
-        {
-          body: JSON.stringify({ domain: 'example.com' }),
-          ...DEFAULT_OPTIONS(action === 'mute' ? 'POST' : 'DELETE'),
-        },
-      )
-
-      if (action === 'mute') {
-        expect(store.currentUser.domainMutes).to.include('example.com')
-      } else {
-        expect(store.currentUser.domainMutes).to.not.include('example.com')
-      }
-    })
-
-    it.each([
-      'muteDomain',
-      'unmuteDomain',
-      'muteUser',
-      'unmuteUser',
-      'blockUser',
-      'unblockUser',
-    ])('%ss', async (action) => {
-      const store = useUsersStore()
-      store[action] = vi.fn().mockResolvedValue(async () => {
-        /* no-op */
-      })
-      store[action + 's'](['1', '2', '3'])
-      expect(store[action]).to.have.been.calledWith('1')
-      expect(store[action]).to.have.been.calledWith('2')
-      expect(store[action]).to.have.been.calledWith('3')
-    })
-  })
-
-  describe('getters', () => {
-    it('relationship returns a placeholder if relationship info is missing', () => {
-      const store = useUsersStore()
-
-      expect(store.relationship(userId)).to.eql({ id: userId, loading: true })
-    })
-
-    it('relationship returns a placeholder if relationship info is missing while user is present', () => {
-      const store = useUsersStore()
-      store.addNewUsers({ data: [mockUser()], timestamp: 1 })
-
-      expect(store.relationship(userId)).to.eql({ id: userId, loading: true })
-    })
-
-    it('findUser returns user with matching id', () => {
-      const store = useUsersStore()
-      store.addNewUsers({ data: [mockUser()], timestamp: 1 })
-
-      expect(store.findUser(userId).id).to.eql(userId)
-    })
-
-    it('findUserByName returns user with matching screen_name', () => {
-      const store = useUsersStore()
-      store.addNewUsers({ data: [mockUser()], timestamp: 1 })
-
-      expect(store.findUserByName(mockUser().screen_name).id).to.eql(userId)
-    })
-
-    it('findUserByName returns user with matching url', () => {
-      const store = useUsersStore()
-      store.addNewUsers({ data: [mockUser()], timestamp: 1 })
-
-      expect(store.findUserByUrl(mockUser().url).id).to.eql(userId)
-    })
-  })
-})