diff --git a/package-lock.json b/package-lock.json
index dcf870208..2cf99b394 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "@sysvale/cuida",
-	"version": "3.154.11",
+	"version": "3.154.12",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@sysvale/cuida",
-			"version": "3.154.11",
+			"version": "3.154.12",
 			"dependencies": {
 				"@popperjs/core": "^2.11.6",
 				"@sysvale/cuida-icons": "^1.18.0",
diff --git a/package.json b/package.json
index 82c939c6a..357a70484 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sysvale/cuida",
-	"version": "3.154.11",
+	"version": "3.154.12",
 	"description": "A design system built by Sysvale, using storybook and Vue components",
 	"repository": {
 		"type": "git",
diff --git a/src/components/InlineDateInput.vue b/src/components/InlineDateInput.vue
index 75e3c4f8b..6d95bbe87 100644
--- a/src/components/InlineDateInput.vue
+++ b/src/components/InlineDateInput.vue
@@ -184,7 +184,7 @@ export default {
 			inputControl: 0,
 			attributes: [
 				{
-					dates: new Date(),
+					dates: DateTime.now().toJSDate(),
 					dot: true,
 				},
 			],
diff --git a/src/components/InternalComponents/MonthSelectorGrid.vue b/src/components/InternalComponents/MonthSelectorGrid.vue
index 49972af64..aa8e2fac4 100644
--- a/src/components/InternalComponents/MonthSelectorGrid.vue
+++ b/src/components/InternalComponents/MonthSelectorGrid.vue
@@ -20,6 +20,7 @@
 <script setup>
 import CdsGrid from '../Grid.vue';
 import { computed, ref, onMounted, watch } from 'vue';
+import { DateTime } from 'luxon';
 
 defineOptions({ name: 'CdsMonthSelectorGrid' });
 
@@ -45,7 +46,7 @@ const props = defineProps({
 	},
 	year: {
 		type: Number,
-		default: new Date().getFullYear(),
+		default: DateTime.now().year,
 	},
 });
 
diff --git a/src/components/InternalComponents/YearSelectorGrid.vue b/src/components/InternalComponents/YearSelectorGrid.vue
index 5e9204cdf..861d3aec1 100644
--- a/src/components/InternalComponents/YearSelectorGrid.vue
+++ b/src/components/InternalComponents/YearSelectorGrid.vue
@@ -34,6 +34,7 @@
 
 <script setup>
 import { ref, computed, onUnmounted } from 'vue';
+import { DateTime } from 'luxon';
 import CdsGrid from '../Grid.vue';
 
 defineOptions({ name: 'CdsYearSelectorGrid' });
@@ -61,7 +62,7 @@ const props = defineProps({
 const emits = defineEmits(['click']);
 
 /* REACTIVE DATA */
-const todayYear = new Date().getFullYear();
+const todayYear = DateTime.now().year;
 const selectedYear = computed(() => {
 	if (!props.selectedDate) return null;
 	return parseInt(props.selectedDate.split('-')[0]);
diff --git a/src/tests/SelectorGridHighlight.spec.js b/src/tests/SelectorGridHighlight.spec.js
index c7969e541..9d87b6bcc 100644
--- a/src/tests/SelectorGridHighlight.spec.js
+++ b/src/tests/SelectorGridHighlight.spec.js
@@ -1,12 +1,20 @@
-import { describe, test, expect, beforeEach, vi } from 'vitest';
+import { describe, test, expect, beforeEach, afterEach, vi } from 'vitest';
 import { mount } from '@vue/test-utils';
 import MonthSelectorGrid from '../components/InternalComponents/MonthSelectorGrid.vue';
 import YearSelectorGrid from '../components/InternalComponents/YearSelectorGrid.vue';
+import { Settings } from 'luxon';
 
 describe('SelectorGrid Highlight Fix', () => {
 	beforeEach(() => {
 		vi.useFakeTimers();
-		vi.setSystemTime(new Date(2026, 1, 10)); // Feb 10, 2026
+		const mockDate = new Date(2026, 1, 10); // Feb 10, 2026
+		vi.setSystemTime(mockDate);
+		Settings.now = () => mockDate.getTime();
+	});
+
+	afterEach(() => {
+		vi.useRealTimers();
+		Settings.now = () => Date.now();
 	});
 
 	describe('MonthSelectorGrid', () => {
diff --git a/src/utils/constants/inputTypes.js b/src/utils/constants/inputTypes.js
index 2493928d7..ab1381638 100644
--- a/src/utils/constants/inputTypes.js
+++ b/src/utils/constants/inputTypes.js
@@ -1 +1 @@
-export default ['text', 'textarea', 'email', 'password', 'tel', 'number', 'search', 'url'];
+export default ['text', 'textarea', 'email', 'password', 'tel', 'number', 'search', 'url', 'date'];