diff --git a/src/runtime/components/Badge.vue b/src/runtime/components/Badge.vue
index 08d541c1..9e3c4428 100644
--- a/src/runtime/components/Badge.vue
+++ b/src/runtime/components/Badge.vue
@@ -1,9 +1,9 @@
 <script lang="ts">
 import { tv, type VariantProps } from 'tailwind-variants'
+import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/badge'
 import type { LinkProps } from '#ui/components/Link.vue'
-import type { AppConfig } from '@nuxt/schema'
 
 const appConfig = _appConfig as AppConfig & { ui: { badge: Partial<typeof theme> } }
 
diff --git a/src/runtime/components/Button.vue b/src/runtime/components/Button.vue
index 92b42846..d220f44f 100644
--- a/src/runtime/components/Button.vue
+++ b/src/runtime/components/Button.vue
@@ -1,9 +1,9 @@
 <script lang="ts">
 import { tv, type VariantProps } from 'tailwind-variants'
+import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/button'
 import type { LinkProps } from '#ui/components/Link.vue'
-import type { AppConfig } from '@nuxt/schema'
 
 const appConfig = _appConfig as AppConfig & { ui: { button: Partial<typeof theme> } }
 
@@ -52,8 +52,6 @@ const slots = defineSlots<ButtonSlots>()
 const appConfig = useAppConfig()
 const forward = useForwardProps(reactiveOmit(props, 'type', 'label', 'color', 'variant', 'size', 'icon', 'leading', 'leadingIcon', 'trailing', 'trailingIcon', 'loading', 'loadingIcon', 'square', 'block', 'disabled', 'truncate', 'class', 'ui'))
 
-// Computed
-
 const isLeading = computed(() => (props.icon && props.leading) || (props.icon && !props.trailing) || (props.loading && !props.trailing) || !!props.leadingIcon)
 const isTrailing = computed(() => (props.icon && props.trailing) || (props.loading && props.trailing) || !!props.trailingIcon)
 
diff --git a/src/runtime/components/Collapsible.vue b/src/runtime/components/Collapsible.vue
index ec1ce056..be48c40d 100644
--- a/src/runtime/components/Collapsible.vue
+++ b/src/runtime/components/Collapsible.vue
@@ -1,9 +1,9 @@
 <script lang="ts">
 import { tv } from 'tailwind-variants'
 import type { CollapsibleRootProps, CollapsibleRootEmits } from 'radix-vue'
+import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/collapsible'
-import type { AppConfig } from '@nuxt/schema'
 
 const appConfig = _appConfig as AppConfig & { ui: { collapsible: Partial<typeof theme> } }
 
@@ -32,12 +32,9 @@ const props = defineProps<CollapsibleProps>()
 const emits = defineEmits<CollapsibleEmits>()
 defineSlots<CollapsibleSlots>()
 
-const forward = useForwardPropsEmits(reactivePick(props, 'defaultOpen', 'open', 'disabled'), emits)
+const forward = useForwardPropsEmits(reactivePick(props, 'as', 'defaultOpen', 'open', 'disabled'), emits)
 
-// FIXME: Cannot extend multiple times
-// const ui = computed(() => tv({ extend: collapsible, slots: props.ui })())
-// eslint-disable-next-line vue/no-dupe-keys
-const ui = computed(() => collapsible())
+const ui = computed(() => tv({ extend: collapsible, slots: props.ui })())
 </script>
 
 <template>
diff --git a/src/runtime/components/Container.vue b/src/runtime/components/Container.vue
index 8af85de3..da292fb7 100644
--- a/src/runtime/components/Container.vue
+++ b/src/runtime/components/Container.vue
@@ -1,8 +1,8 @@
 <script lang="ts">
 import { tv } from 'tailwind-variants'
+import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/container'
-import type { AppConfig } from '@nuxt/schema'
 
 const appConfig = _appConfig as AppConfig & { ui: { container: Partial<typeof theme> } }
 
diff --git a/src/runtime/components/Tooltip.vue b/src/runtime/components/Tooltip.vue
index 3499edb8..746f51f1 100644
--- a/src/runtime/components/Tooltip.vue
+++ b/src/runtime/components/Tooltip.vue
@@ -1,9 +1,9 @@
 <script lang="ts">
 import { tv } from 'tailwind-variants'
 import type { TooltipRootProps, TooltipRootEmits, TooltipContentProps } from 'radix-vue'
+import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/tooltip'
-import type { AppConfig } from '@nuxt/schema'
 
 const appConfig = _appConfig as AppConfig & { ui: { tooltip: Partial<typeof theme> } }
 
@@ -41,10 +41,7 @@ defineSlots<TooltipSlots>()
 const forwardRoot = useForwardPropsEmits(reactivePick(props, 'defaultOpen', 'open', 'delayDuration'), emits)
 const forwardContent = useForwardProps(reactivePick(props, 'side', 'sideOffset', 'align', 'alignOffset', 'avoidCollisions', 'collisionBoundary', 'collisionPadding', 'arrowPadding', 'sticky', 'hideWhenDetached'))
 
-// FIXME: Cannot extend multiple times
-// const ui = computed(() => tv({ extend: tooltip, slots: props.ui })())
-// eslint-disable-next-line vue/no-dupe-keys
-const ui = computed(() => tooltip())
+const ui = computed(() => tv({ extend: tooltip, slots: props.ui })())
 </script>
 
 <template>