diff --git a/src/app.postcss b/src/app.postcss
index b340066f..e12220b2 100644
--- a/src/app.postcss
+++ b/src/app.postcss
@@ -12,3 +12,16 @@ body {
 [type='text']:focus {
 	--tw-ring-color: #00000;
 }
+
+.svelte-select, .svelte-select-list {
+	@apply dark:!bg-zinc-700 border dark:!border-zinc-500;
+}
+
+.multi-item {
+	@apply dark:!bg-zinc-500 dark:!outline-zinc-400;
+}
+
+.list-item .item.hover:not(.active):not(.list-group-title) {
+	@apply dark:!text-black;
+}
+
diff --git a/src/lib/components/Facets/Facets.svelte b/src/lib/components/Facets/Facets.svelte
index f4fa6e5c..5783d901 100644
--- a/src/lib/components/Facets/Facets.svelte
+++ b/src/lib/components/Facets/Facets.svelte
@@ -26,7 +26,7 @@
 				ref: ShowMore,
 				props: {
 					group,
-					handleSave,
+					handleApply,
 					handleCancel
 				}
 			}
@@ -45,7 +45,7 @@
 
 	const modalStore = getModalStore();
 
-	const handleSave = (group: SelectedFacetGroup) => {
+	const handleApply = (group: SelectedFacetGroup) => {
 		const { name: groupName, children } = group;
 
 		dispatch('showMoreOpenChange', {
@@ -110,9 +110,8 @@
 		changed.length && dispatch('facetSelect', changed);
 	};
 
-	// Keeping the sorting function, but stays unused for now
 	const sortOptions = () => {
-		// Sort facets in a descending order if count exits, or sort alphabetically
+		// Sort facets in a descending order if count exits
 		Object.keys(selected).forEach((group) => {
 			const checked = Object.keys(selected[group].children)
 				.filter((item) => selected[group].children[item].selected)
@@ -121,13 +120,20 @@
 					if (a.count != undefined && b.count != undefined) {
 						return b.count - a.count;
 					}
-					return a.displayName.localeCompare(b.displayName);
+					return 0;
 				})
 				.map((item) => item.name);
 
-			const unchecked = Object.keys(selected[group].children).filter(
-				(item) => !checked.includes(item)
-			);
+			const unchecked = Object.keys(selected[group].children)
+				.filter((item) => !checked.includes(item))
+				.map((item) => selected[group].children[item])
+				.sort((a, b) => {
+					if (a.count != undefined && b.count != undefined) {
+						return b.count - a.count;
+					}
+					return 0;
+				})
+				.map((item) => item.name);
 
 			const groupIndex = displayedGroups.findIndex((g) => g.name === group);
 
@@ -172,7 +178,7 @@
 	});
 
 	$: displayedGroups = structuredClone($groups);
-	$: selectedItems, mapSelected('items'); // sortOptions(); // Sorting is not used for now
+	$: selectedItems, mapSelected('items'), sortOptions();
 	$: selectedGroups, mapSelected('groups');
 </script>
 
@@ -186,7 +192,7 @@
 			bind:checked={selectedGroups[group.name]}
 			bind:group={selectedGroups}
 		>
-			<p class="font-semibold">
+			<p class="font-semibold whitespace-nowrap">
 				{group.displayName}{group.count !== undefined ? ` (${group.count})` : ''}
 			</p>
 
@@ -204,7 +210,12 @@
 							selection
 							multiple
 						>
-							<p>{item.displayName} ({item.count})</p>
+							<div class="flex gap-2">
+								<p class="w-max grow truncate">
+									<span title={item.displayName}>{item.displayName}</span>
+								</p>
+								<span>({item.count})</span>
+							</div>
 						</TreeViewItem>
 					{/each}
 					<!-- Trigger for the Modal to view all options -->
@@ -226,7 +237,12 @@
 							selection
 							multiple
 						>
-							<p>{item.displayName} ({item.count})</p>
+							<div class="flex gap-2">
+								<p class="w-max grow truncate">
+									<span title={item.displayName}>{item.displayName}</span>
+								</p>
+								<span>({item.count})</span>
+							</div>
 						</TreeViewItem>
 					{/each}
 				{/if}
diff --git a/src/lib/components/Facets/ShowMore.svelte b/src/lib/components/Facets/ShowMore.svelte
index 24598fbe..56964025 100644
--- a/src/lib/components/Facets/ShowMore.svelte
+++ b/src/lib/components/Facets/ShowMore.svelte
@@ -2,7 +2,7 @@
 	import type { SelectedFacetGroup } from '$models/Models';
 
 	export let group: SelectedFacetGroup;
-	export let handleSave: (group: SelectedFacetGroup) => {};
+	export let handleApply: (group: SelectedFacetGroup) => {};
 	export let handleCancel: (groupName: string) => {};
 
 	let selected = structuredClone(group.children);
@@ -15,8 +15,8 @@
 		Object.keys(selected).forEach((key) => (selected[key].selected = false));
 	};
 
-	const onSave = () => {
-		handleSave({
+	const onApply = () => {
+		handleApply({
 			...group,
 			children: selected
 		});
@@ -29,32 +29,46 @@
 	};
 
 	const gridClass = (items: any[]) => {
-		if (items.length >= 50) {
-			return 'grid-cols-5';
-		} else if (items.length >= 30) {
-			return 'grid-cols-4';
-		} else if (items.length >= 20) {
-			return 'grid-cols-3';
-		}
+		const ceil = Math.ceil(Math.sqrt(items.length));
+		const max = Math.max(ceil, Math.floor(items.length / 3));
 
-		return 'grid-cols-2';
+		const classes = [
+			'grid-rows-1',
+			'grid-rows-2',
+			'grid-rows-3',
+			'grid-rows-4',
+			'grid-rows-5',
+			'grid-rows-6',
+			'grid-rows-7',
+			'grid-rows-8',
+			'grid-rows-9',
+			'grid-rows-10',
+			'grid-rows-11',
+			'grid-rows-12'
+		];
+
+		if (max > 12) {
+			return 'grid-rows-12';
+		} else return classes[max - 1 || 1];
 	};
 </script>
 
-<div class="p-5 rounded-md bg-surface-50 dark:bg-surface-800 border-primary-500 border-2">
+<div class="p-5 rounded-md max-w-6xl bg-surface-50 dark:bg-surface-800 border-primary-500 border-2">
 	<!-- Header -->
 	<h2 class="text-xl font-semibold">{group.displayName}</h2>
 
 	<!-- Items -->
 	<div
-		class="grid {gridClass(
+		class="{gridClass(
 			Object.keys(selected)
-		)} !gap-x-20 gap-y-2 py-10 px-2 max-h-[1000px] overflow-x-auto max-w-6xl"
+		)} grid grid-flow-col gap-x-10 gap-y-2 py-10 px-2 h-full overflow-x-auto"
 	>
 		{#each Object.keys(selected) as key}
-			<label class="flex gap-3 items-center">
+			<label class="flex gap-3 items-center w-48">
 				<input type="checkbox" class="checkbox" bind:checked={selected[key].selected} />
-				<span class="whitespace-nowrap break-before-avoid break-after-avoid"
+				<span
+					title={selected[key].displayName}
+					class="whitespace-nowrap break-before-avoid break-after-avoid truncate"
 					>{selected[key].displayName}</span
 				>
 			</label>
@@ -68,7 +82,7 @@
 			<button class="btn btn-sm variant-filled-tertiary" on:click={selectAll}>All</button>
 		</div>
 		<div class="flex gap-3">
-			<button class="btn btn-sm variant-filled-primary" on:click={onSave}>Save</button>
+			<button class="btn btn-sm variant-filled-primary" on:click={onApply}>Apply</button>
 			<button class="btn btn-sm variant-filled-secondary" on:click={onCancel}>Cancel</button>
 		</div>
 	</div>
diff --git a/src/lib/components/Table/ColumnsMenu.svelte b/src/lib/components/Table/ColumnsMenu.svelte
index f30ecdc2..38f3756f 100644
--- a/src/lib/components/Table/ColumnsMenu.svelte
+++ b/src/lib/components/Table/ColumnsMenu.svelte
@@ -15,6 +15,7 @@
 <button
 	type="button"
 	class="btn btn-sm variant-filled-primary rounded-full order-last"
+	aria-label="Open menu to hide/show columns"
 	use:popup={popupCombobox}>Columns</button
 >
 
@@ -25,6 +26,7 @@
 	{#each columns as column}
 		<div class="flex gap-3 items-center">
 			<input
+				aria-label="Toggle column visibility for column {column.label}"
 				type="checkbox"
 				bind:checked={column.visible}
 				disabled={columns.filter((c) => c.visible).length === 1 && column.visible}
diff --git a/src/lib/components/Table/TableContent.svelte b/src/lib/components/Table/TableContent.svelte
index 291eb0b4..c30610a4 100644
--- a/src/lib/components/Table/TableContent.svelte
+++ b/src/lib/components/Table/TableContent.svelte
@@ -165,9 +165,9 @@
 					header: header ?? key,
 					accessor: accessor,
 					// Render the cell with the provided component, or use the toStringFn if provided, or just use the value
-					cell: ({ value, row }) => {
+					cell: ({ value, row, column }) => {
 						return renderComponent
-							? createRender(renderComponent, { value, row, dispatchFn: actionDispatcher })
+							? createRender(renderComponent, { value, row, column, dispatchFn: actionDispatcher })
 							: toStringFn
 							? toStringFn(value)
 							: value;
@@ -394,7 +394,7 @@
 						} else {
 							sendModel.q = searchValue;
 						}
-            
+
 						$filterValue = searchValue;
 					}}
 				>
@@ -409,6 +409,7 @@
 							type="reset"
 							id="{tableId}-searchReset"
 							class="absolute right-3 items-center"
+							aria-label="Clear search"
 							on:click|preventDefault={() => {
 								if (serverSide && !sendModel) {
 									throw new Error('Server-side configuration is missing');
diff --git a/src/lib/components/Table/TableFilter.svelte b/src/lib/components/Table/TableFilter.svelte
index 86778670..2284f337 100644
--- a/src/lib/components/Table/TableFilter.svelte
+++ b/src/lib/components/Table/TableFilter.svelte
@@ -240,6 +240,7 @@
 		type="button"
 		use:popup={popupFeatured}
 		id="{popupId}-button"
+		aria-label="Open filter menu for column {id}"
 	>
 		<Fa icon={faFilter} size="12" />
 	</button>
@@ -249,6 +250,7 @@
 			<button
 				class="btn variant-filled-primary btn-sm"
 				type="button"
+				aria-label="Clear Filters"
 				on:click|preventDefault={() => {
 					// Set the defaults when cleared
 					clearFilters();
@@ -273,6 +275,7 @@
 								{#each options[type] as option (option)}
 									<option
 										value={option.value}
+										aria-label={option.label}
 										selected={dropdown.option === option.value}
 										disabled={Object.keys($filters[id]).includes(option.value) &&
 											dropdown.option !== option.value}>{option.label}</option
@@ -282,6 +285,7 @@
 							{#if dropdowns.length > 1}
 								<div
 									class="btn variant-filled-warning btn-sm h-full"
+									aria-label="Remove filter"
 									on:click|preventDefault={() => removeFilter(dropdown.option)}
 									on:keydown|preventDefault={() => removeFilter(dropdown.option)}
 								>
@@ -296,6 +300,7 @@
 								class="input p-1 border border-primary-500"
 								on:input={(e) => valueChangeHandler(e, index)}
 								bind:value={dropdown.value}
+								aria-label="Filter value"
 							/>
 						{:else}
 							<input
@@ -303,6 +308,7 @@
 								class="input p-1 border border-primary-500"
 								on:input={(e) => valueChangeHandler(e, index)}
 								bind:value={dropdown.formValue}
+								aria-label="Filter value"
 							/>
 						{/if}
 					</div>
@@ -321,6 +327,7 @@
 					on:keydown|stopPropagation={() => {
 						addFilter(remainingFilters[0].value, undefined);
 					}}
+					aria-label="Add filter"
 				>
 					<div class="flex gap-1 items-center"><Fa icon={faPlus} />Add Filter</div>
 				</div>
@@ -328,6 +335,7 @@
 			<button
 				class="btn variant-filled-primary btn-sm"
 				type="button"
+				aria-label="Apply filters"
 				on:click|preventDefault={() => {
 					$pageIndex = 0;
 					$filterValue = $filters[id];
diff --git a/src/lib/components/Table/TableFilterServer.svelte b/src/lib/components/Table/TableFilterServer.svelte
index 19d3bb5d..70d2fa48 100644
--- a/src/lib/components/Table/TableFilterServer.svelte
+++ b/src/lib/components/Table/TableFilterServer.svelte
@@ -233,6 +233,7 @@
 		type="button"
 		use:popup={popupFeatured}
 		id="{popupId}-button"
+		aria-label="Open filter menu for column {id}"
 	>
 		<Fa icon={faFilter} size="12" />
 	</button>
@@ -242,6 +243,7 @@
 			<button
 				class="btn variant-filled-primary btn-sm"
 				type="button"
+				aria-label="Clear Filters"
 				on:click|preventDefault={() => {
 					// Set the defaults when cleared
 					clearFilters();
@@ -264,6 +266,7 @@
 								{#each options[type] as option (option)}
 									<option
 										value={option.value}
+										aria-label={option.label}
 										selected={dropdown.option === option.value}
 										disabled={Object.keys($filters[id]).includes(option.value) &&
 											dropdown.option !== option.value}>{option.label}</option
@@ -275,7 +278,8 @@
 									class="btn variant-filled-warning btn-sm h-full"
 									on:click|preventDefault={() => removeFilter(dropdown.option)}
 									on:keydown|preventDefault={() => removeFilter(dropdown.option)}
-								>
+									aria-label="Remove filter"
+									>
 									<Fa icon={faXmark} />
 								</div>
 							{/if}
@@ -294,6 +298,7 @@
 								class="input p-1 border border-primary-500"
 								on:input={(e) => valueChangeHandler(e, index)}
 								bind:value={dropdown.value}
+								aria-label="Filter value"
 							/>
 						{:else}
 							<input
@@ -301,6 +306,7 @@
 								class="input p-1 border border-primary-500"
 								on:input={(e) => valueChangeHandler(e, index)}
 								bind:value={dropdown.value}
+								aria-label="Filter value"
 							/>
 						{/if}
 					</div>
@@ -313,6 +319,7 @@
 			{#if remainingFilters.length}
 				<div
 					class="btn variant-filled-secondary btn-sm cursor-pointer"
+					aria-label="Add filter"
 					on:click|stopPropagation={() => {
 						addFilter(remainingFilters[0].value, undefined);
 					}}
@@ -326,6 +333,7 @@
 			<button
 				class="btn variant-filled-primary btn-sm"
 				type="button"
+				aria-label="Apply filters"
 				on:click|preventDefault={applyFilters}>Apply</button
 			>
 		</div>
diff --git a/src/lib/components/Table/TablePagination.svelte b/src/lib/components/Table/TablePagination.svelte
index be2c7ac1..51cdf0c3 100644
--- a/src/lib/components/Table/TablePagination.svelte
+++ b/src/lib/components/Table/TablePagination.svelte
@@ -62,7 +62,11 @@
 			{/each}
 		</select> -->
 
-		<button class="btn variant-filled-primary w-20 justify-between" use:popup={pageSizePopup}>
+		<button
+			aria-label="Open menu to select number of items per page"
+			class="btn variant-filled-primary w-20 justify-between"
+			use:popup={pageSizePopup}
+		>
 			<span class="capitalize font-semibold">{pageSizeDropdownValue}</span>
 			<Fa icon={faChevronDown} size="xs" />
 		</button>
@@ -82,6 +86,7 @@
 		<button
 			class="btn btn-sm variant-filled-primary"
 			on:click|preventDefault={goToFirstPage}
+			aria-label="Go to first page"
 			disabled={goToFirstPageDisabled}
 			id="{id}-first"
 		>
@@ -90,6 +95,7 @@
 		<button
 			class="btn btn-sm variant-filled-primary"
 			id="{id}-previous"
+			aria-label="Go to previous page"
 			on:click|preventDefault={goToPreviousPage}
 			disabled={goToPreviousPageDisabled}><Fa icon={faAngleLeft} /></button
 		>
@@ -98,17 +104,20 @@
 			class="input border border-primary-500 rounded flex w-24"
 			value={$pageIndex + 1}
 			max={$pageCount}
+			aria-label="Current page"
 			min={1}
 			on:change={handleChange}
 		/>
 		<button
 			class="btn btn-sm variant-filled-primary"
 			id="{id}-next"
+			aria-label="Go to next page"
 			on:click|preventDefault={goToNextPage}
 			disabled={goToNextPageDisabled}><Fa icon={faAngleRight} /></button
 		>
 		<button
 			class="btn btn-sm variant-filled-primary"
+			aria-label="Go to last page"
 			id="{id}-last"
 			on:click|preventDefault={goToLastPage}
 			disabled={goToLastPageDisabled}><Fa icon={faAnglesRight} /></button
diff --git a/src/lib/components/Table/TablePaginationServer.svelte b/src/lib/components/Table/TablePaginationServer.svelte
index cbcf227d..418ed3f2 100644
--- a/src/lib/components/Table/TablePaginationServer.svelte
+++ b/src/lib/components/Table/TablePaginationServer.svelte
@@ -73,6 +73,7 @@
 		<select
 			name="pageSize"
 			id="{id}-pageSize"
+			aria-label="Open menu to select number of items per page"
 			class="select variant-filled-primary w-min font-bold"
 			bind:value={$pageSize}
 		>
@@ -86,6 +87,7 @@
 			class="btn btn-sm variant-filled-primary"
 			on:click|preventDefault={() => goTo('first')}
 			disabled={goToFirstPageDisabled}
+			aria-label="Go to first page"
 			id="{id}-first"
 		>
 			<Fa icon={faAnglesLeft} /></button
@@ -93,12 +95,14 @@
 		<button
 			class="btn btn-sm variant-filled-primary"
 			id="{id}-previous"
+			aria-label="Go to previous page"
 			on:click|preventDefault={() => goTo('previous')}
 			disabled={goToPreviousPageDisabled}><Fa icon={faAngleLeft} /></button
 		>
 		<input
 			type="number"
 			class="input border border-primary-500 rounded flex w-24"
+			aria-label="Current page"
 			value={$pageIndex + 1}
 			max={pageCount}
 			min={1}
@@ -108,11 +112,13 @@
 			class="btn btn-sm variant-filled-primary"
 			id="{id}-next"
 			on:click|preventDefault={() => goTo('next')}
+			aria-label="Go to next page"
 			disabled={goToNextPageDisabled}><Fa icon={faAngleRight} /></button
 		>
 		<button
 			class="btn btn-sm variant-filled-primary"
 			id="{id}-last"
+			aria-label="Go to last page"
 			on:click|preventDefault={() => goTo('last')}
 			disabled={goToLastPageDisabled}><Fa icon={faAnglesRight} /></button
 		>
diff --git a/src/lib/components/form/Checkbox.svelte b/src/lib/components/form/Checkbox.svelte
index bc7b91a0..1ade6727 100644
--- a/src/lib/components/form/Checkbox.svelte
+++ b/src/lib/components/form/Checkbox.svelte
@@ -14,7 +14,7 @@
 <InputContainer {label} {feedback} {required}>
 	<input
 		{id}
-		class="input variant-form-material"
+		class="input variant-form-material bg-zinc-50 dark:bg-zinc-50"
 		type="checkbox"
 		class:input-success={valid}
 		class:input-error={invalid}
diff --git a/src/lib/components/form/DateInput.svelte b/src/lib/components/form/DateInput.svelte
index 417a0fb6..840925e8 100644
--- a/src/lib/components/form/DateInput.svelte
+++ b/src/lib/components/form/DateInput.svelte
@@ -15,7 +15,7 @@
 <InputContainer {id} {label} {feedback} {required} {help}>
 	<input
 		{id}
-		class="input variant-form-material"
+		class="input variant-form-material bg-zinc-50 dark:bg-zinc-700 placeholder:text-gray-400"
 		type="date"
 		class:input-success={valid}
 		class:input-error={invalid}
diff --git a/src/lib/components/form/DropdownKvP.svelte b/src/lib/components/form/DropdownKvP.svelte
index 4f6cf787..9e0fc71c 100644
--- a/src/lib/components/form/DropdownKvP.svelte
+++ b/src/lib/components/form/DropdownKvP.svelte
@@ -39,7 +39,7 @@
 <InputContainer {id} label={title} {feedback} {required} {help}>
 	<select
 		{id}
-		class="select variant-form-material"
+		class="select variant-form-material dark:bg-zinc-700 bg-zinc-50 placeholder:text-gray-400"
 		class:input-success={valid}
 		class:input-error={invalid}
 		bind:value={selected}
diff --git a/src/lib/components/form/InputContainer.svelte b/src/lib/components/form/InputContainer.svelte
index 2c0f1859..ddc87468 100644
--- a/src/lib/components/form/InputContainer.svelte
+++ b/src/lib/components/form/InputContainer.svelte
@@ -16,7 +16,13 @@
 	function onMouseOut() {}
 </script>
 
-<div id="{id}-container" on:mouseover={onMouseOver} on:focus={onMouseOver} on:mouseout={onMouseOut} on:blur={onMouseOut}>
+<div
+	id="{id}-container"
+	on:mouseover={onMouseOver}
+	on:focus={onMouseOver}
+	on:mouseout={onMouseOut}
+	on:blur={onMouseOut}
+>
 	<label class="label">
 		<span
 			>{label}
diff --git a/src/lib/components/form/MultiSelect.svelte b/src/lib/components/form/MultiSelect.svelte
index e12fdf52..e1b13a04 100644
--- a/src/lib/components/form/MultiSelect.svelte
+++ b/src/lib/components/form/MultiSelect.svelte
@@ -4,8 +4,6 @@
 	import Select from 'svelte-select';
 	import { onMount } from 'svelte';
 
-
-
 	export let source;
 	export let target;
 	export let id;
@@ -35,16 +33,14 @@
 	$: groupBy;
 
 	function updateTarget(selection) {
+		console.log('updateTarget', target, selection, isMulti);
+		if (selection == undefined) {
+			console.log('no update');
 
-		console.log("updateTarget", target, selection, isMulti);
-  if(selection == undefined)
-		{
-		  console.log("no update");
-
-				return;
+			return;
 		}
 
-		console.log("update");
+		console.log('update');
 		//different cases
 		//a) source is complex model is simple return array
 		if (complexSource && !complexTarget && isLoaded && isMulti) {
@@ -75,8 +71,8 @@
 		}
 
 		if (!complexSource && !complexTarget && isLoaded && !isMulti) {
-			console.log("🚀 ~ updateTarget ~ selection:", selection)
-			if(selection){
+			console.log('🚀 ~ updateTarget ~ selection:', selection);
+			if (selection) {
 				target = selection.value;
 			}
 		}
@@ -167,118 +163,116 @@
 		//console.log(t,value)
 	}
 
-function filterItemStartFn(label, filterText, option) {
-	// console.log(label, filterText, option);
-	let itemFilter = label.toLowerCase().startsWith(filterText.toLowerCase());
+	function filterItemStartFn(label, filterText, option) {
+		// console.log(label, filterText, option);
+		let itemFilter = label.toLowerCase().startsWith(filterText.toLowerCase());
 
-	return itemFilter;
-}
+		return itemFilter;
+	}
 
-function filterItemExactFn(label, filterText, option) {
-	// console.log(label, filterText, option);
-	let itemFilter = label.toLowerCase() == filterText.toLowerCase();
+	function filterItemExactFn(label, filterText, option) {
+		// console.log(label, filterText, option);
+		let itemFilter = label.toLowerCase() == filterText.toLowerCase();
 
-	return itemFilter;
-}
+		return itemFilter;
+	}
 
-function filterItemIncludesFn(label, filterText, option) {
-	// console.log(label, filterText, option);
-	let itemFilter = label.toLowerCase().includes(filterText.toLowerCase());
+	function filterItemIncludesFn(label, filterText, option) {
+		// console.log(label, filterText, option);
+		let itemFilter = label.toLowerCase().includes(filterText.toLowerCase());
 
-	return itemFilter;
-}
+		return itemFilter;
+	}
 
-function filterFn({
-    loadOptions,
-    filterText,
-    items,
-    multiple,
-    value,
-    itemId,
-    groupBy,
-    filterSelectedItems,
-    itemFilter,
-    convertStringItemsToObjects,
-    filterGroupedItems,
-    label,
-}) {
-    if (items && loadOptions) return items;
-    if (!items) return [];
+	function filterFn({
+		loadOptions,
+		filterText,
+		items,
+		multiple,
+		value,
+		itemId,
+		groupBy,
+		filterSelectedItems,
+		itemFilter,
+		convertStringItemsToObjects,
+		filterGroupedItems,
+		label
+	}) {
+		if (items && loadOptions) return items;
+		if (!items) return [];
+
+		if (items && items.length > 0 && typeof items[0] !== 'object') {
+			items = convertStringItemsToObjects(items);
+		}
 
-    if (items && items.length > 0 && typeof items[0] !== 'object') {
-        items = convertStringItemsToObjects(items);
-    }
+		let filterResults = filterListFn(
+			items,
+			label,
+			filterText,
+			multiple,
+			value,
+			filterSelectedItems,
+			itemId
+		);
+
+		if (groupBy) {
+			filterResults = filterGroupedItems(filterResults, label, filterText);
+		}
 
-    let filterResults = filterListFn(items, label, filterText,multiple,value,filterSelectedItems, itemId)
+		return filterResults;
+	}
 
-    if (groupBy) {
-        filterResults = filterGroupedItems(filterResults, label, filterText);
-    }
+	// filter checks 3 types, exact, starts, includes
+	function filterListFn(items, label, filterText, multiple, value, filterSelectedItems, itemId) {
+		if (!items) return [];
 
-    return filterResults;
-}
+		let exact = items.filter((item) => {
+			let matchesFilter = filterItemExactFn(item[label], filterText, item);
+			if (matchesFilter && multiple && value?.length) {
+				matchesFilter = !value.some((x) => {
+					return filterSelectedItems ? x[itemId] === item[itemId] : false;
+				});
+			}
 
-// filter checks 3 types, exact, starts, includes
-function filterListFn(items ,label , filterText, multiple, value, filterSelectedItems, itemId)
-{
+			return matchesFilter;
+		});
 
-	 if (!items) return [];
+		let starts = items.filter((item) => {
+			let matchesFilter = filterItemStartFn(item[label], filterText, item);
+			if (matchesFilter && multiple && value?.length) {
+				matchesFilter = !value.some((x) => {
+					return filterSelectedItems ? x[itemId] === item[itemId] : false;
+				});
+			}
 
-		let exact = items.filter((item) => {
-						let matchesFilter = filterItemExactFn(item[label], filterText, item);
-						if (matchesFilter && multiple && value?.length) {
-            matchesFilter = !value.some((x) => {
-                return filterSelectedItems ? x[itemId] === item[itemId] : false;
-            });
-        }
+			return matchesFilter;
+		});
 
-							return matchesFilter;
-    });
+		let includes = items.filter((item) => {
+			let matchesFilter = filterItemIncludesFn(item[label], filterText, item);
+			if (matchesFilter && multiple && value?.length) {
+				matchesFilter = !value.some((x) => {
+					return filterSelectedItems ? x[itemId] === item[itemId] : false;
+				});
+			}
 
-		let starts = items.filter((item) => {
-				let matchesFilter = filterItemStartFn(item[label], filterText, item);
-						if (matchesFilter && multiple && value?.length) {
-            matchesFilter = !value.some((x) => {
-                return filterSelectedItems ? x[itemId] === item[itemId] : false;
-            });
-        }
-
-							return matchesFilter;
-
-    });
-
-			let includes = items.filter((item) => {
-				let matchesFilter = filterItemIncludesFn(item[label], filterText, item);
-						if (matchesFilter && multiple && value?.length) {
-            matchesFilter = !value.some((x) => {
-                return filterSelectedItems ? x[itemId] === item[itemId] : false;
-            });
-        }
-
-							return matchesFilter;
-    });
-
-	 
-				let result =  [...exact,...starts,...includes];
-				return [...new Set(result)];
-}
-
-function clearFn(e)
-{
-	 console.log("clear", target, e);
-		if(isMulti)
-		{
-				target = [];
-		}
-		else
-		{
-			target="";
-		}
+			return matchesFilter;
+		});
 
-	 console.log("after clear", target);
-}
+		let result = [...exact, ...starts, ...includes];
+		return [...new Set(result)];
+	}
 
+	function clearFn(e) {
+		console.log('clear', target, e);
+		if (isMulti) {
+			target = [];
+		} else {
+			target = '';
+		}
 
+		console.log('after clear', target);
+	}
 </script>
 
 <InputContainer {id} label={title} {feedback} {required} {help}>
@@ -295,7 +289,7 @@ function clearFn(e)
 		{loading}
 		{clearable}
 		{disabled}
-  filter={filterFn}
+		filter={filterFn}
 		on:change
 		on:input
 		on:focus
diff --git a/src/lib/components/form/NumberInput.svelte b/src/lib/components/form/NumberInput.svelte
index 6ee2a51f..be5061cd 100644
--- a/src/lib/components/form/NumberInput.svelte
+++ b/src/lib/components/form/NumberInput.svelte
@@ -18,7 +18,7 @@
 <InputContainer {id} {label} {feedback} {required} {help}>
 	<input
 		{id}
-		class="input variant-form-material"
+		class="input variant-form-material dark:bg-zinc-700 bg-zinc-50 placeholder:text-gray-400"
 		type="number"
 		class:input-success={valid}
 		class:input-error={invalid}
diff --git a/src/lib/components/form/TextArea.svelte b/src/lib/components/form/TextArea.svelte
index 1753cab4..65da2438 100644
--- a/src/lib/components/form/TextArea.svelte
+++ b/src/lib/components/form/TextArea.svelte
@@ -17,7 +17,7 @@
 <InputContainer {id} {label} {feedback} {required} {help}>
 	<textarea
 		{id}
-		class="textarea variant-form-material"
+		class="textarea variant-form-material dark:bg-zinc-700 bg-zinc-50 placeholder:text-gray-400"
 		class:input-success={valid}
 		class:input-error={invalid}
 		bind:value
diff --git a/src/lib/components/form/TextInput.svelte b/src/lib/components/form/TextInput.svelte
index ba33552a..e5d4c83c 100644
--- a/src/lib/components/form/TextInput.svelte
+++ b/src/lib/components/form/TextInput.svelte
@@ -16,7 +16,7 @@
 <InputContainer {id} {label} {feedback} {required} {help}>
 	<input
 		{id}
-		class="input variant-form-material"
+		class="input variant-form-material dark:bg-zinc-700 bg-zinc-50 placeholder:text-gray-400"
 		type="text"
 		class:input-success={valid}
 		class:input-error={invalid}
diff --git a/src/routes/components/form/+page.svelte b/src/routes/components/form/+page.svelte
index 131c6509..8cdd5ec0 100644
--- a/src/routes/components/form/+page.svelte
+++ b/src/routes/components/form/+page.svelte
@@ -56,7 +56,7 @@
 	import Page from '$lib/components/page/Page.svelte';
 </script>
 
-<div id="toc-target">
+<div id="toc-target" class="bg-surface-50 dark:bg-surface-800">
 	<Page
 		title="Form components"
 		note="This page lists all the form components and shows how to develop a validation."