diff --git a/.env.example b/.env.example
index b60c2769..a21e7f83 100644
--- a/.env.example
+++ b/.env.example
@@ -1,4 +1,5 @@
 NUXT_PUBLIC_TRANSLATE_API=
+NUXT_PUBLIC_DEFAULT_SERVER=
 
 # Production only
 NUXT_CLOUDFLARE_ACCOUNT_ID=
diff --git a/components/account/AccountAvatar.vue b/components/account/AccountAvatar.vue
index e12e658e..4a4c50aa 100644
--- a/components/account/AccountAvatar.vue
+++ b/components/account/AccountAvatar.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   square?: boolean
 }>()
 
diff --git a/components/account/AccountBigAvatar.vue b/components/account/AccountBigAvatar.vue
index 491623ff..49ed2318 100644
--- a/components/account/AccountBigAvatar.vue
+++ b/components/account/AccountBigAvatar.vue
@@ -1,17 +1,17 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 // Avatar with a background base achieving a 3px border to be used in status cards
 // The border is used for Avatar on Avatar for reblogs and connecting replies
 
 defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   square?: boolean
 }>()
 </script>
 
 <template>
-  <div :key="account.avatar" v-bind="$attrs" :rounded-full="!square" :bg-base="!square" w-54px h-54px flex items-center justify-center>
+  <div :key="account.avatar" v-bind="$attrs" :style="{ 'clip-path': square ? `url(#avatar-mask)` : 'none' }" :class="{ 'rounded-full': !square }" bg-base w-54px h-54px flex items-center justify-center>
     <AccountAvatar :account="account" w-48px h-48px :square="square" />
   </div>
 </template>
diff --git a/components/account/AccountBigCard.vue b/components/account/AccountBigCard.vue
index caaf3ba0..1abab8ce 100644
--- a/components/account/AccountBigCard.vue
+++ b/components/account/AccountBigCard.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
+
 const { account, as = 'div' } = $defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   as?: string
 }>()
 
diff --git a/components/account/AccountBotIndicator.vue b/components/account/AccountBotIndicator.vue
index 86a0e729..1a4cfa68 100644
--- a/components/account/AccountBotIndicator.vue
+++ b/components/account/AccountBotIndicator.vue
@@ -1,5 +1,20 @@
+<script setup lang="ts">
+defineProps<{
+  showLabel?: boolean
+}>()
+</script>
+
 <template>
-  <div flex="~" items-center border="~ base" text-secondary-light rounded-md px-1 text-xs my-auto>
-    {{ $t('account.bot') }}
+  <div
+    flex="~ gap1" items-center
+    :class="{ 'border border-base rounded-md px-1': showLabel }"
+    text-secondary-light text-xs
+  >
+    <CommonTooltip :content="$t('account.bot')" :disabled="showLabel">
+      <div i-ri:robot-line />
+    </CommonTooltip>
+    <div v-if="showLabel">
+      {{ $t('account.bot') }}
+    </div>
   </div>
 </template>
diff --git a/components/account/AccountCard.vue b/components/account/AccountCard.vue
index c20c9934..7fb5bac6 100644
--- a/components/account/AccountCard.vue
+++ b/components/account/AccountCard.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const { account } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   hoverCard?: boolean
 }>()
 
diff --git a/components/account/AccountDisplayName.vue b/components/account/AccountDisplayName.vue
index a8b8befc..eb9a232a 100644
--- a/components/account/AccountDisplayName.vue
+++ b/components/account/AccountDisplayName.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 defineProps<{
-  account: Account
+  account: mastodon.v1.Account
 }>()
 </script>
 
diff --git a/components/account/AccountFollowButton.vue b/components/account/AccountFollowButton.vue
index 3b4f5239..28781266 100644
--- a/components/account/AccountFollowButton.vue
+++ b/components/account/AccountFollowButton.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import type { Account, Relationship } from 'masto'
+import type { mastodon } from 'masto'
 
 const { account, command, ...props } = defineProps<{
-  account: Account
-  relationship?: Relationship
+  account: mastodon.v1.Account
+  relationship?: mastodon.v1.Relationship
   command?: boolean
 }>()
 
@@ -15,7 +15,7 @@ const masto = useMasto()
 async function toggleFollow() {
   relationship!.following = !relationship!.following
   try {
-    const newRel = await masto.accounts[relationship!.following ? 'follow' : 'unfollow'](account.id)
+    const newRel = await masto.v1.accounts[relationship!.following ? 'follow' : 'unfollow'](account.id)
     Object.assign(relationship!, newRel)
   }
   catch {
@@ -27,7 +27,7 @@ async function toggleFollow() {
 async function unblock() {
   relationship!.blocking = false
   try {
-    const newRel = await masto.accounts.unblock(account.id)
+    const newRel = await masto.v1.accounts.unblock(account.id)
     Object.assign(relationship!, newRel)
   }
   catch {
@@ -39,7 +39,7 @@ async function unblock() {
 async function unmute() {
   relationship!.muting = false
   try {
-    const newRel = await masto.accounts.unmute(account.id)
+    const newRel = await masto.v1.accounts.unmute(account.id)
     Object.assign(relationship!, newRel)
   }
   catch {
diff --git a/components/account/AccountHandle.vue b/components/account/AccountHandle.vue
index 32f6823a..63465d0a 100644
--- a/components/account/AccountHandle.vue
+++ b/components/account/AccountHandle.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const { account } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
 }>()
 
 const serverName = $computed(() => getServerName(account))
diff --git a/components/account/AccountHeader.vue b/components/account/AccountHeader.vue
index 870da89d..dbd4cb54 100644
--- a/components/account/AccountHeader.vue
+++ b/components/account/AccountHeader.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account, Field } from 'masto'
+import type { mastodon } from 'masto'
 
 const { account } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   command?: boolean
 }>()
 
@@ -14,8 +14,8 @@ const createdAt = $(useFormattedDateTime(() => account.createdAt, {
   year: 'numeric',
 }))
 
-const namedFields = ref<Field[]>([])
-const iconFields = ref<Field[]>([])
+const namedFields = ref<mastodon.v1.AccountField[]>([])
+const iconFields = ref<mastodon.v1.AccountField[]>([])
 
 function getFieldIconTitle(fieldName: string) {
   return fieldName === 'Joined' ? t('account.joined') : fieldName
@@ -40,8 +40,8 @@ function previewAvatar() {
 }
 
 watchEffect(() => {
-  const named: Field[] = []
-  const icons: Field[] = []
+  const named: mastodon.v1.AccountField[] = []
+  const icons: mastodon.v1.AccountField[] = []
 
   account.fields?.forEach((field) => {
     const icon = getAccountFieldIcon(field.name)
@@ -76,7 +76,7 @@ const isSelf = $computed(() => currentUser.value?.account.id === account.id)
           <div flex="~ col gap1">
             <div flex justify-between>
               <AccountDisplayName :account="account" font-bold sm:text-2xl text-xl />
-              <AccountBotIndicator v-if="account.bot" />
+              <AccountBotIndicator v-if="account.bot" show-label />
             </div>
             <AccountHandle :account="account" />
           </div>
diff --git a/components/account/AccountHoverCard.vue b/components/account/AccountHoverCard.vue
index 2857492b..b7168ec3 100644
--- a/components/account/AccountHoverCard.vue
+++ b/components/account/AccountHoverCard.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const { account } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
 }>()
 
 const relationship = $(useRelationship(account))
diff --git a/components/account/AccountHoverWrapper.vue b/components/account/AccountHoverWrapper.vue
index ced4dcb8..edb47748 100644
--- a/components/account/AccountHoverWrapper.vue
+++ b/components/account/AccountHoverWrapper.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const props = defineProps<{
-  account?: Account
+  account?: mastodon.v1.Account
   handle?: string
   disabled?: boolean
 }>()
diff --git a/components/account/AccountInfo.vue b/components/account/AccountInfo.vue
index 564b5437..db965e09 100644
--- a/components/account/AccountInfo.vue
+++ b/components/account/AccountInfo.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const { account, as = 'div' } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   as?: string
   hoverCard?: boolean
   square?: boolean
diff --git a/components/account/AccountInlineInfo.vue b/components/account/AccountInlineInfo.vue
index d5422d5b..dbeadde6 100644
--- a/components/account/AccountInlineInfo.vue
+++ b/components/account/AccountInlineInfo.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const { link = true, avatar = true } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   link?: boolean
   avatar?: boolean
 }>()
diff --git a/components/account/AccountMoreButton.vue b/components/account/AccountMoreButton.vue
index 031270ea..1d0b8669 100644
--- a/components/account/AccountMoreButton.vue
+++ b/components/account/AccountMoreButton.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const { account } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   command?: boolean
 }>()
 let relationship = $(useRelationship(account))
@@ -15,24 +15,24 @@ const toggleMute = async () => {
 
   relationship!.muting = !relationship!.muting
   relationship = relationship!.muting
-    ? await masto.accounts.mute(account.id, {
+    ? await masto.v1.accounts.mute(account.id, {
       // TODO support more options
     })
-    : await masto.accounts.unmute(account.id)
+    : await masto.v1.accounts.unmute(account.id)
 }
 
 const toggleBlockUser = async () => {
   // TODO: Add confirmation
 
   relationship!.blocking = !relationship!.blocking
-  relationship = await masto.accounts[relationship!.blocking ? 'block' : 'unblock'](account.id)
+  relationship = await masto.v1.accounts[relationship!.blocking ? 'block' : 'unblock'](account.id)
 }
 
 const toggleBlockDomain = async () => {
   // TODO: Add confirmation
 
   relationship!.domainBlocking = !relationship!.domainBlocking
-  await masto.domainBlocks[relationship!.domainBlocking ? 'block' : 'unblock'](getServerName(account))
+  await masto.v1.domainBlocks[relationship!.domainBlocking ? 'block' : 'unblock'](getServerName(account))
 }
 </script>
 
diff --git a/components/account/AccountMoved.vue b/components/account/AccountMoved.vue
index ac3b79e4..75160514 100644
--- a/components/account/AccountMoved.vue
+++ b/components/account/AccountMoved.vue
@@ -1,10 +1,8 @@
 <script setup lang="ts">
-// type used in <template>
-// eslint-disable-next-line @typescript-eslint/consistent-type-imports
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 defineProps<{
-  account: Account
+  account: mastodon.v1.Account
 }>()
 </script>
 
@@ -16,9 +14,8 @@ defineProps<{
     </div>
 
     <div flex>
-      <!-- type error of masto.js -->
-      <NuxtLink :to="getAccountRoute(account.moved as unknown as Account)">
-        <AccountInfo :account="account.moved as unknown as Account" />
+      <NuxtLink :to="getAccountRoute(account.moved!)">
+        <AccountInfo :account="account.moved!" />
       </NuxtLink>
       <div flex-auto />
       <div flex items-center>
diff --git a/components/account/AccountPaginator.vue b/components/account/AccountPaginator.vue
index bc3bc677..3832b887 100644
--- a/components/account/AccountPaginator.vue
+++ b/components/account/AccountPaginator.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account, Paginator } from 'masto'
+import type { Paginator, mastodon } from 'masto'
 
 const { paginator } = defineProps<{
-  paginator: Paginator<any, Account[]>
+  paginator: Paginator<mastodon.v1.Account[], mastodon.DefaultPaginationParams>
 }>()
 </script>
 
diff --git a/components/account/AccountPostsFollowers.vue b/components/account/AccountPostsFollowers.vue
index d558a4c3..aa3562fa 100644
--- a/components/account/AccountPostsFollowers.vue
+++ b/components/account/AccountPostsFollowers.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const props = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
 }>()
 const { formatHumanReadableNumber, formatNumber, forSR } = useHumanReadableNumber()
 
diff --git a/components/command/CommandItem.vue b/components/command/CommandItem.vue
index 4f9351b1..4f7286a0 100644
--- a/components/command/CommandItem.vue
+++ b/components/command/CommandItem.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { ResolvedCommand } from '@/composables/command'
+import type { ResolvedCommand } from '~/composables/command'
 
 const emit = defineEmits<{
   (event: 'activate'): void
diff --git a/components/command/CommandPanel.vue b/components/command/CommandPanel.vue
index ed60ff4f..a94cc201 100644
--- a/components/command/CommandPanel.vue
+++ b/components/command/CommandPanel.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { AccountResult, HashTagResult, SearchResult as SearchResultType } from '@/components/search/types'
-import type { CommandScope, QueryResult, QueryResultItem } from '@/composables/command'
+import type { SearchResult as SearchResultType } from '~/composables/masto/search'
+import type { CommandScope, QueryResult, QueryResultItem } from '~/composables/command'
 
 const emit = defineEmits<{
   (event: 'close'): void
@@ -39,22 +39,8 @@ const searchResult = $computed<QueryResult>(() => {
 
   // TODO extract this scope
   // duplicate in SearchWidget.vue
-  const hashtagList = hashtags.value.slice(0, 3)
-    .map<HashTagResult>(hashtag => ({
-      type: 'hashtag',
-      id: hashtag.id,
-      hashtag,
-      to: getTagRoute(hashtag.name),
-    }))
-    .map(toSearchQueryResultItem)
-  const accountList = accounts.value
-    .map<AccountResult>(account => ({
-      type: 'account',
-      id: account.id,
-      account,
-      to: getAccountRoute(account),
-    }))
-    .map(toSearchQueryResultItem)
+  const hashtagList = hashtags.value.slice(0, 3).map(toSearchQueryResultItem)
+  const accountList = accounts.value.map(toSearchQueryResultItem)
 
   const grouped: QueryResult['grouped'] = new Map()
   grouped.set('Hashtags', hashtagList)
diff --git a/components/common/CommonAlert.vue b/components/common/CommonAlert.vue
index dabf780d..f784ce87 100644
--- a/components/common/CommonAlert.vue
+++ b/components/common/CommonAlert.vue
@@ -20,7 +20,7 @@ function close() {
     <div>
       <slot />
     </div>
-    <button text-xl hover:text-primary bg-hover-overflow w-1.4em h-1.4em @click="close()">
+    <button text-xl hover:text-primary bg-hover-overflow w="1.4em" h="1.4em" @click="close()">
       <div i-ri:close-line />
     </button>
   </div>
diff --git a/components/common/CommonPaginator.vue b/components/common/CommonPaginator.vue
index b739a4d5..fcb10b9a 100644
--- a/components/common/CommonPaginator.vue
+++ b/components/common/CommonPaginator.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts" generic="T extends any, O extends any">
 // @ts-expect-error missing types
 import { DynamicScroller } from 'vue-virtual-scroller'
 import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
@@ -12,20 +12,23 @@ const {
   eventType = 'update',
   preprocess,
 } = defineProps<{
-  paginator: Paginator<any, any[]>
-  keyProp?: string
+  paginator: Paginator<T[], O>
+  keyProp?: keyof T
   virtualScroller?: boolean
   stream?: Promise<WsEvents>
   eventType?: 'notification' | 'update'
-  preprocess?: (items: any[]) => any[]
+  preprocess?: (items: T[]) => any[]
 }>()
 
 defineSlots<{
   default: {
-    item: any
+    item: T
     active?: boolean
-    older?: any
-    newer?: any // newer is undefined when index === 0
+    older?: T
+    newer?: T // newer is undefined when index === 0
+  }
+  items: {
+    items: T[]
   }
   updater: {
     number: number
@@ -35,6 +38,8 @@ defineSlots<{
   done: {}
 }>()
 
+const { t } = useI18n()
+
 const { items, prevItems, update, state, endAnchor, error } = usePaginator(paginator, stream, eventType, preprocess)
 </script>
 
@@ -62,7 +67,7 @@ const { items, prevItems, update, state, endAnchor, error } = usePaginator(pagin
       <template v-else>
         <slot
           v-for="item, index of items"
-          :key="item[keyProp]"
+          :key="(item as any)[keyProp]"
           :item="item"
           :older="items[index + 1]"
           :newer="items[index - 1]"
@@ -75,11 +80,11 @@ const { items, prevItems, update, state, endAnchor, error } = usePaginator(pagin
     </slot>
     <slot v-else-if="state === 'done'" name="done">
       <div p5 text-secondary italic text-center>
-        {{ $t('common.end_of_list') }}
+        {{ t('common.end_of_list') }}
       </div>
     </slot>
     <div v-else-if="state === 'error'" p5 text-secondary>
-      {{ $t('common.error') }}: {{ error }}
+      {{ t('common.error') }}: {{ error }}
     </div>
   </div>
 </template>
diff --git a/components/common/CommonTrending.vue b/components/common/CommonTrending.vue
index b423bf86..fa363f95 100644
--- a/components/common/CommonTrending.vue
+++ b/components/common/CommonTrending.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup>
-import type { History } from 'masto'
+import type { mastodon } from 'masto'
 
 const {
   history,
   maxDay = 2,
 } = $defineProps<{
-  history: History[]
+  history: mastodon.v1.TagHistory[]
   maxDay?: number
 }>()
 
diff --git a/components/common/CommonTrendingCharts.vue b/components/common/CommonTrendingCharts.vue
index b579dfee..98b1549d 100644
--- a/components/common/CommonTrendingCharts.vue
+++ b/components/common/CommonTrendingCharts.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { History } from 'masto'
+import type { mastodon } from 'masto'
 import sparkline from '@fnando/sparkline'
 
 const {
@@ -7,7 +7,7 @@ const {
   width = 60,
   height = 40,
 } = $defineProps<{
-  history?: History[]
+  history?: mastodon.v1.TagHistory[]
   width?: number
   height?: number
 }>()
diff --git a/components/content/ContentRich.setup.ts b/components/content/ContentRich.setup.ts
index 7447bb0a..867d0659 100644
--- a/components/content/ContentRich.setup.ts
+++ b/components/content/ContentRich.setup.ts
@@ -1,4 +1,4 @@
-import type { Emoji } from 'masto'
+import type { mastodon } from 'masto'
 
 defineOptions({
   name: 'ContentRich',
@@ -10,7 +10,7 @@ const {
   markdown = true,
 } = defineProps<{
   content: string
-  emojis?: Emoji[]
+  emojis?: mastodon.v1.CustomEmoji[]
   markdown?: boolean
 }>()
 
diff --git a/components/conversation/ConversationCard.vue b/components/conversation/ConversationCard.vue
index 764ddd0c..3d8acbaa 100644
--- a/components/conversation/ConversationCard.vue
+++ b/components/conversation/ConversationCard.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Conversation } from 'masto'
+import type { mastodon } from 'masto'
 
 const { conversation } = defineProps<{
-  conversation: Conversation
+  conversation: mastodon.v1.Conversation
 }>()
 
 const withAccounts = $computed(() =>
diff --git a/components/conversation/ConversationPaginator.vue b/components/conversation/ConversationPaginator.vue
index f392b055..40a4c7c7 100644
--- a/components/conversation/ConversationPaginator.vue
+++ b/components/conversation/ConversationPaginator.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Conversation, Paginator } from 'masto'
+import type { Paginator, mastodon } from 'masto'
 
 const { paginator } = defineProps<{
-  paginator: Paginator<any, Conversation[]>
+  paginator: Paginator<mastodon.v1.Conversation[], mastodon.DefaultPaginationParams>
 }>()
 </script>
 
diff --git a/components/modal/ModalContainer.vue b/components/modal/ModalContainer.vue
index 23c31c34..6f2be889 100644
--- a/components/modal/ModalContainer.vue
+++ b/components/modal/ModalContainer.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 import type { ConfirmDialogChoice } from '~/types'
 import {
   isCommandPanelOpen,
@@ -30,7 +30,7 @@ useEventListener('keydown', (e: KeyboardEvent) => {
   }
 })
 
-const handlePublished = (status: Status) => {
+const handlePublished = (status: mastodon.v1.Status) => {
   lastPublishDialogStatus.value = status
   isPublishDialogOpen.value = false
 }
diff --git a/components/modal/ModalMediaPreview.vue b/components/modal/ModalMediaPreview.vue
index 9f3f8621..2faaa135 100644
--- a/components/modal/ModalMediaPreview.vue
+++ b/components/modal/ModalMediaPreview.vue
@@ -40,14 +40,14 @@ onUnmounted(() => locked.value = false)
   <div relative h-full w-full flex pt-12 w-100vh @click="onClick">
     <button
       v-if="hasNext" pointer-events-auto btn-action-icon bg="black/20" :aria-label="$t('action.previous')"
-      hover:bg="black/40" dark:bg="white/30" dark:hover:bg="white/20" absolute top="1/2" right-1 z5
+      hover:bg="black/40" dark:bg="white/30" dark-hover:bg="white/20" absolute top="1/2" right-1 z5
       :title="$t('action.next')" @click="next"
     >
       <div i-ri:arrow-right-s-line text-white />
     </button>
     <button
       v-if="hasPrev" pointer-events-auto btn-action-icon bg="black/20" aria-label="action.next"
-      hover:bg="black/40" dark:bg="white/30" dark:hover:bg="white/20" absolute top="1/2" left-1 z5
+      hover:bg="black/40" dark:bg="white/30" dark:hover-bg="white/20" absolute top="1/2" left-1 z5
       :title="$t('action.prev')" @click="prev"
     >
       <div i-ri:arrow-left-s-line text-white />
@@ -60,7 +60,7 @@ onUnmounted(() => locked.value = false)
     <div absolute top-0 w-full flex justify-between>
       <button
         btn-action-icon bg="black/30" aria-label="action.close" hover:bg="black/40" dark:bg="white/30"
-        dark:hover:bg="white/20" pointer-events-auto shrink-0 @click="emit('close')"
+        dark:hover-bg="white/20" pointer-events-auto shrink-0 @click="emit('close')"
       >
         <div i-ri:close-line text-white />
       </button>
diff --git a/components/modal/ModalMediaPreviewCarousel.vue b/components/modal/ModalMediaPreviewCarousel.vue
index b2e76a5f..45e9bb92 100644
--- a/components/modal/ModalMediaPreviewCarousel.vue
+++ b/components/modal/ModalMediaPreviewCarousel.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { SwipeDirection } from '@vueuse/core'
 import { useReducedMotion } from '@vueuse/motion'
-import type { Attachment } from 'masto'
+import type { mastodon } from 'masto'
 
 const { media = [], threshold = 20 } = defineProps<{
-  media?: Attachment[]
+  media?: mastodon.v1.MediaAttachment[]
   threshold?: number
 }>()
 
diff --git a/components/nav/NavFooter.vue b/components/nav/NavFooter.vue
index 7a9a416e..a20eaac3 100644
--- a/components/nav/NavFooter.vue
+++ b/components/nav/NavFooter.vue
@@ -16,7 +16,7 @@ function toggleDark() {
   <footer p4 text-sm text-secondary-light flex="~ col">
     <div flex="~ gap2" items-center mb4>
       <CommonTooltip :content="$t('nav.toggle_theme')">
-        <button flex i-ri:sun-line dark:i-ri:moon-line text-lg :aria-label="$t('nav.toggle_theme')" @click="toggleDark()" />
+        <button flex i-ri:sun-line dark-i-ri:moon-line text-lg :aria-label="$t('nav.toggle_theme')" @click="toggleDark()" />
       </CommonTooltip>
       <CommonTooltip :content="$t('nav.zen_mode')">
         <button
diff --git a/components/notification/NotificationCard.vue b/components/notification/NotificationCard.vue
index f906f9c5..c3a3261e 100644
--- a/components/notification/NotificationCard.vue
+++ b/components/notification/NotificationCard.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Notification } from 'masto'
+import type { mastodon } from 'masto'
 
 const { notification } = defineProps<{
-  notification: Notification
+  notification: mastodon.v1.Notification
 }>()
 
 const nuxt = useNuxtApp()
diff --git a/components/notification/NotificationPaginator.vue b/components/notification/NotificationPaginator.vue
index 2116dd45..d5b9266a 100644
--- a/components/notification/NotificationPaginator.vue
+++ b/components/notification/NotificationPaginator.vue
@@ -1,20 +1,19 @@
 <script setup lang="ts">
-// type used in <template>
-// eslint-disable-next-line @typescript-eslint/consistent-type-imports
-import type { Notification, Paginator, WsEvents } from 'masto'
+import { mastodon } from 'masto'
+import type { Paginator, WsEvents } from 'masto'
 // type used in <template>
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import type { GroupedAccountLike, GroupedLikeNotifications, NotificationSlot } from '~/types'
 
 const { paginator, stream } = defineProps<{
-  paginator: Paginator<any, Notification[]>
+  paginator: Paginator<mastodon.v1.Notification[], mastodon.v1.ListNotificationsParams>
   stream?: Promise<WsEvents>
 }>()
 
 const groupCapacity = Number.MAX_VALUE // No limit
 
 // Group by type (and status when applicable)
-const groupId = (item: Notification): string => {
+const groupId = (item: mastodon.v1.Notification): string => {
   // If the update is related to an status, group notifications from the same account (boost + favorite the same status)
   const id = item.status
     ? {
@@ -27,12 +26,12 @@ const groupId = (item: Notification): string => {
   return JSON.stringify(id)
 }
 
-function groupItems(items: Notification[]): NotificationSlot[] {
+function groupItems(items: mastodon.v1.Notification[]): NotificationSlot[] {
   const results: NotificationSlot[] = []
 
   let id = 0
   let currentGroupId = ''
-  let currentGroup: Notification[] = []
+  let currentGroup: mastodon.v1.Notification[] = []
   const processGroup = () => {
     if (currentGroup.length === 0)
       return
@@ -127,7 +126,7 @@ const { formatNumber } = useHumanReadableNumber()
         />
         <NotificationCard
           v-else
-          :notification="item as Notification"
+          :notification="item as mastodon.v1.Notification"
           hover:bg-active
           border="b base"
         />
diff --git a/components/notification/NotificationSubscribePushNotificationError.vue b/components/notification/NotificationSubscribePushNotificationError.vue
index 367c2b99..9da057d2 100644
--- a/components/notification/NotificationSubscribePushNotificationError.vue
+++ b/components/notification/NotificationSubscribePushNotificationError.vue
@@ -31,7 +31,7 @@ const { modelValue } = defineModel<{
           :aria-label="$t('settings.notifications.push_notifications.subscription_error.clear_error')"
           @click="modelValue = false"
         >
-          <span aria-hidden="true" w-1.75em h-1.75em i-ri:close-line />
+          <span aria-hidden="true" w="1.75em" h="1.75em" i-ri:close-line />
         </button>
       </CommonTooltip>
     </head>
diff --git a/components/publish/PublishAttachment.vue b/components/publish/PublishAttachment.vue
index 35adc068..b8444e8a 100644
--- a/components/publish/PublishAttachment.vue
+++ b/components/publish/PublishAttachment.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Attachment } from 'masto'
+import type { mastodon } from 'masto'
 
 const props = withDefaults(defineProps<{
-  attachment: Attachment
+  attachment: mastodon.v1.MediaAttachment
   alt?: string
   removable?: boolean
   dialogLabelledBy?: string
diff --git a/components/publish/PublishWidget.vue b/components/publish/PublishWidget.vue
index 1c9a937e..e6dfd154 100644
--- a/components/publish/PublishWidget.vue
+++ b/components/publish/PublishWidget.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { Attachment, CreateStatusParams, Status, StatusVisibility } from 'masto'
+import type { mastodon } from 'masto'
 import { fileOpen } from 'browser-fs-access'
 import { useDropZone } from '@vueuse/core'
 import { EditorContent } from '@tiptap/vue-3'
@@ -18,13 +18,13 @@ const {
   initial?: () => Draft
   placeholder?: string
   inReplyToId?: string
-  inReplyToVisibility?: StatusVisibility
+  inReplyToVisibility?: mastodon.v1.StatusVisibility
   expanded?: boolean
   dialogLabelledBy?: string
 }>()
 
 const emit = defineEmits<{
-  (evt: 'published', status: Status): void
+  (evt: 'published', status: mastodon.v1.Status): void
 }>()
 
 const { t } = useI18n()
@@ -103,7 +103,7 @@ async function uploadAttachments(files: File[]) {
     if (draft.attachments.length < limit) {
       isExceedingAttachmentLimit = false
       try {
-        const attachment = await masto.mediaAttachments.create({
+        const attachment = await masto.v1.mediaAttachments.create({
           file,
         })
         draft.attachments.push(attachment)
@@ -122,9 +122,9 @@ async function uploadAttachments(files: File[]) {
   isUploading = false
 }
 
-async function setDescription(att: Attachment, description: string) {
+async function setDescription(att: mastodon.v1.MediaAttachment, description: string) {
   att.description = description
-  await masto.mediaAttachments.update(att.id, { description: att.description })
+  await masto.v1.mediaAttachments.update(att.id, { description: att.description })
 }
 
 function removeAttachment(index: number) {
@@ -136,8 +136,8 @@ async function publish() {
     ...draft.params,
     status: htmlToText(draft.params.status || ''),
     mediaIds: draft.attachments.map(a => a.id),
-    ...(masto.version.includes('+glitch') ? { 'content-type': 'text/markdown' } : {}),
-  } as CreateStatusParams
+    ...((masto.config as any).props.version.raw.includes('+glitch') ? { 'content-type': 'text/markdown' } : {}),
+  } as mastodon.v1.CreateStatusParams
 
   if (process.dev) {
     // eslint-disable-next-line no-console
@@ -154,11 +154,13 @@ async function publish() {
   try {
     isSending = true
 
-    let status: Status
+    let status: mastodon.v1.Status
     if (!draft.editingStatus)
-      status = await masto.statuses.create(payload)
+      status = await masto.v1.statuses.create(payload)
     else
-      status = await masto.statuses.update(draft.editingStatus.id, payload)
+      status = await masto.v1.statuses.update(draft.editingStatus.id, payload)
+    if (draft.params.inReplyToId)
+      navigateToStatus({ status })
 
     draft = initial()
     emit('published', status)
@@ -251,7 +253,7 @@ defineExpose({
                 :aria-label="$t('action.clear_upload_failed')"
                 @click="failed = []"
               >
-                <span aria-hidden="true" w-1.75em h-1.75em i-ri:close-line />
+                <span aria-hidden="true" w="1.75em" h="1.75em" i-ri:close-line />
               </button>
             </CommonTooltip>
           </head>
@@ -313,7 +315,7 @@ defineExpose({
 
         <div flex-auto />
 
-        <div dir="ltr" pointer-events-none pe-1 pt-2 text-sm tabular-nums text-secondary flex gap-0.5 :class="{ 'text-rose-500': characterCount > characterLimit }">
+        <div dir="ltr" pointer-events-none pe-1 pt-2 text-sm tabular-nums text-secondary flex gap="0.5" :class="{ 'text-rose-500': characterCount > characterLimit }">
           {{ characterCount ?? 0 }}<span text-secondary-light>/</span><span text-secondary-light>{{ characterLimit }}</span>
         </div>
 
diff --git a/components/search/SearchAccountInfo.vue b/components/search/SearchAccountInfo.vue
index 931bc0e7..e3de38f8 100644
--- a/components/search/SearchAccountInfo.vue
+++ b/components/search/SearchAccountInfo.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 defineProps<{
-  account: Account
+  account: mastodon.v1.Account
 }>()
 </script>
 
 <template>
-  <button flex gap-2 items-center>
+  <div flex gap-2 items-center>
     <AccountAvatar w-10 h-10 :account="account" shrink-0 />
     <div flex="~ col gap1" shrink h-full overflow-hidden leading-none>
       <div flex="~" gap-2>
@@ -16,5 +16,5 @@ defineProps<{
       </div>
       <AccountHandle text-sm :account="account" text-secondary-light />
     </div>
-  </button>
+  </div>
 </template>
diff --git a/components/search/SearchHashtagInfo.vue b/components/search/SearchHashtagInfo.vue
index 0fe2d1fd..eb8f76eb 100644
--- a/components/search/SearchHashtagInfo.vue
+++ b/components/search/SearchHashtagInfo.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts">
-import type { Tag } from 'masto'
+import type { mastodon } from 'masto'
 
-const { hashtag } = defineProps<{ hashtag: Tag }>()
+const { hashtag } = defineProps<{
+  hashtag: mastodon.v1.Tag
+}>()
 
 const totalTrend = $computed(() =>
   hashtag.history?.reduce((total: number, item) => total + (Number(item.accounts) || 0), 0),
@@ -20,7 +22,10 @@ const totalTrend = $computed(() =>
       <CommonTrending :history="hashtag.history" text-xs text-secondary truncate />
     </div>
     <div v-if="totalTrend" absolute left-15 right-0 top-0 bottom-4 op35 flex place-items-center place-content-center ml-auto>
-      <CommonTrendingCharts :history="hashtag.history" text-xs text-secondary width="150" height="20" h-full w-full />
+      <CommonTrendingCharts
+        :history="hashtag.history" :width="150" :height="20"
+        text-xs text-secondary h-full w-full
+      />
     </div>
   </div>
 </template>
diff --git a/components/search/SearchResult.vue b/components/search/SearchResult.vue
index a42baa56..3dd87895 100644
--- a/components/search/SearchResult.vue
+++ b/components/search/SearchResult.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { SearchResult } from './types'
+import type { SearchResult } from '~/composables/masto/search'
 
 defineProps<{
   result: SearchResult
@@ -21,9 +21,9 @@ const onActivate = () => {
     :class="{ 'bg-active': active }"
     @click="() => onActivate()"
   >
-    <SearchHashtagInfo v-if="result.type === 'hashtag'" :hashtag="result.hashtag" />
-    <SearchAccountInfo v-else-if="result.type === 'account' && result.account" :account="result.account" />
-    <StatusCard v-else-if="result.type === 'status' && result.status" :status="result.status" :actions="false" :show-reply-to="false" />
+    <SearchHashtagInfo v-if="result.type === 'hashtag'" :hashtag="result.data" />
+    <SearchAccountInfo v-else-if="result.type === 'account'" :account="result.data" />
+    <StatusCard v-else-if="result.type === 'status'" :status="result.data" :actions="false" :show-reply-to="false" />
     <!-- <div v-else-if="result.type === 'action'" text-center>
       {{ result.action!.label }}
     </div> -->
diff --git a/components/search/SearchWidget.vue b/components/search/SearchWidget.vue
index 2eaca6a8..8a008381 100644
--- a/components/search/SearchWidget.vue
+++ b/components/search/SearchWidget.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import type { AccountResult, HashTagResult, StatusResult } from './types'
-
 const query = ref('')
 const { accounts, hashtags, loading, statuses } = useSearch(query)
 const index = ref(0)
@@ -15,24 +13,9 @@ const results = computed(() => {
     return []
 
   const results = [
-    ...hashtags.value.slice(0, 3).map<HashTagResult>(hashtag => ({
-      type: 'hashtag',
-      id: hashtag.id,
-      hashtag,
-      to: getTagRoute(hashtag.name),
-    })),
-    ...accounts.value.map<AccountResult>(account => ({
-      type: 'account',
-      id: account.id,
-      account,
-      to: getAccountRoute(account),
-    })),
-    ...statuses.value.map<StatusResult>(status => ({
-      type: 'status',
-      id: status.id,
-      status,
-      to: getStatusRoute(status),
-    })),
+    ...hashtags.value.slice(0, 3),
+    ...accounts.value,
+    ...statuses.value,
 
     // Disable until search page is implemented
     // {
@@ -53,16 +36,18 @@ watch([results, focused], () => index.value = -1)
 const shift = (delta: number) => index.value = (index.value + delta % results.value.length + results.value.length) % results.value.length
 
 const activate = () => {
-  (document.activeElement as HTMLElement).blur()
   const currentIndex = index.value
   index.value = -1
 
   if (query.value.length === 0)
     return
 
+  (document.activeElement as HTMLElement).blur()
+
   // Disable until search page is implemented
-  // if (currentIndex === -1)
-  //   router.push(`/search?q=${query.value}`)
+  if (currentIndex === -1)
+    // router.push(`/search?q=${query.value}`)
+    return
 
   router.push(results.value[currentIndex].to)
 }
diff --git a/components/search/types.ts b/components/search/types.ts
deleted file mode 100644
index 66f54e0d..00000000
--- a/components/search/types.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { Account, Status } from 'masto'
-import type { RouteLocation } from 'vue-router'
-
-export type BuildResult<K extends keyof any, T> = {
-  [P in K]: T
-} & {
-  id: string
-  type: K
-  to: RouteLocation & {
-    href: string
-  }
-}
-export type HashTagResult = BuildResult<'hashtag', any>
-export type AccountResult = BuildResult<'account', Account>
-export type StatusResult = BuildResult<'status', Status>
-
-export type SearchResult = HashTagResult | AccountResult | StatusResult
diff --git a/components/settings/SettingsProfileMetadata.vue b/components/settings/SettingsProfileMetadata.vue
index 5ac10b43..c8194f65 100644
--- a/components/settings/SettingsProfileMetadata.vue
+++ b/components/settings/SettingsProfileMetadata.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import type { UpdateCredentialsParams } from 'masto'
+import type { mastodon } from 'masto'
 
 const { form } = defineModel<{
   form: {
-    fieldsAttributes: NonNullable<UpdateCredentialsParams['fieldsAttributes']>
+    fieldsAttributes: NonNullable<mastodon.v1.UpdateCredentialsParams['fieldsAttributes']>
   }
 }>()
 const dropdown = $ref<any>()
diff --git a/components/status/StatusAccountDetails.vue b/components/status/StatusAccountDetails.vue
index 3cb34594..22b50fc1 100644
--- a/components/status/StatusAccountDetails.vue
+++ b/components/status/StatusAccountDetails.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
 const { account, link = true } = defineProps<{
-  account: Account
+  account: mastodon.v1.Account
   link?: boolean
 }>()
 </script>
diff --git a/components/status/StatusActions.vue b/components/status/StatusActions.vue
index 7326a56b..d6b30599 100644
--- a/components/status/StatusActions.vue
+++ b/components/status/StatusActions.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 
 const props = defineProps<{
-  status: Status
+  status: mastodon.v1.Status
   details?: boolean
   command?: boolean
 }>()
@@ -25,14 +25,10 @@ const { formatHumanReadableNumber, formatNumber, forSR } = useHumanReadableNumbe
 const reply = () => {
   if (!checkLogin())
     return
-
-  if (details) {
+  if (details)
     focusEditor()
-  }
-  else {
-    nuxtApp.$rememberStatusPosition(status)
-    navigateTo({ path: getStatusRoute(status).href, state: { focusReply: true } })
-  }
+  else
+    navigateToStatus({ status, focusReply: true })
 }
 </script>
 
diff --git a/components/status/StatusActionsMore.vue b/components/status/StatusActionsMore.vue
index be948f9e..4b991f8c 100644
--- a/components/status/StatusActionsMore.vue
+++ b/components/status/StatusActionsMore.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 
 const props = defineProps<{
-  status: Status
+  status: mastodon.v1.Status
   details?: boolean
   command?: boolean
 }>()
@@ -40,21 +40,21 @@ const toggleTranslation = async () => {
 
 const masto = useMasto()
 
-const getPermalinkUrl = (status: Status) => {
+const getPermalinkUrl = (status: mastodon.v1.Status) => {
   const url = getStatusPermalinkRoute(status)
   if (url)
     return `${location.origin}/${url}`
   return null
 }
 
-const copyLink = async (status: Status) => {
+const copyLink = async (status: mastodon.v1.Status) => {
   const url = getPermalinkUrl(status)
   if (url)
     await clipboard.copy(url)
 }
 
 const { share, isSupported: isShareSupported } = useShare()
-const shareLink = async (status: Status) => {
+const shareLink = async (status: mastodon.v1.Status) => {
   const url = getPermalinkUrl(status)
   if (url)
     await share({ url })
@@ -69,7 +69,7 @@ const deleteStatus = async () => {
     return
 
   removeCachedStatus(status.id)
-  await masto.statuses.remove(status.id)
+  await masto.v1.statuses.remove(status.id)
 
   if (route.name === 'status')
     router.back()
@@ -87,7 +87,7 @@ const deleteAndRedraft = async () => {
   }
 
   removeCachedStatus(status.id)
-  await masto.statuses.remove(status.id)
+  await masto.v1.statuses.remove(status.id)
   await openPublishDialog('dialog', await getDraftFromStatus(status), true)
 
   // Go to the new status, if the page is the old status
diff --git a/components/status/StatusAttachment.vue b/components/status/StatusAttachment.vue
index 99f57017..721b3d43 100644
--- a/components/status/StatusAttachment.vue
+++ b/components/status/StatusAttachment.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
 import { clamp } from '@vueuse/core'
-import type { Attachment } from 'masto'
+import type { mastodon } from 'masto'
 
 const {
   attachment,
   fullSize = false,
 } = defineProps<{
-  attachment: Attachment
-  attachments?: Attachment[]
+  attachment: mastodon.v1.MediaAttachment
+  attachments?: mastodon.v1.MediaAttachment[]
   fullSize?: boolean
 }>()
 
diff --git a/components/status/StatusBody.vue b/components/status/StatusBody.vue
index 446dc75d..d91b5ad9 100644
--- a/components/status/StatusBody.vue
+++ b/components/status/StatusBody.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import type { Status, StatusEdit } from 'masto'
+import type { mastodon } from 'masto'
 
 const {
   status,
   withAction = true,
 } = defineProps<{
-  status: Status | StatusEdit
+  status: mastodon.v1.Status | mastodon.v1.StatusEdit
   withAction?: boolean
 }>()
 
diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index a1b587fd..953268cb 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -1,25 +1,26 @@
 <script setup lang="ts">
-import type { FilterContext, Status } from 'masto'
+import type { mastodon } from 'masto'
 
 const props = withDefaults(
   defineProps<{
-    status: Status
+    status: mastodon.v1.Status
     actions?: boolean
-    context?: FilterContext
+    context?: mastodon.v2.FilterContext
     hover?: boolean
     faded?: boolean
 
     // If we know the prev and next status in the timeline, we can simplify the card
-    older?: Status
-    newer?: Status
+    older?: mastodon.v1.Status
+    newer?: mastodon.v1.Status
     // Manual overrides
     hasOlder?: boolean
     hasNewer?: boolean
+
     // When looking into a detailed view of a post, we can simplify the replying badges
     // to the main expanded post
-    main?: Status
+    main?: mastodon.v1.Status
   }>(),
-  { actions: true, showReplyTo: true },
+  { actions: true },
 )
 
 const status = $computed(() => {
@@ -32,9 +33,13 @@ const status = $computed(() => {
 const directReply = $computed(() => props.hasNewer || (!!status.inReplyToId && (status.inReplyToId === props.newer?.id || status.inReplyToId === props.newer?.reblog?.id)))
 // Use reblogged status, connect it to further replies
 const connectReply = $computed(() => props.hasOlder || status.id === props.older?.inReplyToId || status.id === props.older?.reblog?.inReplyToId)
+// Open a detailed status, the replies directly to it
+const replyToMain = $computed(() => props.main && props.main.id === status.inReplyToId)
 
 const rebloggedBy = $computed(() => props.status.reblog ? props.status.account : null)
 
+const statusRoute = $computed(() => getStatusRoute(status))
+
 const el = ref<HTMLElement>()
 const router = useRouter()
 
@@ -47,14 +52,13 @@ function onclick(evt: MouseEvent | KeyboardEvent) {
 }
 
 function go(evt: MouseEvent | KeyboardEvent) {
-  const route = getStatusRoute(status)
   if (evt.metaKey || evt.ctrlKey) {
-    window.open(route.href)
+    window.open(statusRoute.href)
   }
   else {
     useNuxtApp().$rememberStatusPosition(status)
     cacheStatus(status)
-    router.push(route)
+    router.push(statusRoute)
   }
 }
 
@@ -64,24 +68,19 @@ const timeago = useTimeAgo(() => status.createdAt, timeAgoOptions)
 
 // Content Filter logic
 const filterResult = $computed(() => status.filtered?.length ? status.filtered[0] : null)
-const filter = $computed(() => filterResult?.filter)
+const filter = $computed(() => filterResult?.filter as mastodon.v2.Filter)
 
 // a bit of a hack due to Filter being different in v1 and v2
 // clean up when masto.js supports explicit versions: https://github.com/neet/masto.js/issues/722
 const filterPhrase = $computed(() => filter?.phrase || (filter as any)?.title)
 const isFiltered = $computed(() => filterPhrase && (props.context ? filter?.context.includes(props.context) : false))
 
+const isSelfReply = $computed(() => status.inReplyToAccountId === status.account.id)
 const collapseRebloggedBy = $computed(() => rebloggedBy?.id === status.account.id)
-
-// Collapse ReplyingTo badge if it is a self-reply (thread)
-const collapseReplyingTo = $computed(() => (!rebloggedBy || collapseRebloggedBy) && status.inReplyToAccountId === status.account.id)
-
-// Only show avatar in ReplyingTo badge if it was reblogged by the same account or if it is against the main post
-const simplifyReplyingTo = $computed(() =>
-  (props.main && props.main.account.id === status.inReplyToAccountId) || (rebloggedBy && rebloggedBy.id === status.inReplyToAccountId),
-)
-
 const isDM = $computed(() => status.visibility === 'direct')
+
+const showUpperBorder = $computed(() => props.newer && !directReply)
+const showReplyTo = $computed(() => !replyToMain && !directReply)
 </script>
 
 <template>
@@ -89,8 +88,7 @@ const isDM = $computed(() => status.visibility === 'direct')
     v-if="filter?.filterAction !== 'hide'"
     :id="`status-${status.id}`"
     ref="el"
-    relative flex flex-col gap-1 pl-3 pr-4 pt-1
-    class="pb-1.5"
+    relative flex="~ col gap1" p="l-3 r-4 b-2"
     :class="{ 'hover:bg-active': hover }"
     tabindex="0"
     focus:outline-none focus-visible:ring="2 primary"
@@ -98,10 +96,37 @@ const isDM = $computed(() => status.visibility === 'direct')
     @click="onclick"
     @keydown.enter="onclick"
   >
-    <div v-if="newer && !directReply" w-auto h-1px bg-border />
-    <div flex justify-between>
+    <!-- Upper border -->
+    <div :h="showUpperBorder ? '1px' : '0'" w-auto bg-border mb-1 />
+
+    <!-- Line connecting to previous status -->
+    <template v-if="status.inReplyToAccountId">
+      <StatusReplyingTo
+        v-if="showReplyTo"
+        ml-6 pt-1 pl-5
+        :status="status"
+        :is-self-reply="isSelfReply"
+        :class="faded ? 'text-secondary-light' : ''"
+      />
+      <div flex="~ col gap-1" items-center pos="absolute top-0 left-0" w="20.5" z--1>
+        <template v-if="showReplyTo">
+          <div w="1px" h="0.5" border="x base" mt-3 />
+          <div w="1px" h="0.5" border="x base" />
+          <div w="1px" h="0.5" border="x base" />
+        </template>
+        <div w="1px" h-10 border="x base" />
+      </div>
+    </template>
+
+    <!-- Reblog status & Meta -->
+    <div flex="~ col" justify-between>
       <slot name="meta">
-        <div v-if="rebloggedBy && !collapseRebloggedBy" relative text-secondary ws-nowrap flex="~" items-center pt1 pb0.5 px-1px bg-base>
+        <div
+          v-if="rebloggedBy && !collapseRebloggedBy"
+          flex="~" items-center
+          p="t-1 b-0.5 x-1px"
+          relative text-secondary ws-nowrap
+        >
           <div i-ri:repeat-fill me-46px text-primary w-16px h-16px />
           <div absolute top-1 ms-24px w-32px h-32px rounded-full>
             <AccountHoverWrapper :account="rebloggedBy">
@@ -112,11 +137,11 @@ const isDM = $computed(() => status.visibility === 'direct')
           </div>
           <AccountInlineInfo font-bold :account="rebloggedBy" :avatar="false" text-sm />
         </div>
-        <div v-else />
       </slot>
-      <StatusReplyingTo v-if="!directReply && !collapseReplyingTo" :status="status" :simplified="!!simplifyReplyingTo" :class="faded ? 'text-secondary-light' : ''" pt1 />
     </div>
+
     <div flex gap-3 :class="{ 'text-secondary': faded }">
+      <!-- Avatar -->
       <div relative>
         <div v-if="collapseRebloggedBy" absolute flex items-center justify-center top--6px px-2px py-3px rounded-full bg-base>
           <div i-ri:repeat-fill text-primary w-16px h-16px />
@@ -126,24 +151,25 @@ const isDM = $computed(() => status.visibility === 'direct')
             <AccountBigAvatar :account="status.account" />
           </NuxtLink>
         </AccountHoverWrapper>
-        <div v-if="connectReply" w-full h-full flex justify-center>
-          <div class="w-2.5px" bg-primary-light />
+
+        <div v-if="connectReply" w-full h-full flex mt--3px justify-center>
+          <div w-1px border="x base" />
         </div>
       </div>
+
+      <!-- Main -->
       <div flex="~ col 1" min-w-0>
+        <!-- Account Info -->
         <div flex items-center space-x-1>
           <AccountHoverWrapper :account="status.account">
             <StatusAccountDetails :account="status.account" />
           </AccountHoverWrapper>
-          <div v-if="!directReply && collapseReplyingTo" flex="~" ps-1 items-center justify-center>
-            <StatusReplyingTo :collapsed="true" :status="status" :class="faded ? 'text-secondary-light' : ''" />
-          </div>
           <div flex-auto />
-          <div v-if="!userSettings.zenMode" text-sm text-secondary flex="~ row nowrap" hover:underline>
+          <div v-show="!userSettings.zenMode" text-sm text-secondary flex="~ row nowrap" hover:underline>
             <AccountBotIndicator v-if="status.account.bot" me-2 />
             <div flex>
               <CommonTooltip :content="createdAt">
-                <a :title="status.createdAt" :href="getStatusRoute(status).href" @click.prevent="go($event)">
+                <a :title="status.createdAt" :href="statusRoute.href" @click.prevent="go($event)">
                   <time text-sm ws-nowrap hover:underline :datetime="status.createdAt">
                     {{ timeago }}
                   </time>
@@ -154,10 +180,10 @@ const isDM = $computed(() => status.visibility === 'direct')
           </div>
           <StatusActionsMore v-if="actions !== false" :status="status" me--2 />
         </div>
+
+        <!-- Content -->
         <StatusContent :status="status" :context="context" mb2 :class="{ 'mt-2 mb1': isDM }" />
-        <div>
-          <StatusActions v-if="(actions !== false && !userSettings.zenMode)" :status="status" />
-        </div>
+        <StatusActions v-if="actions !== false" v-show="!userSettings.zenMode" :status="status" />
       </div>
     </div>
   </div>
diff --git a/components/status/StatusContent.vue b/components/status/StatusContent.vue
index b4a842ac..5158c108 100644
--- a/components/status/StatusContent.vue
+++ b/components/status/StatusContent.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import type { FilterContext, Status } from 'masto'
+import type { mastodon } from 'masto'
 
 const { status, context } = defineProps<{
-  status: Status
-  context?: FilterContext | 'details'
+  status: mastodon.v1.Status
+  context?: mastodon.v2.FilterContext | 'details'
 }>()
 
 const isDM = $computed(() => status.visibility === 'direct')
diff --git a/components/status/StatusDetails.vue b/components/status/StatusDetails.vue
index 7c067f4c..6e6fbe7e 100644
--- a/components/status/StatusDetails.vue
+++ b/components/status/StatusDetails.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 
 const props = withDefaults(defineProps<{
-  status: Status
+  status: mastodon.v1.Status
   command?: boolean
   actions?: boolean
 }>(), {
diff --git a/components/status/StatusMedia.vue b/components/status/StatusMedia.vue
index 6507231f..e5d6f6f5 100644
--- a/components/status/StatusMedia.vue
+++ b/components/status/StatusMedia.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Status, StatusEdit } from 'masto'
+import type { mastodon } from 'masto'
 
 const { status } = defineProps<{
-  status: Status | StatusEdit
+  status: mastodon.v1.Status | mastodon.v1.StatusEdit
   fullSize?: boolean
 }>()
 </script>
diff --git a/components/status/StatusPoll.vue b/components/status/StatusPoll.vue
index 1f32f0fe..dd82092e 100644
--- a/components/status/StatusPoll.vue
+++ b/components/status/StatusPoll.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 
 const { status } = defineProps<{
-  status: Status
+  status: mastodon.v1.Status
 }>()
 const poll = reactive({ ...status.poll! })
 
@@ -30,7 +30,7 @@ async function vote(e: Event) {
   poll.votersCount = (poll.votersCount || 0) + 1
   cacheStatus({ ...status, poll }, undefined, true)
 
-  await masto.poll.vote(poll.id, { choices })
+  await masto.v1.polls.vote(poll.id, { choices })
 }
 
 const votersCount = $computed(() => poll.votersCount ?? 0)
diff --git a/components/status/StatusPreviewCard.vue b/components/status/StatusPreviewCard.vue
index f68425c3..9df7ced7 100644
--- a/components/status/StatusPreviewCard.vue
+++ b/components/status/StatusPreviewCard.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Card, CardType } from 'masto'
+import type { mastodon } from 'masto'
 
 const props = defineProps<{
-  card: Card
+  card: mastodon.v1.PreviewCard
   /** For the preview image, only the small image mode is displayed */
   smallPictureOnly?: boolean
   /** When it is root card in the list, not appear as a child card */
@@ -24,7 +24,7 @@ const providerName = $computed(() => props.card.providerName ? props.card.provid
 const gitHubCards = $(useFeatureFlag('experimentalGitHubCards'))
 
 // TODO: handle card.type: 'photo' | 'video' | 'rich';
-const cardTypeIconMap: Record<CardType, string> = {
+const cardTypeIconMap: Record<mastodon.v1.PreviewCardType, string> = {
   link: 'i-ri:profile-line',
   photo: 'i-ri:image-line',
   video: 'i-ri:play-line',
diff --git a/components/status/StatusPreviewCardInfo.vue b/components/status/StatusPreviewCardInfo.vue
index 2fa3821e..2cd8347b 100644
--- a/components/status/StatusPreviewCardInfo.vue
+++ b/components/status/StatusPreviewCardInfo.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Card } from 'masto'
+import type { mastodon } from 'masto'
 
 defineProps<{
-  card: Card
+  card: mastodon.v1.PreviewCard
   /** When it is root card in the list, not appear as a child card */
   root?: boolean
   /** For the preview image, only the small image mode is displayed */
diff --git a/components/status/StatusPreviewGitHub.vue b/components/status/StatusPreviewGitHub.vue
index b8f3e7a1..83f6f619 100644
--- a/components/status/StatusPreviewGitHub.vue
+++ b/components/status/StatusPreviewGitHub.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Card } from 'masto'
+import type { mastodon } from 'masto'
 
 const props = defineProps<{
-  card: Card
+  card: mastodon.v1.PreviewCard
 }>()
 
 type UrlType = 'user' | 'repo' | 'issue' | 'pull'
diff --git a/components/status/StatusReplyingTo.vue b/components/status/StatusReplyingTo.vue
index 67a5e822..773fc558 100644
--- a/components/status/StatusReplyingTo.vue
+++ b/components/status/StatusReplyingTo.vue
@@ -1,10 +1,12 @@
 <script setup lang="ts">
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 
-const { status, collapsed = false, simplified = false } = defineProps<{
-  status: Status
-  collapsed?: boolean
-  simplified?: boolean
+const {
+  status,
+  isSelfReply = false,
+} = defineProps<{
+  status: mastodon.v1.Status
+  isSelfReply: boolean
 }>()
 
 const isSelf = $computed(() => status.inReplyToAccountId === status.account.id)
@@ -12,21 +14,25 @@ const account = isSelf ? computed(() => status.account) : useAccountById(status.
 </script>
 
 <template>
-  <div v-if="status.inReplyToAccountId" flex="~ wrap" gap-1 items-end>
-    <NuxtLink
-      v-if="status.inReplyToId"
-      flex="~" items-center h-auto font-bold text-sm text-secondary gap-1
-      :to="getStatusInReplyToRoute(status)"
-      :title="account ? `Replying to ${getDisplayName(account)}` : 'Replying to someone'"
-    >
-      <template v-if="account">
-        <div i-ri:reply-fill :class="collapsed ? '' : 'scale-x-[-1]'" text-secondary-light />
-        <template v-if="!collapsed">
-          <AccountAvatar v-if="isSelf || simplified || status.inReplyToAccountId === currentUser?.account.id" :account="account" :link="false" w-5 h-5 mx-0.5 />
-          <AccountInlineInfo v-else :account="account" :link="false" mx-0.5 />
+  <NuxtLink
+    v-if="status.inReplyToId"
+    flex="~ gap2" items-center h-auto text-sm text-secondary
+    :to="getStatusInReplyToRoute(status)"
+    :title=" $t('status.replying_to', [account ? getDisplayName(account) : $t('status.someone')])"
+  >
+    <template v-if="isSelfReply">
+      <span btn-text p0 mb-1>{{ $t('status.show_full_thread') }}</span>
+    </template>
+    <template v-else>
+      <div i-ri-chat-1-line />
+      <i18n-t keypath="status.replying_to">
+        <template v-if="account">
+          <AccountInlineInfo :account="account" :link="false" mx1 />
         </template>
-      </template>
-      <div i-ri:question-answer-line text-secondary-light text-lg />
-    </NuxtLink>
-  </div>
+        <template v-else>
+          {{ $t('status.someone') }}
+        </template>
+      </i18n-t>
+    </template>
+  </NuxtLink>
 </template>
diff --git a/components/status/StatusSpoiler.vue b/components/status/StatusSpoiler.vue
index 4d741f7b..10250a0f 100644
--- a/components/status/StatusSpoiler.vue
+++ b/components/status/StatusSpoiler.vue
@@ -11,7 +11,7 @@ watchEffect(() => {
 
 <template>
   <div v-if="enabled" flex flex-col items-start>
-    <div class="content-rich" px-4 pb-2.5 text-center text-secondary w-full border="~ base" border-0 border-b-dotted border-b-3 mt-2>
+    <div class="content-rich" p="x-4 b-2.5" text-center text-secondary w-full border="~ base" border-0 border-b-dotted border-b-3 mt-2>
       <slot name="spoiler" />
     </div>
     <div flex="~ gap-1 center" w-full mt="-4.5">
diff --git a/components/status/edit/StatusEditHistory.vue b/components/status/edit/StatusEditHistory.vue
index 6891b334..3935cca7 100644
--- a/components/status/edit/StatusEditHistory.vue
+++ b/components/status/edit/StatusEditHistory.vue
@@ -1,15 +1,15 @@
 <script setup lang="ts">
-import type { Status, StatusEdit } from 'masto'
+import type { mastodon } from 'masto'
 import { formatTimeAgo } from '@vueuse/core'
 
 const { status } = defineProps<{
-  status: Status
+  status: mastodon.v1.Status
 }>()
 
 const masto = useMasto()
-const { data: statusEdits } = useAsyncData(`status:history:${status.id}`, () => masto.statuses.fetchHistory(status.id).then(res => res.reverse()))
+const { data: statusEdits } = useAsyncData(`status:history:${status.id}`, () => masto.v1.statuses.listHistory(status.id).then(res => res.reverse()))
 
-const showHistory = (edit: StatusEdit) => {
+const showHistory = (edit: mastodon.v1.StatusEdit) => {
   openEditHistoryDialog(edit)
 }
 const timeAgoOptions = useTimeAgoOptions()
diff --git a/components/status/edit/StatusEditIndicator.vue b/components/status/edit/StatusEditIndicator.vue
index 7b096ea0..0d3c8609 100644
--- a/components/status/edit/StatusEditIndicator.vue
+++ b/components/status/edit/StatusEditIndicator.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 
 const { status } = defineProps<{
-  status: Status
+  status: mastodon.v1.Status
   inline: boolean
 }>()
 
diff --git a/components/status/edit/StatusEditPreview.vue b/components/status/edit/StatusEditPreview.vue
index fe6a44d9..c0bc3496 100644
--- a/components/status/edit/StatusEditPreview.vue
+++ b/components/status/edit/StatusEditPreview.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { StatusEdit } from 'masto'
+import type { mastodon } from 'masto'
 
 const { edit } = defineProps<{
-  edit: StatusEdit
+  edit: mastodon.v1.StatusEdit
 }>()
 </script>
 
diff --git a/components/tag/TagActionButton.vue b/components/tag/TagActionButton.vue
index 3bd13d60..aab26f16 100644
--- a/components/tag/TagActionButton.vue
+++ b/components/tag/TagActionButton.vue
@@ -1,21 +1,21 @@
 <script setup lang="ts">
-import type { Tag } from 'masto'
+import type { mastodon } from 'masto'
 
 const { tag } = defineProps<{
-  tag: Tag
+  tag: mastodon.v1.Tag
 }>()
 
 const emit = defineEmits<{
   (event: 'change'): void
 }>()
 
-const { tags } = useMasto()
+const masto = useMasto()
 
 const toggleFollowTag = async () => {
   if (tag.following)
-    await tags.unfollow(tag.name)
+    await masto.v1.tags.unfollow(tag.name)
   else
-    await tags.follow(tag.name)
+    await masto.v1.tags.follow(tag.name)
 
   emit('change')
 }
diff --git a/components/tag/TagCard.vue b/components/tag/TagCard.vue
index cc01aef8..7ba468ae 100644
--- a/components/tag/TagCard.vue
+++ b/components/tag/TagCard.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup>
-import type { Tag } from 'masto'
+import type { mastodon } from 'masto'
 
 const {
   tag,
 } = $defineProps<{
-  tag: Tag
+  tag: mastodon.v1.Tag
 }>()
 
 const to = $computed(() => new URL(tag.url).pathname)
diff --git a/components/timeline/TimelineBlocks.vue b/components/timeline/TimelineBlocks.vue
index 5b20b337..fbb7e48e 100644
--- a/components/timeline/TimelineBlocks.vue
+++ b/components/timeline/TimelineBlocks.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const paginator = useMasto().blocks.iterate()
+const paginator = useMasto().v1.blocks.list()
 </script>
 
 <template>
diff --git a/components/timeline/TimelineBookmarks.vue b/components/timeline/TimelineBookmarks.vue
index f99ba34c..6b0cff15 100644
--- a/components/timeline/TimelineBookmarks.vue
+++ b/components/timeline/TimelineBookmarks.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const paginator = useMasto().bookmarks.iterate()
+const paginator = useMasto().v1.bookmarks.list()
 </script>
 
 <template>
diff --git a/components/timeline/TimelineConversations.vue b/components/timeline/TimelineConversations.vue
index a9af6ba3..ae0d5fca 100644
--- a/components/timeline/TimelineConversations.vue
+++ b/components/timeline/TimelineConversations.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const paginator = useMasto().conversations.iterate()
+const paginator = useMasto().v1.conversations.list()
 </script>
 
 <template>
diff --git a/components/timeline/TimelineDomainBlocks.vue b/components/timeline/TimelineDomainBlocks.vue
index a0f564f8..dc21a6bd 100644
--- a/components/timeline/TimelineDomainBlocks.vue
+++ b/components/timeline/TimelineDomainBlocks.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 const masto = useMasto()
-const paginator = masto.domainBlocks.iterate()
+const paginator = masto.v1.domainBlocks.list()
 
 const unblock = async (domain: string) => {
-  await masto.domainBlocks.unblock(domain)
+  await masto.v1.domainBlocks.unblock(domain)
 }
 </script>
 
diff --git a/components/timeline/TimelineFavourites.vue b/components/timeline/TimelineFavourites.vue
index b5e286a5..c9de586c 100644
--- a/components/timeline/TimelineFavourites.vue
+++ b/components/timeline/TimelineFavourites.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const paginator = useMasto().favourites.iterate()
+const paginator = useMasto().v1.favourites.list()
 </script>
 
 <template>
diff --git a/components/timeline/TimelineHome.vue b/components/timeline/TimelineHome.vue
index d1a83633..4404ea7c 100644
--- a/components/timeline/TimelineHome.vue
+++ b/components/timeline/TimelineHome.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-const paginator = useMasto().timelines.iterateHome()
-const stream = useMasto().stream.streamUser()
+const paginator = useMasto().v1.timelines.listHome()
+const stream = useMasto().v1.stream.streamUser()
 onBeforeUnmount(() => stream?.then(s => s.disconnect()))
 </script>
 
diff --git a/components/timeline/TimelineList.vue b/components/timeline/TimelineList.vue
index d31dd448..36b36473 100644
--- a/components/timeline/TimelineList.vue
+++ b/components/timeline/TimelineList.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 
 defineProps<{
-  timelines: Status[]
+  timelines: mastodon.v1.Status[]
 }>()
 </script>
 
diff --git a/components/timeline/TimelineMentions.vue b/components/timeline/TimelineMentions.vue
index edc57a31..2955a4e0 100644
--- a/components/timeline/TimelineMentions.vue
+++ b/components/timeline/TimelineMentions.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 // Default limit is 20 notifications, and servers are normally caped to 30
-const paginator = useMasto().notifications.iterate({ limit: 30, types: ['mention'] })
+const paginator = useMasto().v1.notifications.list({ limit: 30, types: ['mention'] })
 
 const { clearNotifications } = useNotifications()
 onActivated(clearNotifications)
 
-const stream = useMasto().stream.streamUser()
+const stream = useMasto().v1.stream.streamUser()
 </script>
 
 <template>
diff --git a/components/timeline/TimelineMutes.vue b/components/timeline/TimelineMutes.vue
index 303c10ff..64169109 100644
--- a/components/timeline/TimelineMutes.vue
+++ b/components/timeline/TimelineMutes.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const paginator = useMasto().mutes.iterate()
+const paginator = useMasto().v1.mutes.list()
 </script>
 
 <template>
diff --git a/components/timeline/TimelineNotifications.vue b/components/timeline/TimelineNotifications.vue
index 11e6fd4a..9968c678 100644
--- a/components/timeline/TimelineNotifications.vue
+++ b/components/timeline/TimelineNotifications.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 // Default limit is 20 notifications, and servers are normally caped to 30
-const paginator = useMasto().notifications.iterate({ limit: 30 })
+const paginator = useMasto().v1.notifications.list({ limit: 30 })
 
 const { clearNotifications } = useNotifications()
 onActivated(clearNotifications)
 
-const stream = useMasto().stream.streamUser()
+const stream = useMasto().v1.stream.streamUser()
 </script>
 
 <template>
diff --git a/components/timeline/TimelinePaginator.vue b/components/timeline/TimelinePaginator.vue
index 5570fc33..49d7cc84 100644
--- a/components/timeline/TimelinePaginator.vue
+++ b/components/timeline/TimelinePaginator.vue
@@ -2,14 +2,14 @@
 // @ts-expect-error missing types
 import { DynamicScrollerItem } from 'vue-virtual-scroller'
 import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
-import type { Account, FilterContext, Paginator, Status, WsEvents } from 'masto'
+import type { Paginator, WsEvents, mastodon } from 'masto'
 
 const { paginator, stream, account } = defineProps<{
-  paginator: Paginator<any, Status[]>
+  paginator: Paginator<mastodon.v1.Status[], mastodon.v1.ListAccountStatusesParams>
   stream?: Promise<WsEvents>
-  context?: FilterContext
-  account?: Account
-  preprocess?: (items: any[]) => any[]
+  context?: mastodon.v2.FilterContext
+  account?: mastodon.v1.Account
+  preprocess?: (items: mastodon.v1.Status[]) => mastodon.v1.Status[]
 }>()
 
 const { formatNumber } = useHumanReadableNumber()
diff --git a/components/timeline/TimelinePinned.vue b/components/timeline/TimelinePinned.vue
index e0862f01..d62fbb05 100644
--- a/components/timeline/TimelinePinned.vue
+++ b/components/timeline/TimelinePinned.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const paginator = useMasto().accounts.iterateStatuses(currentUser.value!.account.id, { pinned: true })
+const paginator = useMasto().v1.accounts.listStatuses(currentUser.value!.account.id, { pinned: true })
 </script>
 
 <template>
diff --git a/components/timeline/TimelinePublic.vue b/components/timeline/TimelinePublic.vue
index 2c1e1e16..06122783 100644
--- a/components/timeline/TimelinePublic.vue
+++ b/components/timeline/TimelinePublic.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-const paginator = useMasto().timelines.iteratePublic()
-const stream = useMasto().stream.streamPublicTimeline()
+const paginator = useMasto().v1.timelines.listPublic()
+const stream = useMasto().v1.stream.streamPublicTimeline()
 onBeforeUnmount(() => stream.then(s => s.disconnect()))
 </script>
 
diff --git a/components/timeline/TimelinePublicLocal.vue b/components/timeline/TimelinePublicLocal.vue
index 829c75da..4db8e093 100644
--- a/components/timeline/TimelinePublicLocal.vue
+++ b/components/timeline/TimelinePublicLocal.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-const paginator = useMasto().timelines.iteratePublic({ local: true })
-const stream = useMasto().stream.streamCommunityTimeline()
+const paginator = useMasto().v1.timelines.listPublic({ local: true })
+const stream = useMasto().v1.stream.streamCommunityTimeline()
 onBeforeUnmount(() => stream.then(s => s.disconnect()))
 </script>
 
diff --git a/components/tiptap/TiptapHashtagList.vue b/components/tiptap/TiptapHashtagList.vue
index 88728379..d8c063aa 100644
--- a/components/tiptap/TiptapHashtagList.vue
+++ b/components/tiptap/TiptapHashtagList.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import type { Tag } from 'masto'
+import type { mastodon } from 'masto'
 import CommonScrollIntoView from '../common/CommonScrollIntoView.vue'
 
 const { items, command } = defineProps<{
-  items: Tag[]
+  items: mastodon.v1.Tag[]
   command: Function
   isPending?: boolean
 }>()
diff --git a/components/tiptap/TiptapMentionList.vue b/components/tiptap/TiptapMentionList.vue
index 84e8c0e6..08bad3d6 100644
--- a/components/tiptap/TiptapMentionList.vue
+++ b/components/tiptap/TiptapMentionList.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 import CommonScrollIntoView from '../common/CommonScrollIntoView.vue'
 
 const { items, command } = defineProps<{
-  items: Account[]
+  items: mastodon.v1.Account[]
   command: Function
   isPending?: boolean
 }>()
diff --git a/components/user/UserSignIn.vue b/components/user/UserSignIn.vue
index b9ae3589..0c9af5d4 100644
--- a/components/user/UserSignIn.vue
+++ b/components/user/UserSignIn.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import Fuse from 'fuse.js'
 import { $fetch } from 'ofetch'
-import { DEFAULT_SERVER } from '~/constants'
 
 const input = $ref<HTMLInputElement>()
 let server = $ref<string>('')
@@ -26,7 +25,7 @@ async function oauth() {
     server = server.split('/')[0]
 
   try {
-    location.href = await $fetch<string>(`/api/${server || DEFAULT_SERVER}/login`, {
+    location.href = await $fetch<string>(`/api/${server || publicServer.value}/login`, {
       method: 'POST',
       body: {
         origin: location.origin,
diff --git a/composables/cache.ts b/composables/cache.ts
index 145834a1..b453c291 100644
--- a/composables/cache.ts
+++ b/composables/cache.ts
@@ -1,5 +1,5 @@
 import LRU from 'lru-cache'
-import type { Account, Status } from 'masto'
+import type { mastodon } from 'masto'
 
 const cache = new LRU<string, any>({
   max: 1000,
@@ -17,13 +17,13 @@ function removeCached(key: string) {
   cache.delete(key)
 }
 
-export function fetchStatus(id: string, force = false): Promise<Status> {
+export function fetchStatus(id: string, force = false): Promise<mastodon.v1.Status> {
   const server = currentServer.value
   const key = `${server}:status:${id}`
   const cached = cache.get(key)
   if (cached && !force)
     return cached
-  const promise = useMasto().statuses.fetch(id)
+  const promise = useMasto().v1.statuses.fetch(id)
     .then((status) => {
       cacheStatus(status)
       return status
@@ -32,7 +32,7 @@ export function fetchStatus(id: string, force = false): Promise<Status> {
   return promise
 }
 
-export function fetchAccountById(id?: string | null): Promise<Account | null> {
+export function fetchAccountById(id?: string | null): Promise<mastodon.v1.Account | null> {
   if (!id)
     return Promise.resolve(null)
 
@@ -41,11 +41,11 @@ export function fetchAccountById(id?: string | null): Promise<Account | null> {
   const cached = cache.get(key)
   if (cached)
     return cached
-  const uri = currentInstance.value?.uri
-  const promise = useMasto().accounts.fetch(id)
+  const domain = currentInstance.value?.domain
+  const promise = useMasto().v1.accounts.fetch(id)
     .then((r) => {
-      if (r.acct && !r.acct.includes('@') && uri)
-        r.acct = `${r.acct}@${uri}`
+      if (r.acct && !r.acct.includes('@') && domain)
+        r.acct = `${r.acct}@${domain}`
 
       cacheAccount(r, server, true)
       return r
@@ -54,17 +54,17 @@ export function fetchAccountById(id?: string | null): Promise<Account | null> {
   return promise
 }
 
-export async function fetchAccountByHandle(acct: string): Promise<Account> {
+export async function fetchAccountByHandle(acct: string): Promise<mastodon.v1.Account> {
   const server = currentServer.value
   const key = `${server}:account:${acct}`
   const cached = cache.get(key)
   if (cached)
     return cached
-  const uri = currentInstance.value?.uri
-  const account = useMasto().accounts.lookup({ acct })
+  const domain = currentInstance.value?.domain
+  const account = useMasto().v1.accounts.lookup({ acct })
     .then((r) => {
-      if (r.acct && !r.acct.includes('@') && uri)
-        r.acct = `${r.acct}@${uri}`
+      if (r.acct && !r.acct.includes('@') && domain)
+        r.acct = `${r.acct}@${domain}`
 
       cacheAccount(r, server, true)
       return r
@@ -81,7 +81,7 @@ export function useAccountById(id?: string | null) {
   return useAsyncState(() => fetchAccountById(id), null).state
 }
 
-export function cacheStatus(status: Status, server = currentServer.value, override?: boolean) {
+export function cacheStatus(status: mastodon.v1.Status, server = currentServer.value, override?: boolean) {
   setCached(`${server}:status:${status.id}`, status, override)
 }
 
@@ -89,7 +89,7 @@ export function removeCachedStatus(id: string, server = currentServer.value) {
   removeCached(`${server}:status:${id}`)
 }
 
-export function cacheAccount(account: Account, server = currentServer.value, override?: boolean) {
+export function cacheAccount(account: mastodon.v1.Account, server = currentServer.value, override?: boolean) {
   setCached(`${server}:account:${account.id}`, account, override)
   setCached(`${server}:account:${account.acct}`, account, override)
 }
diff --git a/composables/command.ts b/composables/command.ts
index aa74e284..1a73918d 100644
--- a/composables/command.ts
+++ b/composables/command.ts
@@ -2,7 +2,7 @@ import type { ComputedRef } from 'vue'
 import { defineStore } from 'pinia'
 import Fuse from 'fuse.js'
 import type { LocaleObject } from '#i18n'
-import type { SearchResult } from '@/components/search/types'
+import type { SearchResult } from '~/composables/masto/search'
 
 // @unocss-include
 
diff --git a/composables/content-parse.ts b/composables/content-parse.ts
index 47f82925..f6e0aab7 100644
--- a/composables/content-parse.ts
+++ b/composables/content-parse.ts
@@ -1,12 +1,12 @@
 // @unimport-disable
-import type { Emoji } from 'masto'
+import type { mastodon } from 'masto'
 import type { Node } from 'ultrahtml'
-import { ELEMENT_NODE, TEXT_NODE, h, parse, render } from 'ultrahtml'
+import { DOCUMENT_NODE, ELEMENT_NODE, TEXT_NODE, h, parse, render } from 'ultrahtml'
 import { findAndReplaceEmojisInText } from '@iconify/utils'
 import { emojiRegEx, getEmojiAttributes } from '../config/emojis'
 
 export interface ContentParseOptions {
-  emojis?: Record<string, Emoji>
+  emojis?: Record<string, mastodon.v1.CustomEmoji>
   markdown?: boolean
   replaceUnicodeEmoji?: boolean
   astTransforms?: Transform[]
@@ -79,13 +79,15 @@ export function parseMastodonHTML(
 
   transforms.push(replaceCustomEmoji(options.emojis || {}))
 
+  transforms.push(transformParagraphs)
+
   return transformSync(parse(html), transforms)
 }
 
 /**
  * Converts raw HTML form Mastodon server to HTML for Tiptap editor
  */
-export function convertMastodonHTML(html: string, customEmojis: Record<string, Emoji> = {}) {
+export function convertMastodonHTML(html: string, customEmojis: Record<string, mastodon.v1.CustomEmoji> = {}) {
   const tree = parseMastodonHTML(html, {
     emojis: customEmojis,
     markdown: true,
@@ -285,7 +287,7 @@ function transformUnicodeEmoji(node: Node) {
   return matches.filter(Boolean)
 }
 
-function replaceCustomEmoji(customEmojis: Record<string, Emoji>): Transform {
+function replaceCustomEmoji(customEmojis: Record<string, mastodon.v1.CustomEmoji>): Transform {
   return (node) => {
     if (node.type !== TEXT_NODE)
       return node
@@ -313,6 +315,8 @@ const _markdownReplacements: [RegExp, (c: (string | Node)[]) => Node][] = [
   [/\*(.*?)\*/g, c => h('em', null, c)],
   [/~~(.*?)~~/g, c => h('del', null, c)],
   [/`([^`]+?)`/g, c => h('code', null, c)],
+  // transform @username@twitter.com as links
+  [/(?:^|\b)@([a-zA-Z0-9_]+)@twitter\.com(?:$|\b)/gi, c => h('a', { href: `https://twitter.com/${c[0]}`, target: '_blank', class: 'mention external' }, `@${c[0]}@twitter.com`)],
 ]
 
 function _markdownProcess(value: string) {
@@ -349,3 +353,10 @@ function transformMarkdown(node: Node) {
     return node
   return _markdownProcess(node.value)
 }
+
+function transformParagraphs(node: Node): Node | Node[] {
+  // For top level paragraphs, inject an empty <p> to preserve status paragraphs in our editor (except for the last one)
+  if (node.parent?.type === DOCUMENT_NODE && node.name === 'p' && node.parent.children.at(-1) !== node)
+    return [node, h('p')]
+  return node
+}
diff --git a/composables/dialog.ts b/composables/dialog.ts
index 361a0a56..5aab8372 100644
--- a/composables/dialog.ts
+++ b/composables/dialog.ts
@@ -1,14 +1,14 @@
-import type { Attachment, Status, StatusEdit } from 'masto'
+import type { mastodon } from 'masto'
 import type { ConfirmDialogChoice, ConfirmDialogLabel, Draft } from '~/types'
 import { STORAGE_KEY_FIRST_VISIT } from '~/constants'
 
 export const confirmDialogChoice = ref<ConfirmDialogChoice>()
 export const confirmDialogLabel = ref<ConfirmDialogLabel>()
 
-export const mediaPreviewList = ref<Attachment[]>([])
+export const mediaPreviewList = ref<mastodon.v1.MediaAttachment[]>([])
 export const mediaPreviewIndex = ref(0)
 
-export const statusEdit = ref<StatusEdit>()
+export const statusEdit = ref<mastodon.v1.StatusEdit>()
 export const dialogDraftKey = ref<string>()
 
 export const commandPanelInput = ref('')
@@ -23,7 +23,7 @@ export const isPreviewHelpOpen = ref(isFirstVisit.value)
 export const isCommandPanelOpen = ref(false)
 export const isConfirmDialogOpen = ref(false)
 
-export const lastPublishDialogStatus = ref<Status | null>(null)
+export const lastPublishDialogStatus = ref<mastodon.v1.Status | null>(null)
 
 export function openSigninDialog() {
   isSigninDialogOpen.value = true
@@ -80,7 +80,7 @@ if (process.client) {
   restoreMediaPreviewFromState()
 }
 
-export function openMediaPreview(attachments: Attachment[], index = 0) {
+export function openMediaPreview(attachments: mastodon.v1.MediaAttachment[], index = 0) {
   mediaPreviewList.value = attachments
   mediaPreviewIndex.value = index
   isMediaPreviewOpen.value = true
@@ -97,7 +97,7 @@ export function closeMediaPreview() {
   history.back()
 }
 
-export function openEditHistoryDialog(edit: StatusEdit) {
+export function openEditHistoryDialog(edit: mastodon.v1.StatusEdit) {
   statusEdit.value = edit
   isEditHistoryDialogOpen.value = true
 }
diff --git a/composables/emojis.ts b/composables/emojis.ts
index 243c7bd3..4eb1299b 100644
--- a/composables/emojis.ts
+++ b/composables/emojis.ts
@@ -1,4 +1,4 @@
-import type { Emoji } from 'masto'
+import type { mastodon } from 'masto'
 import type { CustomEmojisInfo } from './push-notifications/types'
 import { STORAGE_KEY_CUSTOM_EMOJIS } from '~/constants'
 
@@ -20,14 +20,14 @@ export async function updateCustomEmojis() {
     return
 
   const masto = useMasto()
-  const emojis = await masto.customEmojis.fetchAll()
+  const emojis = await masto.v1.customEmojis.list()
   Object.assign(currentCustomEmojis.value, {
     lastUpdate: Date.now(),
     emojis,
   })
 }
 
-function transformEmojiData(emojis: Emoji[]) {
+function transformEmojiData(emojis: mastodon.v1.CustomEmoji[]) {
   const result = []
 
   for (const emoji of emojis) {
@@ -52,9 +52,9 @@ export const customEmojisData = computed(() => currentCustomEmojis.value.emojis.
     }]
   : undefined)
 
-export function useEmojisFallback(emojisGetter: () => Emoji[] | undefined) {
+export function useEmojisFallback(emojisGetter: () => mastodon.v1.CustomEmoji[] | undefined) {
   return computed(() => {
-    const result: Emoji[] = []
+    const result: mastodon.v1.CustomEmoji[] = []
     const emojis = emojisGetter()
     if (emojis)
       result.push(...emojis)
diff --git a/composables/i18n.ts b/composables/i18n.ts
index 7c4b8724..8e85ab06 100644
--- a/composables/i18n.ts
+++ b/composables/i18n.ts
@@ -2,11 +2,11 @@ import type { MaybeComputedRef, MaybeRef, UseTimeAgoOptions } from '@vueuse/core
 
 const formatter = Intl.NumberFormat()
 
-export const formattedNumber = (num: number, useFormatter: Intl.NumberFormat = formatter) => {
+export function formattedNumber(num: number, useFormatter: Intl.NumberFormat = formatter) {
   return useFormatter.format(num)
 }
 
-export const useHumanReadableNumber = () => {
+export function useHumanReadableNumber() {
   const { n, locale } = useI18n()
 
   const fn = (num: number) => {
@@ -29,10 +29,8 @@ export const useHumanReadableNumber = () => {
   }
 }
 
-export const useFormattedDateTime = (
-  value: MaybeComputedRef<string | number | Date | undefined | null>,
-  options: Intl.DateTimeFormatOptions = { dateStyle: 'long', timeStyle: 'medium' },
-) => {
+export function useFormattedDateTime(value: MaybeComputedRef<string | number | Date | undefined | null>,
+  options: Intl.DateTimeFormatOptions = { dateStyle: 'long', timeStyle: 'medium' }) {
   const { locale } = useI18n()
   const formatter = $computed(() => Intl.DateTimeFormat(locale.value, options))
   return computed(() => {
@@ -41,7 +39,7 @@ export const useFormattedDateTime = (
   })
 }
 
-export const useTimeAgoOptions = (short = false): UseTimeAgoOptions<false> => {
+export function useTimeAgoOptions(short = false): UseTimeAgoOptions<false> {
   const { d, t, n: fnf, locale } = useI18n()
   const prefix = short ? 'short_' : ''
 
@@ -56,7 +54,7 @@ export const useTimeAgoOptions = (short = false): UseTimeAgoOptions<false> => {
   return {
     rounding: 'floor',
     showSecond: !short,
-    updateInterval: short ? 60_000 : 1_000,
+    updateInterval: short ? 60000 : 1000,
     messages: {
       justNow: t('time_ago_options.just_now'),
       // just return the value
diff --git a/composables/masto/account.ts b/composables/masto/account.ts
index 4c365a13..91ca7911 100644
--- a/composables/masto/account.ts
+++ b/composables/masto/account.ts
@@ -1,26 +1,26 @@
-import type { Account } from 'masto'
+import type { mastodon } from 'masto'
 
-export function getDisplayName(account?: Account, options?: { rich?: boolean }) {
+export function getDisplayName(account?: mastodon.v1.Account, options?: { rich?: boolean }) {
   const displayName = account?.displayName || account?.username || ''
   if (options?.rich)
     return displayName
   return displayName.replace(/:([\w-]+?):/g, '')
 }
 
-export function getShortHandle({ acct }: Account) {
+export function getShortHandle({ acct }: mastodon.v1.Account) {
   if (!acct)
     return ''
   return `@${acct.includes('@') ? acct.split('@')[0] : acct}`
 }
 
-export function getServerName(account: Account) {
+export function getServerName(account: mastodon.v1.Account) {
   if (account.acct?.includes('@'))
     return account.acct.split('@')[1]
   // We should only lack the server name if we're on the same server as the account
-  return currentInstance.value?.uri || ''
+  return currentInstance.value?.domain || ''
 }
 
-export function getFullHandle(account: Account) {
+export function getFullHandle(account: mastodon.v1.Account) {
   const handle = `@${account.acct}`
   if (!currentUser.value || account.acct.includes('@'))
     return handle
@@ -36,16 +36,16 @@ export function toShortHandle(fullHandle: string) {
   return fullHandle
 }
 
-export function extractAccountHandle(account: Account) {
+export function extractAccountHandle(account: mastodon.v1.Account) {
   let handle = getFullHandle(account).slice(1)
-  const uri = currentInstance.value?.uri ?? currentServer.value
+  const uri = currentInstance.value?.domain ?? currentServer.value
   if (currentInstance.value && handle.endsWith(`@${uri}`))
     handle = handle.slice(0, -uri.length - 1)
 
   return handle
 }
 
-export function useAccountHandle(account: Account, fullServer = true) {
+export function useAccountHandle(account: mastodon.v1.Account, fullServer = true) {
   return computed(() => fullServer
     ? getFullHandle(account)
     : getShortHandle(account),
diff --git a/composables/masto/relationship.ts b/composables/masto/relationship.ts
index 4a92b084..1deaf71d 100644
--- a/composables/masto/relationship.ts
+++ b/composables/masto/relationship.ts
@@ -1,20 +1,20 @@
-import type { Account, Relationship } from 'masto'
+import type { mastodon } from 'masto'
 import type { Ref } from 'vue'
 
 // Batch requests for relationships when used in the UI
 // We don't want to hold to old values, so every time a Relationship is needed it
 // is requested again from the server to show the latest state
 
-const requestedRelationships = new Map<string, Ref<Relationship | undefined>>()
+const requestedRelationships = new Map<string, Ref<mastodon.v1.Relationship | undefined>>()
 let timeoutHandle: NodeJS.Timeout | undefined
 
-export function useRelationship(account: Account): Ref<Relationship | undefined> {
+export function useRelationship(account: mastodon.v1.Account): Ref<mastodon.v1.Relationship | undefined> {
   if (!currentUser.value)
     return ref()
   let relationship = requestedRelationships.get(account.id)
   if (relationship)
     return relationship
-  relationship = ref<Relationship | undefined>()
+  relationship = ref<mastodon.v1.Relationship | undefined>()
   requestedRelationships.set(account.id, relationship)
   if (timeoutHandle)
     clearTimeout(timeoutHandle)
@@ -27,7 +27,7 @@ export function useRelationship(account: Account): Ref<Relationship | undefined>
 
 async function fetchRelationships() {
   const requested = Array.from(requestedRelationships.entries()).filter(([, r]) => !r.value)
-  const relationships = await useMasto().accounts.fetchRelationships(requested.map(([id]) => id))
+  const relationships = await useMasto().v1.accounts.fetchRelationships(requested.map(([id]) => id))
   for (let i = 0; i < requested.length; i++)
     requested[i][1].value = relationships[i]
 }
diff --git a/composables/masto/routes.ts b/composables/masto/routes.ts
index 05fe07e7..1043bb34 100644
--- a/composables/masto/routes.ts
+++ b/composables/masto/routes.ts
@@ -1,7 +1,7 @@
 import { withoutProtocol } from 'ufo'
-import type { Account, Status } from 'masto'
+import type { mastodon } from 'masto'
 
-export function getAccountRoute(account: Account) {
+export function getAccountRoute(account: mastodon.v1.Account) {
   return useRouter().resolve({
     name: 'account-index',
     params: {
@@ -10,7 +10,7 @@ export function getAccountRoute(account: Account) {
     },
   })
 }
-export function getAccountFollowingRoute(account: Account) {
+export function getAccountFollowingRoute(account: mastodon.v1.Account) {
   return useRouter().resolve({
     name: 'account-following',
     params: {
@@ -19,7 +19,7 @@ export function getAccountFollowingRoute(account: Account) {
     },
   })
 }
-export function getAccountFollowersRoute(account: Account) {
+export function getAccountFollowersRoute(account: mastodon.v1.Account) {
   return useRouter().resolve({
     name: 'account-followers',
     params: {
@@ -29,7 +29,7 @@ export function getAccountFollowersRoute(account: Account) {
   })
 }
 
-export function getStatusRoute(status: Status) {
+export function getStatusRoute(status: mastodon.v1.Status) {
   return useRouter().resolve({
     name: 'status',
     params: {
@@ -50,11 +50,11 @@ export function getTagRoute(tag: string) {
   })
 }
 
-export function getStatusPermalinkRoute(status: Status) {
+export function getStatusPermalinkRoute(status: mastodon.v1.Status) {
   return status.url ? withoutProtocol(status.url) : null
 }
 
-export function getStatusInReplyToRoute(status: Status) {
+export function getStatusInReplyToRoute(status: mastodon.v1.Status) {
   return useRouter().resolve({
     name: 'status-by-id',
     params: {
diff --git a/composables/masto/search.ts b/composables/masto/search.ts
index 8eca9016..ed98f3ab 100644
--- a/composables/masto/search.ts
+++ b/composables/masto/search.ts
@@ -1,19 +1,64 @@
 import type { MaybeRef } from '@vueuse/core'
-import type { Account, Paginator, Results, SearchParams, Status } from 'masto'
+import type { Paginator, mastodon } from 'masto'
+import type { RouteLocation } from 'vue-router'
 
 export interface UseSearchOptions {
-  type?: MaybeRef<'accounts' | 'hashtags' | 'statuses'>
+  type?: MaybeRef<mastodon.v2.SearchType>
 }
 
+export interface BuildSearchResult<K extends keyof any, T> {
+  id: string
+  type: K
+  data: T
+  to: RouteLocation & {
+    href: string
+  }
+}
+export type AccountSearchResult = BuildSearchResult<'account', mastodon.v1.Account>
+export type HashTagSearchResult = BuildSearchResult<'hashtag', mastodon.v1.Tag>
+export type StatusSearchResult = BuildSearchResult<'status', mastodon.v1.Status>
+
+export type SearchResult = HashTagSearchResult | AccountSearchResult | StatusSearchResult
+
 export function useSearch(query: MaybeRef<string>, options?: UseSearchOptions) {
   const done = ref(false)
   const masto = useMasto()
   const loading = ref(false)
-  const statuses = ref<Status[]>([])
-  const accounts = ref<Account[]>([])
-  const hashtags = ref<any[]>([])
+  const accounts = ref<AccountSearchResult[]>([])
+  const hashtags = ref<HashTagSearchResult[]>([])
+  const statuses = ref<StatusSearchResult[]>([])
 
-  let paginator: Paginator<SearchParams, Results> | undefined
+  let paginator: Paginator<mastodon.v2.Search, mastodon.v2.SearchParams> | undefined
+
+  const appendResults = (results: mastodon.v2.Search, empty = false) => {
+    if (empty) {
+      accounts.value = []
+      hashtags.value = []
+      statuses.value = []
+    }
+    accounts.value = [...accounts.value, ...results.accounts.map<AccountSearchResult>(account => ({
+      type: 'account',
+      id: account.id,
+      data: account,
+      to: getAccountRoute(account),
+    }))]
+    hashtags.value = [...hashtags.value, ...results.hashtags.map<HashTagSearchResult>(hashtag => ({
+      type: 'hashtag',
+      id: `hashtag-${hashtag.name}`,
+      data: hashtag,
+      to: getTagRoute(hashtag.name),
+    }))]
+    statuses.value = [...statuses.value, ...results.statuses.map<StatusSearchResult>(status => ({
+      type: 'status',
+      id: status.id,
+      data: status,
+      to: getStatusRoute(status),
+    }))]
+  }
+
+  watch(() => unref(query), () => {
+    loading.value = !!(unref(query) && isMastoInitialised.value)
+  })
 
   debouncedWatch(() => unref(query), async () => {
     if (!unref(query) || !isMastoInitialised.value)
@@ -25,17 +70,19 @@ export function useSearch(query: MaybeRef<string>, options?: UseSearchOptions) {
      * Based on the source it seems like modifying the params when calling next would result in a new search,
      * but that doesn't seem to be the case. So instead we just create a new paginator with the new params.
      */
-    paginator = masto.search({ q: unref(query), resolve: !!currentUser.value, type: unref(options?.type) })
+    paginator = masto.v2.search({
+      q: unref(query),
+      resolve: !!currentUser.value,
+      type: unref(options?.type),
+    })
     const nextResults = await paginator.next()
 
-    done.value = nextResults.done || false
-
-    statuses.value = nextResults.value?.statuses || []
-    accounts.value = nextResults.value?.accounts || []
-    hashtags.value = nextResults.value?.hashtags || []
+    done.value = !!nextResults.done
+    if (!nextResults.done)
+      appendResults(nextResults.value, true)
 
     loading.value = false
-  }, { debounce: 500 })
+  }, { debounce: 300 })
 
   const next = async () => {
     if (!unref(query) || !isMastoInitialised.value || !paginator)
@@ -45,19 +92,9 @@ export function useSearch(query: MaybeRef<string>, options?: UseSearchOptions) {
     const nextResults = await paginator.next()
     loading.value = false
 
-    done.value = nextResults.done || false
-    statuses.value = [
-      ...statuses.value,
-      ...(nextResults.value.statuses || []),
-    ]
-    accounts.value = [
-      ...statuses.value,
-      ...(nextResults.value.accounts || []),
-    ]
-    hashtags.value = [
-      ...statuses.value,
-      ...(nextResults.value.statuses || []),
-    ]
+    done.value = !!nextResults.done
+    if (!nextResults.done)
+      appendResults(nextResults.value)
   }
 
   return {
diff --git a/composables/masto/status.ts b/composables/masto/status.ts
index a4daf36d..c7fd4d81 100644
--- a/composables/masto/status.ts
+++ b/composables/masto/status.ts
@@ -1,14 +1,14 @@
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 
 type Action = 'reblogged' | 'favourited' | 'bookmarked' | 'pinned' | 'muted'
 type CountField = 'reblogsCount' | 'favouritesCount'
 
 export interface StatusActionsProps {
-  status: Status
+  status: mastodon.v1.Status
 }
 
 export function useStatusActions(props: StatusActionsProps) {
-  let status = $ref<Status>({ ...props.status })
+  let status = $ref<mastodon.v1.Status>({ ...props.status })
   const masto = useMasto()
 
   watch(
@@ -27,7 +27,7 @@ export function useStatusActions(props: StatusActionsProps) {
     muted: false,
   })
 
-  async function toggleStatusAction(action: Action, fetchNewStatus: () => Promise<Status>, countField?: CountField) {
+  async function toggleStatusAction(action: Action, fetchNewStatus: () => Promise<mastodon.v1.Status>, countField?: CountField) {
     // check login
     if (!checkLogin())
       return
@@ -46,7 +46,7 @@ export function useStatusActions(props: StatusActionsProps) {
   }
   const toggleReblog = () => toggleStatusAction(
     'reblogged',
-    () => masto.statuses[status.reblogged ? 'unreblog' : 'reblog'](status.id).then((res) => {
+    () => masto.v1.statuses[status.reblogged ? 'unreblog' : 'reblog'](status.id).then((res) => {
       if (status.reblogged)
       // returns the original status
         return res.reblog!
@@ -57,23 +57,23 @@ export function useStatusActions(props: StatusActionsProps) {
 
   const toggleFavourite = () => toggleStatusAction(
     'favourited',
-    () => masto.statuses[status.favourited ? 'unfavourite' : 'favourite'](status.id),
+    () => masto.v1.statuses[status.favourited ? 'unfavourite' : 'favourite'](status.id),
     'favouritesCount',
   )
 
   const toggleBookmark = () => toggleStatusAction(
     'bookmarked',
-    () => masto.statuses[status.bookmarked ? 'unbookmark' : 'bookmark'](status.id),
+    () => masto.v1.statuses[status.bookmarked ? 'unbookmark' : 'bookmark'](status.id),
   )
 
   const togglePin = async () => toggleStatusAction(
     'pinned',
-    () => masto.statuses[status.pinned ? 'unpin' : 'pin'](status.id),
+    () => masto.v1.statuses[status.pinned ? 'unpin' : 'pin'](status.id),
   )
 
   const toggleMute = async () => toggleStatusAction(
     'muted',
-    () => masto.statuses[status.muted ? 'unmute' : 'mute'](status.id),
+    () => masto.v1.statuses[status.muted ? 'unmute' : 'mute'](status.id),
   )
 
   return {
diff --git a/composables/masto/statusDrafts.ts b/composables/masto/statusDrafts.ts
index 618b926b..8ee0c890 100644
--- a/composables/masto/statusDrafts.ts
+++ b/composables/masto/statusDrafts.ts
@@ -1,4 +1,4 @@
-import type { Account, CreateStatusParams, Status } from 'masto'
+import type { mastodon } from 'masto'
 import { STORAGE_KEY_DRAFTS } from '~/constants'
 import type { Draft, DraftMap } from '~/types'
 import type { Mutable } from '~/types/utils'
@@ -10,7 +10,7 @@ export const builtinDraftKeys = [
   'home',
 ]
 
-export function getDefaultDraft(options: Partial<Mutable<CreateStatusParams> & Omit<Draft, 'params'>> = {}): Draft {
+export function getDefaultDraft(options: Partial<Mutable<mastodon.v1.CreateStatusParams> & Omit<Draft, 'params'>> = {}): Draft {
   const {
     attachments = [],
     initialText = '',
@@ -38,7 +38,7 @@ export function getDefaultDraft(options: Partial<Mutable<CreateStatusParams> & O
   }
 }
 
-export async function getDraftFromStatus(status: Status): Promise<Draft> {
+export async function getDraftFromStatus(status: mastodon.v1.Status): Promise<Draft> {
   return getDefaultDraft({
     status: await convertMastodonHTML(status.content),
     mediaIds: status.mediaAttachments.map(att => att.id),
@@ -54,7 +54,7 @@ function mentionHTML(acct: string) {
   return `<span data-type="mention" data-id="${acct}" contenteditable="false">@${acct}</span>`
 }
 
-export function getReplyDraft(status: Status) {
+export function getReplyDraft(status: mastodon.v1.Status) {
   const accountsToMention: string[] = []
   const userId = currentUser.value?.account.id
   if (status.account.id !== userId)
@@ -112,13 +112,13 @@ export function useDraft(
   return { draft, isEmpty }
 }
 
-export function mentionUser(account: Account) {
+export function mentionUser(account: mastodon.v1.Account) {
   openPublishDialog('dialog', getDefaultDraft({
     status: `@${account.acct} `,
   }), true)
 }
 
-export function directMessageUser(account: Account) {
+export function directMessageUser(account: mastodon.v1.Account) {
   openPublishDialog('dialog', getDefaultDraft({
     status: `@${account.acct} `,
     visibility: 'direct',
diff --git a/composables/masto/translate.ts b/composables/masto/translate.ts
index 79e9625d..0f88fc08 100644
--- a/composables/masto/translate.ts
+++ b/composables/masto/translate.ts
@@ -1,4 +1,4 @@
-import type { Status, StatusEdit } from 'masto'
+import type { mastodon } from 'masto'
 
 export interface TranslationResponse {
   translatedText: string
@@ -24,9 +24,9 @@ export async function translateText(text: string, from?: string | null, to?: str
   return translatedText
 }
 
-const translations = new WeakMap<Status | StatusEdit, { visible: boolean; text: string }>()
+const translations = new WeakMap<mastodon.v1.Status | mastodon.v1.StatusEdit, { visible: boolean; text: string }>()
 
-export function useTranslation(status: Status | StatusEdit) {
+export function useTranslation(status: mastodon.v1.Status | mastodon.v1.StatusEdit) {
   if (!translations.has(status))
     translations.set(status, reactive({ visible: false, text: '' }))
 
diff --git a/composables/misc.ts b/composables/misc.ts
index c74e33bc..5d46d543 100644
--- a/composables/misc.ts
+++ b/composables/misc.ts
@@ -1,4 +1,4 @@
-import type { Emoji } from 'masto'
+import type { mastodon } from 'masto'
 
 export const UserLinkRE = /^https?:\/\/([^/]+)\/@([^/]+)$/
 export const TagLinkRE = /^https?:\/\/([^/]+)\/tags\/([^/]+)$/
@@ -21,7 +21,7 @@ export function getDataUrlFromArr(arr: Uint8ClampedArray, w: number, h: number)
   return canvas.toDataURL()
 }
 
-export function emojisArrayToObject(emojis: Emoji[]) {
+export function emojisArrayToObject(emojis: mastodon.v1.CustomEmoji[]) {
   return Object.fromEntries(emojis.map(i => [i.shortcode, i]))
 }
 
diff --git a/composables/paginator.ts b/composables/paginator.ts
index a3c09b3f..9689dcb8 100644
--- a/composables/paginator.ts
+++ b/composables/paginator.ts
@@ -2,8 +2,8 @@ import type { Paginator, WsEvents } from 'masto'
 import type { PaginatorState } from '~/types'
 import { onReactivated } from '~/composables/vue'
 
-export function usePaginator<T>(
-  paginator: Paginator<any, T[]>,
+export function usePaginator<T, P>(
+  paginator: Paginator<T[], P>,
   stream?: Promise<WsEvents>,
   eventType: 'notification' | 'update' = 'update',
   preprocess: (items: T[]) => T[] = (items: T[]) => items,
diff --git a/composables/push-notifications/createPushSubscription.ts b/composables/push-notifications/createPushSubscription.ts
index 30599ab0..e175e968 100644
--- a/composables/push-notifications/createPushSubscription.ts
+++ b/composables/push-notifications/createPushSubscription.ts
@@ -1,8 +1,4 @@
-import type {
-  CreatePushSubscriptionParams,
-  PushSubscription as MastoPushSubscription,
-  SubscriptionPolicy,
-} from 'masto'
+import type { mastodon } from 'masto'
 import type {
   CreatePushNotification,
   PushManagerSubscriptionInfo,
@@ -12,14 +8,14 @@ import type {
 export const createPushSubscription = async (
   user: RequiredUserLogin,
   notificationData: CreatePushNotification,
-  policy: SubscriptionPolicy = 'all',
+  policy: mastodon.v1.SubscriptionPolicy = 'all',
   force = false,
-): Promise<MastoPushSubscription | undefined> => {
+): Promise<mastodon.v1.WebPushSubscription | undefined> => {
   const { server: serverEndpoint, vapidKey } = user
 
   return await getRegistration()
     .then(getPushSubscription)
-    .then(({ registration, subscription }): Promise<MastoPushSubscription | undefined> => {
+    .then(({ registration, subscription }): Promise<mastodon.v1.WebPushSubscription | undefined> => {
       if (subscription) {
         const currentServerKey = (new Uint8Array(subscription.options.applicationServerKey!)).toString()
         const subscriptionServerKey = urlBase64ToUint8Array(vapidKey).toString()
@@ -114,10 +110,10 @@ async function removePushNotificationDataOnError(e: Error) {
 async function sendSubscriptionToBackend(
   subscription: PushSubscription,
   data: CreatePushNotification,
-  policy: SubscriptionPolicy,
-): Promise<MastoPushSubscription> {
+  policy: mastodon.v1.SubscriptionPolicy,
+): Promise<mastodon.v1.WebPushSubscription> {
   const { endpoint, keys } = subscription.toJSON()
-  const params: CreatePushSubscriptionParams = {
+  const params: mastodon.v1.CreateWebPushSubscriptionParams = {
     policy,
     subscription: {
       endpoint: endpoint!,
@@ -129,5 +125,5 @@ async function sendSubscriptionToBackend(
     data,
   }
 
-  return await useMasto().pushSubscriptions.create(params)
+  return await useMasto().v1.webPushSubscriptions.create(params)
 }
diff --git a/composables/push-notifications/types.ts b/composables/push-notifications/types.ts
index 53cba5a1..a286a18f 100644
--- a/composables/push-notifications/types.ts
+++ b/composables/push-notifications/types.ts
@@ -1,4 +1,4 @@
-import type { Emoji, PushSubscription as MastoPushSubscription, PushSubscriptionAlerts, SubscriptionPolicy } from 'masto'
+import type { mastodon } from 'masto'
 
 import type { UserLogin } from '~/types'
 
@@ -9,18 +9,18 @@ export interface PushManagerSubscriptionInfo {
 }
 
 export interface RequiredUserLogin extends Required<Omit<UserLogin, 'account' | 'pushSubscription'>> {
-  pushSubscription?: MastoPushSubscription
+  pushSubscription?: mastodon.v1.WebPushSubscription
 }
 
 export interface CreatePushNotification {
-  alerts?: Partial<PushSubscriptionAlerts> | null
-  policy?: SubscriptionPolicy
+  alerts?: Partial<mastodon.v1.WebPushSubscriptionAlerts> | null
+  policy?: mastodon.v1.SubscriptionPolicy
 }
 
 export type PushNotificationRequest = Record<string, boolean>
-export type PushNotificationPolicy = Record<string, SubscriptionPolicy>
+export type PushNotificationPolicy = Record<string, mastodon.v1.SubscriptionPolicy>
 
 export interface CustomEmojisInfo {
   lastUpdate: number
-  emojis: Emoji[]
+  emojis: mastodon.v1.CustomEmoji[]
 }
diff --git a/composables/push-notifications/usePushManager.ts b/composables/push-notifications/usePushManager.ts
index c1c54a07..f18e8c21 100644
--- a/composables/push-notifications/usePushManager.ts
+++ b/composables/push-notifications/usePushManager.ts
@@ -1,4 +1,4 @@
-import type { SubscriptionPolicy } from 'masto'
+import type { mastodon } from 'masto'
 import type {
   CreatePushNotification,
   PushNotificationPolicy,
@@ -62,7 +62,7 @@ export const usePushManager = () => {
 
   const subscribe = async (
     notificationData?: CreatePushNotification,
-    policy?: SubscriptionPolicy,
+    policy?: mastodon.v1.SubscriptionPolicy,
     force?: boolean,
   ): Promise<SubscriptionResult> => {
     if (!isSupported)
@@ -117,7 +117,7 @@ export const usePushManager = () => {
     await removePushNotificationData(currentUser.value)
   }
 
-  const saveSettings = async (policy?: SubscriptionPolicy) => {
+  const saveSettings = async (policy?: mastodon.v1.SubscriptionPolicy) => {
     if (policy)
       pushNotificationData.value.policy = policy
 
@@ -168,7 +168,7 @@ export const usePushManager = () => {
       if (policyChanged)
         await subscribe(data, policy, true)
       else
-        currentUser.value.pushSubscription = await masto.pushSubscriptions.update({ data })
+        currentUser.value.pushSubscription = await masto.v1.webPushSubscriptions.update({ data })
 
       policyChanged && await nextTick()
 
diff --git a/composables/status.ts b/composables/status.ts
new file mode 100644
index 00000000..44211e03
--- /dev/null
+++ b/composables/status.ts
@@ -0,0 +1,3 @@
+import type { mastodon } from 'masto'
+
+export const navigateToStatus = ({ status, focusReply = false }: { status: mastodon.v1.Status; focusReply?: boolean }) => navigateTo({ path: getStatusRoute(status).href, state: { focusReply } })
diff --git a/composables/timeline.ts b/composables/timeline.ts
index d9358f25..0d0d9b4c 100644
--- a/composables/timeline.ts
+++ b/composables/timeline.ts
@@ -1,15 +1,15 @@
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 
 const maxDistance = 10
 const maxSteps = 1000
 
 // Checks if (b) is a reply to (a)
-function areStatusesConsecutive(a: Status, b: Status) {
+function areStatusesConsecutive(a: mastodon.v1.Status, b: mastodon.v1.Status) {
   const inReplyToId = b.inReplyToId ?? b.reblog?.inReplyToId
   return !!inReplyToId && (inReplyToId === a.reblog?.id || inReplyToId === a.id)
 }
 
-export function reorderedTimeline(items: Status[]) {
+export function reorderedTimeline(items: mastodon.v1.Status[]) {
   let steps = 0
   const newItems = [...items]
   for (let i = items.length - 1; i > 0; i--) {
diff --git a/composables/tiptap/suggestion.ts b/composables/tiptap/suggestion.ts
index 7445164a..706585a1 100644
--- a/composables/tiptap/suggestion.ts
+++ b/composables/tiptap/suggestion.ts
@@ -14,7 +14,7 @@ export const MentionSuggestion: Partial<SuggestionOptions> = {
     if (query.length === 0)
       return []
 
-    const mentionPaginator = useMasto().search({ q: query, type: 'accounts', limit: 25, resolve: true })
+    const mentionPaginator = useMasto().v2.search({ q: query, type: 'accounts', limit: 25, resolve: true })
     const results = await mentionPaginator.next()
 
     return results.value.accounts
@@ -29,7 +29,7 @@ export const HashtagSuggestion: Partial<SuggestionOptions> = {
     if (query.length === 0)
       return []
 
-    const paginator = useMasto().search({ q: query, type: 'hashtags', limit: 25, resolve: true })
+    const paginator = useMasto().v2.search({ q: query, type: 'hashtags', limit: 25, resolve: true })
     const results = await paginator.next()
 
     return results.value.hashtags
diff --git a/composables/users.ts b/composables/users.ts
index e4dce99c..98d08ded 100644
--- a/composables/users.ts
+++ b/composables/users.ts
@@ -1,11 +1,10 @@
 import { login as loginMasto } from 'masto'
-import type { Account, AccountCredentials, Instance, MastoClient, WsEvents } from 'masto'
+import type { WsEvents, mastodon } from 'masto'
 import type { Ref } from 'vue'
 import type { RemovableRef } from '@vueuse/core'
 import type { ElkMasto, UserLogin } from '~/types'
 import {
   DEFAULT_POST_CHARS_LIMIT,
-  DEFAULT_SERVER,
   STORAGE_KEY_CURRENT_USER,
   STORAGE_KEY_NOTIFICATION,
   STORAGE_KEY_NOTIFICATION_POLICY,
@@ -41,7 +40,7 @@ const initializeUsers = async (): Promise<Ref<UserLogin[]> | RemovableRef<UserLo
 }
 
 const users = await initializeUsers()
-const instances = useLocalStorage<Record<string, Instance>>(STORAGE_KEY_SERVERS, mock ? mock.server : {}, { deep: true })
+const instances = useLocalStorage<Record<string, mastodon.v2.Instance>>(STORAGE_KEY_SERVERS, mock ? mock.server : {}, { deep: true })
 const currentUserId = useLocalStorage<string>(STORAGE_KEY_CURRENT_USER, mock ? mock.user.account.id : '')
 
 export const currentUser = computed<UserLogin | undefined>(() => {
@@ -54,10 +53,10 @@ export const currentUser = computed<UserLogin | undefined>(() => {
   return users.value[0]
 })
 
-const publicInstance = ref<Instance | null>(null)
-export const currentInstance = computed<null | Instance>(() => currentUser.value ? instances.value[currentUser.value.server] ?? null : publicInstance.value)
+const publicInstance = ref<mastodon.v2.Instance | null>(null)
+export const currentInstance = computed<null | mastodon.v2.Instance>(() => currentUser.value ? instances.value[currentUser.value.server] ?? null : publicInstance.value)
 
-export const publicServer = ref(DEFAULT_SERVER)
+export const publicServer = ref('')
 export const currentServer = computed<string>(() => currentUser.value?.server || publicServer.value)
 
 // when multiple tabs: we need to reload window when sign in, switch account or sign out
@@ -92,7 +91,7 @@ if (process.client) {
 }
 
 export const currentUserHandle = computed(() => currentUser.value?.account.id
-  ? `${currentUser.value.account.acct}@${currentInstance.value?.uri || currentServer.value}`
+  ? `${currentUser.value.account.acct}@${currentInstance.value?.domain || currentServer.value}`
   : '[anonymous]',
 )
 
@@ -100,7 +99,7 @@ export const useUsers = () => users
 
 export const characterLimit = computed(() => currentInstance.value?.configuration.statuses.maxCharacters ?? DEFAULT_POST_CHARS_LIMIT)
 
-async function loginTo(user?: Omit<UserLogin, 'account'> & { account?: AccountCredentials }) {
+async function loginTo(user?: Omit<UserLogin, 'account'> & { account?: mastodon.v1.AccountCredentials }) {
   const route = useRoute()
   const router = useRouter()
   const server = user?.server || route.params.server as string || publicServer.value
@@ -108,29 +107,27 @@ async function loginTo(user?: Omit<UserLogin, 'account'> & { account?: AccountCr
     url: `https://${server}`,
     accessToken: user?.token,
     disableVersionCheck: true,
-    // Suppress warning of `masto/fetch` usage
-    disableExperimentalWarning: true,
   })
 
   if (!user?.token) {
     publicServer.value = server
-    publicInstance.value = await masto.instances.fetch()
+    publicInstance.value = await masto.v2.instance.fetch()
   }
 
   else {
     try {
       const [me, instance, pushSubscription] = await Promise.all([
-        masto.accounts.verifyCredentials(),
-        masto.instances.fetch(),
+        masto.v1.accounts.verifyCredentials(),
+        masto.v2.instance.fetch(),
         // if PWA is not enabled, don't get push subscription
         useRuntimeConfig().public.pwaEnabled
           // we get 404 response instead empty data
-          ? masto.pushSubscriptions.fetch().catch(() => Promise.resolve(undefined))
+          ? masto.v1.webPushSubscriptions.fetch().catch(() => Promise.resolve(undefined))
           : Promise.resolve(undefined),
       ])
 
       if (!me.acct.includes('@'))
-        me.acct = `${me.acct}@${instance.uri}`
+        me.acct = `${me.acct}@${instance.domain}`
 
       user.account = me
       user.pushSubscription = pushSubscription
@@ -160,7 +157,7 @@ async function loginTo(user?: Omit<UserLogin, 'account'> & { account?: AccountCr
   return masto
 }
 
-export function setAccountInfo(userId: string, account: AccountCredentials) {
+export function setAccountInfo(userId: string, account: mastodon.v1.AccountCredentials) {
   const index = getUsersIndexByUserId(userId)
   if (index === -1)
     return false
@@ -170,9 +167,9 @@ export function setAccountInfo(userId: string, account: AccountCredentials) {
 }
 
 export async function pullMyAccountInfo() {
-  const account = await useMasto().accounts.verifyCredentials()
+  const account = await useMasto().v1.accounts.verifyCredentials()
   if (!account.acct.includes('@'))
-    account.acct = `${account.acct}@${currentInstance.value!.uri}`
+    account.acct = `${account.acct}@${currentInstance.value!.domain}`
 
   setAccountInfo(currentUserId.value, account)
   cacheAccount(account, currentServer.value, true)
@@ -183,6 +180,9 @@ export function getUsersIndexByUserId(userId: string) {
 }
 
 export async function removePushNotificationData(user: UserLogin, fromSWPushManager = true) {
+  if (!user.pushSubscription)
+    return
+
   // clear push subscription
   user.pushSubscription = undefined
   const { acct } = user.account
@@ -214,7 +214,7 @@ export async function removePushNotifications(user: UserLogin) {
 
   // unsubscribe push notifications
   try {
-    await useMasto().pushSubscriptions.remove()
+    await useMasto().v1.webPushSubscriptions.remove()
   }
   catch {
     // ignore
@@ -272,7 +272,7 @@ export const useNotifications = () => {
     if (!isMastoInitialised.value || !id || notifications[id] || !currentUser.value?.token)
       return
 
-    const stream = masto.stream.streamUser()
+    const stream = masto.v1.stream.streamUser()
     notifications[id] = [stream, 0]
     ;(await stream).on('notification', () => {
       if (notifications[id])
@@ -328,13 +328,13 @@ export function useUserLocalStorage<T extends object>(key: string, initial: () =
 /**
  * Clear all storages for the given account
  */
-export function clearUserLocalStorage(account?: Account) {
+export function clearUserLocalStorage(account?: mastodon.v1.Account) {
   if (!account)
     account = currentUser.value?.account
   if (!account)
     return
 
-  const id = `${account.acct}@${currentInstance.value?.uri || currentServer.value}`
+  const id = `${account.acct}@${currentInstance.value?.domain || currentServer.value}`
   // @ts-expect-error bind value to the function
   ;(useUserLocalStorage._ as Map<string, Ref<Record<string, any>>>).forEach((storage) => {
     if (storage.value[id])
@@ -343,8 +343,8 @@ export function clearUserLocalStorage(account?: Account) {
 }
 
 export const createMasto = () => {
-  const api = shallowRef<MastoClient | null>(null)
-  const apiPromise = ref<Promise<MastoClient> | null>(null)
+  const api = shallowRef<mastodon.Client | null>(null)
+  const apiPromise = ref<Promise<mastodon.Client> | null>(null)
   const initialised = computed(() => !!api.value)
 
   const masto = new Proxy({} as ElkMasto, {
@@ -353,7 +353,7 @@ export const createMasto = () => {
         return initialised
 
       if (key === 'loginTo') {
-        return (...args: any[]): Promise<MastoClient> => {
+        return (...args: any[]): Promise<mastodon.Client> => {
           return apiPromise.value = loginTo(...args).then((r) => {
             api.value = r
             return masto
@@ -368,7 +368,7 @@ export const createMasto = () => {
       }
 
       if (api.value && key in api.value)
-        return api.value[key as keyof MastoClient]
+        return api.value[key as keyof mastodon.Client]
 
       if (!api.value) {
         return new Proxy({}, {
diff --git a/constants/index.ts b/constants/index.ts
index 33978f47..e26e5b24 100644
--- a/constants/index.ts
+++ b/constants/index.ts
@@ -1,7 +1,6 @@
 export const APP_NAME = 'Elk'
 
 export const DEFAULT_POST_CHARS_LIMIT = 500
-export const DEFAULT_SERVER = 'mas.to'
 export const DEFAULT_FONT_SIZE = 'md'
 
 export const STORAGE_KEY_DRAFTS = 'elk-drafts'
diff --git a/error.vue b/error.vue
index 79c582e9..79e965da 100644
--- a/error.vue
+++ b/error.vue
@@ -22,7 +22,7 @@ const reload = async () => {
   try {
     if (!masto.loggedIn.value)
       await masto.loginTo(currentUser.value)
-    clearError({ redirect: currentUser.value ? '/home' : `/${currentServer.value}/public` })
+    clearError({ redirect: currentUser.value ? '/home' : `/${currentServer.value}/public/local` })
   }
   catch {
     state.value = 'error'
diff --git a/locales/en-GB.json b/locales/en-GB.json
index bd672d5c..3a1f2875 100644
--- a/locales/en-GB.json
+++ b/locales/en-GB.json
@@ -297,7 +297,8 @@
       "finished": "finished {0}"
     },
     "reblogged": "{0} reblogged",
-    "someone": "Someone",
+    "replying_to": "Replying to {0}",
+    "someone": "someone",
     "spoiler_show_less": "Show less",
     "spoiler_show_more": "Show more",
     "try_original_site": "Try original site"
diff --git a/locales/en-US.json b/locales/en-US.json
index 78a9dde1..9b9de0ca 100644
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -354,7 +354,9 @@
       "finished": "finished {0}"
     },
     "reblogged": "{0} reblogged",
-    "someone": "Someone",
+    "replying_to": "Replying to {0}",
+    "show_full_thread": "Show Full thread",
+    "someone": "someone",
     "spoiler_show_less": "Show less",
     "spoiler_show_more": "Show more",
     "try_original_site": "Try original site"
diff --git a/locales/es-ES.json b/locales/es-ES.json
index d7c3ebeb..c468fd3f 100644
--- a/locales/es-ES.json
+++ b/locales/es-ES.json
@@ -315,7 +315,8 @@
       "finished": "finalizada {0}"
     },
     "reblogged": "{0} retooteó",
-    "someone": "Alguien",
+    "replying_to": "Respondiendo a {0}",
+    "someone": "alguien",
     "spoiler_show_less": "Mostrar menos",
     "spoiler_show_more": "Mostrar más",
     "thread": "Hilo",
diff --git a/locales/fr-FR.json b/locales/fr-FR.json
index 40b05544..0c11f10d 100644
--- a/locales/fr-FR.json
+++ b/locales/fr-FR.json
@@ -296,7 +296,8 @@
       "finished": "clos {0}"
     },
     "reblogged": "{0} relayé",
-    "someone": "Quelqu'un",
+    "replying_to": "Répondre à {0}",
+    "someone": "quelqu'un",
     "spoiler_show_less": "Voir moins",
     "spoiler_show_more": "Voir plus",
     "try_original_site": "Essayer le site d'origine"
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index 882bd3c1..4b90c156 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -326,6 +326,8 @@
       "finished": "已在 {0} 结束"
     },
     "reblogged": "{0} 转发了",
+    "replying_to": "回复{0}",
+    "show_full_thread": "显示完整贴文串",
     "someone": "某人",
     "spoiler_show_less": "隐藏",
     "spoiler_show_more": "显示更多",
diff --git a/middleware/auth.ts b/middleware/auth.ts
index e41dbd93..1854ec85 100644
--- a/middleware/auth.ts
+++ b/middleware/auth.ts
@@ -6,7 +6,7 @@ export default defineNuxtRouteMiddleware((to) => {
 
   onMastoInit(() => {
     if (!currentUser.value)
-      return navigateTo(`/${currentServer.value}/public`)
+      return navigateTo(`/${currentServer.value}/public/local`)
     if (to.path === '/')
       return navigateTo('/home')
   })
diff --git a/middleware/permalink.global.ts b/middleware/permalink.global.ts
index f636156a..79099c99 100644
--- a/middleware/permalink.global.ts
+++ b/middleware/permalink.global.ts
@@ -53,7 +53,7 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
       await masto.loginTo(currentUser.value)
 
     // If we're logged in, search for the local id the account or status corresponds to
-    const { value } = await masto.search({ q: `https:/${to.fullPath}`, resolve: true, limit: 1 }).next()
+    const { value } = await masto.v2.search({ q: `https:/${to.fullPath}`, resolve: true, limit: 1 }).next()
 
     const { accounts, statuses } = value
     if (statuses[0])
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 6d4e10b8..542df56e 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -11,6 +11,10 @@ export default defineNuxtConfig({
   typescript: {
     tsConfig: {
       exclude: ['../service-worker'],
+      vueCompilerOptions: {
+        jsxTemplates: true,
+        experimentalRfc436: true,
+      },
     },
   },
   modules: [
@@ -41,10 +45,7 @@ export default defineNuxtConfig({
   ],
   alias: {
     'querystring': 'rollup-plugin-node-polyfills/polyfills/qs',
-    'masto/fetch': 'masto/fetch',
-    'masto': 'masto/fetch',
     'change-case': 'scule',
-    'semver': 'unenv/runtime/mock/empty',
   },
   imports: {
     dirs: [
@@ -95,6 +96,7 @@ export default defineNuxtConfig({
       env: '', // set in build-info module
       pwaEnabled: !isDevelopment || process.env.VITE_DEV_PWA === 'true',
       translateApi: '',
+      defaultServer: 'mas.to',
     },
     storage: {
       driver: isCI ? 'cloudflare' : 'fs',
diff --git a/package.json b/package.json
index d3aa051b..644d43a8 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "iso-639-1": "^2.1.15",
     "js-yaml": "^4.1.0",
     "lru-cache": "^7.14.1",
-    "masto": "^4.11.1",
+    "masto": "^5.1.2",
     "pinia": "^2.0.28",
     "shiki": "^0.12.1",
     "shiki-es": "^0.1.2",
@@ -110,7 +110,7 @@
     "vite-plugin-inspect": "^0.7.11",
     "vite-plugin-pwa": "^0.14.1",
     "vitest": "^0.26.2",
-    "vue-tsc": "^1.0.16",
+    "vue-tsc": "^1.0.22",
     "workbox-window": "^6.5.4"
   },
   "simple-git-hooks": {
diff --git a/pages/[[server]]/@[account]/[status].vue b/pages/[[server]]/@[account]/[status].vue
index 3fdbc9ce..4f41c93a 100644
--- a/pages/[[server]]/@[account]/[status].vue
+++ b/pages/[[server]]/@[account]/[status].vue
@@ -20,7 +20,7 @@ const { data: status, pending, refresh: refreshStatus } = useAsyncData(
 const masto = useMasto()
 const { data: context, pending: pendingContext, refresh: refreshContext } = useAsyncData(
   `context:${id}`,
-  async () => masto.statuses.fetchContext(id),
+  async () => masto.v1.statuses.fetchContext(id),
   { watch: [isMastoInitialised], immediate: isMastoInitialised.value },
 )
 
@@ -91,8 +91,12 @@ onReactivated(() => {
 
         <template v-for="(comment, di) of context?.descendants" :key="comment.id">
           <StatusCard
-            :status="comment" :actions="comment.visibility !== 'direct'" context="account"
-            :older="context?.descendants[di + 1]" :newer="context?.descendants[di - 1]" :has-newer="di === 0" :main="status"
+            :status="comment"
+            :actions="comment.visibility !== 'direct'" context="account"
+            :older="context?.descendants[di + 1]"
+            :newer="context?.descendants[di - 1]"
+            :has-newer="di === 0"
+            :main="status"
           />
         </template>
       </div>
diff --git a/pages/[[server]]/@[account]/index/followers.vue b/pages/[[server]]/@[account]/index/followers.vue
index 5456d0fe..4ebf6eaa 100644
--- a/pages/[[server]]/@[account]/index/followers.vue
+++ b/pages/[[server]]/@[account]/index/followers.vue
@@ -6,7 +6,7 @@ const handle = $(computedEager(() => params.account as string))
 definePageMeta({ name: 'account-followers' })
 
 const account = await fetchAccountByHandle(handle)
-const paginator = account ? useMasto().accounts.iterateFollowers(account.id, {}) : null
+const paginator = account ? useMasto().v1.accounts.listFollowers(account.id, {}) : null
 
 if (account) {
   useHeadFixed({
diff --git a/pages/[[server]]/@[account]/index/following.vue b/pages/[[server]]/@[account]/index/following.vue
index ef4bed73..12c77920 100644
--- a/pages/[[server]]/@[account]/index/following.vue
+++ b/pages/[[server]]/@[account]/index/following.vue
@@ -6,7 +6,7 @@ const handle = $(computedEager(() => params.account as string))
 definePageMeta({ name: 'account-following' })
 
 const account = await fetchAccountByHandle(handle)
-const paginator = account ? useMasto().accounts.iterateFollowing(account.id, {}) : null
+const paginator = account ? useMasto().v1.accounts.listFollowing(account.id, {}) : null
 
 if (account) {
   useHeadFixed({
diff --git a/pages/[[server]]/@[account]/index/index.vue b/pages/[[server]]/@[account]/index/index.vue
index 6895ef23..7eba1a71 100644
--- a/pages/[[server]]/@[account]/index/index.vue
+++ b/pages/[[server]]/@[account]/index/index.vue
@@ -8,7 +8,7 @@ const { t } = useI18n()
 
 const account = await fetchAccountByHandle(handle)
 
-const paginator = useMasto().accounts.iterateStatuses(account.id, { excludeReplies: true })
+const paginator = useMasto().v1.accounts.listStatuses(account.id, { excludeReplies: true })
 
 if (account) {
   useHeadFixed({
diff --git a/pages/[[server]]/@[account]/index/media.vue b/pages/[[server]]/@[account]/index/media.vue
index c3ebaa4f..bd533187 100644
--- a/pages/[[server]]/@[account]/index/media.vue
+++ b/pages/[[server]]/@[account]/index/media.vue
@@ -7,7 +7,7 @@ const handle = $(computedEager(() => params.account as string))
 
 const account = await fetchAccountByHandle(handle)
 
-const paginator = useMasto().accounts.iterateStatuses(account.id, { onlyMedia: true, excludeReplies: false })
+const paginator = useMasto().v1.accounts.listStatuses(account.id, { onlyMedia: true, excludeReplies: false })
 
 if (account) {
   useHeadFixed({
diff --git a/pages/[[server]]/@[account]/index/with_replies.vue b/pages/[[server]]/@[account]/index/with_replies.vue
index b7e51dec..40ed715b 100644
--- a/pages/[[server]]/@[account]/index/with_replies.vue
+++ b/pages/[[server]]/@[account]/index/with_replies.vue
@@ -7,7 +7,7 @@ const handle = $(computedEager(() => params.account as string))
 
 const account = await fetchAccountByHandle(handle)
 
-const paginator = useMasto().accounts.iterateStatuses(account.id, { excludeReplies: false })
+const paginator = useMasto().v1.accounts.listStatuses(account.id, { excludeReplies: false })
 
 if (account) {
   useHeadFixed({
diff --git a/pages/[[server]]/explore/index.vue b/pages/[[server]]/explore/index.vue
index 289d93be..aee8806d 100644
--- a/pages/[[server]]/explore/index.vue
+++ b/pages/[[server]]/explore/index.vue
@@ -3,7 +3,7 @@ import { STORAGE_KEY_HIDE_EXPLORE_POSTS_TIPS } from '~~/constants'
 
 const { t } = useI18n()
 
-const paginator = useMasto().trends.iterateStatuses()
+const paginator = useMasto().v1.trends.listStatuses()
 
 const hideNewsTips = useLocalStorage(STORAGE_KEY_HIDE_EXPLORE_POSTS_TIPS, false)
 
diff --git a/pages/[[server]]/explore/links.vue b/pages/[[server]]/explore/links.vue
index a3208ec7..55f8be76 100644
--- a/pages/[[server]]/explore/links.vue
+++ b/pages/[[server]]/explore/links.vue
@@ -3,7 +3,7 @@ import { STORAGE_KEY_HIDE_EXPLORE_NEWS_TIPS } from '~~/constants'
 
 const { t } = useI18n()
 
-const paginator = useMasto().trends.links
+const paginator = useMasto().v1.trends.listLinks()
 
 const hideNewsTips = useLocalStorage(STORAGE_KEY_HIDE_EXPLORE_NEWS_TIPS, false)
 
diff --git a/pages/[[server]]/explore/tags.vue b/pages/[[server]]/explore/tags.vue
index 732aac19..e687e3be 100644
--- a/pages/[[server]]/explore/tags.vue
+++ b/pages/[[server]]/explore/tags.vue
@@ -5,7 +5,7 @@ const { t } = useI18n()
 
 const masto = useMasto()
 const { data, pending, error } = useLazyAsyncData(
-  () => masto.trends.fetchTags({ limit: 20 }),
+  async () => masto.v1.trends.listTags({ limit: 20 }),
   { immediate: true },
 )
 
diff --git a/pages/[[server]]/explore/users.vue b/pages/[[server]]/explore/users.vue
index 251b7ce3..8d0ed9c6 100644
--- a/pages/[[server]]/explore/users.vue
+++ b/pages/[[server]]/explore/users.vue
@@ -4,7 +4,7 @@ const { t } = useI18n()
 // limit: 20 is the default configuration of the official client
 const masto = useMasto()
 const { data, pending, error } = useLazyAsyncData(
-  () => masto.suggestions.fetchAll({ limit: 20 }),
+  async () => masto.v2.suggestions.list({ limit: 20 }),
   { immediate: true },
 )
 
diff --git a/pages/[[server]]/tags/[tag].vue b/pages/[[server]]/tags/[tag].vue
index fa2d057e..989f8e47 100644
--- a/pages/[[server]]/tags/[tag].vue
+++ b/pages/[[server]]/tags/[tag].vue
@@ -7,10 +7,10 @@ const params = useRoute().params
 const tagName = $(computedEager(() => params.tag as string))
 
 const masto = useMasto()
-const { data: tag, refresh } = $(await useAsyncData(() => masto.tags.fetch(tagName), { watch: [isMastoInitialised], immediate: isMastoInitialised.value }))
+const { data: tag, refresh } = $(await useAsyncData(() => masto.v1.tags.fetch(tagName), { watch: [isMastoInitialised], immediate: isMastoInitialised.value }))
 
-const paginator = masto.timelines.iterateHashtag(tagName)
-const stream = masto.stream.streamTagTimeline(tagName)
+const paginator = masto.v1.timelines.listHashtag(tagName)
+const stream = masto.v1.stream.streamTagTimeline(tagName)
 onBeforeUnmount(() => stream.then(s => s.disconnect()))
 
 if (tag) {
diff --git a/pages/intent/post.vue b/pages/intent/post.vue
index 2e05f5fc..1dddf03d 100644
--- a/pages/intent/post.vue
+++ b/pages/intent/post.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { StatusVisibility } from 'masto'
+import type { mastodon } from 'masto'
 
 const router = useRouter()
 const route = useRoute()
@@ -10,7 +10,7 @@ onMounted(async () => {
     status: route.query.text as string,
     sensitive: route.query.sensitive === 'true' || route.query.sensitive === null,
     spoilerText: route.query.spoiler_text as string,
-    visibility: route.query.visibility as StatusVisibility,
+    visibility: route.query.visibility as mastodon.v1.StatusVisibility,
     language: route.query.language as string,
   }), true)
   // TODO: need a better idea 👀
diff --git a/pages/settings/profile/appearance.vue b/pages/settings/profile/appearance.vue
index bd6bec57..c8a4b2d7 100644
--- a/pages/settings/profile/appearance.vue
+++ b/pages/settings/profile/appearance.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { UpdateCredentialsParams } from 'masto'
+import type { mastodon } from 'masto'
 import { useForm } from 'slimeform'
 import { parse } from 'ultrahtml'
 
@@ -63,7 +63,7 @@ const { submit, submitting } = submitter(async ({ dirtyFields }) => {
   if (!isCanSubmit.value)
     return
 
-  const res = await useMasto().accounts.updateCredentials(dirtyFields.value as UpdateCredentialsParams)
+  const res = await useMasto().v1.accounts.updateCredentials(dirtyFields.value as mastodon.v1.UpdateCredentialsParams)
     .then(account => ({ account }))
     .catch((error: Error) => ({ error }))
 
diff --git a/plugins/masto.ts b/plugins/masto.ts
index 1fd0ac5b..d4918ee1 100644
--- a/plugins/masto.ts
+++ b/plugins/masto.ts
@@ -1,5 +1,6 @@
 export default defineNuxtPlugin(async (nuxtApp) => {
   const masto = createMasto()
+  publicServer.value = publicServer.value || useRuntimeConfig().public.defaultServer
 
   if (process.client) {
     const { query } = useRoute()
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e04b15b4..10c6668f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -58,7 +58,7 @@ specifiers:
   jsdom: ^20.0.3
   lint-staged: ^13.1.0
   lru-cache: ^7.14.1
-  masto: ^4.11.1
+  masto: ^5.1.2
   nuxt: ^3.0.0
   pinia: ^2.0.28
   postcss-nested: ^6.0.0
@@ -82,7 +82,7 @@ specifiers:
   vite-plugin-pwa: ^0.14.1
   vitest: ^0.26.2
   vue-advanced-cropper: ^2.8.6
-  vue-tsc: ^1.0.16
+  vue-tsc: ^1.0.22
   vue-virtual-scroller: 2.0.0-beta.7
   workbox-window: ^6.5.4
 
@@ -114,13 +114,13 @@ dependencies:
   iso-639-1: 2.1.15
   js-yaml: 4.1.0
   lru-cache: 7.14.1
-  masto: 4.11.1
+  masto: 5.1.2
   pinia: 2.0.28_typescript@4.9.4
   shiki: 0.12.1
   shiki-es: 0.1.2
   slimeform: 0.8.0
-  tauri-plugin-log-api: github.com/tauri-apps/tauri-plugin-log/b58475bbc410fa78eb69276c62d0b64c91c07914
-  tauri-plugin-store-api: github.com/tauri-apps/tauri-plugin-store/9bd993aa67766596638bbfd91e79a1bf8f632014
+  tauri-plugin-log-api: github.com/tauri-apps/tauri-plugin-log/954a857daa45598ffc5e8637fccdba300f9ef757
+  tauri-plugin-store-api: github.com/tauri-apps/tauri-plugin-store/89100ece4ebe010091e90d1873eaeafbbf5eb60a
   tippy.js: 6.3.7
   ufo: 1.0.1
   ultrahtml: 1.2.0
@@ -147,7 +147,7 @@ devDependencies:
   '@types/wicg-file-system-access': 2020.9.5
   '@unocss/nuxt': 0.48.0
   '@vitejs/plugin-vue': 3.2.0
-  '@vue-macros/nuxt': 0.2.8_3nbxte3dhogb6b7pemmre2vo4m
+  '@vue-macros/nuxt': 0.2.8_neamklg3mofeje4gmdzjdymjki
   '@vueuse/math': 9.10.0
   '@vueuse/nuxt': 9.9.0_nuxt@3.0.0
   bumpp: 8.2.1
@@ -171,7 +171,7 @@ devDependencies:
   vite-plugin-inspect: 0.7.11
   vite-plugin-pwa: 0.14.1_workbox-window@6.5.4
   vitest: 0.26.2_jsdom@20.0.3
-  vue-tsc: 1.0.16_typescript@4.9.4
+  vue-tsc: 1.0.22_typescript@4.9.4
   workbox-window: 6.5.4
 
 packages:
@@ -1648,8 +1648,8 @@ packages:
       vue-i18n:
         optional: true
     dependencies:
-      '@intlify/message-compiler': 9.3.0-beta.12
-      '@intlify/shared': 9.3.0-beta.12
+      '@intlify/message-compiler': 9.3.0-beta.13
+      '@intlify/shared': 9.3.0-beta.13
       jsonc-eslint-parser: 1.4.1
       source-map: 0.6.1
       vue-i18n: 9.3.0-beta.10
@@ -1681,11 +1681,11 @@ packages:
       source-map: 0.6.1
     dev: true
 
-  /@intlify/message-compiler/9.3.0-beta.12:
-    resolution: {integrity: sha512-A8/s7pb3v8nf6HG77qFPJntxgQKI9GXxGnkn7aO+b03/X/GkF/4WceDSAIk3i+yLeIgszeBn9GZ23tSg4sTEHA==}
+  /@intlify/message-compiler/9.3.0-beta.13:
+    resolution: {integrity: sha512-6vVGAOqzSurfp8leQ+9ySBTxCTTJyucMBVVXxW1/ENWGxZg1SDdIIZG3FcZo+kZEfbm46AWVByCL8FdcHS2QGw==}
     engines: {node: '>= 14'}
     dependencies:
-      '@intlify/shared': 9.3.0-beta.11
+      '@intlify/shared': 9.3.0-beta.13
       source-map: 0.6.1
     dev: true
 
@@ -1694,13 +1694,8 @@ packages:
     engines: {node: '>= 14'}
     dev: true
 
-  /@intlify/shared/9.3.0-beta.11:
-    resolution: {integrity: sha512-CtbotesxTRiC3bRyXyv1NG39fkqJ790f8z8xFaeIXSZpOdiyxoh5BIyypCzSFQZDGLwz0Q9gyWbW1XpxQJm68Q==}
-    engines: {node: '>= 14'}
-    dev: true
-
-  /@intlify/shared/9.3.0-beta.12:
-    resolution: {integrity: sha512-WsmaS54sA8xuwezPKpa/OMoaX1v2VF2fCgAmYS6prDr2ir0CkUFWPm9A8ilmxzv4nkS61/v8+vf4lGGkn5uBdA==}
+  /@intlify/shared/9.3.0-beta.13:
+    resolution: {integrity: sha512-94pkO11UTh/7b1B9RGe6iEFG6e89I+qDN8MjA3rhc4dnMt7rGzg7/xhxMmavzGTieYQRfv86jv+EOUmP4cc5Wg==}
     engines: {node: '>= 14'}
     dev: true
 
@@ -1720,7 +1715,7 @@ packages:
         optional: true
     dependencies:
       '@intlify/bundle-utils': 3.4.0_vue-i18n@9.3.0-beta.10
-      '@intlify/shared': 9.3.0-beta.12
+      '@intlify/shared': 9.3.0-beta.13
       '@rollup/pluginutils': 4.2.1
       '@vue/compiler-sfc': 3.2.45
       debug: 4.3.4
@@ -1866,6 +1861,18 @@ packages:
       - supports-color
     dev: true
 
+  /@mastojs/ponyfills/1.0.4:
+    resolution: {integrity: sha512-1NaIGmcU7OmyNzx0fk+cYeGTkdXlOJOSdetaC4pStVWsrhht2cdlYSAfe5NDW3FcUmcEm2vVceB9lcClN1RCxw==}
+    dependencies:
+      '@types/node': 18.11.18
+      '@types/node-fetch': 2.6.2
+      abort-controller: 3.0.0
+      form-data: 4.0.0
+      node-fetch: 2.6.7
+    transitivePeerDependencies:
+      - encoding
+    dev: false
+
   /@netlify/functions/1.3.0:
     resolution: {integrity: sha512-hN/Fgpz8XIOBfsBPLYUMxVKBlCopgeqGB0popayicnmkFLnvKByTTMYgF01wcF9DBtBQdV0H2h1kPFpMl34I8w==}
     engines: {node: '>=8.3.0'}
@@ -2372,11 +2379,6 @@ packages:
       string.prototype.matchall: 4.0.8
     dev: true
 
-  /@tauri-apps/api/1.1.0:
-    resolution: {integrity: sha512-n13pIqdPd3KtaMmmAcrU7BTfdMtIlGNnfZD0dNX8L4p8dgmuNyikm6JAA+yCpl9gqq6I8x5cV2Y0muqdgD0cWw==}
-    engines: {node: '>= 12.22.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
-    dev: false
-
   /@tauri-apps/api/1.2.0:
     resolution: {integrity: sha512-lsI54KI6HGf7VImuf/T9pnoejfgkNoXveP14pVV7XarrQ46rOejIVJLFqHI9sRReJMGdh2YuCoI3cc/yCWCsrw==}
     engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
@@ -2718,10 +2720,21 @@ packages:
       '@types/unist': 2.0.6
     dev: true
 
+  /@types/node-fetch/2.6.2:
+    resolution: {integrity: sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==}
+    dependencies:
+      '@types/node': 18.11.18
+      form-data: 3.0.1
+    dev: false
+
   /@types/node/18.11.10:
     resolution: {integrity: sha512-juG3RWMBOqcOuXC643OAdSA525V44cVgGV6dUDuiFtss+8Fk5x1hI93Rsld43VeJVIeqlP9I7Fn9/qaVqoEAuQ==}
     dev: true
 
+  /@types/node/18.11.18:
+    resolution: {integrity: sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==}
+    dev: false
+
   /@types/normalize-package-data/2.4.1:
     resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
     dev: true
@@ -3178,14 +3191,6 @@ packages:
       vue: 3.2.45
     dev: true
 
-  /@volar/language-core/1.0.16:
-    resolution: {integrity: sha512-IGnOxWTs4DZ81TDcmxBAkCBxs97hUblwcjpBsTx/pOGGaSSDQRJPn0wL8NYTybEObU0i7lhEpKZ+0vJfdIy1Kg==}
-    dependencies:
-      '@volar/source-map': 1.0.16
-      '@vue/reactivity': 3.2.45
-      muggle-string: 0.1.0
-    dev: true
-
   /@volar/language-core/1.0.22:
     resolution: {integrity: sha512-hiJeCOqxNdtG/04FRGLGI9H9DVz2l6cTqPDBzwqplHXAWfMxjzUaGUrn9sfTG7YMFNZUgK4EYxJnRfhqdtbSFQ==}
     dependencies:
@@ -3193,42 +3198,36 @@ packages:
       muggle-string: 0.1.0
     dev: true
 
-  /@volar/source-map/1.0.16:
-    resolution: {integrity: sha512-PKjzmQcg8QOGC/1V9tmGh2jcy6bKLhkW5bGidElSr83iDbCzLvldt2/La/QlDxaRCHYLT0MeyuGJBZIChB1dYQ==}
-    dependencies:
-      muggle-string: 0.1.0
-    dev: true
-
   /@volar/source-map/1.0.22:
     resolution: {integrity: sha512-cv4gypHSP4MWVR82ed/+1IpI6794qAl0Q0+KJ+VGMVF8rVugsiF9QbyMCgjel9wNRsssQsazzsf6txOR9vHQiw==}
     dependencies:
       muggle-string: 0.1.0
     dev: true
 
-  /@volar/typescript/1.0.16:
-    resolution: {integrity: sha512-Yov+n4oO3iYnuMt9QJAFpJabfTRCzc7KvjlAwBaSuZy+Gc/f9611MgtqAh5/SIGmltFN8dXn1Ijno8ro8I4lyw==}
+  /@volar/typescript/1.0.22:
+    resolution: {integrity: sha512-VPyEicealSD4gqlE5/UQ1j3ietsO6Hfat40KtUEh/K+XEZ7h02b1KgFV64YEuBkBOaZ5hgvRW/WXKtQgXCl7Iw==}
     dependencies:
-      '@volar/language-core': 1.0.16
+      '@volar/language-core': 1.0.22
     dev: true
 
-  /@volar/vue-language-core/1.0.16:
-    resolution: {integrity: sha512-sQ/aW1Vuiyy4OQuh2lthyYicruM3qh9VSk/aDh8/bFvM8GoohHZqVpMN3LYldEJ9eT/rN6u4xmYP54vc/EjX4Q==}
+  /@volar/vue-language-core/1.0.22:
+    resolution: {integrity: sha512-Ki0G/ZdBj2/GLw+/VVH3n9XR/JL6krMIth02EekFn6JV4PGN3mNxbvoh6lOPSDZLR6biOU5nJPnnjpKy8nuXhw==}
     dependencies:
-      '@volar/language-core': 1.0.16
-      '@volar/source-map': 1.0.16
+      '@volar/language-core': 1.0.22
+      '@volar/source-map': 1.0.22
       '@vue/compiler-dom': 3.2.45
       '@vue/compiler-sfc': 3.2.45
       '@vue/reactivity': 3.2.45
       '@vue/shared': 3.2.45
-      minimatch: 5.1.1
+      minimatch: 5.1.2
       vue-template-compiler: 2.7.14
     dev: true
 
-  /@volar/vue-typescript/1.0.16:
-    resolution: {integrity: sha512-M018Ulg/o2FVktAdlr5b/z4K69bYzekxNUA1o39y5Ur6CObc/o+5eDCCS7gIYijWnx9iNKkSQpWWWblJFv7kHQ==}
+  /@volar/vue-typescript/1.0.22:
+    resolution: {integrity: sha512-2T1o5z86PAev31OMtVOv/qp4P3ZVl9ln/2KTmykQE8Fh4A5F+868MW4nf5J7XQ6RNyx7RH9LhzgjvbqJpAfiYw==}
     dependencies:
-      '@volar/typescript': 1.0.16
-      '@volar/vue-language-core': 1.0.16
+      '@volar/typescript': 1.0.22
+      '@volar/vue-language-core': 1.0.22
     dev: true
 
   /@vue-macros/api/0.2.3:
@@ -3352,7 +3351,7 @@ packages:
       - vue
     dev: true
 
-  /@vue-macros/nuxt/0.2.8_3nbxte3dhogb6b7pemmre2vo4m:
+  /@vue-macros/nuxt/0.2.8_neamklg3mofeje4gmdzjdymjki:
     resolution: {integrity: sha512-vOMPTGNzBx+pmeZa3nJWRgN9CHYW700EZWVcAMQHrLjgh7vV+JqsA667hoBNnJPjmEBwSe8EzYbc1LFqEZoTZQ==}
     engines: {node: '>=14.19.0'}
     peerDependencies:
@@ -3360,7 +3359,7 @@ packages:
     dependencies:
       '@nuxt/kit': 3.0.0
       '@vue-macros/short-vmodel': 1.0.2
-      '@vue-macros/volar': 0.5.9_vue-tsc@1.0.16
+      '@vue-macros/volar': 0.5.9_vue-tsc@1.0.22
       nuxt: 3.0.0_lzzuuodtsqwxnvqeq4g4likcqa
       unplugin-vue-macros: 1.3.0_@vueuse+core@9.9.0
     transitivePeerDependencies:
@@ -3447,7 +3446,7 @@ packages:
       - vue
     dev: true
 
-  /@vue-macros/volar/0.5.9_vue-tsc@1.0.16:
+  /@vue-macros/volar/0.5.9_vue-tsc@1.0.22:
     resolution: {integrity: sha512-SBjgofdn55fDXkPEGwAmjEeUwrupYqC9ZXH+iHMeawQfUwS2BrcvsUHkMnZiAMW0eQPcmwQr2dUJYMswkbp7cw==}
     peerDependencies:
       vue-tsc: ^1.0.9
@@ -3460,7 +3459,7 @@ packages:
       '@vue-macros/define-props': 0.1.2
       '@vue-macros/short-vmodel': 1.0.2
       muggle-string: 0.2.1
-      vue-tsc: 1.0.16_typescript@4.9.4
+      vue-tsc: 1.0.22_typescript@4.9.4
     transitivePeerDependencies:
       - rollup
       - vue
@@ -3772,6 +3771,13 @@ packages:
     resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
     dev: true
 
+  /abort-controller/3.0.0:
+    resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==}
+    engines: {node: '>=6.5'}
+    dependencies:
+      event-target-shim: 5.0.1
+    dev: false
+
   /acorn-globals/7.0.1:
     resolution: {integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==}
     dependencies:
@@ -4018,16 +4024,6 @@ packages:
       postcss-value-parser: 4.2.0
     dev: true
 
-  /axios/1.1.3:
-    resolution: {integrity: sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==}
-    dependencies:
-      follow-redirects: 1.15.2
-      form-data: 4.0.0
-      proxy-from-env: 1.1.0
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
   /babel-plugin-polyfill-corejs2/0.3.3_@babel+core@7.20.5:
     resolution: {integrity: sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==}
     peerDependencies:
@@ -5709,6 +5705,11 @@ packages:
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-target-shim/5.0.1:
+    resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==}
+    engines: {node: '>=6'}
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -5888,10 +5889,11 @@ packages:
     peerDependenciesMeta:
       debug:
         optional: true
+    dev: true
 
-  /form-data/2.5.1:
-    resolution: {integrity: sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==}
-    engines: {node: '>= 0.12'}
+  /form-data/3.0.1:
+    resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==}
+    engines: {node: '>= 6'}
     dependencies:
       asynckit: 0.4.0
       combined-stream: 1.0.8
@@ -6693,18 +6695,12 @@ packages:
     engines: {node: '>=6.0'}
     dev: false
 
-  /isomorphic-form-data/2.0.0:
-    resolution: {integrity: sha512-TYgVnXWeESVmQSg4GLVbalmQ+B4NPi/H4eWxqALKj63KsUrcu301YDjBqaOw3h+cbak7Na4Xyps3BiptHtxTfg==}
-    dependencies:
-      form-data: 2.5.1
-    dev: false
-
-  /isomorphic-ws/5.0.0_ws@8.11.0:
+  /isomorphic-ws/5.0.0_ws@8.12.0:
     resolution: {integrity: sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==}
     peerDependencies:
       ws: '*'
     dependencies:
-      ws: 8.11.0
+      ws: 8.12.0
     dev: false
 
   /jake/10.8.5:
@@ -7137,19 +7133,18 @@ packages:
       semver: 6.3.0
     dev: true
 
-  /masto/4.11.1:
-    resolution: {integrity: sha512-siTQNhfLV1JjOERCGgjagMvD6q0K0hLuhOXrbXNcYzHAwpbPeSeAM6CSpIRrZ8zFDepOR62Djs/GtJdTR21Rfw==}
+  /masto/5.1.2:
+    resolution: {integrity: sha512-nLhX0aHdb4ql4o2Afd81hm6dq/V6FZylEKed6VF099ZB0ZqkOZ54m+7yy1eSgPljmwrZbUgli5kXQ7nfloBkyg==}
     dependencies:
-      axios: 1.1.3
+      '@mastojs/ponyfills': 1.0.4
       change-case: 4.1.2
       eventemitter3: 5.0.0
-      isomorphic-form-data: 2.0.0
-      isomorphic-ws: 5.0.0_ws@8.11.0
+      isomorphic-ws: 5.0.0_ws@8.12.0
       semver: 7.3.8
-      ws: 8.11.0
+      ws: 8.12.0
     transitivePeerDependencies:
       - bufferutil
-      - debug
+      - encoding
       - utf-8-validate
     dev: false
 
@@ -7268,6 +7263,13 @@ packages:
       brace-expansion: 2.0.1
     dev: true
 
+  /minimatch/5.1.2:
+    resolution: {integrity: sha512-bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg==}
+    engines: {node: '>=10'}
+    dependencies:
+      brace-expansion: 2.0.1
+    dev: true
+
   /minimist/1.2.7:
     resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
 
@@ -7480,7 +7482,6 @@ packages:
         optional: true
     dependencies:
       whatwg-url: 5.0.0
-    dev: true
 
   /node-fetch/3.3.0:
     resolution: {integrity: sha512-BKwRP/O0UvoMKp7GNdwPlObhYGB5DQqwhEDQlNKuoqwVYSxkSZCSbHjnFFmUEtwSKRPU4kNK8PbDYYitwaE3QA==}
@@ -8453,10 +8454,6 @@ packages:
     resolution: {integrity: sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==}
     dev: true
 
-  /proxy-from-env/1.1.0:
-    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
-    dev: false
-
   /prr/1.0.1:
     resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==}
 
@@ -9412,7 +9409,6 @@ packages:
 
   /tr46/0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
-    dev: true
 
   /tr46/1.0.1:
     resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==}
@@ -10272,7 +10268,7 @@ packages:
       vue-router:
         optional: true
     dependencies:
-      '@intlify/shared': 9.3.0-beta.12
+      '@intlify/shared': 9.3.0-beta.13
       '@intlify/vue-i18n-bridge': 0.8.0_vue-i18n@9.3.0-beta.10
       '@intlify/vue-router-bridge': 0.8.0
       ufo: 1.0.1
@@ -10320,14 +10316,14 @@ packages:
       he: 1.2.0
     dev: true
 
-  /vue-tsc/1.0.16_typescript@4.9.4:
-    resolution: {integrity: sha512-yZaiJBbcKR1rSLhiF9KryAFH7R63po+N/invr2EAHGXxMzZksE5j1zyQKvrYiqK47ZHLAlCR+re/PHqWp/UzTg==}
+  /vue-tsc/1.0.22_typescript@4.9.4:
+    resolution: {integrity: sha512-xSxwgWR3czhv7sLKHWu6lzj9Xq6AtsCURVL45AY4TLGFszv2L2YlMgygXvqslyCM5bz9cyoIKSaZnzHqHTHjzA==}
     hasBin: true
     peerDependencies:
       typescript: '*'
     dependencies:
-      '@volar/vue-language-core': 1.0.16
-      '@volar/vue-typescript': 1.0.16
+      '@volar/vue-language-core': 1.0.22
+      '@volar/vue-typescript': 1.0.22
       typescript: 4.9.4
     dev: true
 
@@ -10375,7 +10371,6 @@ packages:
 
   /webidl-conversions/3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
-    dev: true
 
   /webidl-conversions/4.0.2:
     resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==}
@@ -10422,7 +10417,6 @@ packages:
     dependencies:
       tr46: 0.0.3
       webidl-conversions: 3.0.1
-    dev: true
 
   /whatwg-url/7.1.0:
     resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==}
@@ -10648,6 +10642,20 @@ packages:
         optional: true
       utf-8-validate:
         optional: true
+    dev: true
+
+  /ws/8.12.0:
+    resolution: {integrity: sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+    dev: false
 
   /xml-name-validator/4.0.0:
     resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
@@ -10733,20 +10741,18 @@ packages:
       readable-stream: 3.6.0
     dev: true
 
-  github.com/tauri-apps/tauri-plugin-log/b58475bbc410fa78eb69276c62d0b64c91c07914:
-    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/b58475bbc410fa78eb69276c62d0b64c91c07914}
+  github.com/tauri-apps/tauri-plugin-log/954a857daa45598ffc5e8637fccdba300f9ef757:
+    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/954a857daa45598ffc5e8637fccdba300f9ef757}
     name: tauri-plugin-log-api
-    version: 0.1.0
+    version: 0.0.0
     dependencies:
       '@tauri-apps/api': 1.2.0
-      tslib: 2.4.1
     dev: false
 
-  github.com/tauri-apps/tauri-plugin-store/9bd993aa67766596638bbfd91e79a1bf8f632014:
-    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/9bd993aa67766596638bbfd91e79a1bf8f632014}
+  github.com/tauri-apps/tauri-plugin-store/89100ece4ebe010091e90d1873eaeafbbf5eb60a:
+    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/89100ece4ebe010091e90d1873eaeafbbf5eb60a}
     name: tauri-plugin-store-api
-    version: 0.1.0
+    version: 0.0.0
     dependencies:
-      '@tauri-apps/api': 1.1.0
-      tslib: 2.4.0
+      '@tauri-apps/api': 1.2.0
     dev: false
diff --git a/service-worker/types.ts b/service-worker/types.ts
index 27ab8c24..be53709c 100644
--- a/service-worker/types.ts
+++ b/service-worker/types.ts
@@ -1,15 +1,7 @@
 // masto types and notification types differs
 // Any type used from masto api retrieving notification from push notification id is no camel case, it is snake case
 // I just copy/paste any entry from masto api and convert it to snake case, reusing types not including camel case props
-import type {
-  AccountCredentials,
-  AttachmentMeta,
-  AttachmentType,
-  Card,
-  Mention,
-  StatusVisibility,
-  Tag,
-} from 'masto'
+import type { mastodon } from 'masto'
 
 export type NotificationType = 'mention' | 'status' | 'reblog' | 'follow' | 'follow_request' | 'favourite' | 'poll' | 'update' | 'admin.sign_up' | 'admin.report'
 
@@ -26,7 +18,7 @@ export interface PushPayload {
 export interface UserLogin {
   server: string
   token?: string
-  account: AccountCredentials
+  account: mastodon.v1.AccountCredentials
 }
 
 export interface NotificationInfo {
@@ -74,7 +66,7 @@ export interface Attachment {
   /** The ID of the attachment in the database. */
   id: string
   /** The type of the attachment. */
-  type: AttachmentType
+  type: mastodon.v1.MediaAttachmentType
   /** The location of the original full-size attachment. */
   url?: string | null
   /** The location of a scaled-down preview of the attachment. */
@@ -86,7 +78,7 @@ export interface Attachment {
   /** A shorter URL for the attachment. */
   text_url?: string | null
   /** Metadata returned by Paperclip. */
-  meta?: AttachmentMeta | null
+  meta?: mastodon.v1.MediaAttachmentMeta | null
   /**
    * Alternate text that describes what is in the media attachment,
    * to be used for the visually impaired or when media attachments do not load.
@@ -126,7 +118,7 @@ export interface Status {
   /** HTML-encoded status content. */
   content: string
   /** Visibility of this status. */
-  visibility: StatusVisibility
+  visibility: mastodon.v1.StatusVisibility
   /** Is this status marked as sensitive content? */
   sensitive: boolean
   /** Subject or summary line, below which status content is collapsed until expanded. */
@@ -136,9 +128,9 @@ export interface Status {
   /** The application used to post this status. */
   // application: Application
   /** Mentions of users within the status content. */
-  mentions: Mention[]
+  mentions: mastodon.v1.StatusMention[]
   /** Hashtags used within the status content. */
-  tags: Tag[]
+  tags: mastodon.v1.Tag[]
   /** Custom emoji to be used when rendering status content. */
   emojis: Emoji[]
   /** How many boosts this status has received. */
@@ -158,7 +150,7 @@ export interface Status {
   /** The poll attached to the status. */
   poll?: Poll | null
   /** Preview card for links included within status content. */
-  card?: Card | null
+  card?: mastodon.v1.PreviewCard | null
   /** Primary language of this status. */
   language?: string | null
   /**
diff --git a/styles/global.css b/styles/global.css
index d91036d6..caaf0321 100644
--- a/styles/global.css
+++ b/styles/global.css
@@ -159,6 +159,17 @@ em-emoji-picker {
   .custom-emoji {
     margin: 0 0.2em;
   }
+
+  p {
+    --at-apply: my-0;
+    line-height: calc(4 / 3 * 1em);
+  }
+  p:first-child {
+    --at-apply: mt-1;
+  }
+  p:last-child {
+    --at-apply: mb-1;
+  }
 }
 
 .skeleton-loading-bg {
diff --git a/tests/__snapshots__/content-rich.test.ts.snap b/tests/__snapshots__/content-rich.test.ts.snap
index 7c0bbf42..176f7587 100644
--- a/tests/__snapshots__/content-rich.test.ts.snap
+++ b/tests/__snapshots__/content-rich.test.ts.snap
@@ -1,7 +1,7 @@
 // Vitest Snapshot v1
 
 exports[`content-rich > code frame 1`] = `
-"<p>Testing code block</p><p><pre lang=\\"ts\\">import { useMouse, usePreferredDark } from &#39;@vueuse/core&#39;
+"<p>Testing code block</p><p></p><p><pre lang=\\"ts\\">import { useMouse, usePreferredDark } from &#39;@vueuse/core&#39;
 // tracks mouse position
 const { x, y } = useMouse()
 // is the user prefers dark theme
diff --git a/tests/__snapshots__/html-parse.test.ts.snap b/tests/__snapshots__/html-parse.test.ts.snap
index 6cd2fdcd..df59da5a 100644
--- a/tests/__snapshots__/html-parse.test.ts.snap
+++ b/tests/__snapshots__/html-parse.test.ts.snap
@@ -1,7 +1,7 @@
 // Vitest Snapshot v1
 
 exports[`html-parse > code frame > html 1`] = `
-"<p>Testing code block</p><p><pre><code class=\\"language-ts\\">import { useMouse, usePreferredDark } from '@vueuse/core'
+"<p>Testing code block</p><p></p><p><pre><code class=\\"language-ts\\">import { useMouse, usePreferredDark } from '@vueuse/core'
 // tracks mouse position
 const { x, y } = useMouse()
 // is the user prefers dark theme
@@ -11,6 +11,7 @@ const isDark = usePreferredDark()</code></pre></p>"
 exports[`html-parse > code frame > text 1`] = `
 "Testing code block
 
+
 \`\`\`ts
 import { useMouse, usePreferredDark } from '@vueuse/core'
 // tracks mouse position
@@ -94,11 +95,12 @@ exports[`html-parse > html entities > html 1`] = `
 
 exports[`html-parse > html entities > text 1`] = `"Hello <World />."`;
 
-exports[`html-parse > inline markdown > html 1`] = `"<p>text <code>code</code> <b>bold</b> <em>italic</em> <del>del</del></p><p><pre><code class=\\"language-js\\">code block</code></pre></p>"`;
+exports[`html-parse > inline markdown > html 1`] = `"<p>text <code>code</code> <b>bold</b> <em>italic</em> <del>del</del></p><p></p><p><pre><code class=\\"language-js\\">code block</code></pre></p>"`;
 
 exports[`html-parse > inline markdown > text 1`] = `
 "text \`code\` **bold** *italic* ~~del~~
 
+
 \`\`\`js
 code block
 \`\`\`"
diff --git a/tests/content-rich.test.ts b/tests/content-rich.test.ts
index 25256408..1f7b17f1 100644
--- a/tests/content-rich.test.ts
+++ b/tests/content-rich.test.ts
@@ -2,7 +2,7 @@
  * @vitest-environment jsdom
  */
 /* eslint-disable vue/one-component-per-file */
-import type { Emoji } from 'masto'
+import type { mastodon } from 'masto'
 import { describe, expect, it, vi } from 'vitest'
 import { renderToString } from 'vue/server-renderer'
 import { format } from 'prettier'
@@ -54,7 +54,7 @@ describe('content-rich', () => {
   })
 })
 
-async function render(content: string, emojis?: Record<string, Emoji>) {
+async function render(content: string, emojis?: Record<string, mastodon.v1.CustomEmoji>) {
   const vnode = contentToVNode(content, { emojis })
   const html = (await renderToString(vnode))
     .replace(/<!--[\[\]]-->/g, '')
diff --git a/tests/html-parse.test.ts b/tests/html-parse.test.ts
index 5c61fc6c..f68bde0f 100644
--- a/tests/html-parse.test.ts
+++ b/tests/html-parse.test.ts
@@ -1,7 +1,7 @@
 /**
  * @vitest-environment jsdom
  */
-import type { Emoji } from 'masto'
+import type { mastodon } from 'masto'
 import { describe, expect, it } from 'vitest'
 import { format } from 'prettier'
 import { render as renderTree } from 'ultrahtml'
@@ -66,7 +66,7 @@ describe('html-parse', () => {
   })
 })
 
-async function render(input: string, emojis?: Record<string, Emoji>) {
+async function render(input: string, emojis?: Record<string, mastodon.v1.CustomEmoji>) {
   const tree = parseMastodonHTML(input, { emojis })
   const html = await renderTree(tree)
   let formatted = ''
diff --git a/tests/reorder-timeline.test.ts b/tests/reorder-timeline.test.ts
index a024e09c..242b674c 100644
--- a/tests/reorder-timeline.test.ts
+++ b/tests/reorder-timeline.test.ts
@@ -1,18 +1,18 @@
 /**
  * @vitest-environment jsdom
  */
-import type { Status } from 'masto'
+import type { mastodon } from 'masto'
 import { describe, expect, it } from 'vitest'
 import { reorderedTimeline } from '~/composables/timeline'
 
-function status(id: string): Status {
-  return { id } as Status
+function status(id: string): mastodon.v1.Status {
+  return { id } as mastodon.v1.Status
 }
-function reply(id: string, s: Status) {
-  return { id, inReplyToId: s.id } as Status
+function reply(id: string, s: mastodon.v1.Status) {
+  return { id, inReplyToId: s.id } as mastodon.v1.Status
 }
-function reblog(id: string, s: Status) {
-  return { id, reblog: s } as Status
+function reblog(id: string, s: mastodon.v1.Status) {
+  return { id, reblog: s } as mastodon.v1.Status
 }
 
 const p_a1 = status('p_a1')
diff --git a/types/index.ts b/types/index.ts
index 190862cf..47c3bfac 100644
--- a/types/index.ts
+++ b/types/index.ts
@@ -1,4 +1,4 @@
-import type { Account, AccountCredentials, Attachment, CreateStatusParams, Emoji, Instance, MastoClient, Notification, PushSubscription, Status } from 'masto'
+import type { mastodon } from 'masto'
 import type { Ref } from 'vue'
 import type { MarkNonNullable, Mutable } from './utils'
 
@@ -15,52 +15,52 @@ export interface AppInfo {
 export interface UserLogin {
   server: string
   token?: string
-  account: AccountCredentials
+  account: mastodon.v1.AccountCredentials
   vapidKey?: string
-  pushSubscription?: PushSubscription
+  pushSubscription?: mastodon.v1.WebPushSubscription
 }
 
-export interface ElkMasto extends MastoClient {
-  loginTo (user?: Omit<UserLogin, 'account'> & { account?: AccountCredentials }): Promise<MastoClient>
+export interface ElkMasto extends mastodon.Client {
+  loginTo (user?: Omit<UserLogin, 'account'> & { account?: mastodon.v1.AccountCredentials }): Promise<mastodon.Client>
   loggedIn: Ref<boolean>
 }
 
 export type PaginatorState = 'idle' | 'loading' | 'done' | 'error'
 
-export interface ServerInfo extends Instance {
+export interface ServerInfo extends mastodon.v2.Instance {
   server: string
   timeUpdated: number
-  customEmojis?: Record<string, Emoji>
+  customEmojis?: Record<string, mastodon.v1.CustomEmoji>
 }
 
 export interface GroupedNotifications {
   id: string
   type: Exclude<string, 'grouped-reblogs-and-favourites'>
-  items: Notification[]
+  items: mastodon.v1.Notification[]
 }
 
 export interface GroupedAccountLike {
-  account: Account
-  favourite?: Notification
-  reblog?: Notification
+  account: mastodon.v1.Account
+  favourite?: mastodon.v1.Notification
+  reblog?: mastodon.v1.Notification
 }
 
 export interface GroupedLikeNotifications {
   id: string
   type: 'grouped-reblogs-and-favourites'
-  status: Status
+  status: mastodon.v1.Status
   likes: GroupedAccountLike[]
 }
 
-export type NotificationSlot = GroupedNotifications | GroupedLikeNotifications | Notification
+export type NotificationSlot = GroupedNotifications | GroupedLikeNotifications | mastodon.v1.Notification
 
 export type TranslateFn = ReturnType<typeof useI18n>['t']
 
 export interface Draft {
-  editingStatus?: Status
+  editingStatus?: mastodon.v1.Status
   initialText?: string
-  params: MarkNonNullable<Mutable<CreateStatusParams>, 'status' | 'language' | 'sensitive' | 'spoilerText' | 'visibility'>
-  attachments: Attachment[]
+  params: MarkNonNullable<Mutable<mastodon.v1.CreateStatusParams>, 'status' | 'language' | 'sensitive' | 'spoilerText' | 'visibility'>
+  attachments: mastodon.v1.MediaAttachment[]
   lastUpdated: number
 }
 export type DraftMap = Record<string, Draft>