diff --git a/resources/js/packages/ui/package-lock.json b/resources/js/packages/ui/package-lock.json
index 0c6972d1..ee9e8db8 100644
--- a/resources/js/packages/ui/package-lock.json
+++ b/resources/js/packages/ui/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@solidtime/ui",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@solidtime/ui",
-            "version": "0.0.2",
+            "version": "0.0.3",
             "license": "AGPL-3.0",
             "devDependencies": {
                 "@types/node": "^22.4.1",
diff --git a/resources/js/packages/ui/package.json b/resources/js/packages/ui/package.json
index 2505a77f..39387c48 100644
--- a/resources/js/packages/ui/package.json
+++ b/resources/js/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@solidtime/ui",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "description": "Package containing the solidtime ui components",
     "main": "./dist/solidtime-ui-lib.umd.cjs",
     "module": "./dist/solidtime-ui-lib.js",
diff --git a/resources/js/packages/ui/src/index.ts b/resources/js/packages/ui/src/index.ts
index 779c0b42..a885995b 100644
--- a/resources/js/packages/ui/src/index.ts
+++ b/resources/js/packages/ui/src/index.ts
@@ -5,64 +5,43 @@ declare global {
     }
 }
 
-export * from './utils/money';
-export * from './utils/color';
-export * from './utils/random';
-export * from './utils/time';
+import * as money from './utils/money';
+import * as color from './utils/color';
+import * as random from './utils/random';
+import * as time from './utils/time';
 
-export * from './Badge.vue';
-export * from './BillableRateModal.vue';
-export * from './CardTitle.vue';
-export * from './DaySectionHeader.vue';
-export * from './DialogModal.vue';
-export * from './GroupedItemsCountButton.vue';
-export * from './LoadingSpinner.vue';
-export * from './Modal.vue';
-export * from './TimeTrackerStartStop.vue';
+import PrimaryButton from './Buttons/PrimaryButton.vue';
+import SecondaryButton from './Buttons/SecondaryButton.vue';
+import TimeTrackerStartStop from './TimeTrackerStartStop.vue';
+import ProjectBadge from './Project/ProjectBadge.vue';
+import LoadingSpinner from './LoadingSpinner.vue';
+import Modal from './Modal.vue';
+import TextInput from './Input/TextInput.vue';
+import InputLabel from './Input/InputLabel.vue';
+import TimeTrackerRunningInDifferentOrganizationOverlay from './TimeTracker/TimeTrackerRunningInDifferentOrganizationOverlay.vue';
+import TimeTrackerControls from './TimeTracker/TimeTrackerControls.vue';
+import CardTitle from './TimeTracker/TimeTrackerControls.vue';
+import SelectDropdown from './TimeTracker/TimeTrackerControls.vue';
+import Badge from './Badge.vue';
+import Checkbox from './Input/Checkbox.vue';
 
-export * from './TimeTracker/TimeTrackerControls.vue';
-export * from './TimeTracker/TimeTrackerProjectTaskDropdown.vue';
-export * from './TimeTracker/TimeTrackerRangeSelector.vue';
-export * from './TimeTracker/TimeTrackerRunningInDifferentOrganizationOverlay.vue';
-export * from './TimeTracker/TimeTrackerTagDropdown.vue';
-
-export * from './TimeEntry/TimeEntryAggregateRow.vue';
-export * from './TimeEntry/TimeEntryDescriptionInput.vue';
-export * from './TimeEntry/TimeEntryGroupedTable.vue';
-export * from './TimeEntry/TimeEntryMoreOptionsDropdown.vue';
-export * from './TimeEntry/TimeEntryRangeSelector.vue';
-export * from './TimeEntry/TimeEntryRow.vue';
-export * from './TimeEntry/TimeEntryRowDurationInput.vue';
-export * from './TimeEntry/TimeEntryRowHeading.vue';
-export * from './TimeEntry/TimeEntryRowTagDropdown.vue';
-
-export * from './Tag/TagBadge.vue';
-export * from './Tag/TagCreateModal.vue';
-export * from './Tag/TagDropdown.vue';
-
-export * from './Project/ProjectBadge.vue';
-export * from './Project/ProjectBillableRateModal.vue';
-export * from './Project/ProjectBillableSelect.vue';
-export * from './Project/ProjectColorSelector.vue';
-export * from './Project/ProjectCreateModal.vue';
-
-export * from './Input/BillableRateInput.vue';
-export * from './Input/BillableToggleButton.vue';
-export * from './Input/Checkbox.vue';
-export * from './Input/DatePicker.vue';
-export * from './Input/DateRangePicker.vue';
-export * from './Input/Dropdown.vue';
-export * from './Input/InputError.vue';
-export * from './Input/InputLabel.vue';
-export * from './Input/SelectDropdown.vue';
-export * from './Input/SelectDropdownItem.vue';
-export * from './Input/TextInput.vue';
-
-export * from './Icons/BillableIcon.vue';
-
-export * from './Client/ClientDropdown.vue';
-export * from './Client/ClientDropdownItem.vue';
-
-export * from './Buttons/DangerButton.vue';
-export * from './Buttons/PrimaryButton.vue';
-export * from './Buttons/SecondaryButton.vue';
+export {
+    money,
+    color,
+    random,
+    time,
+    PrimaryButton,
+    SecondaryButton,
+    TimeTrackerStartStop,
+    ProjectBadge,
+    LoadingSpinner,
+    Modal,
+    TextInput,
+    InputLabel,
+    TimeTrackerRunningInDifferentOrganizationOverlay,
+    TimeTrackerControls,
+    CardTitle,
+    SelectDropdown,
+    Badge,
+    Checkbox
+};