diff --git a/resources/js/packages/api/package.json b/resources/js/packages/api/package.json
index 67125c37..1e47665c 100644
--- a/resources/js/packages/api/package.json
+++ b/resources/js/packages/api/package.json
@@ -12,6 +12,7 @@
     },
     "scripts": {
         "build": "vite build",
+        "watch": "vite build --watch",
         "test": "echo \"Error: no test specified\" && exit 1"
     },
     "files": [
@@ -28,7 +29,7 @@
     "author": "solidtime",
     "license": "AGPL-3.0",
     "devDependencies": {
-        "vite-plugin-dts": "^4.0.3"
+        "vite-plugin-dts": "^4.5.4"
     },
     "peerDependencies": {
         "@zodios/core": "^10.9.6",
diff --git a/resources/js/packages/ui/package.json b/resources/js/packages/ui/package.json
index 6e13fce1..6cba9380 100644
--- a/resources/js/packages/ui/package.json
+++ b/resources/js/packages/ui/package.json
@@ -48,10 +48,10 @@
     "author": "solidtime",
     "license": "AGPL-3.0",
     "devDependencies": {
-        "@types/chroma-js": "^3.1.0",
+        "@types/chroma-js": "^3.1.2",
         "@zodios/core": "^10.9.6",
-        "vite-plugin-dts": "^4.0.3",
-        "zod": "^3.23.8"
+        "vite-plugin-dts": "^4.5.4",
+        "zod": "^3.25.76"
     },
     "peerDependencies": {
         "@floating-ui/vue": "^1.1.4",
@@ -64,7 +64,7 @@
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
         "dayjs": "^1.11.13",
-        "lucide-vue-next": ">=0.453.0",
+        "@lucide/vue": ">=1.0.0",
         "@internationalized/date": "^3.0.0",
         "parse-duration": "^2.0.1",
         "radix-vue": "^1.9.0",
diff --git a/resources/js/packages/ui/src/Client/ClientDropdown.vue b/resources/js/packages/ui/src/Client/ClientDropdown.vue
index ae033bd5..7586e944 100644
--- a/resources/js/packages/ui/src/Client/ClientDropdown.vue
+++ b/resources/js/packages/ui/src/Client/ClientDropdown.vue
@@ -11,7 +11,7 @@ import {
 } from 'radix-vue';
 import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component';
 import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
-import { Check, Plus } from 'lucide-vue-next';
+import { Check, Plus } from '@lucide/vue';
 
 const model = defineModel<string | null>({
     default: null,
diff --git a/resources/js/packages/ui/src/FullCalendar/CalendarSettingsPopover.vue b/resources/js/packages/ui/src/FullCalendar/CalendarSettingsPopover.vue
index 452f646c..7888170c 100644
--- a/resources/js/packages/ui/src/FullCalendar/CalendarSettingsPopover.vue
+++ b/resources/js/packages/ui/src/FullCalendar/CalendarSettingsPopover.vue
@@ -2,7 +2,7 @@
 import { Popover, PopoverContent, PopoverTrigger, Button } from '..';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '..';
 import { Field, FieldLabel } from '../field';
-import { Settings } from 'lucide-vue-next';
+import { Settings } from '@lucide/vue';
 import { ref, watch } from 'vue';
 import type { CalendarSettings } from './calendarSettings';
 
diff --git a/resources/js/packages/ui/src/FullCalendar/CalendarToolbar.vue b/resources/js/packages/ui/src/FullCalendar/CalendarToolbar.vue
index 1070ffb0..035a03ae 100644
--- a/resources/js/packages/ui/src/FullCalendar/CalendarToolbar.vue
+++ b/resources/js/packages/ui/src/FullCalendar/CalendarToolbar.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { Button } from '..';
-import { ChevronLeft, ChevronRight } from 'lucide-vue-next';
+import { ChevronLeft, ChevronRight } from '@lucide/vue';
 import { Tabs, TabsList } from '../tabs';
 import TabBarItem from '../TabBar/TabBarItem.vue';
 import CalendarSettingsPopover from './CalendarSettingsPopover.vue';
diff --git a/resources/js/packages/ui/src/Input/DatePicker.vue b/resources/js/packages/ui/src/Input/DatePicker.vue
index f5fb9b4d..38485963 100644
--- a/resources/js/packages/ui/src/Input/DatePicker.vue
+++ b/resources/js/packages/ui/src/Input/DatePicker.vue
@@ -9,7 +9,7 @@ import {
 import { Popover, PopoverContent, PopoverTrigger } from '@/packages/ui/src/popover';
 import { Calendar } from '..';
 import { Button } from '@/packages/ui/src/Buttons';
-import { CalendarIcon, XIcon } from 'lucide-vue-next';
+import { CalendarIcon, XIcon } from '@lucide/vue';
 import { parseDate, type DateValue } from '@internationalized/date';
 import type { Organization } from '@/packages/api/src';
 
diff --git a/resources/js/packages/ui/src/Input/DateRangePicker.vue b/resources/js/packages/ui/src/Input/DateRangePicker.vue
index 9228569f..b9190f2f 100644
--- a/resources/js/packages/ui/src/Input/DateRangePicker.vue
+++ b/resources/js/packages/ui/src/Input/DateRangePicker.vue
@@ -3,7 +3,7 @@ import { Popover, PopoverContent, PopoverTrigger } from '../popover';
 import Button from '../Buttons/Button.vue';
 import { RangeCalendar } from '../range-calendar';
 import { CalendarDate } from '@internationalized/date';
-import { CalendarIcon } from 'lucide-vue-next';
+import { CalendarIcon } from '@lucide/vue';
 import { computed, ref, inject, type ComputedRef, watch } from 'vue';
 import { twMerge } from 'tailwind-merge';
 import {
diff --git a/resources/js/packages/ui/src/Project/ProjectCreateModal.vue b/resources/js/packages/ui/src/Project/ProjectCreateModal.vue
index 3623bc32..e708d092 100644
--- a/resources/js/packages/ui/src/Project/ProjectCreateModal.vue
+++ b/resources/js/packages/ui/src/Project/ProjectCreateModal.vue
@@ -10,7 +10,7 @@ import { useFocus } from '@vueuse/core';
 import ClientDropdown from '@/packages/ui/src/Client/ClientDropdown.vue';
 import ProjectColorSelector from '@/packages/ui/src/Project/ProjectColorSelector.vue';
 import { Button } from '@/packages/ui/src/Buttons';
-import { ChevronDown } from 'lucide-vue-next';
+import { ChevronDown } from '@lucide/vue';
 import { UserCircleIcon } from '@heroicons/vue/20/solid';
 import EstimatedTimeSection from '@/packages/ui/src/EstimatedTimeSection.vue';
 import { Field, FieldGroup, FieldLabel } from '../field';
diff --git a/resources/js/packages/ui/src/accordion/AccordionTrigger.vue b/resources/js/packages/ui/src/accordion/AccordionTrigger.vue
index 4f25e6ca..753a166a 100644
--- a/resources/js/packages/ui/src/accordion/AccordionTrigger.vue
+++ b/resources/js/packages/ui/src/accordion/AccordionTrigger.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { cn } from '../utils/cn';
-import { ChevronDown } from 'lucide-vue-next';
+import { ChevronDown } from '@lucide/vue';
 import { AccordionHeader, AccordionTrigger, type AccordionTriggerProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 
diff --git a/resources/js/packages/ui/src/calendar/CalendarNextButton.vue b/resources/js/packages/ui/src/calendar/CalendarNextButton.vue
index aafb3a3c..e4e26774 100644
--- a/resources/js/packages/ui/src/calendar/CalendarNextButton.vue
+++ b/resources/js/packages/ui/src/calendar/CalendarNextButton.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { cn, buttonVariants } from '@/packages/ui/src/index';
-import { ChevronRight } from 'lucide-vue-next';
+import { ChevronRight } from '@lucide/vue';
 import { CalendarNext, type CalendarNextProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 
diff --git a/resources/js/packages/ui/src/calendar/CalendarPrevButton.vue b/resources/js/packages/ui/src/calendar/CalendarPrevButton.vue
index 39a4a90f..bc2f0105 100644
--- a/resources/js/packages/ui/src/calendar/CalendarPrevButton.vue
+++ b/resources/js/packages/ui/src/calendar/CalendarPrevButton.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { cn, buttonVariants } from '@/packages/ui/src';
-import { ChevronLeft } from 'lucide-vue-next';
+import { ChevronLeft } from '@lucide/vue';
 import { CalendarPrev, type CalendarPrevProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 
diff --git a/resources/js/packages/ui/src/command/CommandInput.vue b/resources/js/packages/ui/src/command/CommandInput.vue
index c20284eb..5b5bc51b 100644
--- a/resources/js/packages/ui/src/command/CommandInput.vue
+++ b/resources/js/packages/ui/src/command/CommandInput.vue
@@ -2,7 +2,7 @@
 import type { ListboxFilterProps } from 'reka-ui';
 import type { HTMLAttributes } from 'vue';
 import { reactiveOmit } from '@vueuse/core';
-import { Search } from 'lucide-vue-next';
+import { Search } from '@lucide/vue';
 import { ListboxFilter, useForwardProps } from 'reka-ui';
 import { cn } from '../utils/cn';
 import { useCommand } from '.';
diff --git a/resources/js/packages/ui/src/context-menu/ContextMenuCheckboxItem.vue b/resources/js/packages/ui/src/context-menu/ContextMenuCheckboxItem.vue
index ce4ce5c8..247983c3 100644
--- a/resources/js/packages/ui/src/context-menu/ContextMenuCheckboxItem.vue
+++ b/resources/js/packages/ui/src/context-menu/ContextMenuCheckboxItem.vue
@@ -2,7 +2,7 @@
 import type { ContextMenuCheckboxItemEmits, ContextMenuCheckboxItemProps } from 'reka-ui';
 import type { HTMLAttributes } from 'vue';
 import { reactiveOmit } from '@vueuse/core';
-import { Check } from 'lucide-vue-next';
+import { Check } from '@lucide/vue';
 import { ContextMenuCheckboxItem, ContextMenuItemIndicator, useForwardPropsEmits } from 'reka-ui';
 import { cn } from '../utils/cn';
 
diff --git a/resources/js/packages/ui/src/context-menu/ContextMenuRadioItem.vue b/resources/js/packages/ui/src/context-menu/ContextMenuRadioItem.vue
index 0eb44e0b..cbbad7ef 100644
--- a/resources/js/packages/ui/src/context-menu/ContextMenuRadioItem.vue
+++ b/resources/js/packages/ui/src/context-menu/ContextMenuRadioItem.vue
@@ -2,7 +2,7 @@
 import type { ContextMenuRadioItemEmits, ContextMenuRadioItemProps } from 'reka-ui';
 import type { HTMLAttributes } from 'vue';
 import { reactiveOmit } from '@vueuse/core';
-import { Circle } from 'lucide-vue-next';
+import { Circle } from '@lucide/vue';
 import { ContextMenuItemIndicator, ContextMenuRadioItem, useForwardPropsEmits } from 'reka-ui';
 import { cn } from '../utils/cn';
 
diff --git a/resources/js/packages/ui/src/context-menu/ContextMenuSubTrigger.vue b/resources/js/packages/ui/src/context-menu/ContextMenuSubTrigger.vue
index a974d608..8eccd2ea 100644
--- a/resources/js/packages/ui/src/context-menu/ContextMenuSubTrigger.vue
+++ b/resources/js/packages/ui/src/context-menu/ContextMenuSubTrigger.vue
@@ -2,7 +2,7 @@
 import type { ContextMenuSubTriggerProps } from 'reka-ui';
 import type { HTMLAttributes } from 'vue';
 import { reactiveOmit } from '@vueuse/core';
-import { ChevronRight } from 'lucide-vue-next';
+import { ChevronRight } from '@lucide/vue';
 import { ContextMenuSubTrigger, useForwardProps } from 'reka-ui';
 import { cn } from '../utils/cn';
 
diff --git a/resources/js/packages/ui/src/dialog/DialogScrollContent.vue b/resources/js/packages/ui/src/dialog/DialogScrollContent.vue
index b7980a42..f2c0d3e4 100644
--- a/resources/js/packages/ui/src/dialog/DialogScrollContent.vue
+++ b/resources/js/packages/ui/src/dialog/DialogScrollContent.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { cn } from '../utils/cn';
-import { X } from 'lucide-vue-next';
+import { X } from '@lucide/vue';
 import {
     DialogClose,
     DialogContent,
diff --git a/resources/js/packages/ui/src/dropdown-menu/DropdownMenuCheckboxItem.vue b/resources/js/packages/ui/src/dropdown-menu/DropdownMenuCheckboxItem.vue
index 4796f954..f1044a9b 100644
--- a/resources/js/packages/ui/src/dropdown-menu/DropdownMenuCheckboxItem.vue
+++ b/resources/js/packages/ui/src/dropdown-menu/DropdownMenuCheckboxItem.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { cn } from '../utils/cn';
-import { Check } from 'lucide-vue-next';
+import { Check } from '@lucide/vue';
 import {
     DropdownMenuCheckboxItem,
     type DropdownMenuCheckboxItemEmits,
diff --git a/resources/js/packages/ui/src/dropdown-menu/DropdownMenuRadioItem.vue b/resources/js/packages/ui/src/dropdown-menu/DropdownMenuRadioItem.vue
index ea660b99..d510a053 100644
--- a/resources/js/packages/ui/src/dropdown-menu/DropdownMenuRadioItem.vue
+++ b/resources/js/packages/ui/src/dropdown-menu/DropdownMenuRadioItem.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { cn } from '../utils/cn';
-import { Circle } from 'lucide-vue-next';
+import { Circle } from '@lucide/vue';
 import {
     DropdownMenuItemIndicator,
     DropdownMenuRadioItem,
diff --git a/resources/js/packages/ui/src/dropdown-menu/DropdownMenuSubTrigger.vue b/resources/js/packages/ui/src/dropdown-menu/DropdownMenuSubTrigger.vue
index ee0282fa..a2b7501e 100644
--- a/resources/js/packages/ui/src/dropdown-menu/DropdownMenuSubTrigger.vue
+++ b/resources/js/packages/ui/src/dropdown-menu/DropdownMenuSubTrigger.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { cn } from '../utils/cn';
-import { ChevronRight } from 'lucide-vue-next';
+import { ChevronRight } from '@lucide/vue';
 import { DropdownMenuSubTrigger, type DropdownMenuSubTriggerProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 
diff --git a/resources/js/packages/ui/src/number-field/NumberFieldDecrement.vue b/resources/js/packages/ui/src/number-field/NumberFieldDecrement.vue
index 18cc89fd..747d37ea 100644
--- a/resources/js/packages/ui/src/number-field/NumberFieldDecrement.vue
+++ b/resources/js/packages/ui/src/number-field/NumberFieldDecrement.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { NumberFieldDecrementProps } from 'reka-ui';
 import { cn } from '../utils/cn';
-import { Minus } from 'lucide-vue-next';
+import { Minus } from '@lucide/vue';
 import { NumberFieldDecrement, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 
diff --git a/resources/js/packages/ui/src/number-field/NumberFieldIncrement.vue b/resources/js/packages/ui/src/number-field/NumberFieldIncrement.vue
index 1b8f14be..aae49fc2 100644
--- a/resources/js/packages/ui/src/number-field/NumberFieldIncrement.vue
+++ b/resources/js/packages/ui/src/number-field/NumberFieldIncrement.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { NumberFieldIncrementProps } from 'reka-ui';
 import { cn } from '../utils/cn';
-import { Plus } from 'lucide-vue-next';
+import { Plus } from '@lucide/vue';
 import { NumberFieldIncrement, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 
diff --git a/resources/js/packages/ui/src/range-calendar/RangeCalendarNextButton.vue b/resources/js/packages/ui/src/range-calendar/RangeCalendarNextButton.vue
index 2b957428..0e80a5a6 100644
--- a/resources/js/packages/ui/src/range-calendar/RangeCalendarNextButton.vue
+++ b/resources/js/packages/ui/src/range-calendar/RangeCalendarNextButton.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { cn, buttonVariants } from '@/packages/ui/src';
-import { ChevronRight } from 'lucide-vue-next';
+import { ChevronRight } from '@lucide/vue';
 import { RangeCalendarNext, type RangeCalendarNextProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 
diff --git a/resources/js/packages/ui/src/range-calendar/RangeCalendarPrevButton.vue b/resources/js/packages/ui/src/range-calendar/RangeCalendarPrevButton.vue
index 13518fb3..35a5f2fb 100644
--- a/resources/js/packages/ui/src/range-calendar/RangeCalendarPrevButton.vue
+++ b/resources/js/packages/ui/src/range-calendar/RangeCalendarPrevButton.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { cn, buttonVariants } from '@/packages/ui/src';
-import { ChevronLeft } from 'lucide-vue-next';
+import { ChevronLeft } from '@lucide/vue';
 import { RangeCalendarPrev, type RangeCalendarPrevProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 
diff --git a/resources/js/packages/ui/src/select/SelectItem.vue b/resources/js/packages/ui/src/select/SelectItem.vue
index f41a6ff2..702f2f1c 100644
--- a/resources/js/packages/ui/src/select/SelectItem.vue
+++ b/resources/js/packages/ui/src/select/SelectItem.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { cn } from '../utils/cn';
-import { Check } from 'lucide-vue-next';
+import { Check } from '@lucide/vue';
 import {
     SelectItem,
     SelectItemIndicator,
diff --git a/resources/js/packages/ui/src/select/SelectScrollDownButton.vue b/resources/js/packages/ui/src/select/SelectScrollDownButton.vue
index 95995973..60788471 100644
--- a/resources/js/packages/ui/src/select/SelectScrollDownButton.vue
+++ b/resources/js/packages/ui/src/select/SelectScrollDownButton.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { cn } from '../utils/cn';
-import { ChevronDown } from 'lucide-vue-next';
+import { ChevronDown } from '@lucide/vue';
 import { SelectScrollDownButton, type SelectScrollDownButtonProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 
diff --git a/resources/js/packages/ui/src/select/SelectScrollUpButton.vue b/resources/js/packages/ui/src/select/SelectScrollUpButton.vue
index 6ae6ea16..d75910b8 100644
--- a/resources/js/packages/ui/src/select/SelectScrollUpButton.vue
+++ b/resources/js/packages/ui/src/select/SelectScrollUpButton.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { cn } from '../utils/cn';
-import { ChevronUp } from 'lucide-vue-next';
+import { ChevronUp } from '@lucide/vue';
 import { SelectScrollUpButton, type SelectScrollUpButtonProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 
diff --git a/resources/js/packages/ui/src/select/SelectTrigger.vue b/resources/js/packages/ui/src/select/SelectTrigger.vue
index 4c8a6f75..4adb9d4b 100644
--- a/resources/js/packages/ui/src/select/SelectTrigger.vue
+++ b/resources/js/packages/ui/src/select/SelectTrigger.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { cn } from '../utils/cn';
-import { ChevronDown } from 'lucide-vue-next';
+import { ChevronDown } from '@lucide/vue';
 import { SelectIcon, SelectTrigger, type SelectTriggerProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 
diff --git a/resources/js/packages/ui/vite.config.js b/resources/js/packages/ui/vite.config.js
index 3908f916..f40eab09 100644
--- a/resources/js/packages/ui/vite.config.js
+++ b/resources/js/packages/ui/vite.config.js
@@ -19,7 +19,7 @@ export default defineConfig({
             // into your library
             external: [
                 'vue',
-                'lucide-vue-next',
+                '@lucide/vue',
                 '@floating-ui/vue',
                 '@heroicons/vue',
                 /^@heroicons\/vue\/.*/,