diff --git a/src/hooks.server.ts b/src/hooks.server.ts
index a32c74ac..7b6a7643 100644
--- a/src/hooks.server.ts
+++ b/src/hooks.server.ts
@@ -33,16 +33,7 @@ export const handle = sequence(async ({ event, resolve }) => {
     }
   }
 
-const theme = event.cookies.get("theme-mode") || "light";
-
-  // Process request with theme injection
-  const response = await resolve(event, {
-    transformPageChunk: ({ html }) => {
-      // Inject theme class into HTML element
-      return html.replace('<html', `<html data-theme="${theme}"`);
-    }
-  });
-
+  const response = await resolve(event);
 
   // Use a more compatible way to set the cookie
   const cookieString = event?.locals?.pb?.authStore?.exportToCookie({
diff --git a/src/lib/components/Searchbar.svelte b/src/lib/components/Searchbar.svelte
index e22791e1..27e4670a 100644
--- a/src/lib/components/Searchbar.svelte
+++ b/src/lib/components/Searchbar.svelte
@@ -279,7 +279,7 @@
   }
 </script>
 
-<div class="hidden sm:block w-full sm:max-w-[600px]">
+<div class="hidden sm:block w-full sm:max-w-[600px] shadow-sm">
   <div>
     <div class="relative flex items-center">
       <div class="absolute inset-y-0 left-0 flex items-center pl-2.5">
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 0c78b673..2ca5c342 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -125,7 +125,6 @@
     typeof data?.cookieConsent !== "undefined" ? false : true;
 
   onMount(async () => {
-    setMode(data.themeMode);
     if (data?.user?.id) {
       await loadWorker();
       /*
diff --git a/src/routes/options-flow/+page.svelte b/src/routes/options-flow/+page.svelte
index 8bca6c78..a889acf5 100644
--- a/src/routes/options-flow/+page.svelte
+++ b/src/routes/options-flow/+page.svelte
@@ -1381,7 +1381,7 @@
                                       on:click={() => {
                                         handleChangeValue(newValue);
                                       }}
-                                      class="block w-full bg-white dark:bg-default border-b border-gray-300 dark:border-gray-600 px-4 py-1.5 text-left text-sm sm:text-[1rem] rounded last:border-0 sm:hover:bg-gray-100 focus:bg-blue-100 focus:text-gray-900 focus:outline-hidden"
+                                      class="block w-full cursor-pointer border-b border-gray-300 dark:border-gray-600 px-4 py-1.5 text-left text-sm sm:text-[1rem] rounded last:border-0 focus:bg-blue-100 focus:text-gray-900 focus:outline-hidden"
                                     >
                                       {ruleCondition[row?.rule]
                                         ?.replace("under", "Under")
