diff --git a/src/runtime/components/Accordion.vue b/src/runtime/components/Accordion.vue
index e2196991..caa76401 100644
--- a/src/runtime/components/Accordion.vue
+++ b/src/runtime/components/Accordion.vue
@@ -4,7 +4,7 @@ import type { AccordionRootProps, AccordionRootEmits } from 'radix-vue'
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/accordion'
-import type { IconProps } from '#ui/components/Icon.vue'
+import type { IconProps } from '#ui/types'
 
 const appConfig = _appConfig as AppConfig & { ui: { accordion: Partial<typeof theme> } }
 
@@ -42,7 +42,7 @@ export type AccordionSlots<T> = {
 import { computed } from 'vue'
 import { AccordionRoot, AccordionItem, AccordionHeader, AccordionTrigger, AccordionContent, useForwardPropsEmits } from 'radix-vue'
 import { reactivePick } from '@vueuse/core'
-import { useAppConfig } from '#app'
+import { useAppConfig } from '#imports'
 
 const props = withDefaults(defineProps<AccordionProps<T>>(), {
   type: 'single',
diff --git a/src/runtime/components/Avatar.vue b/src/runtime/components/Avatar.vue
index 80241666..e47b2c24 100644
--- a/src/runtime/components/Avatar.vue
+++ b/src/runtime/components/Avatar.vue
@@ -4,7 +4,7 @@ import type { AvatarFallbackProps, AvatarRootProps } from 'radix-vue'
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/avatar'
-import type { IconProps } from '#ui/components/Icon.vue'
+import type { IconProps } from '#ui/types'
 
 const appConfig = _appConfig as AppConfig & { ui: { avatar: Partial<typeof theme> } }
 
@@ -27,7 +27,7 @@ export interface AvatarProps extends Omit<AvatarRootProps, 'asChild'>, Omit<Avat
 import { computed } from 'vue'
 import { AvatarRoot, AvatarImage, AvatarFallback, useForwardProps } from 'radix-vue'
 import { reactivePick } from '@vueuse/core'
-import UIcon from '#ui/components/Icon.vue'
+import { UIcon } from '#components'
 
 const props = defineProps<AvatarProps>()
 
diff --git a/src/runtime/components/Button.vue b/src/runtime/components/Button.vue
index 8bca71fa..bf9fb8ed 100644
--- a/src/runtime/components/Button.vue
+++ b/src/runtime/components/Button.vue
@@ -35,8 +35,8 @@ export interface ButtonSlots {
 import { computed } from 'vue'
 import { useForwardProps } from 'radix-vue'
 import { reactiveOmit } from '@vueuse/core'
-import UIcon from '#ui/components/Icon.vue'
-import { useComponentIcons } from '#ui/composables/useComponentIcons'
+import { useComponentIcons } from '#imports'
+import { UIcon, ULink } from '#components'
 
 const props = defineProps<ButtonProps>()
 const slots = defineSlots<ButtonSlots>()
diff --git a/src/runtime/components/Checkbox.vue b/src/runtime/components/Checkbox.vue
index 2d3829d9..5e71f478 100644
--- a/src/runtime/components/Checkbox.vue
+++ b/src/runtime/components/Checkbox.vue
@@ -4,7 +4,7 @@ import type { CheckboxRootProps, CheckboxRootEmits } from 'radix-vue'
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/checkbox'
-import type { IconProps } from '#ui/components/Icon.vue'
+import type { IconProps } from '#ui/types'
 
 const appConfig = _appConfig as AppConfig & { ui: { checkbox: Partial<typeof theme> } }
 
@@ -38,9 +38,7 @@ export interface CheckboxSlots {
 import { computed } from 'vue'
 import { CheckboxRoot, CheckboxIndicator, Label, useForwardPropsEmits } from 'radix-vue'
 import { reactivePick } from '@vueuse/core'
-import { useId } from '#imports'
-import { useFormField } from '#ui/composables/useFormField'
-import { useAppConfig } from '#app'
+import { useId, useAppConfig, useFormField } from '#imports'
 
 const props = defineProps<CheckboxProps>()
 const emits = defineEmits<CheckboxEmits>()
diff --git a/src/runtime/components/DropdownMenu.vue b/src/runtime/components/DropdownMenu.vue
index 383a1173..b733f872 100644
--- a/src/runtime/components/DropdownMenu.vue
+++ b/src/runtime/components/DropdownMenu.vue
@@ -4,11 +4,7 @@ import type { DropdownMenuRootProps, DropdownMenuRootEmits, DropdownMenuContentP
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/dropdownMenu'
-import type { LinkProps } from '#ui/components/Link.vue'
-import type { AvatarProps } from '#ui/components/Avatar.vue'
-import type { IconProps } from '#ui/components/Icon.vue'
-import type { KbdProps } from '#ui/components/Kbd.vue'
-import type { DropdownMenuContentSlots } from '#ui/components/DropdownMenuContent.vue'
+import type { AvatarProps, IconProps, KbdProps, LinkProps, DropdownMenuContentSlots } from '#ui/types'
 
 const appConfig = _appConfig as AppConfig & { ui: { dropdownMenu: Partial<typeof theme> } }
 
diff --git a/src/runtime/components/DropdownMenuContent.vue b/src/runtime/components/DropdownMenuContent.vue
index 20a1e345..8bd80b07 100644
--- a/src/runtime/components/DropdownMenuContent.vue
+++ b/src/runtime/components/DropdownMenuContent.vue
@@ -1,6 +1,6 @@
 <script lang="ts">
 import type { DropdownMenuContentProps as RadixDropdownMenuContentProps, DropdownMenuContentEmits as RadixDropdownMenuContentEmits } from 'radix-vue'
-import type { DropdownMenuItem } from '#ui/components/DropdownMenu.vue'
+import type { DropdownMenuItem } from '#ui/types'
 
 export interface DropdownMenuContentProps<T> extends Omit<RadixDropdownMenuContentProps, 'as' | 'asChild' | 'forceMount'> {
   items?: T[] | T[][]
@@ -27,9 +27,9 @@ import { computed } from 'vue'
 import { DropdownMenu } from 'radix-vue/namespaced'
 import { useForwardPropsEmits } from 'radix-vue'
 import { reactiveOmit, createReusableTemplate } from '@vueuse/core'
+import { useAppConfig } from '#imports'
 import { ULink } from '#components'
 import { omit } from '#ui/utils'
-import { useAppConfig } from '#imports'
 
 const props = defineProps<DropdownMenuContentProps<T>>()
 const emits = defineEmits<DropdownMenuContentEmits>()
diff --git a/src/runtime/components/Form.vue b/src/runtime/components/Form.vue
index 4744374a..25ab5cfc 100644
--- a/src/runtime/components/Form.vue
+++ b/src/runtime/components/Form.vue
@@ -3,7 +3,6 @@ import { tv } from 'tailwind-variants'
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/form'
-import { getYupErrors, isYupSchema, getValibotError, isValibotSchema, getZodErrors, isZodSchema, getJoiErrors, isJoiSchema } from '#ui/utils/form'
 import type { FormSchema, FormError, FormInputEvents, FormErrorEvent, FormSubmitEvent, FormEvent, FormInjectedOptions, Form, FormErrorWithId } from '#ui/types/form'
 
 const appConfig = _appConfig as AppConfig & { ui: { form: Partial<typeof theme> } }
@@ -49,6 +48,7 @@ export class FormValidationException extends Error {
 import { provide, inject, nextTick, ref, onUnmounted, onMounted, computed } from 'vue'
 import { useEventBus, type UseEventBusReturn } from '@vueuse/core'
 import { useId } from '#imports'
+import { getYupErrors, isYupSchema, getValibotError, isValibotSchema, getZodErrors, isZodSchema, getJoiErrors, isJoiSchema } from '#ui/utils/form'
 
 const props = withDefaults(defineProps<FormProps<T>>(), {
   validateOn () {
diff --git a/src/runtime/components/Input.vue b/src/runtime/components/Input.vue
index 5001be77..e0e95774 100644
--- a/src/runtime/components/Input.vue
+++ b/src/runtime/components/Input.vue
@@ -4,7 +4,6 @@ import { tv, type VariantProps } from 'tailwind-variants'
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/input'
-import { looseToNumber } from '#ui/utils'
 import type { UseComponentIconsProps } from '#ui/composables/useComponentIcons'
 
 const appConfig = _appConfig as AppConfig & { ui: { input: Partial<typeof theme> } }
@@ -42,8 +41,8 @@ export interface InputSlots {
 
 <script lang="ts" setup>
 import { ref, computed, onMounted } from 'vue'
-import { useFormField } from '#ui/composables/useFormField'
-import { useComponentIcons } from '#ui/composables/useComponentIcons'
+import { useComponentIcons, useFormField } from '#imports'
+import { looseToNumber } from '#ui/utils'
 
 defineOptions({ inheritAttrs: false })
 
diff --git a/src/runtime/components/Modal.vue b/src/runtime/components/Modal.vue
index c9833116..10e9e265 100644
--- a/src/runtime/components/Modal.vue
+++ b/src/runtime/components/Modal.vue
@@ -4,7 +4,7 @@ import type { DialogRootProps, DialogRootEmits, DialogContentProps } from 'radix
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/modal'
-import type { ButtonProps } from '#ui/components/Button.vue'
+import type { ButtonProps } from '#ui/types'
 
 const appConfig = _appConfig as AppConfig & { ui: { modal: Partial<typeof theme> } }
 
@@ -42,8 +42,8 @@ export interface ModalSlots {
 import { computed, toRef } from 'vue'
 import { DialogRoot, DialogTrigger, DialogPortal, DialogOverlay, DialogContent, DialogTitle, DialogDescription, DialogClose, useForwardPropsEmits } from 'radix-vue'
 import { reactivePick } from '@vueuse/core'
-import { useAppConfig } from '#app'
-import UButton from '#ui/components/Button.vue'
+import { useAppConfig } from '#imports'
+import { UButton } from '#components'
 
 const props = withDefaults(defineProps<ModalProps>(), {
   portal: true,
diff --git a/src/runtime/components/NavigationMenu.vue b/src/runtime/components/NavigationMenu.vue
index 03f49cd0..fb09226a 100644
--- a/src/runtime/components/NavigationMenu.vue
+++ b/src/runtime/components/NavigationMenu.vue
@@ -4,10 +4,7 @@ import type { NavigationMenuRootProps, NavigationMenuRootEmits } from 'radix-vue
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/navigationMenu'
-import type { LinkProps } from '#ui/components/Link.vue'
-import type { AvatarProps } from '#ui/components/Avatar.vue'
-import type { BadgeProps } from '#ui/components/Badge.vue'
-import type { IconProps } from '#ui/components/Icon.vue'
+import type { AvatarProps, BadgeProps, IconProps, LinkProps } from '#ui/types'
 
 const appConfig = _appConfig as AppConfig & { ui: { navigationMenu: Partial<typeof theme> } }
 
diff --git a/src/runtime/components/Slideover.vue b/src/runtime/components/Slideover.vue
index 7dea05a1..6f7c4e90 100644
--- a/src/runtime/components/Slideover.vue
+++ b/src/runtime/components/Slideover.vue
@@ -4,7 +4,7 @@ import type { DialogRootProps, DialogRootEmits, DialogContentProps } from 'radix
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/slideover'
-import type { ButtonProps } from '#ui/components/Button.vue'
+import type { ButtonProps } from '#ui/types'
 
 const appConfig = _appConfig as AppConfig & { ui: { slideover: Partial<typeof theme> } }
 
@@ -42,8 +42,8 @@ export interface SlideoverSlots {
 import { computed, toRef } from 'vue'
 import { DialogRoot, DialogTrigger, DialogPortal, DialogOverlay, DialogContent, DialogTitle, DialogDescription, DialogClose, useForwardPropsEmits } from 'radix-vue'
 import { reactivePick } from '@vueuse/core'
-import { useAppConfig } from '#app'
-import UButton from '#ui/components/Button.vue'
+import { useAppConfig } from '#imports'
+import { UButton } from '#components'
 
 const props = withDefaults(defineProps<SlideoverProps>(), {
   portal: true,
diff --git a/src/runtime/components/Switch.vue b/src/runtime/components/Switch.vue
index 7baba56f..b4bf8cb8 100644
--- a/src/runtime/components/Switch.vue
+++ b/src/runtime/components/Switch.vue
@@ -4,7 +4,7 @@ import type { SwitchRootProps, SwitchRootEmits } from 'radix-vue'
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/switch'
-import type { IconProps } from '#ui/components/Icon.vue'
+import type { IconProps } from '#ui/types'
 
 const appConfig = _appConfig as AppConfig & { ui: { switch: Partial<typeof theme> } }
 
@@ -30,7 +30,7 @@ export interface SwitchEmits extends SwitchRootEmits {}
 import { computed } from 'vue'
 import { SwitchRoot, SwitchThumb, useForwardPropsEmits } from 'radix-vue'
 import { reactivePick } from '@vueuse/core'
-import { useAppConfig } from '#app'
+import { useAppConfig } from '#imports'
 
 const props = defineProps<SwitchProps>()
 const emits = defineEmits<SwitchEmits>()
diff --git a/src/runtime/components/Textarea.vue b/src/runtime/components/Textarea.vue
index 7511a91e..98788f16 100644
--- a/src/runtime/components/Textarea.vue
+++ b/src/runtime/components/Textarea.vue
@@ -3,7 +3,6 @@ import { tv, type VariantProps } from 'tailwind-variants'
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/textarea'
-import { looseToNumber } from '#ui/utils'
 
 const appConfig = _appConfig as AppConfig & { ui: { textarea: Partial<typeof theme> } }
 
@@ -40,7 +39,8 @@ export interface TextareaSlots {
 
 <script lang="ts" setup>
 import { ref, computed, onMounted, nextTick, watch } from 'vue'
-import { useFormField } from '#ui/composables/useFormField'
+import { useFormField } from '#imports'
+import { looseToNumber } from '#ui/utils'
 
 defineOptions({ inheritAttrs: false })
 
diff --git a/src/runtime/components/Tooltip.vue b/src/runtime/components/Tooltip.vue
index fbbce4cc..99c78217 100644
--- a/src/runtime/components/Tooltip.vue
+++ b/src/runtime/components/Tooltip.vue
@@ -4,7 +4,7 @@ import type { TooltipRootProps, TooltipRootEmits, TooltipContentProps, TooltipAr
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/tooltip'
-import type { KbdProps } from '#ui/components/Kbd.vue'
+import type { KbdProps } from '#ui/types'
 
 const appConfig = _appConfig as AppConfig & { ui: { tooltip: Partial<typeof theme> } }
 
@@ -35,7 +35,7 @@ import { computed, toRef } from 'vue'
 import { defu } from 'defu'
 import { TooltipRoot, TooltipTrigger, TooltipPortal, TooltipContent, TooltipArrow, useForwardPropsEmits } from 'radix-vue'
 import { reactivePick } from '@vueuse/core'
-import UKbd from '#ui/components/Kbd.vue'
+import { UKbd } from '#components'
 
 const props = withDefaults(defineProps<TooltipProps>(), { portal: true })
 const emits = defineEmits<TooltipEmits>()
diff --git a/src/runtime/composables/useComponentIcons.ts b/src/runtime/composables/useComponentIcons.ts
index d090f121..1fe8d990 100644
--- a/src/runtime/composables/useComponentIcons.ts
+++ b/src/runtime/composables/useComponentIcons.ts
@@ -1,6 +1,6 @@
 import { computed } from 'vue'
-import { useAppConfig } from '#app'
-import type { IconProps } from '#ui/components/Icon.vue'
+import { useAppConfig } from '#imports'
+import type { IconProps } from '#ui/types'
 
 export interface UseComponentIconsProps {
   icon?: IconProps['name']
diff --git a/src/runtime/types/index.d.ts b/src/runtime/types/index.d.ts
index 4449ad23..77218ca3 100644
--- a/src/runtime/types/index.d.ts
+++ b/src/runtime/types/index.d.ts
@@ -25,4 +25,3 @@ export * from '../components/Switch.vue'
 export * from '../components/Tabs.vue'
 export * from '../components/Textarea.vue'
 export * from '../components/Tooltip.vue'
-export * from '../composables/useComponentIcons'