diff --git a/components/account/AccountHeader.vue b/components/account/AccountHeader.vue
index 65fd38bf..ffbcfb0f 100644
--- a/components/account/AccountHeader.vue
+++ b/components/account/AccountHeader.vue
@@ -57,7 +57,7 @@ function getFieldNameIcon(fieldName: string) {
             <AccountAvatar :account="account" w-30 h-30 />
           </NuxtLink>
           <div flex flex-col>
-            <ContentRichSetup font-bold text-2xl break-words :content="getDisplayName(account)" :emojis="account.emojis" />
+            <ContentRich font-bold text-2xl break-words :content="getDisplayName(account)" :emojis="account.emojis" />
             <p op50>
               {{ getAccountHandle(account) }}
             </p>
@@ -74,7 +74,7 @@ function getFieldNameIcon(fieldName: string) {
         </div>
       </div>
       <div v-if="account.note">
-        <ContentRichSetup text-4 text-gray :content="account.note" :emojis="account.emojis" />
+        <ContentRich text-4 text-gray :content="account.note" :emojis="account.emojis" />
       </div>
       <div flex flex-wrap gap-4>
         <div v-for="field in fields" :key="field.name" flex="~ gap-1" items-center>
@@ -82,7 +82,7 @@ function getFieldNameIcon(fieldName: string) {
           <div v-else op50 uppercase text-xs font-bold>
             {{ field.name }} |
           </div>
-          <ContentRichSetup text-sm filter-saturate-0 :content="field.value" />
+          <ContentRich text-sm filter-saturate-0 :content="field.value" />
         </div>
       </div>
       <div flex gap-5>
diff --git a/components/account/AccountHoverCard.vue b/components/account/AccountHoverCard.vue
index c2738eee..e05cb5f2 100644
--- a/components/account/AccountHoverCard.vue
+++ b/components/account/AccountHoverCard.vue
@@ -22,6 +22,6 @@ defineProps<{
         {{ account.followersCount }} Followers
       </NuxtLink>
     </div>
-    <ContentRichSetup text-4 text-gray :content="account.note" :emojis="account.emojis" />
+    <ContentRich text-4 text-gray :content="account.note" :emojis="account.emojis" />
   </div>
 </template>
diff --git a/components/account/AccountInfo.vue b/components/account/AccountInfo.vue
index 9648bec6..ed0c5e66 100644
--- a/components/account/AccountInfo.vue
+++ b/components/account/AccountInfo.vue
@@ -19,7 +19,7 @@ const accountHandle = $(useAccountHandle(account, fullServer))
       </NuxtLink>
     </div>
     <NuxtLink flex flex-col :to="link ? getAccountPath(account) : null">
-      <ContentRichSetup font-bold hover:underline :content="getDisplayName(account)" :emojis="account.emojis" />
+      <ContentRich font-bold hover:underline :content="getDisplayName(account)" :emojis="account.emojis" />
       <p op35 text-sm>
         {{ accountHandle }}
       </p>
diff --git a/components/account/AccountInlineInfo.vue b/components/account/AccountInlineInfo.vue
index f4957b11..7a2358b0 100644
--- a/components/account/AccountInlineInfo.vue
+++ b/components/account/AccountInlineInfo.vue
@@ -10,6 +10,6 @@ const { link = true } = defineProps<{
 <template>
   <NuxtLink :to="link ? getAccountPath(account) : undefined" min-w-0 flex gap-1 items-center>
     <AccountAvatar :account="account" w-5 h-5 />
-    <ContentRichSetup hover:underline :content="getDisplayName(account)" :emojis="account.emojis" />
+    <ContentRich hover:underline :content="getDisplayName(account)" :emojis="account.emojis" />
   </NuxtLink>
 </template>
diff --git a/components/account/AccountLink.vue b/components/account/AccountLink.vue
index 05be6506..d425b2f5 100644
--- a/components/account/AccountLink.vue
+++ b/components/account/AccountLink.vue
@@ -8,6 +8,6 @@ defineProps<{
 
 <template>
   <NuxtLink :to="getAccountPath(account)">
-    <ContentRichSetup font-bold :content="getDisplayName(account)" :emojis="account.emojis" />
+    <ContentRich font-bold :content="getDisplayName(account)" :emojis="account.emojis" />
   </NuxtLink>
 </template>
diff --git a/components/status/StatusAccountDetails.vue b/components/status/StatusAccountDetails.vue
index fc54d6a3..9abdb53f 100644
--- a/components/status/StatusAccountDetails.vue
+++ b/components/status/StatusAccountDetails.vue
@@ -14,7 +14,7 @@ const accountHandle = $(useAccountHandle(account))
     :to="link ? getAccountPath(account) : undefined"
     flex="~ col" min-w-0 md:flex="~ row gap-2" md:items-center
   >
-    <ContentRichSetup font-bold break-words hover:underline :content="getDisplayName(account)" :emojis="account.emojis" />
+    <ContentRich font-bold break-words hover:underline :content="getDisplayName(account)" :emojis="account.emojis" />
     <p op35 text-sm>
       {{ accountHandle }}
     </p>
diff --git a/components/status/StatusBody.vue b/components/status/StatusBody.vue
index 9711fa31..0a54c8b8 100644
--- a/components/status/StatusBody.vue
+++ b/components/status/StatusBody.vue
@@ -9,7 +9,7 @@ const { translation } = useTranslation(status)
 
 <template>
   <div class="status-body" whitespace-pre-wrap break-words>
-    <ContentRichSetup
+    <ContentRich
       :content="translation.visible ? translation.text : status.content"
       :emojis="status.emojis"
     />
diff --git a/modules/setup-components.ts b/modules/setup-components.ts
new file mode 100644
index 00000000..4c4d4380
--- /dev/null
+++ b/modules/setup-components.ts
@@ -0,0 +1,16 @@
+import { defineNuxtModule, useNuxt } from '@nuxt/kit'
+
+export default defineNuxtModule({
+  meta: {
+    name: 'setup-components',
+  },
+  setup() {
+    const nuxt = useNuxt()
+    nuxt.hook('components:extend', (components) => {
+      for (const component of components) {
+        component.pascalName = component.pascalName.replace(/Setup$/, '')
+        component.kebabName = component.kebabName.replace(/-setup$/, '')
+      }
+    })
+  },
+})
diff --git a/nuxt.config.ts b/nuxt.config.ts
index f376d9e8..6e35f92b 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -6,6 +6,7 @@ export default defineNuxtConfig({
     '@pinia/nuxt',
     '@vue-macros/nuxt',
     '~/modules/purge-comments',
+    '~/modules/setup-components',
   ],
   experimental: {
     reactivityTransform: true,