diff --git a/src/lib/components/ui/button/button.svelte b/src/lib/components/ui/button/button.svelte
index fb61a87..a128f14 100644
--- a/src/lib/components/ui/button/button.svelte
+++ b/src/lib/components/ui/button/button.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
-	import { Button as ButtonPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils';
-	import { buttonVariants, type Props, type Events } from '.';
+	import { Button as ButtonPrimitive } from "bits-ui";
+	import { cn } from "$lib/utils";
+	import { buttonVariants, type Props, type Events } from ".";
 
 	type $$Props = Props;
 	type $$Events = Events;
 
-	let className: $$Props['class'] = undefined;
-	export let variant: $$Props['variant'] = 'default';
-	export let size: $$Props['size'] = 'default';
-	export let builders: $$Props['builders'] = [];
+	let className: $$Props["class"] = undefined;
+	export let variant: $$Props["variant"] = "default";
+	export let size: $$Props["size"] = "default";
+	export let builders: $$Props["builders"] = [];
 	export { className as class };
 </script>
 
diff --git a/src/lib/components/ui/button/index.ts b/src/lib/components/ui/button/index.ts
index e300752..86b7231 100644
--- a/src/lib/components/ui/button/index.ts
+++ b/src/lib/components/ui/button/index.ts
@@ -1,34 +1,35 @@
-import type { Button as ButtonPrimitive } from 'bits-ui';
-import { tv, type VariantProps } from 'tailwind-variants';
-import Root from './button.svelte';
+import type { Button as ButtonPrimitive } from "bits-ui";
+import { tv, type VariantProps } from "tailwind-variants";
+import Root from "./button.svelte";
 
 const buttonVariants = tv({
-	base: 'inline-flex items-center justify-center rounded-md text-sm font-medium whitespace-nowrap transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50',
+	base: "inline-flex items-center justify-center rounded-md text-sm font-medium whitespace-nowrap transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50",
 	variants: {
 		variant: {
-			default: 'bg-primary text-primary-foreground shadow hover:bg-primary/90',
-			destructive: 'bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90',
+			default: "bg-primary text-primary-foreground shadow hover:bg-primary/90",
+			destructive:
+				"bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90",
 			outline:
-				'border border-input bg-transparent shadow-sm hover:bg-accent hover:text-accent-foreground',
-			secondary: 'bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80',
-			ghost: 'hover:bg-accent hover:text-accent-foreground',
-			link: 'text-primary underline-offset-4 hover:underline'
+				"border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground",
+			secondary: "bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80",
+			ghost: "hover:bg-accent hover:text-accent-foreground",
+			link: "text-primary underline-offset-4 hover:underline",
 		},
 		size: {
-			default: 'h-9 px-4 py-2',
-			sm: 'h-8 rounded-md px-3 text-xs',
-			lg: 'h-10 rounded-md px-8',
-			icon: 'h-9 w-9'
-		}
+			default: "h-9 px-4 py-2",
+			sm: "h-8 rounded-md px-3 text-xs",
+			lg: "h-10 rounded-md px-8",
+			icon: "h-9 w-9",
+		},
 	},
 	defaultVariants: {
-		variant: 'default',
-		size: 'default'
-	}
+		variant: "default",
+		size: "default",
+	},
 });
 
-type Variant = VariantProps<typeof buttonVariants>['variant'];
-type Size = VariantProps<typeof buttonVariants>['size'];
+type Variant = VariantProps<typeof buttonVariants>["variant"];
+type Size = VariantProps<typeof buttonVariants>["size"];
 
 type Props = ButtonPrimitive.Props & {
 	variant?: Variant;
@@ -45,5 +46,5 @@ export {
 	Root as Button,
 	type Props as ButtonProps,
 	type Events as ButtonEvents,
-	buttonVariants
+	buttonVariants,
 };
diff --git a/src/lib/components/ui/form/form-button.svelte b/src/lib/components/ui/form/form-button.svelte
index a6638e4..881e139 100644
--- a/src/lib/components/ui/form/form-button.svelte
+++ b/src/lib/components/ui/form/form-button.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-	import * as Button from '$lib/components/ui/button';
+	import * as Button from "$lib/components/ui/button";
+
 	type $$Props = Button.Props;
-	type $$Events = Button.Events;
 </script>
 
-<Button.Root type="submit" {...$$restProps} on:click on:keydown>
+<Button.Root type="submit" {...$$restProps}>
 	<slot />
 </Button.Root>
diff --git a/src/lib/components/ui/form/form-checkbox.svelte b/src/lib/components/ui/form/form-checkbox.svelte
deleted file mode 100644
index d667441..0000000
--- a/src/lib/components/ui/form/form-checkbox.svelte
+++ /dev/null
@@ -1,26 +0,0 @@
-<script lang="ts">
-	import { getFormField } from 'formsnap';
-	import type { Checkbox as CheckboxPrimitive } from 'bits-ui';
-	import { Checkbox } from '$lib/components/ui/checkbox';
-	type $$Props = CheckboxPrimitive.Props;
-	type $$Events = CheckboxPrimitive.Events;
-
-	export let onCheckedChange: $$Props['onCheckedChange'] = undefined;
-
-	const { name, setValue, attrStore, value } = getFormField();
-	// eslint-disable-next-line @typescript-eslint/no-unused-vars
-	const { name: nameAttr, value: valueAttr, ...rest } = $attrStore;
-</script>
-
-<Checkbox
-	{...rest}
-	checked={typeof $value === 'boolean' ? $value : false}
-	onCheckedChange={(v) => {
-		onCheckedChange?.(v);
-		setValue(v);
-	}}
-	{...$$restProps}
-	on:click
-	on:keydown
-/>
-<input hidden {name} value={$value} />
diff --git a/src/lib/components/ui/form/form-description.svelte b/src/lib/components/ui/form/form-description.svelte
index 0ba02ca..0cc7564 100644
--- a/src/lib/components/ui/form/form-description.svelte
+++ b/src/lib/components/ui/form/form-description.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
-	import { Form as FormPrimitive } from 'formsnap';
-	import { cn } from '$lib/utils';
-	import type { HTMLAttributes } from 'svelte/elements';
+	import * as FormPrimitive from "formsnap";
+	import { cn } from "$lib/utils";
 
-	type $$Props = HTMLAttributes<HTMLSpanElement>;
-	let className: string | undefined | null = undefined;
+	type $$Props = FormPrimitive.DescriptionProps;
+	let className: $$Props["class"] = undefined;
 	export { className as class };
 </script>
 
 <FormPrimitive.Description
-	class={cn('text-[0.8rem] text-muted-foreground', className)}
+	class={cn("text-[0.8rem] text-muted-foreground", className)}
 	{...$$restProps}
+	let:descriptionAttrs
 >
-	<slot />
+	<slot {descriptionAttrs} />
 </FormPrimitive.Description>
diff --git a/src/lib/components/ui/form/form-element-field.svelte b/src/lib/components/ui/form/form-element-field.svelte
new file mode 100644
index 0000000..12bab55
--- /dev/null
+++ b/src/lib/components/ui/form/form-element-field.svelte
@@ -0,0 +1,26 @@
+<script lang="ts" context="module">
+	// eslint-disable-next-line @typescript-eslint/no-unused-vars
+	import type { FormPathLeaves, SuperForm } from "sveltekit-superforms";
+	type T = Record<string, unknown>;
+	type U = unknown;
+</script>
+
+<script lang="ts" generics="T extends Record<string, unknown>, U extends FormPathLeaves<T>">
+	import type { HTMLAttributes } from "svelte/elements";
+	import * as FormPrimitive from "formsnap";
+	import { cn } from "$lib/utils";
+
+	type $$Props = FormPrimitive.ElementFieldProps<T, U> & HTMLAttributes<HTMLDivElement>;
+
+	export let form: SuperForm<T>;
+	export let name: U;
+
+	let className: $$Props["class"] = undefined;
+	export { className as class };
+</script>
+
+<FormPrimitive.ElementField {form} {name} let:constraints let:errors let:tainted let:value>
+	<div class={cn("space-y-2", className)}>
+		<slot {constraints} {errors} {tainted} {value} />
+	</div>
+</FormPrimitive.ElementField>
diff --git a/src/lib/components/ui/form/form-field-errors.svelte b/src/lib/components/ui/form/form-field-errors.svelte
new file mode 100644
index 0000000..8c9bc12
--- /dev/null
+++ b/src/lib/components/ui/form/form-field-errors.svelte
@@ -0,0 +1,26 @@
+<script lang="ts">
+	import * as FormPrimitive from "formsnap";
+	import { cn } from "$lib/utils";
+
+	type $$Props = FormPrimitive.FieldErrorsProps & {
+		errorClasses?: string | undefined | null;
+	};
+
+	let className: $$Props["class"] = undefined;
+	export { className as class };
+	export let errorClasses: $$Props["class"] = undefined;
+</script>
+
+<FormPrimitive.FieldErrors
+	class={cn("text-[0.8rem] font-medium text-destructive", className)}
+	{...$$restProps}
+	let:errors
+	let:fieldErrorsAttrs
+	let:errorAttrs
+>
+	<slot {errors} {fieldErrorsAttrs} {errorAttrs}>
+		{#each errors as error}
+			<div {...errorAttrs} class={cn(errorClasses)}>{error}</div>
+		{/each}
+	</slot>
+</FormPrimitive.FieldErrors>
diff --git a/src/lib/components/ui/form/form-field.svelte b/src/lib/components/ui/form/form-field.svelte
new file mode 100644
index 0000000..745f87c
--- /dev/null
+++ b/src/lib/components/ui/form/form-field.svelte
@@ -0,0 +1,26 @@
+<script lang="ts" context="module">
+	// eslint-disable-next-line @typescript-eslint/no-unused-vars
+	import type { FormPath, SuperForm } from "sveltekit-superforms";
+	type T = Record<string, unknown>;
+	type U = unknown;
+</script>
+
+<script lang="ts" generics="T extends Record<string, unknown>, U extends FormPath<T>">
+	import type { HTMLAttributes } from "svelte/elements";
+	import * as FormPrimitive from "formsnap";
+	import { cn } from "$lib/utils";
+
+	type $$Props = FormPrimitive.FieldProps<T, U> & HTMLAttributes<HTMLElement>;
+
+	export let form: SuperForm<T>;
+	export let name: U;
+
+	let className: $$Props["class"] = undefined;
+	export { className as class };
+</script>
+
+<FormPrimitive.Field {form} {name} let:constraints let:errors let:tainted let:value>
+	<div class={cn("space-y-2", className)}>
+		<slot {constraints} {errors} {tainted} {value} />
+	</div>
+</FormPrimitive.Field>
diff --git a/src/lib/components/ui/form/form-fieldset.svelte b/src/lib/components/ui/form/form-fieldset.svelte
new file mode 100644
index 0000000..6d35255
--- /dev/null
+++ b/src/lib/components/ui/form/form-fieldset.svelte
@@ -0,0 +1,31 @@
+<script lang="ts" context="module">
+	// eslint-disable-next-line @typescript-eslint/no-unused-vars
+	import type { FormPath, SuperForm } from "sveltekit-superforms";
+	type T = Record<string, unknown>;
+	type U = unknown;
+</script>
+
+<script lang="ts" generics="T extends Record<string, unknown>, U extends FormPath<T>">
+	import * as FormPrimitive from "formsnap";
+	import { cn } from "$lib/utils";
+
+	type $$Props = FormPrimitive.FieldsetProps<T, U>;
+
+	export let form: SuperForm<T>;
+	export let name: U;
+
+	let className: $$Props["class"] = undefined;
+	export { className as class };
+</script>
+
+<FormPrimitive.Fieldset
+	{form}
+	{name}
+	let:constraints
+	let:errors
+	let:tainted
+	let:value
+	class={cn("space-y-2", className)}
+>
+	<slot {constraints} {errors} {tainted} {value} />
+</FormPrimitive.Fieldset>
diff --git a/src/lib/components/ui/form/form-input.svelte b/src/lib/components/ui/form/form-input.svelte
deleted file mode 100644
index 5575015..0000000
--- a/src/lib/components/ui/form/form-input.svelte
+++ /dev/null
@@ -1,28 +0,0 @@
-<script lang="ts">
-	import { getFormField } from 'formsnap';
-	import type { HTMLInputAttributes } from 'svelte/elements';
-	import { Input, type InputEvents } from '$lib/components/ui/input';
-
-	type $$Props = HTMLInputAttributes;
-	type $$Events = InputEvents;
-
-	const { attrStore, value } = getFormField();
-</script>
-
-<Input
-	{...$attrStore}
-	bind:value={$value}
-	{...$$restProps}
-	on:blur
-	on:change
-	on:click
-	on:focus
-	on:keydown
-	on:keypress
-	on:keyup
-	on:mouseover
-	on:mouseenter
-	on:mouseleave
-	on:paste
-	on:input
-/>
diff --git a/src/lib/components/ui/form/form-item.svelte b/src/lib/components/ui/form/form-item.svelte
deleted file mode 100644
index 11b9079..0000000
--- a/src/lib/components/ui/form/form-item.svelte
+++ /dev/null
@@ -1,12 +0,0 @@
-<script lang="ts">
-	import { cn } from '$lib/utils';
-	import type { HTMLAttributes } from 'svelte/elements';
-
-	type $$Props = HTMLAttributes<HTMLDivElement>;
-	let className: string | undefined | null = undefined;
-	export { className as class };
-</script>
-
-<div class={cn('space-y-2', className)} {...$$restProps}>
-	<slot />
-</div>
diff --git a/src/lib/components/ui/form/form-label.svelte b/src/lib/components/ui/form/form-label.svelte
index 8608970..0fd76c6 100644
--- a/src/lib/components/ui/form/form-label.svelte
+++ b/src/lib/components/ui/form/form-label.svelte
@@ -1,17 +1,17 @@
 <script lang="ts">
-	import type { Label as LabelPrimitive } from 'bits-ui';
-	import { getFormField } from 'formsnap';
-	import { cn } from '$lib/utils';
-	import { Label } from '$lib/components/ui/label';
+	import type { Label as LabelPrimitive } from "bits-ui";
+	import { getFormControl } from "formsnap";
+	import { cn } from "$lib/utils";
+	import { Label } from "$lib/components/ui/label";
 
 	type $$Props = LabelPrimitive.Props;
 
-	let className: $$Props['class'] = undefined;
+	let className: $$Props["class"] = undefined;
 	export { className as class };
 
-	const { errors, ids } = getFormField();
+	const { labelAttrs } = getFormControl();
 </script>
 
-<Label for={$ids.input} class={cn($errors && 'text-destructive', className)} {...$$restProps}>
-	<slot />
+<Label {...$labelAttrs} class={cn("data-[fs-error]:text-destructive", className)} {...$$restProps}>
+	<slot {labelAttrs} />
 </Label>
diff --git a/src/lib/components/ui/form/form-legend.svelte b/src/lib/components/ui/form/form-legend.svelte
new file mode 100644
index 0000000..9026f17
--- /dev/null
+++ b/src/lib/components/ui/form/form-legend.svelte
@@ -0,0 +1,17 @@
+<script lang="ts">
+	import * as FormPrimitive from "formsnap";
+	import { cn } from "$lib/utils";
+
+	type $$Props = FormPrimitive.LegendProps;
+
+	let className: $$Props["class"] = undefined;
+	export { className as class };
+</script>
+
+<FormPrimitive.Legend
+	{...$$restProps}
+	class={cn("text-sm font-medium leading-none data-[fs-error]:text-destructive", className)}
+	let:legendAttrs
+>
+	<slot {legendAttrs} />
+</FormPrimitive.Legend>
diff --git a/src/lib/components/ui/form/form-native-select.svelte b/src/lib/components/ui/form/form-native-select.svelte
deleted file mode 100644
index 2e04aa7..0000000
--- a/src/lib/components/ui/form/form-native-select.svelte
+++ /dev/null
@@ -1,26 +0,0 @@
-<script lang="ts">
-	import { Form as FormPrimitive } from 'formsnap';
-	import { buttonVariants } from '$lib/components/ui/button';
-	import { cn } from '$lib/utils';
-	import { CaretSort } from 'radix-icons-svelte';
-	import type { HTMLSelectAttributes } from 'svelte/elements';
-
-	type $$Props = HTMLSelectAttributes;
-
-	let className: string | undefined | null = undefined;
-	export { className as class };
-</script>
-
-<div class="relative">
-	<FormPrimitive.Select
-		class={cn(
-			buttonVariants({ variant: 'outline' }),
-			'appearance-none bg-transparent font-normal',
-			className
-		)}
-		{...$$restProps}
-	>
-		<slot />
-	</FormPrimitive.Select>
-	<CaretSort class="absolute right-3 top-2.5 h-4 w-4 opacity-50" />
-</div>
diff --git a/src/lib/components/ui/form/form-radio-group.svelte b/src/lib/components/ui/form/form-radio-group.svelte
deleted file mode 100644
index c3f70bc..0000000
--- a/src/lib/components/ui/form/form-radio-group.svelte
+++ /dev/null
@@ -1,22 +0,0 @@
-<script lang="ts">
-	import { getFormField } from 'formsnap';
-	import type { RadioGroup as RadioGroupPrimitive } from 'bits-ui';
-	import * as RadioGroup from '$lib/components/ui/radio-group';
-
-	type $$Props = RadioGroupPrimitive.Props;
-	const { attrStore, setValue, name, value } = getFormField();
-
-	export let onValueChange: $$Props['onValueChange'] = undefined;
-</script>
-
-<RadioGroup.Root
-	{...$attrStore}
-	onValueChange={(v) => {
-		onValueChange?.(v);
-		setValue(v);
-	}}
-	{...$$restProps}
->
-	<slot />
-	<input hidden {name} value={$value} />
-</RadioGroup.Root>
diff --git a/src/lib/components/ui/form/form-select-trigger.svelte b/src/lib/components/ui/form/form-select-trigger.svelte
deleted file mode 100644
index f389a02..0000000
--- a/src/lib/components/ui/form/form-select-trigger.svelte
+++ /dev/null
@@ -1,18 +0,0 @@
-<script lang="ts">
-	import * as Select from '$lib/components/ui/select';
-	import type { Select as SelectPrimitive } from 'bits-ui';
-	import { getFormField } from 'formsnap';
-
-	type $$Props = SelectPrimitive.TriggerProps & {
-		placeholder?: string;
-	};
-	type $$Events = SelectPrimitive.TriggerEvents;
-	const { attrStore, value } = getFormField();
-	export let placeholder = '';
-</script>
-
-<Select.Trigger {...$$restProps} {...$attrStore} on:click on:keydown>
-	<slot value={$value}>
-		<Select.Value {placeholder} />
-	</slot>
-</Select.Trigger>
diff --git a/src/lib/components/ui/form/form-select.svelte b/src/lib/components/ui/form/form-select.svelte
deleted file mode 100644
index b884f92..0000000
--- a/src/lib/components/ui/form/form-select.svelte
+++ /dev/null
@@ -1,20 +0,0 @@
-<script lang="ts">
-	import * as Select from '$lib/components/ui/select';
-	import { getFormField } from 'formsnap';
-	import type { Select as SelectPrimitive } from 'bits-ui';
-
-	type $$Props = SelectPrimitive.Props<unknown>;
-	const { setValue, name, value } = getFormField();
-	export let onSelectedChange: $$Props['onSelectedChange'] = undefined;
-</script>
-
-<Select.Root
-	onSelectedChange={(v) => {
-		onSelectedChange?.(v);
-		setValue(v ? v.value : undefined);
-	}}
-	{...$$restProps}
->
-	<slot />
-	<input hidden {name} value={$value} />
-</Select.Root>
diff --git a/src/lib/components/ui/form/form-switch.svelte b/src/lib/components/ui/form/form-switch.svelte
deleted file mode 100644
index ff9d0a6..0000000
--- a/src/lib/components/ui/form/form-switch.svelte
+++ /dev/null
@@ -1,24 +0,0 @@
-<script lang="ts">
-	import { getFormField } from 'formsnap';
-	import type { Switch as SwitchPrimitive } from 'bits-ui';
-	import { Switch } from '$lib/components/ui/switch';
-	type $$Props = SwitchPrimitive.Props;
-	type $$Events = SwitchPrimitive.Events;
-
-	export let onCheckedChange: $$Props['onCheckedChange'] = undefined;
-
-	const { name, setValue, attrStore, value } = getFormField();
-</script>
-
-<Switch
-	{...$attrStore}
-	checked={typeof $value === 'boolean' ? $value : false}
-	onCheckedChange={(v) => {
-		onCheckedChange?.(v);
-		setValue(v);
-	}}
-	{...$$restProps}
-	on:click
-	on:keydown
-/>
-<input hidden {name} value={$value} />
diff --git a/src/lib/components/ui/form/form-textarea.svelte b/src/lib/components/ui/form/form-textarea.svelte
deleted file mode 100644
index 5d34734..0000000
--- a/src/lib/components/ui/form/form-textarea.svelte
+++ /dev/null
@@ -1,29 +0,0 @@
-<script lang="ts">
-	import { getFormField } from 'formsnap';
-	import type { HTMLTextareaAttributes } from 'svelte/elements';
-	import type { TextareaGetFormField } from '.';
-	import { Textarea, type TextareaEvents } from '$lib/components/ui/textarea';
-
-	type $$Props = HTMLTextareaAttributes;
-	type $$Events = TextareaEvents;
-
-	const { attrStore, value } = getFormField() as TextareaGetFormField;
-</script>
-
-<Textarea
-	{...$attrStore}
-	bind:value={$value}
-	{...$$restProps}
-	on:blur
-	on:change
-	on:click
-	on:focus
-	on:keydown
-	on:keypress
-	on:keyup
-	on:mouseover
-	on:mouseenter
-	on:mouseleave
-	on:paste
-	on:input
-/>
diff --git a/src/lib/components/ui/form/form-validation.svelte b/src/lib/components/ui/form/form-validation.svelte
deleted file mode 100644
index 43db1cc..0000000
--- a/src/lib/components/ui/form/form-validation.svelte
+++ /dev/null
@@ -1,14 +0,0 @@
-<script lang="ts">
-	import { Form as FormPrimitive } from 'formsnap';
-	import { cn } from '$lib/utils';
-	import type { HTMLAttributes } from 'svelte/elements';
-
-	type $$Props = HTMLAttributes<HTMLParagraphElement>;
-	let className: string | undefined | null = undefined;
-	export { className as class };
-</script>
-
-<FormPrimitive.Validation
-	class={cn('text-[0.8rem] font-medium text-destructive', className)}
-	{...$$restProps}
-/>
diff --git a/src/lib/components/ui/form/index.ts b/src/lib/components/ui/form/index.ts
index d154c72..80fdf6c 100644
--- a/src/lib/components/ui/form/index.ts
+++ b/src/lib/components/ui/form/index.ts
@@ -1,82 +1,33 @@
-import { Form as FormPrimitive, getFormField } from 'formsnap';
-import type { Writable } from 'svelte/store';
-import * as RadioGroupComp from '$lib/components/ui/radio-group';
-import * as SelectComp from '$lib/components/ui/select';
-import Item from './form-item.svelte';
-import Input from './form-input.svelte';
-import Textarea from './form-textarea.svelte';
-import Description from './form-description.svelte';
-import Label from './form-label.svelte';
-import Validation from './form-validation.svelte';
-import Checkbox from './form-checkbox.svelte';
-import Switch from './form-switch.svelte';
-import NativeSelect from './form-native-select.svelte';
-import RadioGroup from './form-radio-group.svelte';
-import Select from './form-select.svelte';
-import SelectTrigger from './form-select-trigger.svelte';
-import Button from './form-button.svelte';
+import * as FormPrimitive from "formsnap";
+import Description from "./form-description.svelte";
+import Label from "./form-label.svelte";
+import FieldErrors from "./form-field-errors.svelte";
+import Field from "./form-field.svelte";
+import Button from "./form-button.svelte";
+import Fieldset from "./form-fieldset.svelte";
+import Legend from "./form-legend.svelte";
+import ElementField from "./form-element-field.svelte";
 
-const Root = FormPrimitive.Root;
-const Field = FormPrimitive.Field;
 const Control = FormPrimitive.Control;
-const RadioItem = RadioGroupComp.Item;
-const NativeRadio = FormPrimitive.Radio;
-const SelectContent = SelectComp.Content;
-const SelectLabel = SelectComp.Label;
-const SelectGroup = SelectComp.Group;
-const SelectItem = SelectComp.Item;
-const SelectSeparator = SelectComp.Separator;
-
-export type TextareaGetFormField = Omit<ReturnType<typeof getFormField>, 'value'> & {
-	value: Writable<string>;
-};
 
 export {
-	Root,
 	Field,
 	Control,
-	Item,
-	Input,
 	Label,
-	Button,
-	Switch,
-	Select,
-	Checkbox,
-	Textarea,
-	Validation,
-	RadioGroup,
-	RadioItem,
+	FieldErrors,
 	Description,
-	SelectContent,
-	SelectLabel,
-	SelectGroup,
-	SelectItem,
-	SelectSeparator,
-	SelectTrigger,
-	NativeSelect,
-	NativeRadio,
+	Fieldset,
+	Legend,
+	ElementField,
+	Button,
 	//
-	Root as Form,
 	Field as FormField,
 	Control as FormControl,
-	Item as FormItem,
-	Input as FormInput,
-	Textarea as FormTextarea,
 	Description as FormDescription,
 	Label as FormLabel,
-	Validation as FormValidation,
-	NativeSelect as FormNativeSelect,
-	NativeRadio as FormNativeRadio,
-	Checkbox as FormCheckbox,
-	Switch as FormSwitch,
-	RadioGroup as FormRadioGroup,
-	RadioItem as FormRadioItem,
-	Select as FormSelect,
-	SelectContent as FormSelectContent,
-	SelectLabel as FormSelectLabel,
-	SelectGroup as FormSelectGroup,
-	SelectItem as FormSelectItem,
-	SelectSeparator as FormSelectSeparator,
-	SelectTrigger as FormSelectTrigger,
-	Button as FormButton
+	FieldErrors as FormFieldErrors,
+	Fieldset as FormFieldset,
+	Legend as FormLegend,
+	ElementField as FormElementField,
+	Button as FormButton,
 };
diff --git a/src/lib/components/ui/label/index.ts b/src/lib/components/ui/label/index.ts
index 808d141..8bfca0b 100644
--- a/src/lib/components/ui/label/index.ts
+++ b/src/lib/components/ui/label/index.ts
@@ -1,7 +1,7 @@
-import Root from './label.svelte';
+import Root from "./label.svelte";
 
 export {
 	Root,
 	//
-	Root as Label
+	Root as Label,
 };
diff --git a/src/lib/components/ui/label/label.svelte b/src/lib/components/ui/label/label.svelte
index 026d2b3..c4a542b 100644
--- a/src/lib/components/ui/label/label.svelte
+++ b/src/lib/components/ui/label/label.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
-	import { Label as LabelPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils';
+	import { Label as LabelPrimitive } from "bits-ui";
+	import { cn } from "$lib/utils";
 
 	type $$Props = LabelPrimitive.Props;
 
-	let className: $$Props['class'] = undefined;
+	let className: $$Props["class"] = undefined;
 	export { className as class };
 </script>
 
 <LabelPrimitive.Root
 	class={cn(
-		'text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70',
+		"text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70",
 		className
 	)}
 	{...$$restProps}