diff --git a/src/lib/button/Button.svelte b/src/lib/button/Button.svelte
index e6d78e4..aef4dad 100644
--- a/src/lib/button/Button.svelte
+++ b/src/lib/button/Button.svelte
@@ -2,24 +2,17 @@
 	import type { ColorMode, FillMode, ButtonType } from '$lib/types';
 
 	import { COLOR_MODE, FILL_MODE, BUTTON_TYPE } from '$lib/types';
-	import { createEventDispatcher } from 'svelte';
 
 	export let type: ButtonType = BUTTON_TYPE.BUTTON;
 	export let color: ColorMode;
 	export let fill: FillMode;
 	export let disabled = false;
-
-	const dispatch = createEventDispatcher();
-
-	function dispatchEvent(event: Event) {
-		dispatch(event.type);
-	}
 </script>
 
 <button
 	{disabled}
 	type={type === BUTTON_TYPE.SUBMIT ? 'submit' : 'button'}
-	on:click={dispatchEvent}
+	on:click
 	class="w-full rounded-md border px-4 py-2 focus:outline-none"
 	class:bg-transparent={fill === FILL_MODE.RING}
 	class:bg-spek-primary-600={fill === FILL_MODE.FILL && color === COLOR_MODE.PRIMARY}
diff --git a/src/lib/datepicker/Datepicker.svelte b/src/lib/datepicker/Datepicker.svelte
index d428173..c111666 100644
--- a/src/lib/datepicker/Datepicker.svelte
+++ b/src/lib/datepicker/Datepicker.svelte
@@ -1,20 +1,12 @@
 <script lang="ts">
-	import { createEventDispatcher } from 'svelte';
-
 	export let value: string;
 	export let name = '';
-
-	const dispatch = createEventDispatcher();
-
-	function dispatchEvent(event: Event) {
-		dispatch(event.type);
-	}
 </script>
 
 <input
 	{name}
 	type="date"
 	bind:value
-	on:change={dispatchEvent}
+	on:change
 	class="w-full rounded border bg-spek-facade-50 p-1 text-sm outline-none outline-offset-0 focus:outline-spek-primary-400 dark:border-transparent dark:bg-spek-facade-500"
 />
diff --git a/src/lib/textbox/Textbox.svelte b/src/lib/textbox/Textbox.svelte
index 4655861..405f0d9 100644
--- a/src/lib/textbox/Textbox.svelte
+++ b/src/lib/textbox/Textbox.svelte
@@ -1,20 +1,12 @@
 <script lang="ts">
-	import { createEventDispatcher } from 'svelte';
-
 	export let value: string;
 	export let name = '';
-
-	const dispatch = createEventDispatcher();
-
-	function dispatchEvent(event: Event) {
-		dispatch(event.type);
-	}
 </script>
 
 <input
 	{name}
 	type="text"
 	bind:value
-	on:change={dispatchEvent}
+	on:change
 	class="w-full rounded border bg-spek-facade-50 p-1 text-sm outline-none outline-offset-0 focus:outline-spek-primary-400 dark:border-transparent dark:bg-spek-facade-500"
 />