diff --git a/src/lib/server/db/schema.ts b/src/lib/server/db/schema.ts
index 34042b4..47dc321 100644
--- a/src/lib/server/db/schema.ts
+++ b/src/lib/server/db/schema.ts
@@ -213,6 +213,8 @@ export const templateItems = pgTable(
 			.notNull()
 			.references(() => checklistTemplates.id, { onDelete: 'cascade' }),
 		text: text('text').notNull(),
+		itemType: text('item_type').notNull().default('checkbox'), // 'checkbox' or 'input'
+		unit: text('unit'), // e.g. 'RPM', 'dB', '%'
 		sortOrder: integer('sort_order').default(0).notNull()
 	},
 	(table) => [index('template_items_template_idx').on(table.templateId)]
@@ -241,7 +243,10 @@ export const checklistItems = pgTable(
 			.notNull()
 			.references(() => deviceChecklists.id, { onDelete: 'cascade' }),
 		text: text('text').notNull(),
+		itemType: text('item_type').notNull().default('checkbox'), // 'checkbox' or 'input'
+		unit: text('unit'), // e.g. 'RPM', 'dB', '%'
 		checked: boolean('checked').default(false).notNull(),
+		value: text('value'), // for input type items
 		sortOrder: integer('sort_order').default(0).notNull(),
 		createdAt: timestamp('created_at', { withTimezone: true }).defaultNow().notNull()
 	},
diff --git a/src/routes/(app)/checklists/+page.server.ts b/src/routes/(app)/checklists/+page.server.ts
index 1f2fed5..0842847 100644
--- a/src/routes/(app)/checklists/+page.server.ts
+++ b/src/routes/(app)/checklists/+page.server.ts
@@ -11,7 +11,7 @@ export const load: PageServerLoad = async () => {
 		.orderBy(checklistTemplates.title);
 
 	const templateIds = templates.map((t) => t.id);
-	let itemsByTemplate: Record<string, Array<{ id: string; text: string; sortOrder: number }>> = {};
+	let itemsByTemplate: Record<string, Array<{ id: string; text: string; itemType: string; unit: string | null; sortOrder: number }>> = {};
 
 	if (templateIds.length > 0) {
 		const allItems = await db
@@ -19,6 +19,8 @@ export const load: PageServerLoad = async () => {
 				id: templateItems.id,
 				templateId: templateItems.templateId,
 				text: templateItems.text,
+				itemType: templateItems.itemType,
+				unit: templateItems.unit,
 				sortOrder: templateItems.sortOrder
 			})
 			.from(templateItems)
@@ -65,6 +67,8 @@ export const actions: Actions = {
 		const formData = await request.formData();
 		const templateId = formData.get('templateId') as string;
 		const text = (formData.get('text') as string)?.trim();
+		const itemType = (formData.get('itemType') as string) || 'checkbox';
+		const unit = (formData.get('unit') as string)?.trim();
 		if (!text) return fail(400, { error: 'Item text is required' });
 
 		const existing = await db
@@ -77,6 +81,8 @@ export const actions: Actions = {
 		await db.insert(templateItems).values({
 			templateId,
 			text,
+			itemType,
+			unit: unit || null,
 			sortOrder: (existing[0]?.sortOrder ?? -1) + 1
 		});
 
diff --git a/src/routes/(app)/checklists/+page.svelte b/src/routes/(app)/checklists/+page.svelte
index 7829124..4c3c6de 100644
--- a/src/routes/(app)/checklists/+page.svelte
+++ b/src/routes/(app)/checklists/+page.svelte
@@ -5,7 +5,9 @@
 	let showNewTemplate = $state(false);
 	function resetForm(form: HTMLFormElement) {
 		const input = form.querySelector('input[name="text"]') as HTMLInputElement;
+		const unit = form.querySelector('input[name="unit"]') as HTMLInputElement;
 		if (input) input.value = '';
+		if (unit) unit.value = '';
 	}
 </script>
 
@@ -85,6 +87,11 @@
 							<div class="group flex items-center gap-2 rounded-md py-1">
 								<span class="text-sm text-gray-400 dark:text-gray-500">{item.sortOrder + 1}.</span>
 								<span class="flex-1 text-sm text-gray-700 dark:text-gray-300">{item.text}</span>
+								{#if item.itemType === 'input'}
+									<span class="rounded bg-purple-100 px-1.5 py-0.5 text-xs text-purple-700 dark:bg-purple-900/40 dark:text-purple-300">
+										input{#if item.unit}: {item.unit}{/if}
+									</span>
+								{/if}
 								<form method="POST" action="?/deleteItem" use:enhance>
 									<input type="hidden" name="itemId" value={item.id} />
 									<button type="submit" class="hidden text-gray-400 hover:text-red-500 group-hover:block dark:text-gray-500 dark:hover:text-red-400" title="Remove">
@@ -108,12 +115,22 @@
 							};
 						}}
 						data-template={template.id}
-						class="mt-2 flex gap-2">
+						class="mt-2 space-y-2">
 						<input type="hidden" name="templateId" value={template.id} />
-						<input type="text" name="text" required
-							placeholder="Add item..."
-							class="flex-1 rounded-md border border-gray-200 px-3 py-1.5 text-sm focus:border-blue-500 focus:ring-1 focus:ring-blue-500 focus:outline-none dark:border-gray-600 dark:bg-gray-700 dark:text-white dark:placeholder-gray-400" />
-						<button type="submit" class="rounded-md border border-gray-300 px-3 py-1.5 text-sm text-gray-600 hover:bg-gray-100 dark:border-gray-600 dark:text-gray-400 dark:hover:bg-gray-700">Add</button>
+						<div class="flex gap-2">
+							<input type="text" name="text" required
+								placeholder="Add item..."
+								class="flex-1 rounded-md border border-gray-200 px-3 py-1.5 text-sm focus:border-blue-500 focus:ring-1 focus:ring-blue-500 focus:outline-none dark:border-gray-600 dark:bg-gray-700 dark:text-white dark:placeholder-gray-400" />
+							<select name="itemType"
+								class="rounded-md border border-gray-200 px-2 py-1.5 text-sm dark:border-gray-600 dark:bg-gray-700 dark:text-white">
+								<option value="checkbox">Checkbox</option>
+								<option value="input">Text input</option>
+							</select>
+							<input type="text" name="unit"
+								placeholder="Unit"
+								class="w-20 rounded-md border border-gray-200 px-2 py-1.5 text-sm focus:border-blue-500 focus:ring-1 focus:ring-blue-500 focus:outline-none dark:border-gray-600 dark:bg-gray-700 dark:text-white dark:placeholder-gray-400" />
+							<button type="submit" class="rounded-md border border-gray-300 px-3 py-1.5 text-sm text-gray-600 hover:bg-gray-100 dark:border-gray-600 dark:text-gray-400 dark:hover:bg-gray-700">Add</button>
+						</div>
 					</form>
 				</div>
 			{/each}
diff --git a/src/routes/(app)/devices/[id]/+page.server.ts b/src/routes/(app)/devices/[id]/+page.server.ts
index 0d2bf2c..a9b1616 100644
--- a/src/routes/(app)/devices/[id]/+page.server.ts
+++ b/src/routes/(app)/devices/[id]/+page.server.ts
@@ -115,7 +115,7 @@ export const load: PageServerLoad = async ({ params }) => {
 
 	const checklistIds = checklists.map((c) => c.id);
 	let itemsByChecklist: Record<string, typeof allItems> = {};
-	let allItems: Array<{ id: string; checklistId: string; text: string; checked: boolean; sortOrder: number; createdAt: Date }> = [];
+	let allItems: Array<{ id: string; checklistId: string; text: string; itemType: string; unit: string | null; checked: boolean; value: string | null; sortOrder: number; createdAt: Date }> = [];
 
 	if (checklistIds.length > 0) {
 		allItems = await db
@@ -284,6 +284,8 @@ export const actions: Actions = {
 		const formData = await request.formData();
 		const checklistId = formData.get('checklistId') as string;
 		const text = (formData.get('text') as string)?.trim();
+		const itemType = (formData.get('itemType') as string) || 'checkbox';
+		const unit = (formData.get('unit') as string)?.trim();
 		if (!text) return fail(400, { error: 'Item text is required' });
 
 		// Get next sort order
@@ -299,6 +301,8 @@ export const actions: Actions = {
 		await db.insert(checklistItems).values({
 			checklistId,
 			text,
+			itemType,
+			unit: unit || null,
 			sortOrder: nextOrder
 		});
 
@@ -318,6 +322,19 @@ export const actions: Actions = {
 		return { itemToggled: true };
 	},
 
+	saveChecklistValue: async ({ request }) => {
+		const formData = await request.formData();
+		const itemId = formData.get('itemId') as string;
+		const value = formData.get('value') as string;
+
+		await db
+			.update(checklistItems)
+			.set({ value: value || null })
+			.where(eq(checklistItems.id, itemId));
+
+		return { valueSaved: true };
+	},
+
 	deleteChecklistItem: async ({ request }) => {
 		const formData = await request.formData();
 		const itemId = formData.get('itemId') as string;
@@ -359,6 +376,8 @@ export const actions: Actions = {
 				items.map((item) => ({
 					checklistId: checklist.id,
 					text: item.text,
+					itemType: item.itemType,
+					unit: item.unit,
 					sortOrder: item.sortOrder
 				}))
 			);
diff --git a/src/routes/(app)/devices/[id]/+page.svelte b/src/routes/(app)/devices/[id]/+page.svelte
index f2e25be..2b0c64f 100644
--- a/src/routes/(app)/devices/[id]/+page.svelte
+++ b/src/routes/(app)/devices/[id]/+page.svelte
@@ -13,7 +13,9 @@
 	let showImportChecklist = $state(false);
 	function resetInput(formEl: HTMLFormElement) {
 		const input = formEl.querySelector('input[name="text"]') as HTMLInputElement;
+		const unit = formEl.querySelector('input[name="unit"]') as HTMLInputElement;
 		if (input) input.value = '';
+		if (unit) unit.value = '';
 	}
 </script>
 
@@ -405,36 +407,62 @@
 								{/if}
 
 								<!-- Items -->
-								<div class="space-y-1">
+								<div class="space-y-1.5">
 									{#each checklist.items as item}
-										<div class="group flex items-center gap-2">
-											<form method="POST" action="?/toggleChecklistItem" use:enhance class="flex items-center">
-												<input type="hidden" name="itemId" value={item.id} />
-												<input type="hidden" name="checked" value={String(item.checked)} />
-												<button type="submit" class="flex h-5 w-5 flex-shrink-0 items-center justify-center rounded border
-													{item.checked
-														? 'border-green-500 bg-green-500 text-white dark:border-green-400 dark:bg-green-500'
-														: 'border-gray-300 hover:border-blue-400 dark:border-gray-600 dark:hover:border-blue-500'}
-												">
-													{#if item.checked}
-														<svg class="h-3 w-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-															<path stroke-linecap="round" stroke-linejoin="round" stroke-width="3" d="M5 13l4 4L19 7" />
-														</svg>
+										{#if item.itemType === 'input'}
+											<!-- Input type item -->
+											<div class="group flex items-center gap-2">
+												<span class="flex-shrink-0 text-sm text-gray-700 dark:text-gray-300">{item.text}</span>
+												<form method="POST" action="?/saveChecklistValue" use:enhance class="flex flex-1 items-center gap-1">
+													<input type="hidden" name="itemId" value={item.id} />
+													<input type="text" name="value" value={item.value ?? ''}
+														placeholder="—"
+														class="w-24 rounded border border-gray-200 px-2 py-0.5 text-sm text-right font-mono focus:border-blue-500 focus:ring-1 focus:ring-blue-500 focus:outline-none dark:border-gray-600 dark:bg-gray-700 dark:text-white" />
+													{#if item.unit}
+														<span class="text-xs text-gray-400 dark:text-gray-500">{item.unit}</span>
 													{/if}
-												</button>
-											</form>
-											<span class="flex-1 text-sm {item.checked ? 'text-gray-400 line-through dark:text-gray-500' : 'text-gray-700 dark:text-gray-300'}">
-												{item.text}
-											</span>
-											<form method="POST" action="?/deleteChecklistItem" use:enhance>
-												<input type="hidden" name="itemId" value={item.id} />
-												<button type="submit" class="hidden text-gray-400 hover:text-red-500 group-hover:block dark:text-gray-500 dark:hover:text-red-400" title="Remove">
-													<svg class="h-3.5 w-3.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-														<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
-													</svg>
-												</button>
-											</form>
-										</div>
+													<button type="submit" class="rounded px-1.5 py-0.5 text-xs text-blue-600 hover:bg-blue-50 dark:text-blue-400 dark:hover:bg-blue-900/20">Save</button>
+												</form>
+												<form method="POST" action="?/deleteChecklistItem" use:enhance>
+													<input type="hidden" name="itemId" value={item.id} />
+													<button type="submit" class="hidden text-gray-400 hover:text-red-500 group-hover:block dark:text-gray-500 dark:hover:text-red-400" title="Remove">
+														<svg class="h-3.5 w-3.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+															<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+														</svg>
+													</button>
+												</form>
+											</div>
+										{:else}
+											<!-- Checkbox type item -->
+											<div class="group flex items-center gap-2">
+												<form method="POST" action="?/toggleChecklistItem" use:enhance class="flex items-center">
+													<input type="hidden" name="itemId" value={item.id} />
+													<input type="hidden" name="checked" value={String(item.checked)} />
+													<button type="submit" class="flex h-5 w-5 flex-shrink-0 items-center justify-center rounded border
+														{item.checked
+															? 'border-green-500 bg-green-500 text-white dark:border-green-400 dark:bg-green-500'
+															: 'border-gray-300 hover:border-blue-400 dark:border-gray-600 dark:hover:border-blue-500'}
+													">
+														{#if item.checked}
+															<svg class="h-3 w-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+																<path stroke-linecap="round" stroke-linejoin="round" stroke-width="3" d="M5 13l4 4L19 7" />
+															</svg>
+														{/if}
+													</button>
+												</form>
+												<span class="flex-1 text-sm {item.checked ? 'text-gray-400 line-through dark:text-gray-500' : 'text-gray-700 dark:text-gray-300'}">
+													{item.text}
+												</span>
+												<form method="POST" action="?/deleteChecklistItem" use:enhance>
+													<input type="hidden" name="itemId" value={item.id} />
+													<button type="submit" class="hidden text-gray-400 hover:text-red-500 group-hover:block dark:text-gray-500 dark:hover:text-red-400" title="Remove">
+														<svg class="h-3.5 w-3.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+															<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+														</svg>
+													</button>
+												</form>
+											</div>
+										{/if}
 									{/each}
 								</div>
 
@@ -454,6 +482,13 @@
 									<input type="text" name="text" required
 										placeholder="Add item..."
 										class="flex-1 rounded-md border border-gray-200 px-2 py-1 text-sm focus:border-blue-500 focus:ring-1 focus:ring-blue-500 focus:outline-none dark:border-gray-600 dark:bg-gray-700 dark:text-white dark:placeholder-gray-400" />
+									<select name="itemType"
+										class="rounded-md border border-gray-200 px-1 py-1 text-xs dark:border-gray-600 dark:bg-gray-700 dark:text-white">
+										<option value="checkbox">Check</option>
+										<option value="input">Input</option>
+									</select>
+									<input type="text" name="unit" placeholder="Unit"
+										class="w-16 rounded-md border border-gray-200 px-2 py-1 text-xs focus:border-blue-500 focus:ring-1 focus:ring-blue-500 focus:outline-none dark:border-gray-600 dark:bg-gray-700 dark:text-white dark:placeholder-gray-400" />
 									<button type="submit" class="rounded-md px-2 py-1 text-sm text-blue-600 hover:bg-blue-50 dark:text-blue-400 dark:hover:bg-blue-900/20">
 										<svg class="h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
 											<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4" />