diff --git a/.sync/log/7eab4bcb78f17b9eed365d617aa3ef3874c21bac.md b/.sync/log/7eab4bcb78f17b9eed365d617aa3ef3874c21bac.md
new file mode 100644
index 000000000..6ec7a5574
--- /dev/null
+++ b/.sync/log/7eab4bcb78f17b9eed365d617aa3ef3874c21bac.md
@@ -0,0 +1,59 @@
+# Port: perf(types): import cross-component types from source, not the barrel (#6646)
+
+**Upstream:** `7eab4bcb78f17b9eed365d617aa3ef3874c21bac` (nuxt/ui)
+**Decision:** port
+
+## Upstream change
+A perf refactor: stop importing cross-component types from the `../types`
+**barrel** (`src/runtime/types/index.ts`, which `export *`s every component +
+every `types/*` submodule). One barrel import eagerly pulls the whole library
+into a consumer's type graph. Instead, import each type directly from its
+**source** — the owning component `.vue` (e.g. `ButtonProps` from
+`./Button.vue`) or a specific `../types/*` module (e.g. `Messages` from
+`../types/locale`). Adds an eslint `no-restricted-imports` guard so the barrel
+can't creep back in, with `useComponentProps.ts` exempted (it legitimately
+needs the whole barrel via `import type * as ComponentTypes`).
+
+## b24ui port — adapted, not 1:1
+b24ui's `types/index.ts` barrel has the **same** shape (re-exports every
+`components/*.vue` + `types/{content,editor,form,input,icons,locale,prose,color-mode,utils}`),
+so the same refactor applies — but the per-type → source mapping had to be
+resolved against **b24ui's own** exports because the component/type set
+diverges from upstream:
+
+- b24ui has **no `Icon.vue`**: upstream maps `IconProps` → `./Icon.vue`; b24ui
+  components use `IconComponent`, which resolves to `../types/icons`.
+- b24ui has its own component set (no `AuthForm`/`BlogPost`/…, plus extras like
+  `Advice`, `Countdown`, the `Sidebar*`/`Navbar*` families).
+- b24ui maintains a **curated, smaller locale set** (§2) — 20 locale files
+  touched here vs upstream's 62. Existing locales are edited normally
+  (`Messages` import retargeted to `../types/locale`); no new locales added.
+
+Rather than copy upstream's per-file import lines, I built a name→source index
+from b24ui's barrel sources and rewrote every consumer's
+`import type { … } from '<../types barrel>'` into per-source grouped imports
+with the correct relative specifier for the consumer's depth. Verified: **0**
+unresolved type names, **0** ambiguous names (no type exported by >1 source).
+
+### Scope
+- **119** consumer files rewritten (`src/runtime/{components,composables,utils,
+  dictionary,locale,vue/...}`), `+`eslint.config.mjs. `120` files total,
+  +284/−120 lines (single barrel lines split into per-source lines).
+- Only remaining barrel import: `composables/useComponentProps.ts`
+  (`import type * as ComponentTypes from '../types'`) — intentional, and the
+  eslint rule turns `no-restricted-imports` **off** for that file, mirroring
+  upstream.
+- eslint rule appended via the existing `.append(...)` chain (b24ui uses the
+  `bitrix24-ui/` plugin namespace, not upstream's `nuxt-ui/`). Rule `files`
+  globs and restricted paths (`../types`, `../../types`) mirror upstream.
+  b24ui's only depth-3 barrel importers live under `src/runtime/vue/…` (not
+  `components/**`/`composables/**`), so — exactly as upstream — they are
+  rewritten but not eslint-guarded.
+
+## Tests
+Types-only change, no runtime/markup change → no snapshot churn. Full suite
+unchanged (225 files, 5143 passed / 6 skipped).
+
+## Verify (CI=true)
+`dev:prepare` · `lint` (new rule active, green) · `typecheck` (all 119 rewrites
+resolve) · `test` · `build` — all green.
diff --git a/.sync/nuxt-ui.json b/.sync/nuxt-ui.json
index d2975ac45..f1f46b8c2 100644
--- a/.sync/nuxt-ui.json
+++ b/.sync/nuxt-ui.json
@@ -2,7 +2,7 @@
   "upstream": "nuxt/ui",
   "branch": "v4",
   "sync_enabled": false,
-  "cursor": "88baabcf42b115b7da1a65e5f71092a37b5c9bf3",
+  "cursor": "7eab4bcb78f17b9eed365d617aa3ef3874c21bac",
   "_cursor_note": "cursor = last upstream commit ported into b24ui (oldest-first, manual cadence). sync_enabled stays false until Phase 2 (porter workflow #67 + CLAUDE_CODE_OAUTH_TOKEN) is wired and trusted. `processed` is maintained per port from now on (backfilled #68-#72 on 2026-06-09).",
   "stats": {
     "queue_depth": 0,
@@ -773,10 +773,16 @@
       "summary": "fix(ContentNavigation): key items by identity to prevent leading icon flash (#6640) — NO-OP: upstream keys the navigation v-for by `${index}-${link.path}` in src/runtime/components/content/ContentNavigation.vue (+spec). b24ui has no ContentNavigation component (git ls-files grep contentnavigation => none). Nothing to port. Bookkeeping only"
     },
     "88baabcf42b115b7da1a65e5f71092a37b5c9bf3": {
+      "pr": 225,
+      "b24ui_sha": "007602bf",
+      "decision": "port",
+      "summary": "fix(Separator): forward fall-through attributes to root (#6641) — Separator.vue: add defineOptions({ inheritAttrs: false }) + change root <Separator> binding v-bind=rootProps -> v-bind={...rootProps, ...$attrs} so fall-through attrs land on the actual root. Direct 1:1 (b24ui matched pre-change; useForwardProps rootProps + reka <Separator> root unchanged; no ui/icon/color renames). +attr-forwarding spec mirroring #218 (d3b5f1d3) (targets [data-slot=root] since Separator is multi-root). 2 snapshots updated (Separator + -vue): the existing 'with color success' renderEach case passes `color` which is NOT a SeparatorProps member = a fall-through attr; pre-fix multi-root dropped it, post-fix $attrs forwards it to root -> snapshot now carries color=air-primary-success (the fix demonstrating itself)"
+    },
+    "7eab4bcb78f17b9eed365d617aa3ef3874c21bac": {
       "pr": null,
       "b24ui_sha": "pending-merge",
       "decision": "port",
-      "summary": "fix(Separator): forward fall-through attributes to root (#6641) — Separator.vue: add defineOptions({ inheritAttrs: false }) + change root <Separator> binding v-bind=rootProps -> v-bind={...rootProps, ...$attrs} so fall-through attrs land on the actual root. Direct 1:1 (b24ui matched pre-change; useForwardProps rootProps + reka <Separator> root unchanged; no ui/icon/color renames). +attr-forwarding spec mirroring #218 (d3b5f1d3) (targets [data-slot=root] since Separator is multi-root). 2 snapshots updated (Separator + -vue): the existing 'with color success' renderEach case passes `color` which is NOT a SeparatorProps member = a fall-through attr; pre-fix multi-root dropped it, post-fix $attrs forwards it to root -> snapshot now carries color=air-primary-success (the fix demonstrating itself)"
+      "summary": "perf(types): import cross-component types from source, not the barrel (#6646) — replace `import type {...} from '../types'` barrel imports with per-source imports (owning component .vue, e.g. ButtonProps from ./Button.vue; or specific ../types/* module, e.g. Messages from ../types/locale) across 119 consumer files in src/runtime/{components,composables,utils,dictionary,locale,vue/...}; +eslint no-restricted-imports guard on ../types & ../../types for components/**/*.vue + composables/**/*.ts, with useComponentProps.ts exempted (keeps `import type * as ComponentTypes from '../types'`). Adapted, not 1:1: resolved each type->source against b24ui's OWN exports (IconComponent->../types/icons since b24ui has no Icon.vue; own component set; curated 20 locale files vs upstream 62 per §2). 0 unresolved / 0 ambiguous names. Rule appended via existing .append chain (bitrix24-ui/ namespace). Types-only, no snapshot churn. 120 files, +284/-120"
     }
   }
 }
diff --git a/eslint.config.mjs b/eslint.config.mjs
index ef17e8dc8..000034c63 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -180,4 +180,19 @@ export default createConfigForNuxt({
   rules: {
     'bitrix24-ui/no-bare-prop-refs': 'error'
   }
+}).append({
+  files: ['src/runtime/components/**/*.vue', 'src/runtime/composables/**/*.ts'],
+  rules: {
+    'no-restricted-imports': ['error', {
+      paths: [
+        { name: '../types', message: 'Import cross-component types from their source file (e.g. \'./Button.vue\') or a specific \'../types/*\' module, not the \'../types\' barrel: it re-exports every component, so one import eagerly loads the whole library into a consumer\'s type graph.' },
+        { name: '../../types', message: 'Import cross-component types from their source file (e.g. \'./Button.vue\') or a specific \'../../types/*\' module, not the \'../../types\' barrel: it re-exports every component, so one import eagerly loads the whole library into a consumer\'s type graph.' }
+      ]
+    }]
+  }
+}, {
+  files: ['src/runtime/composables/useComponentProps.ts'],
+  rules: {
+    'no-restricted-imports': 'off'
+  }
 })
diff --git a/src/runtime/components/Accordion.vue b/src/runtime/components/Accordion.vue
index 828f0aa98..23998a28d 100644
--- a/src/runtime/components/Accordion.vue
+++ b/src/runtime/components/Accordion.vue
@@ -4,7 +4,7 @@ import type { AccordionRootProps, AccordionRootEmits } from 'reka-ui'
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/accordion'
-import type { IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
 import type { DynamicSlots, GetItemKeys } from '../types/utils'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/Advice.vue b/src/runtime/components/Advice.vue
index 95915b80c..59f411a7f 100644
--- a/src/runtime/components/Advice.vue
+++ b/src/runtime/components/Advice.vue
@@ -3,7 +3,7 @@ import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/advice'
 import type { UseComponentIconsProps } from '../composables/useComponentIcons'
-import type { AvatarProps } from '../types'
+import type { AvatarProps } from './Avatar.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type Advice = ComponentConfig<typeof theme, AppConfig, 'advice'>
diff --git a/src/runtime/components/Alert.vue b/src/runtime/components/Alert.vue
index 8e98ac64e..901714255 100644
--- a/src/runtime/components/Alert.vue
+++ b/src/runtime/components/Alert.vue
@@ -2,7 +2,10 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/alert'
-import type { AvatarProps, ButtonProps, IconComponent, LinkPropsKeys } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { ButtonProps } from './Button.vue'
+import type { LinkPropsKeys } from './Link.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type Alert = ComponentConfig<typeof theme, AppConfig, 'alert'>
diff --git a/src/runtime/components/App.vue b/src/runtime/components/App.vue
index f065eb3b1..516229d0e 100644
--- a/src/runtime/components/App.vue
+++ b/src/runtime/components/App.vue
@@ -1,7 +1,8 @@
 <script lang="ts">
 import type { ConfigProviderProps, TooltipProviderProps } from 'reka-ui'
 import type { VNode } from 'vue'
-import type { ToasterProps, Locale, Messages } from '../types'
+import type { Locale, Messages } from '../types/locale'
+import type { ToasterProps } from './Toaster.vue'
 
 export interface AppProps<T extends Messages = Messages> extends Omit<ConfigProviderProps, 'useId' | 'locale' | 'teleportTo'> {
   tooltip?: TooltipProviderProps
diff --git a/src/runtime/components/Avatar.vue b/src/runtime/components/Avatar.vue
index a76555fcc..503413e5d 100644
--- a/src/runtime/components/Avatar.vue
+++ b/src/runtime/components/Avatar.vue
@@ -2,7 +2,8 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/avatar'
-import type { IconComponent, ChipProps } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { ChipProps } from './Chip.vue'
 import type { ImgHTMLAttributes } from '../types/html'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/Badge.vue b/src/runtime/components/Badge.vue
index 4287209e9..7f89bdb7c 100644
--- a/src/runtime/components/Badge.vue
+++ b/src/runtime/components/Badge.vue
@@ -3,7 +3,7 @@ import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/badge'
 import type { UseComponentIconsProps } from '../composables/useComponentIcons'
-import type { AvatarProps } from '../types'
+import type { AvatarProps } from './Avatar.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type Badge = ComponentConfig<typeof theme, AppConfig, 'badge'>
diff --git a/src/runtime/components/Banner.vue b/src/runtime/components/Banner.vue
index f48223fa9..16beb49f2 100644
--- a/src/runtime/components/Banner.vue
+++ b/src/runtime/components/Banner.vue
@@ -2,7 +2,9 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/banner'
-import type { ButtonProps, IconComponent, LinkProps, LinkPropsKeys } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { ButtonProps } from './Button.vue'
+import type { LinkProps, LinkPropsKeys } from './Link.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type Banner = ComponentConfig<typeof theme, AppConfig, 'banner'>
diff --git a/src/runtime/components/Breadcrumb.vue b/src/runtime/components/Breadcrumb.vue
index 4a387d988..d8d9616df 100644
--- a/src/runtime/components/Breadcrumb.vue
+++ b/src/runtime/components/Breadcrumb.vue
@@ -3,7 +3,9 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/breadcrumb'
-import type { AvatarProps, IconComponent, LinkProps } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { LinkProps } from './Link.vue'
 import type { DynamicSlots, GetItemKeys } from '../types/utils'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/Button.vue b/src/runtime/components/Button.vue
index 59f0729e8..f4b1e71ec 100644
--- a/src/runtime/components/Button.vue
+++ b/src/runtime/components/Button.vue
@@ -3,7 +3,8 @@ import type { Ref, VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/button'
 import type { UseComponentIconsProps } from '../composables/useComponentIcons'
-import type { LinkProps, AvatarProps } from '../types'
+import type { AvatarProps } from './Avatar.vue'
+import type { LinkProps } from './Link.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type Button = ComponentConfig<typeof theme, AppConfig, 'button'>
diff --git a/src/runtime/components/Calendar.vue b/src/runtime/components/Calendar.vue
index b07bf27d5..0dea78639 100644
--- a/src/runtime/components/Calendar.vue
+++ b/src/runtime/components/Calendar.vue
@@ -5,7 +5,9 @@ import type { VNode } from 'vue'
 import type { DateValue } from '@internationalized/date'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/calendar'
-import type { IconComponent, ButtonProps, LinkPropsKeys } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { ButtonProps } from './Button.vue'
+import type { LinkPropsKeys } from './Link.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type Calendar = ComponentConfig<typeof theme, AppConfig, 'calendar'>
diff --git a/src/runtime/components/ChatMessage.vue b/src/runtime/components/ChatMessage.vue
index d02c2bc44..772e7eeda 100644
--- a/src/runtime/components/ChatMessage.vue
+++ b/src/runtime/components/ChatMessage.vue
@@ -3,7 +3,9 @@ import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import type { UIDataTypes, UIMessage, UITools, FileUIPart, TextUIPart } from 'ai'
 import theme from '#build/b24ui/chat-message'
-import type { AvatarProps, ButtonProps, IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { ButtonProps } from './Button.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type ChatMessage = ComponentConfig<typeof theme, AppConfig, 'chatMessage'>
diff --git a/src/runtime/components/ChatMessages.vue b/src/runtime/components/ChatMessages.vue
index e1be2bb19..f368d23b0 100644
--- a/src/runtime/components/ChatMessages.vue
+++ b/src/runtime/components/ChatMessages.vue
@@ -4,7 +4,10 @@ import type { ComponentPublicInstance, VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import type { UIDataTypes, UIMessage, UITools, ChatStatus } from 'ai'
 import theme from '#build/b24ui/chat-messages'
-import type { ButtonProps, ChatMessageProps, ChatMessageSlots, IconComponent, LinkPropsKeys } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { ButtonProps } from './Button.vue'
+import type { ChatMessageProps, ChatMessageSlots } from './ChatMessage.vue'
+import type { LinkPropsKeys } from './Link.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type ChatMessages = ComponentConfig<typeof theme, AppConfig, 'chatMessages'>
diff --git a/src/runtime/components/ChatPrompt.vue b/src/runtime/components/ChatPrompt.vue
index cc86c77c4..d144bfe92 100644
--- a/src/runtime/components/ChatPrompt.vue
+++ b/src/runtime/components/ChatPrompt.vue
@@ -2,7 +2,7 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/chat-prompt'
-import type { TextareaProps, TextareaSlots } from '../types'
+import type { TextareaProps, TextareaSlots } from './Textarea.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type ChatPrompt = ComponentConfig<typeof theme, AppConfig, 'chatPrompt'>
diff --git a/src/runtime/components/ChatPromptSubmit.vue b/src/runtime/components/ChatPromptSubmit.vue
index b74d1d24e..24be3f76d 100644
--- a/src/runtime/components/ChatPromptSubmit.vue
+++ b/src/runtime/components/ChatPromptSubmit.vue
@@ -2,7 +2,9 @@
 import type { ChatStatus } from 'ai'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/chat-prompt-submit'
-import type { ButtonProps, ButtonSlots, IconComponent, LinkPropsKeys } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { ButtonProps, ButtonSlots } from './Button.vue'
+import type { LinkPropsKeys } from './Link.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type ChatPromptSubmit = ComponentConfig<typeof theme, AppConfig, 'chatPromptSubmit'>
diff --git a/src/runtime/components/ChatReasoning.vue b/src/runtime/components/ChatReasoning.vue
index e1a062b21..42b400e60 100644
--- a/src/runtime/components/ChatReasoning.vue
+++ b/src/runtime/components/ChatReasoning.vue
@@ -3,7 +3,7 @@ import type { CollapsibleRootProps } from 'reka-ui'
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/chat-reasoning'
-import type { IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
 import type { ChatShimmerProps } from './ChatShimmer.vue'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/ChatTool.vue b/src/runtime/components/ChatTool.vue
index c4ebc7822..dae4c68ee 100644
--- a/src/runtime/components/ChatTool.vue
+++ b/src/runtime/components/ChatTool.vue
@@ -3,7 +3,7 @@ import type { CollapsibleRootProps } from 'reka-ui'
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/chat-tool'
-import type { IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
 import type { ChatShimmerProps } from './ChatShimmer.vue'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/CheckboxGroup.vue b/src/runtime/components/CheckboxGroup.vue
index c0a124f40..bce93b85f 100644
--- a/src/runtime/components/CheckboxGroup.vue
+++ b/src/runtime/components/CheckboxGroup.vue
@@ -3,7 +3,7 @@ import type { CheckboxGroupRootProps, CheckboxGroupRootEmits } from 'reka-ui'
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/checkbox-group'
-import type { CheckboxProps } from '../types'
+import type { CheckboxProps } from './Checkbox.vue'
 import type { AcceptableValue, GetItemKeys, GetModelValue, GetModelValueEmits } from '../types/utils'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/Chip.vue b/src/runtime/components/Chip.vue
index 47c4c9521..b09671bc5 100644
--- a/src/runtime/components/Chip.vue
+++ b/src/runtime/components/Chip.vue
@@ -2,7 +2,7 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/chip'
-import type { IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
 import type { ComponentConfig } from '../types/tv'
 
 type Chip = ComponentConfig<typeof theme, AppConfig, 'chip'>
diff --git a/src/runtime/components/CommandPalette.vue b/src/runtime/components/CommandPalette.vue
index f3b3de430..7c2444940 100644
--- a/src/runtime/components/CommandPalette.vue
+++ b/src/runtime/components/CommandPalette.vue
@@ -7,7 +7,13 @@ import type { AppConfig } from '@nuxt/schema'
 import type { UseFuseOptions } from '@vueuse/integrations/useFuse'
 import theme from '#build/b24ui/command-palette'
 import type { UseComponentIconsProps } from '../composables/useComponentIcons'
-import type { AvatarProps, ButtonProps, ChipProps, KbdProps, InputProps, LinkProps, IconComponent, LinkPropsKeys } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { ButtonProps } from './Button.vue'
+import type { ChipProps } from './Chip.vue'
+import type { InputProps } from './Input.vue'
+import type { KbdProps } from './Kbd.vue'
+import type { LinkProps, LinkPropsKeys } from './Link.vue'
 import type { GetItemKeys } from '../types/utils'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/ContextMenu.vue b/src/runtime/components/ContextMenu.vue
index 546806e88..6a3b5ec9e 100644
--- a/src/runtime/components/ContextMenu.vue
+++ b/src/runtime/components/ContextMenu.vue
@@ -4,7 +4,10 @@ import type { ContextMenuRootProps, ContextMenuRootEmits, ContextMenuContentProp
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/context-menu'
-import type { AvatarProps, IconComponent, KbdProps, LinkProps } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { KbdProps } from './Kbd.vue'
+import type { LinkProps } from './Link.vue'
 import type { ArrayOrNested, DynamicSlots, GetItemKeys, MergeTypes, NestedItem, EmitsToProps } from '../types/utils'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/ContextMenuContent.vue b/src/runtime/components/ContextMenuContent.vue
index 119fa3de2..953668560 100644
--- a/src/runtime/components/ContextMenuContent.vue
+++ b/src/runtime/components/ContextMenuContent.vue
@@ -2,7 +2,10 @@
 import type { ContextMenuContentProps as RekaContextMenuContentProps, ContextMenuContentEmits as RekaContextMenuContentEmits } from 'reka-ui'
 import type { AppConfig } from '@nuxt/schema'
 import type theme from '#build/b24ui/context-menu'
-import type { AvatarProps, ContextMenuItem, ContextMenuSlots, IconComponent, KbdProps } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { ContextMenuItem, ContextMenuSlots } from './ContextMenu.vue'
+import type { KbdProps } from './Kbd.vue'
 import type { ArrayOrNested, GetItemKeys } from '../types/utils'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/Countdown.vue b/src/runtime/components/Countdown.vue
index 130a835db..737223666 100644
--- a/src/runtime/components/Countdown.vue
+++ b/src/runtime/components/Countdown.vue
@@ -3,7 +3,7 @@ import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/countdown'
 import type { UseComponentIconsProps } from '../composables/useComponentIcons'
-import type { AvatarProps } from '../types'
+import type { AvatarProps } from './Avatar.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type Countdown = ComponentConfig<typeof theme, AppConfig, 'countdown'>
diff --git a/src/runtime/components/DashboardNavbar.vue b/src/runtime/components/DashboardNavbar.vue
index 6d3939df0..ce548baa4 100644
--- a/src/runtime/components/DashboardNavbar.vue
+++ b/src/runtime/components/DashboardNavbar.vue
@@ -3,7 +3,9 @@ import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/dashboard-navbar'
 import type { DashboardContext } from '../utils/dashboard'
-import type { ButtonProps, IconComponent, LinkPropsKeys } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { ButtonProps } from './Button.vue'
+import type { LinkPropsKeys } from './Link.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type DashboardNavbar = ComponentConfig<typeof theme, AppConfig, 'dashboardNavbar'>
diff --git a/src/runtime/components/DashboardSearch.vue b/src/runtime/components/DashboardSearch.vue
index a6bffa9fe..042cb0920 100644
--- a/src/runtime/components/DashboardSearch.vue
+++ b/src/runtime/components/DashboardSearch.vue
@@ -4,7 +4,11 @@ import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/dashboard-search'
 import type { UseFuseOptions } from '@vueuse/integrations/useFuse'
-import type { ButtonProps, ModalProps, CommandPaletteProps, CommandPaletteSlots, CommandPaletteGroup, CommandPaletteItem, LinkPropsKeys, InputProps } from '../types'
+import type { ButtonProps } from './Button.vue'
+import type { CommandPaletteGroup, CommandPaletteItem, CommandPaletteProps, CommandPaletteSlots } from './CommandPalette.vue'
+import type { InputProps } from './Input.vue'
+import type { LinkPropsKeys } from './Link.vue'
+import type { ModalProps } from './Modal.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type DashboardSearch = ComponentConfig<typeof theme, AppConfig, 'dashboardSearch'>
diff --git a/src/runtime/components/DashboardSearchButton.vue b/src/runtime/components/DashboardSearchButton.vue
index a1d861c41..cd5ebf34d 100644
--- a/src/runtime/components/DashboardSearchButton.vue
+++ b/src/runtime/components/DashboardSearchButton.vue
@@ -1,7 +1,11 @@
 <script lang="ts">
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/dashboard-search-button'
-import type { ButtonProps, ButtonSlots, IconComponent, KbdProps, TooltipProps, LinkPropsKeys } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { ButtonProps, ButtonSlots } from './Button.vue'
+import type { KbdProps } from './Kbd.vue'
+import type { LinkPropsKeys } from './Link.vue'
+import type { TooltipProps } from './Tooltip.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type DashboardSearchButton = ComponentConfig<typeof theme, AppConfig, 'dashboardSearchButton'>
diff --git a/src/runtime/components/DashboardSidebar.vue b/src/runtime/components/DashboardSidebar.vue
index 2d50dced7..c926df479 100644
--- a/src/runtime/components/DashboardSidebar.vue
+++ b/src/runtime/components/DashboardSidebar.vue
@@ -2,7 +2,11 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import type { UseResizableProps } from '../composables/useResizable'
-import type { ButtonProps, DrawerProps, ModalProps, SlideoverProps, LinkPropsKeys } from '../types'
+import type { ButtonProps } from './Button.vue'
+import type { DrawerProps } from './Drawer.vue'
+import type { LinkPropsKeys } from './Link.vue'
+import type { ModalProps } from './Modal.vue'
+import type { SlideoverProps } from './Slideover.vue'
 import type { ComponentConfig } from '../types/tv'
 import theme from '#build/b24ui/dashboard-sidebar'
 
diff --git a/src/runtime/components/DashboardSidebarCollapse.vue b/src/runtime/components/DashboardSidebarCollapse.vue
index d6ed223dd..b5bbfc082 100644
--- a/src/runtime/components/DashboardSidebarCollapse.vue
+++ b/src/runtime/components/DashboardSidebarCollapse.vue
@@ -1,7 +1,8 @@
 <script lang="ts">
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/dashboard-sidebar-collapse'
-import type { ButtonProps, LinkPropsKeys } from '../types'
+import type { ButtonProps } from './Button.vue'
+import type { LinkPropsKeys } from './Link.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type DashboardSidebarCollapse = ComponentConfig<typeof theme, AppConfig, 'dashboardSidebarCollapse'>
diff --git a/src/runtime/components/DashboardSidebarToggle.vue b/src/runtime/components/DashboardSidebarToggle.vue
index 66764c9f3..dd25f7d7a 100644
--- a/src/runtime/components/DashboardSidebarToggle.vue
+++ b/src/runtime/components/DashboardSidebarToggle.vue
@@ -1,7 +1,8 @@
 <script lang="ts">
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/dashboard-sidebar-toggle'
-import type { ButtonProps, LinkPropsKeys } from '../types'
+import type { ButtonProps } from './Button.vue'
+import type { LinkPropsKeys } from './Link.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type DashboardSidebarToggle = ComponentConfig<typeof theme, AppConfig, 'dashboardSidebarToggle'>
diff --git a/src/runtime/components/DescriptionList.vue b/src/runtime/components/DescriptionList.vue
index 0153b5982..c41f7d9b9 100644
--- a/src/runtime/components/DescriptionList.vue
+++ b/src/runtime/components/DescriptionList.vue
@@ -2,7 +2,9 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/description-list'
-import type { AvatarProps, ButtonProps, IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { ButtonProps } from './Button.vue'
 import type { DynamicSlots } from '../types/utils'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/DropdownMenu.vue b/src/runtime/components/DropdownMenu.vue
index cb1d6d290..2bbe37c4c 100644
--- a/src/runtime/components/DropdownMenu.vue
+++ b/src/runtime/components/DropdownMenu.vue
@@ -4,7 +4,11 @@ import type { DropdownMenuRootProps, DropdownMenuRootEmits, DropdownMenuContentP
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/dropdown-menu'
-import type { AvatarProps, InputProps, KbdProps, LinkProps, IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { InputProps } from './Input.vue'
+import type { KbdProps } from './Kbd.vue'
+import type { LinkProps } from './Link.vue'
 import type { ArrayOrNested, DynamicSlots, GetItemKeys, MergeTypes, NestedItem, EmitsToProps } from '../types/utils'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/DropdownMenuContent.vue b/src/runtime/components/DropdownMenuContent.vue
index 7cb2ba81d..636768097 100644
--- a/src/runtime/components/DropdownMenuContent.vue
+++ b/src/runtime/components/DropdownMenuContent.vue
@@ -4,7 +4,11 @@ import type { DropdownMenuContentProps as RekaDropdownMenuContentProps, Dropdown
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import type theme from '#build/b24ui/dropdown-menu'
-import type { KbdProps, AvatarProps, DropdownMenuItem, DropdownMenuSlots, IconComponent, InputProps } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { DropdownMenuItem, DropdownMenuSlots } from './DropdownMenu.vue'
+import type { InputProps } from './Input.vue'
+import type { KbdProps } from './Kbd.vue'
 import type { ArrayOrNested, GetItemKeys, NestedItem, DynamicSlots, MergeTypes } from '../types/utils'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/EditorDragHandle.vue b/src/runtime/components/EditorDragHandle.vue
index 049065574..0b4e9917c 100644
--- a/src/runtime/components/EditorDragHandle.vue
+++ b/src/runtime/components/EditorDragHandle.vue
@@ -5,7 +5,9 @@ import type { Placement, Strategy } from '@floating-ui/dom'
 import type { Editor, JSONContent } from '@tiptap/vue-3'
 import type { DragHandleProps } from '@tiptap/extension-drag-handle-vue-3'
 import theme from '#build/b24ui/editor-drag-handle'
-import type { ButtonProps, IconComponent, LinkPropsKeys } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { ButtonProps } from './Button.vue'
+import type { LinkPropsKeys } from './Link.vue'
 import type { FloatingUIOptions } from '../types/editor'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/EditorMentionMenu.vue b/src/runtime/components/EditorMentionMenu.vue
index ebf8f5462..eac11eafc 100644
--- a/src/runtime/components/EditorMentionMenu.vue
+++ b/src/runtime/components/EditorMentionMenu.vue
@@ -2,7 +2,8 @@
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/editor-mention-menu'
 import type { EditorMenuOptions } from '../composables/useEditorMenu'
-import type { AvatarProps, IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type EditorMentionMenu = ComponentConfig<typeof theme, AppConfig, 'editorMentionMenu'>
diff --git a/src/runtime/components/EditorSuggestionMenu.vue b/src/runtime/components/EditorSuggestionMenu.vue
index 975cce9bc..5688b5254 100644
--- a/src/runtime/components/EditorSuggestionMenu.vue
+++ b/src/runtime/components/EditorSuggestionMenu.vue
@@ -2,7 +2,7 @@
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/editor-suggestion-menu'
 import type { EditorMenuOptions } from '../composables/useEditorMenu'
-import type { IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
 import type { EditorItem, EditorCustomHandlers } from '../types/editor'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/EditorToolbar.vue b/src/runtime/components/EditorToolbar.vue
index 7f2efc2f9..942589baf 100644
--- a/src/runtime/components/EditorToolbar.vue
+++ b/src/runtime/components/EditorToolbar.vue
@@ -6,7 +6,10 @@ import type { Editor } from '@tiptap/vue-3'
 import type { BubbleMenuPluginProps } from '@tiptap/extension-bubble-menu'
 import type { FloatingMenuPluginProps } from '@tiptap/extension-floating-menu'
 import theme from '#build/b24ui/editor-toolbar'
-import type { ButtonProps, DropdownMenuProps, DropdownMenuItem, TooltipProps, LinkPropsKeys } from '../types'
+import type { ButtonProps } from './Button.vue'
+import type { DropdownMenuItem, DropdownMenuProps } from './DropdownMenu.vue'
+import type { LinkPropsKeys } from './Link.vue'
+import type { TooltipProps } from './Tooltip.vue'
 import type { EditorItem, EditorCustomHandlers } from '../types/editor'
 import type { ArrayOrNested, DynamicSlots, MergeTypes, NestedItem } from '../types/utils'
 import type { ComponentConfig } from '../types/tv'
diff --git a/src/runtime/components/Empty.vue b/src/runtime/components/Empty.vue
index 2cbf7015a..d2a78e972 100644
--- a/src/runtime/components/Empty.vue
+++ b/src/runtime/components/Empty.vue
@@ -3,7 +3,8 @@ import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/empty'
 import type { ComponentConfig } from '../types/tv'
-import type { ButtonProps, IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { ButtonProps } from './Button.vue'
 
 type Empty = ComponentConfig<typeof theme, AppConfig, 'empty'>
 
diff --git a/src/runtime/components/Error.vue b/src/runtime/components/Error.vue
index 565611eae..dd3f4bf5f 100644
--- a/src/runtime/components/Error.vue
+++ b/src/runtime/components/Error.vue
@@ -3,7 +3,9 @@ import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import type { NuxtError } from '#app'
 import theme from '#build/b24ui/error'
-import type { AvatarProps, ButtonProps, IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { ButtonProps } from './Button.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type Error = ComponentConfig<typeof theme, AppConfig, 'error'>
diff --git a/src/runtime/components/FileUpload.vue b/src/runtime/components/FileUpload.vue
index 407c9331c..57cf67ec9 100644
--- a/src/runtime/components/FileUpload.vue
+++ b/src/runtime/components/FileUpload.vue
@@ -3,7 +3,9 @@ import type { VNode, MaybeRef } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import type { UseFileDialogReturn } from '@vueuse/core'
 import theme from '#build/b24ui/file-upload'
-import type { ButtonProps, IconComponent, LinkPropsKeys } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { ButtonProps } from './Button.vue'
+import type { LinkPropsKeys } from './Link.vue'
 import type { InputHTMLAttributes } from '../types/html'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/FooterColumns.vue b/src/runtime/components/FooterColumns.vue
index 21f824cd4..e01a9c0d2 100644
--- a/src/runtime/components/FooterColumns.vue
+++ b/src/runtime/components/FooterColumns.vue
@@ -2,7 +2,8 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/footer-columns'
-import type { IconComponent, LinkProps } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { LinkProps } from './Link.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type FooterColumns = ComponentConfig<typeof theme, AppConfig, 'footerColumns'>
diff --git a/src/runtime/components/Header.vue b/src/runtime/components/Header.vue
index 2adcaeefa..aec12cf9e 100644
--- a/src/runtime/components/Header.vue
+++ b/src/runtime/components/Header.vue
@@ -1,7 +1,11 @@
 <script lang="ts">
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
-import type { ButtonProps, DrawerProps, ModalProps, SlideoverProps, LinkPropsKeys } from '../types'
+import type { ButtonProps } from './Button.vue'
+import type { DrawerProps } from './Drawer.vue'
+import type { LinkPropsKeys } from './Link.vue'
+import type { ModalProps } from './Modal.vue'
+import type { SlideoverProps } from './Slideover.vue'
 import type { ComponentConfig } from '../types/tv'
 import theme from '#build/b24ui/header'
 
diff --git a/src/runtime/components/Input.vue b/src/runtime/components/Input.vue
index 38114820c..668185716 100644
--- a/src/runtime/components/Input.vue
+++ b/src/runtime/components/Input.vue
@@ -3,7 +3,8 @@ import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/input'
 import type { UseComponentIconsProps } from '../composables/useComponentIcons'
-import type { AvatarProps, BadgeProps } from '../types'
+import type { AvatarProps } from './Avatar.vue'
+import type { BadgeProps } from './Badge.vue'
 import type { InputHTMLAttributes } from '../types/html'
 import type { ModelModifiers, ApplyModifiers } from '../types/input'
 import type { AcceptableValue } from '../types/utils'
diff --git a/src/runtime/components/InputDate.vue b/src/runtime/components/InputDate.vue
index 0c40bcd1c..0038854ed 100644
--- a/src/runtime/components/InputDate.vue
+++ b/src/runtime/components/InputDate.vue
@@ -3,7 +3,9 @@ import type { ComponentPublicInstance, VNode } from 'vue'
 import type { DateFieldRootProps, DateFieldRootEmits, DateRangeFieldRootProps, DateRangeFieldRootEmits, DateValue, SegmentPart } from 'reka-ui'
 import type { AppConfig } from '@nuxt/schema'
 import type { UseComponentIconsProps } from '../composables/useComponentIcons'
-import type { AvatarProps, BadgeProps, IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { BadgeProps } from './Badge.vue'
 import type { ComponentConfig } from '../types/tv'
 import theme from '#build/b24ui/input-date'
 
diff --git a/src/runtime/components/InputMenu.vue b/src/runtime/components/InputMenu.vue
index 7dfa5c766..c023e9c6e 100644
--- a/src/runtime/components/InputMenu.vue
+++ b/src/runtime/components/InputMenu.vue
@@ -4,7 +4,13 @@ import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/input-menu'
 import type { UseComponentIconsProps } from '../composables/useComponentIcons'
-import type { AvatarProps, ButtonProps, ChipProps, InputProps, LinkPropsKeys, BadgeProps, IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { BadgeProps } from './Badge.vue'
+import type { ButtonProps } from './Button.vue'
+import type { ChipProps } from './Chip.vue'
+import type { InputProps } from './Input.vue'
+import type { LinkPropsKeys } from './Link.vue'
 import type { ModelModifiers, ApplyModifiers } from '../types/input'
 import type { InputHTMLAttributes } from '../types/html'
 import type { AcceptableValue, ArrayOrNested, GetItemKeys, GetItemValue, GetModelValue, NestedItem, EmitsToProps } from '../types/utils'
diff --git a/src/runtime/components/InputNumber.vue b/src/runtime/components/InputNumber.vue
index 71305763e..2f9a92b7a 100644
--- a/src/runtime/components/InputNumber.vue
+++ b/src/runtime/components/InputNumber.vue
@@ -3,7 +3,10 @@ import type { NumberFieldRootProps } from 'reka-ui'
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/input-number'
-import type { ButtonProps, BadgeProps, IconComponent, LinkPropsKeys } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { BadgeProps } from './Badge.vue'
+import type { ButtonProps } from './Button.vue'
+import type { LinkPropsKeys } from './Link.vue'
 import type { InputHTMLAttributes } from '../types/html'
 import type { ModelModifiers } from '../types/input'
 import type { ComponentConfig } from '../types/tv'
diff --git a/src/runtime/components/InputTags.vue b/src/runtime/components/InputTags.vue
index d86ec9f0f..3227e2ad1 100644
--- a/src/runtime/components/InputTags.vue
+++ b/src/runtime/components/InputTags.vue
@@ -4,7 +4,9 @@ import type { AppConfig } from '@nuxt/schema'
 import type { TagsInputRootProps, TagsInputRootEmits, AcceptableInputValue } from 'reka-ui'
 import theme from '#build/b24ui/input-tags'
 import type { UseComponentIconsProps } from '../composables/useComponentIcons'
-import type { AvatarProps, BadgeProps, IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { BadgeProps } from './Badge.vue'
 import type { InputHTMLAttributes } from '../types/html'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/InputTime.vue b/src/runtime/components/InputTime.vue
index 02fcd48b4..a3fad86ae 100644
--- a/src/runtime/components/InputTime.vue
+++ b/src/runtime/components/InputTime.vue
@@ -4,7 +4,9 @@ import type { TimeFieldRootEmits, TimeFieldRootProps, TimeRangeFieldRootEmits, T
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/input-time'
 import type { UseComponentIconsProps } from '../composables/useComponentIcons'
-import type { AvatarProps, BadgeProps, IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { BadgeProps } from './Badge.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type InputTime = ComponentConfig<typeof theme, AppConfig, 'inputTime'>
diff --git a/src/runtime/components/LinkBase.vue b/src/runtime/components/LinkBase.vue
index da6a9dcf8..aa55da92b 100644
--- a/src/runtime/components/LinkBase.vue
+++ b/src/runtime/components/LinkBase.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import type { LinkProps } from '../types'
+import type { LinkProps } from './Link.vue'
 
 export interface LinkBaseProps {
   as?: string
diff --git a/src/runtime/components/Modal.vue b/src/runtime/components/Modal.vue
index 9d0f03b8f..359ce3d35 100644
--- a/src/runtime/components/Modal.vue
+++ b/src/runtime/components/Modal.vue
@@ -3,7 +3,9 @@ import type { DialogRootProps, DialogRootEmits, DialogContentProps, DialogConten
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/modal'
-import type { ButtonProps, IconComponent, LinkPropsKeys } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { ButtonProps } from './Button.vue'
+import type { LinkPropsKeys } from './Link.vue'
 import type { EmitsToProps } from '../types/utils'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/NavigationMenu.vue b/src/runtime/components/NavigationMenu.vue
index eb56304c6..b2950b327 100644
--- a/src/runtime/components/NavigationMenu.vue
+++ b/src/runtime/components/NavigationMenu.vue
@@ -4,7 +4,13 @@ import type { NavigationMenuRootProps, NavigationMenuContentProps, NavigationMen
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/navigation-menu'
-import type { AvatarProps, BadgeProps, ChipProps, IconComponent, LinkProps, PopoverProps, TooltipProps } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { BadgeProps } from './Badge.vue'
+import type { ChipProps } from './Chip.vue'
+import type { LinkProps } from './Link.vue'
+import type { PopoverProps } from './Popover.vue'
+import type { TooltipProps } from './Tooltip.vue'
 import type { ArrayOrNested, DynamicSlots, GetItemKeys, MergeTypes, NestedItem, EmitsToProps } from '../types/utils'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/PageCard.vue b/src/runtime/components/PageCard.vue
index 8fa8a979b..4ec2b328b 100644
--- a/src/runtime/components/PageCard.vue
+++ b/src/runtime/components/PageCard.vue
@@ -2,7 +2,9 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/page-card'
-import type { IconComponent, LinkProps, AvatarProps } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { LinkProps } from './Link.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type PageCard = ComponentConfig<typeof theme, AppConfig, 'pageCard'>
diff --git a/src/runtime/components/PageCardGroup.vue b/src/runtime/components/PageCardGroup.vue
index a8c27992a..64e0ac312 100644
--- a/src/runtime/components/PageCardGroup.vue
+++ b/src/runtime/components/PageCardGroup.vue
@@ -2,7 +2,10 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/page-card-group'
-import type { IconComponent, AvatarProps, BadgeProps, PageCardProps } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { BadgeProps } from './Badge.vue'
+import type { PageCardProps } from './PageCard.vue'
 import type { AcceptableValue } from '../types/utils'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/PageFeature.vue b/src/runtime/components/PageFeature.vue
index 9e296edee..9137b4246 100644
--- a/src/runtime/components/PageFeature.vue
+++ b/src/runtime/components/PageFeature.vue
@@ -2,7 +2,8 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/page-feature'
-import type { IconComponent, LinkProps } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { LinkProps } from './Link.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type PageFeature = ComponentConfig<typeof theme, AppConfig, 'pageFeature'>
diff --git a/src/runtime/components/PageHeader.vue b/src/runtime/components/PageHeader.vue
index 2dfa04a44..0704a009b 100644
--- a/src/runtime/components/PageHeader.vue
+++ b/src/runtime/components/PageHeader.vue
@@ -2,7 +2,7 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/page-header'
-import type { ButtonProps } from '../types'
+import type { ButtonProps } from './Button.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type PageHeader = ComponentConfig<typeof theme, AppConfig, 'pageHeader'>
diff --git a/src/runtime/components/PageLinks.vue b/src/runtime/components/PageLinks.vue
index 58badda88..5f06fbe7f 100644
--- a/src/runtime/components/PageLinks.vue
+++ b/src/runtime/components/PageLinks.vue
@@ -2,7 +2,8 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/page-links'
-import type { IconComponent, LinkProps } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { LinkProps } from './Link.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type PageLinks = ComponentConfig<typeof theme, AppConfig, 'pageLinks'>
diff --git a/src/runtime/components/PageSection.vue b/src/runtime/components/PageSection.vue
index b60d5cfbe..386983d39 100644
--- a/src/runtime/components/PageSection.vue
+++ b/src/runtime/components/PageSection.vue
@@ -2,7 +2,9 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/page-section'
-import type { ButtonProps, IconComponent, PageFeatureProps } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { ButtonProps } from './Button.vue'
+import type { PageFeatureProps } from './PageFeature.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type PageSection = ComponentConfig<typeof theme, AppConfig, 'pageSection'>
diff --git a/src/runtime/components/Pagination.vue b/src/runtime/components/Pagination.vue
index c1665afce..5bd9bfbd6 100644
--- a/src/runtime/components/Pagination.vue
+++ b/src/runtime/components/Pagination.vue
@@ -3,7 +3,8 @@ import type { PaginationRootProps, PaginationRootEmits } from 'reka-ui'
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/pagination'
-import type { ButtonProps, IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { ButtonProps } from './Button.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type Pagination = ComponentConfig<typeof theme, AppConfig, 'pagination'>
diff --git a/src/runtime/components/Range.vue b/src/runtime/components/Range.vue
index 16811815b..7409c25ce 100644
--- a/src/runtime/components/Range.vue
+++ b/src/runtime/components/Range.vue
@@ -2,7 +2,7 @@
 import type { SliderRootProps } from 'reka-ui'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/range'
-import type { TooltipProps } from '../types'
+import type { TooltipProps } from './Tooltip.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type Range = ComponentConfig<typeof theme, AppConfig, 'range'>
diff --git a/src/runtime/components/Select.vue b/src/runtime/components/Select.vue
index 57a27f6b5..faaec5467 100644
--- a/src/runtime/components/Select.vue
+++ b/src/runtime/components/Select.vue
@@ -4,7 +4,11 @@ import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/select'
 import type { UseComponentIconsProps } from '../composables/useComponentIcons'
-import type { AvatarProps, ChipProps, InputProps, BadgeProps, IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { BadgeProps } from './Badge.vue'
+import type { ChipProps } from './Chip.vue'
+import type { InputProps } from './Input.vue'
 import type { ModelModifiers, ApplyModifiers } from '../types/input'
 import type { ButtonHTMLAttributes } from '../types/html'
 import type { AcceptableValue, ArrayOrNested, GetItemKeys, GetModelValue, NestedItem, EmitsToProps } from '../types/utils'
diff --git a/src/runtime/components/SelectMenu.vue b/src/runtime/components/SelectMenu.vue
index 6825a1d5e..c89f9eab6 100644
--- a/src/runtime/components/SelectMenu.vue
+++ b/src/runtime/components/SelectMenu.vue
@@ -4,7 +4,13 @@ import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/select-menu'
 import type { UseComponentIconsProps } from '../composables/useComponentIcons'
-import type { AvatarProps, ButtonProps, ChipProps, InputProps, LinkPropsKeys, BadgeProps, IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { BadgeProps } from './Badge.vue'
+import type { ButtonProps } from './Button.vue'
+import type { ChipProps } from './Chip.vue'
+import type { InputProps } from './Input.vue'
+import type { LinkPropsKeys } from './Link.vue'
 import type { ModelModifiers, ApplyModifiers } from '../types/input'
 import type { ButtonHTMLAttributes } from '../types/html'
 import type { AcceptableValue, ArrayOrNested, GetItemKeys, GetItemValue, GetModelValue, NestedItem, EmitsToProps } from '../types/utils'
diff --git a/src/runtime/components/Separator.vue b/src/runtime/components/Separator.vue
index 0ea6b7650..27d744c9c 100644
--- a/src/runtime/components/Separator.vue
+++ b/src/runtime/components/Separator.vue
@@ -3,7 +3,8 @@ import type { SeparatorProps as _SeparatorProps } from 'reka-ui'
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/separator'
-import type { AvatarProps, IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type Separator = ComponentConfig<typeof theme, AppConfig, 'separator'>
diff --git a/src/runtime/components/Sidebar.vue b/src/runtime/components/Sidebar.vue
index 49969bc8d..de21ea740 100644
--- a/src/runtime/components/Sidebar.vue
+++ b/src/runtime/components/Sidebar.vue
@@ -2,7 +2,12 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/sidebar'
-import type { ButtonProps, DrawerProps, IconComponent, ModalProps, SlideoverProps, LinkPropsKeys } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { ButtonProps } from './Button.vue'
+import type { DrawerProps } from './Drawer.vue'
+import type { LinkPropsKeys } from './Link.vue'
+import type { ModalProps } from './Modal.vue'
+import type { SlideoverProps } from './Slideover.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type Sidebar = ComponentConfig<typeof theme, AppConfig, 'sidebar'>
diff --git a/src/runtime/components/Slideover.vue b/src/runtime/components/Slideover.vue
index c5e8cf9af..3226b5af5 100644
--- a/src/runtime/components/Slideover.vue
+++ b/src/runtime/components/Slideover.vue
@@ -3,7 +3,9 @@ import type { DialogRootProps, DialogRootEmits, DialogContentProps, DialogConten
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/slideover'
-import type { ButtonProps, IconComponent, LinkPropsKeys } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { ButtonProps } from './Button.vue'
+import type { LinkPropsKeys } from './Link.vue'
 import type { EmitsToProps } from '../types/utils'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/Stepper.vue b/src/runtime/components/Stepper.vue
index 62ffdbb4f..8ee157f48 100644
--- a/src/runtime/components/Stepper.vue
+++ b/src/runtime/components/Stepper.vue
@@ -4,7 +4,7 @@ import type { StepperRootProps, StepperRootEmits } from 'reka-ui'
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/stepper'
-import type { IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
 import type { DynamicSlots, GetItemKeys } from '../types/utils'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/Switch.vue b/src/runtime/components/Switch.vue
index 9532e007f..6d0af45bf 100644
--- a/src/runtime/components/Switch.vue
+++ b/src/runtime/components/Switch.vue
@@ -3,7 +3,7 @@ import type { SwitchRootProps, SwitchRootEmits } from 'reka-ui'
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/switch'
-import type { IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
 import type { ButtonHTMLAttributes } from '../types/html'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/Tabs.vue b/src/runtime/components/Tabs.vue
index d87864402..5e1d7fd2d 100644
--- a/src/runtime/components/Tabs.vue
+++ b/src/runtime/components/Tabs.vue
@@ -4,7 +4,9 @@ import type { ComponentPublicInstance, VNode } from 'vue'
 import type { TabsRootProps, TabsRootEmits } from 'reka-ui'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/tabs'
-import type { AvatarProps, BadgeProps, IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { BadgeProps } from './Badge.vue'
 import type { DynamicSlots, GetItemKeys } from '../types/utils'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/Textarea.vue b/src/runtime/components/Textarea.vue
index e259d9b16..982ffafb6 100644
--- a/src/runtime/components/Textarea.vue
+++ b/src/runtime/components/Textarea.vue
@@ -3,7 +3,8 @@ import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/textarea'
 import type { UseComponentIconsProps } from '../composables/useComponentIcons'
-import type { AvatarProps, BadgeProps } from '../types'
+import type { AvatarProps } from './Avatar.vue'
+import type { BadgeProps } from './Badge.vue'
 import type { TextareaHTMLAttributes } from '../types/html'
 import type { ModelModifiers, ApplyModifiers } from '../types/input'
 import type { ComponentConfig } from '../types/tv'
diff --git a/src/runtime/components/Timeline.vue b/src/runtime/components/Timeline.vue
index 3db9f5beb..fd9ed6af6 100644
--- a/src/runtime/components/Timeline.vue
+++ b/src/runtime/components/Timeline.vue
@@ -3,7 +3,8 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/timeline'
-import type { AvatarProps, IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
 import type { DynamicSlots, GetItemKeys } from '../types/utils'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/Toast.vue b/src/runtime/components/Toast.vue
index 687fc330c..e7527fdc5 100644
--- a/src/runtime/components/Toast.vue
+++ b/src/runtime/components/Toast.vue
@@ -3,7 +3,11 @@ import type { ToastRootProps, ToastRootEmits } from 'reka-ui'
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/toast'
-import type { AvatarProps, ButtonProps, ProgressProps, IconComponent, LinkPropsKeys } from '../types'
+import type { IconComponent } from '../types/icons'
+import type { AvatarProps } from './Avatar.vue'
+import type { ButtonProps } from './Button.vue'
+import type { LinkPropsKeys } from './Link.vue'
+import type { ProgressProps } from './Progress.vue'
 import type { StringOrVNode } from '../types/utils'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/Tooltip.vue b/src/runtime/components/Tooltip.vue
index ab6e47581..bda329828 100644
--- a/src/runtime/components/Tooltip.vue
+++ b/src/runtime/components/Tooltip.vue
@@ -3,7 +3,7 @@ import type { TooltipRootProps, TooltipRootEmits, TooltipContentProps, TooltipCo
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/tooltip'
-import type { KbdProps } from '../types'
+import type { KbdProps } from './Kbd.vue'
 import type { EmitsToProps } from '../types/utils'
 import type { ComponentConfig } from '../types/tv'
 
diff --git a/src/runtime/components/User.vue b/src/runtime/components/User.vue
index 6600cc125..c236c302f 100644
--- a/src/runtime/components/User.vue
+++ b/src/runtime/components/User.vue
@@ -2,7 +2,9 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/user'
-import type { AvatarProps, ChipProps, LinkProps } from '../types'
+import type { AvatarProps } from './Avatar.vue'
+import type { ChipProps } from './Chip.vue'
+import type { LinkProps } from './Link.vue'
 import type { ComponentConfig } from '../types/tv'
 
 type User = ComponentConfig<typeof theme, AppConfig, 'user'>
diff --git a/src/runtime/components/color-mode/ColorModeAvatar.vue b/src/runtime/components/color-mode/ColorModeAvatar.vue
index 3e0407dfd..9d96c77e9 100644
--- a/src/runtime/components/color-mode/ColorModeAvatar.vue
+++ b/src/runtime/components/color-mode/ColorModeAvatar.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import type { AvatarProps } from '../../types'
+import type { AvatarProps } from '../Avatar.vue'
 
 export interface ColorModeAvatarProps extends Omit<AvatarProps, 'src'> {
   light: string
diff --git a/src/runtime/components/color-mode/ColorModeButton.vue b/src/runtime/components/color-mode/ColorModeButton.vue
index fdf19ab5d..96ff5d91f 100644
--- a/src/runtime/components/color-mode/ColorModeButton.vue
+++ b/src/runtime/components/color-mode/ColorModeButton.vue
@@ -1,5 +1,6 @@
 <script lang="ts">
-import type { ButtonProps, LinkPropsKeys } from '../../types'
+import type { ButtonProps } from '../Button.vue'
+import type { LinkPropsKeys } from '../Link.vue'
 
 export interface ColorModeButtonProps extends Omit<ButtonProps, LinkPropsKeys | 'color'> {
   /**
diff --git a/src/runtime/components/color-mode/ColorModeSelect.vue b/src/runtime/components/color-mode/ColorModeSelect.vue
index 4e4bb474e..2421eb0fa 100644
--- a/src/runtime/components/color-mode/ColorModeSelect.vue
+++ b/src/runtime/components/color-mode/ColorModeSelect.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import type { SelectMenuProps, SelectMenuItem } from '../../types'
+import type { SelectMenuItem, SelectMenuProps } from '../SelectMenu.vue'
 
 export interface ColorModeSelectProps extends Omit<SelectMenuProps<SelectMenuItem[]>, 'icon' | 'items' | 'modelValue'> {
 }
diff --git a/src/runtime/components/color-mode/ColorModeSwitch.vue b/src/runtime/components/color-mode/ColorModeSwitch.vue
index 2199d60ff..4173ca697 100644
--- a/src/runtime/components/color-mode/ColorModeSwitch.vue
+++ b/src/runtime/components/color-mode/ColorModeSwitch.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import type { SwitchProps } from '../../types'
+import type { SwitchProps } from '../Switch.vue'
 
 export interface ColorModeSwitchProps extends Omit<SwitchProps, 'checkedIcon' | 'uncheckedIcon' | 'modelValue'> {
 }
diff --git a/src/runtime/components/content/ContentSearch.vue b/src/runtime/components/content/ContentSearch.vue
index f2c48a30c..840cfaacf 100644
--- a/src/runtime/components/content/ContentSearch.vue
+++ b/src/runtime/components/content/ContentSearch.vue
@@ -5,7 +5,12 @@ import type { ContentNavigationItem } from '@nuxt/content'
 import type { AppConfig } from '@nuxt/schema'
 import type { UseFuseOptions } from '@vueuse/integrations/useFuse'
 import theme from '#build/b24ui/content/content-search'
-import type { ButtonProps, LinkProps, ModalProps, CommandPaletteProps, CommandPaletteSlots, CommandPaletteGroup, CommandPaletteItem, IconComponent, LinkPropsKeys, InputProps } from '../../types'
+import type { IconComponent } from '../../types/icons'
+import type { ButtonProps } from '../Button.vue'
+import type { CommandPaletteGroup, CommandPaletteItem, CommandPaletteProps, CommandPaletteSlots } from '../CommandPalette.vue'
+import type { InputProps } from '../Input.vue'
+import type { LinkProps, LinkPropsKeys } from '../Link.vue'
+import type { ModalProps } from '../Modal.vue'
 import type { ComponentConfig } from '../../types/tv'
 
 type ContentSearch = ComponentConfig<typeof theme, AppConfig, 'contentSearch'>
diff --git a/src/runtime/components/content/ContentSearchButton.vue b/src/runtime/components/content/ContentSearchButton.vue
index f651fb373..a01e4699a 100644
--- a/src/runtime/components/content/ContentSearchButton.vue
+++ b/src/runtime/components/content/ContentSearchButton.vue
@@ -1,7 +1,11 @@
 <script lang="ts">
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/content/content-search-button'
-import type { ButtonProps, ButtonSlots, IconComponent, KbdProps, TooltipProps, LinkPropsKeys } from '../../types'
+import type { IconComponent } from '../../types/icons'
+import type { ButtonProps, ButtonSlots } from '../Button.vue'
+import type { KbdProps } from '../Kbd.vue'
+import type { LinkPropsKeys } from '../Link.vue'
+import type { TooltipProps } from '../Tooltip.vue'
 import type { ComponentConfig } from '../../types/tv'
 
 type ContentSearchButton = ComponentConfig<typeof theme, AppConfig, 'contentSearchButton'>
diff --git a/src/runtime/components/content/ContentSurround.vue b/src/runtime/components/content/ContentSurround.vue
index a6da468b2..37f1442c7 100644
--- a/src/runtime/components/content/ContentSurround.vue
+++ b/src/runtime/components/content/ContentSurround.vue
@@ -3,7 +3,7 @@ import type { PropType, VNode } from 'vue'
 import type { ContentNavigationItem } from '@nuxt/content'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/content/content-surround'
-import type { IconComponent } from '../../types'
+import type { IconComponent } from '../../types/icons'
 import type { ComponentConfig } from '../../types/tv'
 
 type ContentSurround = ComponentConfig<typeof theme, AppConfig, 'contentSurround'>
diff --git a/src/runtime/components/content/ContentToc.vue b/src/runtime/components/content/ContentToc.vue
index f54fa9e42..0c5832621 100644
--- a/src/runtime/components/content/ContentToc.vue
+++ b/src/runtime/components/content/ContentToc.vue
@@ -4,7 +4,7 @@ import type { VNode } from 'vue'
 import type { TocLink } from '@nuxt/content'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/content/content-toc'
-import type { IconComponent } from '../../types'
+import type { IconComponent } from '../../types/icons'
 import type { ComponentConfig } from '../../types/tv'
 
 type ContentToc = ComponentConfig<typeof theme, AppConfig, 'contentToc'>
diff --git a/src/runtime/components/prose/Accordion.vue b/src/runtime/components/prose/Accordion.vue
index 6721f3416..380521740 100644
--- a/src/runtime/components/prose/Accordion.vue
+++ b/src/runtime/components/prose/Accordion.vue
@@ -2,7 +2,8 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/prose/accordion'
-import type { AccordionProps, IconComponent } from '../../types'
+import type { IconComponent } from '../../types/icons'
+import type { AccordionProps } from '../Accordion.vue'
 import type { ComponentConfig } from '../../types/tv'
 
 type ProseAccordion = ComponentConfig<typeof theme, AppConfig, 'accordion', 'b24ui.prose'>
diff --git a/src/runtime/components/prose/Callout.vue b/src/runtime/components/prose/Callout.vue
index 26812b374..eb9ac40fe 100644
--- a/src/runtime/components/prose/Callout.vue
+++ b/src/runtime/components/prose/Callout.vue
@@ -1,7 +1,8 @@
 <script lang="ts">
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
-import type { IconComponent, LinkProps } from '../../types'
+import type { IconComponent } from '../../types/icons'
+import type { LinkProps } from '../Link.vue'
 import type { ComponentConfig } from '../../types/tv'
 import theme from '#build/b24ui/prose/callout'
 
diff --git a/src/runtime/components/prose/Card.vue b/src/runtime/components/prose/Card.vue
index 8163a48e4..2fced7a53 100644
--- a/src/runtime/components/prose/Card.vue
+++ b/src/runtime/components/prose/Card.vue
@@ -1,7 +1,8 @@
 <script lang="ts">
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
-import type { IconComponent, LinkProps } from '../../types'
+import type { IconComponent } from '../../types/icons'
+import type { LinkProps } from '../Link.vue'
 import type { ComponentConfig } from '../../types/tv'
 import theme from '#build/b24ui/prose/card'
 
diff --git a/src/runtime/components/prose/CodeCollapse.vue b/src/runtime/components/prose/CodeCollapse.vue
index 836ec78eb..d3eedbaac 100644
--- a/src/runtime/components/prose/CodeCollapse.vue
+++ b/src/runtime/components/prose/CodeCollapse.vue
@@ -2,7 +2,7 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/prose/code-collapse'
-import type { IconComponent } from '../../types'
+import type { IconComponent } from '../../types/icons'
 import type { ComponentConfig } from '../../types/tv'
 
 type ProseCodeCollapse = ComponentConfig<typeof theme, AppConfig, 'codeCollapse', 'b24ui.prose'>
diff --git a/src/runtime/components/prose/CodeGroup.vue b/src/runtime/components/prose/CodeGroup.vue
index 8c751f743..360177efc 100644
--- a/src/runtime/components/prose/CodeGroup.vue
+++ b/src/runtime/components/prose/CodeGroup.vue
@@ -2,7 +2,7 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import type { ComponentConfig } from '../../types/tv'
-import type { IconComponent } from '../../types'
+import type { IconComponent } from '../../types/icons'
 import theme from '#build/b24ui/prose/code-group'
 
 type ProseCodeGroup = ComponentConfig<typeof theme, AppConfig, 'codeGroup', 'b24ui.prose'>
diff --git a/src/runtime/components/prose/CodeIcon.vue b/src/runtime/components/prose/CodeIcon.vue
index ca82a606d..82ab9fba6 100644
--- a/src/runtime/components/prose/CodeIcon.vue
+++ b/src/runtime/components/prose/CodeIcon.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/prose/code-icon'
-import type { IconComponent } from '../../types'
+import type { IconComponent } from '../../types/icons'
 import type { ComponentConfig } from '../../types/tv'
 
 type ProseCodeIcon = ComponentConfig<typeof theme, AppConfig, 'codeIcon', 'b24ui.prose'>
diff --git a/src/runtime/components/prose/Collapsible.vue b/src/runtime/components/prose/Collapsible.vue
index 00d5fee29..d325f7e45 100644
--- a/src/runtime/components/prose/Collapsible.vue
+++ b/src/runtime/components/prose/Collapsible.vue
@@ -2,7 +2,8 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/prose/collapsible'
-import type { IconComponent, CollapsibleProps } from '../../types'
+import type { IconComponent } from '../../types/icons'
+import type { CollapsibleProps } from '../Collapsible.vue'
 import type { ComponentConfig } from '../../types/tv'
 
 type ProseCollapsible = ComponentConfig<typeof theme, AppConfig, 'collapsible', 'b24ui.prose'>
diff --git a/src/runtime/components/prose/Pre.vue b/src/runtime/components/prose/Pre.vue
index fc142ddc8..05a5b66b1 100644
--- a/src/runtime/components/prose/Pre.vue
+++ b/src/runtime/components/prose/Pre.vue
@@ -2,7 +2,7 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/prose/pre'
-import type { IconComponent } from '../../types'
+import type { IconComponent } from '../../types/icons'
 import type { ComponentConfig } from '../../types/tv'
 
 type ProsePre = ComponentConfig<typeof theme, AppConfig, 'pre', 'b24ui.prose'>
diff --git a/src/runtime/components/prose/Prompt.vue b/src/runtime/components/prose/Prompt.vue
index df05c3c91..cc5c0cebd 100644
--- a/src/runtime/components/prose/Prompt.vue
+++ b/src/runtime/components/prose/Prompt.vue
@@ -2,7 +2,7 @@
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
 import theme from '#build/b24ui/prose/prompt'
-import type { IconComponent } from '../../types'
+import type { IconComponent } from '../../types/icons'
 import type { ComponentConfig } from '../../types/tv'
 
 type ProsePrompt = ComponentConfig<typeof theme, AppConfig, 'prompt', 'b24ui.prose'>
diff --git a/src/runtime/components/prose/Tabs.vue b/src/runtime/components/prose/Tabs.vue
index 8fdfa35db..1f4eceda9 100644
--- a/src/runtime/components/prose/Tabs.vue
+++ b/src/runtime/components/prose/Tabs.vue
@@ -1,9 +1,8 @@
 <script lang="ts">
 import type { VNode } from 'vue'
 import type { AppConfig } from '@nuxt/schema'
-import type { TabsItem } from '../Tabs.vue'
+import type { TabsItem, TabsProps } from '../Tabs.vue'
 import theme from '#build/b24ui/prose/tabs'
-import type { TabsProps } from '../../types'
 import type { ComponentConfig } from '../../types/tv'
 
 type ProseTabs = ComponentConfig<typeof theme, AppConfig, 'tabs', 'b24ui.prose'>
diff --git a/src/runtime/composables/useAvatarGroup.ts b/src/runtime/composables/useAvatarGroup.ts
index 40ad39451..e9c0deb75 100644
--- a/src/runtime/composables/useAvatarGroup.ts
+++ b/src/runtime/composables/useAvatarGroup.ts
@@ -1,6 +1,6 @@
 import { inject, provide, computed } from 'vue'
 import type { ComputedRef, InjectionKey } from 'vue'
-import type { AvatarGroupProps } from '../types'
+import type { AvatarGroupProps } from '../components/AvatarGroup.vue'
 
 export const avatarGroupInjectionKey: InjectionKey<ComputedRef<{ size: AvatarGroupProps['size'], color: AvatarGroupProps['color'] }>> = Symbol('bitrix24-ui.avatar-group')
 
diff --git a/src/runtime/composables/useComponentIcons.ts b/src/runtime/composables/useComponentIcons.ts
index 59953ec87..3050fe2dd 100644
--- a/src/runtime/composables/useComponentIcons.ts
+++ b/src/runtime/composables/useComponentIcons.ts
@@ -1,6 +1,7 @@
 import { computed, toValue } from 'vue'
 import type { MaybeRefOrGetter } from 'vue'
-import type { AvatarProps, IconComponent } from '../types'
+import type { AvatarProps } from '../components/Avatar.vue'
+import type { IconComponent } from '../types/icons'
 import icons from '../dictionary/icons'
 
 export interface UseComponentIconsProps {
diff --git a/src/runtime/composables/useContentSearch.ts b/src/runtime/composables/useContentSearch.ts
index 55317ecfd..7b3717e28 100644
--- a/src/runtime/composables/useContentSearch.ts
+++ b/src/runtime/composables/useContentSearch.ts
@@ -5,7 +5,7 @@ import { createSharedComposable } from '@vueuse/core'
 import icons from '../dictionary/icons'
 import { sanitizeSnippet } from '../utils/search'
 import type { ContentSearchFile, ContentSearchItem, ContentSearchLink, ContentSearchResult } from '../components/content/ContentSearch.vue'
-import type { IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
 
 function _useContentSearch() {
   const open = ref(false)
diff --git a/src/runtime/composables/useFormField.ts b/src/runtime/composables/useFormField.ts
index 95379ce45..0b5056c41 100644
--- a/src/runtime/composables/useFormField.ts
+++ b/src/runtime/composables/useFormField.ts
@@ -2,7 +2,7 @@ import { inject, computed, provide } from 'vue'
 import type { InjectionKey, Ref, ComputedRef } from 'vue'
 import { useDebounceFn } from '@vueuse/core'
 import type { UseEventBusReturn } from '@vueuse/core'
-import type { FormFieldProps } from '../types'
+import type { FormFieldProps } from '../components/FormField.vue'
 import type { FormErrorWithId, FormEvent, FormInputEvents, FormFieldInjectedOptions, FormInjectedOptions } from '../types/form'
 import type { GetObjectField } from '../types/utils'
 
diff --git a/src/runtime/composables/useToast.ts b/src/runtime/composables/useToast.ts
index ce4e7f777..231e06b92 100644
--- a/src/runtime/composables/useToast.ts
+++ b/src/runtime/composables/useToast.ts
@@ -1,7 +1,7 @@
 import type { Ref, InjectionKey } from 'vue'
 import { ref, nextTick, inject } from 'vue'
 import { useState } from '#imports'
-import type { ToastProps, ToastEmits } from '../types'
+import type { ToastEmits, ToastProps } from '../components/Toast.vue'
 import type { EmitsToProps } from '../types/utils'
 
 export const toastMaxInjectionKey: InjectionKey<Ref<number | undefined>> = Symbol('bitrix24-ui.toast-max')
diff --git a/src/runtime/dictionary/icons.ts b/src/runtime/dictionary/icons.ts
index d2544d108..dca409909 100644
--- a/src/runtime/dictionary/icons.ts
+++ b/src/runtime/dictionary/icons.ts
@@ -7,7 +7,7 @@
  */
 
 import { h } from 'vue'
-import type { IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
 import ArrowToTheLeftIcon from '@bitrix24/b24icons-vue/actions/ArrowToTheLeftIcon'
 import ArrowToTheRightIcon from '@bitrix24/b24icons-vue/actions/ArrowToTheRightIcon'
 import CheckIcon from '@bitrix24/b24icons-vue/outline/CheckLIcon'
diff --git a/src/runtime/locale/ar.ts b/src/runtime/locale/ar.ts
index ae3d07c6e..d1cee522b 100644
--- a/src/runtime/locale/ar.ts
+++ b/src/runtime/locale/ar.ts
@@ -1,4 +1,4 @@
-import type { Messages } from '../types'
+import type { Messages } from '../types/locale'
 import { defineLocale } from '../composables/defineLocale'
 
 export default defineLocale<Messages>({
diff --git a/src/runtime/locale/br.ts b/src/runtime/locale/br.ts
index 425063ff0..b78b5d2c3 100644
--- a/src/runtime/locale/br.ts
+++ b/src/runtime/locale/br.ts
@@ -1,4 +1,4 @@
-import type { Messages } from '../types'
+import type { Messages } from '../types/locale'
 import { defineLocale } from '../composables/defineLocale'
 
 export default defineLocale<Messages>({
diff --git a/src/runtime/locale/de.ts b/src/runtime/locale/de.ts
index cc5884071..788a28309 100644
--- a/src/runtime/locale/de.ts
+++ b/src/runtime/locale/de.ts
@@ -1,4 +1,4 @@
-import type { Messages } from '../types'
+import type { Messages } from '../types/locale'
 import { defineLocale } from '../composables/defineLocale'
 
 export default defineLocale<Messages>({
diff --git a/src/runtime/locale/en.ts b/src/runtime/locale/en.ts
index 116119a3f..c0aeb7d48 100644
--- a/src/runtime/locale/en.ts
+++ b/src/runtime/locale/en.ts
@@ -1,4 +1,4 @@
-import type { Messages } from '../types'
+import type { Messages } from '../types/locale'
 import { defineLocale } from '../composables/defineLocale'
 
 export default defineLocale<Messages>({
diff --git a/src/runtime/locale/fr.ts b/src/runtime/locale/fr.ts
index 0822bb557..6a7fb49f5 100644
--- a/src/runtime/locale/fr.ts
+++ b/src/runtime/locale/fr.ts
@@ -1,4 +1,4 @@
-import type { Messages } from '../types'
+import type { Messages } from '../types/locale'
 import { defineLocale } from '../composables/defineLocale'
 
 export default defineLocale<Messages>({
diff --git a/src/runtime/locale/id.ts b/src/runtime/locale/id.ts
index aca7595bd..3e42c590f 100644
--- a/src/runtime/locale/id.ts
+++ b/src/runtime/locale/id.ts
@@ -1,4 +1,4 @@
-import type { Messages } from '../types'
+import type { Messages } from '../types/locale'
 import { defineLocale } from '../composables/defineLocale'
 
 export default defineLocale<Messages>({
diff --git a/src/runtime/locale/in.ts b/src/runtime/locale/in.ts
index 31a00cd43..52ca90c6d 100644
--- a/src/runtime/locale/in.ts
+++ b/src/runtime/locale/in.ts
@@ -1,4 +1,4 @@
-import type { Messages } from '../types'
+import type { Messages } from '../types/locale'
 import { defineLocale } from '../composables/defineLocale'
 
 export default defineLocale<Messages>({
diff --git a/src/runtime/locale/it.ts b/src/runtime/locale/it.ts
index 10c71f73c..09a2b9963 100644
--- a/src/runtime/locale/it.ts
+++ b/src/runtime/locale/it.ts
@@ -1,4 +1,4 @@
-import type { Messages } from '../types'
+import type { Messages } from '../types/locale'
 import { defineLocale } from '../composables/defineLocale'
 
 export default defineLocale<Messages>({
diff --git a/src/runtime/locale/ja.ts b/src/runtime/locale/ja.ts
index 74ad7f9f8..51df45ecd 100644
--- a/src/runtime/locale/ja.ts
+++ b/src/runtime/locale/ja.ts
@@ -1,4 +1,4 @@
-import type { Messages } from '../types'
+import type { Messages } from '../types/locale'
 import { defineLocale } from '../composables/defineLocale'
 
 export default defineLocale<Messages>({
diff --git a/src/runtime/locale/kz.ts b/src/runtime/locale/kz.ts
index 1a81266b3..69c56ed9c 100644
--- a/src/runtime/locale/kz.ts
+++ b/src/runtime/locale/kz.ts
@@ -1,4 +1,4 @@
-import type { Messages } from '../types'
+import type { Messages } from '../types/locale'
 import { defineLocale } from '../composables/defineLocale'
 
 export default defineLocale<Messages>({
diff --git a/src/runtime/locale/la.ts b/src/runtime/locale/la.ts
index b5f056269..ca105eee3 100644
--- a/src/runtime/locale/la.ts
+++ b/src/runtime/locale/la.ts
@@ -1,4 +1,4 @@
-import type { Messages } from '../types'
+import type { Messages } from '../types/locale'
 import { defineLocale } from '../composables/defineLocale'
 
 export default defineLocale<Messages>({
diff --git a/src/runtime/locale/ms.ts b/src/runtime/locale/ms.ts
index caf812be7..44454f2f3 100644
--- a/src/runtime/locale/ms.ts
+++ b/src/runtime/locale/ms.ts
@@ -1,4 +1,4 @@
-import type { Messages } from '../types'
+import type { Messages } from '../types/locale'
 import { defineLocale } from '../composables/defineLocale'
 
 export default defineLocale<Messages>({
diff --git a/src/runtime/locale/pl.ts b/src/runtime/locale/pl.ts
index 018d626f6..be0d182dd 100644
--- a/src/runtime/locale/pl.ts
+++ b/src/runtime/locale/pl.ts
@@ -1,4 +1,4 @@
-import type { Messages } from '../types'
+import type { Messages } from '../types/locale'
 import { defineLocale } from '../composables/defineLocale'
 
 export default defineLocale<Messages>({
diff --git a/src/runtime/locale/ru.ts b/src/runtime/locale/ru.ts
index 30e1d9340..0bf156d34 100644
--- a/src/runtime/locale/ru.ts
+++ b/src/runtime/locale/ru.ts
@@ -1,4 +1,4 @@
-import type { Messages } from '../types'
+import type { Messages } from '../types/locale'
 import { defineLocale } from '../composables/defineLocale'
 
 export default defineLocale<Messages>({
diff --git a/src/runtime/locale/sc.ts b/src/runtime/locale/sc.ts
index aeec97765..5625094aa 100644
--- a/src/runtime/locale/sc.ts
+++ b/src/runtime/locale/sc.ts
@@ -1,4 +1,4 @@
-import type { Messages } from '../types'
+import type { Messages } from '../types/locale'
 import { defineLocale } from '../composables/defineLocale'
 
 export default defineLocale<Messages>({
diff --git a/src/runtime/locale/tc.ts b/src/runtime/locale/tc.ts
index 137aadcf1..be2b075df 100644
--- a/src/runtime/locale/tc.ts
+++ b/src/runtime/locale/tc.ts
@@ -1,4 +1,4 @@
-import type { Messages } from '../types'
+import type { Messages } from '../types/locale'
 import { defineLocale } from '../composables/defineLocale'
 
 export default defineLocale<Messages>({
diff --git a/src/runtime/locale/th.ts b/src/runtime/locale/th.ts
index d02582fb8..c47a429f4 100644
--- a/src/runtime/locale/th.ts
+++ b/src/runtime/locale/th.ts
@@ -1,4 +1,4 @@
-import type { Messages } from '../types'
+import type { Messages } from '../types/locale'
 import { defineLocale } from '../composables/defineLocale'
 
 export default defineLocale<Messages>({
diff --git a/src/runtime/locale/tr.ts b/src/runtime/locale/tr.ts
index 422111336..19d72cfff 100644
--- a/src/runtime/locale/tr.ts
+++ b/src/runtime/locale/tr.ts
@@ -1,4 +1,4 @@
-import type { Messages } from '../types'
+import type { Messages } from '../types/locale'
 import { defineLocale } from '../composables/defineLocale'
 
 export default defineLocale<Messages>({
diff --git a/src/runtime/locale/ua.ts b/src/runtime/locale/ua.ts
index 84e577b06..eec06db9f 100644
--- a/src/runtime/locale/ua.ts
+++ b/src/runtime/locale/ua.ts
@@ -1,4 +1,4 @@
-import type { Messages } from '../types'
+import type { Messages } from '../types/locale'
 import { defineLocale } from '../composables/defineLocale'
 
 export default defineLocale<Messages>({
diff --git a/src/runtime/locale/vn.ts b/src/runtime/locale/vn.ts
index b350b0876..15405058e 100644
--- a/src/runtime/locale/vn.ts
+++ b/src/runtime/locale/vn.ts
@@ -1,4 +1,4 @@
-import type { Messages } from '../types'
+import type { Messages } from '../types/locale'
 import { defineLocale } from '../composables/defineLocale'
 
 export default defineLocale<Messages>({
diff --git a/src/runtime/utils/index.ts b/src/runtime/utils/index.ts
index dde6ec5b4..828c9a75a 100644
--- a/src/runtime/utils/index.ts
+++ b/src/runtime/utils/index.ts
@@ -1,7 +1,7 @@
 import { isEqual } from 'ohash/utils'
 import { withTrailingSlash, withLeadingSlash, joinURL } from 'ufo'
 import type { GetItemKeys } from '../types/utils'
-import type { IconComponent } from '../types'
+import type { IconComponent } from '../types/icons'
 import icons from '../dictionary/icons'
 
 export function pick<Data extends object, Keys extends keyof Data>(data: Data, keys: Keys[]): Pick<Data, Keys> {
diff --git a/src/runtime/utils/link.ts b/src/runtime/utils/link.ts
index 248a7c47f..13e5159f9 100644
--- a/src/runtime/utils/link.ts
+++ b/src/runtime/utils/link.ts
@@ -1,6 +1,6 @@
 import { reactivePick } from '@vueuse/core'
 import { isEqual, diff } from 'ohash/utils'
-import type { LinkProps } from '../types'
+import type { LinkProps } from '../components/Link.vue'
 
 export const linkKeys = [
   'active',
diff --git a/src/runtime/vue/components/color-mode/ColorModeSelect.vue b/src/runtime/vue/components/color-mode/ColorModeSelect.vue
index ead8360c7..e700edcbc 100644
--- a/src/runtime/vue/components/color-mode/ColorModeSelect.vue
+++ b/src/runtime/vue/components/color-mode/ColorModeSelect.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import type { SelectMenuProps, SelectMenuItem } from '../../../types'
+import type { SelectMenuItem, SelectMenuProps } from '../../../components/SelectMenu.vue'
 
 export interface ColorModeSelectProps extends Omit<SelectMenuProps<SelectMenuItem[]>, 'icon' | 'items' | 'modelValue'> {
 }
diff --git a/src/runtime/vue/components/color-mode/ColorModeSwitch.vue b/src/runtime/vue/components/color-mode/ColorModeSwitch.vue
index 2a5778aa6..a381aadd5 100644
--- a/src/runtime/vue/components/color-mode/ColorModeSwitch.vue
+++ b/src/runtime/vue/components/color-mode/ColorModeSwitch.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import type { SwitchProps } from '../../../types'
+import type { SwitchProps } from '../../../components/Switch.vue'
 
 export interface ColorModeSwitchProps extends Omit<SwitchProps, 'checkedIcon' | 'uncheckedIcon' | 'modelValue'> {
 }
diff --git a/src/runtime/vue/overrides/inertia/LinkBase.vue b/src/runtime/vue/overrides/inertia/LinkBase.vue
index 37f156a53..7ed73b59c 100644
--- a/src/runtime/vue/overrides/inertia/LinkBase.vue
+++ b/src/runtime/vue/overrides/inertia/LinkBase.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import type { LinkProps } from '../../../types'
+import type { LinkProps } from '../../../components/Link.vue'
 
 export interface LinkBaseProps {
   as?: string