diff --git a/src/lib/components/DataInput/TextInput.stories.svelte b/src/lib/components/DataInput/TextInput.stories.svelte
index 74eb578..55223ed 100644
--- a/src/lib/components/DataInput/TextInput.stories.svelte
+++ b/src/lib/components/DataInput/TextInput.stories.svelte
@@ -6,27 +6,36 @@
 		title: 'Data Input/Text Input',
 		component: TextInput,
 		argTypes: {
+			bordered: {
+				control: 'boolean',
+			},
 			color: {
 				control: 'select',
 				options: [
+					'ghost',
 					'primary',
 					'secondary',
 					'accent',
-					'ghost',
-					'link',
 					'info',
 					'success',
 					'warning',
 					'error',
 				],
 			},
-			bordered: {
+			disabled: {
 				control: 'boolean',
 			},
+			error: {
+				control: 'text',
+			},
+			fade: { control: 'boolean' },
+			start: { control: 'text' },
+			end: { control: 'text' },
+			label: { control: 'text' },
+			placeholder: { control: 'text' },
 			size: {
 				control: 'select',
-				options: ['Default', 'xs', 'sm', 'lg'],
-				defaultValue: 'Default',
+				options: ['xs', 'sm', '-', 'lg'],
 			},
 			type: {
 				control: 'select',
@@ -42,4 +51,4 @@
 
 <Story name="Text Label" args={{ color: 'primary', name: 'text', start: 'Text' }} />
 <Story name="Icon Start" args={{ color: 'secondary', name: 'text', start: icon }} />
-<Story name="Icon End" args={{ color: 'secondary', name: 'text', end: icon }} />
+<Story name="Icon End" args={{ color: 'secondary', name: 'text', end: icon }} />
\ No newline at end of file
diff --git a/src/lib/components/DataInput/TextInput.svelte b/src/lib/components/DataInput/TextInput.svelte
index affbd2c..5b7fc02 100644
--- a/src/lib/components/DataInput/TextInput.svelte
+++ b/src/lib/components/DataInput/TextInput.svelte
@@ -8,9 +8,11 @@
 		bordered?: boolean;
 		color?: Exclude<DaisyColor, 'neutral'>;
 		disabled?: boolean;
+		error?: string | Snippet;
 		fade?: boolean;
-		start?: Snippet | string;
-		end?: Snippet | string;
+		start?: string | Snippet;
+		end?: string | Snippet;
+		label?: string | Snippet;
 		name: string;
 		placeholder?: string;
 		size?: DaisySize;
@@ -24,9 +26,11 @@
 		bordered = false,
 		color,
 		disabled,
+		error,
 		fade,
 		start,
 		end,
+		label,
 		name,
 		placeholder,
 		size,
@@ -34,35 +38,62 @@
 	}: Props = $props();
 </script>
 
-<label
-	transition:fadeTransition={{ duration: fade ? 200 : 0 }}
-	class="input flex w-full items-center gap-2"
-	class:input-bordered={bordered}
-	class:input-xs={size === 'xs'}
-	class:input-sm={size === 'sm'}
-	class:input-lg={size === 'lg'}
-	class:input-primary={color === 'primary'}
-	class:input-secondary={color === 'secondary'}
-	class:input-accent={color === 'accent'}
-	class:input-ghost={color === 'ghost'}
-	class:input-link={color === 'link'}
-	class:input-info={color === 'info'}
-	class:input-success={color === 'success'}
-	class:input-warning={color === 'warning'}
-	class:input-error={color === 'error'}
->
-	{#if typeof start === 'string'}
-		{start}
-	{:else}
-		{@render start?.()}
-	{/if}
-	<input {disabled} {name} {placeholder} {type} class="grow" />
-	{#if typeof end === 'string'}
-		{end}
-	{:else}
-		{@render end?.()}
-	{/if}
+<label class="form-control w-full">
+	<div class="label">
+		<span
+			class="label-text"
+			class:text-primary={color === 'primary'}
+			class:text-secondary={color === 'secondary'}
+			class:text-accent={color === 'accent'}
+			class:text-info={color === 'info'}
+			class:text-success={color === 'success'}
+			class:text-warning={color === 'warning'}
+			class:text-error={color === 'error' || error}
+		>
+			{#if typeof label === 'string'}
+				{label}
+			{:else if label}
+				{@render label()}
+			{/if}
+		</span>
+		<span class="label-text-alt font-semibold text-error">
+			{#if typeof error === 'string'}
+				{error}
+			{:else if error}
+				{@render error()}
+			{/if}
+		</span>
+	</div>
+	<div
+		transition:fadeTransition={{ duration: fade ? 200 : 0 }}
+		class="input flex w-full items-center gap-2"
+		class:input-bordered={bordered}
+		class:input-xs={size === 'xs'}
+		class:input-sm={size === 'sm'}
+		class:input-lg={size === 'lg'}
+		class:input-primary={color === 'primary'}
+		class:input-secondary={color === 'secondary'}
+		class:input-accent={color === 'accent'}
+		class:input-ghost={color === 'ghost'}
+		class:input-link={color === 'link'}
+		class:input-info={color === 'info'}
+		class:input-success={color === 'success'}
+		class:input-warning={color === 'warning'}
+		class:input-error={color === 'error' || error}
+	>
+		{#if typeof start === 'string'}
+			{start}
+		{:else}
+			{@render start?.()}
+		{/if}
+		<input {disabled} {name} {placeholder} {type} class="grow" />
+		{#if typeof end === 'string'}
+			{end}
+		{:else}
+			{@render end?.()}
+		{/if}
+	</div>
 </label>
 
 <style>
-</style>
+</style>
\ No newline at end of file