fix: position calendar error indicator

2026-08-22 16:56:12 +02:00
185 changed files with 2509 additions and 4891 deletions
@@ -0,0 +1,60 @@
+---
+name: homarr-local-harness
+description: Build and inspect a writable Docker demo harness from the current Homarr checkout when validating a local branch in a browser.
+---
+
+# Homarr Local Harness
+
+Use this skill when a Homarr change needs a real production image and browser validation. Work from the repository root and keep the harness name Docker-safe, such as `feature-board`.
+
+## Set up the harness
+
+Run the TypeScript operations CLI; this workflow does not use the interactive developer TUI:
+
+```sh
+pnpm cli harness setup feature-board
+```
+
+`setup` builds the current checkout as `homarr:feature-board`, replaces the named harness container, and starts it with a persistent data volume. It enables demo mode, mock integrations, and writable demo mutations by default:
+
+- `DEMO_MODE=true`
+- `DEMO_READ_ONLY=false`
+- `UNSAFE_ENABLE_MOCK_INTEGRATION=true`
+
+Pass repeatable environment overrides when the feature needs them:
+
+```sh
+pnpm cli harness setup feature-board \
+  --env WORKSHOP_WEB_URL=https://example.test \
+  --env FEATURE_FLAG=true
+```
+
+Use `pnpm cli harness build <name>` when only the image is needed, and `pnpm cli harness run <name>` to start an already-built image. `--port <number>` pins a host port; otherwise Docker assigns one.
+
+Always use the URL printed by the command. If the output is no longer available, query it directly:
+
+```sh
+pnpm cli harness port feature-board
+```
+
+Do not assume port `7575`; the container listens on `7575`, but the host port is dynamic by default.
+
+## Browser validation
+
+Open the printed URL with the environment's `browser-harness` tool. In this workspace, the `agent-browser` CLI is the supported browser automation fallback. Load its current workflow before invoking it:
+
+```sh
+agent-browser skills get core
+```
+
+Navigate to the exact harness URL, wait for the app to become usable, exercise the changed flow, and capture screenshots or other browser evidence. Keep browser state in a named session when the workflow needs login persistence. Report the exact URL, viewport/session used, and screenshot paths; a Docker process or HTTP health response alone is not browser acceptance.
+
+## Cleanup
+
+Stop the named container when finished:
+
+```sh
+pnpm cli harness stop feature-board
+```
+
+Stopping keeps the data volume so the same harness can be restarted. A later `setup` rebuilds the image and replaces only the container. Preserve unrelated containers, images, volumes, and working-tree changes.
@@ -0,0 +1,4 @@
+interface:
+  display_name: "Homarr Local Harness"
+  short_description: "Build and browse a writable local Homarr branch harness"
+  default_prompt: "Use $homarr-local-harness to set up a writable Homarr harness for the current branch and validate it in the browser."
@@ -30,26 +30,6 @@
  "options": {
    "reportUnusedDisableDirectives": "off"
  },
-  "overrides": [
-    {
-      "files": ["apps/nextjs/src/**/*.ts", "apps/nextjs/src/**/*.tsx"],
-      "excludeFiles": ["**/*.spec.ts", "**/*.spec.tsx"],
-      "rules": {
-        "eslint/no-restricted-imports": [
-          "error",
-          {
-            "paths": [
-              {
-                "name": "@homarr/widgets",
-                "allowTypeImports": true,
-                "message": "Import a narrow @homarr/widgets export to preserve widget lazy loading."
-              }
-            ]
-          }
-        ]
-      }
-    }
-  ],
  "ignorePatterns": [
    "**/*.config.js",
    "**/*.config.mjs",
@@ -8,28 +8,13 @@ Homarr has the following keyboard shortcuts:

 | Shortcut                                            | Description                                                                                                                |
 | --------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------- |
-| `MOD` + `K`                                         | Opens search, including local apps, boards, integrations, pages, commands, and preferences                                 |
-| `MOD` + `P`                                         | Opens app search                                                                                                           |
-| `MOD` + `/`                                         | Opens Homarr Assistant inside search                                                                                       |
-| `MOD` + `Shift` + `/` (`MOD` + `?`)                 | Opens preference search                                                                                                    |
-| `Shift` + `A`                                       | Opens the full Homarr Assistant                                                                                            |
+| `MOD` + `K`                                         | Opens the search bar                                                                                                       |
 | `MOD` + `J`                                         | Toggles Dark Mode                                                                                                          |
 | `MOD` + `E`                                         | Toggles Edit Mode                                                                                                          |
 | Hold `Shift` for 500 ms over a supported widget     | Opens its temporary advanced view                                                                                          |
 | Hold `Shift` + `Ctrl`/`Cmd` over a supported widget | Keeps its advanced view open until it is closed                                                                            |
 | `Esc`                                               | Stops keyboard tile editing, cancels an active pointer or touch move/resize, or closes an open advanced view or board menu |

-## Search and commands
-
-Search is designed as the fastest route to Homarr. Start typing after `MOD` + `K` to find local apps, boards,
-integrations, pages, commands, and preferences without entering a separate mode first. Local Homarr results appear
-before configured search-engine actions and Assistant fallbacks. Commands include opening the board switcher without
-leaving the keyboard. Type `!` to enter Web mode when you want to browse configured engine shortcuts or discover
-DuckDuckGo bangs; bang discovery is excluded from ordinary Search results.
-
-Use the dedicated shortcuts above to start in apps, Assistant, or preferences. Inside search, choose a mode to narrow
-the same query when needed. Media request search is available only when a supported Seerr integration is configured.
-
 ## Widget advanced view

 Supported widgets open a temporary advanced view when you hold `Shift` over them for 500 ms. Hold `Shift` plus `Ctrl`
@@ -198,13 +198,9 @@ In the modal you can edit the app that you want to display:

 <figure>
  <img src={editItemCurrent} alt="Current Edit item modal for an App tile" style={{ maxWidth: "620px" }} />
-  <figcaption>
-    The Edit item workspace previews option changes as you configure the tile. Save changes to apply them to the board.
-  </figcaption>
+  <figcaption>Use the Edit item modal to choose the app and configure how its tile is displayed.</figcaption>
 </figure>

-When adding a widget, set its initial grid width and height directly in the preview. These size controls are only shown before the widget is added.
-
 As soon as you save your changes, the tile on the board will refresh and display your app.
 Resize from any visible edge or corner handle. For a Container, activate its top-left grip before using its resize handles.
 Press and hold a handle, move the pointer, and release it when the tile has the size you want.
@@ -38,7 +38,7 @@ host gateway address.
 ## Use it

 - Select **Assistant** in the user menu or press `Shift + A`.
- Press `Cmd/Ctrl + /` to ask from search, or use `Cmd/Ctrl + K` and choose the Assistant fallback.
+- Ask from `Cmd/Ctrl + K`.
 - Add the [Assistant widget](../widgets/assistant) to a board.

 The assistant can work with boards, apps, integrations, widgets, Custom Widgets, and connected services. Use `@` to
@@ -27,10 +27,9 @@ opening it. Containers include their visible widgets and app icons instead of ap

 Names of boards must be unique because this will be used in the URL to load the desired board.

-Press `Shift+C`, or select **Switch board** from the user menu, to open the board switcher. It shows structural
-previews of every board you can access, with your current board at the end. Home-board markers and creator avatars
-match the board management view. Use the search field at the top, or simply start typing, to filter by name. Use the
-arrow keys to move through the results and press `Enter` to open the selected board.
+Press `Shift+C`, or select **Switch board** from the user menu, to open the board switcher. It shows
+structural previews of the other boards you can access. Start typing to filter by name, use the arrow keys to move
+through the results, and press `Enter` to open the selected board.

 ## Create a new board

@@ -7,13 +7,9 @@ tags:

 # Search Engines

-Using the search engines, terms can be quickly searched simply by opening the search bar at the top or using the keyboard shortcut `MOD + K`.
+Using the search engines, terms can be quickly searched simply by opening the search bar at the top or using the keyboard shortcut `CTRL + K`.
 The management page provides a searchable list with the shortcut, URL template, source, and available row actions for each engine.

-The default **Search** mode lists every configured search engine as a fallback action for the current query. To discover
-engines by shortcut, switch to **Web** with `!`. DuckDuckGo bang discovery is intentionally limited to Web mode so an
-ordinary search term never expands into similarly named bang providers.
-
 You can add any search engine that has a search URL that accepts a search term as a parameter.

 ## Create search engine
@@ -30,8 +26,6 @@ The name can be chosen freely. It will be displayed in the search box popover.

 Prefix that is used to choose the search engine in the popover using the keyboard.
 It is recommended that this value is kept short (for example `g` for Google and `e` for Ecosia).
-Type `!` in Spotlight to browse these shortcuts and, when DuckDuckGo bangs are enabled in preferences, discover
-additional bang providers.

 ### Configuration

@@ -1,6 +1,6 @@
 ---
 title: "Bookmarks"
-description: "Keeps useful links together"
+description: "Displays multiple app links"
 hide_title: true
 ---

@@ -13,12 +13,11 @@ import { bookmarksWidget } from ".";

 <WidgetHeader widget={bookmarksWidget} categories={["Links", "Apps"]} />

-The bookmarks widget keeps direct URLs and Homarr Apps in one ordered list.
-Paste a URL and press Enter, paste several comma-separated or one-per-line URLs, or search for an existing App.
-URLs do not need an App record; Homarr uses the site's favicon and falls back to a link icon when it cannot load one.
-Bookmarks selected from Apps continue to use the App name, URL, icon, and description.
-
-**Adaptive** layout is the practical default: it changes between icons, compact rows, and tiles as the widget changes shape. Every compact item exposes its destination on hover, while advanced view expands items into descriptive cards.
+The bookmarks widget allows you to display multiple links in a single widget.
+Select one or more existing Apps directly in the widget settings; these bookmarks keep a reference to the App, so changes to its name, icon, or URL are reflected automatically.
+For links that do not need an App, add their URLs under **Custom links** instead.
+Its normal view adapts each configured layout to the available width and height: lower-priority hostnames are hidden before names or icons, and larger collections scroll instead of crushing cards.
+Advanced view shows every bookmark as a roomy card with its full title, hostname, icon, and complete description regardless of the compact layout and visibility choices.

 ### Screenshots

@@ -4,7 +4,7 @@ import { IconBookmark } from "@tabler/icons-react";
 export const bookmarksWidget: WidgetDefinition = {
  icon: IconBookmark,
  name: "Bookmarks",
-  description: "Keeps useful links together",
+  description: "Displays multiple app links",
  path: "../../widgets/bookmarks",
  configuration: {
    items: [
@@ -16,21 +16,9 @@ export const bookmarksWidget: WidgetDefinition = {
      },
      {
        name: "Layout",
-        description: "How bookmarks use the available widget space.",
-        values: { type: "select", options: ["Adaptive", "Vertical", "Horizontal", "Grid", "Compact grid", "Icons"] },
-        defaultValue: "Adaptive",
-      },
-      {
-        name: "Appearance",
-        description: "Card surface style.",
-        values: { type: "select", options: ["Soft", "Filled", "Outline", "Plain"] },
-        defaultValue: "Soft",
-      },
-      {
-        name: "Card spacing",
-        description: "Space between bookmark cards.",
-        values: { type: "select", options: ["Extra small", "Small", "Medium", "Large", "Extra large"] },
-        defaultValue: "Extra small",
+        description: "Layout in which the bookmarks are displayed.",
+        values: { type: "select", options: ["Vertical", "Horizontal", "Grid", "Grid horizontal"] },
+        defaultValue: "Vertical",
      },
      {
        name: "Hide title",
@@ -58,10 +46,16 @@ export const bookmarksWidget: WidgetDefinition = {
      },
      {
        name: "Bookmarks",
-        description: "URLs and existing Apps shown by the widget.",
-        values: "Paste one or many URLs, or find an existing App. Drag to reorder.",
+        description: "List of bookmarks to display in the widget.",
+        values: "Select one or more Apps directly, then order them as you like.",
        defaultValue: "No bookmarks selected",
      },
+      {
+        name: "Custom links",
+        description: "URLs to display without first creating an App.",
+        values: "List of URLs.",
+        defaultValue: "No custom links",
+      },
    ],
  },
 };
@@ -76,7 +76,6 @@
    "@tanstack/react-query": "catalog:",
    "@tanstack/react-query-devtools": "catalog:",
    "@tanstack/react-query-next-experimental": "catalog:",
-    "@tanstack/react-query-persist-client": "catalog:",
    "@trpc/client": "catalog:",
    "@trpc/next": "catalog:",
    "@trpc/react-query": "catalog:",
@@ -1,350 +0,0 @@
-import { dehydrate, QueryClient } from "@tanstack/react-query";
-import type { PersistedClient } from "@tanstack/react-query-persist-client";
-import { persistQueryClientRestore } from "@tanstack/react-query-persist-client";
-import { parse, stringify } from "superjson";
-import { afterEach, describe, expect, test, vi } from "vitest";
-
-import {
-  createSessionQueryPersister,
-  getQueryPersistenceStorageKey,
-  queryPersistenceBuster,
-  queryPersistenceMaxDataBytes,
-  shouldPersistDashboardQuery,
-} from "./query-persistence";
-
-const createSuccessfulQuery = (queryKey: readonly unknown[], data: unknown, updatedAt = Date.now()) => {
-  const queryClient = new QueryClient();
-  queryClient.setQueryData(queryKey, data, { updatedAt });
-  const query = queryClient.getQueryCache().find({ queryKey });
-  if (!query) throw new Error("Expected query to be present");
-  return { query, queryClient };
-};
-
-const createMemoryStorage = (): Storage => {
-  const values = new Map<string, string>();
-  return {
-    get length() {
-      return values.size;
-    },
-    clear: () => values.clear(),
-    getItem: (key) => values.get(key) ?? null,
-    key: (index) => Array.from(values.keys())[index] ?? null,
-    removeItem: (key) => values.delete(key),
-    setItem: (key, value) => values.set(key, value),
-  };
-};
-
-afterEach(() => {
-  vi.useRealTimers();
-  vi.restoreAllMocks();
-  window.sessionStorage.clear();
-});
-
-describe("widget query persistence", () => {
-  test("persists successful dashboard data but not unrelated, ping, pending, or oversized queries", () => {
-    const widget = createSuccessfulQuery([["widget", "weather", "getWeather"], { type: "query" }], { temp: 21 });
-    const supporting = createSuccessfulQuery([["app", "byIds"], { type: "query" }], [{ id: "app-1" }]);
-    const unrelated = createSuccessfulQuery([["board", "getBoardByName"], { type: "query" }], { name: "Home" });
-    const ping = createSuccessfulQuery([["widget", "app", "ping"], { type: "query" }], { status: "online" });
-    const oversized = createSuccessfulQuery([["widget", "example"], { type: "query" }], {
-      value: "x".repeat(queryPersistenceMaxDataBytes + 1),
-    });
-    const pendingClient = new QueryClient();
-    const pending = pendingClient.getQueryCache().build(pendingClient, {
-      queryKey: [["widget", "calendar", "findAllEvents"], { type: "query" }],
-      queryFn: () => Promise.resolve([]),
-    });
-
-    expect(shouldPersistDashboardQuery(widget.query)).toBe(true);
-    expect(shouldPersistDashboardQuery(supporting.query)).toBe(true);
-    expect(shouldPersistDashboardQuery(unrelated.query)).toBe(false);
-    expect(shouldPersistDashboardQuery(ping.query)).toBe(false);
-    expect(shouldPersistDashboardQuery(oversized.query)).toBe(false);
-    expect(shouldPersistDashboardQuery(pending)).toBe(false);
-  });
-
-  test("uses stable, isolated storage keys for anonymous and authenticated scopes", () => {
-    expect(getQueryPersistenceStorageKey("user-a")).toBe(getQueryPersistenceStorageKey("user-a"));
-    expect(getQueryPersistenceStorageKey("user-a")).not.toBe(getQueryPersistenceStorageKey("user-b"));
-    expect(getQueryPersistenceStorageKey(null)).not.toBe(getQueryPersistenceStorageKey("user-a"));
-
-    const userAKey = getQueryPersistenceStorageKey("user-a");
-    window.sessionStorage.setItem(userAKey, "a");
-    createSessionQueryPersister("user-a").removeClient();
-    expect(window.sessionStorage.getItem(userAKey)).toBeNull();
-  });
-
-  test("evicts every other scope so signing out cannot leave data behind", () => {
-    const userAKey = getQueryPersistenceStorageKey("user-a");
-    const anonymousKey = getQueryPersistenceStorageKey(null);
-    window.sessionStorage.setItem(userAKey, "a");
-    window.sessionStorage.setItem(anonymousKey, "anonymous");
-    window.sessionStorage.setItem("unrelated", "kept");
-
-    createSessionQueryPersister("user-b");
-
-    expect(window.sessionStorage.getItem(userAKey)).toBeNull();
-    expect(window.sessionStorage.getItem(anonymousKey)).toBeNull();
-    expect(window.sessionStorage.getItem("unrelated")).toBe("kept");
-  });
-
-  test("never restores another session scope", async () => {
-    const queryKey = [["widget", "weather", "getWeather"], { type: "query" }] as const;
-    const { queryClient } = createSuccessfulQuery(queryKey, { temp: 21 });
-    const userAPersister = createSessionQueryPersister("user-a");
-    userAPersister.persistClient({
-      timestamp: Date.now(),
-      buster: queryPersistenceBuster,
-      clientState: dehydrate(queryClient),
-    });
-    userAPersister.flush();
-    expect((await userAPersister.restoreClient())?.clientState.queries).toHaveLength(1);
-
-    expect(createSessionQueryPersister("user-b").restoreClient()).toBeUndefined();
-  });
-
-  test("stops persisting once the provider tears the cache down", async () => {
-    const storage = createMemoryStorage();
-    const persister = createSessionQueryPersister("user-a", storage);
-    const { queryClient } = createSuccessfulQuery([["widget", "weather", "getWeather"], { type: "query" }], {
-      temp: 21,
-    });
-
-    persister.persistClient({
-      timestamp: Date.now(),
-      buster: queryPersistenceBuster,
-      clientState: dehydrate(queryClient),
-    });
-    persister.flush();
-    persister.stop();
-
-    persister.persistClient({
-      timestamp: Date.now(),
-      buster: queryPersistenceBuster,
-      clientState: { mutations: [], queries: [] },
-    });
-    persister.flush();
-
-    expect((await persister.restoreClient())?.clientState.queries).toHaveLength(1);
-  });
-
-  test("removes the cache instead of storing an empty one", () => {
-    const scope = "user-a";
-    const key = getQueryPersistenceStorageKey(scope);
-    const persister = createSessionQueryPersister(scope);
-    window.sessionStorage.setItem(key, "stale");
-
-    persister.persistClient({
-      timestamp: Date.now(),
-      buster: queryPersistenceBuster,
-      clientState: { mutations: [], queries: [] },
-    });
-    persister.flush();
-
-    expect(window.sessionStorage.getItem(key)).toBeNull();
-  });
-
-  test("round-trips SuperJSON data, strips refresh errors, and removes corrupted storage", async () => {
-    vi.useFakeTimers();
-    const scope = "user-a";
-    const key = getQueryPersistenceStorageKey(scope);
-    const persister = createSessionQueryPersister(scope);
-    const { query, queryClient } = createSuccessfulQuery([["widget", "calendar", "findAllEvents"], { type: "query" }], {
-      startsAt: new Date("2026-08-22T12:00:00.000Z"),
-    });
-    query.setState({ ...query.state, error: new Error("private refresh error"), status: "error" });
-    expect(shouldPersistDashboardQuery(query)).toBe(true);
-    const persistedClient: PersistedClient = {
-      timestamp: Date.now(),
-      buster: queryPersistenceBuster,
-      clientState: dehydrate(queryClient, { shouldDehydrateQuery: shouldPersistDashboardQuery }),
-    };
-
-    persister.persistClient(persistedClient);
-    persister.flush();
-    const restored = await persister.restoreClient();
-    const restoredData = restored?.clientState.queries[0]?.state.data as { startsAt?: Date } | undefined;
-    expect(restoredData?.startsAt).toEqual(new Date("2026-08-22T12:00:00.000Z"));
-    expect(restored?.clientState.queries[0]?.state.status).toBe("success");
-    expect(restored?.clientState.queries[0]?.state.error).toBeNull();
-    expect(restored?.clientState.queries[0]?.state.isInvalidated).toBe(true);
-    expect(window.sessionStorage.getItem(key)).not.toContain("private refresh error");
-
-    window.sessionStorage.setItem(key, "not-valid-superjson");
-    expect(persister.restoreClient()).toBeUndefined();
-    expect(window.sessionStorage.getItem(key)).toBeNull();
-  });
-
-  test("sanitizes structurally valid but unsafe stored state before hydration", async () => {
-    const scope = "user-a";
-    const key = getQueryPersistenceStorageKey(scope);
-    const { queryClient } = createSuccessfulQuery(
-      [["widget", "calendar", "findAllEvents"], { type: "query" }],
-      [{ title: "safe" }],
-    );
-    const validQuery = dehydrate(queryClient).queries[0];
-    if (!validQuery) throw new Error("Expected a dehydrated query");
-
-    window.sessionStorage.setItem(
-      key,
-      stringify({
-        timestamp: Date.now(),
-        buster: queryPersistenceBuster,
-        clientState: {
-          mutations: [{ state: { status: "pending" } }],
-          queries: [
-            {
-              ...validQuery,
-              state: {
-                ...validQuery.state,
-                error: new Error("private refresh error"),
-                fetchStatus: "fetching",
-                status: "error",
-              },
-            },
-            {
-              ...validQuery,
-              queryHash: "unrelated",
-              queryKey: [["board", "getBoardByName"], { type: "query" }],
-            },
-            { queryHash: "malformed", queryKey: [["widget", "weather"]], state: null },
-            {
-              ...validQuery,
-              queryHash: "missing-timestamp",
-              state: { ...validQuery.state, dataUpdatedAt: undefined },
-            },
-          ],
-        },
-      }),
-    );
-
-    const restored = await createSessionQueryPersister(scope).restoreClient();
-    expect(restored?.clientState.mutations).toEqual([]);
-    expect(restored?.clientState.queries).toHaveLength(1);
-    expect(restored?.clientState.queries[0]?.state.status).toBe("success");
-    expect(restored?.clientState.queries[0]?.state.fetchStatus).toBe("idle");
-    expect(restored?.clientState.queries[0]?.state.error).toBeNull();
-  });
-
-  test.each([
-    ["expired", 1, queryPersistenceBuster],
-    ["different buster", new Date("2026-08-22T12:00:00.000Z").getTime(), "old-version"],
-    ["future timestamp", new Date("2026-08-22T12:00:00.000Z").getTime() + 1, queryPersistenceBuster],
-  ])("discards %s cache entries", async (_case, timestamp, storedBuster) => {
-    vi.useFakeTimers();
-    vi.setSystemTime(new Date("2026-08-22T12:00:00.000Z"));
-    const scope = "user-a";
-    const persister = createSessionQueryPersister(scope);
-    const { queryClient } = createSuccessfulQuery([["widget", "weather", "getWeather"], { type: "query" }], {
-      temp: 21,
-    });
-    persister.persistClient({ timestamp, buster: storedBuster, clientState: dehydrate(queryClient) });
-    persister.flush();
-
-    const restoredClient = new QueryClient();
-    await persistQueryClientRestore({
-      queryClient: restoredClient,
-      persister,
-      maxAge: 5 * 60 * 1_000,
-      buster: queryPersistenceBuster,
-    });
-
-    expect(restoredClient.getQueryData([["widget", "weather", "getWeather"], { type: "query" }])).toBeUndefined();
-    expect(window.sessionStorage.getItem(getQueryPersistenceStorageKey(scope))).toBeNull();
-  });
-
-  test("quota retry writes the cache after evicting the oldest query", async () => {
-    const old = createSuccessfulQuery([["widget", "old"], { type: "query" }], "old", 1);
-    const recent = createSuccessfulQuery([["widget", "recent"], { type: "query" }], "recent", 2);
-    const storage = createMemoryStorage();
-    const setItem = storage.setItem.bind(storage);
-    const setItemSpy = vi.spyOn(storage, "setItem").mockImplementation((key, value) => {
-      const client = parse<PersistedClient>(value);
-      if (client.clientState.queries.length > 1) throw new DOMException("quota", "QuotaExceededError");
-      setItem(key, value);
-    });
-    const persistedClient: PersistedClient = {
-      timestamp: Date.now(),
-      buster: queryPersistenceBuster,
-      clientState: {
-        mutations: [],
-        queries: [...dehydrate(old.queryClient).queries, ...dehydrate(recent.queryClient).queries],
-      },
-    };
-    const persister = createSessionQueryPersister("user-a", storage);
-
-    persister.persistClient(persistedClient);
-    persister.flush();
-
-    expect(setItemSpy).toHaveBeenCalledTimes(2);
-    const restored = await persister.restoreClient();
-    expect(restored?.clientState.queries).toHaveLength(1);
-    expect(restored?.clientState.queries[0]?.queryKey).toEqual([["widget", "recent"], { type: "query" }]);
-  });
-
-  test("coalesces pending writes and can synchronously flush the latest cache before reload", async () => {
-    vi.useFakeTimers();
-    const storage = createMemoryStorage();
-    const setItem = vi.spyOn(storage, "setItem");
-    const queryKey = [["widget", "weather", "getWeather"], { type: "query" }] as const;
-    const first = createSuccessfulQuery(queryKey, { temp: 20 }, 1);
-    const latest = createSuccessfulQuery(queryKey, { temp: 21 }, 2);
-    const persister = createSessionQueryPersister("user-a", storage);
-
-    persister.persistClient({
-      timestamp: Date.now(),
-      buster: queryPersistenceBuster,
-      clientState: dehydrate(first.queryClient),
-    });
-    persister.persistClient({
-      timestamp: Date.now(),
-      buster: queryPersistenceBuster,
-      clientState: dehydrate(latest.queryClient),
-    });
-
-    expect(setItem).not.toHaveBeenCalled();
-    persister.flush();
-    expect(setItem).toHaveBeenCalledOnce();
-    await vi.advanceTimersByTimeAsync(0);
-    expect(setItem).toHaveBeenCalledOnce();
-
-    const restored = await persister.restoreClient();
-    expect(restored?.clientState.queries[0]?.state.data).toEqual({ temp: 21 });
-  });
-
-  test("treats blocked storage operations as an empty cache", async () => {
-    const blockedStorage = {
-      getItem: () => {
-        throw new DOMException("blocked", "SecurityError");
-      },
-      removeItem: () => {
-        throw new DOMException("blocked", "SecurityError");
-      },
-      setItem: () => {
-        throw new DOMException("blocked", "SecurityError");
-      },
-    } as unknown as Storage;
-    const persister = createSessionQueryPersister("blocked", blockedStorage);
-    const { queryClient } = createSuccessfulQuery([["widget", "weather"], { type: "query" }], { temp: 21 });
-
-    expect(persister.restoreClient()).toBeUndefined();
-    expect(() => {
-      persister.persistClient({
-        timestamp: Date.now(),
-        buster: queryPersistenceBuster,
-        clientState: dehydrate(queryClient),
-      });
-      persister.flush();
-    }).not.toThrow();
-    expect(() => persister.removeClient()).not.toThrow();
-  });
-
-  test("treats an unavailable session storage getter as an empty cache", async () => {
-    vi.spyOn(window, "sessionStorage", "get").mockImplementation(() => {
-      throw new DOMException("blocked", "SecurityError");
-    });
-
-    expect(() => createSessionQueryPersister("blocked-getter")).not.toThrow();
-    expect(createSessionQueryPersister("blocked-getter").restoreClient()).toBeUndefined();
-  });
-});
@@ -1,226 +0,0 @@
-import type { QueryKey } from "@tanstack/react-query";
-import type { PersistedClient, Persister } from "@tanstack/react-query-persist-client";
-import { removeOldestQuery } from "@tanstack/react-query-persist-client";
-import { parse, stringify } from "superjson";
-
-import { isWidgetDataQueryKey, queryCacheDefaultGcTimeMs } from "@homarr/api/query-cache";
-
-export const queryPersistenceMaxAgeMs = queryCacheDefaultGcTimeMs;
-export const queryPersistenceMaxDataBytes = 256 * 1024;
-export const queryPersistenceBuster = "v2-session-superjson";
-
-const queryPersistenceStoragePrefix = "homarr:widget-query-cache";
-
-export const getQueryPersistenceStorageKey = (scope: string | null) =>
-  `${queryPersistenceStoragePrefix}:${encodeURIComponent(scope ?? "anonymous")}`;
-
-interface PersistableQuery {
-  queryKey: QueryKey;
-  state: {
-    data: unknown;
-    dataUpdatedAt: number;
-  };
-}
-
-export type SessionQueryPersister = Persister & { flush: () => void; stop: () => void };
-
-const textEncoder = new TextEncoder();
-const budgetVerdictCache = new WeakMap<object, boolean>();
-
-const measureFitsBudget = (data: unknown) => {
-  try {
-    return textEncoder.encode(stringify(data)).byteLength <= queryPersistenceMaxDataBytes;
-  } catch {
-    return false;
-  }
-};
-
-const fitsStorageBudget = (data: unknown) => {
-  if (typeof data !== "object" || data === null) return measureFitsBudget(data);
-
-  const cached = budgetVerdictCache.get(data);
-  if (cached !== undefined) return cached;
-
-  const verdict = measureFitsBudget(data);
-  budgetVerdictCache.set(data, verdict);
-  return verdict;
-};
-
-const holdsDashboardData = (query: PersistableQuery) =>
-  query.state.data !== undefined &&
-  Number.isFinite(query.state.dataUpdatedAt) &&
-  query.state.dataUpdatedAt > 0 &&
-  isWidgetDataQueryKey(query.queryKey);
-
-export const shouldPersistDashboardQuery = (query: PersistableQuery) =>
-  holdsDashboardData(query) && fitsStorageBudget(query.state.data);
-
-type DehydratedQuery = PersistedClient["clientState"]["queries"][number];
-
-const sanitizePersistedQuery = (query: DehydratedQuery): DehydratedQuery => ({
-  ...query,
-  state: {
-    ...query.state,
-    error: null,
-    errorUpdateCount: 0,
-    errorUpdatedAt: 0,
-    fetchFailureCount: 0,
-    fetchFailureReason: null,
-    fetchStatus: "idle",
-    isInvalidated: true,
-    status: "success",
-  },
-});
-
-const sanitizePersistedClient = (client: PersistedClient): PersistedClient => ({
-  ...client,
-  clientState: {
-    mutations: [],
-    queries: client.clientState.queries.map(sanitizePersistedQuery),
-  },
-});
-
-const isRecord = (value: unknown): value is Record<string, unknown> =>
-  typeof value === "object" && value !== null && !Array.isArray(value);
-
-const isRestorableQuery = (value: unknown): value is DehydratedQuery => {
-  if (!isRecord(value) || typeof value.queryHash !== "string" || !Array.isArray(value.queryKey)) return false;
-  if (!isRecord(value.state) || typeof value.state.status !== "string") return false;
-
-  return holdsDashboardData(value as unknown as PersistableQuery);
-};
-
-const sanitizeRestoredClient = (value: unknown): PersistedClient | undefined => {
-  if (!isRecord(value) || !Number.isFinite(value.timestamp) || typeof value.buster !== "string") return undefined;
-  if (!isRecord(value.clientState) || !Array.isArray(value.clientState.queries)) return undefined;
-
-  return {
-    timestamp: value.timestamp as number,
-    buster: value.buster,
-    clientState: {
-      mutations: [],
-      queries: value.clientState.queries.filter(isRestorableQuery).map(sanitizePersistedQuery),
-    },
-  };
-};
-
-const getSessionStorage = (): Storage | undefined => {
-  if (typeof window === "undefined") return undefined;
-
-  try {
-    return window.sessionStorage;
-  } catch {
-    return undefined;
-  }
-};
-
-const removeStorageItem = (storage: Storage | undefined, key: string) => {
-  try {
-    storage?.removeItem(key);
-  } catch {
-    return undefined;
-  }
-};
-
-const removeForeignScopes = (storage: Storage | undefined, activeKey: string) => {
-  if (!storage) return;
-
-  try {
-    const foreignKeys: string[] = [];
-    for (let index = 0; index < storage.length; index += 1) {
-      const storedKey = storage.key(index);
-      if (storedKey === null || storedKey === activeKey) continue;
-      if (storedKey.startsWith(`${queryPersistenceStoragePrefix}:`)) foreignKeys.push(storedKey);
-    }
-
-    for (const foreignKey of foreignKeys) storage.removeItem(foreignKey);
-  } catch {
-    return undefined;
-  }
-};
-
-export const createSessionQueryPersister = (
-  scope: string | null,
-  storage: Storage | undefined = getSessionStorage(),
-): SessionQueryPersister => {
-  const key = getQueryPersistenceStorageKey(scope);
-  removeForeignScopes(storage, key);
-  let pendingClient: PersistedClient | undefined;
-  let persistTimer: ReturnType<typeof setTimeout> | undefined;
-  let stopped = false;
-
-  const persistNow = (client: PersistedClient) => {
-    if (!storage) return;
-    let candidate: PersistedClient | undefined = sanitizePersistedClient(client);
-    let errorCount = 0;
-
-    if (candidate.clientState.queries.length === 0) {
-      removeStorageItem(storage, key);
-      return;
-    }
-
-    while (candidate) {
-      try {
-        storage.setItem(key, stringify(candidate));
-        return;
-      } catch (error) {
-        errorCount += 1;
-        candidate = removeOldestQuery({
-          persistedClient: candidate,
-          error: error instanceof Error ? error : new Error("Failed to persist the widget query cache"),
-          errorCount,
-        });
-      }
-    }
-  };
-
-  const clearPersistTimer = () => {
-    if (persistTimer === undefined) return;
-    clearTimeout(persistTimer);
-    persistTimer = undefined;
-  };
-
-  const flush = () => {
-    clearPersistTimer();
-    const client = pendingClient;
-    pendingClient = undefined;
-    if (client) persistNow(client);
-  };
-
-  return {
-    persistClient(client) {
-      if (!storage || stopped) return;
-      pendingClient = client;
-      if (persistTimer !== undefined) return;
-      persistTimer = setTimeout(flush, 0);
-    },
-    restoreClient() {
-      try {
-        const storedValue = storage?.getItem(key);
-        if (!storedValue) return undefined;
-
-        const client = sanitizeRestoredClient(parse<unknown>(storedValue));
-        if (!client || client.timestamp > Date.now() || client.clientState.queries.length === 0) {
-          removeStorageItem(storage, key);
-          return undefined;
-        }
-
-        return client;
-      } catch {
-        removeStorageItem(storage, key);
-        return undefined;
-      }
-    },
-    removeClient() {
-      clearPersistTimer();
-      pendingClient = undefined;
-      removeStorageItem(storage, key);
-    },
-    flush,
-    stop() {
-      stopped = true;
-      clearPersistTimer();
-      pendingClient = undefined;
-    },
-  };
-};
@@ -1,11 +1,10 @@
 "use client";

 import type { PropsWithChildren } from "react";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import dynamic from "next/dynamic";
-import { QueryClient } from "@tanstack/react-query";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { ReactQueryStreamedHydration } from "@tanstack/react-query-next-experimental";
-import { PersistQueryClientProvider } from "@tanstack/react-query-persist-client";
 import {
  createWSClient,
  httpBatchStreamLink,
@@ -36,13 +35,6 @@ import { showWarningNotification } from "@homarr/notifications";
 import { widgetQueryRefetchIntervals } from "@homarr/widgets/refetch-intervals";

 import { getSessionQueryScope, SessionQueryScopeGuard } from "./session-query-scope";
-import {
-  createSessionQueryPersister,
-  queryPersistenceBuster,
-  queryPersistenceMaxAgeMs,
-  shouldPersistDashboardQuery,
-} from "./query-persistence";
-import type { SessionQueryPersister } from "./query-persistence";
 import { createQueryRetry } from "./query-retry";

 const DevelopmentTools =
@@ -75,29 +67,21 @@ export function TRPCReactProvider({ children }: PropsWithChildren) {
  const { data: session } = useSession();
  const sessionQueryScope = getSessionQueryScope(session);
  const [initialSessionQueryScope] = useState(() => sessionQueryScope);
-  const [queryPersister] = useState(() => createSessionQueryPersister(initialSessionQueryScope));
-  const handleScopeChange = useCallback(() => {
-    void queryPersister.removeClient();
-    reloadPage();
-  }, [queryPersister]);

  return (
    <SessionQueryScopeGuard
      initialScope={initialSessionQueryScope}
      currentScope={sessionQueryScope}
-      onScopeChange={handleScopeChange}
+      onScopeChange={reloadPage}
    >
-      <ScopedTRPCReactProvider queryPersister={queryPersister}>{children}</ScopedTRPCReactProvider>
+      <ScopedTRPCReactProvider>{children}</ScopedTRPCReactProvider>
    </SessionQueryScopeGuard>
  );
 }

 const reloadPage = () => window.location.reload();

-const ScopedTRPCReactProvider = ({
-  children,
-  queryPersister,
-}: PropsWithChildren<{ queryPersister: SessionQueryPersister }>) => {
+const ScopedTRPCReactProvider = ({ children }: PropsWithChildren) => {
  const wsClient = useMemo(
    () =>
      createWSClient({
@@ -152,15 +136,6 @@ const ScopedTRPCReactProvider = ({
    return client;
  });

-  useEffect(() => {
-    const flush = () => queryPersister.flush();
-    window.addEventListener("pagehide", flush);
-    return () => {
-      window.removeEventListener("pagehide", flush);
-      flush();
-      queryPersister.stop();
-    };
-  }, [queryPersister]);
  useEffect(() => () => queryClient.clear(), [queryClient]);

  const trpcClient = useMemo(() => {
@@ -211,18 +186,10 @@ const ScopedTRPCReactProvider = ({

  return (
    <clientApi.Provider client={trpcClient} queryClient={queryClient}>
-      <PersistQueryClientProvider
-        client={queryClient}
-        persistOptions={{
-          persister: queryPersister,
-          maxAge: queryPersistenceMaxAgeMs,
-          buster: queryPersistenceBuster,
-          dehydrateOptions: { shouldDehydrateQuery: shouldPersistDashboardQuery },
-        }}
-      >
+      <QueryClientProvider client={queryClient}>
        <ReactQueryStreamedHydration transformer={superjson}>{children}</ReactQueryStreamedHydration>
        {process.env.NODE_ENV === "development" && <DevelopmentTools />}
-      </PersistQueryClientProvider>
+      </QueryClientProvider>
    </clientApi.Provider>
  );
 };
@@ -11,13 +11,12 @@ import { useI18n } from "@homarr/translation/client";
 import { FloatingTip } from "@homarr/ui";

 import { BoardAdvancedFocusProvider } from "~/components/board/advanced-focus/context";
-import { BoardAppsSpotlightRegistrar } from "~/components/board/board-apps-spotlight-registrar";
 import { BoardEmptyState } from "~/components/board/board-empty-state";
 import { BoardSetupChecklist } from "~/components/board/board-setup-checklist";
 import {
  getBoardLaneColumnCount,
  getInitialBoardLogicalHeight,
-  getLogicalGridSize,
+  getLogicalTrackSize,
  LOGICAL_GRID_GAP,
  getRootSectionForLane,
 } from "~/components/board/layout";
@@ -62,16 +61,16 @@ export const ClientBoard = () => {
  const rightColumnCount = getBoardLaneColumnCount(currentLayout, "right");
  const laneWidths = [leftColumnCount, mainColumnCount, rightColumnCount]
    .filter((columnCount) => columnCount > 0)
-    .map(getLogicalGridSize);
+    .map(getLogicalTrackSize);
  const logicalWidth =
    laneWidths.reduce((total, width) => total + width, 0) + (laneWidths.length - 1) * LOGICAL_GRID_GAP;
  const initialLogicalHeight = getInitialBoardLogicalHeight(board, currentLayoutId);
  const representativeWidth = layoutOverrideId ? getRepresentativeLayoutWidth(currentLayout, board.layouts) : null;
  const initialAvailableWidth = Math.max(1, (representativeWidth ?? initialViewportWidth) - APP_SHELL_INLINE_PADDING);
  const gridTemplateColumns = [
-    leftColumnCount > 0 ? `${getLogicalGridSize(leftColumnCount)}px` : null,
-    `${getLogicalGridSize(mainColumnCount)}px`,
-    rightColumnCount > 0 ? `${getLogicalGridSize(rightColumnCount)}px` : null,
+    leftColumnCount > 0 ? `${getLogicalTrackSize(leftColumnCount)}px` : null,
+    `${getLogicalTrackSize(mainColumnCount)}px`,
+    rightColumnCount > 0 ? `${getLogicalTrackSize(rightColumnCount)}px` : null,
  ]
    .filter((value) => value !== null)
    .join(" ");
@@ -80,7 +79,6 @@ export const ClientBoard = () => {
    <BoardSelectionGridProvider>
      <BoardAdvancedFocusProvider>
        <Box h="100%" pos="relative" data-homarr-dev-benchmark-board>
-          <BoardAppsSpotlightRegistrar />
          <BoardBackgroundVideo />
          <BoardEmptyState />
          <BoardSetupChecklist />
@@ -111,6 +111,9 @@ export const LayoutSettingsContent = ({ board, form, isSaving, saveSettingsAsync

  const nextBreakpoint = getNextCustomBreakpoint(form.values.layouts);
  const baseLayout = form.values.layouts.find((layout) => layout.role === "base");
+  const sortedLayouts = form.values.layouts
+    .map((layout, index) => ({ layout, index }))
+    .toSorted((entryA, entryB) => entryA.layout.breakpoint - entryB.layout.breakpoint);

  return (
    <SectionCard title={tBoard("setting.section.layout.title")}>
@@ -126,25 +129,25 @@ export const LayoutSettingsContent = ({ board, form, isSaving, saveSettingsAsync
            disabled={nextBreakpoint === null || !baseLayout}
            onClick={() => {
              if (nextBreakpoint === null || !baseLayout) return;
-              const newLayout: FormValues["layouts"][number] = {
-                id: createId(),
-                name: tBoard("setting.section.layout.custom.defaultName"),
-                columnCount: baseLayout.columnCount,
-                leftGutterColumnCount: baseLayout.leftGutterColumnCount,
-                rightGutterColumnCount: baseLayout.rightGutterColumnCount,
-                breakpoint: nextBreakpoint,
-                role: "custom",
-              };
-              let insertionIndex = form.values.layouts.findIndex((layout) => layout.breakpoint > nextBreakpoint);
-              if (insertionIndex === -1) insertionIndex = form.values.layouts.length;
-              form.insertListItem("layouts", newLayout, insertionIndex);
+              form.setFieldValue("layouts", [
+                ...form.values.layouts,
+                {
+                  id: createId(),
+                  name: tBoard("setting.section.layout.custom.defaultName"),
+                  columnCount: baseLayout.columnCount,
+                  leftGutterColumnCount: baseLayout.leftGutterColumnCount,
+                  rightGutterColumnCount: baseLayout.rightGutterColumnCount,
+                  breakpoint: nextBreakpoint,
+                  role: "custom",
+                },
+              ]);
            }}
          >
            {tBoard("setting.section.layout.responsive.action.add")}
          </Button>
        </Group>

-        {form.values.layouts.map((layout, index) => {
+        {sortedLayouts.map(({ layout, index }) => {
          const persistedLayout = board.layouts.find((candidate) => candidate.id === layout.id);
          const sourceLayout = persistedLayout ?? board.layouts.find((candidate) => candidate.role === "base");
          const customBreakpoints = form.values.layouts
@@ -1,7 +1,5 @@
 "use client";

-/* eslint-disable react/no-unstable-nested-components -- Widget modules and definition-bound fallbacks are loaded dynamically. */
-
 import { use, useCallback, useState } from "react";
 import { ActionIcon, Affix, Card } from "@mantine/core";
 import { IconDimensions, IconPencil, IconToggleLeft, IconToggleRight } from "@tabler/icons-react";
@@ -73,7 +71,6 @@ export const WidgetPreviewPageContent = ({ kind }: WidgetPreviewPageContentProps
          ),
          integrationSupport: hasIntegrationSupport,
          settings,
-          previewDimensions: dimensions,
        },
        {
          title(translate) {
@@ -89,10 +86,10 @@ export const WidgetPreviewPageContent = ({ kind }: WidgetPreviewPageContentProps
    } finally {
      setIsEditorLoading(false);
    }
-  }, [currentDefinition, dimensions, kind, openWidgetEditModal, settings, state, t, utils]);
+  }, [currentDefinition, kind, openWidgetEditModal, settings, state, t, utils]);

  const toggleEditMode = useCallback(() => {
-    setEditMode((currentEditMode) => !currentEditMode);
+    setEditMode((editMode) => !editMode);
    showSuccessNotification({
      message: editMode ? t("widgetPreview.toggle.disabled") : t("widgetPreview.toggle.enabled"),
    });
@@ -1,14 +1,8 @@
 import { Suspense } from "react";
-import { notFound, redirect } from "next/navigation";
+import { notFound } from "next/navigation";
 import { Center, Loader } from "@mantine/core";

-import { getHomeBoardAsync } from "@homarr/api/board-server";
-import { IntegrationProvider } from "@homarr/auth/client";
-import { auth } from "@homarr/auth/next";
-import { getIntegrationsWithPermissionsAsync } from "@homarr/auth/server";
-import { BoardPreviewProvider } from "@homarr/boards/context";
 import type { WidgetKind } from "@homarr/definitions";
-import { ModalProvider } from "@homarr/modals";
 import { widgetKinds } from "@homarr/widgets/manifest";

 import { WidgetPreviewPageContent } from "./_content";
@@ -22,24 +16,12 @@ export default async function WidgetPreview(props: Props) {
  if (!widgetKinds.includes(kind as WidgetKind)) {
    notFound();
  }
-  const session = await auth();
-  if (!session) {
-    redirect(`/auth/login?callbackUrl=${encodeURIComponent(`/widgets/${kind}`)}`);
-  }
-
-  const [integrations, board] = await Promise.all([getIntegrationsWithPermissionsAsync(session), getHomeBoardAsync()]);

  return (
-    <IntegrationProvider integrations={integrations}>
-      <BoardPreviewProvider board={board}>
-        <ModalProvider>
-          <Center h="100vh">
-            <Suspense fallback={<Loader size="sm" />}>
-              <WidgetPreviewPageContent key={kind} kind={kind as WidgetKind} />
-            </Suspense>
-          </Center>
-        </ModalProvider>
-      </BoardPreviewProvider>
-    </IntegrationProvider>
+    <Center h="100vh">
+      <Suspense fallback={<Loader size="sm" />}>
+        <WidgetPreviewPageContent key={kind} kind={kind as WidgetKind} />
+      </Suspense>
+    </Center>
  );
 }
@@ -184,6 +184,10 @@
  min-width: 0;
 }

+.widgetPanel[data-editing] .panelActions {
+  padding-inline-end: 2.75rem;
+}
+
 .panelHeader {
  min-width: 0;
  min-height: 3.75rem;
@@ -32,7 +32,7 @@ import { showErrorNotification, showWarningNotification } from "@homarr/notifica
 import { closeSpotlight } from "@homarr/spotlight/store";
 import { useI18n } from "@homarr/translation/client";
 import { openMediaRequestSearch, openSpotlight, useRegisterSpotlightContextResults } from "@homarr/spotlight";
-import { AssistantWidgetRendererProvider } from "@homarr/widgets/assistant/context";
+import { AssistantWidgetRendererProvider } from "@homarr/widgets";
 import { createWorkshopClient } from "~/components/workshop/workshop-client";

 import { AssistantContext, AssistantPreferencesContext, useAssistantPreferences } from "./assistant-context";
@@ -856,7 +856,6 @@ const EnabledAssistantProvider = ({ children }: PropsWithChildren) => {
          : t("busy.description"),
      unavailable: !canSend,
      alwaysVisible: true,
-      placement: "fallback" as const,
      interaction: (query: string) =>
        createAssistantPromptInteraction({
          sendPrompt,
@@ -19,7 +19,6 @@ export const useRegisterAssistantSpotlightPlaceholder = (description: string) =>
      description,
      unavailable: true,
      alwaysVisible: true,
-      placement: "fallback" as const,
      interaction: (_query: string) => ({ type: "none" as const }),
    }),
    [description, t],
@@ -20,7 +20,6 @@ describe("getAssistantWidgetConfiguration", () => {

  test("preserves generated notebook content and fills its hidden defaults", () => {
    const result = getAssistantWidgetConfiguration(
-      widgetImports.notebook.definition,
      {
        boardId: "board-1",
        boardName: "Home",
@@ -42,7 +41,6 @@ describe("getAssistantWidgetConfiguration", () => {

  test("keeps only accessible, compatible integrations and respects the widget maximum", () => {
    const result = getAssistantWidgetConfiguration(
-      widgetImports.audioStats.definition,
      {
        boardId: "board-1",
        boardName: "Home",
@@ -90,13 +88,11 @@ describe("getAssistantWidgetConfiguration", () => {

  test("treats integration-backed widgets as required unless explicitly optional", () => {
    const mediaServer = getAssistantWidgetConfiguration(
-      widgetImports.mediaServer.definition,
      { boardId: "board-1", boardName: "Home", kind: "mediaServer", summary: "Show Plex streams" },
      settings,
      [],
    );
    const calendar = getAssistantWidgetConfiguration(
-      widgetImports.calendar.definition,
      { boardId: "board-1", boardName: "Home", kind: "calendar", summary: "Show releases" },
      settings,
      [],
@@ -1,11 +1,9 @@
 "use client";

-import { Suspense, use, useMemo } from "react";
+import { useMemo } from "react";
 import type { ToolCallMessagePartProps } from "@assistant-ui/react";
 import { Alert, Box, Button, Group, Skeleton, Stack, Text, ThemeIcon } from "@mantine/core";
 import { IconAlertTriangle, IconCheck, IconSettings } from "@tabler/icons-react";
-import { ErrorBoundary } from "react-error-boundary";
-import type { FallbackProps } from "react-error-boundary";

 import { clientApi } from "@homarr/api/client";
 import { useSession } from "@homarr/auth/client";
@@ -15,8 +13,7 @@ import { useModalAction } from "@homarr/modals";
 import type { SettingsContextProps } from "@homarr/settings/creator";
 import { useSettings } from "@homarr/settings";
 import { useI18n } from "@homarr/translation/client";
-import type { WidgetDefinition } from "@homarr/widgets/definition";
-import { loadWidgetDefinition, reduceWidgetOptionsWithDefinition } from "@homarr/widgets/manifest";
+import { reduceWidgetOptionsWithDefaultValues, widgetImports } from "@homarr/widgets";
 import type { IntegrationSelectOption } from "@homarr/widgets/widget-integration-select";
 import { WidgetEditModal } from "@homarr/widgets/modals";

@@ -32,11 +29,11 @@ interface AssistantIntegration extends IntegrationSelectOption {
 }

 export const getAssistantWidgetConfiguration = (
-  definition: WidgetDefinition,
  args: ConfigureWidgetArgs,
  settings: Pick<SettingsContextProps, "enableStatusByDefault" | "forceDisableStatus">,
  integrations: AssistantIntegration[],
 ) => {
+  const definition = widgetImports[args.kind].definition;
  const integrationSupport = "supportedIntegrations" in definition;
  const supportedIntegrations = integrationSupport
    ? (definition.supportedIntegrations as readonly IntegrationKind[])
@@ -57,91 +54,35 @@ export const getAssistantWidgetConfiguration = (
      integrationSupport && (!("integrationsRequired" in definition) || definition.integrationsRequired !== false),
    value: {
      advancedOptions: { title: null, customCssClasses: [], borderColor: "" },
-      options: reduceWidgetOptionsWithDefinition(definition, settings, args.options),
+      options: reduceWidgetOptionsWithDefaultValues(args.kind, settings, args.options),
      integrationIds,
    },
  };
 };

-type AssistantConfigureWidgetToolProps = ToolCallMessagePartProps<ConfigureWidgetArgs, ConfigureWidgetResult>;
-
-export const AssistantConfigureWidgetTool = (props: AssistantConfigureWidgetToolProps) => {
-  const hasCompleteArguments = hasCompleteAssistantToolArguments(props.status);
-  const completeArgs =
-    props.result === undefined && !hasFailedAssistantToolArguments(props.status) && hasCompleteArguments
-      ? props.args
-      : undefined;
-
-  if (!completeArgs) return <AssistantConfigureWidgetToolContent {...props} definition={undefined} />;
-
-  return (
-    <ErrorBoundary FallbackComponent={AssistantWidgetDefinitionErrorFallback} resetKeys={[completeArgs.kind]}>
-      <Suspense fallback={<AssistantConfigureWidgetSkeleton />}>
-        <LoadedAssistantConfigureWidgetTool {...props} args={completeArgs} />
-      </Suspense>
-    </ErrorBoundary>
-  );
-};
-
-const AssistantWidgetDefinitionErrorFallback = ({ resetErrorBoundary }: FallbackProps) => {
-  const t = useI18n("assistant.configureWidget");
-  const actionT = useI18n("common.action");
-
-  return (
-    <Alert color="red" variant="light" title={t("definitionLoadErrorTitle")} icon={<IconAlertTriangle size={18} />}>
-      <Stack gap="sm">
-        <Text size="sm">{t("definitionLoadErrorDescription")}</Text>
-        <Button variant="light" color="red" size="compact-sm" w="fit-content" onClick={resetErrorBoundary}>
-          {actionT("tryAgain")}
-        </Button>
-      </Stack>
-    </Alert>
-  );
-};
-
-const LoadedAssistantConfigureWidgetTool = (
-  props: AssistantConfigureWidgetToolProps & { args: ConfigureWidgetArgs },
-) => {
-  const definition = use(loadWidgetDefinition(props.args.kind));
-  return <AssistantConfigureWidgetToolContent {...props} definition={definition} />;
-};
-
-const AssistantConfigureWidgetSkeleton = () => {
-  const t = useI18n("assistant.configureWidget");
-  return (
-    <Box className={classes.appTool} aria-label={t("preparing")}>
-      <Stack gap="sm">
-        <Skeleton height={18} width="45%" />
-        <Skeleton height={14} width="76%" />
-        <Skeleton height={38} />
-      </Stack>
-    </Box>
-  );
-};
-
-const AssistantConfigureWidgetToolContent = ({
+export const AssistantConfigureWidgetTool = ({
  args,
  result,
  addResult,
  status,
  toolCallId,
-  definition,
-}: AssistantConfigureWidgetToolProps & { definition: WidgetDefinition | undefined }) => {
+}: ToolCallMessagePartProps<ConfigureWidgetArgs, ConfigureWidgetResult>) => {
  const t = useI18n("assistant.configureWidget");
  const actionT = useI18n("common.action");
  const fullT = useI18n();
  const { data: session } = useSession();
  const settings = useSettings();
  const hasCompleteArguments = hasCompleteAssistantToolArguments(status);
+  const definition = args?.kind ? widgetImports[args.kind].definition : undefined;
  const needsIntegrations = definition !== undefined && "supportedIntegrations" in definition;
  const integrations = clientApi.integration.all.useQuery(undefined, {
    enabled: result === undefined && hasCompleteArguments && needsIntegrations,
    retry: false,
  });
  const configuration = useMemo(() => {
-    if (!args || !definition || !hasCompleteArguments || (needsIntegrations && !integrations.data)) return null;
-    return getAssistantWidgetConfiguration(definition, args, settings, integrations.data ?? []);
-  }, [args, definition, hasCompleteArguments, integrations.data, needsIntegrations, settings]);
+    if (!args || !hasCompleteArguments || (needsIntegrations && !integrations.data)) return null;
+    return getAssistantWidgetConfiguration(args, settings, integrations.data ?? []);
+  }, [args, hasCompleteArguments, integrations.data, needsIntegrations, settings]);
  const missingRequiredIntegration =
    configuration?.integrationsRequired === true && configuration.value.integrationIds.length === 0;
  const { openModal: openWidgetModal } = useModalAction(WidgetEditModal);
@@ -193,7 +134,15 @@ const AssistantConfigureWidgetToolContent = ({
  }

  if (!hasCompleteArguments || !args || (needsIntegrations && integrations.isPending)) {
-    return <AssistantConfigureWidgetSkeleton />;
+    return (
+      <Box className={classes.appTool} aria-label={t("preparing")}>
+        <Stack gap="sm">
+          <Skeleton height={18} width="45%" />
+          <Skeleton height={14} width="76%" />
+          <Skeleton height={38} />
+        </Stack>
+      </Box>
+    );
  }

  if (integrations.isError) {
@@ -209,7 +158,7 @@ const AssistantConfigureWidgetToolContent = ({
    );
  }

-  if (!configuration || !definition) return null;
+  if (!configuration) return null;

  const openConfigurationModal = (
    value = configuration.value,
@@ -218,7 +167,7 @@ const AssistantConfigureWidgetToolContent = ({
    openWidgetModal(
      {
        kind: args.kind,
-        definition,
+        definition: widgetImports[args.kind].definition,
        value,
        integrationData,
        integrationSupport: configuration.integrationSupport,
@@ -291,7 +240,7 @@ const AssistantConfigureWidgetToolContent = ({
    );
  }

-  const WidgetIcon = definition.icon;
+  const WidgetIcon = widgetImports[args.kind].definition.icon;
  return (
    <Box className={classes.appTool}>
      <Group gap="sm" align="flex-start" wrap="nowrap">
@@ -1,70 +0,0 @@
-"use client";
-
-import { useEffect, useMemo, useState } from "react";
-
-import { clientApi } from "@homarr/api/client";
-import { useRequiredBoard } from "@homarr/boards/context";
-import { getSafeAppHref } from "@homarr/common";
-import type { ContextSpecificItem } from "@homarr/spotlight";
-import { useRegisterSpotlightContextResults } from "@homarr/spotlight";
-import { hasPendingSpotlightOpen, spotlightOpenEvent } from "@homarr/spotlight/open";
-
-export const BoardAppsSpotlightRegistrar = () => {
-  const board = useRequiredBoard();
-  const [isSpotlightActivated, setIsSpotlightActivated] = useState(() => hasPendingSpotlightOpen());
-
-  useEffect(() => {
-    if (isSpotlightActivated) return;
-
-    const activateSpotlightQueries = () => setIsSpotlightActivated(true);
-    window.addEventListener(spotlightOpenEvent, activateSpotlightQueries);
-
-    if (hasPendingSpotlightOpen()) activateSpotlightQueries();
-
-    return () => window.removeEventListener(spotlightOpenEvent, activateSpotlightQueries);
-  }, [isSpotlightActivated]);
-
-  const openInNewTabByAppId = useMemo(() => {
-    const result = new Map<string, boolean>();
-
-    for (const item of board.items) {
-      if (item.kind !== "app" || typeof item.options.appId !== "string" || item.options.appId.length === 0) continue;
-
-      const existingOpenInNewTab = result.get(item.options.appId) ?? false;
-      result.set(item.options.appId, existingOpenInNewTab || item.options.openInNewTab === true);
-    }
-
-    return result;
-  }, [board.items]);
-  const appIds = useMemo(() => Array.from(openInNewTabByAppId.keys()), [openInNewTabByAppId]);
-  const activeAppIds = isSpotlightActivated ? appIds : [];
-  const appQueries = clientApi.useQueries((trpc) => activeAppIds.map((id) => trpc.app.byId({ id })));
-  const apps = appQueries.flatMap((query) => query.data ?? []);
-  const spotlightItems = useMemo<ContextSpecificItem[]>(() => {
-    return apps.flatMap((app) => {
-      const href = getSafeAppHref(app.href);
-      if (!href) return [];
-
-      return [
-        {
-          id: app.id,
-          dedupeKey: `app:${app.id}`,
-          name: app.name,
-          icon: app.iconUrl,
-          interaction() {
-            return {
-              type: "link" as const,
-              href,
-              // Opening a new tab wins if any widget instance requests it.
-              newTab: openInNewTabByAppId.get(app.id) ?? false,
-            };
-          },
-        },
-      ];
-    });
-  }, [apps, openInNewTabByAppId]);
-
-  useRegisterSpotlightContextResults("board-apps", spotlightItems, [spotlightItems]);
-
-  return null;
-};
@@ -1,6 +1,5 @@
 .canvas {
-  width: 100%;
-  min-width: 0;
+  min-height: 8rem;
  aspect-ratio: 16 / 7;
  overflow: hidden;
  color: var(--mantine-color-dimmed);
@@ -84,3 +83,9 @@
  gap: rem(1px);
  overflow: hidden;
 }
+
+@media (max-width: $mantine-breakpoint-xs) {
+  .canvas {
+    min-height: 7rem;
+  }
+}
@@ -11,12 +11,11 @@ import classes from "./board-layout-thumbnail.module.css";
 interface BoardLayoutThumbnailProps {
  preview: BoardPreviewData | null;
  label: string;
-  fitFullLayout?: boolean;
 }

 const maxThumbnailRows = 12;

-export const BoardLayoutThumbnail = ({ preview, label, fitFullLayout = false }: BoardLayoutThumbnailProps) => {
+export const BoardLayoutThumbnail = ({ preview, label }: BoardLayoutThumbnailProps) => {
  const layout = preview?.layouts.find((candidate) => candidate.role === "base") ?? preview?.layouts.at(0);
  if (!preview || !layout) {
    return (
@@ -27,7 +26,6 @@ export const BoardLayoutThumbnail = ({ preview, label, fitFullLayout = false }:
  }

  const elements = projectBoardLayout(preview, layout, layout);
-  const thumbnailRowLimit = fitFullLayout ? Number.POSITIVE_INFINITY : maxThumbnailRows;
  const roots = preview.sections
    .filter((section) => section.kind === "empty")
    .toSorted((first, second) => (first.xOffset ?? 0) - (second.xOffset ?? 0) || first.id.localeCompare(second.id));
@@ -67,12 +65,12 @@ export const BoardLayoutThumbnail = ({ preview, label, fitFullLayout = false }:
              element.xOffset >= 0 &&
              element.xOffset < columnCount &&
              element.yOffset >= 0 &&
-              element.yOffset < thumbnailRowLimit &&
+              element.yOffset < maxThumbnailRows &&
              element.width > 0 &&
              element.height > 0,
          );
          const rowCount = Math.min(
-            thumbnailRowLimit,
+            maxThumbnailRows,
            Math.max(4, ...laneElements.map((element) => element.yOffset + element.height)),
          );

@@ -1,26 +1,7 @@
-.modalContent {
-  overflow: hidden;
-  border: rem(1px) solid color-mix(in srgb, var(--mantine-color-default-border) 70%, transparent);
-  border-radius: rem(24px);
-  background: color-mix(in srgb, var(--mantine-color-body) 58%, transparent);
-  box-shadow: 0 rem(18px) rem(56px) rgb(0 0 0 / 22%);
-  backdrop-filter: blur(rem(20px)) saturate(140%);
-}
-
-.modalBody {
-  padding: var(--mantine-spacing-sm);
-}
-
 .content {
  outline: none;
 }

-.searchInput {
-  border-color: color-mix(in srgb, var(--mantine-color-default-border) 72%, transparent);
-  background: color-mix(in srgb, var(--mantine-color-body) 54%, transparent);
-  backdrop-filter: blur(rem(8px));
-}
-
 .option {
  min-width: 0;
  border-radius: var(--mantine-radius-md);
@@ -30,12 +11,6 @@
 .card {
  height: 100%;
  overflow: hidden;
-  box-shadow: var(--mantine-shadow-sm);
-}
-
-.metadataBadge {
-  width: rem(22px);
-  padding-inline: 0;
 }

 .option:hover .card,
@@ -3,32 +3,29 @@
 import type { KeyboardEvent, ReactNode, RefObject } from "react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import {
-  Badge,
  Card,
  Center,
  Group,
+  Kbd,
  Loader,
  Modal,
  ScrollArea,
  SimpleGrid,
  Stack,
  Text,
-  TextInput,
  ThemeIcon,
-  Tooltip,
  UnstyledButton,
  useMatches,
  VisuallyHidden,
 } from "@mantine/core";
 import { useHotkeys } from "@mantine/hooks";
-import { IconDeviceMobile, IconHomeFilled, IconLayoutBoard, IconSearch } from "@tabler/icons-react";
+import { IconArrowDown, IconArrowRight, IconLayoutBoard, IconReplace } from "@tabler/icons-react";

 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
 import { useOptionalBoard } from "@homarr/boards/context";
-import { useRegisterSpotlightContextActions } from "@homarr/spotlight";
 import { useI18n } from "@homarr/translation/client";
-import { Link, UserAvatar } from "@homarr/ui";
+import { Link } from "@homarr/ui";

 import { BoardLayoutThumbnail } from "~/components/board/board-layout-thumbnail";

@@ -42,8 +39,6 @@ interface BoardSwitcherProps {

 export const BoardSwitcher = ({ children }: BoardSwitcherProps) => {
  const t = useI18n("board.action.switcher");
-  const tBoard = useI18n("board");
-  const manageBoardsT = useI18n("management.page.board");
  const currentBoard = useOptionalBoard();
  const [isOpen, setIsOpen] = useState(false);
  const [search, setSearch] = useState("");
@@ -55,27 +50,20 @@ export const BoardSwitcher = ({ children }: BoardSwitcherProps) => {
    data: boards = [],
    isPending,
    isError,
-  } = clientApi.board.getManageOverview.useQuery(
-    { fullPreview: true },
-    {
-      enabled: isOpen,
-    },
-  );
+  } = clientApi.board.getManageOverview.useQuery(undefined, {
+    enabled: isOpen,
+  });

-  const switcherBoards = useMemo(
-    () => [
-      ...boards.filter((board) => board.id !== currentBoard?.id),
-      ...boards.filter((board) => board.id === currentBoard?.id),
-    ],
+  const availableBoards = useMemo(
+    () => boards.filter((board) => board.id !== currentBoard?.id),
    [boards, currentBoard?.id],
  );
  const filteredBoards = useMemo(() => {
    const normalizedSearch = search.trim().toLocaleLowerCase();
-    if (normalizedSearch.length === 0) return switcherBoards;
-    return switcherBoards.filter((board) => board.name.toLocaleLowerCase().includes(normalizedSearch));
-  }, [search, switcherBoards]);
+    if (normalizedSearch.length === 0) return availableBoards;
+    return availableBoards.filter((board) => board.name.toLocaleLowerCase().includes(normalizedSearch));
+  }, [availableBoards, search]);
  const columnCount = Math.max(1, Math.min(filteredBoards.length, responsiveColumnCount));
-  const modalColumnCount = Math.max(1, Math.min(switcherBoards.length, responsiveColumnCount));

  const openSwitcher = useCallback(() => {
    setIsOpen(true);
@@ -85,21 +73,7 @@ export const BoardSwitcher = ({ children }: BoardSwitcherProps) => {
    setSearch("");
    setActiveIndex(0);
  }, []);
-  const preloadBoards = () => void utils.board.getManageOverview.prefetch({ fullPreview: true });
-
-  const spotlightAction = useMemo(
-    () => ({
-      id: "open-board-switcher",
-      name: tBoard("action.switch"),
-      icon: IconLayoutBoard,
-      interaction: () => ({
-        type: "javaScript" as const,
-        onSelect: openSwitcher,
-      }),
-    }),
-    [openSwitcher, tBoard],
-  );
-  useRegisterSpotlightContextActions("board-switcher", [spotlightAction], [spotlightAction]);
+  const preloadBoards = () => void utils.board.getManageOverview.prefetch();

  useHotkeys([[boardSwitcherHotkey, openSwitcher, { preventDefault: true }]]);

@@ -114,17 +88,14 @@ export const BoardSwitcher = ({ children }: BoardSwitcherProps) => {
  }, [activeIndex, filteredBoards.length, isOpen]);

  const handleModalKeyDown = (event: KeyboardEvent<HTMLDivElement>) => {
-    const isSearchInput =
-      event.target instanceof HTMLInputElement && event.target.dataset.boardSwitcherSearch !== undefined;
-
-    if (!isSearchInput && event.key === "Backspace") {
+    if (event.key === "Backspace") {
      event.preventDefault();
      setSearch((current) => current.slice(0, -1));
      setActiveIndex(0);
      return;
    }

-    if (!isSearchInput && event.key.length === 1 && !event.altKey && !event.ctrlKey && !event.metaKey) {
+    if (event.key.length === 1 && !event.altKey && !event.ctrlKey && !event.metaKey) {
      event.preventDefault();
      setSearch((current) => `${current}${event.key}`);
      setActiveIndex(0);
@@ -170,7 +141,7 @@ export const BoardSwitcher = ({ children }: BoardSwitcherProps) => {
  };

  const results = getBoardSwitcherResults({
-    availableBoardCount: switcherBoards.length,
+    availableBoardCount: availableBoards.length,
    filteredBoards,
    isError,
    isPending,
@@ -181,7 +152,6 @@ export const BoardSwitcher = ({ children }: BoardSwitcherProps) => {
    setActiveIndex,
    optionRefs,
    columnCount,
-    manageBoardsT,
  });

  return (
@@ -191,40 +161,54 @@ export const BoardSwitcher = ({ children }: BoardSwitcherProps) => {
      <Modal
        opened={isOpen}
        onClose={closeSwitcher}
-        withCloseButton={false}
-        yOffset="15vh"
-        aria-label={t("title")}
-        size={`${modalColumnCount * 15 + Math.max(0, modalColumnCount - 1) * 0.75}rem`}
-        overlayProps={{ backgroundOpacity: 0, blur: 2 }}
+        title={
+          <Group gap="sm" wrap="nowrap">
+            <ThemeIcon variant="light" radius="md">
+              <IconReplace size={18} stroke={1.5} />
+            </ThemeIcon>
+            <Text fw={700}>{t("title")}</Text>
+          </Group>
+        }
+        size={1280}
+        yOffset={32}
+        overlayProps={{ backgroundOpacity: 0.18, blur: 2 }}
        transitionProps={{ transition: "fade", duration: 100, timingFunction: "ease" }}
-        classNames={{ content: classes.modalContent, body: classes.modalBody }}
      >
        <Stack
+          data-autofocus
          tabIndex={-1}
-          gap="xs"
+          gap="md"
          onKeyDown={handleModalKeyDown}
          className={classes.content}
          aria-describedby="board-switcher-instructions"
        >
          <VisuallyHidden id="board-switcher-instructions">{t("keyboard.instructions")}</VisuallyHidden>
-          <TextInput
-            data-autofocus
-            data-board-switcher-search
-            value={search}
-            onChange={(event) => {
-              setSearch(event.currentTarget.value);
-              setActiveIndex(0);
-            }}
-            leftSection={<IconSearch size="1rem" stroke={1.6} />}
-            placeholder={t("title")}
-            aria-label={t("title")}
-            aria-controls="board-switcher-results"
-            radius="xl"
-            classNames={{ input: classes.searchInput }}
-          />
-          <ScrollArea.Autosize mah="min(80vh, 42rem)" type="never">
+          <ScrollArea.Autosize mah={640} type="auto" offsetScrollbars>
            {results}
          </ScrollArea.Autosize>
+
+          <Group justify={currentBoard ? "space-between" : "flex-end"} gap="xs" visibleFrom="sm">
+            {currentBoard && (
+              <Text size="xs" c="dimmed">
+                {t("currentHidden", { name: currentBoard.name })}
+              </Text>
+            )}
+            <Group gap="xs">
+              <Kbd size="xs">
+                <IconArrowRight size={12} />
+              </Kbd>
+              <Kbd size="xs">
+                <IconArrowDown size={12} />
+              </Kbd>
+              <Text size="xs" c="dimmed">
+                {t("keyboard.navigate")}
+              </Text>
+              <Kbd size="xs">Enter</Kbd>
+              <Text size="xs" c="dimmed">
+                {t("keyboard.open")}
+              </Text>
+            </Group>
+          </Group>
        </Stack>
      </Modal>
    </>
@@ -243,7 +227,6 @@ interface BoardSwitcherResultsProps {
  setActiveIndex: (index: number) => void;
  optionRefs: RefObject<Array<HTMLAnchorElement | null>>;
  columnCount: number;
-  manageBoardsT: ReturnType<typeof useI18n<"management.page.board">>;
 }

 const getBoardSwitcherResults = ({
@@ -258,7 +241,6 @@ const getBoardSwitcherResults = ({
  setActiveIndex,
  optionRefs,
  columnCount,
-  manageBoardsT,
 }: BoardSwitcherResultsProps) => {
  if (isPending) {
    return (
@@ -305,7 +287,7 @@ const getBoardSwitcherResults = ({
  }

  return (
-    <SimpleGrid id="board-switcher-results" aria-label={t("results")} cols={columnCount} spacing="xs" p={2}>
+    <SimpleGrid id="board-switcher-results" aria-label={t("results")} cols={columnCount} spacing="md" p={4}>
      {filteredBoards.map((board, index) => (
        <UnstyledButton
          key={board.id}
@@ -314,7 +296,7 @@ const getBoardSwitcherResults = ({
          }}
          className={classes.option}
          w="100%"
-          maw={240}
+          maw={320}
          mx="auto"
          component={Link}
          href={`/boards/${encodeURIComponent(board.name)}`}
@@ -324,50 +306,21 @@ const getBoardSwitcherResults = ({
          onFocus={() => setActiveIndex(index)}
          onPointerEnter={() => setActiveIndex(index)}
        >
-          <Card padding={0} withBorder radius="lg" className={classes.card}>
+          <Card padding={0} withBorder radius="md" className={classes.card}>
            <Card.Section>
              <BoardLayoutThumbnail
                preview={board.preview}
                label={t("preview", { name: board.name, count: String(board.preview?.items.length ?? 0) })}
-                fitFullLayout
              />
            </Card.Section>
-            <Card.Section withBorder px="sm" py={6}>
-              <Group justify="space-between" gap="xs" wrap="nowrap">
-                <Text fw={600} size="sm" truncate>
+            <Card.Section withBorder p="sm">
+              <Group gap="sm" wrap="nowrap">
+                <ThemeIcon variant="light" radius="md" size="md">
+                  <IconLayoutBoard size={16} stroke={1.5} />
+                </ThemeIcon>
+                <Text fw={650} truncate>
                  {board.name}
                </Text>
-                <Group gap={4} wrap="nowrap">
-                  {board.isHome && (
-                    <Tooltip label={manageBoardsT("action.setHomeBoard.badge.tooltip")}>
-                      <Badge
-                        className={classes.metadataBadge}
-                        color="yellow"
-                        variant="light"
-                        aria-label={manageBoardsT("action.setHomeBoard.badge.label")}
-                      >
-                        <IconHomeFilled size="0.7rem" />
-                      </Badge>
-                    </Tooltip>
-                  )}
-                  {board.isMobileHome && (
-                    <Tooltip label={manageBoardsT("action.setMobileHomeBoard.badge.tooltip")}>
-                      <Badge
-                        className={classes.metadataBadge}
-                        color="yellow"
-                        variant="light"
-                        aria-label={manageBoardsT("action.setMobileHomeBoard.badge.label")}
-                      >
-                        <IconDeviceMobile size="0.7rem" />
-                      </Badge>
-                    </Tooltip>
-                  )}
-                  {board.creator && (
-                    <Tooltip label={board.creator.name ?? manageBoardsT("preview.unknownCreator")}>
-                      <UserAvatar user={board.creator} size="xs" />
-                    </Tooltip>
-                  )}
-                </Group>
              </Group>
            </Card.Section>
          </Card>
@@ -1,22 +1,17 @@
-.refreshIndicator {
-  position: absolute;
-  top: 0.25rem;
-  right: 0.25rem;
-  z-index: 3;
-  display: grid;
-  place-items: center;
-  width: 1.25rem;
-  height: 1.25rem;
-  border-radius: 999px;
-  background: color-mix(in srgb, var(--mantine-color-body) 78%, transparent);
-  pointer-events: none;
+.badge {
+  @mixin dark {
+    --background-color: rgb(from var(--mantine-color-dark-6) r g b / var(--opacity));
+    --border-color: rgb(from var(--mantine-color-dark-4) r g b / var(--opacity));
+  }
+  @mixin light {
+    --background-color: rgb(from var(--mantine-color-white) r g b / var(--opacity));
+    --border-color: rgb(from var(--mantine-color-gray-3) r g b / var(--opacity));
+  }
+  background-color: var(--background-color) !important;
+  border-color: var(--border-color) !important;
 }

 .settingsButton {
-  position: absolute;
-  top: -34px;
-  right: 14px;
-  z-index: 201;
  opacity: 0;
  pointer-events: none;
  transition: opacity 120ms ease;
@@ -63,11 +58,3 @@
    transition: none;
  }
 }
-
-@media (max-width: 768px) {
-  .settingsButton {
-    right: 4px;
-    opacity: 1;
-    pointer-events: auto;
-  }
-}
@@ -1,10 +1,11 @@
-import type { ComponentType, CSSProperties, MutableRefObject, PropsWithChildren } from "react";
+import type { ComponentType, CSSProperties, MutableRefObject } from "react";
 import { memo, Suspense, use, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { createPortal } from "react-dom";
 import dynamic from "next/dynamic";
-import { Box, Button, Center, Loader, Portal } from "@mantine/core";
+import type { CardProps } from "@mantine/core";
+import { Badge, Box, Button, Card, Center, Loader, Portal } from "@mantine/core";
 import { useElementSize, useIsomorphicEffect } from "@mantine/hooks";
-import { QueryErrorResetBoundary, useIsFetching, useQueryClient } from "@tanstack/react-query";
+import { QueryErrorResetBoundary, useQueryClient } from "@tanstack/react-query";
 import combineClasses from "clsx";
 import { NoIntegrationSelectedError } from "@homarr/widgets/errors/classes";
 import type { FallbackProps } from "react-error-boundary";
@@ -19,16 +20,13 @@ import { WidgetError } from "@homarr/widgets/errors";
 import {
  createWidgetRuntimeState,
  getWidgetQueryKeys,
-  getWidgetRuntimeQueries,
  supportsAdvancedFocus as definitionSupportsAdvancedFocus,
 } from "@homarr/widgets/definition";
 import type { WidgetComponentProps, WidgetDefinition, WidgetRuntimeRef } from "@homarr/widgets/definition";
 import { loadWidgetResources, reduceWidgetOptionsWithDefinition } from "@homarr/widgets/manifest";
-import { WidgetCardShell, WidgetTitleBadge } from "@homarr/widgets/widget-card-shell";

 import type { SectionItem } from "~/app/[locale]/boards/_types";
 import { getLogicalTrackSize } from "~/components/board/layout";
-import { useBoardCanvasScale } from "~/components/board/layout/scaled-board-canvas";
 import advancedFocusClasses from "../advanced-focus/advanced-focus.module.css";
 import { useAdvancedFocus } from "../advanced-focus/context";
 import { startAdvancedFocusEntrance } from "../advanced-focus/entrance";
@@ -36,11 +34,11 @@ import { getAdvancedFocusClosePosition, getAdvancedFocusRect } from "../advanced
 import { AdvancedFocusManualSurface } from "../advanced-focus/manual-surface";
 import { redirectShiftWheel } from "../advanced-focus/wheel";
 import { useBoardGridPortalHost } from "../sections/grid/grid-portal-host";
+import classes from "../sections/item.module.css";
 import { useItemActions } from "./item-actions";
 import itemContentClasses from "./item-content.module.css";
 import { WidgetContextMenu } from "./widget-context-menu";
 import { removeWidgetDataQueries } from "./widget-query-recovery";
-import { matchesWidgetItemQuery } from "./widget-query-scope";

 const BoardItemMenu = dynamic(() => import("./item-menu").then((module) => module.BoardItemMenu), {
  ssr: false,
@@ -50,28 +48,47 @@ interface BoardItemContentProps {
  item: SectionItem;
 }

-type BoardItemCardProps = PropsWithChildren<{
+const getOverflowFromKind = (kind: SectionItem["kind"], hasCustomCssClasses: boolean) => {
+  if (kind === "systemResources") return { overflowX: "visible", overflowY: "visible" } as const;
+  if (kind === "iframe" || kind === "assistant") return { overflowX: "hidden", overflowY: "hidden" } as const;
+  if (hasCustomCssClasses) return {};
+  return { overflowX: "hidden", overflowY: "auto" } as const;
+};
+
+type BoardItemCardProps = CardProps & {
  item: SectionItem;
  innerRef: (element: HTMLDivElement | null) => void;
-}>;
+};

-const BoardItemCard = ({ item, innerRef, children }: BoardItemCardProps) => {
+const BoardItemCard = ({ item, innerRef, children, ...cardProps }: BoardItemCardProps) => {
  const board = useRequiredBoard();

  return (
-    <WidgetCardShell
-      innerRef={innerRef}
-      kind={item.kind}
-      advancedOptions={item.advancedOptions}
-      opacity={board.opacity / 100}
+    <Card
+      {...cardProps}
+      ref={innerRef}
      w="100%"
      h="100%"
      data-grid-item-content
+      className={combineClasses(
+        classes.itemCard,
+        `${item.kind}-wrapper`,
+        "board-grid-item-content",
+        item.advancedOptions.customCssClasses.join(" "),
+      )}
      radius={board.itemRadius}
+      styles={{
+        root: {
+          "--opacity": board.opacity / 100,
+          containerType: "size",
+          ...getOverflowFromKind(item.kind, item.advancedOptions.customCssClasses.length > 0),
+          "--border-color": item.advancedOptions.borderColor !== "" ? item.advancedOptions.borderColor : undefined,
+        },
+      }}
      p={0}
    >
      {children}
-    </WidgetCardShell>
+    </Card>
  );
 };

@@ -150,7 +167,6 @@ const LoadedBoardItemContent = ({
  const cardRef = useRef<HTMLDivElement>(null);
  const previewEntranceFrameRef = useRef<number | null>(null);
  const board = useRequiredBoard();
-  const boardCanvasScale = useBoardCanvasScale();
  const t = useI18n();
  const [isEditMode] = useEditMode();
  const settings = useSettings();
@@ -158,34 +174,12 @@ const LoadedBoardItemContent = ({
    () => ({ ...item, options: reduceWidgetOptionsWithDefinition(definition, settings, item.options) }),
    [definition, item, settings],
  );
-  const widgetQueryKeys = useMemo(() => getWidgetQueryKeys(definition, item.kind), [definition, item.kind]);
-  const isWidgetRefreshing =
-    useIsFetching({
-      predicate: (query) =>
-        query.state.data !== undefined &&
-        matchesWidgetItemQuery(
-          query.queryKey,
-          widgetQueryKeys,
-          {
-            itemId: item.id,
-            boardId: board.id,
-            integrationIds: item.integrationIds,
-            options: menuItem.options,
-            runtimeQueries: getWidgetRuntimeQueries(widgetRuntimeRef),
-          },
-          definition.queryMatcher,
-        ),
-    }) > 0;
  const [manualSurface, setManualSurface] = useState<HTMLDivElement | null>(null);
  const [surfacePortalTarget, setSurfacePortalTarget] = useState<HTMLDivElement | null>(null);
  const { active, viewportSize, open, close, dismiss, hover, leave } = useAdvancedFocus();
  const { width: viewportWidth, height: viewportHeight } = viewportSize;
  const supportsAdvancedFocus = definitionSupportsAdvancedFocus(definition);
  const widgetName = getWidgetName(item.kind, t);
-  const previewDimensions = useMemo(
-    () => ({ width, height, scale: boardCanvasScale }),
-    [boardCanvasScale, height, width],
-  );
  const advancedViewLabel = t("item.advancedFocus.label", { widget: widgetName });
  const advancedViewId = `advanced-focus-${item.id}`;
  const activeFocus = supportsAdvancedFocus && active?.itemId === item.id ? active : null;
@@ -297,11 +291,8 @@ const LoadedBoardItemContent = ({
      : undefined;

  const widgetCard = (
-    <WidgetCardShell
-      innerRef={cardRef}
-      kind={item.kind}
-      advancedOptions={item.advancedOptions}
-      opacity={isAdvanced ? 0.98 : board.opacity / 100}
+    <Card
+      ref={cardRef}
      id={isPreview ? advancedViewId : undefined}
      role={isPreview ? "region" : undefined}
      aria-label={isPreview ? advancedViewLabel : undefined}
@@ -312,9 +303,21 @@ const LoadedBoardItemContent = ({
      h={isManual ? "100%" : isAdvanced ? undefined : "100%"}
      w={isManual ? "100%" : isAdvanced ? undefined : "100%"}
      className={combineClasses(
+        classes.itemCard,
+        `${item.kind}-wrapper`,
+        "board-grid-item-content",
        isPreview && advancedFocusClasses.surface,
        activeFocus?.phase === "closing" && isPreview && advancedFocusClasses.surfaceClosing,
+        item.advancedOptions.customCssClasses.join(" "),
      )}
+      styles={{
+        root: {
+          "--opacity": isAdvanced ? 0.98 : board.opacity / 100,
+          containerType: "size",
+          ...getOverflowFromKind(item.kind, item.advancedOptions.customCssClasses.length > 0),
+          "--border-color": item.advancedOptions.borderColor !== "" ? item.advancedOptions.borderColor : undefined,
+        },
+      }}
      style={previewStyle}
    >
      <Box ref={contentRef} w="100%" h="100%" mih={0}>
@@ -342,21 +345,15 @@ const LoadedBoardItemContent = ({
          />
        </ErrorBoundary>
      </Box>
-      {isWidgetRefreshing && (
-        <Box className={itemContentClasses.refreshIndicator} data-widget-refreshing aria-hidden>
-          <Loader size="xs" />
-        </Box>
-      )}
-    </WidgetCardShell>
+    </Card>
  );

  return (
    <>
-      {isEditMode && <BoardItemMenu item={menuItem} definition={definition} previewDimensions={previewDimensions} />}
+      {isEditMode && <BoardItemMenu item={menuItem} definition={definition} />}
      <WidgetContextMenu
        item={item}
        definition={definition}
-        previewDimensions={previewDimensions}
        widgetStateRef={widgetStateRef}
        widgetRuntimeRef={widgetRuntimeRef}
        sourceRef={sourceRef}
@@ -421,12 +418,25 @@ const LoadedBoardItemContent = ({
          )}
        </Box>
      </WidgetContextMenu>
-      {!isAdvanced && (
-        <WidgetTitleBadge
-          advancedOptions={item.advancedOptions}
-          opacity={board.opacity / 100}
+      {!isAdvanced && item.advancedOptions.title?.trim() && (
+        <Badge
+          pos="absolute"
+          style={{ zIndex: "var(--mantine-z-index-app)" }}
+          top={2}
+          left={16}
+          size="xs"
          radius={board.itemRadius}
-        />
+          styles={{
+            root: {
+              "--border-color": item.advancedOptions.borderColor !== "" ? item.advancedOptions.borderColor : undefined,
+              "--opacity": board.opacity / 100,
+            },
+          }}
+          className={itemContentClasses.badge}
+          c="var(--mantine-color-text)"
+        >
+          {item.advancedOptions.title}
+        </Badge>
      )}
    </>
  );
@@ -21,7 +21,6 @@ import { LazyWidgetEditModal, preloadWidgetEditModal } from "./lazy-widget-edit-
 interface BoardItemMenuProps {
  item: SectionItem;
  definition: WidgetDefinition;
-  previewDimensions: { width: number; height: number; scale?: number };
  resetErrorBoundary?: () => void;
 }

@@ -32,7 +31,7 @@ export const BoardItemMenu = (props: BoardItemMenuProps) => {

  return <BoardItemMenuInner {...props} />;
 };
-const BoardItemMenuInner = ({ item, definition, previewDimensions, resetErrorBoundary }: BoardItemMenuProps) => {
+const BoardItemMenuInner = ({ item, definition, resetErrorBoundary }: BoardItemMenuProps) => {
  const { data: session } = useSession();
  const canDuplicate = item.kind !== "customApi" || (session?.user.permissions.includes("admin") ?? false);
  const refResetErrorBoundaryOnNextRender = useRef(false);
@@ -90,7 +89,6 @@ const BoardItemMenuInner = ({ item, definition, previewDimensions, resetErrorBou
        integrationSupport: "supportedIntegrations" in definition,
        settings,
        itemId: item.id,
-        previewDimensions,
        appId: item.kind === "app" ? (item.options.appId as string | undefined) : undefined,
      },
      {
@@ -108,6 +106,10 @@ const BoardItemMenuInner = ({ item, definition, previewDimensions, resetErrorBou
          variant="default"
          size={24}
          radius="sm"
+          pos="absolute"
+          top={4}
+          right={4}
+          style={{ zIndex: 30 }}
          className={itemContentClasses.settingsButton}
          data-menu-open={isMenuOpen || undefined}
          data-board-widget-settings
@@ -30,7 +30,6 @@ import {
  getIntegrationName,
  getWidgetName,
  getRootSectionLane,
-  widgetDefaultSizes,
  widgetIntegrationSupport,
  widgetKinds,
  widgetKindsWithOptionalIntegrations,
@@ -48,7 +47,6 @@ import { loadWidgetDefinition, reduceWidgetOptionsWithDefinition } from "@homarr
 import type { EmptySection } from "~/app/[locale]/boards/_types";
 import { useSetupAnalytics } from "~/components/create/setup-analytics";
 import { IntegrationSelectModal } from "~/components/integration/integration-select-modal";
-import { getSectionGridColumnCount } from "../sections/grid/section-grid-placements";
 import { useItemActions } from "./item-actions";
 import type { WidgetConnectionStatus } from "./item-select-data";
 import {
@@ -78,8 +76,6 @@ export interface WidgetItemData {
 }

 const selectGridCols = { base: 1, xs: 2, sm: 2, md: 3, lg: 4 };
-const defaultWidgetSize = { width: 1, height: 1 };
-const maximumWidgetHeight = 64;

 const ItemSelectModalContent = ({
  actions,
@@ -128,13 +124,6 @@ const ItemSelectModalContent = ({
  const effectiveSectionId = placementOptions.some(({ value }) => value === targetSectionId)
    ? targetSectionId
    : (placementOptions[0]?.value ?? null);
-  const maximumWidgetSize = useMemo(() => {
-    if (!effectiveSectionId) return defaultWidgetSize;
-    return {
-      width: Math.max(1, getSectionGridColumnCount(board, currentLayoutId, effectiveSectionId) ?? 1),
-      height: maximumWidgetHeight,
-    };
-  }, [board, currentLayoutId, effectiveSectionId]);

  const [loadingSelection, setLoadingSelection] = useState<string | null>(null);
  const selectionLock = useRef(false);
@@ -257,7 +246,6 @@ const ItemSelectModalContent = ({
    try {
      const definition = await loadWidgetDefinition("customApi");
      const itemId = createId();
-      const initialSize = widgetDefaultSizes.customApi ?? defaultWidgetSize;
      const defaultOptions = reduceWidgetOptionsWithDefinition(definition, settings);
      const options = {
        ...defaultOptions,
@@ -275,7 +263,7 @@ const ItemSelectModalContent = ({
            options,
            integrationIds: [],
          },
-          onSuccessfulEdit: ({ options: configuredOptions, advancedOptions }, selectedSize) => {
+          onSuccessfulEdit: ({ options: configuredOptions, advancedOptions }) => {
            const updatedBoard = createItem({
              id: itemId,
              kind: "customApi",
@@ -283,14 +271,12 @@ const ItemSelectModalContent = ({
              options: configuredOptions,
              targetSectionId: effectiveSectionId ?? undefined,
              advancedOptions,
-              size: selectedSize ?? initialSize,
            });
            notifyCreated(updatedBoard, itemId, customWidgetDefinition.name);
          },
          integrationData: [],
          integrationSupport: false,
          settings,
-          previewResize: { initialSize, maximumSize: maximumWidgetSize },
        },
        {
          title: (titleT) => `${titleT("item.edit.title")} - ${customWidgetDefinition.name}`,
@@ -325,7 +311,6 @@ const ItemSelectModalContent = ({
      const matchingIntegrationCount = Math.min(matchingIntegrations.length, maxIntegrations);
      const itemId = createId();
      const defaultOptions = reduceWidgetOptionsWithDefinition(definition, settings);
-      const initialSize = widgetDefaultSizes[kind] ?? defaultWidgetSize;
      const openEditor = (
        availableIntegrations: { id: string; name: string; url: string; kind: IntegrationKind }[],
      ) => {
@@ -341,7 +326,7 @@ const ItemSelectModalContent = ({
              options: defaultOptions,
              integrationIds: selectedIntegrationIds,
            },
-            onSuccessfulEdit: ({ options, integrationIds: newIntegrationIds, advancedOptions }, selectedSize) => {
+            onSuccessfulEdit: ({ options, integrationIds: newIntegrationIds, advancedOptions }) => {
              const updatedBoard = createItem({
                id: itemId,
                kind,
@@ -349,7 +334,6 @@ const ItemSelectModalContent = ({
                integrationIds: newIntegrationIds,
                targetSectionId: effectiveSectionId ?? undefined,
                advancedOptions,
-                size: selectedSize ?? initialSize,
              });
              if (!notifyCreated(updatedBoard, itemId, getWidgetName(kind, t))) return;
              trackSetup("widget-completed", {
@@ -362,7 +346,6 @@ const ItemSelectModalContent = ({
            integrationData: availableIntegrations,
            integrationSupport: hasIntegrationSupport,
            settings,
-            previewResize: { initialSize, maximumSize: maximumWidgetSize },
          },
          {
            title: (titleT) => `${titleT("item.edit.title")} - ${getWidgetName(kind, titleT)}`,
@@ -1,6 +1,5 @@
 "use client";

-import type { PropsWithChildren } from "react";
 import { Suspense, use, useCallback, useMemo, useState } from "react";
 import { Center, Loader } from "@mantine/core";
 import { ErrorBoundary } from "react-error-boundary";
@@ -8,49 +7,16 @@ import type { FallbackProps } from "react-error-boundary";

 import { clientApi } from "@homarr/api/client";
 import type { WidgetKind } from "@homarr/definitions";
-import { widgetDefaultSizes } from "@homarr/definitions";
-import { createModal, useModalAction } from "@homarr/modals";
+import { createModal, modalSizeForm, useModalAction } from "@homarr/modals";
 import { WidgetError } from "@homarr/widgets/errors";
 import type * as WidgetModalsModule from "@homarr/widgets/modals";
-import type { WidgetEditModalProps, WidgetEditModalSize } from "@homarr/widgets/modals";
-import { loadWidgetComponent } from "@homarr/widgets/manifest";
+import type { WidgetEditModalProps } from "@homarr/widgets/modals";
 import type { IntegrationSelectOption } from "@homarr/widgets/widget-integration-select";

-import { AssistantContext, useOptionalHomarrAssistant } from "~/components/assistant/assistant-context";
-import { getLogicalTrackSize } from "~/components/board/layout";
 import { IntegrationSelectModal } from "~/components/integration/integration-select-modal";
 import type * as IntegrationEditFormModule from "~/components/integration/embedded-integration-edit-form";
 import type { EmbeddedIntegrationEditFormProps } from "~/components/integration/embedded-integration-edit-form";

-const defaultWidgetSize = { width: 1, height: 1 };
-const ignoreAssistantAction = () => undefined;
-const ignoreAssistantPrompt = () => false;
-const ignoreAssistantRefresh = () => Promise.resolve();
-const getPreviewDimensions = (size: WidgetEditModalSize) => ({
-  width: getLogicalTrackSize(size.width),
-  height: getLogicalTrackSize(size.height),
-});
-
-const PreviewRuntimeWrapper = ({ children }: PropsWithChildren) => {
-  const assistant = useOptionalHomarrAssistant();
-  const previewAssistant = useMemo(() => {
-    if (!assistant) return null;
-    return {
-      ...assistant,
-      open: ignoreAssistantAction,
-      close: ignoreAssistantAction,
-      toggle: ignoreAssistantAction,
-      sendPrompt: ignoreAssistantPrompt,
-      refreshCurrentView: ignoreAssistantRefresh,
-      setWidgetVisible: ignoreAssistantAction,
-      activateWidget: ignoreAssistantAction,
-    };
-  }, [assistant]);
-
-  if (!previewAssistant) return children;
-  return <AssistantContext.Provider value={previewAssistant}>{children}</AssistantContext.Provider>;
-};
-
 let widgetEditModalPromise: Promise<typeof WidgetModalsModule> | undefined;

 export const loadWidgetEditModal = () => {
@@ -117,7 +83,6 @@ interface LazyWidgetEditModalContentProps {

 const LazyWidgetEditModalContent = (props: LazyWidgetEditModalContentProps) => {
  const { WidgetEditModal } = use(loadWidgetEditModal());
-  const { default: PreviewComponent } = use(loadWidgetComponent(props.innerProps.kind));
  const { openModal: openIntegrationModal } = useModalAction(IntegrationSelectModal);
  const Component = WidgetEditModal.component;
  const utils = clientApi.useUtils();
@@ -149,18 +114,6 @@ const LazyWidgetEditModalContent = (props: LazyWidgetEditModalContentProps) => {
    const additional = createdIntegrations.filter((c) => !existing.some((e) => e.id === c.id));
    return [...existing, ...additional];
  }, [props.innerProps.integrationData, createdIntegrations]);
-  const previewDimensions = useMemo(() => {
-    if (props.innerProps.previewDimensions) return props.innerProps.previewDimensions;
-    const size = widgetDefaultSizes[props.innerProps.kind] ?? defaultWidgetSize;
-    return {
-      width: getLogicalTrackSize(size.width),
-      height: getLogicalTrackSize(size.height),
-    };
-  }, [props.innerProps.kind, props.innerProps.previewDimensions]);
-  let previewResize = props.innerProps.previewResize;
-  if (previewResize) {
-    previewResize = { ...previewResize, getDimensions: getPreviewDimensions };
-  }

  return (
    <Component
@@ -169,10 +122,6 @@ const LazyWidgetEditModalContent = (props: LazyWidgetEditModalContentProps) => {
        ...props.innerProps,
        integrationData: combinedIntegrationData,
        integrationEditForm: LazyIntegrationEditForm,
-        previewComponent: PreviewComponent,
-        previewDimensions,
-        previewResize,
-        previewWrapper: PreviewRuntimeWrapper,
        onOpenNewIntegration: supportedKinds.length > 0 ? handleOpenNewIntegration : undefined,
      }}
    />
@@ -208,10 +157,6 @@ export const LazyWidgetEditModal = createModal<WidgetEditModalProps<WidgetKind>>
  defaultTitle(t) {
    return t("item.edit.title");
  },
-  size: "100rem",
-  transitionProps: {
-    transition: "pop",
-    duration: 180,
-  },
+  size: modalSizeForm,
  closeOnClickOutside: false,
 });
@@ -35,7 +35,6 @@ import { matchesWidgetItemQuery } from "./widget-query-scope";
 interface WidgetContextMenuProps {
  item: SectionItem;
  definition: WidgetDefinition;
-  previewDimensions: { width: number; height: number; scale?: number };
  widgetStateRef: MutableRefObject<Record<string, unknown> | null>;
  widgetRuntimeRef: WidgetRuntimeRef;
  sourceRef: RefObject<HTMLElement | null>;
@@ -45,7 +44,6 @@ interface WidgetContextMenuProps {
 export const WidgetContextMenu = ({
  item,
  definition,
-  previewDimensions,
  widgetRuntimeRef,
  sourceRef,
  children,
@@ -162,7 +160,7 @@ export const WidgetContextMenu = ({
        definition,
        value: {
          advancedOptions: item.advancedOptions,
-          options,
+          options: item.options,
          integrationIds: item.integrationIds,
        },
        onSuccessfulEdit: (editResult) => {
@@ -191,9 +189,6 @@ export const WidgetContextMenu = ({
        ),
        integrationSupport: definition.supportedIntegrations !== undefined,
        settings,
-        itemId: item.id,
-        boardId: board.id,
-        previewDimensions,
        appId: item.kind === "app" ? (item.options.appId as string | undefined) : undefined,
      },
      // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -202,15 +197,12 @@ export const WidgetContextMenu = ({
      },
    );
  }, [
-    board.id,
    definition,
    integrationData,
    item,
    handleRefetch,
    openModal,
-    options,
    persistBoard,
-    previewDimensions,
    settings,
    updateItemAdvancedOptions,
    updateItemIntegrations,
@@ -31,7 +31,7 @@
  align-items: center;
  gap: 8px;
  min-height: 28px;
-  padding: 4px 40px 4px 8px;
+  padding: 4px 8px;
  border: 1px solid var(--border-color);
  border-radius: var(--mantine-radius-md);
  background-color: var(--background-color);
@@ -2,16 +2,17 @@

 The board uses fixed logical units:

- one grid track has a `212 × 212` logical-pixel footprint;
- cards are inset by `10` visual pixels on every side, matching the legacy GridStack gutter;
- multi-cell items occupy complete track footprints (`2 × 1` is `424 × 212` before the card inset);
+- one `1 × 1` item is exactly `200 × 200` logical pixels;
+- the gap matches Mantine's `sm` spacing at `12` logical pixels, giving a `212` pixel track pitch;
+- multi-cell items include the gaps between their cells (`2 × 1` is `412 × 200`);
 - the canvas is zoomed once with one uniform scale derived from its available width.

-Grid footprints keep the same logical dimensions at every viewport. Widget cards
-use a scale-compensated inset so their painted size and content measurements
-match the legacy responsive grid. The visual canvas always fits the available
-width, every root lane keeps at least one viewport of height, and edit-mode
-previews extend it downward as needed.
+Items keep the same logical dimensions at every viewport. The viewport reserves
+the painted size while the inner canvas remains at its logical dimensions, so a
+widget's `clientWidth`, `clientHeight`, and `ResizeObserver` measurements stay
+stable. The visual canvas always fits the available width, every root lane
+keeps at least one viewport of height, and edit-mode previews extend it downward
+as needed.

 The read-only renderer should:

@@ -2,7 +2,7 @@ import type { BoardLane } from "@homarr/definitions";
 import { getBoardLaneColumnCount, getRootSectionLane } from "@homarr/definitions";

 import type { Board, EmptySection } from "~/app/[locale]/boards/_types";
-import { getLogicalGridSize, getLayoutRowCount, normalizeGridPlacement } from "./geometry";
+import { getLogicalTrackSize, getLayoutRowCount, normalizeGridPlacement } from "./geometry";
 import { getCollapsedDisplayLayout } from "./reflow";
 import type { GridPlacement } from "./types";

@@ -90,5 +90,5 @@ export const getInitialBoardLogicalHeight = (board: Board, layoutId: string) =>
    return [getLayoutRowCount(displayPlacements)];
  });

-  return getLogicalGridSize(Math.max(0, ...rowCounts));
+  return getLogicalTrackSize(Math.max(0, ...rowCounts));
 };
@@ -10,23 +10,12 @@ export const getLogicalTrackSize = (trackCount: number) => {
  return normalizedTrackCount * LOGICAL_GRID_CELL_SIZE + (normalizedTrackCount - 1) * LOGICAL_GRID_GAP;
 };

-/**
- * Returns the complete footprint occupied by grid tracks. Cards are inset
- * inside this footprint so their visual gutters stay fixed while the canvas
- * is scaled.
- */
-export const getLogicalGridSize = (trackCount: number) => {
-  const normalizedTrackCount = Math.max(0, toFiniteNumber(trackCount, "trackCount"));
-
-  return normalizedTrackCount * LOGICAL_GRID_PITCH;
-};
-
 export const getLogicalItemStyle = ({ x, y, w, h }: GridCoordinates): CSSProperties => ({
  position: "absolute",
  left: x * LOGICAL_GRID_PITCH,
  top: y * LOGICAL_GRID_PITCH,
-  width: getLogicalGridSize(w),
-  height: getLogicalGridSize(h),
+  width: getLogicalTrackSize(w),
+  height: getLogicalTrackSize(h),
 });

 export const getLayoutRowCount = (placements: readonly GridCoordinates[]) =>
@@ -36,7 +25,7 @@ export const getGridRowCountForVisualHeight = (visualHeight: number, visualScale
  if (!Number.isFinite(visualHeight) || visualHeight <= 0) return 1;
  if (!Number.isFinite(visualScale) || visualScale <= 0) return 1;

-  return Math.max(1, Math.ceil(visualHeight / visualScale / LOGICAL_GRID_PITCH));
+  return Math.max(1, Math.ceil((visualHeight / visualScale + LOGICAL_GRID_GAP) / LOGICAL_GRID_PITCH));
 };

 export const normalizeGridPlacement = <TPlacement extends GridPlacement>(
@@ -8,7 +8,7 @@ import { ItemMockBuilder } from "~/components/board/items/actions/test/mocks/ite
 import {
  getBoardLaneColumnCount,
  getInitialBoardLogicalHeight,
-  getLogicalGridSize,
+  getLogicalTrackSize,
  getRootSectionForLane,
 } from "../index";

@@ -131,6 +131,6 @@ describe("board lanes", () => {
      },
    ];

-    expect(getInitialBoardLogicalHeight(board, layoutId)).toBe(getLogicalGridSize(4));
+    expect(getInitialBoardLogicalHeight(board, layoutId)).toBe(getLogicalTrackSize(4));
  });
 });
@@ -3,28 +3,24 @@ import { describe, expect, test } from "vitest";
 import {
  getGridRowCountForVisualHeight,
  getLayoutRowCount,
-  getLogicalGridSize,
  getLogicalItemStyle,
  getLogicalTrackSize,
  normalizeGridPlacement,
 } from "../index";

 describe("fixed dashboard geometry", () => {
-  test("separates content track sizes from complete grid footprints", () => {
+  test("keeps a 1x1 item exactly 200px with a fixed 12px gap", () => {
    expect(getLogicalTrackSize(1)).toBe(200);
    expect(getLogicalTrackSize(0.5)).toBe(94);
    expect(getLogicalTrackSize(2)).toBe(412);
    expect(getLogicalTrackSize(3)).toBe(624);
-    expect(getLogicalGridSize(1)).toBe(212);
-    expect(getLogicalGridSize(2)).toBe(424);
-    expect(getLogicalGridSize(3)).toBe(636);

    expect(getLogicalItemStyle({ x: 1, y: 2, w: 2, h: 3 })).toEqual({
      position: "absolute",
      left: 212,
      top: 424,
-      width: 424,
-      height: 636,
+      width: 412,
+      height: 624,
    });
  });

@@ -1,4 +1,4 @@
-import { getLogicalGridSize, LOGICAL_GRID_PITCH } from "~/components/board/layout";
+import { getLogicalTrackSize, LOGICAL_GRID_PITCH } from "~/components/board/layout";
 import type { GridPlacement } from "~/components/board/layout";
 import type { GridResizeDirection } from "./types";

@@ -38,7 +38,7 @@ export const getSnappedGridCoordinates = ({
  target: RectangleLike;
  columnCount: number;
 }) => {
-  const logicalWidth = getLogicalGridSize(columnCount);
+  const logicalWidth = getLogicalTrackSize(columnCount);
  const visualScale = logicalWidth > 0 ? target.width / logicalWidth : 0;
  if (!Number.isFinite(visualScale) || visualScale <= 0) return null;

@@ -39,7 +39,7 @@ import { useCurrentLayout, useRequiredBoard } from "@homarr/boards/context";
 import { getWidgetName } from "@homarr/definitions";
 import { useI18n } from "@homarr/translation/client";

-import { getLogicalGridSize, LOGICAL_GRID_PITCH } from "~/components/board/layout";
+import { getLogicalTrackSize, LOGICAL_GRID_PITCH } from "~/components/board/layout";
 import {
  beginGridTransaction,
  cancelGridTransaction,
@@ -792,8 +792,8 @@ export default function GridEditor({
      data-grid-depth={depth}
      style={
        {
-          width: getLogicalGridSize(columnCount),
-          height: getLogicalGridSize(rowCount),
+          width: getLogicalTrackSize(columnCount),
+          height: getLogicalTrackSize(rowCount),
          "--board-grid-pitch": `${LOGICAL_GRID_PITCH}px`,
        } as CSSProperties
      }
@@ -1234,8 +1234,8 @@ const getEntryVisualScale = (element: HTMLElement | null, placement: SectionGrid
  if (!element) return null;
  const rectangle = element.getBoundingClientRect();
  const scale = {
-    x: rectangle.width / getLogicalGridSize(placement.w),
-    y: rectangle.height / getLogicalGridSize(placement.h),
+    x: rectangle.width / getLogicalTrackSize(placement.w),
+    y: rectangle.height / getLogicalTrackSize(placement.h),
  };
  return Number.isFinite(scale.x) && scale.x > 0 && Number.isFinite(scale.y) && scale.y > 0 ? scale : null;
 };
@@ -1,4 +1,4 @@
-import { getLogicalGridSize, LOGICAL_GRID_PITCH } from "~/components/board/layout";
+import { getLogicalTrackSize, LOGICAL_GRID_PITCH } from "~/components/board/layout";
 import type { GridPlacement } from "~/components/board/layout";

 export interface GridPreviewDomState {
@@ -75,8 +75,8 @@ export const clearGridPreviewGeometry = (
 const applyPreviewGeometry = (element: HTMLElement, controlled: GridPlacement, preview: GridPlacement) => {
  element.style.setProperty("--board-grid-preview-x", `${(preview.x - controlled.x) * LOGICAL_GRID_PITCH}px`);
  element.style.setProperty("--board-grid-preview-y", `${(preview.y - controlled.y) * LOGICAL_GRID_PITCH}px`);
-  element.style.setProperty("--board-grid-preview-width", `${getLogicalGridSize(preview.w)}px`);
-  element.style.setProperty("--board-grid-preview-height", `${getLogicalGridSize(preview.h)}px`);
+  element.style.setProperty("--board-grid-preview-width", `${getLogicalTrackSize(preview.w)}px`);
+  element.style.setProperty("--board-grid-preview-height", `${getLogicalTrackSize(preview.h)}px`);
  element.setAttribute("data-grid-preview", "true");
  setPlacementAttributes(element, preview);
 };
@@ -3,7 +3,7 @@
 import type { RefObject } from "react";
 import { useCallback, useLayoutEffect, useRef, useSyncExternalStore } from "react";

-import { getLayoutRowCount, getLogicalItemStyle, getLogicalGridSize } from "~/components/board/layout";
+import { getLayoutRowCount, getLogicalItemStyle, getLogicalTrackSize } from "~/components/board/layout";
 import type { TransactionalGridState } from "./dnd";
 import type { GridInteractionStore } from "./grid-interaction-store";
 import { clearGridPreviewGeometry, createGridPreviewDomState, syncGridPreviewGeometry } from "./grid-preview-geometry";
@@ -87,7 +87,7 @@ export const GridPreviewLayer = ({
    } else {
      delete grid.dataset.dndPreviewRevision;
    }
-    grid.style.height = `${getLogicalGridSize(renderedRowCount)}px`;
+    grid.style.height = `${getLogicalTrackSize(renderedRowCount)}px`;

    const viewport = grid.parentElement;
    if (viewport?.hasAttribute("data-section-id")) {
@@ -98,7 +98,7 @@ export const GridPreviewLayer = ({
      // stray value would silently blow the cap open for the rest of the session, well after any
      // drag ended, since nothing else would ever clear it back out.
      if (maxRowCount === null) {
-        viewport.style.setProperty("--board-grid-drag-height", `${getLogicalGridSize(renderedRowCount)}px`);
+        viewport.style.setProperty("--board-grid-drag-height", `${getLogicalTrackSize(renderedRowCount)}px`);
      } else {
        viewport.style.removeProperty("--board-grid-drag-height");
      }
@@ -1,4 +1,4 @@
-import { getLogicalGridSize, LOGICAL_GRID_PITCH } from "~/components/board/layout";
+import { getLogicalTrackSize, LOGICAL_GRID_PITCH } from "~/components/board/layout";
 import type { GridPlacement } from "~/components/board/layout";

 interface ResizeOutlinePreview {
@@ -31,8 +31,8 @@ export const createGridResizeOutlineController = (
    outline.style.position = "absolute";
    outline.style.left = `${(preview.placement.x - visualX) * LOGICAL_GRID_PITCH}px`;
    outline.style.top = `${(preview.placement.y - visualY) * LOGICAL_GRID_PITCH}px`;
-    outline.style.width = `${getLogicalGridSize(preview.placement.w)}px`;
-    outline.style.height = `${getLogicalGridSize(preview.placement.h)}px`;
+    outline.style.width = `${getLogicalTrackSize(preview.placement.w)}px`;
+    outline.style.height = `${getLogicalTrackSize(preview.placement.h)}px`;
    outline.dataset.gridResizeValid = String(preview.valid);
  };

@@ -50,10 +50,6 @@
  overflow: visible;
 }

-.staticItem[data-type="item"] > .contentMount {
-  inset: calc(10px * var(--board-canvas-inverse-scale, 1));
-}
-
 .staticItem:has([data-board-container-label]) {
  z-index: 2;
 }
@@ -14,7 +14,7 @@ import {
  getEditableCanvasAttributes,
  getGridRowCountForVisualHeight,
  getLayoutRowCount,
-  getLogicalGridSize,
+  getLogicalTrackSize,
  getReadonlyCanvasAttributes,
  normalizeGridPlacement,
 } from "~/components/board/layout";
@@ -138,9 +138,9 @@ export const SectionGrid = ({
  // of expanding to fit every widget, so its viewport height is capped independently of rowCount.
  const isScrollableContainer = section.kind === "container" && section.options.scrollable;
  const viewportRowCount = isScrollableContainer ? Math.max(requestedRowCount, 1) : rowCount;
-  const logicalWidth = getLogicalGridSize(columnCount);
-  const logicalHeight = getLogicalGridSize(rowCount);
-  const viewportHeight = getLogicalGridSize(viewportRowCount);
+  const logicalWidth = getLogicalTrackSize(columnCount);
+  const logicalHeight = getLogicalTrackSize(rowCount);
+  const viewportHeight = getLogicalTrackSize(viewportRowCount);
  // A collapsed container's compact coordinates are display-only. Its own
  // nested grid stays inactive until an explicit edit interaction expands it.
  const isInteractionDisabled = section.kind === "container" && collapsedSectionIds.has(section.id);
@@ -4,7 +4,7 @@ import { createRoot } from "react-dom/client";
 import type { Root } from "react-dom/client";
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";

-import { getCollapsedDisplayLayout, getLogicalGridSize } from "../../../layout";
+import { getCollapsedDisplayLayout, LOGICAL_GRID_CELL_SIZE } from "../../../layout";
 import { FixedGridItem } from "../fixed-grid-item";

 const mocks = vi.hoisted(() => ({
@@ -250,14 +250,14 @@ describe("fixed grid item behavior", () => {
    expect(container.querySelector('[data-testid="board-grid-drag-affordance"]')).toBeNull();
  });

-  test("renders a view-only 1x1 card at the complete grid footprint", () => {
+  test("renders a view-only 1x1 card at the fixed 200px logical size", () => {
    mocks.editMode = false;
    renderWeather(root);

    const item = container.querySelector<HTMLElement>('[data-grid-id="weather"]');
    expect(item).not.toBeNull();
-    expect(item?.style.width).toBe(`${getLogicalGridSize(1)}px`);
-    expect(item?.style.height).toBe(`${getLogicalGridSize(1)}px`);
+    expect(item?.style.width).toBe(`${LOGICAL_GRID_CELL_SIZE}px`);
+    expect(item?.style.height).toBe(`${LOGICAL_GRID_CELL_SIZE}px`);
    expect(item?.getAttribute("role")).toBeNull();

    act(() => item?.dispatchEvent(new KeyboardEvent("keydown", { key: "ArrowRight", bubbles: true })));
@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, test } from "vitest";

-import { getLogicalGridSize, LOGICAL_GRID_PITCH } from "~/components/board/layout";
+import { getLogicalTrackSize, LOGICAL_GRID_PITCH } from "~/components/board/layout";

 import { createGridPreviewDomState, syncGridPreviewGeometry } from "../grid-preview-geometry";

@@ -65,8 +65,8 @@ describe("grid preview geometry", () => {
    expect(active?.getAttribute("data-grid-preview")).toBe("true");
    expect(active?.style.getPropertyValue("--board-grid-preview-x")).toBe(`${LOGICAL_GRID_PITCH}px`);
    expect(active?.style.getPropertyValue("--board-grid-preview-y")).toBe(`${LOGICAL_GRID_PITCH}px`);
-    expect(active?.style.getPropertyValue("--board-grid-preview-width")).toBe(`${getLogicalGridSize(3)}px`);
-    expect(active?.style.getPropertyValue("--board-grid-preview-height")).toBe(`${getLogicalGridSize(4)}px`);
+    expect(active?.style.getPropertyValue("--board-grid-preview-width")).toBe(`${getLogicalTrackSize(3)}px`);
+    expect(active?.style.getPropertyValue("--board-grid-preview-height")).toBe(`${getLogicalTrackSize(4)}px`);
    expect(active?.dataset.gridW).toBe("3");
    expect(active?.dataset.gridH).toBe("4");
  });
@@ -1,6 +1,6 @@
 import { afterEach, describe, expect, test, vi } from "vitest";

-import { getLogicalGridSize } from "~/components/board/layout";
+import { getLogicalTrackSize } from "~/components/board/layout";

 import { createGridResizeOutlineController } from "../grid-resize-outline";

@@ -30,8 +30,8 @@ describe("grid resize outline", () => {
    const outline = shell.querySelector<HTMLElement>("[data-grid-resize-outline]");
    expect(outline?.style.left).toBe("0px");
    expect(outline?.style.top).toBe("0px");
-    expect(outline?.style.width).toBe(`${getLogicalGridSize(1)}px`);
-    expect(outline?.style.height).toBe(`${getLogicalGridSize(2)}px`);
+    expect(outline?.style.width).toBe(`${getLogicalTrackSize(1)}px`);
+    expect(outline?.style.height).toBe(`${getLogicalTrackSize(2)}px`);
    expect(outline?.dataset.gridResizeValid).toBe("false");

    controller.schedule(null);
@@ -2,7 +2,6 @@

 import { useEffect, useState } from "react";
 import dynamic from "next/dynamic";
-import type { HotkeyItem } from "@mantine/hooks";
 import { useHotkeys } from "@mantine/hooks";

 import { hotkeys } from "@homarr/definitions";
@@ -14,18 +13,23 @@ const Spotlight = dynamic(() => loadSpotlight().then(({ Spotlight: Component })
  loading: () => null,
 });

-const spotlightHotkeys: HotkeyItem[] = [
-  [hotkeys.openSpotlight, () => openSpotlight(), { preventDefault: true }],
-  [hotkeys.openSpotlightApps, () => openSpotlight({ mode: "apps" }), { preventDefault: true }],
-  [hotkeys.openSpotlightAssistant, () => openSpotlight({ mode: "assistant" }), { preventDefault: true }],
-  [hotkeys.openSpotlightPreferences, () => openSpotlight({ mode: "preferences" }), { preventDefault: true }],
-];
-
 export const LazySpotlight = () => {
  const [isMounted, setIsMounted] = useState(false);
  const [isPreloaded, setIsPreloaded] = useState(false);

-  useHotkeys(spotlightHotkeys, [], true);
+  useHotkeys(
+    isMounted
+      ? []
+      : [
+          [
+            hotkeys.openSpotlight,
+            () => {
+              setIsMounted(true);
+              openSpotlight();
+            },
+          ],
+        ],
+  );

  useEffect(() => {
    let isActive = true;
@@ -57,8 +61,12 @@ export const LazySpotlight = () => {
  return isMounted || isPreloaded ? (
    <>
      {isPreloaded && <span hidden data-homarr-dev-benchmark-spotlight-preloaded />}
-      {isMounted && <span hidden data-homarr-dev-benchmark-spotlight-mounted />}
-      <Spotlight />
+      {isMounted && (
+        <>
+          <span hidden data-homarr-dev-benchmark-spotlight-mounted />
+          <Spotlight />
+        </>
+      )}
    </>
  ) : null;
 };
@@ -20,7 +20,7 @@ export const DesktopSearchInput = () => {
      w={400}
      size="sm"
      leftSection={<IconSearch size={20} stroke={1.5} />}
-      onClick={() => openSpotlight()}
+      onClick={openSpotlight}
      radius="xl"
    >
      {`${t("search.placeholder")}...`}
@@ -32,7 +32,7 @@ export const MobileSearchButton = () => {
  return (
    <HeaderButton
      data-homarr-dev-benchmark-interaction="search"
-      onClick={() => openSpotlight()}
+      onClick={openSpotlight}
      className={classes.mobileSearch}
    >
      <IconSearch size={20} stroke={1.5} />
@@ -1,6 +1,5 @@
 import { createId } from "@paralleldrive/cuid2";
 import { chromium, expect } from "@playwright/test";
-import type { Route } from "@playwright/test";
 import { eq } from "drizzle-orm";
 import { stringify } from "superjson";
 import { describe, test } from "vitest";
@@ -22,9 +21,7 @@ describe("lazy widget application graph", () => {
    const boardId = createId();
    const layoutId = createId();
    const sectionId = createId();
-    const clockItemId = createId();
-    const downloadsItemId = createId();
-    const mockIntegrationId = createId();
+    const itemId = createId();

    await db.insert(sqliteSchema.boards).values({
      id: boardId,
@@ -44,56 +41,26 @@ describe("lazy widget application graph", () => {
      xOffset: 0,
      yOffset: 0,
    });
-    await db.insert(sqliteSchema.integrations).values({
-      id: mockIntegrationId,
-      name: "Mock downloads",
-      url: "http://mock.local",
-      kind: "mock",
+    await db.insert(sqliteSchema.items).values({
+      id: itemId,
+      boardId,
+      kind: "clock",
+      options: stringify({ showSeconds: true }),
    });
-    await db.insert(sqliteSchema.items).values([
-      {
-        id: clockItemId,
-        boardId,
-        kind: "clock",
-        options: stringify({ showSeconds: true }),
-      },
-      {
-        id: downloadsItemId,
-        boardId,
-        kind: "downloads",
-        options: stringify({}),
-      },
-    ]);
-    await db.insert(sqliteSchema.itemLayouts).values([
-      {
-        itemId: clockItemId,
-        sectionId,
-        layoutId,
-        xOffset: 0,
-        yOffset: 0,
-        width: 4,
-        height: 2,
-      },
-      {
-        itemId: downloadsItemId,
-        sectionId,
-        layoutId,
-        xOffset: 0,
-        yOffset: 2,
-        width: 8,
-        height: 5,
-      },
-    ]);
-    await db.insert(sqliteSchema.integrationItems).values({
-      itemId: downloadsItemId,
-      integrationId: mockIntegrationId,
+    await db.insert(sqliteSchema.itemLayouts).values({
+      itemId,
+      sectionId,
+      layoutId,
+      xOffset: 0,
+      yOffset: 0,
+      width: 4,
+      height: 2,
    });
    await db.update(sqliteSchema.users).set({ homeBoardId: boardId }).where(eq(sqliteSchema.users.id, userId));

    const homarrContainer = await createHomarrContainer({
      environment: {
        AUTH_PROVIDERS: "credentials",
-        UNSAFE_ENABLE_MOCK_INTEGRATION: "true",
      },
      mounts: {
        "/appdata": localMountPath,
@@ -102,18 +69,10 @@ describe("lazy widget application graph", () => {

    const baseUrl = `http://${homarrContainer.getHost()}:${homarrContainer.getMappedPort(7575)}`;
    const browser = await chromium.launch();
-    const context = await browser.newContext({ serviceWorkers: "block" });
+    const context = await browser.newContext();
    const page = await context.newPage();
    const pageErrors: Error[] = [];
-    const hydrationErrors: string[] = [];
    page.on("pageerror", (error) => pageErrors.push(error));
-    const hydrationErrorPattern = /hydrat|did not match|react\.dev\/errors\/4(18|2[1235])|react error #4(18|2[1235])/i;
-    page.on("console", (message) => {
-      if (message.type() === "error" && hydrationErrorPattern.test(message.text())) {
-        hydrationErrors.push(message.text());
-      }
-    });
-    let releaseRefresh: (() => void) | undefined;

    try {
      await page.goto(`${baseUrl}/auth/login`);
@@ -129,18 +88,9 @@ describe("lazy widget application graph", () => {
      const visibleBoard = page.locator("[data-homarr-dev-benchmark-board]").filter({ visible: true }).first();
      await expect(visibleBoard).toBeVisible({ timeout: 30_000 });
      const clockWidget = page.locator(
-        `[data-id="${clockItemId}"] .clock-widget-container, [data-grid-item-id="${clockItemId}"] .clock-widget-container`,
+        `[data-id="${itemId}"] .clock-widget-container, [data-grid-item-id="${itemId}"] .clock-widget-container`,
      );
      await expect(clockWidget.filter({ visible: true }).first()).toBeVisible({ timeout: 30_000 });
-      await expect(clockWidget.locator("time").filter({ visible: true }).first()).not.toHaveText("--:--", {
-        timeout: 30_000,
-      });
-      const downloadsWidget = page
-        .locator(`[data-id="${downloadsItemId}"], [data-grid-item-id="${downloadsItemId}"]`)
-        .filter({ visible: true })
-        .first();
-      const cachedDownload = downloadsWidget.getByText("Big.Buck.Bunny.2008.1080p.BluRay.x264");
-      await expect(cachedDownload).toBeVisible({ timeout: 30_000 });

      await expect(page.locator("[data-homarr-dev-benchmark-spotlight-preloaded]")).toHaveCount(1, {
        timeout: 15_000,
@@ -151,59 +101,23 @@ describe("lazy widget application graph", () => {
      await page.keyboard.press("Escape");
      await expect(page.locator("[data-homarr-dev-benchmark-spotlight]")).not.toBeVisible();

-      let refreshRequestStarted = false;
-      const refreshGate = new Promise<void>((resolve) => {
-        releaseRefresh = resolve;
-      });
-      const downloadsRequestPattern = "**/*widget.downloads.getJobsAndStatuses*";
-      const delayDownloadsRefresh = async (route: Route) => {
-        refreshRequestStarted = true;
-        await refreshGate;
-        await route.continue();
-      };
-      await page.route(downloadsRequestPattern, delayDownloadsRefresh);
+      await expect
+        .poll(
+          async () =>
+            await page.evaluate(async () => {
+              const registrations = await navigator.serviceWorker.getRegistrations();
+              return registrations[0]?.scope ?? null;
+            }),
+          { timeout: 15_000 },
+        )
+        .toBe(`${baseUrl}/`);

-      await page.reload({ waitUntil: "domcontentloaded" });
+      await page.reload();
      await expect(clockWidget.filter({ visible: true }).first()).toBeVisible({ timeout: 30_000 });
-      await expect(clockWidget.locator("time").filter({ visible: true }).first()).not.toHaveText("--:--", {
-        timeout: 30_000,
-      });
-      await expect.poll(() => refreshRequestStarted, { timeout: 10_000 }).toBe(true);
-      await expect(cachedDownload).toBeVisible({ timeout: 5_000 });
-      await expect(downloadsWidget.locator("[data-widget-refreshing]")).toBeVisible();
-
-      const refreshedDownloadsResponse = page.waitForResponse(
-        (response) => response.url().includes("widget.downloads.getJobsAndStatuses") && response.ok(),
-      );
-      releaseRefresh();
-      releaseRefresh = undefined;
-      await refreshedDownloadsResponse;
-      await expect(downloadsWidget.locator("[data-widget-refreshing]")).toHaveCount(0);
-      await page.unroute(downloadsRequestPattern, delayDownloadsRefresh);
      expect(pageErrors).toEqual([]);
-      expect(hydrationErrors).toEqual([]);
-
-      const serviceWorkerContext = await browser.newContext();
-      const serviceWorkerPage = await serviceWorkerContext.newPage();
-      try {
-        await serviceWorkerPage.goto(`${baseUrl}/auth/login`);
-        await expect
-          .poll(
-            async () =>
-              await serviceWorkerPage.evaluate(async () => {
-                const registrations = await navigator.serviceWorker.getRegistrations();
-                return registrations[0]?.scope ?? null;
-              }),
-            { timeout: 15_000 },
-          )
-          .toBe(`${baseUrl}/`);
-      } finally {
-        await serviceWorkerContext.close();
-      }
    } finally {
-      releaseRefresh?.();
      await browser.close();
      await homarrContainer.stop();
    }
-  }, 180_000);
+  }, 120_000);
 });
@@ -8,8 +8,6 @@ export const queryCacheDefaultGcTimeMs = 1000 * 60 * 5;
 export const queryCacheMetadataStaleTimeMs = 1000 * 60 * 5;

 const widgetDataQueryPaths = new Set(["app.byId", "app.byIds", "docker.getContainers", "integration.byIds"]);
-// Beszel system stats are large time-series payloads and were deliberately kept out of
-// the persisted cache in #6289; live stats come from an SSE subscription instead.
 const excludedWidgetPaths = new Set(["widget.app.ping", "widget.beszel.getSystemStats"]);

 export const isWidgetDataTrpcPath = (path: string) => {
@@ -2,7 +2,6 @@ import { TRPCError } from "@trpc/server";
 import superjson from "superjson";
 import { z } from "zod/v4";

-import type { Session } from "@homarr/auth";
 import { constructBoardPermissions } from "@homarr/auth/shared";
 import { createId, generateResponsiveGridFor } from "@homarr/common";
 import type { GridAlgorithmItem } from "@homarr/common";
@@ -87,7 +86,6 @@ interface BoardItemPlacementRectangle {

 const boardItemPlacementTails = new Map<string, Promise<void>>();
 const maxManageOverviewPreviewRows = 12;
-const manageOverviewInputSchema = z.object({ fullPreview: z.boolean().default(false) }).optional();

 const serializeBoardItemPlacementAsync = async <T>(boardId: string, operation: () => Promise<T>) => {
  const previous = boardItemPlacementTails.get(boardId) ?? Promise.resolve();
@@ -124,78 +122,6 @@ const findFirstAvailableBoardItemPosition = (
  return null;
 };

-const searchAccessibleBoardsAsync = async (
-  ctx: { db: Database; session: Session | null },
-  query: string,
-  limit?: number,
-) => {
-  const userId = ctx.session?.user.id;
-  const permissionsOfCurrentUserWhenPresent = await ctx.db.query.boardUserPermissions.findMany({
-    where: eq(boardUserPermissions.userId, userId ?? ""),
-  });
-
-  const permissionsOfCurrentUserGroupsWhenPresent = await ctx.db.query.groupMembers.findMany({
-    where: eq(groupMembers.userId, userId ?? ""),
-    with: {
-      group: {
-        with: {
-          boardPermissions: {},
-        },
-      },
-    },
-  });
-  const boardIds = permissionsOfCurrentUserWhenPresent
-    .map((permission) => permission.boardId)
-    .concat(
-      permissionsOfCurrentUserGroupsWhenPresent
-        .map((groupMember) => groupMember.group.boardPermissions.map((permission) => permission.boardId))
-        .flat(),
-    );
-
-  const currentUserWhenPresent = await ctx.db.query.users.findFirst({
-    where: eq(users.id, userId ?? ""),
-  });
-
-  const foundBoards = await ctx.db.query.boards.findMany({
-    where: and(
-      like(boards.name, `%${query}%`),
-      ctx.session?.user.permissions.includes("board-view-all")
-        ? undefined
-        : or(
-            eq(boards.isPublic, true),
-            eq(boards.creatorId, ctx.session?.user.id ?? ""),
-            inArray(boards.id, boardIds),
-          ),
-    ),
-    limit,
-    orderBy: asc(boards.name),
-    columns: {
-      id: true,
-      name: true,
-      creatorId: true,
-      isPublic: true,
-      logoImageUrl: true,
-    },
-    with: {
-      userPermissions: {
-        where: eq(boardUserPermissions.userId, ctx.session?.user.id ?? ""),
-      },
-      groupPermissions: {
-        where: getBoardGroupPermissionWhere(permissionsOfCurrentUserGroupsWhenPresent),
-      },
-    },
-  });
-
-  return foundBoards.map((board) => ({
-    id: board.id,
-    name: board.name,
-    logoImageUrl: board.logoImageUrl,
-    permissions: constructBoardPermissions(board, ctx.session),
-    isHome: currentUserWhenPresent?.homeBoardId === board.id,
-    isMobileHome: currentUserWhenPresent?.mobileHomeBoardId === board.id,
-  }));
-};
-
 export const boardRouter = createTRPCRouter({
  exists: permissionRequiredProcedure
    .requiresPermission("board-create")
@@ -299,7 +225,7 @@ export const boardRouter = createTRPCRouter({
        isMobileHome: currentUser?.mobileHomeBoardId === board.id,
      }));
    }),
-  getManageOverview: publicProcedure.input(manageOverviewInputSchema).query(async ({ ctx, input }) => {
+  getManageOverview: publicProcedure.query(async ({ ctx }) => {
    const userId = ctx.session?.user.id;
    const { boardIds, currentUser, groupMemberships } = await getBoardAccessContextAsync(ctx.db, userId);
    const groupPermissionWhere = getBoardGroupPermissionWhere(groupMemberships);
@@ -380,7 +306,7 @@ export const boardRouter = createTRPCRouter({
                inArray(itemLayouts.sectionId, rootSectionIds),
                gte(itemLayouts.xOffset, 0),
                gte(itemLayouts.yOffset, 0),
-                input?.fullPreview ? undefined : lt(itemLayouts.yOffset, maxManageOverviewPreviewRows),
+                lt(itemLayouts.yOffset, maxManageOverviewPreviewRows),
                gt(itemLayouts.width, 0),
                gt(itemLayouts.height, 0),
              ),
@@ -405,7 +331,7 @@ export const boardRouter = createTRPCRouter({
                inArray(sectionLayouts.parentSectionId, rootSectionIds),
                gte(sectionLayouts.xOffset, 0),
                gte(sectionLayouts.yOffset, 0),
-                input?.fullPreview ? undefined : lt(sectionLayouts.yOffset, maxManageOverviewPreviewRows),
+                lt(sectionLayouts.yOffset, maxManageOverviewPreviewRows),
                gt(sectionLayouts.width, 0),
                gt(sectionLayouts.height, 0),
              ),
@@ -440,7 +366,7 @@ export const boardRouter = createTRPCRouter({
              inArray(itemLayouts.sectionId, previewContainerSectionIds),
              gte(itemLayouts.xOffset, 0),
              gte(itemLayouts.yOffset, 0),
-              input?.fullPreview ? undefined : lt(itemLayouts.yOffset, maxManageOverviewPreviewRows),
+              lt(itemLayouts.yOffset, maxManageOverviewPreviewRows),
              gt(itemLayouts.width, 0),
              gt(itemLayouts.height, 0),
            ),
@@ -555,18 +481,80 @@ export const boardRouter = createTRPCRouter({
      };
    });
  }),
-  catalog: publicProcedure
-    .meta({ mcp: { enabled: true, description: "List every board the current user can access." } })
-    .query(async ({ ctx }) => searchAccessibleBoardsAsync(ctx, "")),
  search: publicProcedure
-    .meta({
-      mcp: {
-        enabled: true,
-        description: "Search accessible boards by name. REQUIRED: query (string). OPTIONAL: limit (number).",
-      },
-    })
    .input(z.object({ query: z.string(), limit: z.number().min(1).max(100).default(10) }))
-    .query(async ({ ctx, input }) => searchAccessibleBoardsAsync(ctx, input.query, input.limit)),
+    .query(async ({ ctx, input }) => {
+      const userId = ctx.session?.user.id;
+      const permissionsOfCurrentUserWhenPresent = await ctx.db.query.boardUserPermissions.findMany({
+        where: eq(boardUserPermissions.userId, userId ?? ""),
+      });
+
+      const permissionsOfCurrentUserGroupsWhenPresent = await ctx.db.query.groupMembers.findMany({
+        where: eq(groupMembers.userId, userId ?? ""),
+        with: {
+          group: {
+            with: {
+              boardPermissions: {},
+            },
+          },
+        },
+      });
+      const boardIds = permissionsOfCurrentUserWhenPresent
+        .map((permission) => permission.boardId)
+        .concat(
+          permissionsOfCurrentUserGroupsWhenPresent
+            .map((groupMember) => groupMember.group.boardPermissions.map((permission) => permission.boardId))
+            .flat(),
+        );
+
+      const currentUserWhenPresent = await ctx.db.query.users.findFirst({
+        where: eq(users.id, userId ?? ""),
+      });
+
+      const foundBoards = await ctx.db.query.boards.findMany({
+        where: and(
+          like(boards.name, `%${input.query}%`),
+          ctx.session?.user.permissions.includes("board-view-all")
+            ? undefined
+            : or(
+                eq(boards.isPublic, true),
+                eq(boards.creatorId, ctx.session?.user.id ?? ""),
+                inArray(boards.id, boardIds),
+              ),
+        ),
+        limit: input.limit,
+        columns: {
+          id: true,
+          name: true,
+          creatorId: true,
+          isPublic: true,
+          logoImageUrl: true,
+        },
+        with: {
+          userPermissions: {
+            where: eq(boardUserPermissions.userId, ctx.session?.user.id ?? ""),
+          },
+          groupPermissions: {
+            where:
+              permissionsOfCurrentUserGroupsWhenPresent.length >= 1
+                ? inArray(
+                    boardGroupPermissions.groupId,
+                    permissionsOfCurrentUserGroupsWhenPresent.map((groupMember) => groupMember.groupId),
+                  )
+                : undefined,
+          },
+        },
+      });
+
+      return foundBoards.map((board) => ({
+        id: board.id,
+        name: board.name,
+        logoImageUrl: board.logoImageUrl,
+        permissions: constructBoardPermissions(board, ctx.session),
+        isHome: currentUserWhenPresent?.homeBoardId === board.id,
+        isMobileHome: currentUserWhenPresent?.mobileHomeBoardId === board.id,
+      }));
+    }),
  createBoard: permissionRequiredProcedure
    .requiresPermission("board-create")
    .meta({
@@ -130,28 +130,6 @@ export const searchEngineRouter = createTRPCRouter({

    return null;
  }),
-  catalog: publicProcedure
-    .meta({
-      mcp: {
-        enabled: true,
-        description: "List search engines available to the current user.",
-      },
-    })
-    .query(async ({ ctx }) => {
-      return await ctx.db.query.searchEngines.findMany({
-        where: ctx.session?.user ? undefined : eq(searchEngines.type, "generic"),
-        orderBy: asc(searchEngines.name),
-        with: {
-          integration: {
-            columns: {
-              kind: true,
-              url: true,
-              id: true,
-            },
-          },
-        },
-      });
-    }),
  search: publicProcedure.input(searchSchema).query(async ({ ctx, input }) => {
    return await ctx.db.query.searchEngines.findMany({
      // Public dashboards have no session: restrict anonymous users to generic
@@ -337,7 +337,7 @@ describe("getManageOverview", () => {
    expect(overview.map((board) => board.id)).not.toContain(hiddenBoardId);
  });

-  test("returns compact previews by default and full previews on request", async () => {
+  test("returns one compact base-layout preview for each accessible board", async () => {
    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
    const boardId = createId();
@@ -487,10 +487,6 @@ describe("getManageOverview", () => {
    expect(result[0]?.preview?.layouts).toHaveLength(1);
    expect(result[0]?.preview?.items.map((item) => item.id)).toEqual([itemId, nestedItemId]);
    expect(result[0]?.preview?.sections).toHaveLength(2);
-
-    const fullResult = await caller.getManageOverview({ fullPreview: true });
-
-    expect(fullResult[0]?.preview?.items.map((item) => item.id)).toEqual([itemId, offscreenItemId, nestedItemId]);
  });

  test("includes app and widget icons in compact previews", async () => {
@@ -19,10 +19,8 @@ const MCP_TOOL_ALLOWLIST = {
    "beszel_getAlerts",
    "beszel_getSystems",
    "beszel_getSystemStats",
-    "board_catalog",
    "board_getAllBoards",
    "board_getBoardSettings",
-    "board_search",
    "calendar_findAllEvents",
    "customWidget_get",
    "customWidget_getAuthoringPrompt",
@@ -10,16 +10,12 @@ import { clientApi } from "@homarr/api/client";
 import { boardViewportWidthCookieName, getLayoutIdForViewportWidth } from "./layout-selection";
 import { updateBoardName } from "./updater";

-type Board = RouterOutputs["board"]["getBoardByName"];
-
-interface BoardContextValue {
-  board: Board;
+const BoardContext = createContext<{
+  board: RouterOutputs["board"]["getBoardByName"];
  layoutOverrideId: string | null;
  currentLayout: string;
  initialViewportWidth: number;
-}
-
-const BoardContext = createContext<BoardContextValue | null>(null);
+} | null>(null);

 const subscribeToViewport = (onStoreChange: () => void) => {
  if (typeof window === "undefined") return () => undefined;
@@ -41,23 +37,6 @@ const subscribeToViewport = (onStoreChange: () => void) => {
  };
 };

-export const BoardPreviewProvider = ({ children, board }: PropsWithChildren<{ board: Board }>) => {
-  const currentLayout = board.layouts[0]?.id ?? "";
-
-  return (
-    <BoardContext.Provider
-      value={{
-        board,
-        layoutOverrideId: null,
-        currentLayout,
-        initialViewportWidth: 0,
-      }}
-    >
-      {children}
-    </BoardContext.Provider>
-  );
-};
-
 export const BoardProvider = ({
  children,
  initialBoard,
@@ -3,8 +3,5 @@ export const hotkeys = {
  toggleColorScheme: "mod+j",
  saveNotebook: "mod+s",
  openSpotlight: "mod+k",
-  openSpotlightApps: "mod+p",
-  openSpotlightAssistant: "mod+/",
-  openSpotlightPreferences: "mod+shift+?",
  openAssistant: "shift+a",
 };
@@ -1,32 +1,22 @@
-import { Center } from "@mantine/core";
+import { Center, Loader } from "@mantine/core";
+import { useWindowEvent } from "@mantine/hooks";

+import type { TranslationObject } from "@homarr/translation";
 import { useI18n } from "@homarr/translation/client";

 import type { SearchGroup } from "../../lib/group";
 import type { inferSearchInteractionOptions } from "../../lib/interaction";
-import type { SpotlightMode } from "../../open";
+import { SpotlightNoResults } from "../no-results";
 import { SpotlightGroupActionItem } from "./items/group-action-item";

 interface GroupActionsProps<TOption extends Record<string, unknown>> {
  group: SearchGroup<TOption>;
  query: string;
  setQuery: (query: string) => void;
-  setMode: (mode: SpotlightMode) => void;
+  setMode: (mode: keyof TranslationObject["search"]["mode"]) => void;
  setChildrenOptions: (options: inferSearchInteractionOptions<"children">) => void;
 }

-const getUniqueOptions = <TOption extends Record<string, unknown>>(options: TOption[], keyPath: keyof TOption) => {
-  const optionKeys = new Set<unknown>();
-
-  return options.filter((option) => {
-    const optionKey = option[keyPath];
-    if (optionKeys.has(optionKey)) return false;
-
-    optionKeys.add(optionKey);
-    return true;
-  });
-};
-
 export const SpotlightGroupActions = <TOption extends Record<string, unknown>>({
  group,
  query,
@@ -40,26 +30,28 @@ export const SpotlightGroupActions = <TOption extends Record<string, unknown>>({
  const options = useOptions(query);
  const t = useI18n();

+  useWindowEvent("keydown", (event) => {
+    const optionsArray = Array.isArray(options) ? options : (options.data ?? []);
+    group.onKeyDown?.(event, optionsArray, query, { setChildrenOptions });
+  });
+
  if (Array.isArray(options)) {
    if (options.length === 0) {
      return null;
    }

-    const filteredOptions = getUniqueOptions(
-      options
-        .filter((option) => ("filter" in group ? group.filter(query, option) : false))
-        .sort((optionA, optionB) => {
-          if ("sort" in group) {
-            return group.sort?.(query, [optionA, optionB]) ?? 0;
-          }
+    const filteredOptions = options
+      .filter((option) => ("filter" in group ? group.filter(query, option) : false))
+      .sort((optionA, optionB) => {
+        if ("sort" in group) {
+          return group.sort?.(query, [optionA, optionB]) ?? 0;
+        }

-          return 0;
-        }),
-      group.keyPath,
-    );
+        return 0;
+      });

    if (filteredOptions.length === 0) {
-      return null;
+      return <SpotlightNoResults />;
    }

    return filteredOptions.map((option) => (
@@ -76,15 +68,15 @@ export const SpotlightGroupActions = <TOption extends Record<string, unknown>>({
  }

  if (options.isLoading) {
-    return <span hidden data-search-pending />;
+    return (
+      <Center w="100%" py="sm">
+        <Loader size="sm" />
+      </Center>
+    );
  }

  if (options.isError) {
-    return (
-      <Center py="sm" data-search-status>
-        {t("search.error.fetch")}
-      </Center>
-    );
+    return <Center py="sm">{t("search.error.fetch")}</Center>;
  }

  if (!options.data) {
@@ -92,10 +84,10 @@ export const SpotlightGroupActions = <TOption extends Record<string, unknown>>({
  }

  if (options.data.length === 0) {
-    return null;
+    return <SpotlightNoResults />;
  }

-  return getUniqueOptions(options.data, group.keyPath).map((option) => (
+  return options.data.map((option) => (
    <SpotlightGroupActionItem
      key={option[group.keyPath] as never}
      option={option}
@@ -1,18 +1,18 @@
 import { Spotlight } from "@mantine/spotlight";

+import type { TranslationObject } from "@homarr/translation";
 import { translateIfNecessary } from "@homarr/translation";
 import { useI18n } from "@homarr/translation/client";

 import type { SearchGroup } from "../../../lib/group";
 import type { inferSearchInteractionOptions } from "../../../lib/interaction";
-import type { SpotlightMode } from "../../../open";
 import { SpotlightGroupActions } from "../group-actions";

 interface SpotlightActionGroupsProps {
  groups: SearchGroup[];
  query: string;
  setQuery: (query: string) => void;
-  setMode: (mode: SpotlightMode) => void;
+  setMode: (mode: keyof TranslationObject["search"]["mode"]) => void;
  setChildrenOptions: (options: inferSearchInteractionOptions<"children">) => void;
 }

@@ -23,8 +23,6 @@ export const SpotlightActionGroups = ({ groups, ...others }: SpotlightActionGrou
    <Spotlight.ActionsGroup
      key={`${translateIfNecessary(t, group.title)}::${String(group.keyPath)}`}
      label={translateIfNecessary(t, group.title)}
-      data-search-source={group.source?.kind ?? "local"}
-      data-remote-source={group.source?.kind === "remote" ? group.source.source : undefined}
    >
      {/*eslint-disable-next-line @typescript-eslint/no-explicit-any */}
      <SpotlightGroupActions<any> group={group} {...others} />
@@ -1,11 +1,11 @@
 import { Spotlight } from "@mantine/spotlight";

 import { getSafeAppHref, SAFE_NEW_TAB_REL } from "@homarr/common";
+import type { TranslationObject } from "@homarr/translation";
 import { Link } from "@homarr/ui";

 import type { SearchGroup } from "../../../lib/group";
 import type { inferSearchInteractionOptions } from "../../../lib/interaction";
-import type { SpotlightMode } from "../../../open";
 import { selectAction, spotlightStore } from "../../../spotlight-store";
 import classes from "./action-item.module.css";

@@ -13,7 +13,7 @@ interface SpotlightGroupActionItemProps<TOption extends Record<string, unknown>>
  option: TOption;
  query: string;
  setQuery: (query: string) => void;
-  setMode: (mode: SpotlightMode) => void;
+  setMode: (mode: keyof TranslationObject["search"]["mode"]) => void;
  setChildrenOptions: (options: inferSearchInteractionOptions<"children">) => void;
  group: SearchGroup<TOption>;
 }
@@ -34,7 +34,7 @@ export const SpotlightGroupActionItem = <TOption extends Record<string, unknown>

  const safeHref = interaction.type === "link" ? getSafeAppHref(interaction.href) : undefined;
  const renderRoot =
-    interaction.type === "link" && safeHref && !unavailable
+    interaction.type === "link" && safeHref
      ? (props: Record<string, unknown>) => {
          return (
            <Link
@@ -48,8 +48,6 @@ export const SpotlightGroupActionItem = <TOption extends Record<string, unknown>
      : undefined;

  const handleClickAsync = async () => {
-    if (unavailable) return;
-
    if (interaction.type === "javaScript") {
      await interaction.onSelect();
    } else if (interaction.type === "setQuery") {
@@ -78,7 +76,6 @@ export const SpotlightGroupActionItem = <TOption extends Record<string, unknown>
      }
      className={classes.spotlightAction}
      aria-disabled={unavailable || undefined}
-      disabled={unavailable}
    >
      <group.Component {...(optionProps as TOption)} />
    </Spotlight.Action>
@@ -1,80 +0,0 @@
-import { Group, Kbd, ScrollArea, Text, UnstyledButton } from "@mantine/core";
-import {
-  IconApps,
-  IconCommand,
-  IconMovie,
-  IconRobot,
-  IconSearch,
-  IconSettings,
-  IconUsers,
-  IconWorldSearch,
-} from "@tabler/icons-react";
-
-import { useSession } from "@homarr/auth/client";
-
-import type { SpotlightMode } from "../open";
-import classes from "./spotlight.module.css";
-
-interface ModeRailEntry {
-  ariaLabel: string;
-  character?: string;
-  label: string;
-  mode: SpotlightMode;
-}
-
-interface SpotlightModeRailProps {
-  activeMode: SpotlightMode;
-  entries: ModeRailEntry[];
-  navigationLabel: string;
-  onModeChange: (mode: SpotlightMode) => void;
-}
-
-const modeIcons: Record<SpotlightMode, typeof IconSearch> = {
-  search: IconSearch,
-  apps: IconApps,
-  command: IconCommand,
-  preferences: IconSettings,
-  assistant: IconRobot,
-  external: IconWorldSearch,
-  media: IconMovie,
-  userGroup: IconUsers,
-};
-
-export const SpotlightModeRail = ({ activeMode, entries, navigationLabel, onModeChange }: SpotlightModeRailProps) => {
-  const { data: session } = useSession();
-  const canManageUsers = session?.user.permissions.includes("admin") ?? false;
-
-  return (
-    <ScrollArea type="never" scrollbarSize={0} className={classes.modeRailViewport}>
-      <Group component="nav" aria-label={navigationLabel} wrap="nowrap" gap={4} className={classes.modeRail}>
-        {entries.map((entry) => {
-          if (entry.mode === "userGroup" && !canManageUsers) return null;
-          const Icon = modeIcons[entry.mode];
-          const active = entry.mode === activeMode;
-
-          return (
-            <UnstyledButton
-              type="button"
-              key={entry.mode}
-              className={classes.modeButton}
-              data-active={active || undefined}
-              aria-pressed={active}
-              aria-label={entry.ariaLabel}
-              onClick={() => onModeChange(entry.mode)}
-            >
-              <Icon size={15} stroke={1.7} />
-              <Text component="span" size="xs" fw={600} className={classes.modeLabel}>
-                {entry.label}
-              </Text>
-              {entry.character ? (
-                <Kbd size="xs" className={classes.modeKey}>
-                  {entry.character}
-                </Kbd>
-              ) : null}
-            </UnstyledButton>
-          );
-        })}
-      </Group>
-    </ScrollArea>
-  );
-};
@@ -2,8 +2,8 @@ import { Spotlight } from "@mantine/spotlight";

 import { useI18n } from "@homarr/translation/client";

-export const SpotlightNoResults = ({ className }: { className?: string }) => {
+export const SpotlightNoResults = () => {
  const t = useI18n();

-  return <Spotlight.Empty className={className}>{t("search.nothingFound")}</Spotlight.Empty>;
+  return <Spotlight.Empty>{t("search.nothingFound")}</Spotlight.Empty>;
 };
@@ -1,106 +0,0 @@
-.content {
-  overflow: hidden;
-  border: 1px solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
-  box-shadow: var(--mantine-shadow-xl);
-}
-
-.search {
-  border-bottom: 1px solid light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5));
-}
-
-.modeRailViewport {
-  border-bottom: 1px solid light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5));
-}
-
-.modeRail {
-  min-width: max-content;
-  padding: var(--mantine-spacing-xs);
-}
-
-.modeButton {
-  display: flex;
-  align-items: center;
-  gap: 4px;
-  min-height: 30px;
-  padding-inline: 6px;
-  border-radius: var(--mantine-radius-sm);
-  color: var(--mantine-color-dimmed);
-  transition:
-    color 100ms ease,
-    background-color 100ms ease;
-}
-
-.modeKey {
-  min-width: 0;
-  padding: 0;
-  border: 0;
-  background: transparent;
-  color: inherit;
-  font-size: 10px;
-}
-
-.modeButton:hover {
-  color: var(--mantine-color-text);
-  background: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-6));
-}
-
-.modeButton[data-active] {
-  color: var(--mantine-primary-color-filled);
-  background: var(--mantine-primary-color-light);
-}
-
-.modeButton:focus-visible {
-  outline: 2px solid var(--mantine-primary-color-filled);
-  outline-offset: -2px;
-}
-
-.actionsList {
-  padding-block: 4px;
-}
-
-.actionsList [data-search-source="fallback"] {
-  margin-top: var(--mantine-spacing-xs);
-  padding-top: var(--mantine-spacing-xs);
-  border-top: 1px dashed light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
-}
-
-.actionsList > [data-search-source="fallback"]:first-child {
-  margin-top: 0;
-  padding-top: 0;
-  border-top: 0;
-}
-
-.actionsList:has([data-action]) .emptyState,
-.actionsList:has([data-search-pending]) .emptyState,
-.actionsList:has([data-search-status]) .emptyState {
-  display: none;
-}
-
-.actionsList [data-search-source]:has([data-search-pending]) {
-  display: none;
-}
-
-.footer {
-  min-height: 42px;
-  border-top: 1px solid light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5));
-}
-
-.footerHint {
-  color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-gray-4));
-}
-
-@media (max-width: 48em) {
-  .modeLabel {
-    display: none;
-  }
-
-  .footerSecondary {
-    display: none;
-  }
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .modeButton {
-    transition: none;
-  }
-}
@@ -2,12 +2,13 @@

 import type { Dispatch, SetStateAction } from "react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { ActionIcon, Center, Group, Kbd, Text } from "@mantine/core";
+import { ActionIcon, Center, Group, Kbd } from "@mantine/core";
 import { Spotlight as MantineSpotlight } from "@mantine/spotlight";
-import { IconArrowDown, IconArrowLeft, IconArrowUp, IconCornerDownLeft, IconSearch, IconX } from "@tabler/icons-react";
+import { IconArrowLeft, IconSearch, IconX } from "@tabler/icons-react";
 import { useSetAtom } from "jotai";

-import { translateIfNecessary } from "@homarr/translation";
+import { hotkeys } from "@homarr/definitions";
+import type { TranslationObject } from "@homarr/translation";
 import { useI18n } from "@homarr/translation/client";

 import {
@@ -16,142 +17,74 @@ import {
  mediaRequestSearchEvent,
  spotlightOpenEvent,
 } from "../open";
-import type { OpenMediaRequestSearchOptions, SpotlightMode, SpotlightOpenIntent } from "../open";
+import type { OpenMediaRequestSearchOptions } from "../open";
 import type { inferSearchInteractionOptions } from "../lib/interaction";
 import type { SearchMode } from "../lib/mode";
-import { useSpotlightCatalogs } from "../lib/catalog";
 import { searchModes } from "../modes";
+import { useHomeEmptyGroupsWithPreferences } from "../modes/help/home-empty-groups";
+import { contextSpecificSearchGroups } from "../modes/home/context-specific-group";
 import { mediaRequestSearchScopeAtom, selectAction, spotlightActions, spotlightStore } from "../spotlight-store";
 import { SpotlightChildrenActions } from "./actions/children-actions";
 import { SpotlightActionGroups } from "./actions/groups/action-group";
-import { SpotlightModeRail } from "./mode-rail";
-import { SpotlightNoResults } from "./no-results";
-import classes from "./spotlight.module.css";

+type SearchModeKey = keyof TranslationObject["search"]["mode"];
 type ChildrenOptions = inferSearchInteractionOptions<"children">;

-const defaultMode: SpotlightMode = "search";
-
-const resetSelection = () => {
-  requestAnimationFrame(() => selectAction(0, spotlightStore));
-};
-
+const defaultMode = "home";
 export const Spotlight = () => {
-  useSpotlightCatalogs();
+  const searchModeState = useState<SearchModeKey>(defaultMode);
+  const queryState = useState("");
+  const mode = searchModeState[0];
+  const activeMode = useMemo(() => searchModes.find((searchMode) => searchMode.modeKey === mode), [mode]);

-  const [mode, setMode] = useState<SpotlightMode>(defaultMode);
-  const [query, setQuery] = useState("");
-  const setMediaRequestSearchScope = useSetAtom(mediaRequestSearchScopeAtom);
-  const activeMode = useMemo(() => searchModes.find((searchMode) => searchMode.mode === mode), [mode]);
-
-  const applyOpenOptions = useCallback(
-    (options: SpotlightOpenIntent) => {
-      setMode(options.mode);
-      setQuery(options.query ?? "");
-      if (options.mode !== "media") setMediaRequestSearchScope({});
-      spotlightActions.open();
-      resetSelection();
-    },
-    [setMediaRequestSearchScope],
-  );
-
-  useEffect(() => {
-    const handleOpen = (event: Event) => {
-      const pendingOptions = consumePendingSpotlightOpen();
-      const eventOptions = (event as CustomEvent<SpotlightOpenIntent>).detail;
-      applyOpenOptions(eventOptions ?? pendingOptions ?? { mode: defaultMode });
-    };
-
-    window.addEventListener(spotlightOpenEvent, handleOpen);
-    const pendingOptions = consumePendingSpotlightOpen();
-    if (pendingOptions) applyOpenOptions(pendingOptions);
-    return () => window.removeEventListener(spotlightOpenEvent, handleOpen);
-  }, [applyOpenOptions]);
-
-  useEffect(() => {
-    const applyMediaRequestSearch = ({ integrationIds, query: mediaQuery }: OpenMediaRequestSearchOptions) => {
-      setMediaRequestSearchScope({ integrationIds });
-      applyOpenOptions({ mode: "media", query: mediaQuery });
-    };
-
-    const handleMediaRequestSearch = (event: Event) => {
-      const pendingOptions = consumePendingMediaRequestSearch();
-      const eventOptions = (event as CustomEvent<OpenMediaRequestSearchOptions>).detail;
-      applyMediaRequestSearch(eventOptions ?? pendingOptions ?? {});
-    };
-
-    window.addEventListener(mediaRequestSearchEvent, handleMediaRequestSearch);
-    const pendingOptions = consumePendingMediaRequestSearch();
-    if (pendingOptions) applyMediaRequestSearch(pendingOptions);
-    return () => window.removeEventListener(mediaRequestSearchEvent, handleMediaRequestSearch);
-  }, [applyOpenOptions, setMediaRequestSearchScope]);
-
-  if (!activeMode) return null;
+  if (!activeMode) {
+    return null;
+  }

  return (
-    <SpotlightWithActiveMode
-      key={mode}
-      mode={mode}
-      setMode={setMode}
-      query={query}
-      setQuery={setQuery}
-      activeMode={activeMode}
-    />
+    <SpotlightWithActiveMode key={mode} modeState={searchModeState} queryState={queryState} activeMode={activeMode} />
  );
 };

 interface SpotlightWithActiveModeProps {
-  mode: SpotlightMode;
-  setMode: Dispatch<SetStateAction<SpotlightMode>>;
-  query: string;
-  setQuery: Dispatch<SetStateAction<string>>;
+  modeState: [SearchModeKey, Dispatch<SetStateAction<SearchModeKey>>];
+  queryState: [string, Dispatch<SetStateAction<string>>];
  activeMode: SearchMode;
 }

-const SpotlightWithActiveMode = ({ mode, setMode, query, setQuery, activeMode }: SpotlightWithActiveModeProps) => {
+const SpotlightWithActiveMode = ({ modeState, queryState, activeMode }: SpotlightWithActiveModeProps) => {
+  const [query, setQuery] = queryState;
+  const [mode, setMode] = modeState;
  const [childrenStack, setChildrenStack] = useState<ChildrenOptions[]>([]);
  const childrenOptions = childrenStack.at(-1) ?? null;
  const t = useI18n();
  const inputRef = useRef<HTMLInputElement>(null);
+  const setMediaRequestSearchScope = useSetAtom(mediaRequestSearchScopeAtom);
  const useGroups = "groups" in activeMode ? () => activeMode.groups : activeMode.useGroups;
  const groups = useGroups();
-  const hasModeCharacter = activeMode.character !== undefined;
-  const activeModeLabel = translateIfNecessary(t, activeMode.label) ?? activeMode.mode;
-  const placeholder = translateIfNecessary(t, activeMode.placeholder) ?? t("search.placeholder");
-  const modeRailEntries = searchModes.map((searchMode) => {
-    const label = translateIfNecessary(t, searchMode.label) ?? searchMode.mode;
-    return {
-      mode: searchMode.mode,
-      character: searchMode.character,
-      label,
-      ariaLabel: t("search.modePicker.modeAriaLabel", { mode: label }),
-    };
-  });
+  const homeEmptyGroups = useHomeEmptyGroupsWithPreferences();
+  const hasModeCharacter = activeMode.modeKey !== defaultMode && activeMode.character !== undefined;

  useEffect(() => {
-    requestAnimationFrame(() => inputRef.current?.focus());
+    const handleOpen = () => {
+      consumePendingSpotlightOpen();
+      spotlightActions.open();
+    };
+
+    window.addEventListener(spotlightOpenEvent, handleOpen);
+    if (consumePendingSpotlightOpen()) spotlightActions.open();
+    return () => window.removeEventListener(spotlightOpenEvent, handleOpen);
  }, []);

  const clearChildrenStack = useCallback(() => {
    setChildrenStack([]);
  }, []);

-  const changeMode = useCallback(
-    (nextMode: SpotlightMode, preserveQuery = true) => {
-      setMode(nextMode);
-      clearChildrenStack();
-      if (!preserveQuery) setQuery("");
-      resetSelection();
-      requestAnimationFrame(() => inputRef.current?.focus());
-    },
-    [clearChildrenStack, setMode, setQuery],
-  );
-
  const pushChildrenOptions = useCallback(
    (options: ChildrenOptions) => {
      setChildrenStack((currentStack) => [...currentStack, options]);
      setQuery("");
-      resetSelection();
+      setTimeout(() => selectAction(0, spotlightStore));
    },
    [setQuery],
  );
@@ -159,19 +92,44 @@ const SpotlightWithActiveMode = ({ mode, setMode, query, setQuery, activeMode }:
  const popChildrenOptions = useCallback(() => {
    setChildrenStack((currentStack) => currentStack.slice(0, -1));
    setQuery("");
-    resetSelection();
+    setTimeout(() => selectAction(0, spotlightStore));
  }, [setQuery]);

+  useEffect(() => {
+    const applyMediaRequestSearch = ({ integrationIds, query: searchQuery }: OpenMediaRequestSearchOptions) => {
+      setMediaRequestSearchScope({ integrationIds });
+      setMode("media");
+      clearChildrenStack();
+      setQuery(searchQuery ?? "");
+      spotlightActions.open();
+      setTimeout(() => selectAction(0, spotlightStore));
+    };
+
+    const handleMediaRequestSearch = (event: Event) => {
+      consumePendingMediaRequestSearch();
+      const { integrationIds, query: searchQuery } = (event as CustomEvent<OpenMediaRequestSearchOptions>).detail ?? {};
+      applyMediaRequestSearch({ integrationIds, query: searchQuery });
+    };
+
+    window.addEventListener(mediaRequestSearchEvent, handleMediaRequestSearch);
+    const pendingSearch = consumePendingMediaRequestSearch();
+    if (pendingSearch) applyMediaRequestSearch(pendingSearch);
+    return () => {
+      window.removeEventListener(mediaRequestSearchEvent, handleMediaRequestSearch);
+    };
+  }, [setMediaRequestSearchScope, setMode, setQuery, clearChildrenStack]);
+
+  useEffect(() => {
+    if (mode !== "media") {
+      setMediaRequestSearchScope({});
+    }
+  }, [mode, setMediaRequestSearchScope]);
+
  return (
    <MantineSpotlight.Root
-      shortcut={null}
-      size={760}
-      yOffset={64}
-      scrollable
-      maxHeight="min(62vh, 560px)"
-      overlayProps={{ blur: 3, backgroundOpacity: 0.24 }}
-      attributes={{ content: { "aria-label": t("search.modePicker.dialogAriaLabel", { mode: activeModeLabel }) } }}
-      classNames={{ content: classes.content }}
+      shortcut={hotkeys.openSpotlight}
+      yOffset={8}
+      overlayProps={{ blur: 2, backgroundOpacity: 0.2 }}
      onSpotlightOpen={() => {
        requestAnimationFrame(() => inputRef.current?.focus());
      }}
@@ -185,24 +143,22 @@ const SpotlightWithActiveMode = ({ mode, setMode, query, setQuery, activeMode }:
        const sanitizedQuery = mode === "external" && nextQuery.startsWith("!") ? nextQuery.slice(1) : nextQuery;
        setQuery(sanitizedQuery);

-        if (sanitizedQuery.length === 1) {
-          const modeToActivate = searchModes.find((searchMode) => searchMode.character === sanitizedQuery);
-          if (modeToActivate) {
-            changeMode(modeToActivate.mode, false);
-            return;
-          }
-        }
+        if (sanitizedQuery.length !== 1) return;

-        resetSelection();
+        const modeToActivate = searchModes.find((searchMode) => searchMode.character === sanitizedQuery);
+        if (!modeToActivate) return;
+
+        setMode(modeToActivate.modeKey);
+        clearChildrenStack();
+        setQuery("");
+        setTimeout(() => selectAction(0, spotlightStore));
      }}
      store={spotlightStore}
    >
      <MantineSpotlight.Search
        data-homarr-dev-benchmark-spotlight
-        aria-label={placeholder}
-        placeholder={placeholder}
+        placeholder={`${t("search.placeholder")}...`}
        ref={inputRef}
-        className={classes.search}
        leftSectionWidth={hasModeCharacter ? 80 : 48}
        leftSection={
          <Group align="center" wrap="nowrap" gap="xs" w="100%" h="100%">
@@ -212,7 +168,11 @@ const SpotlightWithActiveMode = ({ mode, setMode, query, setQuery, activeMode }:
            {hasModeCharacter ? <Kbd size="sm">{activeMode.character}</Kbd> : null}
          </Group>
        }
-        styles={{ section: { pointerEvents: "all" } }}
+        styles={{
+          section: {
+            pointerEvents: "all",
+          },
+        }}
        rightSection={
          mode === defaultMode && childrenStack.length === 0 ? null : (
            <ActionIcon
@@ -228,7 +188,9 @@ const SpotlightWithActiveMode = ({ mode, setMode, query, setQuery, activeMode }:
                  return;
                }

-                changeMode(defaultMode, true);
+                setMode(defaultMode);
+                clearChildrenStack();
+                inputRef.current?.focus();
              }}
              variant="subtle"
              aria-label={
@@ -250,28 +212,20 @@ const SpotlightWithActiveMode = ({ mode, setMode, query, setQuery, activeMode }:
            return;
          }

-          if (mode !== defaultMode) changeMode(defaultMode, true);
+          if (mode !== defaultMode) {
+            setMode(defaultMode);
+            clearChildrenStack();
+          }
        }}
      />

-      <SpotlightModeRail
-        activeMode={mode}
-        entries={modeRailEntries}
-        navigationLabel={t("search.modePicker.navigationLabel")}
-        onModeChange={changeMode}
-      />
-
      {childrenOptions ? (
        <Group key={childrenStack.length}>
          <childrenOptions.DetailComponent options={childrenOptions.option as never} />
        </Group>
      ) : null}

-      <MantineSpotlight.ActionsList
-        component="section"
-        className={classes.actionsList}
-        aria-label={t("search.modePicker.resultsAriaLabel", { mode: activeModeLabel })}
-      >
+      <MantineSpotlight.ActionsList>
        {childrenOptions ? (
          <SpotlightChildrenActions
            key={childrenStack.length}
@@ -282,46 +236,21 @@ const SpotlightWithActiveMode = ({ mode, setMode, query, setQuery, activeMode }:
        ) : (
          <SpotlightActionGroups
            setQuery={setQuery}
-            setMode={(nextMode) => changeMode(nextMode, true)}
-            setChildrenOptions={pushChildrenOptions}
+            setMode={(nextMode) => {
+              setMode(nextMode);
+              clearChildrenStack();
+              setTimeout(() => selectAction(0, spotlightStore));
+            }}
+            setChildrenOptions={(options) => {
+              pushChildrenOptions(options);
+            }}
            query={query}
-            groups={groups}
+            groups={
+              mode === defaultMode && query.length === 0 ? [...homeEmptyGroups, contextSpecificSearchGroups] : groups
+            }
          />
        )}
-        <SpotlightNoResults className={classes.emptyState} />
      </MantineSpotlight.ActionsList>
-
-      <MantineSpotlight.Footer className={classes.footer} px="md" py="xs">
-        <Group justify="space-between" wrap="nowrap">
-          <Group gap="xs" wrap="nowrap">
-            <Group gap={4} wrap="nowrap">
-              <Kbd size="xs">
-                <IconArrowUp size={11} />
-              </Kbd>
-              <Kbd size="xs">
-                <IconArrowDown size={11} />
-              </Kbd>
-              <Text size="xs" className={classes.footerHint}>
-                {t("search.modePicker.footer.navigate")}
-              </Text>
-            </Group>
-            <Group gap={4} wrap="nowrap">
-              <Kbd size="xs">
-                <IconCornerDownLeft size={11} />
-              </Kbd>
-              <Text size="xs" className={classes.footerHint}>
-                {t("search.modePicker.footer.open")}
-              </Text>
-            </Group>
-          </Group>
-          <Group gap={4} wrap="nowrap" className={classes.footerSecondary}>
-            <Kbd size="xs">esc</Kbd>
-            <Text size="xs" className={classes.footerHint}>
-              {t("search.modePicker.footer.close")}
-            </Text>
-          </Group>
-        </Group>
-      </MantineSpotlight.Footer>
    </MantineSpotlight.Root>
  );
 };
@@ -6,4 +6,3 @@ export {
  useRegisterSpotlightContextResults,
  useRegisterSpotlightContextActions,
 } from "./modes/home/context";
-export type { ContextSpecificItem } from "./modes/home/context";
@@ -1,96 +0,0 @@
-"use client";
-
-import { useEffect } from "react";
-
-import { clientApi } from "@homarr/api/client";
-import { queryCacheDefaultStaleTimeMs } from "@homarr/api/query-cache";
-import { useSession } from "@homarr/auth/client";
-
-import { spotlightOpenEvent } from "../open";
-
-const catalogQueryOptions = (enabled = true) => ({
-  enabled,
-  refetchOnWindowFocus: false,
-  staleTime: queryCacheDefaultStaleTimeMs,
-});
-
-export const useAppsCatalogQuery = (enabled = true) => {
-  const { status } = useSession();
-  return clientApi.app.selectable.useQuery(undefined, catalogQueryOptions(enabled && status === "authenticated"));
-};
-
-export const useBoardsCatalogQuery = () => {
-  const { status } = useSession();
-  return clientApi.board.catalog.useQuery(undefined, catalogQueryOptions(status !== "loading"));
-};
-
-export const useIntegrationsCatalogQuery = (enabled = true) => {
-  const { status } = useSession();
-  return clientApi.integration.all.useQuery(undefined, catalogQueryOptions(enabled && status === "authenticated"));
-};
-
-export const useSearchEnginesCatalogQuery = () => {
-  const { status } = useSession();
-  return clientApi.searchEngine.catalog.useQuery(undefined, catalogQueryOptions(status !== "loading"));
-};
-
-export const useSpotlightCatalogs = () => {
-  const { data: session, status } = useSession();
-  const isAuthenticated = status === "authenticated";
-  const isSessionResolved = status !== "loading";
-  const canBrowseApps =
-    session?.user.permissions.includes("board-modify-all") === true ||
-    session?.user.permissions.includes("app-modify-all") === true;
-
-  const appsQuery = useAppsCatalogQuery(isAuthenticated && canBrowseApps);
-  const boardsQuery = useBoardsCatalogQuery();
-  const integrationsQuery = useIntegrationsCatalogQuery(isAuthenticated);
-  const searchEnginesQuery = useSearchEnginesCatalogQuery();
-
-  useEffect(() => {
-    const refreshCatalogs = () => {
-      if (canBrowseApps) void appsQuery.refetch();
-      if (isSessionResolved) void boardsQuery.refetch();
-      if (isAuthenticated) void integrationsQuery.refetch();
-      if (isSessionResolved) void searchEnginesQuery.refetch();
-    };
-
-    window.addEventListener(spotlightOpenEvent, refreshCatalogs);
-    return () => window.removeEventListener(spotlightOpenEvent, refreshCatalogs);
-  }, [
-    appsQuery,
-    boardsQuery,
-    canBrowseApps,
-    integrationsQuery,
-    isAuthenticated,
-    isSessionResolved,
-    searchEnginesQuery,
-  ]);
-};
-
-export const filterCatalog = <TOption>(
-  options: TOption[],
-  query: string,
-  getSearchableValues: (option: TOption) => string[],
-  limit = 8,
-) => {
-  const normalizedQuery = query.trim().toLowerCase();
-  if (normalizedQuery.length === 0) return options.slice(0, limit);
-
-  return options
-    .map((option, index) => {
-      const values = getSearchableValues(option).map((value) => value.toLowerCase());
-      const score = values.reduce((currentScore, value) => {
-        if (value === normalizedQuery) return Math.min(currentScore, 0);
-        if (value.startsWith(normalizedQuery)) return Math.min(currentScore, 1);
-        if (value.includes(normalizedQuery)) return Math.min(currentScore, 2);
-        return currentScore;
-      }, Number.POSITIVE_INFINITY);
-
-      return { option, index, score };
-    })
-    .filter(({ score }) => Number.isFinite(score))
-    .toSorted((first, second) => first.score - second.score || first.index - second.index)
-    .slice(0, limit)
-    .map(({ option }) => option);
-};
@@ -2,34 +2,26 @@ import type { JSX } from "react";

 import type { stringOrTranslation } from "@homarr/translation";

-import type { inferSearchInteractionDefinition, SearchInteraction } from "./interaction";
+import type { inferSearchInteractionDefinition, inferSearchInteractionOptions, SearchInteraction } from "./interaction";

-export type RemoteSearchSource =
-  | "apps"
-  | "boards"
-  | "integrations"
-  | "users"
-  | "groups"
-  | "search-engines"
-  | "integration-search"
-  | "media";
-
-export type SearchGroupSource =
-  | { kind: "local" }
-  | { kind: "remote"; source: RemoteSearchSource }
-  | { kind: "fallback" };
-
-type CommonSearchGroup<TOption extends object, TOptionProps extends object> = {
+type CommonSearchGroup<TOption extends Record<string, unknown>, TOptionProps extends Record<string, unknown>> = {
  // key path is used to define the path to a unique key in the option object
  keyPath: keyof TOption;
  title: stringOrTranslation;
-  source?: SearchGroupSource;
  Component: (option: TOption) => JSX.Element;
  useInteraction: (option: TOption, query: string) => inferSearchInteractionDefinition<SearchInteraction>;
+  onKeyDown?: (
+    event: KeyboardEvent,
+    options: TOption[],
+    query: string,
+    actions: {
+      setChildrenOptions: (options: inferSearchInteractionOptions<"children">) => void;
+    },
+  ) => void;
 } & TOptionProps;

 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type SearchGroup<TOption extends object = any> =
+export type SearchGroup<TOption extends Record<string, unknown> = any> =
  | CommonSearchGroup<TOption, { filter: (query: string, option: TOption) => boolean; options: TOption[] }>
  | CommonSearchGroup<
      TOption,
@@ -44,4 +36,4 @@ export type SearchGroup<TOption extends object = any> =
      { useQueryOptions: (query: string) => { data: TOption[] | undefined; isLoading: boolean; isError: boolean } }
    >;

-export const createGroup = <TOption extends object>(group: SearchGroup<TOption>) => group;
+export const createGroup = <TOption extends Record<string, unknown>>(group: SearchGroup<TOption>) => group;
@@ -1,7 +1,7 @@
 import type { MaybePromise } from "@homarr/common/types";
+import type { TranslationObject } from "@homarr/translation";

 import type { CreateChildrenOptionsProps } from "./children";
-import type { SpotlightMode } from "../open";

 const createSearchInteraction = <TType extends string>(type: TType) => ({
  optionsType: <TOption extends Record<string, unknown> | undefined>() => ({ type, _inferOptions: {} as TOption }),
@@ -15,7 +15,7 @@ const searchInteractions = [
    closeSpotlightOnTrigger?: boolean;
  }>(),
  createSearchInteraction("setQuery").optionsType<{ query: string }>(),
-  createSearchInteraction("mode").optionsType<{ mode: SpotlightMode; query?: string }>(),
+  createSearchInteraction("mode").optionsType<{ mode: keyof TranslationObject["search"]["mode"]; query?: string }>(),
  createSearchInteraction("children").optionsType<{
    // eslint-disable-next-line @typescript-eslint/no-explicit-any
    useActions: CreateChildrenOptionsProps<any>["useActions"];
@@ -1,13 +1,10 @@
-import type { stringOrTranslation } from "@homarr/translation";
+import type { TranslationObject } from "@homarr/translation";

 import type { SearchGroup } from "./group";
-import type { SpotlightMode } from "../open";

 export type SearchMode = {
-  mode: SpotlightMode;
+  modeKey: keyof TranslationObject["search"]["mode"];
  character: string | undefined;
-  label: stringOrTranslation;
-  placeholder: stringOrTranslation;
 } & (
  | {
      groups: SearchGroup[];
@@ -1,46 +0,0 @@
-"use client";
-
-import { useDebouncedValue } from "@mantine/hooks";
-
-import type { RemoteSearchSource } from "./group";
-
-const remoteSearchPolicy: Record<RemoteSearchSource, { delay: number; minimumLength: number }> = {
-  apps: { delay: 140, minimumLength: 1 },
-  boards: { delay: 140, minimumLength: 1 },
-  integrations: { delay: 160, minimumLength: 1 },
-  users: { delay: 180, minimumLength: 1 },
-  groups: { delay: 180, minimumLength: 1 },
-  "search-engines": { delay: 160, minimumLength: 1 },
-  "integration-search": { delay: 220, minimumLength: 1 },
-  media: { delay: 220, minimumLength: 1 },
-};
-
-interface RemoteQueryOptions {
-  minimumLength?: number;
-  trim?: boolean;
-}
-
-export interface RemoteQuery {
-  enabled: boolean;
-  query: string;
-}
-
-/**
- * Keeps every network-backed spotlight provider on the same query cadence. Local providers still
- * receive the immediate query and therefore render before remote results can replace the selection.
- */
-export const useRemoteQuery = (
-  query: string,
-  source: RemoteSearchSource,
-  options: RemoteQueryOptions = {},
-): RemoteQuery => {
-  const policy = remoteSearchPolicy[source];
-  const minimumLength = options.minimumLength ?? policy.minimumLength;
-  const normalizedQuery = options.trim === false ? query : query.trim();
-  const [debouncedQuery] = useDebouncedValue(normalizedQuery, policy.delay);
-
-  return {
-    enabled: debouncedQuery.length >= minimumLength,
-    query: debouncedQuery,
-  };
-};
@@ -1,13 +1,12 @@
 import { Avatar, Group, Stack, Text } from "@mantine/core";
 import { IconExternalLink, IconEye } from "@tabler/icons-react";

+import { clientApi } from "@homarr/api/client";
 import { useI18n } from "@homarr/translation/client";

 import { createChildrenOptions } from "../../lib/children";
-import { filterCatalog, useAppsCatalogQuery } from "../../lib/catalog";
 import { createGroup } from "../../lib/group";
 import { interaction } from "../../lib/interaction";
-import { useSpotlightContextResults } from "../home/context";

 // This has to be type so it can be interpreted as Record<string, unknown>.
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
@@ -59,7 +58,6 @@ const appChildrenOptions = createChildrenOptions<App>({
          <Avatar
            size="sm"
            src={options.iconUrl}
-            alt=""
            radius={0}
            styles={{
              image: {
@@ -77,13 +75,11 @@ const appChildrenOptions = createChildrenOptions<App>({
 export const appsSearchGroup = createGroup<App>({
  keyPath: "id",
  title: (t) => t("common.entity.apps"),
-  source: { kind: "remote", source: "apps" },
  Component: (app) => (
    <Group px="md" py="sm">
      <Avatar
        size="sm"
        src={app.iconUrl}
-        alt=""
        radius={0}
        styles={{
          image: {
@@ -96,16 +92,6 @@ export const appsSearchGroup = createGroup<App>({
  ),
  useInteraction: interaction.children(appChildrenOptions),
  useQueryOptions(query) {
-    const catalogQuery = useAppsCatalogQuery();
-    const localAppKeys = new Set(
-      useSpotlightContextResults().flatMap((item) => (item.dedupeKey ? [item.dedupeKey] : [])),
-    );
-    const apps = (catalogQuery.data ?? []).filter((app) => !localAppKeys.has(`app:${app.id}`));
-
-    return {
-      data: filterCatalog(apps, query, (app) => [app.name]),
-      isLoading: catalogQuery.isLoading,
-      isError: catalogQuery.isError,
-    };
+    return clientApi.app.search.useQuery({ query, limit: 5 });
  },
 });
@@ -1,14 +1,13 @@
 import { Group, Stack, Text } from "@mantine/core";
 import { IconDeviceMobile, IconHome, IconLayoutDashboard, IconLink, IconSettings } from "@tabler/icons-react";

+import { clientApi } from "@homarr/api/client";
 import { useI18n } from "@homarr/translation/client";

 import type { ChildrenAction } from "../../lib/children";
-import { filterCatalog, useBoardsCatalogQuery } from "../../lib/catalog";
 import { createChildrenOptions } from "../../lib/children";
 import { createGroup } from "../../lib/group";
 import { interaction } from "../../lib/interaction";
-import { clientApi } from "@homarr/api/client";

 // This has to be type so it can be interpreted as Record<string, unknown>.
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
@@ -127,7 +126,6 @@ const boardChildrenOptions = createChildrenOptions<Board>({
 export const boardsSearchGroup = createGroup<Board>({
  keyPath: "id",
  title: (t) => t("common.entity.boards"),
-  source: { kind: "remote", source: "boards" },
  Component: (board) => (
    <Group px="md" py="sm">
      {board.logoImageUrl ? (
@@ -141,11 +139,6 @@ export const boardsSearchGroup = createGroup<Board>({
  ),
  useInteraction: interaction.children(boardChildrenOptions),
  useQueryOptions(query) {
-    const catalogQuery = useBoardsCatalogQuery();
-    return {
-      data: filterCatalog(catalogQuery.data ?? [], query, (board) => [board.name]),
-      isLoading: catalogQuery.isLoading,
-      isError: catalogQuery.isError,
-    };
+    return clientApi.board.search.useQuery({ query, limit: 5 });
  },
 });
@@ -2,22 +2,19 @@ import { useSession } from "@homarr/auth/client";

 import type { SearchGroup } from "../../lib/group";
 import type { SearchMode } from "../../lib/mode";
-import { contextSpecificAppsSearchGroup } from "../home/context-specific-group";
 import { appsSearchGroup } from "./apps-search-group";
 import { boardsSearchGroup } from "./boards-search-group";
 import { integrationsSearchGroup } from "./integrations-search-group";

 export const appIntegrationBoardMode = {
-  mode: "apps",
+  modeKey: "appIntegrationBoard",
  character: "#",
-  label: (t) => t("search.modePicker.apps.label"),
-  placeholder: (t) => t("search.modePicker.apps.placeholder"),
  useGroups() {
    const { data: session } = useSession();
-    const groups: SearchGroup[] = [contextSpecificAppsSearchGroup];
+    const groups: SearchGroup[] = [boardsSearchGroup];

    if (!session?.user) {
-      return groups.concat(boardsSearchGroup);
+      return groups;
    }

    // Mirrors the gate on app.search: either permission may browse the app catalogue, so an app
@@ -25,10 +22,6 @@ export const appIntegrationBoardMode = {
    const canSearchApps =
      session.user.permissions.includes("board-modify-all") || session.user.permissions.includes("app-modify-all");

-    if (canSearchApps) {
-      return groups.concat(appsSearchGroup, boardsSearchGroup, integrationsSearchGroup);
-    }
-
-    return groups.concat(boardsSearchGroup, integrationsSearchGroup);
+    return groups.concat(canSearchApps ? [appsSearchGroup, integrationsSearchGroup] : [integrationsSearchGroup]);
  },
 } satisfies SearchMode;
@@ -1,16 +1,15 @@
 import { Group, Text } from "@mantine/core";

+import { clientApi } from "@homarr/api/client";
 import type { IntegrationKind } from "@homarr/definitions";
 import { IntegrationAvatar } from "@homarr/ui";

-import { filterCatalog, useIntegrationsCatalogQuery } from "../../lib/catalog";
 import { createGroup } from "../../lib/group";
 import { interaction } from "../../lib/interaction";

 export const integrationsSearchGroup = createGroup<{ id: string; kind: IntegrationKind; name: string }>({
  keyPath: "id",
  title: (t) => t("common.entity.integrations"),
-  source: { kind: "remote", source: "integrations" },
  Component: (integration) => (
    <Group px="md" py="sm">
      <IntegrationAvatar size="sm" kind={integration.kind} />
@@ -20,11 +19,6 @@ export const integrationsSearchGroup = createGroup<{ id: string; kind: Integrati
  ),
  useInteraction: interaction.link(({ id }) => ({ href: `/manage/integrations/edit/${id}` })),
  useQueryOptions(query) {
-    const catalogQuery = useIntegrationsCatalogQuery();
-    return {
-      data: filterCatalog(catalogQuery.data ?? [], query, (integration) => [integration.name, integration.kind]),
-      isLoading: catalogQuery.isLoading,
-      isError: catalogQuery.isError,
-    };
+    return clientApi.integration.search.useQuery({ query, limit: 5 });
  },
 });
@@ -1,10 +0,0 @@
-import type { SearchMode } from "../../lib/mode";
-import { contextSpecificFallbackSearchGroup } from "../home/context-specific-group";
-
-export const assistantMode = {
-  mode: "assistant",
-  character: undefined,
-  label: (t) => t("search.modePicker.assistant.label"),
-  placeholder: (t) => t("search.modePicker.assistant.placeholder"),
-  groups: [contextSpecificFallbackSearchGroup],
-} satisfies SearchMode;
@@ -2,10 +2,10 @@

 import { Group, Stack, Switch, Text } from "@mantine/core";
 import type { DayOfWeek } from "@mantine/dates";
-import { IconChevronRight } from "@tabler/icons-react";
 import dayjs from "dayjs";
 import localeData from "dayjs/plugin/localeData";

+import { clientApi } from "@homarr/api/client";
 import { useSession } from "@homarr/auth/client";
 import type { ColorScheme } from "@homarr/definitions";
 import { visiblePreferenceDefinitions } from "@homarr/settings";
@@ -47,19 +47,15 @@ const BooleanRow = ({
  </Group>
 );

-const SelectRow = ({ label, Icon, valueLabel }: { label: string; Icon: TablerIcon; valueLabel?: string }) => (
+const SelectRow = ({ label, Icon, valueLabel }: { label: string; Icon: TablerIcon; valueLabel: string }) => (
  <Group mx="md" my="sm" wrap="nowrap" justify="space-between" w="100%">
    <Group wrap="nowrap" gap="sm">
      <Icon stroke={1.5} size={20} />
      <Text>{label}</Text>
    </Group>
-    {valueLabel ? (
-      <Text size="sm" c="dimmed">
-        {valueLabel}
-      </Text>
-    ) : (
-      <IconChevronRight aria-hidden size={16} />
-    )}
+    <Text size="sm" c="dimmed">
+      {valueLabel}
+    </Text>
  </Group>
 );

@@ -72,7 +68,7 @@ const LinkRow = ({ label, Icon }: { label: string; Icon: TablerIcon }) => (

 const SELECT_KINDS = new Set(["select", "searchEngine", "board"]);

-export const useSettingsActions = (_: Record<string, unknown>, query: string): SettingsAction[] => {
+const useSettingsActions = (_: Record<string, unknown>, query: string): SettingsAction[] => {
  const t = useI18n("search.mode.command.group.preferences.option");
  const tUserField = useI18n("user.field");
  const tColorScheme = useI18n("common.colorScheme.options");
@@ -81,13 +77,25 @@ export const useSettingsActions = (_: Record<string, unknown>, query: string): S
  const normalizedQuery = query.trim().toLowerCase();
  const preferences = useUserPreferences();

+  const boardsQuery = clientApi.board.getAllBoards.useQuery(undefined, { enabled: isAuthenticated });
+  const searchEnginesQuery = clientApi.searchEngine.getSelectable.useQuery(undefined, { enabled: isAuthenticated });
+
  const valueLabelResolvers: Record<string, () => string> = {
    colorScheme: () => tColorScheme(preferences.getPreference("colorScheme").value as ColorScheme),
    locale: () => {
      const val = preferences.getPreference("locale").value;
      return localeConfigurations[val as keyof typeof localeConfigurations]?.name ?? String(val);
    },
+    defaultSearchEngineId: () =>
+      searchEnginesQuery.data?.find((e) => e.value === preferences.getPreference("defaultSearchEngineId").value)
+        ?.label ?? t("searchEngine.none" as never),
    firstDayOfWeek: () => dayjs.weekdays(false)[preferences.getPreference("firstDayOfWeek").value as DayOfWeek] ?? "",
+    homeBoardId: () =>
+      boardsQuery.data?.find((b) => b.id === preferences.getPreference("homeBoardId").value)?.name ??
+      t("board.none" as never),
+    mobileHomeBoardId: () =>
+      boardsQuery.data?.find((b) => b.id === preferences.getPreference("mobileHomeBoardId").value)?.name ??
+      t("board.none" as never),
  };

  return visiblePreferenceDefinitions(isAuthenticated)
@@ -126,7 +134,9 @@ export const useSettingsActions = (_: Record<string, unknown>, query: string): S
        if (!children) return null;
        return {
          key: definition.key,
-          Component: () => <SelectRow label={label} Icon={Icon} valueLabel={valueLabelResolvers[definition.key]?.()} />,
+          Component: () => (
+            <SelectRow label={label} Icon={Icon} valueLabel={valueLabelResolvers[definition.key]?.() ?? ""} />
+          ),
          useInteraction: interaction.children(children),
        };
      }
@@ -7,7 +7,6 @@ import { useSpotlightContextActions } from "../home/context";
 export const contextSpecificActionsSearchGroups = createGroup<ContextSpecificItem>({
  title: (t) => t("search.mode.command.group.localCommand.title"),
  keyPath: "id",
-  source: { kind: "local" },
  Component(option) {
    const icon =
      typeof option.icon !== "string" ? (
@@ -36,8 +36,7 @@ type Command<TSearchInteraction extends SearchInteraction = SearchInteraction> =

 export const globalCommandGroup = createGroup<Command>({
  keyPath: "commandKey",
-  title: (t) => t("search.mode.command.group.globalCommand.title"),
-  source: { kind: "local" },
+  title: "Global commands",
  useInteraction: (option, query) => option.useInteraction(option, query),
  Component: ({ icon: Icon, name }) => (
    <Group px="md" py="sm">
@@ -4,9 +4,7 @@ import { globalCommandGroup } from "./global-group";
 import { preferencesGroup } from "../preferences/groups";

 export const commandMode = {
-  mode: "command",
+  modeKey: "command",
  character: ">",
-  label: (t) => t("search.modePicker.command.label"),
-  placeholder: (t) => t("search.modePicker.command.placeholder"),
-  groups: [contextSpecificActionsSearchGroups, globalCommandGroup, preferencesGroup],
+  groups: [contextSpecificActionsSearchGroups, preferencesGroup, globalCommandGroup],
 } satisfies SearchMode;
@@ -2,9 +2,7 @@ import type { SearchMode } from "../../lib/mode";
 import { searchEnginesSearchGroups } from "./search-engines-search-group";

 export const externalMode = {
-  mode: "external",
+  modeKey: "external",
  character: "!",
-  label: (t) => t("search.modePicker.external.label"),
-  placeholder: (t) => t("search.modePicker.external.placeholder"),
  groups: [searchEnginesSearchGroups],
 } satisfies SearchMode;
@@ -1,5 +1,7 @@
 import { Group, Image, Kbd, Stack, Text } from "@mantine/core";
+import { useDebouncedValue } from "@mantine/hooks";
 import { IconDownload, IconSearch } from "@tabler/icons-react";
+import { keepPreviousData } from "@tanstack/react-query";

 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
@@ -11,13 +13,11 @@ import { useSettings } from "@homarr/settings";
 import { useI18n } from "@homarr/translation/client";

 import { createChildrenOptions } from "../../lib/children";
-import { filterCatalog, useSearchEnginesCatalogQuery } from "../../lib/catalog";
 import { createGroup } from "../../lib/group";
 import type { inferSearchInteractionDefinition } from "../../lib/interaction";
 import { interaction } from "../../lib/interaction";
-import { useRemoteQuery } from "../../lib/remote-query";

-type SearchEngine = RouterOutputs["searchEngine"]["catalog"][number];
+type SearchEngine = RouterOutputs["searchEngine"]["search"][number];
 type FromIntegrationSearchResult = RouterOutputs["integration"]["searchInIntegration"][number];
 type DuckDuckGoBang = RouterOutputs["bangs"]["search"][number];

@@ -187,7 +187,7 @@ export const mediaRequestsChildrenOptions = createChildrenOptions<MediaRequestCh
    return (
      <Group mx="md" my="sm" wrap="nowrap">
        {options.result.image ? (
-          <Image src={options.result.image} alt="" w={35} h={50} fit="cover" radius={"md"} />
+          <Image src={options.result.image} w={35} h={50} fit="cover" radius={"md"} />
        ) : (
          <IconSearch stroke={1.5} size={35} />
        )}
@@ -206,12 +206,11 @@ export const mediaRequestsChildrenOptions = createChildrenOptions<MediaRequestCh

 export const searchEnginesChildrenOptions = createChildrenOptions<SearchEngine>({
  useActions: (searchEngine, query) => {
-    const remoteQuery = useRemoteQuery(query, "integration-search");
    const { data } = clientApi.integration.searchInIntegration.useQuery(
      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      { integrationId: searchEngine.integrationId!, query: remoteQuery.query },
+      { integrationId: searchEngine.integrationId!, query },
      {
-        enabled: remoteQuery.enabled && searchEngine.type === "fromIntegration" && searchEngine.integrationId !== null,
+        enabled: searchEngine.type === "fromIntegration" && searchEngine.integrationId !== null && query.length > 0,
      },
    );
    const { openSearchInNewTab } = useSettings();
@@ -245,7 +244,7 @@ export const searchEnginesChildrenOptions = createChildrenOptions<SearchEngine>(
        return (
          <Group mx="md" my="sm" wrap="nowrap">
            {searchResult.image ? (
-              <Image src={searchResult.image} alt="" w={35} h={50} fit="cover" radius={"md"} />
+              <Image src={searchResult.image} w={35} h={50} fit="cover" radius={"md"} />
            ) : (
              <IconSearch stroke={1.5} size={35} />
            )}
@@ -271,7 +270,7 @@ export const searchEnginesChildrenOptions = createChildrenOptions<SearchEngine>(
      <Stack mx="md" my="sm">
        <Text>{options.type === "generic" ? tChildren("detail.title") : tChildren("searchResults.title")}</Text>
        <Group>
-          <img height={24} width={24} src={options.iconUrl} alt="" />
+          <img height={24} width={24} src={options.iconUrl} alt={options.name} />
          <Text>{options.name}</Text>
        </Group>
      </Stack>
@@ -288,7 +287,7 @@ const parseBangQuery = (query: string) => {
  return { bangToken, searchText, locked };
 };

-export const buildSearchUrl = (template: string, query: string) => {
+const buildSearchUrl = (template: string, query: string) => {
  const encoded = encodeURIComponent(query);
  if (template.includes("{{{s}}}")) {
    return template.replaceAll("{{{s}}}", encoded);
@@ -297,23 +296,36 @@ export const buildSearchUrl = (template: string, query: string) => {
  return template.replaceAll("%s", encoded);
 };

-interface SearchEngineGroupOptions {
-  minimumLength: number;
-  showEmptyHint: boolean;
-  source: "focused" | "fallback";
-}
+export const searchEnginesSearchGroups = createGroup<ExternalOption>({
+  keyPath: "key",
+  title: (t) => t("common.entity.searchEngines"),
+  Component: (option) => {
+    if (option.kind === "hint") {
+      return (
+        <Group w="100%" wrap="nowrap" align="center" px="md" py="xs">
+          <IconSearch stroke={1.5} />
+          <Stack gap={0}>
+            <Text size="sm">{option.label}</Text>
+            {option.description ? (
+              <Text size="xs" c="gray.6">
+                {option.description}
+              </Text>
+            ) : null}
+          </Stack>
+        </Group>
+      );
+    }

-const createSearchEnginesSearchGroup = ({ minimumLength, showEmptyHint, source }: SearchEngineGroupOptions) =>
-  createGroup<ExternalOption>({
-    keyPath: "key",
-    title: (t) => t("common.entity.searchEngines"),
-    source: source === "focused" ? { kind: "remote", source: "search-engines" } : { kind: "fallback" },
-    Component: (option) => {
-      if (option.kind === "hint") {
-        return (
-          <Group w="100%" wrap="nowrap" align="center" px="md" py="xs">
-            <IconSearch stroke={1.5} />
-            <Stack gap={0}>
+    if (option.kind === "search") {
+      return (
+        <Group w="100%" wrap="nowrap" justify="space-between" align="center" px="md" py="xs">
+          <Group wrap="nowrap">
+            {option.iconUrl ? (
+              <img height={24} width={24} src={option.iconUrl} alt={option.label} />
+            ) : (
+              <IconSearch stroke={1.5} />
+            )}
+            <Stack gap={0} justify="center">
              <Text size="sm">{option.label}</Text>
              {option.description ? (
                <Text size="xs" c="gray.6">
@@ -322,61 +334,22 @@ const createSearchEnginesSearchGroup = ({ minimumLength, showEmptyHint, source }
              ) : null}
            </Stack>
          </Group>
-        );
-      }

-      if (option.kind === "search") {
-        return (
-          <Group w="100%" wrap="nowrap" justify="space-between" align="center" px="md" py="xs">
-            <Group wrap="nowrap">
-              {option.iconUrl ? (
-                <img height={24} width={24} src={option.iconUrl} alt="" />
-              ) : (
-                <IconSearch stroke={1.5} />
-              )}
-              <Stack gap={0} justify="center">
-                <Text size="sm">{option.label}</Text>
-                {option.description ? (
-                  <Text size="xs" c="gray.6">
-                    {option.description}
-                  </Text>
-                ) : null}
-              </Stack>
-            </Group>
+          <Kbd size="sm">!{option.bang}</Kbd>
+        </Group>
+      );
+    }

-            <Kbd size="sm">!{option.bang}</Kbd>
-          </Group>
-        );
-      }
-
-      if (option.kind === "engine") {
-        const { iconUrl, name, short, description } = option.engine;
-        return (
-          <Group w="100%" wrap="nowrap" justify="space-between" align="center" px="md" py="xs">
-            <Group wrap="nowrap">
-              <img height={24} width={24} src={iconUrl} alt="" />
-              <Stack gap={0} justify="center">
-                <Text size="sm">{name}</Text>
-                <Text size="xs" c="gray.6">
-                  {description}
-                </Text>
-              </Stack>
-            </Group>
-
-            <Kbd size="sm">!{short}</Kbd>
-          </Group>
-        );
-      }
-
-      const { s: name, t: short, d: domain } = option.bang;
+    if (option.kind === "engine") {
+      const { iconUrl, name, short, description } = option.engine;
      return (
        <Group w="100%" wrap="nowrap" justify="space-between" align="center" px="md" py="xs">
          <Group wrap="nowrap">
-            <IconSearch stroke={1.5} />
+            <img height={24} width={24} src={iconUrl} alt={name} />
            <Stack gap={0} justify="center">
              <Text size="sm">{name}</Text>
              <Text size="xs" c="gray.6">
-                {domain ?? "DuckDuckGo bang"}
+                {description}
              </Text>
            </Stack>
          </Group>
@@ -384,134 +357,138 @@ const createSearchEnginesSearchGroup = ({ minimumLength, showEmptyHint, source }
          <Kbd size="sm">!{short}</Kbd>
        </Group>
      );
-    },
-    useInteraction(option, query) {
-      const { openSearchInNewTab } = useSettings();
-      const { bangToken, searchText } = parseBangQuery(query);
+    }

-      if (option.kind === "search") {
-        return {
-          type: "link",
-          href: buildSearchUrl(option.urlTemplate, option.searchText),
-          newTab: openSearchInNewTab,
-        };
-      }
+    const { s: name, t: short, d: domain } = option.bang;
+    return (
+      <Group w="100%" wrap="nowrap" justify="space-between" align="center" px="md" py="xs">
+        <Group wrap="nowrap">
+          <IconSearch stroke={1.5} />
+          <Stack gap={0} justify="center">
+            <Text size="sm">{name}</Text>
+            <Text size="xs" c="gray.6">
+              {domain ?? "DuckDuckGo bang"}
+            </Text>
+          </Stack>
+        </Group>

-      if (option.kind === "engine") {
-        const nextBang = option.engine.short;
-        const nextQuery = `${`${nextBang} ${searchText}`.trimEnd()} `;
-        return { type: "setQuery", query: bangToken === nextBang && query.endsWith(" ") ? query : nextQuery };
-      }
+        <Kbd size="sm">!{short}</Kbd>
+      </Group>
+    );
+  },
+  useInteraction(option, query) {
+    const { openSearchInNewTab } = useSettings();
+    const { bangToken, searchText } = parseBangQuery(query);

-      if (option.kind === "ddg") {
-        const nextBang = option.bang.t;
-        const nextQuery = `${`${nextBang} ${searchText}`.trimEnd()} `;
-        return { type: "setQuery", query: bangToken === nextBang && query.endsWith(" ") ? query : nextQuery };
-      }
+    if (option.kind === "search") {
+      return {
+        type: "link",
+        href: buildSearchUrl(option.urlTemplate, option.searchText),
+        newTab: openSearchInNewTab,
+      };
+    }

-      return { type: "none" };
-    },
-    useQueryOptions(query) {
-      const tExternal = useI18n("search.mode.external.group.searchEngine");
-      const { ddgBangs } = useSettings();
-      const { bangToken, searchText, locked } = parseBangQuery(query);
-      const remoteQuery = useRemoteQuery(bangToken, "search-engines", { minimumLength });
-      const ddgQueryEnabled = remoteQuery.enabled && ddgBangs && remoteQuery.query.length >= 1;
-      const enginesQuery = useSearchEnginesCatalogQuery();
+    if (option.kind === "engine") {
+      const nextBang = option.engine.short;
+      const nextQuery = `${`${nextBang} ${searchText}`.trimEnd()} `;
+      return { type: "setQuery", query: bangToken === nextBang && query.endsWith(" ") ? query : nextQuery };
+    }

-      const ddgQuery = clientApi.bangs.search.useQuery(
-        { query: remoteQuery.query, limit: 10 },
-        {
-          enabled: ddgQueryEnabled,
-          placeholderData: (previousData) => previousData,
-        },
-      );
+    if (option.kind === "ddg") {
+      const nextBang = option.bang.t;
+      const nextQuery = `${`${nextBang} ${searchText}`.trimEnd()} `;
+      return { type: "setQuery", query: bangToken === nextBang && query.endsWith(" ") ? query : nextQuery };
+    }

-      const engineCatalog = enginesQuery.data ?? [];
-      const engineData = filterCatalog(engineCatalog, bangToken, (engine) => [engine.short, engine.name], 10);
-      const ddgData = ddgQueryEnabled && bangToken.length > 0
-        ? (ddgQuery.data ?? []).filter((bang) => bang.t.toLowerCase().startsWith(bangToken.toLowerCase()))
-        : [];
-      const isWaitingForDdgResults =
-        ddgBangs &&
-        bangToken.length > 0 &&
-        engineData.length === 0 &&
-        (remoteQuery.query !== bangToken || (ddgQueryEnabled && ddgQuery.isFetching && ddgData.length === 0));
-      const isLoading = enginesQuery.isLoading || isWaitingForDdgResults;
-      const isError = enginesQuery.isError || (ddgQuery.isError && ddgQueryEnabled && bangToken.length > 0);
+    return { type: "none" };
+  },
+  useQueryOptions(query) {
+    const tExternal = useI18n("search.mode.external.group.searchEngine");
+    const { ddgBangs } = useSettings();
+    const { bangToken, searchText, locked } = parseBangQuery(query);
+    const [debouncedBangToken] = useDebouncedValue(bangToken, 150);

-      const engineOptions = engineData.map(
-        (engine): ExternalOption => ({
-          key: `engine-${engine.short}`,
-          kind: "engine",
-          engine,
+    const enginesQuery = clientApi.searchEngine.search.useQuery(
+      { query: debouncedBangToken, limit: 10 },
+      { placeholderData: keepPreviousData },
+    );
+
+    const ddgQuery = clientApi.bangs.search.useQuery(
+      { query: debouncedBangToken, limit: 10 },
+      {
+        enabled: ddgBangs && debouncedBangToken.length >= 1,
+        placeholderData: keepPreviousData,
+      },
+    );
+
+    const isLoading = enginesQuery.isLoading || ddgQuery.isLoading;
+    const isError = enginesQuery.isError || ddgQuery.isError;
+
+    const engineOptions = (enginesQuery.data ?? []).map(
+      (engine): ExternalOption => ({
+        key: `engine-${engine.short}`,
+        kind: "engine",
+        engine,
+      }),
+    );
+
+    const ddgOptions = (ddgQuery.data ?? [])
+      .filter((bang) => !engineOptions.some((option) => option.kind === "engine" && option.engine.short === bang.t))
+      .map(
+        (bang): ExternalOption => ({
+          key: `ddg-${bang.t}`,
+          kind: "ddg",
+          bang,
        }),
      );

-      const ddgOptions = ddgData
-        .filter((bang) => !engineOptions.some((option) => option.kind === "engine" && option.engine.short === bang.t))
-        .map(
-          (bang): ExternalOption => ({
-            key: `ddg-${bang.t}`,
-            kind: "ddg",
-            bang,
-          }),
-        );
+    const searchActions: ExternalOption[] = [];
+    if (locked && bangToken.length > 0) {
+      const matchedEngine = (enginesQuery.data ?? []).find((engine) => engine.short === bangToken);
+      const matchedDdg = (ddgQuery.data ?? []).find((bang) => bang.t === bangToken);

-      const searchActions: ExternalOption[] = [];
-      if (locked && bangToken.length > 0) {
-        const matchedEngine = engineCatalog.find((engine) => engine.short === bangToken);
-        const matchedDdg = ddgData.find((bang) => bang.t === bangToken);
+      const label = matchedEngine?.name ?? matchedDdg?.s;
+      const iconUrl = matchedEngine?.iconUrl;
+      const urlTemplate = matchedEngine?.type === "generic" ? matchedEngine.urlTemplate : matchedDdg?.u;

-        const genericEngine = matchedEngine?.type === "generic" ? matchedEngine : undefined;
-        const label = genericEngine?.name ?? matchedDdg?.s;
-        const iconUrl = genericEngine?.iconUrl;
-        const urlTemplate = genericEngine?.urlTemplate ?? matchedDdg?.u;
-
-        if (label && urlTemplate) {
-          if (searchText.trim().length > 0) {
-            searchActions.push({
-              key: "search-action",
-              kind: "search",
-              label: tExternal("bang.searchWithQuery", {
-                query: searchText.trim(),
-                label,
-              }),
-              description: tExternal("bang.pressEnterToOpen"),
-              bang: bangToken,
-              iconUrl,
-              urlTemplate,
-              searchText: searchText.trim(),
-            });
-          } else {
-            searchActions.push({
-              key: "search-hint",
-              kind: "hint",
-              label: tExternal("bang.engineSelected", { label, bang: bangToken }),
-              description: tExternal("bang.typeQueryToContinue"),
-            });
-          }
+      if (label && urlTemplate) {
+        if (searchText.trim().length > 0) {
+          searchActions.push({
+            key: "search-action",
+            kind: "search",
+            label: tExternal("bang.searchWithQuery", {
+              query: searchText.trim(),
+              label,
+            }),
+            description: tExternal("bang.pressEnterToOpen"),
+            bang: bangToken,
+            iconUrl,
+            urlTemplate,
+            searchText: searchText.trim(),
+          });
+        } else {
+          searchActions.push({
+            key: "search-hint",
+            kind: "hint",
+            label: tExternal("bang.engineSelected", { label, bang: bangToken }),
+            description: tExternal("bang.typeQueryToContinue"),
+          });
        }
      }
-      if (showEmptyHint && bangToken.length === 0) {
-        searchActions.push({
-          key: "hint",
-          kind: "hint",
-          label: tExternal("bang.emptyBangHint"),
-          description: ddgBangs ? tExternal("tipDdgBangs") : undefined,
-        });
-      }
+    }
+    if (query.length === 0) {
+      searchActions.push({
+        key: "hint",
+        kind: "hint",
+        label: tExternal("bang.emptyBangHint"),
+        description: ddgBangs ? tExternal("tipDdgBangs") : undefined,
+      });
+    }

-      return {
-        isLoading,
-        isError,
-        data: [...searchActions, ...engineOptions, ...ddgOptions].slice(0, 10),
-      };
-    },
-  });
-
-export const searchEnginesSearchGroups = createSearchEnginesSearchGroup({
-  minimumLength: 0,
-  showEmptyHint: true,
-  source: "focused",
+    return {
+      isLoading,
+      isError,
+      data: [...searchActions, ...engineOptions, ...ddgOptions].slice(0, 10),
+    };
+  },
 });
@@ -0,0 +1,138 @@
+import { Group, Kbd, Text } from "@mantine/core";
+import {
+  IconBook2,
+  IconBrandDiscord,
+  IconBrandGithub,
+  IconLayoutDashboard,
+  IconSearch,
+  IconSettings,
+} from "@tabler/icons-react";
+
+import { useSession } from "@homarr/auth/client";
+import { createDocumentationLink } from "@homarr/definitions";
+import { useI18n } from "@homarr/translation/client";
+import type { TablerIcon } from "@homarr/ui";
+
+import { createGroup } from "../../lib/group";
+import { interaction } from "../../lib/interaction";
+import type { SearchMode } from "../../lib/mode";
+import { appIntegrationBoardMode } from "../app-integration-board";
+import { commandMode } from "../command";
+import { externalMode } from "../external";
+import { mediaMode } from "../media";
+import { pageMode } from "../page";
+import { preferencesGroup } from "../preferences/groups";
+import { userGroupMode } from "../user-group";
+
+type QuickLinkOption = {
+  key: string;
+  icon: TablerIcon;
+  name: string;
+  path: string;
+};
+
+export const useHomeEmptyGroups = () => {
+  const { data: session } = useSession();
+  const tPages = useI18n("search.mode.page.group.page.option");
+  const tHelp = useI18n("management.navbar.items.help.items");
+  const visibleSearchModes: SearchMode[] = [appIntegrationBoardMode, externalMode, mediaMode, commandMode, pageMode];
+
+  if (session?.user.permissions.includes("admin")) {
+    visibleSearchModes.unshift(userGroupMode);
+  }
+
+  return [
+    createGroup({
+      keyPath: "key",
+      title: () => "Quick links",
+      options: (() => {
+        const quickLinks: QuickLinkOption[] = [];
+
+        quickLinks.push({
+          key: "manageBoards",
+          icon: IconLayoutDashboard,
+          path: "/manage/boards",
+          name: tPages("manageBoard.label"),
+        });
+
+        if (session?.user.permissions.includes("admin")) {
+          quickLinks.push({
+            key: "manageSettings",
+            icon: IconSettings,
+            path: "/manage/settings",
+            name: tPages("manageSettings.label"),
+          });
+        }
+
+        if (session) {
+          quickLinks.push({
+            key: "manageSearchEngines",
+            icon: IconSearch,
+            path: "/manage/search-engines",
+            name: tPages("manageSearchEngine.label"),
+          });
+        }
+
+        return quickLinks;
+      })(),
+      Component: ({ name, icon: Icon }) => (
+        <Group px="md" py="xs" w="100%" wrap="nowrap" align="center">
+          <Icon stroke={1.5} />
+          <Text>{name}</Text>
+        </Group>
+      ),
+      filter: () => true,
+      useInteraction: interaction.link(({ path }) => ({ href: path })),
+    }),
+    createGroup({
+      keyPath: "modeKey",
+      title: (t) => t("search.mode.help.group.mode.title"),
+      options: visibleSearchModes.map(({ character, modeKey }) => ({ character, modeKey })),
+      Component: ({ modeKey, character }) => {
+        const t = useI18n(`search.mode.${modeKey}`);
+
+        return (
+          <Group px="md" py="xs" w="100%" wrap="nowrap" align="center" justify="space-between">
+            <Text>{t("help")}</Text>
+            {character && <Kbd size="sm">{character}</Kbd>}
+          </Group>
+        );
+      },
+      filter: () => true,
+      useInteraction: interaction.mode(({ modeKey }) => ({ mode: modeKey })),
+    }),
+    createGroup({
+      keyPath: "href",
+      title: (t) => t("management.navbar.items.help.label"),
+      useOptions() {
+        return [
+          {
+            href: createDocumentationLink("/docs/getting-started"),
+            icon: IconBook2,
+            label: tHelp("documentation"),
+          },
+          {
+            href: "https://github.com/homarr-labs/homarr/issues/new/choose",
+            icon: IconBrandGithub,
+            label: tHelp("submitIssue"),
+          },
+          {
+            href: "https://discord.com/invite/aCsmEV5RgA",
+            icon: IconBrandDiscord,
+            label: tHelp("discord"),
+          },
+        ];
+      },
+      Component: (props) => (
+        <Group px="md" py="xs" w="100%" wrap="nowrap" align="center">
+          <props.icon stroke={1.5} />
+          <Text>{props.label}</Text>
+        </Group>
+      ),
+      filter: () => true,
+      useInteraction: interaction.link(({ href }) => ({ href, newTab: true })),
+    }),
+  ] as const;
+};
+
+export const useHomeEmptyGroupsWithPreferences = () => [preferencesGroup, ...useHomeEmptyGroups()];
@@ -7,89 +7,39 @@ import { useSpotlightContextResults } from "./context";
 export const shouldShowContextSpecificResult = (query: string, option: ContextSpecificItem) => {
  if (option.alwaysVisible) return true;
  if (query.length === 0) return false;
-  const normalizedQuery = query.trim().toLowerCase();
-  const searchableValues = [option.name, option.description ?? "", ...(option.aliases ?? [])];
-  return searchableValues.some((value) => value.toLowerCase().includes(normalizedQuery));
-};
-
-const localResultSort = (query: string, [first, second]: [ContextSpecificItem, ContextSpecificItem]) => {
-  const normalizedQuery = query.trim().toLowerCase();
-  const score = (option: ContextSpecificItem) => {
-    const normalizedName = option.name.toLowerCase();
-    if (normalizedName === normalizedQuery) return 0;
-    if (normalizedName.startsWith(normalizedQuery)) return 1;
-    return 2;
-  };
-
-  return score(first) - score(second);
-};
-
-const renderContextSpecificItem = (option: ContextSpecificItem) => {
-  const icon =
-    typeof option.icon !== "string" ? (
-      <option.icon size={24} />
-    ) : (
-      <img width={24} height={24} src={option.icon} alt="" />
-    );
-
-  return (
-    <Group w="100%" wrap="nowrap" align="center" px="md" py="xs" opacity={option.unavailable ? 0.55 : 1}>
-      {icon}
-      <Stack gap={0}>
-        <Text>{option.name}</Text>
-        {option.description ? (
-          <Text size="xs" c="dimmed">
-            {option.description}
-          </Text>
-        ) : null}
-      </Stack>
-    </Group>
-  );
+  return option.name.toLowerCase().includes(query.toLowerCase());
 };

 export const contextSpecificSearchGroups = createGroup<ContextSpecificItem>({
  title: (t) => t("search.mode.home.group.local.title"),
  keyPath: "id",
-  source: { kind: "local" },
-  Component: renderContextSpecificItem,
+  Component(option) {
+    const icon =
+      typeof option.icon !== "string" ? (
+        <option.icon size={24} />
+      ) : (
+        <img width={24} height={24} src={option.icon} alt={option.name} />
+      );
+
+    return (
+      <Group w="100%" wrap="nowrap" align="center" px="md" py="xs" opacity={option.unavailable ? 0.55 : 1}>
+        {icon}
+        <Stack gap={0}>
+          <Text>{option.name}</Text>
+          {option.description && (
+            <Text size="xs" c="dimmed">
+              {option.description}
+            </Text>
+          )}
+        </Stack>
+      </Group>
+    );
+  },
  useInteraction(option, query) {
    return option.interaction(query);
  },
  filter: shouldShowContextSpecificResult,
-  sort: localResultSort,
  useOptions() {
-    return useSpotlightContextResults().filter((item) => item.placement !== "fallback");
-  },
-});
-
-export const contextSpecificAppsSearchGroup = createGroup<ContextSpecificItem>({
-  title: (t) => t("search.mode.home.group.local.title"),
-  keyPath: "id",
-  source: { kind: "local" },
-  Component: renderContextSpecificItem,
-  useInteraction(option, query) {
-    return option.interaction(query);
-  },
-  filter(query, option) {
-    return query.trim().length === 0 || shouldShowContextSpecificResult(query, option);
-  },
-  sort: localResultSort,
-  useOptions() {
-    return useSpotlightContextResults().filter((item) => item.placement !== "fallback");
-  },
-});
-
-export const contextSpecificFallbackSearchGroup = createGroup<ContextSpecificItem>({
-  title: (t) => t("search.modePicker.continueWith"),
-  keyPath: "id",
-  source: { kind: "fallback" },
-  Component: renderContextSpecificItem,
-  useInteraction(option, query) {
-    return option.interaction(query);
-  },
-  filter: shouldShowContextSpecificResult,
-  sort: localResultSort,
-  useOptions() {
-    return useSpotlightContextResults().filter((item) => item.placement === "fallback");
+    return useSpotlightContextResults();
  },
 });
@@ -11,13 +11,10 @@ export type ContextSpecificItem = {
  name: string;
  icon: TablerIcon | string;
  interaction: (query: string) => inferSearchInteractionDefinition<SearchInteraction>;
-  aliases?: string[];
-  placement?: "primary" | "fallback";
  disabled?: boolean;
  description?: string;
  unavailable?: boolean;
  alwaysVisible?: boolean;
-  dedupeKey?: string;
 };

 interface SpotlightContextProps {
@@ -63,22 +60,7 @@ const createSpotlightContext = (displayName: string) => {
      });
    }, []);

-    const items = useMemo(() => {
-      const uniqueItems: ContextSpecificItem[] = [];
-      const itemKeys = new Set<string>();
-
-      for (const registration of itemsMap.values()) {
-        for (const item of registration.items) {
-          const itemKey = item.dedupeKey ?? item.id;
-          if (itemKeys.has(itemKey)) continue;
-
-          itemKeys.add(itemKey);
-          uniqueItems.push(item);
-        }
-      }
-
-      return uniqueItems;
-    }, [itemsMap]);
+    const items = useMemo(() => Array.from(itemsMap.values()).flatMap(({ items }) => items), [itemsMap]);
    const itemsContext = useMemo(() => ({ items }), [items]);
    const registration = useMemo(() => ({ registerItems, unregisterItems }), [registerItems, unregisterItems]);

@@ -1,21 +1,19 @@
 import { Box, Group, Stack, Text } from "@mantine/core";
-import { IconSearchOff } from "@tabler/icons-react";
+import { IconSearch, IconSearchOff } from "@tabler/icons-react";

 import type { RouterOutputs } from "@homarr/api";
+import { clientApi } from "@homarr/api/client";
+import type { Session } from "@homarr/auth";
 import { useSession } from "@homarr/auth/client";
 import { useSettings } from "@homarr/settings";
 import type { TranslationFunction } from "@homarr/translation";
 import { useI18n } from "@homarr/translation/client";
 import type { TablerIcon } from "@homarr/ui";

-import { useSearchEnginesCatalogQuery } from "../../lib/catalog";
 import { createGroup } from "../../lib/group";
 import type { inferSearchInteractionDefinition, SearchInteraction } from "../../lib/interaction";
-import { buildSearchUrl } from "../external/search-engines-search-group";
+import { useFromIntegrationSearchInteraction } from "../external/search-engines-search-group";

-type SearchEngine = RouterOutputs["searchEngine"]["catalog"][number];
-
-// This has to be type so it can be interpreted as Record<string, unknown>.
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 type GroupItem = {
  id: string;
@@ -23,20 +21,19 @@ type GroupItem = {
  description?: string;
  icon: TablerIcon | string;
  disabled?: boolean;
-  interaction: inferSearchInteractionDefinition<SearchInteraction>;
+  useInteraction: (query: string) => inferSearchInteractionDefinition<SearchInteraction>;
 };

 export const homeSearchEngineGroup = createGroup<GroupItem>({
  title: (t) => t("search.mode.home.group.search.title"),
  keyPath: "id",
-  source: { kind: "fallback" },
  Component(item) {
    const icon =
      typeof item.icon !== "string" ? (
        <item.icon size={24} />
      ) : (
        <Box w={24} h={24}>
-          <img src={item.icon} alt="" style={{ maxWidth: 24 }} />
+          <img src={item.icon} alt={item.name} style={{ maxWidth: 24 }} />
        </Box>
      );

@@ -45,95 +42,121 @@ export const homeSearchEngineGroup = createGroup<GroupItem>({
        {icon}
        <Stack gap={0}>
          <Text>{item.name}</Text>
-          {item.description ? (
+          {item.description && (
            <Text c="gray.6" size="sm">
              {item.description}
            </Text>
-          ) : null}
+          )}
        </Stack>
      </Group>
    );
  },
-  useInteraction(item) {
-    return item.interaction;
+  useInteraction(item, query) {
+    return item.useInteraction(query);
+  },
+  filter() {
+    return true;
  },
  useQueryOptions(query) {
    const t = useI18n();
-    const { data: session } = useSession();
-    const { openSearchInNewTab } = useSettings();
-    const catalogQuery = useSearchEnginesCatalogQuery();
+    const { data: session, status } = useSession();
+    const { data: defaultSearchEngine, ...defaultSearchEngineQuery } =
+      clientApi.searchEngine.getDefaultSearchEngine.useQuery(undefined, {
+        enabled: status !== "loading",
+      });
+    const fromIntegrationEnabled = defaultSearchEngine?.type === "fromIntegration" && query.length > 0;
+    const { data: results, ...resultQuery } = clientApi.integration.searchInIntegration.useQuery(
+      {
+        query,
+        integrationId: defaultSearchEngine?.integrationId ?? "",
+      },
+      {
+        enabled: fromIntegrationEnabled,
+        select: (data) => data.slice(0, 5),
+      },
+    );

    return {
-      isLoading: catalogQuery.isLoading,
-      isError: catalogQuery.isError,
-      data: createSearchEntries(
-        catalogQuery.data ?? [],
-        session?.user.permissions.includes("search-engine-create") === true,
-        query,
-        openSearchInNewTab,
-        t,
-      ),
+      isLoading:
+        defaultSearchEngineQuery.isLoading || (resultQuery.isLoading && fromIntegrationEnabled) || status === "loading",
+      isError: defaultSearchEngineQuery.isError || (resultQuery.isError && fromIntegrationEnabled),
+      data: createDefaultSearchEntries(defaultSearchEngine, results, session, query, t),
    };
  },
 });

-const createSearchEntries = (
-  searchEngines: SearchEngine[],
-  canCreateSearchEngine: boolean,
+const createDefaultSearchEntries = (
+  defaultSearchEngine: RouterOutputs["searchEngine"]["getDefaultSearchEngine"] | null,
+  results: RouterOutputs["integration"]["searchInIntegration"] | undefined,
+  session: Session | null,
  query: string,
-  openInNewTab: boolean,
  t: TranslationFunction,
 ): GroupItem[] => {
-  if (searchEngines.length === 0) {
+  if (!session?.user && !defaultSearchEngine) return [];
+
+  if (!defaultSearchEngine) {
    return [
      {
-        id: "no-search-engines",
-        name: t("search.mode.home.group.search.option.no-engines.label"),
-        description: canCreateSearchEngine
-          ? t("search.mode.home.group.search.option.no-engines.descriptionCreate")
-          : t("search.mode.home.group.search.option.no-engines.descriptionUnavailable"),
+        id: "no-default",
+        name: t("search.mode.home.group.search.option.no-default.label"),
+        description: t("search.mode.home.group.search.option.no-default.description"),
        icon: IconSearchOff,
-        disabled: !canCreateSearchEngine,
-        interaction: canCreateSearchEngine ? { type: "link", href: "/manage/search-engines/new" } : { type: "none" },
+        useInteraction() {
+          return {
+            type: "link",
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            href: `/manage/users/${session!.user.id}/general`,
+          };
+        },
      },
    ];
  }

-  const normalizedQuery = query.trim();
-  return searchEngines.map((searchEngine) => {
-    const name =
-      normalizedQuery.length === 0
-        ? searchEngine.name
-        : t("search.mode.home.group.search.option.search.label", {
-            query: normalizedQuery,
-            name: searchEngine.name,
-          });
-
-    if (searchEngine.type === "generic") {
-      return {
-        id: `search-${searchEngine.id}`,
-        name,
-        description: searchEngine.description ?? undefined,
-        icon: searchEngine.iconUrl,
-        interaction: {
-          type: "link",
-          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          href: buildSearchUrl(searchEngine.urlTemplate!, normalizedQuery),
-          newTab: openInNewTab,
+  if (defaultSearchEngine.type === "generic") {
+    return [
+      {
+        id: "search",
+        name: t("search.mode.home.group.search.option.search.label", {
+          query,
+          name: defaultSearchEngine.name,
+        }),
+        icon: defaultSearchEngine.iconUrl,
+        useInteraction(query) {
+          const { openSearchInNewTab } = useSettings();
+          return {
+            type: "link",
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            href: defaultSearchEngine.urlTemplate!.replace("%s", query),
+            newTab: openSearchInNewTab,
+          };
        },
-      };
-    }
-
-    return {
-      id: `search-${searchEngine.id}`,
-      name,
-      description: searchEngine.description ?? undefined,
-      icon: searchEngine.iconUrl,
-      interaction: {
-        type: "mode",
-        mode: "external",
-        query: `${searchEngine.short} ${normalizedQuery}`.trimEnd(),
      },
-    };
-  });
+    ];
+  }
+
+  if (!results) {
+    return [
+      {
+        id: "from-integration",
+        name: defaultSearchEngine.name,
+        icon: defaultSearchEngine.iconUrl,
+        description: t("search.mode.home.group.search.option.from-integration.description"),
+        useInteraction() {
+          return {
+            type: "none",
+          };
+        },
+      },
+    ];
+  }
+
+  return results.map((result) => ({
+    id: `search-${result.id}`,
+    name: result.name,
+    description: result.text,
+    icon: result.image ?? IconSearch,
+    useInteraction() {
+      return useFromIntegrationSearchInteraction(defaultSearchEngine, result);
+    },
+  }));
 };
@@ -1,38 +1,10 @@
 import type { SearchMode } from "../../lib/mode";
-import { appIntegrationBoardMode } from "../app-integration-board";
-import { contextSpecificActionsSearchGroups } from "../command/context-specific-group";
-import { globalCommandGroup } from "../command/global-group";
-import { homeSearchEngineGroup } from "./home-search-engine-group";
-import {
-  contextSpecificAppsSearchGroup,
-  contextSpecificFallbackSearchGroup,
-  contextSpecificSearchGroups,
-} from "./context-specific-group";
-import { mediaFallbackGroup } from "../media/media-fallback-group";
-import { pagesSearchGroup } from "../page/pages-search-group";
 import { preferencesGroup } from "../preferences/groups";
-import { userGroupMode } from "../user-group";
+import { contextSpecificSearchGroups } from "./context-specific-group";
+import { homeSearchEngineGroup } from "./home-search-engine-group";

 export const homeMode = {
-  mode: "search",
-  character: "/",
-  label: (t) => t("search.modePicker.search.label"),
-  placeholder: (t) => t("search.modePicker.search.placeholder"),
-  useGroups() {
-    const appGroups = appIntegrationBoardMode.useGroups().filter((group) => group !== contextSpecificAppsSearchGroup);
-    const directoryGroups = userGroupMode.useGroups();
-
-    return [
-      contextSpecificSearchGroups,
-      pagesSearchGroup,
-      contextSpecificActionsSearchGroups,
-      globalCommandGroup,
-      preferencesGroup,
-      ...appGroups,
-      ...directoryGroups,
-      homeSearchEngineGroup,
-      contextSpecificFallbackSearchGroup,
-      mediaFallbackGroup,
-    ];
-  },
+  character: undefined,
+  modeKey: "home",
+  groups: [preferencesGroup, homeSearchEngineGroup, contextSpecificSearchGroups],
 } satisfies SearchMode;
@@ -1,19 +1,17 @@
 import { appIntegrationBoardMode } from "./app-integration-board";
-import { assistantMode } from "./assistant";
 import { commandMode } from "./command";
 import { externalMode } from "./external";
 import { homeMode } from "./home";
 import { mediaMode } from "./media";
-import { preferencesMode } from "./preferences";
+import { pageMode } from "./page";
 import { userGroupMode } from "./user-group";

 export const searchModes = [
-  homeMode,
-  appIntegrationBoardMode,
-  commandMode,
-  preferencesMode,
-  assistantMode,
-  externalMode,
-  mediaMode,
  userGroupMode,
+  appIntegrationBoardMode,
+  externalMode,
+  commandMode,
+  pageMode,
+  mediaMode,
+  homeMode,
 ] as const;
@@ -2,9 +2,7 @@ import type { SearchMode } from "../../lib/mode";
 import { mediaRequestSearchGroup } from "./media-request-search-group";

 export const mediaMode = {
-  mode: "media",
+  modeKey: "media",
  character: undefined,
-  label: (t) => t("search.modePicker.media.label"),
-  placeholder: (t) => t("search.modePicker.media.placeholder"),
  groups: [mediaRequestSearchGroup],
 } satisfies SearchMode;
@@ -1,87 +0,0 @@
-import { Group, Stack, Text } from "@mantine/core";
-import { IconMovie } from "@tabler/icons-react";
-
-import { clientApi } from "@homarr/api/client";
-import { useSession } from "@homarr/auth/client";
-import { useI18n } from "@homarr/translation/client";
-
-import { createGroup } from "../../lib/group";
-import { useRemoteQuery } from "../../lib/remote-query";
-
-type MediaFallbackOption = {
-  key: string;
-  label: string;
-  description: string;
-  query: string;
-  unavailable?: boolean;
-};
-
-/** Discovers whether media search is usable, but intentionally never performs a media search. */
-export const mediaFallbackGroup = createGroup<MediaFallbackOption>({
-  keyPath: "key",
-  title: (t) => t("search.modePicker.continueWith"),
-  source: { kind: "fallback" },
-  Component(option) {
-    return (
-      <Group w="100%" wrap="nowrap" align="center" px="md" py="xs" opacity={option.unavailable ? 0.5 : 1}>
-        <IconMovie stroke={1.5} />
-        <Stack gap={0}>
-          <Text>{option.label}</Text>
-          <Text size="xs" c="dimmed">
-            {option.description}
-          </Text>
-        </Stack>
-      </Group>
-    );
-  },
-  useInteraction(option) {
-    if (option.unavailable) return { type: "none" };
-    return { type: "mode", mode: "media", query: option.query };
-  },
-  useQueryOptions(query) {
-    const t = useI18n();
-    const remoteQuery = useRemoteQuery(query, "media");
-    const { data: session, status } = useSession();
-    const canDiscoverTargets = remoteQuery.enabled && Boolean(session?.user);
-    const targets = clientApi.integration.mediaRequestSearchTargets.useQuery(undefined, {
-      enabled: canDiscoverTargets,
-      staleTime: 60_000,
-    });
-
-    if (!remoteQuery.enabled) return { data: [], isLoading: false, isError: false };
-    if (status === "loading") return { data: [], isLoading: true, isError: false };
-    if (!session?.user) {
-      return {
-        data: [
-          {
-            key: "media-fallback",
-            label: t("search.modePicker.media.fallback", { query: remoteQuery.query }),
-            description: t("search.mode.media.action.search.disabled.signInRequired"),
-            query: remoteQuery.query,
-            unavailable: true,
-          },
-        ],
-        isLoading: false,
-        isError: false,
-      };
-    }
-    if (!targets.data) return { data: [], isLoading: targets.isLoading, isError: targets.isError };
-
-    const unavailable = targets.data.length === 0;
-    return {
-      isLoading: targets.isLoading,
-      isError: targets.isError,
-      data: [
-        {
-          key: "media-fallback",
-          label: t("search.modePicker.media.fallback", { query: remoteQuery.query }),
-          description: unavailable
-            ? t("search.mode.media.action.search.disabled.noIntegration")
-            : t("search.mode.media.action.search.description"),
-          query: remoteQuery.query,
-          unavailable,
-        },
-      ],
-    };
-  },
-});
@@ -1,17 +1,17 @@
 import { Badge, Group, Image, Stack, Text } from "@mantine/core";
+import { useDebouncedValue } from "@mantine/hooks";
 import { IconMovie, IconSearch } from "@tabler/icons-react";
+import { keepPreviousData } from "@tanstack/react-query";
 import { useAtomValue } from "jotai";

 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
-import { useSession } from "@homarr/auth/client";
 import { getIntegrationName } from "@homarr/definitions";
 import type { MediaAvailability } from "@homarr/integrations/types";
 import { mediaAvailabilityConfiguration } from "@homarr/integrations/types";
 import { useI18n } from "@homarr/translation/client";

 import { createGroup } from "../../lib/group";
-import { useRemoteQuery } from "../../lib/remote-query";
 import { mediaRequestSearchScopeAtom } from "../../spotlight-store";
 import { useMediaRequestSearchInteraction } from "../external/search-engines-search-group";

@@ -23,14 +23,7 @@ type MediaRequestSearchResult = RouterOutputs["integration"]["searchMediaRequest
 type MediaRequestSearchOption =
  | {
      key: string;
-      kind: "disabled";
-      label: string;
-      description: string;
-      unavailable: true;
-    }
-  | {
-      key: string;
-      kind: "hint";
+      kind: "disabled" | "hint";
      label: string;
      description: string;
    }
@@ -43,7 +36,6 @@ type MediaRequestSearchOption =
 export const mediaRequestSearchGroup = createGroup<MediaRequestSearchOption>({
  keyPath: "key",
  title: (t) => t("search.mode.media.group.title"),
-  source: { kind: "remote", source: "media" },
  Component(option) {
    const tMedia = useI18n("search.mode.media");

@@ -74,7 +66,7 @@ export const mediaRequestSearchGroup = createGroup<MediaRequestSearchOption>({
    return (
      <Group w="100%" wrap="nowrap" align="center" px="md" py="xs">
        {result.image ? (
-          <Image src={result.image} alt="" w={35} h={50} fit="cover" radius="md" />
+          <Image src={result.image} w={35} h={50} fit="cover" radius="md" />
        ) : (
          <IconSearch stroke={1.5} size={35} />
        )}
@@ -106,24 +98,21 @@ export const mediaRequestSearchGroup = createGroup<MediaRequestSearchOption>({
  useQueryOptions(query) {
    const tMedia = useI18n("search.mode.media");
    const scope = useAtomValue(mediaRequestSearchScopeAtom);
-    const remoteQuery = useRemoteQuery(query, "media");
-    const { data: session, status } = useSession();
-    const targetsQuery = clientApi.integration.mediaRequestSearchTargets.useQuery(undefined, {
-      enabled: status !== "loading" && Boolean(session?.user),
-      staleTime: 60_000,
-    });
+    const [debouncedQuery] = useDebouncedValue(query.trim(), 150);
+    const targetsQuery = clientApi.integration.mediaRequestSearchTargets.useQuery();

    const scopedTargets = (targetsQuery.data ?? []).filter((target) =>
      scope.integrationIds ? scope.integrationIds.includes(target.id) : true,
    );
    const hasScopedTargets = scopedTargets.length > 0;
-    const shouldSearch = remoteQuery.enabled && hasScopedTargets;
+    const shouldSearch = debouncedQuery.length > 0 && hasScopedTargets;
    const integrationIds = scope.integrationIds ? scopedTargets.map((target) => target.id) : undefined;

    const resultsQuery = clientApi.integration.searchMediaRequests.useQuery(
-      { query: remoteQuery.query, integrationIds },
+      { query: debouncedQuery, integrationIds },
      {
        enabled: shouldSearch,
+        placeholderData: keepPreviousData,
        select: (data) => data.slice(0, 10),
      },
    );
@@ -131,26 +120,6 @@ export const mediaRequestSearchGroup = createGroup<MediaRequestSearchOption>({
    const isLoading = targetsQuery.isLoading || (shouldSearch && resultsQuery.isLoading);
    const isError = targetsQuery.isError || (shouldSearch && resultsQuery.isError);

-    if (status === "loading") {
-      return { data: [], isLoading: true, isError: false };
-    }
-
-    if (!session?.user) {
-      return {
-        data: [
-          {
-            key: "disabled",
-            kind: "disabled",
-            label: tMedia("action.search.label"),
-            description: tMedia("action.search.disabled.signInRequired"),
-            unavailable: true,
-          },
-        ],
-        isLoading: false,
-        isError: false,
-      };
-    }
-
    if (!targetsQuery.data) {
      return {
        isLoading,
@@ -171,13 +140,12 @@ export const mediaRequestSearchGroup = createGroup<MediaRequestSearchOption>({
            description: scope.integrationIds
              ? tMedia("action.search.disabled.scoped")
              : tMedia("action.search.disabled.noIntegration"),
-            unavailable: true,
          },
        ],
      };
    }

-    if (!remoteQuery.enabled) {
+    if (debouncedQuery.length === 0) {
      return {
        isLoading,
        isError,
@@ -0,0 +1,8 @@
+import type { SearchMode } from "../../lib/mode";
+import { pagesSearchGroup } from "./pages-search-group";
+
+export const pageMode = {
+  modeKey: "page",
+  character: "/",
+  groups: [pagesSearchGroup],
+} satisfies SearchMode;
@@ -30,7 +30,6 @@ export const pagesSearchGroup = createGroup<{
 }>({
  keyPath: "path",
  title: (t) => t("search.mode.page.group.page.title"),
-  source: { kind: "local" },
  Component: ({ name, icon: Icon }) => (
    <Group px="md" py="sm">
      <Icon stroke={1.5} />
@@ -1,22 +1,90 @@
+import { Group, Text } from "@mantine/core";
+import { IconSettings } from "@tabler/icons-react";
+
+import { useSession } from "@homarr/auth/client";
+import { colorSchemes } from "@homarr/definitions";
+import type { UserPreferenceKey } from "@homarr/settings";
+import { visiblePreferenceDefinitions } from "@homarr/settings";
+import { useI18n } from "@homarr/translation/client";
+
 import { createGroup } from "../../lib/group";
-import type { ChildrenAction } from "../../lib/children";
-import { useSettingsActions } from "../command/children/preferences/settings-children";
+import {
+  preferenceChildrenOptionsByKey,
+  preferenceIcons,
+  userFieldPreferenceLabels,
+} from "../../preferences/preference-registry";
+import { settingsChildrenOptions } from "../command/children/preferences/settings-children";

-type PreferenceAction = ChildrenAction<Record<string, unknown>>;
+type PreferencesGroupOption =
+  | { key: "settings"; preferenceKey: null }
+  | { key: UserPreferenceKey; preferenceKey: UserPreferenceKey };

-/** Preferences are normal command-menu actions, not a gateway into another hidden list. */
-export const preferencesGroup = createGroup<PreferenceAction>({
+const settingsOption: PreferencesGroupOption = { key: "settings", preferenceKey: null };
+
+export const preferencesGroup = createGroup<PreferencesGroupOption>({
  keyPath: "key",
  title: (t) => t("search.mode.command.group.preferences.title"),
-  source: { kind: "local" },
  useOptions(query) {
-    return useSettingsActions({}, query);
+    const t = useI18n();
+    const tColorScheme = useI18n("common.colorScheme.options");
+    const tUserField = useI18n("user.field");
+    const { data: session } = useSession();
+    const definitions = visiblePreferenceDefinitions(Boolean(session?.user));
+    const q = query.trim().toLowerCase();
+
+    if (q.length === 0) return [settingsOption];
+
+    const matching = definitions.flatMap((def): PreferencesGroupOption[] => {
+      if (!preferenceChildrenOptionsByKey[def.key]) return [];
+      const userFieldKey = userFieldPreferenceLabels[def.key];
+      const label = userFieldKey
+        ? tUserField(`${userFieldKey}.label` as never)
+        : t(`search.mode.command.group.preferences.option.${def.key}.label` as never);
+      const searchValues = [
+        label,
+        ...def.aliases,
+        ...(def.key === "colorScheme" ? colorSchemes.map((s) => tColorScheme(s)) : []),
+      ];
+      if (!searchValues.some((v) => v.toLowerCase().includes(q))) return [];
+      return [{ key: def.key, preferenceKey: def.key }];
+    });
+
+    if (matching.length > 0) return matching;
+
+    const allSearchValues = [
+      t("search.mode.command.group.preferences.title"),
+      ...definitions.flatMap((d) => d.aliases),
+    ];
+    return allSearchValues.some((v) => v.toLowerCase().includes(q)) ? [settingsOption] : [];
  },
-  Component(option) {
-    return <option.Component />;
-  },
-  useInteraction(option, query) {
-    return option.useInteraction({}, query);
+  Component: (option) => {
+    const t = useI18n("search.mode.command.group.preferences");
+    const tOption = useI18n("search.mode.command.group.preferences.option");
+    const tUserField = useI18n("user.field");
+    const Icon = option.preferenceKey
+      ? preferenceIcons[option.preferenceKey as keyof typeof preferenceIcons]
+      : IconSettings;
+    let label = t("title");
+    if (option.preferenceKey) {
+      const userFieldKey = userFieldPreferenceLabels[option.preferenceKey];
+      label = userFieldKey
+        ? tUserField(`${userFieldKey}.label` as never)
+        : tOption(`${option.preferenceKey}.label` as never);
+    }
+
+    return (
+      <Group px="md" py="sm" wrap="nowrap" gap="sm">
+        <Icon stroke={1.5} />
+        <Text>{label}</Text>
+      </Group>
+    );
  },
  filter: () => true,
+  useInteraction: (option) => ({
+    type: "children",
+    ...(option.preferenceKey
+      ? (preferenceChildrenOptionsByKey[option.preferenceKey as keyof typeof preferenceChildrenOptionsByKey]?.({}) ??
+        settingsChildrenOptions({}))
+      : settingsChildrenOptions({})),
+  }),
 });
@@ -1,10 +0,0 @@
-import type { SearchMode } from "../../lib/mode";
-import { preferencesGroup } from "./groups";
-
-export const preferencesMode = {
-  mode: "preferences",
-  character: "?",
-  label: (t) => t("search.modePicker.preferences.label"),
-  placeholder: (t) => t("search.modePicker.preferences.placeholder"),
-  groups: [preferencesGroup],
-} satisfies SearchMode;
@@ -7,7 +7,6 @@ import { useI18n } from "@homarr/translation/client";
 import { createChildrenOptions } from "../../lib/children";
 import { createGroup } from "../../lib/group";
 import { interaction } from "../../lib/interaction";
-import { useRemoteQuery } from "../../lib/remote-query";

 // This has to be type so it can be interpreted as Record<string, unknown>.
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
@@ -72,7 +71,6 @@ const groupChildrenOptions = createChildrenOptions<Group>({
 export const groupsSearchGroup = createGroup<Group>({
  keyPath: "id",
  title: (t) => t("common.entity.groups"),
-  source: { kind: "remote", source: "groups" },
  Component: ({ name }) => (
    <Group px="md" py="sm">
      <Text>{name}</Text>
@@ -80,7 +78,6 @@ export const groupsSearchGroup = createGroup<Group>({
  ),
  useInteraction: interaction.children(groupChildrenOptions),
  useQueryOptions(query) {
-    const remoteQuery = useRemoteQuery(query, "groups");
-    return clientApi.group.search.useQuery({ query: remoteQuery.query, limit: 8 }, { enabled: remoteQuery.enabled });
+    return clientApi.group.search.useQuery({ query, limit: 5 });
  },
 });
@@ -1,17 +1,9 @@
-import { useSession } from "@homarr/auth/client";
-
 import type { SearchMode } from "../../lib/mode";
 import { groupsSearchGroup } from "./groups-search-group";
 import { usersSearchGroup } from "./users-search-group";

 export const userGroupMode = {
-  mode: "userGroup",
+  modeKey: "userGroup",
  character: "@",
-  label: (t) => t("search.modePicker.userGroup.label"),
-  placeholder: (t) => t("search.modePicker.userGroup.placeholder"),
-  useGroups() {
-    const { data: session } = useSession();
-    if (!session?.user.permissions.includes("admin")) return [];
-    return [usersSearchGroup, groupsSearchGroup];
-  },
+  groups: [usersSearchGroup, groupsSearchGroup],
 } satisfies SearchMode;