diff --git a/biome.json b/biome.json
index d64639d52..6a464a0e5 100644
--- a/biome.json
+++ b/biome.json
@@ -132,7 +132,11 @@
             "groups": [
               [":NODE:", ":PACKAGE:", "!src/**", "!@fortawesome/**"],
               ":BLANK_LINE:",
-              [":PATH:", "src/**"],
+              [":PATH:", "src/components/**"],
+              ":BLANK_LINE:",
+              [":PATH:", "src/stores/**"],
+              ":BLANK_LINE:",
+              [":PATH:", "src/**", "src/stores/**", "src/components/**"],
               ":BLANK_LINE:",
               "@fortawesome/fontawesome-svg-core",
               "@fortawesome/*"
diff --git a/src/App.js b/src/App.js
index d0b27c331..fb42cf2ac 100644
--- a/src/App.js
+++ b/src/App.js
@@ -2,10 +2,6 @@ import { throttle } from 'lodash'
 import { mapActions, mapState } from 'pinia'
 import { defineAsyncComponent } from 'vue'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-import { useShoutStore } from 'src/stores/shout.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import DesktopNav from './components/desktop_nav/desktop_nav.vue'
 import EditStatusModal from './components/edit_status_modal/edit_status_modal.vue'
 import FeaturesPanel from './components/features_panel/features_panel.vue'
@@ -25,6 +21,11 @@ import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_pan
 import { getOrCreateServiceWorker } from './services/sw/sw'
 import { windowHeight, windowWidth } from './services/window_utils/window_utils'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useInterfaceStore } from 'src/stores/interface.js'
+import { useShoutStore } from 'src/stores/shout.js'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 export default {
   name: 'app',
   components: {
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index fab948cf2..771c0e233 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -15,17 +15,6 @@ import {
 
 config.autoAddCss = false
 
-import VBodyScrollLock from 'src/directives/body_scroll_lock'
-import {
-  instanceDefaultConfig,
-  staticOrApiConfigDefault,
-} from 'src/modules/default_config_state.js'
-import { useAnnouncementsStore } from 'src/stores/announcements'
-import { useAuthFlowStore } from 'src/stores/auth_flow'
-import { useI18nStore } from 'src/stores/i18n'
-import { useInstanceStore } from 'src/stores/instance'
-import { useInterfaceStore } from 'src/stores/interface'
-import { useOAuthStore } from 'src/stores/oauth'
 import App from '../App.vue'
 import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
 import FaviconService from '../services/favicon_service/favicon_service.js'
@@ -37,6 +26,19 @@ import {
 } from '../services/window_utils/window_utils'
 import routes from './routes'
 
+import { useAnnouncementsStore } from 'src/stores/announcements'
+import { useAuthFlowStore } from 'src/stores/auth_flow'
+import { useI18nStore } from 'src/stores/i18n'
+import { useInstanceStore } from 'src/stores/instance'
+import { useInterfaceStore } from 'src/stores/interface'
+import { useOAuthStore } from 'src/stores/oauth'
+
+import VBodyScrollLock from 'src/directives/body_scroll_lock'
+import {
+  instanceDefaultConfig,
+  staticOrApiConfigDefault,
+} from 'src/modules/default_config_state.js'
+
 let staticInitialResults = null
 
 const parsedInitialResults = () => {
diff --git a/src/boot/routes.js b/src/boot/routes.js
index 0b8df95ac..4077f67ba 100644
--- a/src/boot/routes.js
+++ b/src/boot/routes.js
@@ -28,11 +28,12 @@ import UserProfile from 'components/user_profile/user_profile.vue'
 import WhoToFollow from 'components/who_to_follow/who_to_follow.vue'
 
 import NavPanel from 'src/components/nav_panel/nav_panel.vue'
-import { useInstanceStore } from 'src/stores/instance.js'
 import BookmarkFolderEdit from '../components/bookmark_folder_edit/bookmark_folder_edit.vue'
 import BookmarkFolders from '../components/bookmark_folders/bookmark_folders.vue'
 import QuotesTimeline from '../components/quotes_timeline/quotes_timeline.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
 export default (store) => {
   const validateAuthenticatedRoute = (to, from, next) => {
     if (store.state.users.currentUser) {
diff --git a/src/components/about/about.js b/src/components/about/about.js
index 4c1ec87d1..b4a33505b 100644
--- a/src/components/about/about.js
+++ b/src/components/about/about.js
@@ -1,11 +1,12 @@
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import FeaturesPanel from '../features_panel/features_panel.vue'
 import InstanceSpecificPanel from '../instance_specific_panel/instance_specific_panel.vue'
 import MRFTransparencyPanel from '../mrf_transparency_panel/mrf_transparency_panel.vue'
 import StaffPanel from '../staff_panel/staff_panel.vue'
 import TermsOfServicePanel from '../terms_of_service_panel/terms_of_service_panel.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 const About = {
   components: {
     InstanceSpecificPanel,
diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js
index f9a1abf86..10fbfc228 100644
--- a/src/components/account_actions/account_actions.js
+++ b/src/components/account_actions/account_actions.js
@@ -2,12 +2,13 @@ import { mapState } from 'vuex'
 
 import UserListMenu from 'src/components/user_list_menu/user_list_menu.vue'
 import UserTimedFilterModal from 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue'
-import { useReportsStore } from 'src/stores/reports'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import Popover from '../popover/popover.vue'
 import ProgressButton from '../progress_button/progress_button.vue'
 
+import { useReportsStore } from 'src/stores/reports'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faEllipsisV } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/announcement/announcement.js b/src/components/announcement/announcement.js
index 906b84ce2..c206d7344 100644
--- a/src/components/announcement/announcement.js
+++ b/src/components/announcement/announcement.js
@@ -1,10 +1,11 @@
 import { mapState } from 'vuex'
 
-import { useAnnouncementsStore } from 'src/stores/announcements'
 import localeService from '../../services/locale/locale.service.js'
 import AnnouncementEditor from '../announcement_editor/announcement_editor.vue'
 import RichContent from '../rich_content/rich_content.jsx'
 
+import { useAnnouncementsStore } from 'src/stores/announcements'
+
 const Announcement = {
   components: {
     AnnouncementEditor,
diff --git a/src/components/announcements_page/announcements_page.js b/src/components/announcements_page/announcements_page.js
index 0c4383d2e..5ee979dc7 100644
--- a/src/components/announcements_page/announcements_page.js
+++ b/src/components/announcements_page/announcements_page.js
@@ -1,9 +1,10 @@
 import { mapState } from 'vuex'
 
-import { useAnnouncementsStore } from 'src/stores/announcements'
 import Announcement from '../announcement/announcement.vue'
 import AnnouncementEditor from '../announcement_editor/announcement_editor.vue'
 
+import { useAnnouncementsStore } from 'src/stores/announcements'
+
 const AnnouncementsPage = {
   components: {
     Announcement,
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index f6f132efd..c754b85e9 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -1,15 +1,16 @@
 import { mapState } from 'pinia'
 import { mapGetters } from 'vuex'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useMediaViewerStore } from 'src/stores/media_viewer'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import nsfwImage from '../../assets/nsfw.png'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import Flash from '../flash/flash.vue'
 import StillImage from '../still-image/still-image.vue'
 import VideoAttachment from '../video_attachment/video_attachment.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useMediaViewerStore } from 'src/stores/media_viewer'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faAlignRight,
diff --git a/src/components/auth_form/auth_form.js b/src/components/auth_form/auth_form.js
index ce88aa6f9..db721b307 100644
--- a/src/components/auth_form/auth_form.js
+++ b/src/components/auth_form/auth_form.js
@@ -1,11 +1,12 @@
 import { mapState } from 'pinia'
 import { h, resolveComponent } from 'vue'
 
-import { useAuthFlowStore } from 'src/stores/auth_flow'
 import LoginForm from '../login_form/login_form.vue'
 import MFARecoveryForm from '../mfa_form/recovery_form.vue'
 import MFATOTPForm from '../mfa_form/totp_form.vue'
 
+import { useAuthFlowStore } from 'src/stores/auth_flow'
+
 const AuthForm = {
   name: 'AuthForm',
   render() {
diff --git a/src/components/avatar_list/avatar_list.js b/src/components/avatar_list/avatar_list.js
index 938713207..830b64219 100644
--- a/src/components/avatar_list/avatar_list.js
+++ b/src/components/avatar_list/avatar_list.js
@@ -1,7 +1,9 @@
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
-import { useInstanceStore } from 'src/stores/instance.js'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+
 const AvatarList = {
   props: ['users'],
   computed: {
diff --git a/src/components/basic_user_card/basic_user_card.js b/src/components/basic_user_card/basic_user_card.js
index 8d2b17b7d..0e45b140a 100644
--- a/src/components/basic_user_card/basic_user_card.js
+++ b/src/components/basic_user_card/basic_user_card.js
@@ -1,10 +1,12 @@
 import RichContent from 'src/components/rich_content/rich_content.jsx'
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
-import { useInstanceStore } from 'src/stores/instance.js'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import UserLink from '../user_link/user_link.vue'
 import UserPopover from '../user_popover/user_popover.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+
 const BasicUserCard = {
   props: ['user'],
   components: {
diff --git a/src/components/bookmark_folder_edit/bookmark_folder_edit.js b/src/components/bookmark_folder_edit/bookmark_folder_edit.js
index a658a0f40..002fd688f 100644
--- a/src/components/bookmark_folder_edit/bookmark_folder_edit.js
+++ b/src/components/bookmark_folder_edit/bookmark_folder_edit.js
@@ -1,8 +1,9 @@
-import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders'
-import { useInterfaceStore } from 'src/stores/interface'
 import apiService from '../../services/api/api.service'
 import EmojiPicker from '../emoji_picker/emoji_picker.vue'
 
+import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders'
+import { useInterfaceStore } from 'src/stores/interface'
+
 const BookmarkFolderEdit = {
   data() {
     return {
diff --git a/src/components/bookmark_folders/bookmark_folders.js b/src/components/bookmark_folders/bookmark_folders.js
index 8e09abb31..c558f0812 100644
--- a/src/components/bookmark_folders/bookmark_folders.js
+++ b/src/components/bookmark_folders/bookmark_folders.js
@@ -1,6 +1,7 @@
-import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders'
 import BookmarkFolderCard from '../bookmark_folder_card/bookmark_folder_card.vue'
 
+import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders'
+
 const BookmarkFolders = {
   data() {
     return {
diff --git a/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js b/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js
index e84b3bc85..73139eb08 100644
--- a/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js
+++ b/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js
@@ -2,6 +2,7 @@ import { mapState } from 'pinia'
 
 import { getBookmarkFolderEntries } from 'src/components/navigation/filter.js'
 import NavigationEntry from 'src/components/navigation/navigation_entry.vue'
+
 import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders'
 
 export const BookmarkFoldersMenuContent = {
diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js
index 6dd69ada4..caeb2aea7 100644
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@@ -2,7 +2,6 @@ import _ from 'lodash'
 import { mapState as mapPiniaState } from 'pinia'
 import { mapGetters, mapState } from 'vuex'
 
-import { useInterfaceStore } from 'src/stores/interface.js'
 import { WSConnectionStatus } from '../../services/api/api.service.js'
 import chatService from '../../services/chat_service/chat_service.js'
 import { buildFakeMessage } from '../../services/chat_utils/chat_utils.js'
@@ -17,6 +16,8 @@ import {
   isScrollable,
 } from './chat_layout_utils.js'
 
+import { useInterfaceStore } from 'src/stores/interface.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronDown, faChevronLeft } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/chat_list_item/chat_list_item.js b/src/components/chat_list_item/chat_list_item.js
index 0923a8568..4f4ea4955 100644
--- a/src/components/chat_list_item/chat_list_item.js
+++ b/src/components/chat_list_item/chat_list_item.js
@@ -1,12 +1,13 @@
 import { mapState } from 'vuex'
 
-import fileType from 'src/services/file_type/file_type.service'
 import AvatarList from '../avatar_list/avatar_list.vue'
 import ChatTitle from '../chat_title/chat_title.vue'
 import StatusBody from '../status_content/status_content.vue'
 import Timeago from '../timeago/timeago.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 
+import fileType from 'src/services/file_type/file_type.service'
+
 const ChatListItem = {
   name: 'ChatListItem',
   props: ['chat'],
diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js
index f3cc495c2..d84286e80 100644
--- a/src/components/chat_message/chat_message.js
+++ b/src/components/chat_message/chat_message.js
@@ -2,7 +2,6 @@ import { mapState as mapPiniaState } from 'pinia'
 import { defineAsyncComponent } from 'vue'
 import { mapGetters, mapState } from 'vuex'
 
-import { useInterfaceStore } from 'src/stores/interface'
 import Attachment from '../attachment/attachment.vue'
 import ChatMessageDate from '../chat_message_date/chat_message_date.vue'
 import Gallery from '../gallery/gallery.vue'
@@ -11,6 +10,8 @@ import Popover from '../popover/popover.vue'
 import StatusContent from '../status_content/status_content.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 
+import { useInterfaceStore } from 'src/stores/interface'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faEllipsisH, faTimes } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/component_preview/component_preview.js b/src/components/component_preview/component_preview.js
index 70696f56b..1d54f58de 100644
--- a/src/components/component_preview/component_preview.js
+++ b/src/components/component_preview/component_preview.js
@@ -1,5 +1,6 @@
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import ColorInput from 'src/components/color_input/color_input.vue'
+
 import genRandomSeed from 'src/services/random_seed/random_seed.service.js'
 import {
   adoptStyleSheets,
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 84b33b3a2..85db541e3 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -2,15 +2,16 @@ import { clone, filter, findIndex, get, reduce } from 'lodash'
 import { mapState as mapPiniaState } from 'pinia'
 import { mapGetters, mapState } from 'vuex'
 
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import { WSConnectionStatus } from '../../services/api/api.service.js'
 import QuickFilterSettings from '../quick_filter_settings/quick_filter_settings.vue'
 import QuickViewSettings from '../quick_view_settings/quick_view_settings.vue'
 import Status from '../status/status.vue'
 import ThreadTree from '../thread_tree/thread_tree.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useInterfaceStore } from 'src/stores/interface'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faAngleDoubleDown,
diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
index df7078afd..a912e7fb6 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -1,10 +1,11 @@
 import SearchBar from 'components/search_bar/search_bar.vue'
 import { mapState } from 'pinia'
 
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
+
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
diff --git a/src/components/draft/draft.js b/src/components/draft/draft.js
index 5caaf7a96..5ee85dff4 100644
--- a/src/components/draft/draft.js
+++ b/src/components/draft/draft.js
@@ -5,6 +5,7 @@ import EditStatusForm from 'src/components/edit_status_form/edit_status_form.vue
 import Gallery from 'src/components/gallery/gallery.vue'
 import PostStatusForm from 'src/components/post_status_form/post_status_form.vue'
 import StatusContent from 'src/components/status_content/status_content.vue'
+
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
diff --git a/src/components/draft_closer/draft_closer.js b/src/components/draft_closer/draft_closer.js
index 816ffd1ee..5f297bf4c 100644
--- a/src/components/draft_closer/draft_closer.js
+++ b/src/components/draft_closer/draft_closer.js
@@ -1,4 +1,5 @@
 import DialogModal from 'src/components/dialog_modal/dialog_modal.vue'
+
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 
 const DraftCloser = {
diff --git a/src/components/edit_status_modal/edit_status_modal.js b/src/components/edit_status_modal/edit_status_modal.js
index 8a16e4234..035e953bc 100644
--- a/src/components/edit_status_modal/edit_status_modal.js
+++ b/src/components/edit_status_modal/edit_status_modal.js
@@ -1,9 +1,10 @@
 import get from 'lodash/get'
 
-import { useEditStatusStore } from 'src/stores/editStatus'
 import EditStatusForm from '../edit_status_form/edit_status_form.vue'
 import Modal from '../modal/modal.vue'
 
+import { useEditStatusStore } from 'src/stores/editStatus'
+
 const EditStatusModal = {
   components: {
     EditStatusForm,
diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index a9c024993..4917a11fb 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -2,14 +2,16 @@ import { take } from 'lodash'
 
 import Popover from 'src/components/popover/popover.vue'
 import ScreenReaderNotice from 'src/components/screen_reader_notice/screen_reader_notice.vue'
-import { ensureFinalFallback } from 'src/i18n/languages.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import Completion from '../../services/completion/completion.js'
 import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
 import genRandomSeed from '../../services/random_seed/random_seed.service.js'
 import EmojiPicker from '../emoji_picker/emoji_picker.vue'
 import UnicodeDomainIndicator from '../unicode_domain_indicator/unicode_domain_indicator.vue'
 
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
+import { ensureFinalFallback } from 'src/i18n/languages.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faSmileBeam } from '@fortawesome/free-regular-svg-icons'
 
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 9c3a1d6db..d6e3006d9 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -2,12 +2,14 @@ import { chunk, debounce, trim } from 'lodash'
 import { defineAsyncComponent } from 'vue'
 
 import Popover from 'src/components/popover/popover.vue'
-import { ensureFinalFallback } from 'src/i18n/languages.js'
+import Checkbox from '../checkbox/checkbox.vue'
+import StillImage from '../still-image/still-image.vue'
+
 import { useEmojiStore } from 'src/stores/emoji.js'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import Checkbox from '../checkbox/checkbox.vue'
-import StillImage from '../still-image/still-image.vue'
+
+import { ensureFinalFallback } from 'src/i18n/languages.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
diff --git a/src/components/features_panel/features_panel.js b/src/components/features_panel/features_panel.js
index 3b46e6f68..17e54180f 100644
--- a/src/components/features_panel/features_panel.js
+++ b/src/components/features_panel/features_panel.js
@@ -1,6 +1,7 @@
-import { useInstanceStore } from 'src/stores/instance.js'
 import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
 const FeaturesPanel = {
   computed: {
     shout: function () {
diff --git a/src/components/follow_button/follow_button.js b/src/components/follow_button/follow_button.js
index 6c2186a89..539749bc8 100644
--- a/src/components/follow_button/follow_button.js
+++ b/src/components/follow_button/follow_button.js
@@ -1,9 +1,10 @@
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import {
   requestFollow,
   requestUnfollow,
 } from '../../services/follow_manipulate/follow_manipulate'
 import ConfirmModal from '../confirm_modal/confirm_modal.vue'
+
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
 export default {
   props: ['relationship', 'user', 'labelFollowing', 'buttonClass'],
   components: {
diff --git a/src/components/follow_request_card/follow_request_card.js b/src/components/follow_request_card/follow_request_card.js
index fa5487ec4..b7959a2d3 100644
--- a/src/components/follow_request_card/follow_request_card.js
+++ b/src/components/follow_request_card/follow_request_card.js
@@ -1,8 +1,9 @@
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import { notificationsFromStore } from '../../services/notification_utils/notification_utils.js'
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 const FollowRequestCard = {
   props: ['user'],
   components: {
diff --git a/src/components/font_control/font_control.js b/src/components/font_control/font_control.js
index 08d25d52d..b0dc813f6 100644
--- a/src/components/font_control/font_control.js
+++ b/src/components/font_control/font_control.js
@@ -1,8 +1,9 @@
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import Popover from 'src/components/popover/popover.vue'
-import { useInterfaceStore } from 'src/stores/interface'
 import Select from '../select/select.vue'
 
+import { useInterfaceStore } from 'src/stores/interface'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faExclamationTriangle,
diff --git a/src/components/gallery/gallery.js b/src/components/gallery/gallery.js
index 9934a7905..9540302ef 100644
--- a/src/components/gallery/gallery.js
+++ b/src/components/gallery/gallery.js
@@ -1,8 +1,9 @@
 import { set, sumBy } from 'lodash'
 
-import { useMediaViewerStore } from 'src/stores/media_viewer'
 import Attachment from '../attachment/attachment.vue'
 
+import { useMediaViewerStore } from 'src/stores/media_viewer'
+
 const Gallery = {
   props: [
     'attachments',
diff --git a/src/components/lists/lists.js b/src/components/lists/lists.js
index 446178245..0508ace82 100644
--- a/src/components/lists/lists.js
+++ b/src/components/lists/lists.js
@@ -1,6 +1,7 @@
-import { useListsStore } from 'src/stores/lists'
 import ListsCard from '../lists_card/lists_card.vue'
 
+import { useListsStore } from 'src/stores/lists'
+
 const Lists = {
   data() {
     return {
diff --git a/src/components/lists_edit/lists_edit.js b/src/components/lists_edit/lists_edit.js
index 64a2e942c..928b56725 100644
--- a/src/components/lists_edit/lists_edit.js
+++ b/src/components/lists_edit/lists_edit.js
@@ -3,12 +3,13 @@ import { mapGetters, mapState } from 'vuex'
 
 import PanelLoading from 'src/components/panel_loading/panel_loading.vue'
 import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
-import { useInterfaceStore } from 'src/stores/interface'
-import { useListsStore } from 'src/stores/lists'
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 import ListsUserSearch from '../lists_user_search/lists_user_search.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 
+import { useInterfaceStore } from 'src/stores/interface'
+import { useListsStore } from 'src/stores/lists'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronLeft, faSearch } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/lists_menu/lists_menu_content.js b/src/components/lists_menu/lists_menu_content.js
index 7574c4c3f..e322e51e8 100644
--- a/src/components/lists_menu/lists_menu_content.js
+++ b/src/components/lists_menu/lists_menu_content.js
@@ -3,6 +3,7 @@ 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'
 
 export const ListsMenuContent = {
diff --git a/src/components/lists_timeline/lists_timeline.js b/src/components/lists_timeline/lists_timeline.js
index ae1554eb6..d7e407fb7 100644
--- a/src/components/lists_timeline/lists_timeline.js
+++ b/src/components/lists_timeline/lists_timeline.js
@@ -1,6 +1,7 @@
-import { useListsStore } from 'src/stores/lists'
 import Timeline from '../timeline/timeline.vue'
 
+import { useListsStore } from 'src/stores/lists'
+
 const ListsTimeline = {
   data() {
     return {
diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js
index 7c43923c9..3d94e4023 100644
--- a/src/components/login_form/login_form.js
+++ b/src/components/login_form/login_form.js
@@ -1,9 +1,10 @@
 import { mapActions, mapState as mapPiniaState, mapStores } from 'pinia'
 import { mapState } from 'vuex'
 
+import oauthApi from '../../services/new_api/oauth.js'
+
 import { useAuthFlowStore } from 'src/stores/auth_flow.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
-import oauthApi from '../../services/new_api/oauth.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faTimes } from '@fortawesome/free-solid-svg-icons'
diff --git a/src/components/media_modal/media_modal.js b/src/components/media_modal/media_modal.js
index 6199a6e32..b983d92ab 100644
--- a/src/components/media_modal/media_modal.js
+++ b/src/components/media_modal/media_modal.js
@@ -1,5 +1,4 @@
 import Flash from 'src/components/flash/flash.vue'
-import { useMediaViewerStore } from 'src/stores/media_viewer'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import GestureService from '../../services/gesture_service/gesture_service'
 import Modal from '../modal/modal.vue'
@@ -8,6 +7,8 @@ import StillImage from '../still-image/still-image.vue'
 import SwipeClick from '../swipe_click/swipe_click.vue'
 import VideoAttachment from '../video_attachment/video_attachment.vue'
 
+import { useMediaViewerStore } from 'src/stores/media_viewer'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faChevronLeft,
diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index 89561f3e3..cc5bdbcba 100644
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@@ -1,7 +1,8 @@
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'
 import statusPosterService from '../../services/status_poster/status_poster.service.js'
 
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircleNotch, faUpload } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/mention_link/mention_link.js b/src/components/mention_link/mention_link.js
index eb79a95b1..5fa12392e 100644
--- a/src/components/mention_link/mention_link.js
+++ b/src/components/mention_link/mention_link.js
@@ -2,8 +2,6 @@ import { mapState as mapPiniaState } from 'pinia'
 import { defineAsyncComponent } from 'vue'
 import { mapGetters, mapState } from 'vuex'
 
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import {
   highlightClass,
   highlightStyle,
@@ -11,6 +9,10 @@ import {
 import UnicodeDomainIndicator from '../unicode_domain_indicator/unicode_domain_indicator.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faAt } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/mfa_form/recovery_form.js b/src/components/mfa_form/recovery_form.js
index 5fa5c187a..ea857e50e 100644
--- a/src/components/mfa_form/recovery_form.js
+++ b/src/components/mfa_form/recovery_form.js
@@ -1,9 +1,10 @@
 import { mapActions, mapState as mapPiniaState, mapStores } from 'pinia'
 import { mapState } from 'vuex'
 
+import mfaApi from '../../services/new_api/mfa.js'
+
 import { useAuthFlowStore } from 'src/stores/auth_flow.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
-import mfaApi from '../../services/new_api/mfa.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faTimes } from '@fortawesome/free-solid-svg-icons'
diff --git a/src/components/mfa_form/totp_form.js b/src/components/mfa_form/totp_form.js
index d1378b078..ab7754415 100644
--- a/src/components/mfa_form/totp_form.js
+++ b/src/components/mfa_form/totp_form.js
@@ -1,9 +1,10 @@
 import { mapActions, mapState as mapPiniaState, mapStores } from 'pinia'
 import { mapState } from 'vuex'
 
+import mfaApi from '../../services/new_api/mfa.js'
+
 import { useAuthFlowStore } from 'src/stores/auth_flow.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
-import mfaApi from '../../services/new_api/mfa.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faTimes } from '@fortawesome/free-solid-svg-icons'
diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index 33767762e..0123fbe13 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -2,9 +2,6 @@ import { mapState } from 'pinia'
 import { mapGetters } from 'vuex'
 
 import NavigationPins from 'src/components/navigation/navigation_pins.vue'
-import { useAnnouncementsStore } from 'src/stores/announcements'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import GestureService from '../../services/gesture_service/gesture_service'
 import {
   countExtraNotifications,
@@ -14,6 +11,10 @@ import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import Notifications from '../notifications/notifications.vue'
 import SideDrawer from '../side_drawer/side_drawer.vue'
 
+import { useAnnouncementsStore } from 'src/stores/announcements'
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faArrowUp,
diff --git a/src/components/moderation_tools/moderation_tools.js b/src/components/moderation_tools/moderation_tools.js
index f4c5e0470..b30fcb2b9 100644
--- a/src/components/moderation_tools/moderation_tools.js
+++ b/src/components/moderation_tools/moderation_tools.js
@@ -1,7 +1,8 @@
-import { useInstanceStore } from 'src/stores/instance.js'
 import DialogModal from '../dialog_modal/dialog_modal.vue'
 import Popover from '../popover/popover.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronDown } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
index 56fecf9ae..dc5d0c4fb 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -8,6 +8,7 @@ import { filterNavigation } from 'src/components/navigation/filter.js'
 import { ROOT_ITEMS, TIMELINES } from 'src/components/navigation/navigation.js'
 import NavigationEntry from 'src/components/navigation/navigation_entry.vue'
 import NavigationPins from 'src/components/navigation/navigation_pins.vue'
+
 import { useAnnouncementsStore } from 'src/stores/announcements.js'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
diff --git a/src/components/navigation/navigation_entry.js b/src/components/navigation/navigation_entry.js
index 46f1695ad..6469c2f2f 100644
--- a/src/components/navigation/navigation_entry.js
+++ b/src/components/navigation/navigation_entry.js
@@ -3,6 +3,7 @@ import { mapState } from 'vuex'
 
 import { routeTo } from 'src/components/navigation/navigation.js'
 import OptionalRouterLink from 'src/components/optional_router_link/optional_router_link.vue'
+
 import { useAnnouncementsStore } from 'src/stores/announcements'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 
diff --git a/src/components/navigation/navigation_pins.js b/src/components/navigation/navigation_pins.js
index 2f347f9ad..036fd351c 100644
--- a/src/components/navigation/navigation_pins.js
+++ b/src/components/navigation/navigation_pins.js
@@ -12,6 +12,7 @@ import {
   TIMELINES,
 } from 'src/components/navigation/navigation.js'
 import StillImage from 'src/components/still-image/still-image.vue'
+
 import { useAnnouncementsStore } from 'src/stores/announcements'
 import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders'
 import { useInstanceStore } from 'src/stores/instance'
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index 35644d070..f3f5b76da 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -1,9 +1,6 @@
 import { mapState } from 'vuex'
 
 import RichContent from 'src/components/rich_content/rich_content.jsx'
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import { isStatusNotification } from '../../services/notification_utils/notification_utils.js'
 import {
   highlightClass,
@@ -19,6 +16,11 @@ import UserCard from '../user_card/user_card.vue'
 import UserLink from '../user_link/user_link.vue'
 import UserPopover from '../user_popover/user_popover.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faCheck,
diff --git a/src/components/notifications/notification_filters.vue b/src/components/notifications/notification_filters.vue
index d01e5e9ab..5508e03ac 100644
--- a/src/components/notifications/notification_filters.vue
+++ b/src/components/notifications/notification_filters.vue
@@ -106,9 +106,10 @@
 </template>
 
 <script>
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import Popover from '../popover/popover.vue'
 
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faFilter } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index 958471c28..e4b68fccd 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -2,10 +2,6 @@ import { mapState } from 'pinia'
 import { computed } from 'vue'
 import { mapGetters } from 'vuex'
 
-import { useAnnouncementsStore } from 'src/stores/announcements.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import FaviconService from '../../services/favicon_service/favicon_service.js'
 import {
   ACTIONABLE_NOTIFICATION_TYPES,
@@ -19,6 +15,11 @@ import ExtraNotifications from '../extra_notifications/extra_notifications.vue'
 import Notification from '../notification/notification.vue'
 import NotificationFilters from './notification_filters.vue'
 
+import { useAnnouncementsStore } from 'src/stores/announcements.js'
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useInterfaceStore } from 'src/stores/interface.js'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faArrowUp,
diff --git a/src/components/oauth_callback/oauth_callback.js b/src/components/oauth_callback/oauth_callback.js
index 3a1195b14..4bcb9803e 100644
--- a/src/components/oauth_callback/oauth_callback.js
+++ b/src/components/oauth_callback/oauth_callback.js
@@ -1,6 +1,7 @@
+import oauth from '../../services/new_api/oauth.js'
+
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
-import oauth from '../../services/new_api/oauth.js'
 
 const oac = {
   props: ['code'],
diff --git a/src/components/palette_editor/palette_editor.vue b/src/components/palette_editor/palette_editor.vue
index 21b40bccb..58110f3ba 100644
--- a/src/components/palette_editor/palette_editor.vue
+++ b/src/components/palette_editor/palette_editor.vue
@@ -48,11 +48,13 @@
 import { computed } from 'vue'
 
 import ColorInput from 'src/components/color_input/color_input.vue'
+
+import { useInterfaceStore } from 'src/stores/interface'
+
 import {
   newExporter,
   newImporter,
 } from 'src/services/export_import/export_import.js'
-import { useInterfaceStore } from 'src/stores/interface'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faFileExport, faFileImport } from '@fortawesome/free-solid-svg-icons'
diff --git a/src/components/poll/poll.js b/src/components/poll/poll.js
index 42353f240..e92e5feed 100644
--- a/src/components/poll/poll.js
+++ b/src/components/poll/poll.js
@@ -2,9 +2,10 @@ import Checkbox from 'components/checkbox/checkbox.vue'
 import RichContent from 'components/rich_content/rich_content.jsx'
 import Timeago from 'components/timeago/timeago.vue'
 
+import genRandomSeed from '../../services/random_seed/random_seed.service.js'
+
 import { usePollsStore } from 'src/stores/polls'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import genRandomSeed from '../../services/random_seed/random_seed.service.js'
 
 export default {
   name: 'Poll',
diff --git a/src/components/poll/poll_form.js b/src/components/poll/poll_form.js
index 6cd3de2a3..9a66f151e 100644
--- a/src/components/poll/poll_form.js
+++ b/src/components/poll/poll_form.js
@@ -1,7 +1,9 @@
+import Select from '../select/select.vue'
+
+import { useInstanceStore } from 'src/stores/instance.js'
+
 import * as DateUtils from 'src/services/date_utils/date_utils.js'
 import { pollFallback } from 'src/services/poll/poll.service.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import Select from '../select/select.vue'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faPlus, faTimes } from '@fortawesome/free-solid-svg-icons'
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index a42e32fc6..dfcb60e05 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -5,12 +5,6 @@ import { mapGetters } from 'vuex'
 import DraftCloser from 'src/components/draft_closer/draft_closer.vue'
 import Gallery from 'src/components/gallery/gallery.vue'
 import Popover from 'src/components/popover/popover.vue'
-import { pollFormToMasto } from 'src/services/poll/poll.service.js'
-import { useEmojiStore } from 'src/stores/emoji.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-import { useMediaViewerStore } from 'src/stores/media_viewer.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import { propsToNative } from '../../services/attributes_helper/attributes_helper.service.js'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
@@ -26,6 +20,14 @@ import ScopeSelector from '../scope_selector/scope_selector.vue'
 import Select from '../select/select.vue'
 import StatusContent from '../status_content/status_content.vue'
 
+import { useEmojiStore } from 'src/stores/emoji.js'
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useInterfaceStore } from 'src/stores/interface.js'
+import { useMediaViewerStore } from 'src/stores/media_viewer.js'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
+import { pollFormToMasto } from 'src/services/poll/poll.service.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faBan,
diff --git a/src/components/post_status_modal/post_status_modal.js b/src/components/post_status_modal/post_status_modal.js
index 2c643e9db..fad835881 100644
--- a/src/components/post_status_modal/post_status_modal.js
+++ b/src/components/post_status_modal/post_status_modal.js
@@ -1,9 +1,10 @@
 import get from 'lodash/get'
 
-import { usePostStatusStore } from 'src/stores/post_status'
 import Modal from '../modal/modal.vue'
 import PostStatusForm from '../post_status_form/post_status_form.vue'
 
+import { usePostStatusStore } from 'src/stores/post_status'
+
 const PostStatusModal = {
   components: {
     PostStatusForm,
diff --git a/src/components/quick_filter_settings/quick_filter_settings.js b/src/components/quick_filter_settings/quick_filter_settings.js
index 3572dbb18..dbb237e74 100644
--- a/src/components/quick_filter_settings/quick_filter_settings.js
+++ b/src/components/quick_filter_settings/quick_filter_settings.js
@@ -1,9 +1,10 @@
 import { mapState } from 'pinia'
 import { mapGetters } from 'vuex'
 
-import { useInterfaceStore } from 'src/stores/interface'
 import Popover from '../popover/popover.vue'
 
+import { useInterfaceStore } from 'src/stores/interface'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faFilter, faFont, faWrench } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/quick_view_settings/quick_view_settings.js b/src/components/quick_view_settings/quick_view_settings.js
index 6c5a9f667..c305893a0 100644
--- a/src/components/quick_view_settings/quick_view_settings.js
+++ b/src/components/quick_view_settings/quick_view_settings.js
@@ -3,6 +3,7 @@ import { mapGetters } from 'vuex'
 
 import Popover from 'src/components/popover/popover.vue'
 import QuickFilterSettings from 'src/components/quick_filter_settings/quick_filter_settings.vue'
+
 import { useInterfaceStore } from 'src/stores/interface'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index 8d1081acb..ae25e2228 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -2,11 +2,12 @@ import useVuelidate from '@vuelidate/core'
 import { required, requiredIf, sameAs } from '@vuelidate/validators'
 import { mapActions, mapState } from 'vuex'
 
-import { DAY } from 'src/services/date_utils/date_utils.js'
 import localeService from '../../services/locale/locale.service.js'
 import InterfaceLanguageSwitcher from '../interface_language_switcher/interface_language_switcher.vue'
 import TermsOfServicePanel from '../terms_of_service_panel/terms_of_service_panel.vue'
 
+import { DAY } from 'src/services/date_utils/date_utils.js'
+
 const registration = {
   setup() {
     return { v$: useVuelidate() }
diff --git a/src/components/remove_follower_button/remove_follower_button.js b/src/components/remove_follower_button/remove_follower_button.js
index 4009bf76e..43bf3ca39 100644
--- a/src/components/remove_follower_button/remove_follower_button.js
+++ b/src/components/remove_follower_button/remove_follower_button.js
@@ -1,6 +1,7 @@
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 export default {
   props: ['user', 'relationship'],
   data() {
diff --git a/src/components/report/report.js b/src/components/report/report.js
index d6b4a14b5..a51ab0f19 100644
--- a/src/components/report/report.js
+++ b/src/components/report/report.js
@@ -1,11 +1,13 @@
 import RichContent from 'src/components/rich_content/rich_content.jsx'
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useReportsStore } from 'src/stores/reports'
 import Select from '../select/select.vue'
 import StatusContent from '../status_content/status_content.vue'
 import Timeago from '../timeago/timeago.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useReportsStore } from 'src/stores/reports'
+
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+
 const Report = {
   props: ['reportId'],
   components: {
diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx
index 99dd8035d..3a6f0b1bc 100644
--- a/src/components/rich_content/rich_content.jsx
+++ b/src/components/rich_content/rich_content.jsx
@@ -5,6 +5,7 @@ import { MENTIONS_LIMIT } from 'src/components/mentions_line/mentions_line.js'
 import MentionsLine from 'src/components/mentions_line/mentions_line.vue'
 import StillImage from 'src/components/still-image/still-image.vue'
 import StillImageEmojiPopover from 'src/components/still-image/still-image-emoji-popover.vue'
+
 import { convertHtmlToLines } from 'src/services/html_converter/html_line_converter.service.js'
 import { convertHtmlToTree } from 'src/services/html_converter/html_tree_converter.service.js'
 import {
diff --git a/src/components/settings_modal/admin_tabs/emoji_tab.js b/src/components/settings_modal/admin_tabs/emoji_tab.js
index a066776b8..eda57273f 100644
--- a/src/components/settings_modal/admin_tabs/emoji_tab.js
+++ b/src/components/settings_modal/admin_tabs/emoji_tab.js
@@ -6,13 +6,14 @@ import StillImage from 'components/still-image/still-image.vue'
 import { assign, clone } from 'lodash'
 
 import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface'
 import EmojiEditingPopover from '../helpers/emoji_editing_popover.vue'
 import ModifiedIndicator from '../helpers/modified_indicator.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import StringSetting from '../helpers/string_setting.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useInterfaceStore } from 'src/stores/interface'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faArrowsRotate,
diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.js b/src/components/settings_modal/admin_tabs/frontends_tab.js
index 7563adae0..a7f16a0d4 100644
--- a/src/components/settings_modal/admin_tabs/frontends_tab.js
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.js
@@ -1,6 +1,5 @@
 import PanelLoading from 'src/components/panel_loading/panel_loading.vue'
 import Popover from 'src/components/popover/popover.vue'
-import { useInterfaceStore } from 'src/stores/interface'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import GroupSetting from '../helpers/group_setting.vue'
@@ -8,6 +7,8 @@ import IntegerSetting from '../helpers/integer_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import StringSetting from '../helpers/string_setting.vue'
 
+import { useInterfaceStore } from 'src/stores/interface'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faGlobe } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/settings_modal/helpers/attachment_setting.js b/src/components/settings_modal/helpers/attachment_setting.js
index 694c168e0..7ba910950 100644
--- a/src/components/settings_modal/helpers/attachment_setting.js
+++ b/src/components/settings_modal/helpers/attachment_setting.js
@@ -1,9 +1,11 @@
 import Attachment from 'src/components/attachment/attachment.vue'
 import MediaUpload from 'src/components/media_upload/media_upload.vue'
-import { fileTypeExt } from 'src/services/file_type/file_type.service.js'
-import { useInstanceStore } from 'src/stores/instance.js'
 import Setting from './setting.js'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
+import { fileTypeExt } from 'src/services/file_type/file_type.service.js'
+
 export default {
   ...Setting,
   props: {
diff --git a/src/components/settings_modal/helpers/pwa_manifest_icons_setting.js b/src/components/settings_modal/helpers/pwa_manifest_icons_setting.js
index dd80ab54d..5d90ccb1e 100644
--- a/src/components/settings_modal/helpers/pwa_manifest_icons_setting.js
+++ b/src/components/settings_modal/helpers/pwa_manifest_icons_setting.js
@@ -3,10 +3,12 @@ import { clone } from 'lodash'
 import Attachment from 'src/components/attachment/attachment.vue'
 import MediaUpload from 'src/components/media_upload/media_upload.vue'
 import Select from 'src/components/select/select.vue'
-import { fileTypeExt } from 'src/services/file_type/file_type.service.js'
-import { useInstanceStore } from 'src/stores/instance.js'
 import Setting from './setting.js'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
+import { fileTypeExt } from 'src/services/file_type/file_type.service.js'
+
 export default {
   ...Setting,
   components: {
diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js
index 522d2ad0a..a959912c9 100644
--- a/src/components/settings_modal/helpers/setting.js
+++ b/src/components/settings_modal/helpers/setting.js
@@ -1,11 +1,12 @@
 import { cloneDeep, get, isEqual, set } from 'lodash'
 
+import DraftButtons from './draft_buttons.vue'
+import ModifiedIndicator from './modified_indicator.vue'
+import ProfileSettingIndicator from './profile_setting_indicator.vue'
+
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import DraftButtons from './draft_buttons.vue'
-import ModifiedIndicator from './modified_indicator.vue'
-import ProfileSettingIndicator from './profile_setting_indicator.vue'
 
 export default {
   components: {
diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index 4517c3295..1d6da7068 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -6,13 +6,15 @@ import Checkbox from 'src/components/checkbox/checkbox.vue'
 import ConfirmModal from 'src/components/confirm_modal/confirm_modal.vue'
 import Modal from 'src/components/modal/modal.vue'
 import PanelLoading from 'src/components/panel_loading/panel_loading.vue'
+import Popover from '../popover/popover.vue'
+
+import { useInterfaceStore } from 'src/stores/interface'
+
 import {
   newExporter,
   newImporter,
 } from 'src/services/export_import/export_import.js'
 import getResettableAsyncComponent from 'src/services/resettable_async_component.js'
-import { useInterfaceStore } from 'src/stores/interface'
-import Popover from '../popover/popover.vue'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faWindowMinimize } from '@fortawesome/free-regular-svg-icons'
diff --git a/src/components/settings_modal/settings_modal_admin_content.js b/src/components/settings_modal/settings_modal_admin_content.js
index 1a3f10e77..98c82d980 100644
--- a/src/components/settings_modal/settings_modal_admin_content.js
+++ b/src/components/settings_modal/settings_modal_admin_content.js
@@ -1,4 +1,3 @@
-import { useInterfaceStore } from 'src/stores/interface'
 import AuthTab from './admin_tabs/auth_tab.vue'
 import EmojiTab from './admin_tabs/emoji_tab.vue'
 import FederationTab from './admin_tabs/federation_tab.vue'
@@ -18,6 +17,8 @@ import RegistrationsTab from './admin_tabs/registrations_tab.vue'
 import UploadsTab from './admin_tabs/uploads_tab.vue'
 import VerticalTabSwitcher from './helpers/vertical_tab_switcher.jsx'
 
+import { useInterfaceStore } from 'src/stores/interface'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faChain,
diff --git a/src/components/settings_modal/settings_modal_user_content.js b/src/components/settings_modal/settings_modal_user_content.js
index f66099049..247811840 100644
--- a/src/components/settings_modal/settings_modal_user_content.js
+++ b/src/components/settings_modal/settings_modal_user_content.js
@@ -1,4 +1,3 @@
-import { useInterfaceStore } from 'src/stores/interface'
 import VerticalTabSwitcher from './helpers/vertical_tab_switcher.jsx'
 import AppearanceTab from './tabs/appearance_tab.vue'
 import ClutterTab from './tabs/clutter_tab.vue'
@@ -16,6 +15,8 @@ import ProfileTab from './tabs/profile_tab.vue'
 import SecurityTab from './tabs/security_tab/security_tab.vue'
 import StyleTab from './tabs/style_tab/style_tab.vue'
 
+import { useInterfaceStore } from 'src/stores/interface'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faBell,
diff --git a/src/components/settings_modal/tabs/appearance_tab.js b/src/components/settings_modal/tabs/appearance_tab.js
index 1db46d5c1..b0f980eac 100644
--- a/src/components/settings_modal/tabs/appearance_tab.js
+++ b/src/components/settings_modal/tabs/appearance_tab.js
@@ -2,6 +2,19 @@ import { mapActions } from 'pinia'
 
 import fileSizeFormatService from 'src/components/../services/file_size_format/file_size_format.js'
 import PaletteEditor from 'src/components/palette_editor/palette_editor.vue'
+import BooleanSetting from '../helpers/boolean_setting.vue'
+import ChoiceSetting from '../helpers/choice_setting.vue'
+import FloatSetting from '../helpers/float_setting.vue'
+import IntegerSetting from '../helpers/integer_setting.vue'
+import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue'
+import SharedComputedObject from '../helpers/shared_computed_object.js'
+import UnitSetting from '../helpers/unit_setting.vue'
+import Preview from './old_theme_tab/theme_preview.vue'
+
+import { useInstanceStore } from 'src/stores/instance.js'
+import { normalizeThemeData, useInterfaceStore } from 'src/stores/interface'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 import { newImporter } from 'src/services/export_import/export_import.js'
 import {
   adoptStyleSheets,
@@ -11,17 +24,6 @@ import { getCssRules } from 'src/services/theme_data/css_utils.js'
 import { deserialize } from 'src/services/theme_data/iss_deserializer.js'
 import { init } from 'src/services/theme_data/theme_data_3.service.js'
 import { convertTheme2To3 } from 'src/services/theme_data/theme2_to_theme3.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { normalizeThemeData, useInterfaceStore } from 'src/stores/interface'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import BooleanSetting from '../helpers/boolean_setting.vue'
-import ChoiceSetting from '../helpers/choice_setting.vue'
-import FloatSetting from '../helpers/float_setting.vue'
-import IntegerSetting from '../helpers/integer_setting.vue'
-import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue'
-import SharedComputedObject from '../helpers/shared_computed_object.js'
-import UnitSetting from '../helpers/unit_setting.vue'
-import Preview from './old_theme_tab/theme_preview.vue'
 
 const AppearanceTab = {
   data() {
diff --git a/src/components/settings_modal/tabs/clutter_tab.js b/src/components/settings_modal/tabs/clutter_tab.js
index 3504511fd..5f12fdf97 100644
--- a/src/components/settings_modal/tabs/clutter_tab.js
+++ b/src/components/settings_modal/tabs/clutter_tab.js
@@ -4,8 +4,6 @@ import { mapState as mapVuexState } from 'vuex'
 
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import Select from 'src/components/select/select.vue'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import HelpIndicator from '../helpers/help_indicator.vue'
@@ -13,6 +11,9 @@ import IntegerSetting from '../helpers/integer_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import UnitSetting from '../helpers/unit_setting.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 const ClutterTab = {
   components: {
     BooleanSetting,
diff --git a/src/components/settings_modal/tabs/composing_tab.js b/src/components/settings_modal/tabs/composing_tab.js
index 6655fb549..675a45f4f 100644
--- a/src/components/settings_modal/tabs/composing_tab.js
+++ b/src/components/settings_modal/tabs/composing_tab.js
@@ -4,10 +4,6 @@ import FontControl from 'src/components/font_control/font_control.vue'
 import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
 import ScopeSelector from 'src/components/scope_selector/scope_selector.vue'
 import Select from 'src/components/select/select.vue'
-import localeService from 'src/services/locale/locale.service.js'
-import { cacheKey, clearCache, emojiCacheKey } from 'src/services/sw/sw.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import FloatSetting from '../helpers/float_setting.vue'
@@ -16,6 +12,12 @@ import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import UnitSetting from '../helpers/unit_setting.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
+import localeService from 'src/services/locale/locale.service.js'
+import { cacheKey, clearCache, emojiCacheKey } from 'src/services/sw/sw.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faDatabase,
diff --git a/src/components/settings_modal/tabs/data_import_export_tab.js b/src/components/settings_modal/tabs/data_import_export_tab.js
index dcd63416b..7a2bf1d4f 100644
--- a/src/components/settings_modal/tabs/data_import_export_tab.js
+++ b/src/components/settings_modal/tabs/data_import_export_tab.js
@@ -3,6 +3,7 @@ import { mapState } from 'vuex'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import Exporter from 'src/components/exporter/exporter.vue'
 import Importer from 'src/components/importer/importer.vue'
+
 import { useOAuthTokensStore } from 'src/stores/oauth_tokens'
 
 const DataImportExportTab = {
diff --git a/src/components/settings_modal/tabs/developer_tab.js b/src/components/settings_modal/tabs/developer_tab.js
index 0bc258670..11e552463 100644
--- a/src/components/settings_modal/tabs/developer_tab.js
+++ b/src/components/settings_modal/tabs/developer_tab.js
@@ -1,10 +1,12 @@
 import { mapState } from 'pinia'
 
-import { cacheKey, clearCache, emojiCacheKey } from 'src/services/sw/sw.js'
-import { useInstanceStore } from 'src/stores/instance.js'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
+import { cacheKey, clearCache, emojiCacheKey } from 'src/services/sw/sw.js'
+
 const pleromaFeCommitUrl =
   'https://git.pleroma.social/pleroma/pleroma-fe/commit/'
 
diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js
index 03ad36c1b..593b5e264 100644
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -4,13 +4,6 @@ import { v4 as uuidv4 } from 'uuid'
 
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import Select from 'src/components/select/select.vue'
-import {
-  newExporter,
-  newImporter,
-} from 'src/services/export_import/export_import.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import HelpIndicator from '../helpers/help_indicator.vue'
@@ -18,6 +11,15 @@ import IntegerSetting from '../helpers/integer_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import UnitSetting from '../helpers/unit_setting.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useInterfaceStore } from 'src/stores/interface'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
+import {
+  newExporter,
+  newImporter,
+} from 'src/services/export_import/export_import.js'
+
 const SUPPORTED_TYPES = new Set(['word', 'regexp', 'user', 'user_regexp'])
 
 const FilteringTab = {
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index b8cbcdefa..25f9f96a9 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -2,9 +2,6 @@ import { mapState } from 'pinia'
 
 import FontControl from 'src/components/font_control/font_control.vue'
 import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
-import localeService from 'src/services/locale/locale.service.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import FloatSetting from '../helpers/float_setting.vue'
@@ -12,6 +9,11 @@ import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import UnitSetting from '../helpers/unit_setting.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
+import localeService from 'src/services/locale/locale.service.js'
+
 const GeneralTab = {
   props: {
     parentCollapsed: {
@@ -48,6 +50,7 @@ const GeneralTab = {
           path: 'simple.interfaceLanguage',
           value: val,
         })
+        useSyncConfigStore().pushSyncConfig()
       },
     },
     ...SharedComputedObject(),
diff --git a/src/components/settings_modal/tabs/layout_tab.js b/src/components/settings_modal/tabs/layout_tab.js
index d36ba123b..61dc4d664 100644
--- a/src/components/settings_modal/tabs/layout_tab.js
+++ b/src/components/settings_modal/tabs/layout_tab.js
@@ -1,11 +1,12 @@
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import UnitSetting from '../helpers/unit_setting.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 const GeneralTab = {
   props: {
     parentCollapsed: {
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 e778c4941..17c28c303 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
@@ -12,6 +12,7 @@ import MuteCard from 'src/components/mute_card/mute_card.vue'
 import ProgressButton from 'src/components/progress_button/progress_button.vue'
 import SelectableList from 'src/components/selectable_list/selectable_list.vue'
 import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
+
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthTokensStore } from 'src/stores/oauth_tokens'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
diff --git a/src/components/settings_modal/tabs/old_theme_tab/old_theme_tab.js b/src/components/settings_modal/tabs/old_theme_tab/old_theme_tab.js
index 1a637a96a..51c9d3fad 100644
--- a/src/components/settings_modal/tabs/old_theme_tab/old_theme_tab.js
+++ b/src/components/settings_modal/tabs/old_theme_tab/old_theme_tab.js
@@ -7,6 +7,12 @@ import RangeInput from 'src/components/range_input/range_input.vue'
 import Select from 'src/components/select/select.vue'
 import ShadowControl from 'src/components/shadow_control/shadow_control.vue'
 import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
+import Preview from './theme_preview.vue'
+
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useInterfaceStore } from 'src/stores/interface'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 import {
   getContrastRatioLayers,
   hex2rgb,
@@ -41,10 +47,6 @@ import {
 } from 'src/services/theme_data/theme_data.service.js'
 import { init } from 'src/services/theme_data/theme_data_3.service.js'
 import { convertTheme2To3 } from 'src/services/theme_data/theme2_to_theme3.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import Preview from './theme_preview.vue'
 
 // List of color values used in v1
 const v1OnlyNames = [
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 87a70af2a..5b4780085 100644
--- a/src/components/settings_modal/tabs/security_tab/security_tab.js
+++ b/src/components/settings_modal/tabs/security_tab/security_tab.js
@@ -1,9 +1,11 @@
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import ProgressButton from 'src/components/progress_button/progress_button.vue'
-import localeService from 'src/services/locale/locale.service.js'
+import Mfa from './mfa.vue'
+
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthTokensStore } from 'src/stores/oauth_tokens'
-import Mfa from './mfa.vue'
+
+import localeService from 'src/services/locale/locale.service.js'
 
 const SecurityTab = {
   data() {
diff --git a/src/components/settings_modal/tabs/style_tab/style_tab.js b/src/components/settings_modal/tabs/style_tab/style_tab.js
index 7fa55761a..6c2366999 100644
--- a/src/components/settings_modal/tabs/style_tab/style_tab.js
+++ b/src/components/settings_modal/tabs/style_tab/style_tab.js
@@ -20,6 +20,12 @@ import SelectMotion from 'src/components/select/select_motion.vue'
 import ShadowControl from 'src/components/shadow_control/shadow_control.vue'
 import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
 import Tooltip from 'src/components/tooltip/tooltip.vue'
+import StringSetting from '../../helpers/string_setting.vue'
+import Preview from '../old_theme_tab/theme_preview.vue'
+import VirtualDirectivesTab from './virtual_directives_tab.vue'
+
+import { useInterfaceStore } from 'src/stores/interface'
+
 import {
   getContrastRatio,
   hex2rgb,
@@ -43,10 +49,6 @@ import {
   findColor,
   init,
 } from 'src/services/theme_data/theme_data_3.service.js'
-import { useInterfaceStore } from 'src/stores/interface'
-import StringSetting from '../../helpers/string_setting.vue'
-import Preview from '../old_theme_tab/theme_preview.vue'
-import VirtualDirectivesTab from './virtual_directives_tab.vue'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
diff --git a/src/components/settings_modal/tabs/style_tab/virtual_directives_tab.js b/src/components/settings_modal/tabs/style_tab/virtual_directives_tab.js
index d52c0084c..70a24010b 100644
--- a/src/components/settings_modal/tabs/style_tab/virtual_directives_tab.js
+++ b/src/components/settings_modal/tabs/style_tab/virtual_directives_tab.js
@@ -4,6 +4,7 @@ import ColorInput from 'src/components/color_input/color_input.vue'
 import Select from 'src/components/select/select.vue'
 import SelectMotion from 'src/components/select/select_motion.vue'
 import ShadowControl from 'src/components/shadow_control/shadow_control.vue'
+
 import { serializeShadow } from 'src/services/theme_data/iss_serializer.js'
 
 // helper for debugging
diff --git a/src/components/shadow_control/shadow_control.js b/src/components/shadow_control/shadow_control.js
index a7613923c..066fe9d71 100644
--- a/src/components/shadow_control/shadow_control.js
+++ b/src/components/shadow_control/shadow_control.js
@@ -7,6 +7,7 @@ import OpacityInput from 'src/components/opacity_input/opacity_input.vue'
 import Popover from 'src/components/popover/popover.vue'
 import Select from 'src/components/select/select.vue'
 import SelectMotion from 'src/components/select/select_motion.vue'
+
 import { rgb2hex } from 'src/services/color_convert/color_convert.js'
 import {
   getCssShadow,
diff --git a/src/components/shout_panel/shout_panel.js b/src/components/shout_panel/shout_panel.js
index 8725697d6..1dba50b2c 100644
--- a/src/components/shout_panel/shout_panel.js
+++ b/src/components/shout_panel/shout_panel.js
@@ -1,7 +1,8 @@
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useShoutStore } from 'src/stores/shout'
 
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faBullhorn, faTimes } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
index d371d314d..191668caa 100644
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@@ -2,13 +2,14 @@ import { mapState as mapPiniaState } from 'pinia'
 import { mapGetters, mapState } from 'vuex'
 
 import { USERNAME_ROUTES } from 'src/components/navigation/navigation.js'
+import GestureService from '../../services/gesture_service/gesture_service'
+import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
+import UserCard from '../user_card/user_card.vue'
+
 import { useAnnouncementsStore } from 'src/stores/announcements'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInterfaceStore } from 'src/stores/interface'
 import { useShoutStore } from 'src/stores/shout'
-import GestureService from '../../services/gesture_service/gesture_service'
-import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
-import UserCard from '../user_card/user_card.vue'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
diff --git a/src/components/staff_panel/staff_panel.js b/src/components/staff_panel/staff_panel.js
index d3b33cdb6..73821e30b 100644
--- a/src/components/staff_panel/staff_panel.js
+++ b/src/components/staff_panel/staff_panel.js
@@ -2,9 +2,10 @@ import groupBy from 'lodash/groupBy'
 import map from 'lodash/map'
 import { mapGetters, mapState } from 'vuex'
 
-import { useInstanceStore } from 'src/stores/instance.js'
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
 const StaffPanel = {
   created() {
     const nicknames = useInstanceStore().staffAccounts
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 3173ab897..4e8f6c74c 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -5,9 +5,6 @@ import MentionLink from 'src/components/mention_link/mention_link.vue'
 import MentionsLine from 'src/components/mentions_line/mentions_line.vue'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
 import StatusActionButtons from 'src/components/status_action_buttons/status_action_buttons.vue'
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import { muteFilterHits } from '../../services/status_parser/status_parser.js'
 import {
   highlightClass,
@@ -24,6 +21,11 @@ import UserLink from '../user_link/user_link.vue'
 import UserListPopover from '../user_list_popover/user_list_popover.vue'
 import UserPopover from '../user_popover/user_popover.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faAngleDoubleRight,
diff --git a/src/components/status_action_buttons/action_button.js b/src/components/status_action_buttons/action_button.js
index d5c68422a..518ca9593 100644
--- a/src/components/status_action_buttons/action_button.js
+++ b/src/components/status_action_buttons/action_button.js
@@ -1,6 +1,7 @@
 import EmojiPicker from 'src/components/emoji_picker/emoji_picker.vue'
 import Popover from 'src/components/popover/popover.vue'
 import StatusBookmarkFolderMenu from 'src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.vue'
+
 import { useInstanceStore } from 'src/stores/instance.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
diff --git a/src/components/status_action_buttons/status_action_buttons.js b/src/components/status_action_buttons/status_action_buttons.js
index a39faaa3e..6e0b88190 100644
--- a/src/components/status_action_buttons/status_action_buttons.js
+++ b/src/components/status_action_buttons/status_action_buttons.js
@@ -2,12 +2,14 @@ import { mapState } from 'pinia'
 
 import ConfirmModal from 'src/components/confirm_modal/confirm_modal.vue'
 import Popover from 'src/components/popover/popover.vue'
-import genRandomSeed from 'src/services/random_seed/random_seed.service.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import ActionButtonContainer from './action_button_container.vue'
 import { BUTTONS } from './buttons_definitions.js'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
+import genRandomSeed from 'src/services/random_seed/random_seed.service.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faEllipsisH } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/status_body/status_body.js b/src/components/status_body/status_body.js
index 5855d223e..217e7e29c 100644
--- a/src/components/status_body/status_body.js
+++ b/src/components/status_body/status_body.js
@@ -2,9 +2,11 @@ import { mapState } from 'pinia'
 import { mapGetters } from 'vuex'
 
 import RichContent from 'src/components/rich_content/rich_content.jsx'
-import fileType from 'src/services/file_type/file_type.service'
+
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 
+import fileType from 'src/services/file_type/file_type.service'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faFile,
diff --git a/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.js b/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.js
index 4aa617832..17ea62f99 100644
--- a/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.js
+++ b/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.js
@@ -2,6 +2,7 @@ import { mapState } from 'pinia'
 
 import Popover from 'src/components/popover/popover.vue'
 import StillImage from 'src/components/still-image/still-image.vue'
+
 import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index 5a6eb5e7a..a8493eef4 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -2,13 +2,14 @@ import { mapState as mapPiniaState } from 'pinia'
 import { mapGetters, mapState } from 'vuex'
 
 import StatusBody from 'src/components/status_body/status_body.vue'
-import { useMediaViewerStore } from 'src/stores/media_viewer'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import Attachment from '../attachment/attachment.vue'
 import Gallery from '../gallery/gallery.vue'
 import LinkPreview from '../link-preview/link-preview.vue'
 import Poll from '../poll/poll.vue'
 
+import { useMediaViewerStore } from 'src/stores/media_viewer'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faCircleNotch,
diff --git a/src/components/status_history_modal/status_history_modal.js b/src/components/status_history_modal/status_history_modal.js
index 1ad48ace3..9b518a10d 100644
--- a/src/components/status_history_modal/status_history_modal.js
+++ b/src/components/status_history_modal/status_history_modal.js
@@ -1,9 +1,10 @@
 import { get } from 'lodash'
 
-import { useStatusHistoryStore } from 'src/stores/statusHistory'
 import Modal from '../modal/modal.vue'
 import Status from '../status/status.vue'
 
+import { useStatusHistoryStore } from 'src/stores/statusHistory'
+
 const StatusHistoryModal = {
   components: {
     Modal,
diff --git a/src/components/sticker_picker/sticker_picker.js b/src/components/sticker_picker/sticker_picker.js
index 0b9feae4a..92c4ade60 100644
--- a/src/components/sticker_picker/sticker_picker.js
+++ b/src/components/sticker_picker/sticker_picker.js
@@ -1,9 +1,10 @@
 /* eslint-env browser */
 
-import { useInstanceStore } from 'src/stores/instance.js'
 import statusPosterService from '../../services/status_poster/status_poster.service.js'
 import TabSwitcher from '../tab_switcher/tab_switcher.jsx'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
 const StickerPicker = {
   components: {
     TabSwitcher,
diff --git a/src/components/still-image/still-image-emoji-popover.vue b/src/components/still-image/still-image-emoji-popover.vue
index b53234b2a..4e087c094 100644
--- a/src/components/still-image/still-image-emoji-popover.vue
+++ b/src/components/still-image/still-image-emoji-popover.vue
@@ -60,9 +60,10 @@ import Popover from 'components/popover/popover.vue'
 import SelectComponent from 'components/select/select.vue'
 import { assign } from 'lodash'
 
+import StillImage from './still-image.vue'
+
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInterfaceStore } from 'src/stores/interface'
-import StillImage from './still-image.vue'
 
 export default {
   components: { StillImage, Popover, SelectComponent },
diff --git a/src/components/timeago/timeago.vue b/src/components/timeago/timeago.vue
index 9f6b54a5e..e7d91a552 100644
--- a/src/components/timeago/timeago.vue
+++ b/src/components/timeago/timeago.vue
@@ -8,9 +8,10 @@
 </template>
 
 <script>
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 import * as DateUtils from 'src/services/date_utils/date_utils.js'
 import localeService from 'src/services/locale/locale.service.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 
 export default {
   name: 'Timeago',
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 4521e0db6..450506622 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -1,10 +1,6 @@
 import { debounce, keyBy, throttle } from 'lodash'
 import { mapState } from 'pinia'
 
-import timelineFetcher from 'src/services/timeline_fetcher/timeline_fetcher.service.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import Conversation from '../conversation/conversation.vue'
 import QuickFilterSettings from '../quick_filter_settings/quick_filter_settings.vue'
 import QuickViewSettings from '../quick_view_settings/quick_view_settings.vue'
@@ -12,6 +8,12 @@ import ScrollTopButton from '../scroll_top_button/scroll_top_button.vue'
 import Status from '../status/status.vue'
 import TimelineMenu from '../timeline_menu/timeline_menu.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useInterfaceStore } from 'src/stores/interface'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
+import timelineFetcher from 'src/services/timeline_fetcher/timeline_fetcher.service.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faArrowUp,
diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js
index cbca4823c..1aeb3e2a5 100644
--- a/src/components/timeline_menu/timeline_menu.js
+++ b/src/components/timeline_menu/timeline_menu.js
@@ -4,13 +4,14 @@ import { mapState } from 'vuex'
 import { filterNavigation } from 'src/components/navigation/filter.js'
 import { TIMELINES } from 'src/components/navigation/navigation.js'
 import NavigationEntry from 'src/components/navigation/navigation_entry.vue'
+import BookmarkFoldersMenuContent from '../bookmark_folders_menu/bookmark_folders_menu_content.vue'
+import ListsMenuContent from '../lists_menu/lists_menu_content.vue'
+import Popover from '../popover/popover.vue'
+
 import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInterfaceStore } from 'src/stores/interface'
 import { useListsStore } from 'src/stores/lists'
-import BookmarkFoldersMenuContent from '../bookmark_folders_menu/bookmark_folders_menu_content.vue'
-import ListsMenuContent from '../lists_menu/lists_menu_content.vue'
-import Popover from '../popover/popover.vue'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronDown } from '@fortawesome/free-solid-svg-icons'
diff --git a/src/components/update_notification/update_notification.js b/src/components/update_notification/update_notification.js
index c37927e4f..78aaa79e8 100644
--- a/src/components/update_notification/update_notification.js
+++ b/src/components/update_notification/update_notification.js
@@ -1,9 +1,11 @@
-import pleromaTanFoxMask from 'src/assets/pleromatan_apology_fox_mask.png'
-import pleromaTanMask from 'src/assets/pleromatan_apology_mask.png'
 import Modal from 'src/components/modal/modal.vue'
+
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 
+import pleromaTanFoxMask from 'src/assets/pleromatan_apology_fox_mask.png'
+import pleromaTanMask from 'src/assets/pleromatan_apology_mask.png'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faTimes } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/user_avatar/user_avatar.js b/src/components/user_avatar/user_avatar.js
index f193f8eb2..12c31fc35 100644
--- a/src/components/user_avatar/user_avatar.js
+++ b/src/components/user_avatar/user_avatar.js
@@ -1,6 +1,7 @@
+import StillImage from '../still-image/still-image.vue'
+
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInterfaceStore } from 'src/stores/interface'
-import StillImage from '../still-image/still-image.vue'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faPeopleGroup, faRobot } from '@fortawesome/free-solid-svg-icons'
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index af98bab94..6240af037 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -12,13 +12,6 @@ import suggestor from 'src/components/emoji_input/suggestor.js'
 import ImageCropper from 'src/components/image_cropper/image_cropper.vue'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
 import UserTimedFilterModal from 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue'
-import { propsToNative } from 'src/services/attributes_helper/attributes_helper.service.js'
-import localeService from 'src/services/locale/locale.service.js'
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
-import { useEmojiStore } from 'src/stores/emoji.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { usePostStatusStore } from 'src/stores/post_status'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import { useInterfaceStore } from '../../stores/interface'
 import { useMediaViewerStore } from '../../stores/media_viewer'
 import AccountActions from '../account_actions/account_actions.vue'
@@ -31,6 +24,15 @@ import UserAvatar from '../user_avatar/user_avatar.vue'
 import UserLink from '../user_link/user_link.vue'
 import UserNote from '../user_note/user_note.vue'
 
+import { useEmojiStore } from 'src/stores/emoji.js'
+import { useInstanceStore } from 'src/stores/instance.js'
+import { usePostStatusStore } from 'src/stores/post_status'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
+import { propsToNative } from 'src/services/attributes_helper/attributes_helper.service.js'
+import localeService from 'src/services/locale/locale.service.js'
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faBell,
diff --git a/src/components/user_link/user_link.vue b/src/components/user_link/user_link.vue
index 4bb1822c9..e8a4ac4a7 100644
--- a/src/components/user_link/user_link.vue
+++ b/src/components/user_link/user_link.vue
@@ -14,10 +14,12 @@
 </template>
 
 <script>
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
-import { useInstanceStore } from 'src/stores/instance.js'
 import UnicodeDomainIndicator from '../unicode_domain_indicator/unicode_domain_indicator.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+
 const UserLink = {
   props: {
     user: Object,
diff --git a/src/components/user_list_menu/user_list_menu.js b/src/components/user_list_menu/user_list_menu.js
index b30a8808f..61e5b9096 100644
--- a/src/components/user_list_menu/user_list_menu.js
+++ b/src/components/user_list_menu/user_list_menu.js
@@ -1,9 +1,10 @@
 import { mapState } from 'pinia'
 
-import { useListsStore } from 'src/stores/lists'
 import DialogModal from '../dialog_modal/dialog_modal.vue'
 import Popover from '../popover/popover.vue'
 
+import { useListsStore } from 'src/stores/lists'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronRight } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/user_popover/user_popover.js b/src/components/user_popover/user_popover.js
index d11b17e2c..8134f29e1 100644
--- a/src/components/user_popover/user_popover.js
+++ b/src/components/user_popover/user_popover.js
@@ -1,9 +1,10 @@
 import { mapState } from 'pinia'
 import { defineAsyncComponent } from 'vue'
 
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import UserCard from '../user_card/user_card.vue'
 
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 const UserPopover = {
   name: 'UserPopover',
   props: ['userId', 'overlayCenters', 'disabled', 'overlayCentersSelector'],
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 36e5019d1..567518c34 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -2,8 +2,6 @@ import get from 'lodash/get'
 
 import RichContent from 'src/components/rich_content/rich_content.jsx'
 import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import withLoadMore from '../../hocs/with_load_more/with_load_more'
 import Conversation from '../conversation/conversation.vue'
 import FollowCard from '../follow_card/follow_card.vue'
@@ -11,6 +9,9 @@ import List from '../list/list.vue'
 import Timeline from '../timeline/timeline.vue'
 import UserCard from '../user_card/user_card.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/src/components/user_reporting_modal/user_reporting_modal.js b/src/components/user_reporting_modal/user_reporting_modal.js
index 39c264d5b..aee741c7f 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.js
+++ b/src/components/user_reporting_modal/user_reporting_modal.js
@@ -1,10 +1,11 @@
-import { useReportsStore } from 'src/stores/reports'
 import Checkbox from '../checkbox/checkbox.vue'
 import List from '../list/list.vue'
 import Modal from '../modal/modal.vue'
 import Status from '../status/status.vue'
 import UserLink from '../user_link/user_link.vue'
 
+import { useReportsStore } from 'src/stores/reports'
+
 const UserReportingModal = {
   components: {
     Status,
diff --git a/src/components/user_timed_filter_modal/user_timed_filter_modal.js b/src/components/user_timed_filter_modal/user_timed_filter_modal.js
index ac22ca38f..a06c5db59 100644
--- a/src/components/user_timed_filter_modal/user_timed_filter_modal.js
+++ b/src/components/user_timed_filter_modal/user_timed_filter_modal.js
@@ -1,9 +1,11 @@
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import ConfirmModal from 'src/components/confirm_modal/confirm_modal.vue'
 import Select from 'src/components/select/select.vue'
-import { durationStrToMs } from 'src/services/date_utils/date_utils.js'
+
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 
+import { durationStrToMs } from 'src/services/date_utils/date_utils.js'
+
 const UserTimedFilterModal = {
   data() {
     const action = this.isMute
diff --git a/src/components/who_to_follow/who_to_follow.js b/src/components/who_to_follow/who_to_follow.js
index 230c685b7..720b15041 100644
--- a/src/components/who_to_follow/who_to_follow.js
+++ b/src/components/who_to_follow/who_to_follow.js
@@ -1,7 +1,8 @@
-import { useInstanceStore } from 'src/stores/instance.js'
 import apiService from '../../services/api/api.service.js'
 import FollowCard from '../follow_card/follow_card.vue'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
 const WhoToFollow = {
   components: {
     FollowCard,
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 ce01ad815..bbb22ab92 100644
--- a/src/components/who_to_follow_panel/who_to_follow_panel.js
+++ b/src/components/who_to_follow_panel/who_to_follow_panel.js
@@ -1,9 +1,11 @@
 import { shuffle } from 'lodash'
 
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
-import { useInstanceStore } from 'src/stores/instance.js'
 import apiService from '../../services/api/api.service.js'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+
 function showWhoToFollow(panel, reply) {
   const shuffled = shuffle(reply)
 
diff --git a/src/lib/language.js b/src/lib/language.js
new file mode 100644
index 000000000..f99e16971
--- /dev/null
+++ b/src/lib/language.js
@@ -0,0 +1,25 @@
+import Cookies from 'js-cookie'
+
+import { useEmojiStore } from 'src/stores/emoji.js'
+import { useI18nStore } from 'src/stores/i18n.js'
+
+import messages from 'src/i18n/messages'
+import localeService from 'src/services/locale/locale.service.js'
+
+const BACKEND_LANGUAGE_COOKIE_NAME = 'userLanguage'
+
+export const piniaLanguagePlugin = ({ store, options }) => {
+  if (store.$id === 'sync_config') {
+    store.$onAction(({ name, args }) => {
+      const { path, value } = args[0]
+      if (name === 'setPreference' && path === 'simple.interfaceLanguage') {
+        messages.setLanguage(useI18nStore().i18n, value)
+        useEmojiStore().loadUnicodeEmojiData(value)
+        Cookies.set(
+          BACKEND_LANGUAGE_COOKIE_NAME,
+          localeService.internalToBackendLocaleMulti(value),
+        )
+      }
+    })
+  }
+}
diff --git a/src/lib/language_plugin.js b/src/lib/language_plugin.js
deleted file mode 100644
index 1dd079b52..000000000
--- a/src/lib/language_plugin.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const piniaLanguagePlugin = ({ store, options }) => {
-  if (store.$id === 'syncConfig') {
-    store.$onAction(({ store }) => {
-      console.log(store)
-    })
-  }
-}
diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index 90f602c40..f7e2b0b08 100644
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@@ -1,9 +1,10 @@
 import { cloneDeep, each, get, set } from 'lodash'
 import merge from 'lodash.merge'
 
-import { useInterfaceStore } from 'src/stores/interface'
 import { storage } from './storage.js'
 
+import { useInterfaceStore } from 'src/stores/interface'
+
 let loaded = false
 
 const defaultReducer = (state, paths) =>
diff --git a/src/lib/push_notifications_plugin.js b/src/lib/push_notifications_plugin.js
index d4d8a9199..13de785f3 100644
--- a/src/lib/push_notifications_plugin.js
+++ b/src/lib/push_notifications_plugin.js
@@ -1,11 +1,12 @@
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import {
   registerPushNotifications,
   unregisterPushNotifications,
 } from '../services/sw/sw.js'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useInterfaceStore } from 'src/stores/interface.js'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 export const vuexPushNotificationsPlugin = (store) => {
   store.subscribe((mutation, state) => {
     const user = state.users.currentUser
diff --git a/src/main.js b/src/main.js
index 421e73137..4bdc5aad1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -26,6 +26,8 @@ import {
 } from './lib/push_notifications_plugin.js'
 import vuexModules from './modules/index.js'
 
+import { piniaLanguagePlugin } from 'src/lib/language.js'
+
 const currentLocale = (window.navigator.language || 'en').split('-')[0]
 
 const i18n = createI18n({
@@ -72,6 +74,7 @@ const persistedStateOptions = {
     const plugins = [vuexPushNotificationsPlugin]
     const pinia = createPinia()
     pinia.use(piniaPersistPlugin())
+    pinia.use(piniaLanguagePlugin)
     pinia.use(piniaPushNotificationsPlugin)
 
     try {
diff --git a/src/modules/api.js b/src/modules/api.js
index 5829c442d..c8b31e738 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -1,11 +1,12 @@
 import { Socket } from 'phoenix'
 
+import { WSConnectionStatus } from '../services/api/api.service.js'
+import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
+import { maybeShowChatNotification } from '../services/chat_utils/chat_utils.js'
+
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useShoutStore } from 'src/stores/shout.js'
-import { WSConnectionStatus } from '../services/api/api.service.js'
-import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
-import { maybeShowChatNotification } from '../services/chat_utils/chat_utils.js'
 
 const retryTimeout = (multiplier) => 1000 * multiplier
 
diff --git a/src/modules/config.js b/src/modules/config.js
index 35f26af6a..1b245e353 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -1,13 +1,14 @@
 import Cookies from 'js-cookie'
 import { set } from 'lodash'
 
-import { useI18nStore } from 'src/stores/i18n.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
 import messages from '../i18n/messages'
 import localeService from '../services/locale/locale.service.js'
 import { applyConfig } from '../services/style_setter/style_setter.js'
 import { defaultState, instanceDefaultConfig } from './default_config_state.js'
 
+import { useI18nStore } from 'src/stores/i18n.js'
+import { useInterfaceStore } from 'src/stores/interface.js'
+
 const BACKEND_LANGUAGE_COOKIE_NAME = 'userLanguage'
 const APPEARANCE_SETTINGS_KEYS = new Set([
   'sidebarColumnWidth',
diff --git a/src/modules/instance.js b/src/modules/instance.js
index de5af2962..880a5f675 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -1,7 +1,5 @@
 // See build/emojis_plugin for more details
 
-import { ensureFinalFallback } from 'src/i18n/languages.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
 import apiService from '../services/api/api.service.js'
 import { instanceDefaultProperties } from './config.js'
 import {
@@ -9,6 +7,10 @@ import {
   staticOrApiConfigDefault,
 } from './default_config_state.js'
 
+import { useInterfaceStore } from 'src/stores/interface.js'
+
+import { ensureFinalFallback } from 'src/i18n/languages.js'
+
 import { annotationsLoader } from 'virtual:pleroma-fe/emoji-annotations'
 
 const SORTED_EMOJI_GROUP_IDS = [
diff --git a/src/modules/notifications.js b/src/modules/notifications.js
index e3bbeeb2b..9507177a2 100644
--- a/src/modules/notifications.js
+++ b/src/modules/notifications.js
@@ -1,5 +1,3 @@
-import { useReportsStore } from 'src/stores/reports.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import apiService from '../services/api/api.service.js'
 import {
   closeAllDesktopNotifications,
@@ -11,6 +9,9 @@ import {
   maybeShowNotification,
 } from '../services/notification_utils/notification_utils.js'
 
+import { useReportsStore } from 'src/stores/reports.js'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 const emptyNotifications = () => ({
   desktopNotificationSilence: true,
   maxId: 0,
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index bf6500238..43aeeb9a6 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -13,9 +13,10 @@ import {
   slice,
 } from 'lodash'
 
-import { useInterfaceStore } from 'src/stores/interface'
 import apiService from '../services/api/api.service.js'
 
+import { useInterfaceStore } from 'src/stores/interface'
+
 const emptyTl = (userId = 0) => ({
   statuses: [],
   statusesObject: {},
diff --git a/src/modules/users.js b/src/modules/users.js
index 4af5465ff..8a01ee88e 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -9,12 +9,6 @@ import {
   uniq,
 } from 'lodash'
 
-import { declarations } from 'src/modules/config_declaration'
-import { useEmojiStore } from 'src/stores/emoji.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import apiService from '../services/api/api.service.js'
 import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
 import oauthApi from '../services/new_api/oauth.js'
@@ -27,6 +21,14 @@ import {
   windowWidth,
 } from '../services/window_utils/window_utils'
 
+import { useEmojiStore } from 'src/stores/emoji.js'
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useInterfaceStore } from 'src/stores/interface.js'
+import { useOAuthStore } from 'src/stores/oauth.js'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
+import { declarations } from 'src/modules/config_declaration'
+
 // TODO: Unify with mergeOrAdd in statuses.js
 export const mergeOrAdd = (arr, obj, item) => {
   if (!item) {
diff --git a/src/services/bookmark_folders_fetcher/bookmark_folders_fetcher.service.js b/src/services/bookmark_folders_fetcher/bookmark_folders_fetcher.service.js
index 50afb4564..7b81c19dc 100644
--- a/src/services/bookmark_folders_fetcher/bookmark_folders_fetcher.service.js
+++ b/src/services/bookmark_folders_fetcher/bookmark_folders_fetcher.service.js
@@ -1,7 +1,8 @@
-import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
 import apiService from '../api/api.service.js'
 import { promiseInterval } from '../promise_interval/promise_interval.js'
 
+import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
+
 const fetchAndUpdate = ({ credentials }) => {
   return apiService
     .fetchBookmarkFolders({ credentials })
diff --git a/src/services/lists_fetcher/lists_fetcher.service.js b/src/services/lists_fetcher/lists_fetcher.service.js
index 6744fb696..c395ef93b 100644
--- a/src/services/lists_fetcher/lists_fetcher.service.js
+++ b/src/services/lists_fetcher/lists_fetcher.service.js
@@ -1,7 +1,8 @@
-import { useListsStore } from 'src/stores/lists.js'
 import apiService from '../api/api.service.js'
 import { promiseInterval } from '../promise_interval/promise_interval.js'
 
+import { useListsStore } from 'src/stores/lists.js'
+
 const fetchAndUpdate = ({ credentials }) => {
   return apiService
     .fetchLists({ credentials })
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index cf930dfa2..9533d4aa8 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -1,9 +1,11 @@
-import FaviconService from 'src/services/favicon_service/favicon_service.js'
+import { showDesktopNotification } from '../desktop_notification_utils/desktop_notification_utils.js'
+import { muteFilterHits } from '../status_parser/status_parser.js'
+
 import { useAnnouncementsStore } from 'src/stores/announcements'
 import { useI18nStore } from 'src/stores/i18n.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { showDesktopNotification } from '../desktop_notification_utils/desktop_notification_utils.js'
-import { muteFilterHits } from '../status_parser/status_parser.js'
+
+import FaviconService from 'src/services/favicon_service/favicon_service.js'
 
 export const ACTIONABLE_NOTIFICATION_TYPES = new Set([
   'mention',
diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
index bf1f29ff6..dd6b0db8f 100644
--- a/src/services/notifications_fetcher/notifications_fetcher.service.js
+++ b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -1,8 +1,9 @@
+import apiService from '../api/api.service.js'
+import { promiseInterval } from '../promise_interval/promise_interval.js'
+
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import apiService from '../api/api.service.js'
-import { promiseInterval } from '../promise_interval/promise_interval.js'
 
 const update = ({ store, notifications, older }) => {
   store.dispatch('addNewNotifications', { notifications, older })
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index d44b0fc06..08034d485 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -1,10 +1,11 @@
 import localforage from 'localforage'
 import { chunk, throttle } from 'lodash'
 
-import { defaultState } from 'src/modules/default_config_state.js'
 import { getCssRules } from '../theme_data/css_utils.js'
 import { getEngineChecksum, init } from '../theme_data/theme_data_3.service.js'
 
+import { defaultState } from 'src/modules/default_config_state.js'
+
 // On platforms where this is not supported, it will return undefined
 // Otherwise it will return an array
 const supportsAdoptedStyleSheets = !!document.adoptedStyleSheets
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index 4b99f4f68..d46037e2a 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -1,9 +1,10 @@
 import { camelCase } from 'lodash'
 
+import apiService from '../api/api.service.js'
+import { promiseInterval } from '../promise_interval/promise_interval.js'
+
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import apiService from '../api/api.service.js'
-import { promiseInterval } from '../promise_interval/promise_interval.js'
 
 const update = ({
   store,
diff --git a/src/stores/emoji.js b/src/stores/emoji.js
index 38d530549..e2e5b48f5 100644
--- a/src/stores/emoji.js
+++ b/src/stores/emoji.js
@@ -1,8 +1,9 @@
 import { defineStore } from 'pinia'
 
-import { ensureFinalFallback } from 'src/i18n/languages.js'
 import { useInstanceStore } from 'src/stores/instance.js'
 
+import { ensureFinalFallback } from 'src/i18n/languages.js'
+
 import { annotationsLoader } from 'virtual:pleroma-fe/emoji-annotations'
 
 const defaultState = {
diff --git a/src/stores/instance.js b/src/stores/instance.js
index 3dc591f8f..1caae0ee1 100644
--- a/src/stores/instance.js
+++ b/src/stores/instance.js
@@ -1,8 +1,6 @@
 import { get, set } from 'lodash'
 import { defineStore } from 'pinia'
 
-import { ensureFinalFallback } from 'src/i18n/languages.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
 import { instanceDefaultProperties } from '../modules/config.js'
 import {
   instanceDefaultConfig,
@@ -10,6 +8,10 @@ import {
 } from '../modules/default_config_state.js'
 import apiService from '../services/api/api.service.js'
 
+import { useInterfaceStore } from 'src/stores/interface.js'
+
+import { ensureFinalFallback } from 'src/i18n/languages.js'
+
 const REMOTE_INTERACTION_URL = '/main/ostatus'
 
 const defaultState = {
diff --git a/src/stores/interface.js b/src/stores/interface.js
index 9bec78d96..66fe94fad 100644
--- a/src/stores/interface.js
+++ b/src/stores/interface.js
@@ -1,12 +1,5 @@
 import { defineStore } from 'pinia'
 
-import {
-  CURRENT_VERSION,
-  generatePreset,
-} from 'src/services/theme_data/theme_data.service.js'
-import { convertTheme2To3 } from 'src/services/theme_data/theme2_to_theme3.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import {
   applyTheme,
   getResourcesIndex,
@@ -14,6 +7,15 @@ import {
 } from '../services/style_setter/style_setter.js'
 import { deserialize } from '../services/theme_data/iss_deserializer.js'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
+import {
+  CURRENT_VERSION,
+  generatePreset,
+} from 'src/services/theme_data/theme_data.service.js'
+import { convertTheme2To3 } from 'src/services/theme_data/theme2_to_theme3.js'
+
 export const useInterfaceStore = defineStore('interface', {
   state: () => ({
     localFonts: null,
diff --git a/src/stores/sync_config.js b/src/stores/sync_config.js
index d5fb93c2a..c3c9d9f69 100644
--- a/src/stores/sync_config.js
+++ b/src/stores/sync_config.js
@@ -16,11 +16,13 @@ import { defineStore } from 'pinia'
 import { toRaw } from 'vue'
 
 import { CURRENT_UPDATE_COUNTER } from 'src/components/update_notification/update_notification.js'
+
+import { useInstanceStore } from 'src/stores/instance'
+
 import {
   defaultState as configDefaultState,
   instanceDefaultConfig,
 } from 'src/modules/default_config_state'
-import { useInstanceStore } from 'src/stores/instance'
 
 export const VERSION = 2
 export const NEW_USER_DATE = new Date('2022-08-04') // date of writing this, basically
@@ -408,7 +410,7 @@ export const _doMigrations = (cache, live) => {
   return cache
 }
 
-export const useSyncConfigStore = defineStore('syncConfigStore', {
+export const useSyncConfigStore = defineStore('sync_config', {
   state() {
     return cloneDeep(defaultState)
   },
diff --git a/src/sw.js b/src/sw.js
index 62433fa97..c0337c3df 100644
--- a/src/sw.js
+++ b/src/sw.js
@@ -4,11 +4,12 @@ import 'virtual:pleroma-fe/service_worker_env'
 
 import { createI18n } from 'vue-i18n'
 
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
+
 import { storage } from 'src/lib/storage.js'
 import { parseNotification } from 'src/services/entity_normalizer/entity_normalizer.service.js'
 import { prepareNotificationObject } from 'src/services/notification_utils/notification_utils.js'
 import { cacheKey, emojiCacheKey, shouldCache } from 'src/services/sw/sw.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
 
 // Collects all messages for service workers
 // Needed because service workers cannot use dynamic imports
diff --git a/test/fixtures/setup_test.js b/test/fixtures/setup_test.js
index 082fdbe29..02c49eb60 100644
--- a/test/fixtures/setup_test.js
+++ b/test/fixtures/setup_test.js
@@ -2,9 +2,10 @@ import { config } from '@vue/test-utils'
 import { createMemoryHistory, createRouter } from 'vue-router'
 import VueVirtualScroller from 'vue-virtual-scroller'
 
-import routes from 'src/boot/routes'
 import makeMockStore from './mock_store'
 
+import routes from 'src/boot/routes'
+
 export const $t = (msg) => msg
 const $i18n = { t: (msg) => msg }
 
diff --git a/test/unit/specs/components/user_profile.spec.js b/test/unit/specs/components/user_profile.spec.js
index 2b594b160..8b198420b 100644
--- a/test/unit/specs/components/user_profile.spec.js
+++ b/test/unit/specs/components/user_profile.spec.js
@@ -2,6 +2,7 @@ import { mount } from '@vue/test-utils'
 import { createStore } from 'vuex'
 
 import UserProfile from 'src/components/user_profile/user_profile.vue'
+
 import { getters } from 'src/modules/users.js'
 import backendInteractorService from 'src/services/backend_interactor_service/backend_interactor_service.js'
 
diff --git a/test/unit/specs/stores/lists.spec.js b/test/unit/specs/stores/lists.spec.js
index 192546981..083730856 100644
--- a/test/unit/specs/stores/lists.spec.js
+++ b/test/unit/specs/stores/lists.spec.js
@@ -1,9 +1,10 @@
 import { createPinia, setActivePinia } from 'pinia'
 import { createStore } from 'vuex'
 
-import apiModule from 'src/modules/api.js'
 import { useListsStore } from 'src/stores/lists.js'
 
+import apiModule from 'src/modules/api.js'
+
 setActivePinia(createPinia())
 const store = useListsStore()
 window.vuex = createStore({
diff --git a/test/unit/specs/stores/oauth.spec.js b/test/unit/specs/stores/oauth.spec.js
index c634ebb66..54a489479 100644
--- a/test/unit/specs/stores/oauth.spec.js
+++ b/test/unit/specs/stores/oauth.spec.js
@@ -3,13 +3,14 @@ import { createPinia, setActivePinia } from 'pinia'
 import { createApp } from 'vue'
 import { createStore } from 'vuex'
 
-import { useOAuthStore } from 'src/stores/oauth.js'
 import {
   authApis,
   injectMswToTest,
   testServer,
 } from '/test/fixtures/mock_api.js'
 
+import { useOAuthStore } from 'src/stores/oauth.js'
+
 const test = injectMswToTest(authApis)
 
 const vuexStore = createStore({