diff --git a/apps/www/src/content/docs/components/number-field.md b/apps/www/src/content/docs/components/number-field.md
index 5be93859..e47d05aa 100644
--- a/apps/www/src/content/docs/components/number-field.md
+++ b/apps/www/src/content/docs/components/number-field.md
@@ -28,13 +28,13 @@ import {
   NumberFieldDecrement,
   NumberFieldIncrement,
   NumberFieldInput,
-  NumberFieldLabel
 } from '@/lib/registry/default/ui/number-field'
+import { Label } from '@/lib/registry/default/ui/label'
 </script>
 
 <template>
   <NumberField>
-    <NumberFieldLabel>Age</NumberFieldLabel>
+    <Label>Age</Label>
     <NumberFieldContent>
       <NumberFieldDecrement />
       <NumberFieldInput />
diff --git a/apps/www/src/lib/registry/default/example/DonutChartColor.vue b/apps/www/src/lib/registry/default/example/DonutChartColor.vue
index 0ae5b157..646ca6db 100644
--- a/apps/www/src/lib/registry/default/example/DonutChartColor.vue
+++ b/apps/www/src/lib/registry/default/example/DonutChartColor.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { DonutChart } from '@/lib/registry/new-york/ui/chart-donut'
+import { DonutChart } from '@/lib/registry/default/ui/chart-donut'
 
 const data = [
   { name: 'Jan', total: Math.floor(Math.random() * 2000) + 500, predicted: Math.floor(Math.random() * 2000) + 500 },
diff --git a/apps/www/src/lib/registry/default/example/NumberFieldCurrency.vue b/apps/www/src/lib/registry/default/example/NumberFieldCurrency.vue
index 68d1c66e..1cbfed13 100644
--- a/apps/www/src/lib/registry/default/example/NumberFieldCurrency.vue
+++ b/apps/www/src/lib/registry/default/example/NumberFieldCurrency.vue
@@ -5,8 +5,8 @@ import {
   NumberFieldDecrement,
   NumberFieldIncrement,
   NumberFieldInput,
-  NumberFieldLabel,
 } from '@/lib/registry/default/ui/number-field'
+import { Label } from '@/lib/registry/default/ui/label'
 </script>
 
 <template>
@@ -19,7 +19,7 @@ import {
       currencySign: 'accounting',
     }"
   >
-    <NumberFieldLabel>Balance</NumberFieldLabel>
+    <Label>Balance</Label>
     <NumberFieldContent>
       <NumberFieldDecrement />
       <NumberFieldInput />
diff --git a/apps/www/src/lib/registry/default/example/NumberFieldDecimal.vue b/apps/www/src/lib/registry/default/example/NumberFieldDecimal.vue
index 7d223790..fcc7e35d 100644
--- a/apps/www/src/lib/registry/default/example/NumberFieldDecimal.vue
+++ b/apps/www/src/lib/registry/default/example/NumberFieldDecimal.vue
@@ -5,8 +5,8 @@ import {
   NumberFieldDecrement,
   NumberFieldIncrement,
   NumberFieldInput,
-  NumberFieldLabel,
 } from '@/lib/registry/default/ui/number-field'
+import { Label } from '@/lib/registry/default/ui/label'
 </script>
 
 <template>
@@ -17,7 +17,7 @@ import {
       minimumFractionDigits: 1,
     }"
   >
-    <NumberFieldLabel>Number</NumberFieldLabel>
+    <Label>Number</Label>
     <NumberFieldContent>
       <NumberFieldDecrement />
       <NumberFieldInput />
diff --git a/apps/www/src/lib/registry/default/example/NumberFieldDemo.vue b/apps/www/src/lib/registry/default/example/NumberFieldDemo.vue
index 434738cb..f5a9896e 100644
--- a/apps/www/src/lib/registry/default/example/NumberFieldDemo.vue
+++ b/apps/www/src/lib/registry/default/example/NumberFieldDemo.vue
@@ -5,13 +5,13 @@ import {
   NumberFieldDecrement,
   NumberFieldIncrement,
   NumberFieldInput,
-  NumberFieldLabel,
 } from '@/lib/registry/default/ui/number-field'
+import { Label } from '@/lib/registry/default/ui/label'
 </script>
 
 <template>
   <NumberField :default-value="18" :min="0">
-    <NumberFieldLabel>Age</NumberFieldLabel>
+    <Label>Age</Label>
     <NumberFieldContent>
       <NumberFieldDecrement />
       <NumberFieldInput />
diff --git a/apps/www/src/lib/registry/default/example/NumberFieldDisabled.vue b/apps/www/src/lib/registry/default/example/NumberFieldDisabled.vue
index bfba65a1..43af9016 100644
--- a/apps/www/src/lib/registry/default/example/NumberFieldDisabled.vue
+++ b/apps/www/src/lib/registry/default/example/NumberFieldDisabled.vue
@@ -5,13 +5,13 @@ import {
   NumberFieldDecrement,
   NumberFieldIncrement,
   NumberFieldInput,
-  NumberFieldLabel,
 } from '@/lib/registry/default/ui/number-field'
+import { Label } from '@/lib/registry/default/ui/label'
 </script>
 
 <template>
   <NumberField :default-value="18" :min="0" disabled>
-    <NumberFieldLabel>Age</NumberFieldLabel>
+    <Label>Age</Label>
     <NumberFieldContent>
       <NumberFieldDecrement />
       <NumberFieldInput />
diff --git a/apps/www/src/lib/registry/default/example/NumberFieldPercentage.vue b/apps/www/src/lib/registry/default/example/NumberFieldPercentage.vue
index 102c915b..fabd5f8e 100644
--- a/apps/www/src/lib/registry/default/example/NumberFieldPercentage.vue
+++ b/apps/www/src/lib/registry/default/example/NumberFieldPercentage.vue
@@ -5,8 +5,8 @@ import {
   NumberFieldDecrement,
   NumberFieldIncrement,
   NumberFieldInput,
-  NumberFieldLabel,
-} from '@/lib/registry/new-york/ui/number-field'
+} from '@/lib/registry/default/ui/number-field'
+import { Label } from '@/lib/registry/default/ui/label'
 </script>
 
 <template>
@@ -17,7 +17,7 @@ import {
       style: 'percent',
     }"
   >
-    <NumberFieldLabel>Percent</NumberFieldLabel>
+    <Label>Percent</Label>
     <NumberFieldContent>
       <NumberFieldDecrement />
       <NumberFieldInput />
diff --git a/apps/www/src/lib/registry/default/ui/number-field/NumberFieldLabel.vue b/apps/www/src/lib/registry/default/ui/number-field/NumberFieldLabel.vue
deleted file mode 100644
index b6c2737a..00000000
--- a/apps/www/src/lib/registry/default/ui/number-field/NumberFieldLabel.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<script setup lang="ts">
-import type { NumberFieldLabelProps } from 'radix-vue'
-import { NumberFieldLabel, useForwardProps } from 'radix-vue'
-import { type HTMLAttributes, computed } from 'vue'
-import { cn } from '@/lib/utils'
-
-const props = defineProps<NumberFieldLabelProps & { class?: HTMLAttributes['class'] }>()
-
-const delegatedProps = computed(() => {
-  const { class: _, ...delegated } = props
-
-  return delegated
-})
-
-const forwarded = useForwardProps(delegatedProps)
-</script>
-
-<template>
-  <NumberFieldLabel v-bind="forwarded" :class="cn('text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70', props.class)">
-    <slot />
-  </NumberFieldLabel>
-</template>
diff --git a/apps/www/src/lib/registry/default/ui/number-field/index.ts b/apps/www/src/lib/registry/default/ui/number-field/index.ts
index 3d33c8d8..45edbe40 100644
--- a/apps/www/src/lib/registry/default/ui/number-field/index.ts
+++ b/apps/www/src/lib/registry/default/ui/number-field/index.ts
@@ -1,6 +1,5 @@
 export { default as NumberField } from './NumberField.vue'
 export { default as NumberFieldInput } from './NumberFieldInput.vue'
-export { default as NumberFieldLabel } from './NumberFieldLabel.vue'
 export { default as NumberFieldIncrement } from './NumberFieldIncrement.vue'
 export { default as NumberFieldDecrement } from './NumberFieldDecrement.vue'
 export { default as NumberFieldContent } from './NumberFieldContent.vue'
diff --git a/apps/www/src/lib/registry/new-york/example/CustomChartTooltip.vue b/apps/www/src/lib/registry/new-york/example/CustomChartTooltip.vue
index 86f72173..ac7a6daa 100644
--- a/apps/www/src/lib/registry/new-york/example/CustomChartTooltip.vue
+++ b/apps/www/src/lib/registry/new-york/example/CustomChartTooltip.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Card, CardContent } from '@/lib/registry/default/ui/card'
+import { Card, CardContent } from '@/lib/registry/new-york/ui/card'
 
 defineProps<{
   title?: string
diff --git a/apps/www/src/lib/registry/new-york/example/NumberFieldCurrency.vue b/apps/www/src/lib/registry/new-york/example/NumberFieldCurrency.vue
index 00906ac6..cc1432f7 100644
--- a/apps/www/src/lib/registry/new-york/example/NumberFieldCurrency.vue
+++ b/apps/www/src/lib/registry/new-york/example/NumberFieldCurrency.vue
@@ -5,8 +5,8 @@ import {
   NumberFieldDecrement,
   NumberFieldIncrement,
   NumberFieldInput,
-  NumberFieldLabel,
 } from '@/lib/registry/new-york/ui/number-field'
+import { Label } from '@/lib/registry/new-york/ui/label'
 </script>
 
 <template>
@@ -19,7 +19,7 @@ import {
       currencySign: 'accounting',
     }"
   >
-    <NumberFieldLabel>Balance</NumberFieldLabel>
+    <Label>Balance</Label>
     <NumberFieldContent>
       <NumberFieldDecrement />
       <NumberFieldInput />
diff --git a/apps/www/src/lib/registry/new-york/example/NumberFieldDecimal.vue b/apps/www/src/lib/registry/new-york/example/NumberFieldDecimal.vue
index 8f39c4e4..6299ba61 100644
--- a/apps/www/src/lib/registry/new-york/example/NumberFieldDecimal.vue
+++ b/apps/www/src/lib/registry/new-york/example/NumberFieldDecimal.vue
@@ -5,8 +5,8 @@ import {
   NumberFieldDecrement,
   NumberFieldIncrement,
   NumberFieldInput,
-  NumberFieldLabel,
 } from '@/lib/registry/new-york/ui/number-field'
+import { Label } from '@/lib/registry/new-york/ui/label'
 </script>
 
 <template>
@@ -17,7 +17,7 @@ import {
       minimumFractionDigits: 1,
     }"
   >
-    <NumberFieldLabel>Number</NumberFieldLabel>
+    <Label>Number</Label>
     <NumberFieldContent>
       <NumberFieldDecrement />
       <NumberFieldInput />
diff --git a/apps/www/src/lib/registry/new-york/example/NumberFieldDemo.vue b/apps/www/src/lib/registry/new-york/example/NumberFieldDemo.vue
index a3b25e0f..9a0172dd 100644
--- a/apps/www/src/lib/registry/new-york/example/NumberFieldDemo.vue
+++ b/apps/www/src/lib/registry/new-york/example/NumberFieldDemo.vue
@@ -5,13 +5,13 @@ import {
   NumberFieldDecrement,
   NumberFieldIncrement,
   NumberFieldInput,
-  NumberFieldLabel,
 } from '@/lib/registry/new-york/ui/number-field'
+import { Label } from '@/lib/registry/new-york/ui/label'
 </script>
 
 <template>
   <NumberField :default-value="18" :min="0">
-    <NumberFieldLabel>Age</NumberFieldLabel>
+    <Label>Age</Label>
     <NumberFieldContent>
       <NumberFieldDecrement />
       <NumberFieldInput />
diff --git a/apps/www/src/lib/registry/new-york/example/NumberFieldDisabled.vue b/apps/www/src/lib/registry/new-york/example/NumberFieldDisabled.vue
index 02f7447b..166d22ab 100644
--- a/apps/www/src/lib/registry/new-york/example/NumberFieldDisabled.vue
+++ b/apps/www/src/lib/registry/new-york/example/NumberFieldDisabled.vue
@@ -5,13 +5,13 @@ import {
   NumberFieldDecrement,
   NumberFieldIncrement,
   NumberFieldInput,
-  NumberFieldLabel,
 } from '@/lib/registry/new-york/ui/number-field'
+import { Label } from '@/lib/registry/new-york/ui/label'
 </script>
 
 <template>
   <NumberField :default-value="18" disabled>
-    <NumberFieldLabel>Age</NumberFieldLabel>
+    <Label>Age</Label>
     <NumberFieldContent>
       <NumberFieldDecrement />
       <NumberFieldInput />
diff --git a/apps/www/src/lib/registry/new-york/example/NumberFieldPercentage.vue b/apps/www/src/lib/registry/new-york/example/NumberFieldPercentage.vue
index 102c915b..47259a54 100644
--- a/apps/www/src/lib/registry/new-york/example/NumberFieldPercentage.vue
+++ b/apps/www/src/lib/registry/new-york/example/NumberFieldPercentage.vue
@@ -5,8 +5,8 @@ import {
   NumberFieldDecrement,
   NumberFieldIncrement,
   NumberFieldInput,
-  NumberFieldLabel,
 } from '@/lib/registry/new-york/ui/number-field'
+import { Label } from '@/lib/registry/new-york/ui/label'
 </script>
 
 <template>
@@ -17,7 +17,7 @@ import {
       style: 'percent',
     }"
   >
-    <NumberFieldLabel>Percent</NumberFieldLabel>
+    <Label>Percent</Label>
     <NumberFieldContent>
       <NumberFieldDecrement />
       <NumberFieldInput />
diff --git a/apps/www/src/lib/registry/new-york/ui/calendar/CalendarCellTrigger.vue b/apps/www/src/lib/registry/new-york/ui/calendar/CalendarCellTrigger.vue
index 196240ed..4f751343 100644
--- a/apps/www/src/lib/registry/new-york/ui/calendar/CalendarCellTrigger.vue
+++ b/apps/www/src/lib/registry/new-york/ui/calendar/CalendarCellTrigger.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { type HTMLAttributes, computed } from 'vue'
 import { CalendarCellTrigger, type CalendarCellTriggerProps, useForwardProps } from 'radix-vue'
-import { buttonVariants } from '@/lib/registry/default/ui/button'
+import { buttonVariants } from '@/lib/registry/new-york/ui/button'
 import { cn } from '@/lib/utils'
 
 const props = defineProps<CalendarCellTriggerProps & { class?: HTMLAttributes['class'] }>()
diff --git a/apps/www/src/lib/registry/new-york/ui/calendar/CalendarNextButton.vue b/apps/www/src/lib/registry/new-york/ui/calendar/CalendarNextButton.vue
index 8ead0696..d624f4a6 100644
--- a/apps/www/src/lib/registry/new-york/ui/calendar/CalendarNextButton.vue
+++ b/apps/www/src/lib/registry/new-york/ui/calendar/CalendarNextButton.vue
@@ -3,7 +3,7 @@ import { type HTMLAttributes, computed } from 'vue'
 import { CalendarNext, type CalendarNextProps, useForwardProps } from 'radix-vue'
 import { ChevronRightIcon } from '@radix-icons/vue'
 import { cn } from '@/lib/utils'
-import { buttonVariants } from '@/lib/registry/default/ui/button'
+import { buttonVariants } from '@/lib/registry/new-york/ui/button'
 
 const props = defineProps<CalendarNextProps & { class?: HTMLAttributes['class'] }>()
 
diff --git a/apps/www/src/lib/registry/new-york/ui/calendar/CalendarPrevButton.vue b/apps/www/src/lib/registry/new-york/ui/calendar/CalendarPrevButton.vue
index 189d2fb5..b4f92063 100644
--- a/apps/www/src/lib/registry/new-york/ui/calendar/CalendarPrevButton.vue
+++ b/apps/www/src/lib/registry/new-york/ui/calendar/CalendarPrevButton.vue
@@ -3,7 +3,7 @@ import { type HTMLAttributes, computed } from 'vue'
 import { CalendarPrev, type CalendarPrevProps, useForwardProps } from 'radix-vue'
 import { ChevronLeftIcon } from '@radix-icons/vue'
 import { cn } from '@/lib/utils'
-import { buttonVariants } from '@/lib/registry/default/ui/button'
+import { buttonVariants } from '@/lib/registry/new-york/ui/button'
 
 const props = defineProps<CalendarPrevProps & { class?: HTMLAttributes['class'] }>()
 
diff --git a/apps/www/src/lib/registry/new-york/ui/number-field/NumberFieldLabel.vue b/apps/www/src/lib/registry/new-york/ui/number-field/NumberFieldLabel.vue
deleted file mode 100644
index b6c2737a..00000000
--- a/apps/www/src/lib/registry/new-york/ui/number-field/NumberFieldLabel.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<script setup lang="ts">
-import type { NumberFieldLabelProps } from 'radix-vue'
-import { NumberFieldLabel, useForwardProps } from 'radix-vue'
-import { type HTMLAttributes, computed } from 'vue'
-import { cn } from '@/lib/utils'
-
-const props = defineProps<NumberFieldLabelProps & { class?: HTMLAttributes['class'] }>()
-
-const delegatedProps = computed(() => {
-  const { class: _, ...delegated } = props
-
-  return delegated
-})
-
-const forwarded = useForwardProps(delegatedProps)
-</script>
-
-<template>
-  <NumberFieldLabel v-bind="forwarded" :class="cn('text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70', props.class)">
-    <slot />
-  </NumberFieldLabel>
-</template>
diff --git a/apps/www/src/lib/registry/new-york/ui/number-field/index.ts b/apps/www/src/lib/registry/new-york/ui/number-field/index.ts
index 3d33c8d8..45edbe40 100644
--- a/apps/www/src/lib/registry/new-york/ui/number-field/index.ts
+++ b/apps/www/src/lib/registry/new-york/ui/number-field/index.ts
@@ -1,6 +1,5 @@
 export { default as NumberField } from './NumberField.vue'
 export { default as NumberFieldInput } from './NumberFieldInput.vue'
-export { default as NumberFieldLabel } from './NumberFieldLabel.vue'
 export { default as NumberFieldIncrement } from './NumberFieldIncrement.vue'
 export { default as NumberFieldDecrement } from './NumberFieldDecrement.vue'
 export { default as NumberFieldContent } from './NumberFieldContent.vue'
diff --git a/apps/www/src/lib/registry/new-york/ui/range-calendar/RangeCalendarCellTrigger.vue b/apps/www/src/lib/registry/new-york/ui/range-calendar/RangeCalendarCellTrigger.vue
index 283aad5e..653ad8ef 100644
--- a/apps/www/src/lib/registry/new-york/ui/range-calendar/RangeCalendarCellTrigger.vue
+++ b/apps/www/src/lib/registry/new-york/ui/range-calendar/RangeCalendarCellTrigger.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { type HTMLAttributes, computed } from 'vue'
 import { RangeCalendarCellTrigger, type RangeCalendarCellTriggerProps, useForwardProps } from 'radix-vue'
-import { buttonVariants } from '@/lib/registry/default/ui/button'
+import { buttonVariants } from '@/lib/registry/new-york/ui/button'
 import { cn } from '@/lib/utils'
 
 const props = defineProps<RangeCalendarCellTriggerProps & { class?: HTMLAttributes['class'] }>()
diff --git a/apps/www/src/lib/registry/new-york/ui/range-calendar/RangeCalendarNextButton.vue b/apps/www/src/lib/registry/new-york/ui/range-calendar/RangeCalendarNextButton.vue
index eb0487d6..fcb4a097 100644
--- a/apps/www/src/lib/registry/new-york/ui/range-calendar/RangeCalendarNextButton.vue
+++ b/apps/www/src/lib/registry/new-york/ui/range-calendar/RangeCalendarNextButton.vue
@@ -3,7 +3,7 @@ import { type HTMLAttributes, computed } from 'vue'
 import { RangeCalendarNext, type RangeCalendarNextProps, useForwardProps } from 'radix-vue'
 import { ChevronRightIcon } from '@radix-icons/vue'
 import { cn } from '@/lib/utils'
-import { buttonVariants } from '@/lib/registry/default/ui/button'
+import { buttonVariants } from '@/lib/registry/new-york/ui/button'
 
 const props = defineProps<RangeCalendarNextProps & { class?: HTMLAttributes['class'] }>()
 
diff --git a/apps/www/src/lib/registry/new-york/ui/range-calendar/RangeCalendarPrevButton.vue b/apps/www/src/lib/registry/new-york/ui/range-calendar/RangeCalendarPrevButton.vue
index 0934bf50..972744df 100644
--- a/apps/www/src/lib/registry/new-york/ui/range-calendar/RangeCalendarPrevButton.vue
+++ b/apps/www/src/lib/registry/new-york/ui/range-calendar/RangeCalendarPrevButton.vue
@@ -3,7 +3,7 @@ import { type HTMLAttributes, computed } from 'vue'
 import { RangeCalendarPrev, type RangeCalendarPrevProps, useForwardProps } from 'radix-vue'
 import { ChevronLeftIcon } from '@radix-icons/vue'
 import { cn } from '@/lib/utils'
-import { buttonVariants } from '@/lib/registry/default/ui/button'
+import { buttonVariants } from '@/lib/registry/new-york/ui/button'
 
 const props = defineProps<RangeCalendarPrevProps & { class?: HTMLAttributes['class'] }>()