chore: remove paseo worktree config

fix(cli): resolve PR review feedback and improve command execution
docs(cli): add local harness agent skill
2026-08-21 17:36:44 +02:00 · 2026-08-21 17:01:29 +02:00 · 2026-08-21 16:23:18 +02:00 · 2026-08-21 16:21:41 +02:00 · 2026-08-21 15:40:04 +02:00
1014 changed files with 15705 additions and 36607 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."
@@ -40,7 +40,7 @@ homarr/
 │   ├── db/              # Drizzle schema (3 DB drivers), migrations, queries
 │   ├── core/            # Env validation, DB/Redis driver factories, logging
 │   ├── definitions/     # Domain enums: WidgetKind, IntegrationKind, permissions
-│   ├── widgets/         # Dashboard widget definitions, components, and lazy registry
+│   ├── widgets/         # All 39 dashboard widgets (definitions + components)
 │   ├── integrations/    # Integration classes (HTTP clients to external apps)
 │   ├── redis/           # Redis pub/sub channels, caching abstractions
 │   ├── translation/     # next-intl setup, locale configs, lang JSON files
@@ -118,15 +118,11 @@ Selected at runtime via `DB_DRIVER` env (`better-sqlite3` | `mysql2` | `node-pos

 ### Widget System

-Widget kinds live in `packages/definitions/src/widget.ts`. Integration selection and authorization metadata lives in
-`packages/definitions/src/widget-integration-map.ts`. Each widget module exports a typed `definition` and
-`componentLoader` created with `createWidgetDefinition(...).withDynamicImport(...)`.
-
-Register widgets in all three explicit maps in `packages/widgets/src/registry.ts`: the type-only module map, literal
-module loaders, and literal component loaders. The two runtime loader maps are deliberately separate so
-`packages/widgets/src/manifest.ts` can request a widget's definition chunk and component chunk in parallel while
-keeping every lazy import statically discoverable by Next.js. The manifest owns promise caching and clears rejected
-entries so later loads can retry. Do not restore an eager root `widgetImports` map.
+Widgets are registered in `packages/widgets/src/index.tsx` as `widgetImports` (must satisfy `Record<WidgetKind, ...>`). Each widget:
+- Has a `definition` created via `createWidgetDefinition(kind, { icon, createOptions, supportedIntegrations? })`
+- Uses `optionsBuilder.from(factory => ({ ... }))` for typed options
+- Loads dynamically via `next/dynamic`
+- Fetches data via tRPC client hooks (backed by cron job caches)

 ### Integration System

@@ -320,12 +320,8 @@ jobs:

  publish-preview:
    name: Publish multi-platform preview image
-    needs: [container, preview-amd64, preview-arm64]
+    needs: [preview-amd64, preview-arm64]
    if: |
-      !cancelled() &&
-      needs.container.result == 'success' &&
-      needs.preview-amd64.result == 'success' &&
-      needs.preview-arm64.result == 'success' &&
      (
        (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) ||
        (github.event_name == 'push' && github.ref == 'refs/heads/release/v2') ||
@@ -379,6 +375,9 @@ jobs:
          ARM64_DIGEST: ${{ needs.preview-arm64.outputs.digest }}
        run: |
          tags=(-t "${PREVIEW_IMAGE}:${PREVIEW_TAG}")
+          if [[ "${GITHUB_EVENT_NAME}" == "push" && "${GITHUB_REF}" == "refs/heads/release/v2" ]]; then
+            tags+=(-t "${PREVIEW_IMAGE}:pr-6545")
+          fi
          docker buildx imagetools create "${tags[@]}" \
            "${PREVIEW_IMAGE}@${AMD64_DIGEST}" \
            "${PREVIEW_IMAGE}@${ARM64_DIGEST}"
@@ -387,6 +386,9 @@ jobs:
        if: "!env.ACT"
        run: |
          tags=("${PREVIEW_TAG}")
+          if [[ "${GITHUB_EVENT_NAME}" == "push" && "${GITHUB_REF}" == "refs/heads/release/v2" ]]; then
+            tags+=("pr-6545")
+          fi
          for tag in "${tags[@]}"; do
            image="${PREVIEW_IMAGE}:${tag}"
            manifest="$(docker buildx imagetools inspect "$image" --raw)"
@@ -433,14 +435,6 @@ jobs:
              core.info(`No package version found with tag "${tag}"`);
              return;
            }
-            const targetTags = target.metadata?.container?.tags ?? [];
-            const extraTags = targetTags.filter((targetTag) => targetTag !== tag);
-            if (extraTags.length > 0) {
-              core.setFailed(
-                `Package version ${target.id} also carries tag(s) ${extraTags.map((targetTag) => `"${targetTag}"`).join(", ")}; refusing cleanup.`,
-              );
-              return;
-            }
            await github.rest.packages.deletePackageVersionForOrg({
              package_type: "container",
              package_name: packageName,
@@ -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",
@@ -36,8 +36,6 @@ pnpm cli harness setup feature-board

 The command builds `homarr:feature-board`, starts a container with a persistent data volume, enables demo mode, and keeps demo mutations writable (`DEMO_READ_ONLY=false`). Docker assigns a free host port by default; use the URL printed by the command or query it later:

-The demo board includes every widget kind. Integration-backed widgets use the bundled mock integration; media widgets use public stock assets.
-
 ```sh
 pnpm cli harness port feature-board
 ```
@@ -1,102 +0,0 @@
---
-title: Widgets and integrations
-tags:
-  - Developer
-  - Technical documentation
-  - Widgets
-  - Integrations
-sidebar_position: 2
---
-
-Homarr keeps feature registration explicit and typed. Feature registration has no generator or generated registry.
-A new feature is available when its typed metadata and lazy loader are registered.
-
-## Add a widget
-
-Keep the UI, options, helpers, and tests together in `packages/widgets/src/<widget>/`. The usual folder only needs an
-`index.ts` definition and a lazily imported `component.tsx`; complex widgets can add local files as needed.
-
-1. Add the stable kind to `packages/definitions/src/widget.ts` and its documentation slug to the direct typed map in
-   `packages/definitions/src/docs/widget-doc-slugs.ts`.
-2. Export `definition` and `componentLoader` from `packages/widgets/src/<widget>/index.ts` with
-   `createWidgetDefinition`. The local definition owns its icon, query keys, refresh interval, options, matchers, and
-   errors. Keep the component behind `withDynamicImport` so adding a widget does not load it on every dashboard.
-3. For an integration-backed widget, add its integration kinds and selection rules once to
-   `packages/definitions/src/widget-integration-map.ts`, then spread `getWidgetIntegrationConfig(kind)` into the local
-   definition. This server-safe config is also the API authorization boundary, avoiding a package cycle without
-   duplicating widget metadata.
-4. Register the widget in both explicit literal loader maps and the type-only module map in
-   `packages/widgets/src/registry.ts`, then add its icon to `packages/ui/src/widget-icons.ts`. The module and component
-   loaders must both use literal import paths. Keeping them separate lets a cold widget load request its definition
-   and component chunks in parallel; the type-only map preserves exact option and component inference. Keep all three
-   maps in the same order so drift is obvious in review.
-5. If the widget needs server data, add its tRPC router under `packages/api/src/router/widgets/` and add its explicit
-   lazy import to `packages/api/src/router/widgets/index.ts`. Keep upstream requests and Redis response caching in
-   `@homarr/request-handler`. Use the widget integration middleware for integration-backed procedures.
-6. Add canonical documentation in `apps/docs/docs/widgets/<slug>/`.
-
-Weather is the small integration-free example. Downloads shows integration selection, polling, server caching,
-mutations, partial upstream failures, and a larger options surface.
-
-## Add an integration
-
-Keep the HTTP client and its capability-specific types in `packages/integrations/src/<integration>/`.
-
-1. Add the typed definition to `packages/definitions/src/integration.ts`, including credential alternatives,
-   categories, documentation slug, ports, Docker aliases, and onboarding metadata when relevant.
-2. Add an explicit lazy creator to `packages/integrations/src/base/creator.ts`. The literal import keeps the
-   implementation out of the initial server bundle and makes the registration easy to find.
-3. Implement only the interfaces required by the widgets that use the service.
-4. Add canonical documentation in `apps/docs/docs/integrations/<slug>/`. Its `index.ts` must satisfy
-   `IntegrationDefinition` so invalid metadata fails type checking without widening the object. Use a type-only import
-   and `satisfies IntegrationDefinition`; do not cast the object.
-
-Beszel is a compact example with several widgets sharing one integration client.
-
-## Write user documentation
-
-Write for technically capable self-hosters. Keep each page short and operational.
-
- Start with one sentence describing what the integration or widget adds to Homarr.
- Include prerequisites, credentials, permissions, destructive actions, and non-obvious limits only when they matter.
- Use numbered steps only when order matters. Prefer the exact UI labels a user must select.
- Do not add marketing, implementation history, architecture internals, or explanations of basic self-hosting concepts.
- End when the user can configure and verify the feature; do not repeat the same information in a summary.
-
-The usual page needs only an introduction and a `Configuration` section. Add `Notes` or `Troubleshooting` only for
-real caveats.
-
-## Data and errors
-
- TanStack Query owns browser caching and refresh behavior. Redis owns shared server response caching for bounded key
-  spaces. Public handlers whose keys come from arbitrary URLs, domains, symbols, or coordinates stay in the bounded
-  process-local cache.
- Cache raw service responses, never authorization decisions or decrypted credentials. Integration-backed cache keys
-  include keyed credential fingerprints and the complete integration identity, and are invalidated after mutations.
-  The fingerprints change with credentials without exposing their values in Redis keys.
- Give upstream requests a finite deadline and pass the request handler's `AbortSignal` into clients that support it.
-  Admission is bounded per handler. Request deduplication and distributed lock ownership remain active until the
-  upstream settles or a bounded cleanup grace expires, while unresolved upstream work stays separately capped.
- Keep validation and authorization on the server. Client-side checks improve UX but do not replace tRPC guards.
- Use the shared logger with safe identifiers, operation names, duration, and the original error cause. Never log
-  secrets or full upstream payloads.
- Multi-integration reads should return successful providers when one service fails and surface a clear error when all
-  providers fail.
-
-Registration files intentionally contain boring, explicit imports. This small amount of repetition preserves exact
-TypeScript inference, gives Next.js discoverable lazy chunks, and keeps Ctrl+click navigation reliable.
-
-## Registry imports
-
-Use `@homarr/widgets/manifest` to load registered widgets. `loadWidgetDefinition` is the metadata-only path;
-`loadWidgetComponent` loads only the UI module; and `loadWidgetResources` requests both paths in parallel. These
-loaders cache in-flight and successful promises and remove rejected promises so a later request can retry.
-
-The former root `widgetImports` and `loadWidgetDynamic` exports are intentionally not compatibility aliases.
-`widgetImports` synchronously imported every widget module, and `loadWidgetDynamic` depended on that eager map.
-Restoring them at the package root would defeat lazy definition chunks or add client-only runtime dependencies to
-every root consumer. Migrate metadata consumers to `loadWidgetDefinition`, renderers to `loadWidgetResources`, and
-type-only registry consumers from the removed internal `WidgetImportRecord` helper to the root `WidgetImports` type.
-
-`@homarr/widgets/catalog` remains as a deprecated compatibility subpath for `widgetCatalogIcons`. New imports should
-use `@homarr/ui/widget-icons`, which is the canonical server-safe icon catalog.
@@ -6,34 +6,19 @@ tags:

 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` + `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.
+| Shortcut                                        | Description                                                                                                                |
+| ----------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------- |
+| `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                                                                                          |
+| `Shift` + `Enter` on a supported widget         | Opens its advanced view 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 |

 ## Widget advanced view

-Supported widgets open a temporary advanced view when you hold `Shift` over them for 500 ms. Hold `Shift` plus `Ctrl`
-on Windows/Linux or `Cmd` on macOS over the widget to keep the advanced view open, or use its menu.
+Supported widgets open a temporary advanced view when you hold `Shift` over them for 500 ms. Focus a widget and press
+`Shift` + `Enter`, or use its menu, to keep the advanced view open.

 ## Board editing

@@ -55,7 +55,7 @@ The studio keeps related choices together:
 2. **Discover** checks the actual database, Docker-compatible sockets, Kubernetes configuration, Workshop, and Assistant capabilities. Unavailable sources never block manual setup.
 3. **Connect** shows detected integrations and apps first, identifying whether each app came from an explicit [`homarr.*` or Homepage Docker label](/docs/integrations/docker-labels) or image matching. Select several integrations and apps at once, review every URL, and use the service-specific link to open its API-key settings when one is available. If a container has no published port or URL label, add its HTTP or HTTPS address before importing it.
 4. **Board** previews the Base layout, colors, widget radius, sidebars, selected apps, and widgets inferred from integrations or Docker labels. Choose 8 columns for a focused board, 10 for a balanced board, 12 for a wide board, or use the slider for a custom width up to 24 columns. Homarr still creates and reflows the protected Mobile layout automatically. A fast setup adds the integration-free Clock, Weather, and Bookmarks starter widgets.
-5. **Extend** explains and optionally configures Assistant, the community Workshop, and the separate Homarr MCP endpoint.
+5. **Extend** explains and optionally configures Homarr Assistant, the community Workshop, and the separate Homarr MCP endpoint.
 6. **Review** tests the selected connections, then saves integrations, apps, widgets, settings, and the exact first board together. If any part fails, the database changes are rolled back and your form stays available to correct.

 Docker discovery reports each configured host separately. Results from reachable hosts remain selectable if another socket
@@ -132,8 +132,8 @@ Here you have the following options in the header:
 - **Search**: Here you can search for data. You can search for integrations, boards, actions, sites and much more. Some actions may be context dependent (eg. will only show when certain widgets are on your page)
 - **Edit board**: Clicking this button will toggle edit mode. In this mode you can edit the contents of your board.
 - **Settings**: Clicking this button will redirect you to a settings page where you can adjust the board settings (page title, colors, ...).
- **Profile**: This avatar will be visible on every page. Its menu includes the board switcher; press `Shift+C` to open
-  it directly. The current board is left out of the results.
+- **Board switcher**: Use this button to open another board that you can access.
+- **Profile**: This avatar will be visible on every page. Clicking it will show a menu with actions.

 When entering the edit mode, you'll get some additional buttons to work with:

@@ -151,7 +151,7 @@ When entering the edit mode, you'll get some additional buttons to work with:

 Outside edit mode, right-click a widget for its live status, refresh, settings, quick options, and supported actions.
 Hold `Shift` while hovering a widget that supports advanced view to expand it in place while the rest of the board
-stays visible but dimmed. Release `Shift` to close it. Hold `Shift` plus `Ctrl` on Windows/Linux or `Cmd` on macOS to
+stays visible but dimmed. Release `Shift` to close it. You can also focus that widget and press `Shift` + `Enter` to
 keep its advanced view open until you close it. Widgets without a distinct advanced experience adapt in place.

 To continue, click **New item** in the add-content menu. New content is placed at the first available position on the main
@@ -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.
@@ -373,7 +369,7 @@ Each page highlights the list view and the create action so you know where to fi

 ### Board tour

-When you first open a board, a tour highlights the board header elements: search, edit mode, settings, and the user menu.
+When you first open a board, a tour highlights the board header elements: search, edit mode, settings, board switcher, and user menu.

 ### Tour controls

@@ -1,9 +1,9 @@
-import type { IntegrationDefinition } from "@site/src/types";
+import { IntegrationDefinition } from "@site/src/types";

-export const beszelIntegration = {
+export const beszelIntegration: IntegrationDefinition = {
  name: "Beszel",
  description:
    "Beszel is a lightweight server monitoring platform with Docker stats, historical data, and alert functions.",
  iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/beszel.svg",
  path: "../../integrations/beszel",
-} satisfies IntegrationDefinition;
+};
@@ -29,9 +29,6 @@ Alternatively, you can [open the full interactive API reference](/api-reference)
 Many endpoints will require you to authenticate. At the top of the API reference, you'll find a button to authenticate yourself with an API key.
 You can obtain API keys from the "Authentication" tab at the top of the page.
 API keys will not expire and can be used indefinitely.
-When you create a key, its one-time value is shown inline above the key table. Copy it before closing the notice; the
-creation action remains disabled until the value has been acknowledged. Deletion uses a two-click inline confirmation
-instead of opening a separate dialog.

 ### API Key Format

@@ -113,13 +110,8 @@ The OpenAPI and MCP APIs include board management endpoints for common automatio
 - Set desktop and mobile home boards for the current user
 - Configure global board defaults such as public home boards and status behavior

-Creating, duplicating, or reconfiguring a widget validates its integration selection on the server. The caller needs
-use access for each newly linked integration; unchanged links remain editable through normal board permissions.
-
 Board layout responses identify each layout with a `mobile`, `base`, or `custom` role. Mobile and Base are protected. Layout-saving clients must preserve existing roles, keep Mobile at breakpoint `0`, keep Base as the highest breakpoint, and use unique custom breakpoints between them. The layout save operation returns the canonical saved layouts, including server-generated IDs for new custom layouts. A non-Base layout can be regenerated from Base with the protected reset operation.

-The internal `board.getManageOverview` tRPC query returns compact board previews limited to 12 layout rows by default. Callers may provide `previewRowLimit` from 1 through 48; `fullPreview: true` requests the server's 48-row maximum.
-
 Use the interactive API reference to inspect the exact request body for each endpoint under the `boards` and `settings` tags.

 ## Docker action payload migration
@@ -1,5 +1,5 @@
 ---
-description: Configure and use Assistant.
+description: Configure and use Homarr Assistant.
 tags:
  - Assistant
  - AI
@@ -8,10 +8,10 @@ tags:

 # Assistant

-Assistant can answer questions and manage Homarr for you. It uses the signed-in user's permissions and asks for
+Homarr Assistant can answer questions and manage Homarr for you. It uses the signed-in user's permissions and asks for
 approval before making changes.

-![Assistant conversation with suggested prompts](/img/assistant/conversation.png)
+![Homarr Assistant conversation with suggested prompts](/img/assistant/conversation.png)

 ## Set it up

@@ -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,18 +27,11 @@ 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.
-
 ## Create a new board

-Select **New board** on the boards management page. The creation form expands in the page, so you can enter the board
-details without opening a dialog or leaving the board list. The availability of the board name is checked as you type.
+When creating a board, the availability of the board name will be checked for you.

-The board menu also keeps duplication in context: select **Duplicate board**, choose the new name in the form below that
-board, and create the copy without navigating to a separate page.
+![](./img/create-board-modal.png)

 ### Name

@@ -58,9 +51,6 @@ This will enable public access for everyone - regardless of whether they are log
 This can be really useful if you want to have public boards in your company or for family and friends.
 Modifications for public boards must be allowed explicitly using user groups and their permissions.

-Deleting a board from the management list uses an inline safeguard. Select **Delete**, then select **Confirm** in the
-same menu item. No separate confirmation dialog is opened.
-
 ## Board settings

 You navigate to the board settings by clicking on these three dots:
@@ -133,21 +123,20 @@ On larger canvases, the complete board grows together like browser zoom.
 The complete canvas always fits the available width and never adds horizontal board scrolling.

 - **Mobile** starts at `0px` and uses three columns on new boards.
- **Base** is the main layout and starts at `768px` on new boards.
+- **Base** is the widest layout and starts at `768px` on new boards.

 Mobile and Base can be renamed and their column counts can be changed, but they cannot be removed. Mobile has no fixed
-rails; rail configuration is available only on Base and custom layouts. You can add removable custom layouts at any
-unused breakpoint above Mobile.
+rails; rail configuration is available only on Base and custom layouts. You can add removable custom layouts between
+their breakpoints.

 Each layout stores independent positions and sizes. Moving or resizing a widget while editing Mobile does not move it in
-Base or any custom layout. New custom layouts start from Base's current column count and rail widths; Homarr chooses an
-available breakpoint, and you can then change the breakpoint, columns, and rails.
+Base or any custom layout. New custom layouts start from Base's current column count and rail widths; Homarr chooses a
+free breakpoint between Mobile and Base, and you can then change the breakpoint, columns, and rails.

 Older or incomplete boards are repaired automatically. A board with no layouts receives Mobile at `0px` with three
 columns and Base at `768px` with ten columns. A board with one layout keeps it as Base and receives a generated Mobile
-layout. When protected roles are missing from a board with multiple layouts, the narrowest becomes Mobile, the widest
-becomes Base, and intermediate layouts become custom. Once roles exist, breakpoint changes do not reassign them.
-Duplicate breakpoints are normalized without discarding saved positions.
+layout. With multiple layouts, the narrowest becomes Mobile, the widest becomes Base, and intermediate layouts remain
+custom. Duplicate or out-of-order breakpoints are normalized without discarding saved positions.

 Use **Reset from Base** on Mobile or a custom layout to replace all of its positions and sizes with a newly generated version of Base. The layout's name, breakpoint, and column count are kept.

@@ -183,8 +172,7 @@ Apps, widgets, and Containers inside them still use the same fixed `200 × 200`
 #### Breakpoint

 The minimum screen width where the layout is used; a layout is eligible at its breakpoint and above. Mobile is fixed at
-`0px`. Every other breakpoint must be unique, but Base and custom layouts can be ordered at any width. Homarr uses the
-eligible layout with the highest breakpoint, regardless of its role.
+`0px`. Custom breakpoints must be unique and sit between Mobile and Base. Base must remain the highest breakpoint.
 When the initial viewport is not available, Homarr uses its remembered viewport information, client hints, or User-Agent
 fallback to select a layout.

@@ -222,8 +210,7 @@ Containers as destinations before the widget is created, so the common flow does

 Hold `Ctrl` on Windows or Linux, or `⌘` on macOS, while clicking board items to select several at once. The selection
 toolbar can move the complete selection to another canvas, rail, or Container, delete it with an undo option, or clear the
-selection. A short tip appears after entering edit mode as a reminder of the modifier key. A move is applied only when every
-selected item fits in the destination.
+selection. A move is applied only when every selected item fits in the destination.

 The widget editor also lists its selected integrations. Users with full access can choose **Edit connection** to test,
 diagnose, and repair an integration without leaving the board. A successful repair refreshes the affected widget; the
@@ -273,8 +260,6 @@ Expanding it smoothly restores those bounds and moves following items out of the

 ### Background

-When a background image is set, it always covers at least the full browser window height, even if the board's content is shorter (for example when a Container is collapsed).
-
 #### Background image URL

 Homarr can display a background image behind apps and widgets.
@@ -326,7 +311,7 @@ Change the radius of your items and Containers.
 This is the field where you can enter custom CSS.
 The styling will only be applied on the respective board page.

-When Assistant is enabled, users with modify permission can also ask it to edit the board's General, Background,
+When Homarr Assistant is enabled, users with modify permission can also ask it to edit the board's General, Background,
 Appearance, Custom CSS, and app-status settings. The assistant reads the current stylesheet first and presents an
 editable review form before requesting approval to save the change. It does not edit responsive layouts, access control,
 or Danger zone actions.
@@ -344,9 +329,8 @@ This will disable the status check for apps.
 Widgets expose their routine controls without requiring edit mode:

 - Hold `Shift` while hovering a widget that supports advanced view to expand it in place while the other widgets
-  remain visible but dimmed. Release `Shift` to close it. Hold `Shift` plus `Ctrl` on Windows/Linux or `Cmd` on macOS to
-  keep the view open until you close it. On touch devices, open it from the widget menu. Other widgets adapt in place
-  instead.
+  remain visible but dimmed. Release `Shift` to close it. Focus that widget and press `Shift` + `Enter` to keep the view
+  open until you close it. On touch devices, open it from the widget menu. Other widgets adapt in place instead.
 - When signed in, outside edit mode, and with **Enable right click on widgets** enabled, right-click a widget to inspect
  its live query status, refresh its data, change quick options, open settings, or run supported actions. App tiles do
  not use this widget menu, and available controls follow your board and integration permissions.
@@ -414,7 +398,8 @@ nor the integrations the user does not have access to.
 Duplicating a board will create a new board with the same settings, all responsive layouts, and independent positions as the original board.
 Duplicating a board that contains Custom Widgets also requires an administrator.
 You can duplicate a board by clicking on the three dots in the list of boards and selecting "Duplicate board".
-The name form expands below that board card and can be cancelled without leaving the list.
+
+![](./img/duplicate-board-modal.png)

 ## Setting boards as your home board

@@ -30,12 +30,15 @@ Navigate to `Management` > `Tools` > `Certificates`.

 ## Add a certificate

-To add a certificate click on the "Add certificate" button. The upload form expands directly on the certificates page.
+To add a certificate click on the "Add certificate" button.

 ![](./img/add-button.png)

-Then select the certificate file you want to add and click the "Add" button. You can cancel to collapse the form without
-leaving the page.
+Then select the certificate file you want to add.
+
+![](./img/add-modal.png)
+
+And click the "Add" button.

 ## Delete a certificate

@@ -43,7 +46,7 @@ To delete a certificate you can click on the trash icon in the certificate card.

 ![](./img/card.png)

-The first click arms the action and the second click confirms the deletion in place; no confirmation dialog is opened.
+Then confirm the deletion.

 ## Managing it through file system

@@ -125,7 +125,7 @@ model judges a result, the candidate must pass Homarr's real clipboard parser, c
 checks for documented endpoints, authentication, request triggers, query bindings, response fields, and essential
 runtime components.

-To exercise the real Assistant lifecycle instead of accepting a returned JSON block, run:
+To exercise the real Homarr Assistant lifecycle instead of accepting a returned JSON block, run:

 ```sh
 OPENROUTER_API_KEY=... pnpm --filter @homarr/custom-widgets test:assistant-ai
@@ -41,10 +41,6 @@ needs attention.
 4. Write responsive JSX using `data`, `status`, `options`, and temporary `inputs`.
 5. Test and preview, inspect Data and the redacted request journal, then save.

-While focus is inside a code editor, use `Ctrl+Z`/`Cmd+Z` to undo and `Ctrl+Shift+Z`/`Cmd+Shift+Z` to redo. The toolbar exposes the same actions. This history is local to that editor; builder-wide undo is not yet available.
-
-Changing the definition, instance options, or credentials invalidates the previous preview and its live-action session. Run **Test and preview** again before treating the data or result as current. Automatic load queries are queued with up to four running at once so larger previews stay within the request limit.
-
 <CanonicalCustomWidgetExample
  id="named-widget-requests"
  label="Named queries and actions"
@@ -43,7 +43,7 @@ interface HomarrCustomWidgetV2 {
 ### Design with AI

 The **Design with AI** action is available while creating or editing a custom widget. Describe what the widget should show and,
-when [Assistant](../assistant) is enabled, send the request directly from the form. The generated prompt includes the
+when [Homarr Assistant](../assistant) is enabled, send the request directly from the form. The generated prompt includes the
 widget schema and current non-secret configuration, but not the latest preview response. It proposes the matching create or
 update tool for your approval.

@@ -114,8 +114,7 @@ The install flow always links to the corresponding public Workshop entry under t
 For example, installing **Tautulli Activity** asks for both the user's Tautulli URL and API key. A stable public source such as PokéAPI keeps its published URL without creating unnecessary setup work.

 Workshop publishes technically valid widgets immediately; users can vote or report them, and Workshop moderators can
-delete submissions. The report form expands within the Workshop detail page instead of interrupting the review with a
-dialog. Community moderation is separate from Homarr administration and is not a security boundary.
+delete submissions. Community moderation is separate from Homarr administration and is not a security boundary.
 Publishers should replace personal private-network hosts with a clear service placeholder before publishing. Homarr
 performs definitive validation again at install time.

@@ -17,7 +17,7 @@ remains available as a compatibility alias, but new clients should always use `/

 With MCP, you can ask your AI assistant to manage apps, integrations, users, boards, Docker containers, media servers, DNS settings, and more - all through Homarr's existing tRPC API, now exposed as 50+ AI-callable tools.

-The optional [Assistant](./assistant) uses these same tool definitions internally.
+The optional [Homarr Assistant](./assistant) uses these same tool definitions internally.
 Unlike external MCP clients, it uses the current Homarr session directly and asks for in-conversation
 approval before running mutating procedures.

@@ -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

@@ -128,26 +128,6 @@ You can decide if app status is disabled on all boards.

 You can set the default color scheme for users without their own color scheme.

-## Branding
-
-Branding settings let administrators adapt Homarr to the identity and visual style of their installation. Changes apply across the application and authentication pages after you save the settings.
-
-### Identity
-
- **Application name** replaces the default Homarr name in page titles and branded surfaces.
- **Logo** is used in the header and other application branding.
- **Favicon** controls the browser tab icon. When it is empty, Homarr falls back to the configured logo.
-
-### Colors and corners
-
-Choose the primary and secondary colors used by the theme. **Lock primary color** prevents users from overriding the configured primary color. **Default corner style** controls the global radius used by cards, controls, and other interface elements.
-
-### Sign-in page
-
-You can set a greeting and a background image for authentication pages. The overlay slider adjusts the contrast between the background and the sign-in content. The visibility controls independently show or hide the application name, logo, and greeting.
-
-Use an image URL that every user can load before signing in. A URL that requires an authenticated Homarr session will not work on the sign-in page.
-
 ## Culture

 ### Default language
@@ -108,7 +108,7 @@ However, you can create as many groups as you'd like.
 ### Creating a group

 Click on the button `New group` to create a new one.
-The group-name form expands above the group list and can be closed without leaving the page.
+Homarr will prompt you for a group name.

 ### Managing a group

@@ -259,8 +259,7 @@ An invitation link can be used indefinitely.

 ### Creating an invitation

-Select the create-invitation button. The expiration form expands above the invitation table instead of opening a
-dialog or navigating to another page:
+Click on the button:

 ![](./img/create-invitation-button.png)

@@ -270,12 +269,12 @@ The default is 4 hours in the future.

 ![](./img/invitation-expiry-date.png)

-Next, click `Create` and the same section shows the ID, Token and a link that can be copied:
+Next, click `Create` and you'll get a confirmation with an ID, Token and a link that can be copied:

 ![](./img/create-invitation-confirmation.png)

 Both ID and Token are also in the URL. Ensure that you copy either ID & Token or the URL - it will never be shown again.
-Use **Copy** to copy the URL, then close the section when you are finished.
+Clicking the `Copy & close` button will copy the URL to your clipboard.

 ### Self-onboarding

@@ -294,4 +293,3 @@ If an invitation needs to be deleted before or after the expiry, the delete butt

 The link will become invalid.
 If the invitation expires, the link will also expire.
-The first click changes the action to **Confirm**; the second click deletes the invitation without opening a dialog.
@@ -11,7 +11,7 @@ import { appWidget } from ".";

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

-The app widget allows you to add a link to an application or a website that you want to access quickly from your Homarr board. Compact tiles retain the familiar title, optional description, and centered app icon proportions.
+The app widget allows you to add a link to an application or a website that you want to access quickly from your Homarr board.
 It also supports a status check to indicate whether Homarr can reach the application or website.

 ### Screenshots
@@ -23,8 +23,6 @@ This widget adapts its display based on the linked integration:

 Only options relevant to your linked integration are shown in the configuration panel.

-Compact mode keeps every configured statistic visible in the familiar filled tile layout, including a vertical stack for narrow Navidrome cards. Advanced mode retains the complete expanded statistics and stream details.
-
 ### Supported Integrations

 <WidgetIntegrations
@@ -17,7 +17,7 @@ import beszelAlerts from "./img/beszel-alerts.png";

 <WidgetHeader widget={beszelAlertsWidget} categories={["System Monitoring", "Alerts"]} />

-This widget displays your Beszel alert configurations separated by status (triggered and ok). It also shows alert history with timestamps. Compact mode keeps configured OK alerts and descriptions visible alongside triggered alerts, and keeps history visible when the history option is enabled. Alerts are updated in real time via WebSocket subscriptions.
+This widget displays your Beszel alert configurations separated by status (triggered and ok). It also shows alert history with timestamps. Alerts are updated in real time via WebSocket subscriptions.

 ### Screenshots

@@ -16,7 +16,7 @@ import beszelSystemGrid from "./img/beszel-system-grid.png";

 <WidgetHeader widget={beszelSystemGridWidget} categories={["System Monitoring"]} />

-This widget displays all your Beszel-monitored systems as a responsive card grid. Each card shows real-time metrics like CPU, memory, disk, network, temperature, and more. Resizing the widget adjusts its rows and columns to keep the cards balanced. If Beszel reports multiple filesystems, the disk bar exposes a hover breakdown for the root disk and each extra mount.
+This widget displays all your Beszel-monitored systems as a responsive card grid. Each card shows real-time metrics like CPU, memory, disk, network, temperature, and more. Cards adapt their layout based on available space. If Beszel reports multiple filesystems, the disk bar exposes a hover breakdown for the root disk and each extra mount.

 Select a system card to open the complete statistics view, including system, filesystem, Docker, historical, and realtime charts.

@@ -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. **Compact grid** keeps every card to a short row. Enable **Expand cards to fill row** when cards in an incomplete final row should use the remaining width. 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",
@@ -57,16 +45,16 @@ export const bookmarksWidget: WidgetDefinition = {
        defaultValue: "yes",
      },
      {
-        name: "Expand cards to fill row",
-        description: "Whether cards in an incomplete final row expand to use the remaining width.",
-        values: { type: "boolean" },
-        defaultValue: "no",
+        name: "Bookmarks",
+        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: "Bookmarks",
-        description: "URLs and existing Apps shown by the widget.",
-        values: "Paste one or many URLs, or find an existing App. Drag to reorder.",
-        defaultValue: "No bookmarks selected",
+        name: "Custom links",
+        description: "URLs to display without first creating an App.",
+        values: "List of URLs.",
+        defaultValue: "No custom links",
      },
    ],
  },
@@ -69,7 +69,6 @@ import advancedView from "./img/advanced-view.png";

 ### Interactions

- Colored dots directly below a date mark its events. They scale with the widget and are hidden when the calendar is too short.
 - Hover over a marked date to preview its events in a popover.
 - The advanced view replaces the month grid with a grouped event list, keeps every event attributed to its source integration, and expands titles, locations, and descriptions. Use its previous and next controls to change months.
 - If one selected integration is unavailable, its warning indicator remains visible while events from healthy integrations continue to load.
@@ -15,7 +15,7 @@ import { coolifyIntegration } from "@site/docs/integrations/coolify";

 <WidgetHeader widget={coolifyWidget} categories={["System monitoring", "Deployment"]} />

-The Coolify widget displays a compact overview of your Coolify instance. It can show servers, applications, and services with status indicators, project and environment context, direct links to Coolify, and the installed Coolify version. Compact resource badges and footer details remain visible without height-based hiding.
+The Coolify widget displays a compact overview of your Coolify instance. It can show servers, applications, and services with status indicators, project and environment context, direct links to Coolify, and the installed Coolify version.

 ### Supported Integrations

@@ -22,7 +22,7 @@ import { technitiumDnsIntegration } from "@site/docs/integrations/technitium-dns

 When several DNS integrations are selected, Homarr keeps healthy controls available if one source fails and shows a warning identifying the unavailable integration.

-This widget lets permitted users enable, disable, or temporarily pause one or more DNS services. It shares the summary query and cache with DNS Hole Summary. Every selected source stays available in the normal scrollable view, with its familiar textual status control retained at compact heights. Bulk actions keep successful results visible and report the number of failures.
+This widget lets permitted users enable, disable, or temporarily pause one or more DNS services. It shares the summary query and cache with DNS Hole Summary. Every selected source stays available in the normal scrollable view, while cards and controls adapt to the widget&apos;s width and height. Bulk actions keep successful results visible and report the number of failures.

 ### Screenshots

@@ -12,7 +12,7 @@ import { dockerContainersWidget } from ".";

 <WidgetHeader widget={dockerContainersWidget} categories={["Containers"]} />

-This widget displays the resource usage of your Docker containers and allows you to manage them. Compact mode keeps every configured table column and shows the complete CPU and memory totals whenever the footer is available.
+This widget displays the resource usage of your Docker containers and allows you to manage them.

 :::info
 This widget reads the Docker environments configured through environment variables. You do not need to create a Docker integration under **Management → Integrations**. The widget can only be used with administrator privileges.
@@ -58,7 +58,7 @@ import filterPanelImg from "./img/filter-panel.png";

 ### Features

- **Responsive compact table** — in compact mode, selected columns use the established width breakpoints; widget height does not remove configured columns or the footer
+- **Responsive compact table** — in compact mode, selected columns adapt to both widget width and height; narrow or short tiles hide speed/state columns, and the shortest tiles also hide the ETA column
 - **Sortable columns** — click any sortable column header to sort the current view; the configured default controls the initial column and direction
 - **Column customization** — choose which columns to display, then hover a header to reveal its grab handle for reordering or drag its edge to resize it; layouts save automatically per widget
 - **Download-row context menu** — copy a download name or ID from any row; pause, resume, and delete actions appear when you have Interact access to that integration
@@ -72,10 +72,11 @@ import filterPanelImg from "./img/filter-panel.png";

 :::note

-Compact layouts use their established width breakpoints: below 500px wide, speed columns are hidden; below 300px wide,
-the ETA and state columns are hidden too. Height does not remove configured columns or the footer. Advanced view bypasses
-the compact width reductions, keeps the selected column set, and always includes the stats bar and footer controls, with
-the filter panel available from the footer.
+Compact layouts use both dimensions: below 500px wide, speed columns are hidden; below 300px wide, the ETA and state
+columns are hidden too. A tile shorter than 180px hides speed and state columns, and a tile shorter than 120px also
+hides ETA. The footer is hidden below 96px in compact mode. Advanced view bypasses these compact size reductions,
+keeps the selected column set, and always includes the stats bar and footer controls, with the filter panel available
+from the footer.

 The filter panel changes the visible rows. Its client/status filters also change the stats bar's progress, size, and
 state counts, while transfer-speed totals summarize the selected clients and the global torrent ratio summarizes the
@@ -16,8 +16,6 @@ import { opnsenseIntegration } from "../../integrations/opnsense";

 <WidgetHeader widget={firewallWidget} categories={["Firewall"]} />

-Compact mode keeps the configured firewall summary and interface section visible without dropping interfaces based on widget height.
-
 ### Screenshots

 ![Firewall Widget](img/firewall_widget.png)
@@ -67,8 +67,6 @@ add_header Content-Security-Policy "frame-ancestors 'self' https://trusted-domai
 - **Wikipedia homepage:** https://en.wikipedia.org/wiki/Main_Page
 - **Any YouTube video or stream:** https://www.youtube.com/embed/dQw4w9WgXcQ?si=MWUbbG66UNTla_Ni

-Homarr passes the configured URL directly to the browser. The iframe sandbox and configured permissions still apply.
-
 ### Configuration

 <WidgetConfig configuration={iframeWidget.configuration} />
@@ -15,8 +15,6 @@ import { immichServerStatsWidget } from ".";

 <WidgetHeader widget={immichServerStatsWidget} categories={["Photos server"]} />

-Compact mode presents every enabled statistic as a vertical icon, label, and value card.
-
 ### Screenshots

 import screen from "./img/screen.png";
@@ -14,8 +14,6 @@ import { indexerManagerWidget } from ".";

 <WidgetHeader widget={indexerManagerWidget} categories={["Indexer"]} />

-Compact mode keeps the titled indexer list, per-indexer status indicators, and full-width **Test all** action together.
-
 ### Screenshots

 import bigItem from "./img/big.png";
@@ -17,7 +17,7 @@ import { plexIntegration } from "@site/docs/integrations/plex";

 <WidgetHeader widget={mediaReleasesWidget} categories={["Releases", "Media"]} />

-Provides a list of newly added media or upcoming releases from your media server. Compact rows retain their poster, full release date and time, and configured metadata.
+Provides a list of newly added media or upcoming releases from your media server.

 Releases retain the name and icon of the integration that supplied them. If one integration is unavailable, releases from healthy integrations remain visible and a warning identifies the failed source without exposing connection details. The widget reports an error only when every selected integration fails.

@@ -16,11 +16,10 @@ import TabItem from "@theme/TabItem";
 import { mediaRequestListWidget } from ".";
 import { jellyseerrIntegration } from "@site/docs/integrations/jellyseerr";
 import { overseerrIntegration } from "@site/docs/integrations/overseerr";
-import { seerrIntegration } from "@site/docs/integrations/seerr";

 <WidgetHeader widget={mediaRequestListWidget} categories={["Media requests"]} />

-Provides a list of all open and recently closed requests. It also provides the functionality to approve or reject requests. Compact request cards retain their full artwork, request metadata, title, status, and permitted actions.
+Provides a list of all open and recently closed requests. It also provides the functionality to approve or reject requests.

 You can limit the list to specific request statuses (for example, only show `pending`) and restrict it to requests created within the last N days.

@@ -40,9 +39,6 @@ import mediaRequestList from "./img/list.png";
    {
      integration: overseerrIntegration,
    },
-    {
-      integration: seerrIntegration,
-    },
  ]}
 />

@@ -50,7 +46,6 @@ import mediaRequestList from "./img/list.png";

 - Approve / decline a request by clicking on the thumbs up or down icon.
 - Hover over the widget to reveal a **search button** that opens Spotlight in media request search mode, scoped to the widget's integrations.
- When no requests exist yet, the widget offers the same media search action instead of reporting an integration error.
 - A warning indicator identifies unavailable integrations without hiding requests returned by healthy integrations.

 <WidgetInteractionGuide advancedView={false} />
@@ -16,11 +16,10 @@ import TabItem from "@theme/TabItem";
 import { mediaRequestStatsWidget } from ".";
 import { jellyseerrIntegration } from "@site/docs/integrations/jellyseerr";
 import { overseerrIntegration } from "@site/docs/integrations/overseerr";
-import { seerrIntegration } from "@site/docs/integrations/seerr";

 <WidgetHeader widget={mediaRequestStatsWidget} categories={["Media requests"]} />

-Provides an overview of media requests, including totals, availability, approvals, and rejections. Compact mode keeps every configured stat and section title visible; the user ranking remains scrollable instead of being truncated.
+Provides an overview of media requests, including totals, availability, approvals, and rejections. Resize the widget to reveal denser stat tiles; the user ranking remains scrollable instead of being truncated.

 ### Supported Integrations

@@ -32,9 +31,6 @@ Provides an overview of media requests, including totals, availability, approval
    {
      integration: overseerrIntegration,
    },
-    {
-      integration: seerrIntegration,
-    },
  ]}
 />

@@ -47,7 +43,6 @@ import mediaRequestStats from "./img/stats.png";
 ### Interactions

 - Hover over the widget to reveal a **search button** that opens Spotlight in media request search mode, scoped to the widget's integrations.
- When no requests exist yet, the widget offers media search and explains when statistics will appear.
 - A warning indicator identifies unavailable integrations while totals from healthy integrations remain visible.

 <WidgetInteractionGuide advancedView={false} />
@@ -22,7 +22,7 @@ import { plexIntegration } from "@site/docs/integrations/plex";
 <WidgetHeader widget={mediaServerWidget} categories={["Media server"]} />

 The media server widget shows active sessions across your media servers.
-It shows playback progress, pause state, time remaining, the streaming resolution (e.g. `1080p`), and whether each session is direct play, direct stream, or transcoding audio or video. Location and bitrate can be toggled independently. Compact mode keeps the user, currently playing, and status columns together with the stream summary and integration names.
+It shows playback progress, pause state, time remaining, the streaming resolution (e.g. `1080p`), and whether each session is direct play, direct stream, or transcoding audio or video. Location and bitrate can be toggled independently.

 Select a session to inspect its media metadata in an anchored popover. Advanced mode adds search, sorting, location, bitrate, and a summary of playing and transcoding sessions while keeping separate integration instances identifiable. Compact visibility switches do not hide location or bitrate from the complete advanced session view.
 If one selected server is unavailable, a warning indicator identifies the degraded result while sessions from healthy servers remain usable.
@@ -17,7 +17,7 @@ import { minecraftServerStatusWidget } from ".";

 <WidgetHeader widget={minecraftServerStatusWidget} categories={["Gaming", "Minecraft"]} />

-Shows the status and amount of players on a Minecraft server. Compact mode keeps the server icon and player count visible instead of hiding them based on tile size. It supports both Java and Bedrock editions, but only public servers accessible through the [mcsrvstat.us API](https://api.mcsrvstat.us) are supported.
+Shows the status and amount of players on a Minecraft server. It supports both Java and Bedrock editions, however only public servers are supported which can be reached through the used api of [api.mcsrvstat.us](https://api.mcsrvstat.us).

 ### Screenshots

@@ -20,7 +20,7 @@ import { networkControllerStatusWidget } from ".";

 Shows connected users and connected guest devices on wired or wireless networks.

-Compact view aggregates the configured controllers into one familiar card for the selected Wi-Fi or wired total. A failed refresh is shown as a small warning instead of replacing the totals card. Advanced view shows both totals separately for every controller, preserving each integration's name, type, and exact update time while keeping partial-source and stale-data warnings visible.
+Compact view aggregates the configured controllers into the selected Wi-Fi or wired total. Advanced view shows both totals separately for every controller, preserving each integration's name, type, and exact update time while keeping partial-source and stale-data warnings visible.

 ### Screenshots

@@ -18,7 +18,7 @@ import { networkControllerSummaryWidget } from ".";

 <WidgetHeader widget={networkControllerSummaryWidget} categories={["Network controller"]} />

-Shows whether your WAN, internet, Wi-Fi, and VPN are available. The compact board view keeps the familiar status list, including internet latency and the connected VPN-user count.
+Shows whether your WAN, internet, Wi-Fi, LAN, and VPN are available. Wider or taller layouts progressively reveal latency, ping, and connected-client counts without a separate view.

 ### Screenshots

@@ -36,7 +36,7 @@ import summaryCard from "./img/summary.png";
  ]}
 />

-In advanced view, each controller gets its own information matrix showing source, last update, WAN and web status, latency, ping, web uptime, separate Wi-Fi and LAN user and guest counts, and connected VPN users.
+In advanced view, each controller gets its own information matrix showing source, last update, WAN and web status, latency, ping, web uptime, separate Wi-Fi and LAN user and guest counts, and connected VPN users. The compact board view keeps its progressive aggregate layout.

 <WidgetInteractionGuide />

@@ -20,7 +20,7 @@ import { gotifyIntegration } from "@site/docs/integrations/gotify";

 <WidgetHeader widget={notificationsWidget} categories={["Notifications", "Messaging"]} />

-The notifications widget allows you to display notifications from various integrations in a unified view. Compact mode presents them as a vertical list of padded notification cards.
+The notifications widget allows you to display notifications from various integrations in a unified view.

 ### Screenshots

@@ -15,7 +15,7 @@ import { paperlessNgxIntegration } from "@site/docs/integrations/paperless-ngx";

 <WidgetHeader widget={paperlessNgxWidget} categories={["Documents"]} />

-This widget displays statistics from your Paperless-ngx instance, including an inbox ratio ring showing how many documents are in your inbox versus total, along with counts for correspondents, tags, and document types. Compact mode keeps every configured statistic in the familiar filled tile layout and uses a vertical stack on narrow cards.
+This widget displays statistics from your Paperless-ngx instance, including an inbox ratio ring showing how many documents are in your inbox versus total, along with counts for correspondents, tags, and document types.

 ### Supported Integrations

@@ -13,7 +13,7 @@ import { releasesWidget } from ".";

 <WidgetHeader widget={releasesWidget} categories={["Releases", "Software"]} />

-The releases widget enables you to track a list of repositories and see their respective latest release. Compact mode keeps repositories in the familiar full-width stack.
+The releases widget enables you to track a list of repositories and see their respective latest release.
 It also supports importing releases from your local docker containers.

 ### Screenshots
@@ -35,7 +35,7 @@ GitHub, Docker Hub, GitLab, NPM, Codeberg, GitHub Container Registry, Quay, and
 For GitHub Container Registry, use `owner/package` identifiers such as `homarr-labs/homarr`.
 Full image references such as `ghcr.io/homarr-labs/homarr:latest` are also accepted.

-Advanced view shows every configured repository in a roomier responsive layout. Repository names and details remain visible, and selecting a repository still expands its description and links.
+Advanced view shows every configured repository even when compact view is limited to highlighted or top releases. Repository names and details remain visible, and selecting a repository still expands its description and links.

 <WidgetInteractionGuide />

@@ -13,7 +13,7 @@ import { rssFeedWidget } from ".";

 <WidgetHeader widget={rssFeedWidget} categories={["Feeds"]} />

-Using the RSS standard, you can integrate most News websites, applications and more on your dashboard. Compact mode uses a vertical card list and keeps enclosure images as the familiar poster and blurred backdrop.
+Using the RSS standard, you can integrate most News websites, applications and more on your dashboard.

 ### Screenshots

@@ -18,7 +18,7 @@ import { homeAssistantIntegration } from "@site/docs/integrations/home-assistant

 <WidgetHeader widget={smartHomeEntityStateWidget} categories={["Smart home"]} />

-The entity state enables you to display the current state of an entity. Compact mode presents the friendly name first and its state beneath it.
+The entity state enables you to display the current state of an entity.
 This works with most entities and enables you display almost any data.
 It is recommended that you transform data on the integration as much as possible since Homarr's capabilities in transformation are very limited.

@@ -18,7 +18,7 @@ import { speedtestTrackerIntegration } from "@site/docs/integrations/speedtest-t
 This widget displays internet speed test results from your [Speedtest Tracker](https://docs.speedtest-tracker.dev/) instance,
 including the latest result, historical averages, and a live chart of the last 12 hours.

-The widget keeps every configured overview section in a compact card layout and names its healthy sources when multiple integrations are selected.
+Advanced view renders a source-labeled panel for every healthy integration. Each panel exposes that source's latest test, statistics, speed and ping charts, plus 12-hour, 24-hour, and truthful **Last 30** result ranges regardless of compact visibility switches. Compact mode keeps the responsive aggregate overview and names its healthy sources when multiple integrations are selected.

 When multiple Speedtest Tracker integrations are selected, results from healthy sources remain visible if another source fails. A warning indicator identifies each unavailable integration without exposing private request details. If every selected integration fails, the widget reports an error; if cached data remains visible after a later total failure, a stale-data warning is shown.

@@ -19,7 +19,7 @@ import { synologyIntegration } from "@site/docs/integrations/synology";

 <WidgetHeader widget={systemDisksWidget} categories={["Storage", "Disks"]} />

-This widget displays filesystem and SMART disk usage for supported server and NAS integrations. Compact mode uses a one-column card list with the configured primary value, available temperature, and solid health bar.
+This widget displays filesystem and SMART disk usage for supported server and NAS integrations.

 ### Supported Integrations

@@ -18,7 +18,7 @@ import { proxmoxIntegration } from "@site/docs/integrations/proxmox";

 <WidgetHeader widget={systemResourcesWidget} categories={["CPU", "RAM", "Memory", "Network", "Interface"]} />

-Displays CPU, RAM and network of your host in real time. Compact view keeps every configured chart in its familiar stacked layout, while advanced view adds the expanded per-source presentation.
+Displays CPU, RAM and network of your host in real time

 ### Screenshots

@@ -13,7 +13,7 @@ import { timetableWidget } from ".";

 <WidgetHeader widget={timetableWidget} categories={["Timetable"]} />

-The Timetable widget provides real-time departure times for a selected station. Compact mode keeps configured titles, line names, and platform fields visible while adapting dense rows to the available space.
+The Timetable widget provides real-time departure times for a selected station.

 ### Screenshots

@@ -15,7 +15,7 @@ import { tracearrIntegration } from "@site/docs/integrations/tracearr";

 <WidgetHeader widget={tracearrWidget} categories={["Media Monitoring"]} />

-The Tracearr widget provides a real-time monitoring dashboard for your media server activity. It displays active streams, user statistics, recent watching history, and policy violations. Compact mode renders every enabled section in that familiar order without hiding or truncating sections based on widget height.
+The Tracearr widget provides a real-time monitoring dashboard for your media server activity. It displays active streams, user statistics, recent watching history, and policy violations.

 When multiple Tracearr integrations are selected, every stream, violation, and activity row keeps its source identity and an integration-scoped key. Data from healthy sources remains visible if another source fails, and a warning identifies each unavailable integration without exposing private request details. If every selected integration fails, the widget reports an error; if cached data remains visible after a later total failure, a stale-data warning is shown.

@@ -17,7 +17,7 @@ import { traefikIntegration } from "@site/docs/integrations/traefik";

 This widget displays a compact overview of your Traefik instance, including total routers, entry points, protocol-specific router/service/middleware counts, and warning or error totals when Traefik reports them.

-Advanced view shows every protocol and entry point, identifies every healthy Traefik source and version, and labels each resource or failed endpoint with its owning integration. Compact mode keeps every configured protocol card and entry-point label visible and names each healthy source when multiple integrations are selected.
+Advanced view shows every protocol and entry point, identifies every healthy Traefik source and version, and labels each resource or failed endpoint with its owning integration. Compact mode keeps the responsive aggregate overview and names each healthy source when multiple integrations are selected.

 When multiple Traefik integrations are selected, data from healthy sources remains visible if another source fails. A warning indicator identifies each unavailable integration without exposing private request details. If every selected integration fails, the widget reports an error; if cached data remains visible after a later total failure, a stale-data warning is shown.

@@ -15,7 +15,7 @@ import { umamiIntegration } from "@site/docs/integrations/umami";

 <WidgetHeader widget={umamiWidget} categories={["Analytics"]} />

-The Umami Analytics widget displays key visitor metrics from a website tracked by your [Umami](https://umami.is) instance - pageviews, unique visitors, visits, bounce rate, avg. visit duration, and real-time active visitor count. The widget body can be switched between a visitor/event chart, a multi-event chart, and ranked top pages or referrers lists. Compact mode keeps configured axes and secondary statistics visible regardless of widget height.
+The Umami Analytics widget displays key visitor metrics from a website tracked by your [Umami](https://umami.is) instance - pageviews, unique visitors, visits, bounce rate, avg. visit duration, and real-time active visitor count. The widget body can be switched between a visitor/event chart, a multi-event chart, and ranked top pages or referrers lists.

 ### Supported Integrations

@@ -15,7 +15,7 @@ import { uptimeKumaIntegration } from "@site/docs/integrations/uptime-kuma";

 <WidgetHeader widget={uptimeKumaWidget} categories={["Monitoring"]} />

-This widget displays uptime statistics from your Uptime Kuma status page, including a visual uptime ring, average uptime percentage, and per-status monitor counts. Compact mode shows every configured ring and statistic without dropping them based on widget height.
+This widget displays uptime statistics from your Uptime Kuma status page, including a visual uptime ring, average uptime percentage, and per-status monitor counts.

 Advanced view always shows the uptime ring, all status totals, and the complete monitor list with source identity, regardless of compact visibility switches.

@@ -38,10 +38,8 @@ its server; changing the browser clock cannot bypass them.
 Workshop keeps the OpenRouter API key on its server. Homarr and the browser never receive it.

 Prompts, attachments, tools, and tool results pass through Workshop and OpenRouter. Workshop does not retain this
-content or the responses. It stores only the user, UTC day, and counters needed to enforce allowances. Each active day
-has a separate quota record so Workshop operators can inspect per-user daily usage without seeing request content.
-OpenRouter is configured for zero data retention with data collection disabled. Homarr does not use this content to
-train models.
+content or the responses. It stores only the user, UTC day, and counters needed to enforce allowances. OpenRouter is
+configured for zero data retention with data collection disabled. Homarr does not use this content to train models.

 We would rather become millionaires in a more ethical manner.

@@ -72,9 +72,6 @@ per-request telemetry. It accepts only uploaded image data, conservatively bound
 allows at most two concurrent requests per user and 100 across the service. Keep an OpenRouter account-level credit
 limit as the final monetary backstop because request quotas are not dollar accounting.

-PocketBase stores one `assistant_quotas` record per user and active UTC day. Workshop superusers can use this private
-collection for a daily usage breakdown; regular users cannot list or view its records.
-
 Run `pnpm test:workshop` to test authentication, streaming, UTC reset, atomic per-user and global quota enforcement,
 failed-request accounting, identity attribution, server-selected model routing, function tools, input and output
 controls, privacy routing, spoofing resistance, absence of request logs, and migration rollback.
@@ -2,17 +2,13 @@ import type { LoadContext, Plugin } from "@docusaurus/types";
 import fs from "node:fs";
 import path from "node:path";

+import { integrationDocSlugs } from "@homarr/definitions/docs/integration-doc-slugs";
 import { widgetDocSlugs } from "@homarr/definitions/docs/widget-doc-slugs";
-import { getIntegrationDocumentationSlug, integrationKinds } from "@homarr/definitions/integration";

-const documentationEntries = [
-  {
-    label: "Integration",
-    folder: "integrations",
-    entries: integrationKinds.map((kind) => [kind, getIntegrationDocumentationSlug(kind)] as const),
-  },
-  { label: "Widget", folder: "widgets", entries: Object.entries(widgetDocSlugs) },
-] as const;
+const slugMaps = {
+  Integration: { slugs: integrationDocSlugs, folder: "integrations" },
+  Widget: { slugs: widgetDocSlugs, folder: "widgets" },
+} as const;

 export default function validateDocsCoveragePlugin(context: LoadContext): Plugin {
  return {
@@ -21,8 +17,8 @@ export default function validateDocsCoveragePlugin(context: LoadContext): Plugin
      const docsDir = path.resolve(context.siteDir, "docs");
      const missing: string[] = [];

-      for (const { label, folder, entries } of documentationEntries) {
-        for (const [kind, slug] of entries) {
+      for (const [label, { slugs, folder }] of Object.entries(slugMaps)) {
+        for (const [kind, slug] of Object.entries(slugs)) {
          if (!slug) continue;
          if (!fs.existsSync(path.join(docsDir, folder, slug))) {
            missing.push(`${label} "${kind}" -> docs/${folder}/${slug}/`);
@@ -1,5 +1,5 @@
-import type { TablerIcon } from "@tabler/icons-react";
-import type { ReactNode } from "react";
+import { TablerIcon } from "@tabler/icons-react";
+import { ReactNode } from "react";

 export interface IntegrationDefinition {
  name: string;
@@ -3453,9 +3453,6 @@
                    "enableRightClickOnWidgets": {
                      "type": "boolean"
                    },
-                    "headerPreferences": {
-                      "type": "string"
-                    },
                    "defaultSearchEngineId": {
                      "anyOf": [
                        {
@@ -3491,7 +3488,6 @@
                    "firstDayOfWeek",
                    "pingIconsEnabled",
                    "enableRightClickOnWidgets",
-                    "headerPreferences",
                    "defaultSearchEngineId",
                    "openSearchInNewTab",
                    "ddgBangs",
@@ -4350,353 +4346,6 @@
        }
      }
    },
-    "/api/users/header-preferences": {
-      "patch": {
-        "operationId": "userRouter-changeHeaderPreferences",
-        "tags": ["users"],
-        "security": [
-          {
-            "apikey": []
-          }
-        ],
-        "parameters": [],
-        "requestBody": {
-          "required": true,
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "properties": {
-                  "id": {
-                    "type": "string"
-                  },
-                  "headerPreferences": {
-                    "oneOf": [
-                      {
-                        "type": "object",
-                        "properties": {
-                          "version": {
-                            "type": "number",
-                            "const": 3
-                          },
-                          "visible": {
-                            "type": "boolean"
-                          },
-                          "searchDisplay": {
-                            "type": "string",
-                            "enum": ["input", "icon"]
-                          },
-                          "logoDisplay": {
-                            "default": "logoAndText",
-                            "type": "string",
-                            "enum": ["logo", "logoAndText"]
-                          },
-                          "zones": {
-                            "type": "object",
-                            "properties": {
-                              "left": {
-                                "maxItems": 100,
-                                "type": "array",
-                                "items": {
-                                  "oneOf": [
-                                    {
-                                      "type": "object",
-                                      "properties": {
-                                        "type": {
-                                          "type": "string",
-                                          "const": "builtin"
-                                        },
-                                        "id": {
-                                          "type": "string",
-                                          "enum": [
-                                            "logo",
-                                            "search",
-                                            "home",
-                                            "boardSwitcher",
-                                            "assistant",
-                                            "docker",
-                                            "boardEdit",
-                                            "boardSettings",
-                                            "settings",
-                                            "themeToggle",
-                                            "user"
-                                          ]
-                                        }
-                                      },
-                                      "required": ["type", "id"],
-                                      "additionalProperties": false
-                                    },
-                                    {
-                                      "type": "object",
-                                      "properties": {
-                                        "type": {
-                                          "type": "string",
-                                          "const": "board"
-                                        },
-                                        "boardId": {
-                                          "type": "string",
-                                          "minLength": 1,
-                                          "maxLength": 255
-                                        }
-                                      },
-                                      "required": ["type", "boardId"],
-                                      "additionalProperties": false
-                                    }
-                                  ],
-                                  "type": "object"
-                                }
-                              },
-                              "center": {
-                                "maxItems": 100,
-                                "type": "array",
-                                "items": {
-                                  "oneOf": [
-                                    {
-                                      "type": "object",
-                                      "properties": {
-                                        "type": {
-                                          "type": "string",
-                                          "const": "builtin"
-                                        },
-                                        "id": {
-                                          "type": "string",
-                                          "enum": [
-                                            "logo",
-                                            "search",
-                                            "home",
-                                            "boardSwitcher",
-                                            "assistant",
-                                            "docker",
-                                            "boardEdit",
-                                            "boardSettings",
-                                            "settings",
-                                            "themeToggle",
-                                            "user"
-                                          ]
-                                        }
-                                      },
-                                      "required": ["type", "id"],
-                                      "additionalProperties": false
-                                    },
-                                    {
-                                      "type": "object",
-                                      "properties": {
-                                        "type": {
-                                          "type": "string",
-                                          "const": "board"
-                                        },
-                                        "boardId": {
-                                          "type": "string",
-                                          "minLength": 1,
-                                          "maxLength": 255
-                                        }
-                                      },
-                                      "required": ["type", "boardId"],
-                                      "additionalProperties": false
-                                    }
-                                  ],
-                                  "type": "object"
-                                }
-                              },
-                              "right": {
-                                "maxItems": 100,
-                                "type": "array",
-                                "items": {
-                                  "oneOf": [
-                                    {
-                                      "type": "object",
-                                      "properties": {
-                                        "type": {
-                                          "type": "string",
-                                          "const": "builtin"
-                                        },
-                                        "id": {
-                                          "type": "string",
-                                          "enum": [
-                                            "logo",
-                                            "search",
-                                            "home",
-                                            "boardSwitcher",
-                                            "assistant",
-                                            "docker",
-                                            "boardEdit",
-                                            "boardSettings",
-                                            "settings",
-                                            "themeToggle",
-                                            "user"
-                                          ]
-                                        }
-                                      },
-                                      "required": ["type", "id"],
-                                      "additionalProperties": false
-                                    },
-                                    {
-                                      "type": "object",
-                                      "properties": {
-                                        "type": {
-                                          "type": "string",
-                                          "const": "board"
-                                        },
-                                        "boardId": {
-                                          "type": "string",
-                                          "minLength": 1,
-                                          "maxLength": 255
-                                        }
-                                      },
-                                      "required": ["type", "boardId"],
-                                      "additionalProperties": false
-                                    }
-                                  ],
-                                  "type": "object"
-                                }
-                              }
-                            },
-                            "required": ["left", "center", "right"],
-                            "additionalProperties": false
-                          }
-                        },
-                        "required": ["version", "visible", "searchDisplay", "zones"],
-                        "additionalProperties": false
-                      },
-                      {
-                        "type": "object",
-                        "properties": {
-                          "version": {
-                            "type": "number",
-                            "const": 1
-                          },
-                          "visible": {
-                            "type": "boolean"
-                          },
-                          "items": {
-                            "minItems": 1,
-                            "maxItems": 6,
-                            "type": "array",
-                            "items": {
-                              "type": "string",
-                              "enum": ["logo", "search", "boardSwitcher", "assistant", "docker", "user"]
-                            }
-                          }
-                        },
-                        "required": ["version", "visible", "items"],
-                        "additionalProperties": false
-                      },
-                      {
-                        "type": "object",
-                        "properties": {
-                          "version": {
-                            "type": "number",
-                            "const": 2
-                          },
-                          "visible": {
-                            "type": "boolean"
-                          },
-                          "zones": {
-                            "type": "object",
-                            "properties": {
-                              "left": {
-                                "maxItems": 6,
-                                "type": "array",
-                                "items": {
-                                  "type": "string",
-                                  "enum": ["logo", "search", "boardSwitcher", "assistant", "docker", "user"]
-                                }
-                              },
-                              "center": {
-                                "maxItems": 6,
-                                "type": "array",
-                                "items": {
-                                  "type": "string",
-                                  "enum": ["logo", "search", "boardSwitcher", "assistant", "docker", "user"]
-                                }
-                              },
-                              "right": {
-                                "maxItems": 6,
-                                "type": "array",
-                                "items": {
-                                  "type": "string",
-                                  "enum": ["logo", "search", "boardSwitcher", "assistant", "docker", "user"]
-                                }
-                              }
-                            },
-                            "required": ["left", "center", "right"],
-                            "additionalProperties": false
-                          }
-                        },
-                        "required": ["version", "visible", "zones"],
-                        "additionalProperties": false
-                      }
-                    ],
-                    "type": "object"
-                  }
-                },
-                "required": ["id", "headerPreferences"]
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "Successful response",
-            "content": {
-              "application/json": {
-                "schema": {}
-              }
-            }
-          },
-          "400": {
-            "description": "Invalid input data",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/error.BAD_REQUEST"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "Authorization not provided",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/error.UNAUTHORIZED"
-                }
-              }
-            }
-          },
-          "403": {
-            "description": "Insufficient access",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/error.FORBIDDEN"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "Not found",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/error.NOT_FOUND"
-                }
-              }
-            }
-          },
-          "500": {
-            "description": "Internal server error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/error.INTERNAL_SERVER_ERROR"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
    "/api/users/ddg-bangs": {
      "patch": {
        "operationId": "userRouter-changeDdgBangs",
@@ -72,12 +72,10 @@
    "@rexa-developer/tiks": "catalog:",
    "@scalar/api-reference-react": "catalog:",
    "@tabler/icons-react": "catalog:",
-    "@tanstack/query-sync-storage-persister": "catalog:",
    "@tanstack/react-devtools": "catalog:",
    "@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,53 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1920 1080" role="img" aria-labelledby="title description">
-  <title id="title">Abstract homelab network</title>
-  <description id="description">A dark indigo field with subtle connected nodes and cyan signal paths.</description>
-  <defs>
-    <radialGradient id="base" cx="50%" cy="40%" r="80%">
-      <stop offset="0" stop-color="#172047"/>
-      <stop offset="0.48" stop-color="#0b1028"/>
-      <stop offset="1" stop-color="#060814"/>
-    </radialGradient>
-    <radialGradient id="indigoGlow">
-      <stop offset="0" stop-color="#748ffc" stop-opacity="0.32"/>
-      <stop offset="1" stop-color="#748ffc" stop-opacity="0"/>
-    </radialGradient>
-    <radialGradient id="cyanGlow">
-      <stop offset="0" stop-color="#3bc9db" stop-opacity="0.22"/>
-      <stop offset="1" stop-color="#3bc9db" stop-opacity="0"/>
-    </radialGradient>
-    <linearGradient id="signal" x1="0" y1="0" x2="1" y2="1">
-      <stop stop-color="#748ffc" stop-opacity="0.05"/>
-      <stop offset="0.5" stop-color="#748ffc" stop-opacity="0.34"/>
-      <stop offset="1" stop-color="#3bc9db" stop-opacity="0.05"/>
-    </linearGradient>
-    <filter id="blur">
-      <feGaussianBlur stdDeviation="55"/>
-    </filter>
-  </defs>
-  <rect width="1920" height="1080" fill="url(#base)"/>
-  <ellipse cx="330" cy="90" rx="560" ry="430" fill="url(#indigoGlow)" filter="url(#blur)"/>
-  <ellipse cx="1680" cy="940" rx="620" ry="400" fill="url(#cyanGlow)" filter="url(#blur)"/>
-  <g fill="none" stroke="url(#signal)" stroke-width="1.5">
-    <path d="M-80 825C240 570 475 760 720 510s470-165 650-330 330-85 630-250"/>
-    <path d="M-120 1010C220 740 470 920 780 660s520-105 700-270 300-125 560-180"/>
-    <path d="M110 40c180 190 350 220 545 130s390-55 520 80 320 155 620 60" opacity=".45"/>
-  </g>
-  <g fill="#9aa8ff" opacity=".48">
-    <circle cx="248" cy="660" r="3"/>
-    <circle cx="718" cy="511" r="4"/>
-    <circle cx="1118" cy="287" r="3"/>
-    <circle cx="1450" cy="110" r="4"/>
-  </g>
-  <g fill="#5ee0ee" opacity=".42">
-    <circle cx="435" cy="850" r="3"/>
-    <circle cx="908" cy="604" r="4"/>
-    <circle cx="1350" cy="510" r="3"/>
-    <circle cx="1715" cy="285" r="4"/>
-  </g>
-  <g fill="none" stroke="#aeb8ff" stroke-opacity=".055">
-    <circle cx="330" cy="90" r="260"/>
-    <circle cx="330" cy="90" r="345"/>
-    <circle cx="1680" cy="940" r="250"/>
-    <circle cx="1680" cy="940" r="335"/>
-  </g>
-</svg>
@@ -1,7 +1,6 @@
 "use client";

 import type { PropsWithChildren } from "react";
-import { useMemo } from "react";
 import type { MantineColorScheme, MantineColorSchemeManager } from "@mantine/core";
 import { DirectionProvider, MantineProvider, v8CssVariablesResolver } from "@mantine/core";
 import dayjs from "dayjs";
@@ -11,23 +10,18 @@ import { useSession } from "@homarr/auth/client";
 import { parseCookies, setClientCookie } from "@homarr/common";
 import { colorSchemeCookieKey } from "@homarr/definitions";
 import { theme } from "@homarr/ui";
-import type { ServerSettings } from "@homarr/server-settings";
-
-import { createBrandTheme } from "~/theme/branding";

 export const CustomMantineProvider = ({
  children,
  defaultColorScheme,
-  branding,
-}: PropsWithChildren<{ defaultColorScheme: MantineColorScheme; branding?: ServerSettings["branding"] }>) => {
+}: PropsWithChildren<{ defaultColorScheme: MantineColorScheme }>) => {
  const manager = useColorSchemeManager();
-  const configuredTheme = useMemo(() => (branding ? createBrandTheme(branding) : theme), [branding]);
  return (
    <DirectionProvider>
      <MantineProvider
        defaultColorScheme={defaultColorScheme}
        colorSchemeManager={manager}
-        theme={configuredTheme}
+        theme={theme}
        cssVariablesResolver={v8CssVariablesResolver}
      >
        {children}
@@ -1,131 +0,0 @@
-import { dehydrate, QueryClient } from "@tanstack/react-query";
-import type { PersistedClient } from "@tanstack/react-query-persist-client";
-import { afterEach, describe, expect, test, vi } from "vitest";
-
-import {
-  createSessionQueryPersistence,
-  getQueryPersistenceStorageKey,
-  queryPersistenceBuster,
-  shouldPersistDashboardQuery,
-} from "./query-persistence";
-
-const createSuccessfulQuery = (queryKey: readonly unknown[], data: unknown) => {
-  const queryClient = new QueryClient();
-  queryClient.setQueryData(queryKey, data);
-  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();
-});
-
-describe("dashboard query persistence", () => {
-  test("keeps usable dashboard data and skips volatile or unrelated queries", () => {
-    const widget = createSuccessfulQuery([["widget", "weather", "atLocation"], { type: "query" }], { temp: 21 });
-    const supporting = createSuccessfulQuery([["app", "byIds"], { type: "query" }], [{ id: "app-1" }]);
-    const ping = createSuccessfulQuery([["widget", "app", "ping"], { type: "query" }], { status: "online" });
-    const beszel = createSuccessfulQuery([["widget", "beszel", "getSystemStats"], { type: "query" }], []);
-    const customApi = createSuccessfulQuery([["widget", "customApi", "getData"], { type: "query" }], {
-      apiKey: "secret",
-    });
-    const unrelated = createSuccessfulQuery([["board", "getBoardByName"], { type: "query" }], { name: "Home" });
-    const pendingClient = new QueryClient();
-    const pending = pendingClient.getQueryCache().build(pendingClient, {
-      queryKey: [["widget", "calendar", "findAllEvents"], { type: "query" }],
-      queryFn: () => Promise.resolve([]),
-    });
-    const failed = createSuccessfulQuery([["widget", "calendar", "findAllEvents"], { type: "query" }], []);
-    failed.query.setState({ ...failed.query.state, error: new Error("refresh failed"), status: "error" });
-
-    expect(shouldPersistDashboardQuery(widget.query)).toBe(true);
-    expect(shouldPersistDashboardQuery(supporting.query)).toBe(true);
-    expect(shouldPersistDashboardQuery(ping.query)).toBe(false);
-    expect(shouldPersistDashboardQuery(beszel.query)).toBe(false);
-    expect(shouldPersistDashboardQuery(customApi.query)).toBe(false);
-    expect(shouldPersistDashboardQuery(unrelated.query)).toBe(false);
-    expect(shouldPersistDashboardQuery(pending)).toBe(false);
-    expect(shouldPersistDashboardQuery(failed.query)).toBe(true);
-  });
-
-  test("round-trips dashboard data with SuperJSON in an isolated session scope", async () => {
-    vi.useFakeTimers();
-    const storage = createMemoryStorage();
-    const userA = createSessionQueryPersistence("user-a", storage);
-    const userB = createSessionQueryPersistence("user-b", storage);
-    const { queryClient } = createSuccessfulQuery([["widget", "calendar", "findAllEvents"], { type: "query" }], {
-      startsAt: new Date("2026-08-22T12:00:00.000Z"),
-    });
-    const cachedQuery = queryClient.getQueryCache().find({
-      queryKey: [["widget", "calendar", "findAllEvents"], { type: "query" }],
-    });
-    if (!cachedQuery) throw new Error("Expected cached query to be present");
-    cachedQuery.setState({ ...cachedQuery.state, error: new Error("refresh failed"), status: "error" });
-    queryClient.getMutationCache().build(
-      queryClient,
-      { mutationKey: ["integration", "create"], mutationFn: async () => undefined },
-      {
-        context: undefined,
-        data: undefined,
-        error: null,
-        failureCount: 0,
-        failureReason: null,
-        isPaused: true,
-        status: "pending",
-        submittedAt: Date.now(),
-        variables: { apiKey: "secret" },
-      },
-    );
-    const persistedClient: PersistedClient = {
-      timestamp: Date.now(),
-      buster: queryPersistenceBuster,
-      clientState: dehydrate(queryClient, userA.dehydrateOptions),
-    };
-
-    expect(persistedClient.clientState.mutations).toHaveLength(0);
-
-    await userA.persister.persistClient(persistedClient);
-    await vi.advanceTimersByTimeAsync(1_000);
-
-    const restored = await userA.persister.restoreClient();
-    expect(restored?.clientState.queries[0]?.state.data).toEqual({
-      startsAt: 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(await userB.persister.restoreClient()).toBeUndefined();
-
-    await userA.persister.removeClient();
-    expect(storage.getItem(getQueryPersistenceStorageKey("user-a"))).toBeNull();
-  });
-
-  test("treats unavailable session storage as an empty cache", async () => {
-    const blockedStorage = createMemoryStorage();
-    blockedStorage.getItem = () => {
-      throw new DOMException("blocked", "SecurityError");
-    };
-    blockedStorage.removeItem = () => {
-      throw new DOMException("blocked", "SecurityError");
-    };
-
-    const persistence = createSessionQueryPersistence("blocked", blockedStorage);
-    expect(await persistence.persister.restoreClient()).toBeUndefined();
-    expect(() => persistence.persister.removeClient()).not.toThrow();
-  });
-});
@@ -1,97 +0,0 @@
-import type { QueryKey } from "@tanstack/react-query";
-import { createSyncStoragePersister } from "@tanstack/query-sync-storage-persister";
-import { removeOldestQuery } from "@tanstack/react-query-persist-client";
-import type { PersistedClient, PersistQueryClientProviderProps } from "@tanstack/react-query-persist-client";
-import { parse, stringify } from "superjson";
-
-import { isPersistableDashboardQueryKey, queryCacheDefaultGcTimeMs } from "@homarr/api/query-cache";
-
-export const queryPersistenceBuster = "v6-dashboard-data";
-
-const queryPersistenceStoragePrefix = "homarr:widget-query-cache";
-
-export const getQueryPersistenceStorageKey = (scope: string | null) =>
-  `${queryPersistenceStoragePrefix}:${encodeURIComponent(scope ?? "anonymous")}`;
-
-interface PersistableQuery {
-  queryKey: QueryKey;
-  state: { data: unknown; status: string };
-}
-
-export const shouldPersistDashboardQuery = (query: PersistableQuery) =>
-  query.state.data !== undefined && isPersistableDashboardQueryKey(query.queryKey);
-
-const serializePersistedClient = (client: PersistedClient) =>
-  stringify({
-    ...client,
-    clientState: {
-      ...client.clientState,
-      queries: client.clientState.queries.map((query) => ({
-        ...query,
-        state: {
-          ...query.state,
-          error: null,
-          errorUpdateCount: 0,
-          errorUpdatedAt: 0,
-          fetchFailureCount: 0,
-          fetchFailureReason: null,
-          status: "success",
-        },
-      })),
-    },
-  });
-
-const getSessionStorage = () => {
-  if (typeof window === "undefined") return undefined;
-
-  try {
-    return window.sessionStorage;
-  } catch {
-    return undefined;
-  }
-};
-
-const protectStorage = (storage: Storage | undefined) => {
-  if (!storage) return undefined;
-
-  return {
-    getItem(key: string) {
-      try {
-        return storage.getItem(key);
-      } catch {
-        return null;
-      }
-    },
-    setItem(key: string, value: string) {
-      storage.setItem(key, value);
-    },
-    removeItem(key: string) {
-      try {
-        storage.removeItem(key);
-      } catch {
-        return undefined;
-      }
-    },
-  };
-};
-
-export type SessionQueryPersistence = PersistQueryClientProviderProps["persistOptions"];
-
-export const createSessionQueryPersistence = (
-  scope: string | null,
-  storage: Storage | undefined = getSessionStorage(),
-): SessionQueryPersistence => ({
-  persister: createSyncStoragePersister({
-    storage: protectStorage(storage),
-    key: getQueryPersistenceStorageKey(scope),
-    serialize: serializePersistedClient,
-    deserialize: parse,
-    retry: removeOldestQuery,
-  }),
-  maxAge: queryCacheDefaultGcTimeMs,
-  buster: queryPersistenceBuster,
-  dehydrateOptions: {
-    shouldDehydrateMutation: () => false,
-    shouldDehydrateQuery: shouldPersistDashboardQuery,
-  },
-});
@@ -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 { QueryCache, 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,
@@ -25,8 +24,6 @@ import type { AppRouter } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
 import {
  dashboardSupportingQueryPolicies,
-  isTrpcForbiddenError,
-  isWidgetDataQueryKey,
  queryCacheDefaultGcTimeMs,
  queryCacheDefaultRefetchIntervalMs,
  queryCacheDefaultStaleTimeMs,
@@ -38,8 +35,6 @@ import { showWarningNotification } from "@homarr/notifications";
 import { widgetQueryRefetchIntervals } from "@homarr/widgets/refetch-intervals";

 import { getSessionQueryScope, SessionQueryScopeGuard } from "./session-query-scope";
-import { createSessionQueryPersistence } from "./query-persistence";
-import type { SessionQueryPersistence } from "./query-persistence";
 import { createQueryRetry } from "./query-retry";

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

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

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

-const ScopedTRPCReactProvider = ({
-  children,
-  queryPersistence,
-}: PropsWithChildren<{ queryPersistence: SessionQueryPersistence }>) => {
+const ScopedTRPCReactProvider = ({ children }: PropsWithChildren) => {
  const wsClient = useMemo(
    () =>
      createWSClient({
@@ -111,13 +98,6 @@ const ScopedTRPCReactProvider = ({
  );
  const [queryClient] = useState(() => {
    const client = new QueryClient({
-      queryCache: new QueryCache({
-        onError(error, query) {
-          if (!isTrpcForbiddenError(error) || !isWidgetDataQueryKey(query.queryKey)) return;
-          void queryPersistence.persister.removeClient();
-          query.setState({ data: undefined, dataUpdatedAt: 0, isInvalidated: true });
-        },
-      }),
      defaultOptions: {
        queries: {
          staleTime: queryCacheDefaultStaleTimeMs,
@@ -145,14 +125,10 @@ const ScopedTRPCReactProvider = ({
      refetchOnWindowFocus: false,
      refetchOnReconnect: false,
    });
-    for (const queryDefaults of widgetQueryRefetchIntervals) {
-      const policy: { refetchInterval?: number | false; staleTime?: number } = {};
-      if (queryDefaults.intervalSeconds === null) policy.refetchInterval = false;
-      if (typeof queryDefaults.intervalSeconds === "number") {
-        policy.refetchInterval = queryDefaults.intervalSeconds * 1000;
-      }
-      if ("staleTimeSeconds" in queryDefaults) policy.staleTime = queryDefaults.staleTimeSeconds * 1000;
-      client.setQueryDefaults(queryDefaults.queryKey, policy);
+    for (const { queryKey, intervalSeconds } of widgetQueryRefetchIntervals) {
+      client.setQueryDefaults(queryKey, {
+        refetchInterval: intervalSeconds === null ? false : intervalSeconds * 1000,
+      });
    }
    for (const { queryKey, ...policy } of dashboardSupportingQueryPolicies) {
      client.setQueryDefaults(queryKey, policy);
@@ -210,10 +186,10 @@ const ScopedTRPCReactProvider = ({

  return (
    <clientApi.Provider client={trpcClient} queryClient={queryClient}>
-      <PersistQueryClientProvider client={queryClient} persistOptions={queryPersistence}>
+      <QueryClientProvider client={queryClient}>
        <ReactQueryStreamedHydration transformer={superjson}>{children}</ReactQueryStreamedHydration>
        {process.env.NODE_ENV === "development" && <DevelopmentTools />}
-      </PersistQueryClientProvider>
+      </QueryClientProvider>
    </clientApi.Provider>
  );
 };
@@ -7,7 +7,7 @@ import type { z } from "zod/v4";
 import { clientApi } from "@homarr/api/client";
 import { useZodForm } from "@homarr/form";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
-import { useI18n } from "@homarr/translation/client";
+import { useScopedI18n } from "@homarr/translation/client";
 import { CustomPasswordInput } from "@homarr/ui";
 import { userRegistrationSchema } from "@homarr/validation/user";

@@ -19,7 +19,7 @@ interface RegistrationFormProps {
 }

 export const RegistrationForm = ({ invite }: RegistrationFormProps) => {
-  const t = useI18n("user");
+  const t = useScopedI18n("user");
  const router = useRouter();
  const { mutate, isPending } = clientApi.user.register.useMutation();
  const form = useZodForm(userRegistrationSchema, {
@@ -1,14 +1,12 @@
 import { notFound } from "next/navigation";
 import { IconUserPlus } from "@tabler/icons-react";

-import { getRscServerSettingsAsync } from "@homarr/api/server-settings-server";
 import { auth } from "@homarr/auth/next";
 import { isProviderEnabled } from "@homarr/auth/server";
 import { and, db, eq } from "@homarr/db";
 import { invites } from "@homarr/db/schema";
 import { OnboardingAuthShell } from "@homarr/onboarding";
-import { defaultBrandingSettings, getBrandingColorOverrides } from "@homarr/server-settings";
-import { getI18n } from "@homarr/translation/server";
+import { getScopedI18n } from "@homarr/translation/server";

 import { RegistrationForm } from "./_registration-form";

@@ -22,9 +20,11 @@ interface InviteUsagePageProps {
 }

 export default async function InviteUsagePage(props: InviteUsagePageProps) {
+  const searchParams = await props.searchParams;
+  const params = await props.params;
  if (!isProviderEnabled("credentials")) notFound();

-  const [searchParams, params, session] = await Promise.all([props.searchParams, props.params, auth()]);
+  const session = await auth();
  if (session) notFound();

  const invite = await db.query.invites.findFirst({
@@ -45,33 +45,13 @@ export default async function InviteUsagePage(props: InviteUsagePageProps) {

  if (!invite || invite.expirationDate < new Date()) notFound();

-  const [t, serverSettings] = await Promise.all([getI18n("user.page.invite"), getRscServerSettingsAsync()]);
-  const branding = serverSettings.branding;
-  const wordmarkColors = getBrandingColorOverrides(branding);
-  const showCustomAppName = branding.authBranding.showAppName && branding.appName !== defaultBrandingSettings.appName;
-  const showCustomGreeting = branding.authBranding.showGreeting && branding.greeting.length > 0;
-  const title = showCustomAppName ? t("titleWithAppName", { appName: branding.appName }) : t("title");
-  const defaultDescription = showCustomAppName
-    ? t("subtitleWithAppName", { appName: branding.appName })
-    : t("subtitle");
-  const description = showCustomGreeting ? branding.greeting : defaultDescription;
+  const t = await getScopedI18n("user.page.invite");

  return (
    <OnboardingAuthShell
-      title={title}
-      description={description}
+      title={t("title")}
+      description={t("subtitle")}
      icon={<IconUserPlus size={24} />}
-      appName={branding.appName}
-      showAppName={branding.authBranding.showAppName}
-      showAppLogo={branding.authBranding.showLogo}
-      primaryColor={branding.primaryColor}
-      secondaryColor={branding.secondaryColor}
-      wordmarkPrimaryColor={wordmarkColors.primaryColor}
-      wordmarkSecondaryColor={wordmarkColors.secondaryColor}
-      logoImageUrl={branding.logoImageUrl ?? undefined}
-      backgroundImageUrl={branding.signInBackgroundImageUrl ?? undefined}
-      backgroundOverlay={branding.signInBackgroundOverlay}
-      radius={branding.defaultRadius}
      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
      footer={t("description", { username: invite.creator.name! })}
    >
@@ -12,7 +12,7 @@ import { revalidatePathActionAsync } from "@homarr/common/client";
 import type { UseFormReturnType } from "@homarr/form";
 import { useZodForm } from "@homarr/form";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
-import { useI18n } from "@homarr/translation/client";
+import { useScopedI18n } from "@homarr/translation/client";
 import { sanitizeRedirectionUrl } from "@homarr/validation/redirection-url";
 import { userSignInSchema } from "@homarr/validation/user";

@@ -28,7 +28,7 @@ interface LoginFormProps {
 const extendedValidation = userSignInSchema.extend({ provider: z.enum(["credentials", "ldap"]) });

 export const LoginForm = ({ providers, oidcClientName, isOidcAutoLoginEnabled, callbackUrl }: LoginFormProps) => {
-  const t = useI18n("user");
+  const t = useScopedI18n("user");
  const searchParams = useSearchParams();
  const isError = searchParams.has("error");
  const router = useRouter();
@@ -196,7 +196,7 @@ interface PasswordForgottenCollapseProps {
 }
 const PasswordForgottenCollapse = ({ username }: PasswordForgottenCollapseProps) => {
  const [visible, { toggle }] = useDisclosure(false);
-  const tForgotPassword = useI18n("user.action.login.forgotPassword");
+  const tForgotPassword = useScopedI18n("user.action.login.forgotPassword");

  const commandUsername = username.trim().length >= 1 ? username.trim() : "<username>";

@@ -2,12 +2,10 @@ import { redirect } from "next/navigation";
 import { Alert, Code, Text } from "@mantine/core";
 import { IconLogin } from "@tabler/icons-react";

-import { getRscServerSettingsAsync } from "@homarr/api/server-settings-server";
 import { env } from "@homarr/auth/env";
 import { auth } from "@homarr/auth/next";
 import { OnboardingAuthShell } from "@homarr/onboarding";
-import { getBrandingColorOverrides } from "@homarr/server-settings";
-import { getI18n } from "@homarr/translation/server";
+import { getScopedI18n } from "@homarr/translation/server";
 import { sanitizeRedirectionUrl } from "@homarr/validation/redirection-url";

 import { env as appEnv } from "~/env";
@@ -21,35 +19,17 @@ interface LoginProps {
 }

 export default async function Login(props: LoginProps) {
-  const [searchParams, session] = await Promise.all([props.searchParams, auth()]);
+  const searchParams = await props.searchParams;
+  const session = await auth();

  if (session) {
    redirect(sanitizeRedirectionUrl(searchParams.callbackUrl));
  }

-  const [t, serverSettings] = await Promise.all([getI18n("user.page.login"), getRscServerSettingsAsync()]);
-  const branding = serverSettings.branding;
-  const wordmarkColors = getBrandingColorOverrides(branding);
-  const showCustomGreeting = branding.authBranding.showGreeting && branding.greeting.length > 0;
-  const description = showCustomGreeting ? branding.greeting : t("subtitle");
+  const t = await getScopedI18n("user.page.login");

  return (
-    <OnboardingAuthShell
-      title={t("title")}
-      description={description}
-      icon={<IconLogin size={24} />}
-      appName={branding.appName}
-      showAppName={branding.authBranding.showAppName}
-      showAppLogo={branding.authBranding.showLogo}
-      primaryColor={branding.primaryColor}
-      secondaryColor={branding.secondaryColor}
-      wordmarkPrimaryColor={wordmarkColors.primaryColor}
-      wordmarkSecondaryColor={wordmarkColors.secondaryColor}
-      logoImageUrl={branding.logoImageUrl ?? undefined}
-      backgroundImageUrl={branding.signInBackgroundImageUrl ?? undefined}
-      backgroundOverlay={branding.signInBackgroundOverlay}
-      radius={branding.defaultRadius}
-    >
+    <OnboardingAuthShell title={t("title")} description={t("subtitle")} icon={<IconLogin size={24} />}>
      {appEnv.DEMO_MODE ? (
        <Alert icon={<IconLogin size={18} />} color="blue" variant="light">
          <Text size="sm" fw={500}>
@@ -1,11 +1,11 @@
 import { IconLayoutOff } from "@tabler/icons-react";

-import { getI18n } from "@homarr/translation/server";
+import { getScopedI18n } from "@homarr/translation/server";

 import { BoardNotFound } from "~/components/board/not-found";

 export default async function BoardNotFoundPage() {
-  const tNotFound = await getI18n("board.error.notFound");
+  const tNotFound = await getScopedI18n("board.error.notFound");
  return (
    <BoardNotFound
      icon={IconLayoutOff}
@@ -19,11 +19,35 @@
  align-self: start;
  box-sizing: border-box;
  height: var(--board-gutter-viewport-height);
+  padding-top: 24px;
+  margin-top: -24px;
  overflow: clip;
 }

 .gutter[data-board-editing="true"] {
-  outline: 0.0625rem solid var(--mantine-color-default-border);
-  outline-offset: -0.0625rem;
+  outline: 1px dashed var(--mantine-color-default-border);
+  outline-offset: -1px;
  border-radius: var(--mantine-radius-md);
 }
+
+.gutter[data-board-editing="true"]::before {
+  position: sticky;
+  top: 0;
+  inset-inline-start: 0;
+  z-index: 2;
+  display: block;
+  width: fit-content;
+  height: 24px;
+  padding-inline: var(--mantine-spacing-xs);
+  margin-top: -24px;
+  overflow: hidden;
+  font-size: var(--mantine-font-size-xs);
+  line-height: 24px;
+  color: var(--mantine-color-dimmed);
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  pointer-events: none;
+  content: attr(aria-label);
+  background: color-mix(in srgb, var(--mantine-color-body) 88%, transparent);
+  border-radius: var(--mantine-radius-sm);
+}
@@ -1,31 +1,26 @@
 "use client";

-import type { PropsWithChildren } from "react";
 import { Box, Paper, Stack, Text } from "@mantine/core";
-import { IconBulb } from "@tabler/icons-react";

 import { useCurrentLayout, useInitialViewportWidth, useLayoutOverride, useRequiredBoard } from "@homarr/boards/context";
 import { useEditMode } from "@homarr/boards/edit-mode";
 import { getRepresentativeLayoutWidth } from "@homarr/boards/layout-preview";
-import { useI18n } from "@homarr/translation/client";
-import { FloatingTip } from "@homarr/ui";
+import { useScopedI18n } from "@homarr/translation/client";

 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";
 import { ScaledBoardCanvas } from "~/components/board/layout/scaled-board-canvas";
 import { BoardEmptySection } from "~/components/board/sections/empty-section";
 import { BoardGridEditorBoundary } from "~/components/board/sections/grid/board-grid-editor-boundary";
-import { GridEditorRegistryProvider } from "~/components/board/sections/grid/grid-editor-registry";
-import { BoardGridPortalHost } from "~/components/board/sections/grid/grid-portal-host";
+import { BoardGridPortalHost, BoardGridPortalRenderer } from "~/components/board/sections/grid/grid-portal-host";
 import { BoardSectionCollapseProvider } from "~/components/board/sections/section-collapse";
 import { BoardBackgroundVideo } from "~/components/layout/background";
 import { BoardSelectionProvider } from "~/components/board/selection/board-selection-context";
@@ -34,17 +29,10 @@ import classes from "./_client.module.css";

 const APP_SHELL_INLINE_PADDING = 32;

-const BoardSelectionGridProvider = ({ children }: PropsWithChildren) => (
-  <GridEditorRegistryProvider>
-    <BoardSelectionProvider>{children}</BoardSelectionProvider>
-  </GridEditorRegistryProvider>
-);
-
 export const ClientBoard = () => {
  const board = useRequiredBoard();
-  const t = useI18n("board.landmark");
-  const tPreview = useI18n("board.setting.section.layout.preview");
-  const tTips = useI18n("tips");
+  const t = useScopedI18n("board.landmark");
+  const tPreview = useScopedI18n("board.setting.section.layout.preview");
  const [isEditMode] = useEditMode();
  const currentLayoutId = useCurrentLayout();
  const initialViewportWidth = useInitialViewportWidth();
@@ -62,25 +50,24 @@ 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(" ");

  const content = (
-    <BoardSelectionGridProvider>
+    <BoardSelectionProvider>
      <BoardAdvancedFocusProvider>
        <Box h="100%" pos="relative" data-homarr-dev-benchmark-board>
-          <BoardAppsSpotlightRegistrar />
          <BoardBackgroundVideo />
          <BoardEmptyState />
          <BoardSetupChecklist />
@@ -93,6 +80,7 @@ export const ClientBoard = () => {
                label={board.name}
              >
                <BoardGridEditorBoundary key={currentLayoutId}>
+                  <BoardGridPortalRenderer />
                  <div className={classes.columns} style={{ gridTemplateColumns }}>
                    {leftColumnCount > 0 && leftSection && (
                      <aside
@@ -142,19 +130,9 @@ export const ClientBoard = () => {
            </BoardGridPortalHost>
          </BoardSectionCollapseProvider>
          <BoardSelectionToolbar />
-          <FloatingTip
-            opened={isEditMode}
-            showDelay={2_000}
-            dismissAfter={3_000}
-            transitionDuration={200}
-            closable={false}
-            alertProps={{ color: "primaryColor", icon: <IconBulb size={18} />, variant: "light" }}
-          >
-            {tTips("multiSelectApps")}
-          </FloatingTip>
        </Box>
      </BoardAdvancedFocusProvider>
-    </BoardSelectionGridProvider>
+    </BoardSelectionProvider>
  );

  if (representativeWidth === null) return content;
@@ -4,7 +4,6 @@ import { notFound, redirect } from "next/navigation";
 import { TRPCError } from "@trpc/server";

 import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
-import { getRscServerSettingsAsync } from "@homarr/api/server-settings-server";
 import { makeQueryClient } from "@homarr/api/shared";
 import { IntegrationProvider } from "@homarr/auth/client";
 import { auth } from "@homarr/auth/next";
@@ -16,11 +15,12 @@ import type { WidgetKind } from "@homarr/definitions";
 import { getI18n } from "@homarr/translation/server";
 import { prefetchForKindAsync } from "@homarr/widgets/prefetch";

+import { createMetaTitle } from "~/metadata";
 import { env } from "~/env";
 import { createBoardLayout } from "../_layout-creator";
 import type { Board, Item } from "../_types";
 import { ClientBoard } from "./_client";
-import { BoardContentEditAction, BoardContentSettingsAction } from "./_header-actions";
+import { BoardContentHeaderActions } from "./_header-actions";

 const logger = createLogger({ module: "createBoardContentPage" });
 const getQueryClient = cache(makeQueryClient);
@@ -36,8 +36,7 @@ export const createBoardContentPage = <TParams extends Record<string, unknown>>(
 }: Props<TParams>) => {
  return {
    layout: createBoardLayout({
-      headerBoardEditAction: <BoardContentEditAction demoReadOnly={env.DEMO_MODE && env.DEMO_READ_ONLY} />,
-      headerBoardSettingsAction: <BoardContentSettingsAction demoReadOnly={env.DEMO_MODE && env.DEMO_READ_ONLY} />,
+      headerActions: <BoardContentHeaderActions demoReadOnly={env.DEMO_MODE && env.DEMO_READ_ONLY} />,
      getInitialBoardAsync: getInitialBoard,
      withTour: true,
    }),
@@ -104,24 +103,18 @@ export const createBoardContentPage = <TParams extends Record<string, unknown>>(
    },
    generateMetadataAsync: async ({ params }: { params: Promise<TParams> }): Promise<Metadata> => {
      try {
-        const [board, t, serverSettings] = await Promise.all([
-          getInitialBoard(await params),
-          getI18n("board"),
-          getRscServerSettingsAsync(),
-        ]);
-        const brandLogo = serverSettings.branding.logoImageUrl ?? "/logo/logo.png";
-        const brandFavicon = serverSettings.branding.faviconImageUrl ?? brandLogo;
-        const favicon = !isNullOrWhitespace(board.faviconImageUrl) ? board.faviconImageUrl : brandFavicon;
+        const board = await getInitialBoard(await params);
+        const t = await getI18n();

        return {
-          title: board.metaTitle ? { absolute: board.metaTitle } : t("content.metaTitle", { boardName: board.name }),
+          title: board.metaTitle ?? createMetaTitle(t("board.content.metaTitle", { boardName: board.name })),
          icons: {
-            icon: favicon,
-            apple: favicon,
+            icon: !isNullOrWhitespace(board.faviconImageUrl) ? board.faviconImageUrl : undefined,
+            apple: !isNullOrWhitespace(board.faviconImageUrl) ? board.faviconImageUrl : undefined,
          },
          appleWebApp: {
            startupImage: {
-              url: favicon,
+              url: !isNullOrWhitespace(board.faviconImageUrl) ? board.faviconImageUrl : "/logo/logo.png",
            },
          },
        };
@@ -29,9 +29,7 @@ const AddMenu = () => {
  const { openModal: openIntegrationSelectModal } = useModalAction(IntegrationSelectModal);
  const { addContainer } = useContainerActions();
  const { createItem } = useItemActions();
-  const tBoard = useI18n("board");
-  const tIntegration = useI18n("integration");
-  const tContainer = useI18n("section.container");
+  const t = useI18n();
  const pathname = usePathname();
  const router = useRouter();
  const searchParams = useSearchParams();
@@ -79,7 +77,7 @@ const AddMenu = () => {
  return (
    <Menu position="bottom-end">
      <Menu.Target>
-        <HeaderButton w="auto" px={4} aria-label={tBoard("action.addContent")}>
+        <HeaderButton w="auto" px={4} aria-label={t("board.action.addContent")}>
          <Group gap={4} wrap="nowrap">
            <IconPlus stroke={1.5} />
            <IconChevronDown color="gray" size={16} />
@@ -88,19 +86,19 @@ const AddMenu = () => {
      </Menu.Target>
      <Menu.Dropdown style={{ transform: "translate(-3px, 0)" }}>
        <Menu.Item leftSection={<IconResize size={20} />} onClick={handleSelectItem}>
-          {tBoard("emptyState.addWidget")}
+          {t("item.action.create")}
        </Menu.Item>
        <Menu.Item leftSection={<IconBox size={20} />} onClick={handleSelectApp}>
-          {tBoard("emptyState.addApp")}
+          {t("app.action.add")}
        </Menu.Item>
        {session?.user.permissions.includes("integration-create") && (
          <Menu.Item leftSection={<IconPlug size={20} />} onClick={handleAddIntegration}>
-            {tIntegration("action.create")}
+            {t("integration.action.create")}
          </Menu.Item>
        )}
        <Menu.Divider />
        <Menu.Item leftSection={<IconLayoutGridAdd size={20} />} onClick={addContainer}>
-          {tContainer("action.create")}
+          {t("section.container.action.create")}
        </Menu.Item>
      </Menu.Dropdown>
    </Menu>
@@ -3,9 +3,18 @@
 import { useCallback, useEffect, useRef, useState } from "react";
 import dynamic from "next/dynamic";
 import { useRouter, useSearchParams } from "next/navigation";
+import { Box, Center, Loader, Menu, ScrollArea } from "@mantine/core";
 import { useHotkeys } from "@mantine/hooks";
 import { notifications } from "@mantine/notifications";
-import { IconDeviceFloppy, IconPencil, IconPencilOff, IconSettings, IconX } from "@tabler/icons-react";
+import {
+  IconDeviceFloppy,
+  IconLayoutBoard,
+  IconPencil,
+  IconPencilOff,
+  IconReplace,
+  IconSettings,
+  IconX,
+} from "@tabler/icons-react";

 import { clientApi } from "@homarr/api/client";
 import { useRequiredBoard } from "@homarr/boards/context";
@@ -15,7 +24,9 @@ import { env } from "@homarr/common/env";
 import { hotkeys } from "@homarr/definitions";
 import { useConfirmModal } from "@homarr/modals";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
-import { useI18n } from "@homarr/translation/client";
+import { useI18n, useScopedI18n } from "@homarr/translation/client";
+import { Link } from "@homarr/ui";
+
 import { useBoardPermissions } from "~/components/board/permissions/client";
 import { loadGridEditorAsync, scheduleGridEditorWarmup } from "~/components/board/sections/grid/grid-editor-loader";
 import { HeaderButton } from "~/components/layout/header/button";
@@ -39,37 +50,35 @@ const loadBoardEditorAsync = async () =>
  ]);
 const BoardEditActions = dynamic(loadEditActionsAsync, { ssr: false });

-export const BoardContentEditAction = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
+export const BoardContentHeaderActions = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
  const [isEditMode] = useEditMode();
  const board = useRequiredBoard();
+  const t = useI18n();
  const { hasChangeAccess } = useBoardPermissions(board);

-  if (!hasChangeAccess) return null;
+  if (!hasChangeAccess) {
+    return <SelectBoardsMenu />;
+  }

  return (
    <>
      {isEditMode && <BoardEditActions />}
+
      <EditModeMenu demoReadOnly={demoReadOnly} />
+
+      {!demoReadOnly && (
+        <TourTarget id="board-settings">
+          <HeaderButton href={`/boards/${board.name}/settings`} aria-label={t("board.action.settings")}>
+            <IconSettings stroke={1.5} />
+          </HeaderButton>
+        </TourTarget>
+      )}
+
+      <SelectBoardsMenu />
    </>
  );
 };

-export const BoardContentSettingsAction = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
-  const board = useRequiredBoard();
-  const t = useI18n("board");
-  const { hasChangeAccess } = useBoardPermissions(board);
-
-  if (!hasChangeAccess || demoReadOnly) return null;
-
-  return (
-    <TourTarget id="board-settings">
-      <HeaderButton href={`/boards/${board.name}/settings`} aria-label={t("action.settings")}>
-        <IconSettings stroke={1.5} />
-      </HeaderButton>
-    </TourTarget>
-  );
-};
-
 const EditModeMenu = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
  const [isEditMode, { open, close }] = useEditMode();
  const [editorLoadState, setEditorLoadState] = useState<"scheduled" | "loading" | "ready" | "error">("scheduled");
@@ -79,9 +88,8 @@ const EditModeMenu = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
  const router = useRouter();
  const searchParams = useSearchParams();
  const { openConfirmModal } = useConfirmModal();
-  const tCommon = useI18n("common");
-  const tBoardSetting = useI18n("board.setting");
-  const t = useI18n("board.action.edit");
+  const commonT = useI18n();
+  const t = useScopedI18n("board.action.edit");
  const returnToLayoutSettings =
    isEditMode &&
    searchParams.get("edit") === "true" &&
@@ -96,7 +104,7 @@ const EditModeMenu = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
    },
    onSuccess() {
      showSuccessNotification({
-        title: tCommon("notification.update.success"),
+        title: t("notification.success.title"),
        message: t("notification.success.message"),
      });
      void utils.board.getBoardByName.invalidate({ name: board.name });
@@ -107,7 +115,7 @@ const EditModeMenu = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
    },
    onError() {
      showErrorNotification({
-        title: tCommon("notification.update.error"),
+        title: t("notification.error.title"),
        message: t("notification.error.message"),
      });
    },
@@ -170,9 +178,9 @@ const EditModeMenu = ({ demoReadOnly }: { demoReadOnly: boolean }) => {

  const cancelLayoutEdit = useCallback(() => {
    openConfirmModal({
-      title: tBoardSetting("section.layout.edit.cancel.title"),
-      children: tBoardSetting("section.layout.edit.cancel.message"),
-      confirmProps: { children: tCommon("action.discard"), color: "red" },
+      title: commonT("board.setting.section.layout.edit.cancel.title"),
+      children: commonT("board.setting.section.layout.edit.cancel.message"),
+      confirmProps: { children: commonT("common.action.discard"), color: "red" },
      onConfirm() {
        void (async () => {
          await utils.board.getBoardByName.invalidate({ name: board.name });
@@ -181,7 +189,7 @@ const EditModeMenu = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
        })();
      },
    });
-  }, [board.name, close, openConfirmModal, router, tBoardSetting, tCommon, utils.board.getBoardByName]);
+  }, [board.name, close, commonT, openConfirmModal, router, utils.board.getBoardByName]);

  useHotkeys([[hotkeys.toggleBoardEdit, () => void toggle()]]);
  usePreventLeaveWithDirty(isEditMode);
@@ -192,14 +200,14 @@ const EditModeMenu = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
        <HeaderButton
          onClick={() => saveBoard(board)}
          loading={isPending}
-          aria-label={tBoardSetting("section.layout.edit.save")}
+          aria-label={commonT("board.setting.section.layout.edit.save")}
        >
          <IconDeviceFloppy stroke={1.5} />
        </HeaderButton>
        <HeaderButton
          onClick={cancelLayoutEdit}
          disabled={isPending}
-          aria-label={tBoardSetting("section.layout.edit.cancel.action")}
+          aria-label={commonT("board.setting.section.layout.edit.cancel.action")}
        >
          <IconX stroke={1.5} />
        </HeaderButton>
@@ -226,10 +234,50 @@ const EditModeMenu = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
  );
 };

+const SelectBoardsMenu = () => {
+  const t = useI18n();
+  const [isOpen, setIsOpen] = useState(false);
+  const utils = clientApi.useUtils();
+  const { data: boards = [], isPending } = clientApi.board.getAllBoards.useQuery(undefined, { enabled: isOpen });
+  const preloadBoards = () => void utils.board.getAllBoards.prefetch();
+
+  return (
+    <TourTarget id="board-switcher">
+      <Box onFocus={preloadBoards} onPointerEnter={preloadBoards}>
+        <Menu position="bottom-end" opened={isOpen} onChange={setIsOpen}>
+          <Menu.Target>
+            <HeaderButton w="auto" px={4} aria-label={t("board.action.switch")}>
+              <IconReplace stroke={1.5} />
+            </HeaderButton>
+          </Menu.Target>
+          <Menu.Dropdown style={{ transform: "translate(-7px, 0)" }}>
+            <ScrollArea.Autosize mah={300}>
+              {isPending && (
+                <Center p="xs">
+                  <Loader size="xs" />
+                </Center>
+              )}
+              {boards.map((board) => (
+                <Menu.Item
+                  key={board.id}
+                  component={Link}
+                  href={`/boards/${board.name}`}
+                  leftSection={<IconLayoutBoard size={20} />}
+                >
+                  {board.name}
+                </Menu.Item>
+              ))}
+            </ScrollArea.Autosize>
+          </Menu.Dropdown>
+        </Menu>
+      </Box>
+    </TourTarget>
+  );
+};
+
 const anchorSelector = "a[href]:not([target='_blank'])";
 const usePreventLeaveWithDirty = (isDirty: boolean) => {
-  const tBoard = useI18n("board");
-  const tCommon = useI18n("common");
+  const t = useI18n();
  const { openConfirmModal } = useConfirmModal();
  const router = useRouter();

@@ -245,13 +293,13 @@ const usePreventLeaveWithDirty = (isDirty: boolean) => {
      event.stopPropagation();

      openConfirmModal({
-        title: tBoard("action.edit.confirmLeave.title"),
-        children: tBoard("action.edit.confirmLeave.message"),
+        title: t("board.action.edit.confirmLeave.title"),
+        children: t("board.action.edit.confirmLeave.message"),
        onConfirm() {
          router.push(target.href);
        },
        confirmProps: {
-          children: tCommon("action.discard"),
+          children: t("common.action.discard"),
        },
      });
    };
@@ -277,5 +325,5 @@ const usePreventLeaveWithDirty = (isDirty: boolean) => {
      window.removeEventListener("popstate", handlePopState);
      window.removeEventListener("beforeunload", handleBeforeUnload);
    };
-  }, [isDirty, openConfirmModal, router, tBoard, tCommon]);
+  }, [isDirty, openConfirmModal, router, t]);
 };
@@ -1,33 +1,30 @@
 "use client";

 import type { PropsWithChildren } from "react";
-import { colorsTuple, createTheme, MantineProvider, rem, v8CssVariablesResolver } from "@mantine/core";
+import type { MantineColorsTuple } from "@mantine/core";
+import { colorsTuple, createTheme, darken, lighten, MantineProvider, rem, v8CssVariablesResolver } from "@mantine/core";

 import { useRequiredBoard } from "@homarr/boards/context";
 import type { ColorScheme } from "@homarr/definitions";
-import { useSettings } from "@homarr/settings";

 import { useColorSchemeManager } from "../../_client-providers/mantine";
-import { generateColorScale } from "~/theme/branding";

 export const BoardMantineProvider = ({
  children,
  defaultColorScheme,
 }: PropsWithChildren<{ defaultColorScheme: ColorScheme }>) => {
  const board = useRequiredBoard();
-  const { branding } = useSettings();
  const colorSchemeManager = useColorSchemeManager();
-  const primaryColor = branding.lockPrimaryColor ? branding.primaryColor : board.primaryColor;

  const theme = createTheme({
    colors: {
-      primaryColor: generateColorScale(primaryColor),
-      secondaryColor: generateColorScale(board.secondaryColor),
-      iconColor: board.iconColor ? generateColorScale(board.iconColor) : colorsTuple("#000000"),
+      primaryColor: generateColors(board.primaryColor),
+      secondaryColor: generateColors(board.secondaryColor),
+      iconColor: board.iconColor ? generateColors(board.iconColor) : colorsTuple("#000000"),
    },
    primaryColor: "primaryColor",
    autoContrast: true,
-    defaultRadius: branding.defaultRadius,
+    defaultRadius: "sm",
    fontSizes: {
      "2xl": rem(24),
      "3xl": rem(28),
@@ -46,3 +43,29 @@ export const BoardMantineProvider = ({
    </MantineProvider>
  );
 };
+
+export const generateColors = (hex: string) => {
+  const lightnessForColors = [-0.25, -0.2, -0.15, -0.1, -0.05, 0, 0.05, 0.1, 0.15, 0.2] as const;
+  const rgbaColors = lightnessForColors.map((lightness) => {
+    if (lightness < 0) {
+      return lighten(hex, -lightness);
+    }
+    return darken(hex, lightness);
+  });
+
+  return rgbaColors.map((color) => {
+    return (
+      "#" +
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      color
+        .split("(")[1]!
+        .replaceAll(" ", "")
+        .replace(")", "")
+        .split(",")
+        .map((color) => parseInt(color, 10))
+        .slice(0, 3)
+        .map((color) => color.toString(16).padStart(2, "0"))
+        .join("")
+    );
+  }) as unknown as MantineColorsTuple;
+};
@@ -1,6 +1,5 @@
 import { IconHomeOff } from "@tabler/icons-react";

-import { getRscServerSettingsAsync } from "@homarr/api/server-settings-server";
 import { auth } from "@homarr/auth/next";
 import { db } from "@homarr/db";
 import { boards } from "@homarr/db/schema";
@@ -8,7 +7,6 @@ import { getI18n } from "@homarr/translation/server";

 import type { BoardNotFoundProps } from "~/components/board/not-found";
 import { BoardNotFound } from "~/components/board/not-found";
-import { homarrLogoPath } from "~/components/layout/logo/constants";

 export default async function NotFoundBoardHomePage() {
  const boardNotFoundProps = await getPropsAsync();
@@ -18,16 +16,15 @@ export default async function NotFoundBoardHomePage() {

 const getPropsAsync = async (): Promise<BoardNotFoundProps> => {
  const boardCount = await db.$count(boards);
-  const t = await getI18n("board");
+  const t = await getI18n();

  if (boardCount === 0) {
-    const { branding } = await getRscServerSettingsAsync();
    return {
-      icon: { src: branding.logoImageUrl ?? homarrLogoPath, alt: `${branding.appName} logo` },
-      title: t("error.noBoard.title"),
-      description: t("error.noBoard.description"),
-      link: { label: t("error.noBoard.link"), href: "/manage/boards" },
-      notice: t("error.noBoard.notice"),
+      icon: { src: "/favicon.ico", alt: "Homarr logo" },
+      title: t("board.error.noBoard.title"),
+      description: t("board.error.noBoard.description"),
+      link: { label: t("board.error.noBoard.link"), href: "/manage/boards" },
+      notice: t("board.error.noBoard.notice"),
    };
  }

@@ -42,9 +39,9 @@ const getPropsAsync = async (): Promise<BoardNotFoundProps> => {

  return {
    icon: IconHomeOff,
-    title: t("error.homeBoard.title"),
-    description: t(`error.homeBoard.${type}.description` as never),
-    link: { label: t(`error.homeBoard.${type}.link` as never), href },
-    notice: t(`error.homeBoard.${type}.notice` as never),
+    title: t(`board.error.homeBoard.title`),
+    description: t(`board.error.homeBoard.${type}.description`),
+    link: { label: t(`board.error.homeBoard.${type}.link`), href },
+    notice: t(`board.error.homeBoard.${type}.notice`),
  };
 };
@@ -22,10 +22,9 @@ import { IconX } from "@tabler/icons-react";
 import type { UseFormReturnType } from "@homarr/form";
 import { useI18n } from "@homarr/translation/client";
 import { BoardColorInput } from "@homarr/ui";
-import { useSettings } from "@homarr/settings";

 import { SectionCard } from "~/components/manage/section-card";
-import { generateColorScale } from "~/theme/branding";
+import { generateColors } from "../../(content)/_theme";
 import type { FormValues } from "./_settings-form";

 interface Props {
@@ -38,29 +37,22 @@ const progressPercentageLabel = (value: number) => `${value}%`;

 export const ColorSettingsContent = ({ form }: Props) => {
  const [showPreview, { toggle }] = useDisclosure(false);
-  const tBoard = useI18n("board");
-  const tCommon = useI18n("common");
+  const t = useI18n();
  const theme = useMantineTheme();
-  const { branding } = useSettings();

  return (
-    <SectionCard title={tBoard("setting.section.appearance.title")}>
+    <SectionCard title={t("board.setting.section.appearance.title")}>
      <Grid>
        <Grid.Col span={{ sm: 12, md: 6 }}>
          <Stack gap="xs">
-            <BoardColorInput
-              label={tBoard("field.primaryColor.label")}
-              description={branding.lockPrimaryColor ? tBoard("field.primaryColor.locked") : undefined}
-              disabled={branding.lockPrimaryColor}
-              {...form.getInputProps("primaryColor")}
-            />
+            <BoardColorInput label={t("board.field.primaryColor.label")} {...form.getInputProps("primaryColor")} />
          </Stack>
        </Grid.Col>
        <Grid.Col span={{ sm: 12, md: 6 }}>
-          <BoardColorInput label={tBoard("field.secondaryColor.label")} {...form.getInputProps("secondaryColor")} />
+          <BoardColorInput label={t("board.field.secondaryColor.label")} {...form.getInputProps("secondaryColor")} />
        </Grid.Col>
        <Grid.Col span={12}>
-          <Anchor onClick={toggle}>{showPreview ? tCommon("preview.hide") : tCommon("preview.show")}</Anchor>
+          <Anchor onClick={toggle}>{showPreview ? t("common.preview.hide") : t("common.preview.show")}</Anchor>
        </Grid.Col>
        <Grid.Col span={12}>
          <Collapse expanded={showPreview}>
@@ -71,7 +63,7 @@ export const ColorSettingsContent = ({ form }: Props) => {
          </Collapse>
        </Grid.Col>
        <Grid.Col span={{ sm: 12, md: 6 }}>
-          <InputWrapper label={tBoard("field.opacity.label")}>
+          <InputWrapper label={t("board.field.opacity.label")}>
            <Slider
              my={6}
              min={0}
@@ -85,7 +77,7 @@ export const ColorSettingsContent = ({ form }: Props) => {
        <Grid.Col span={{ sm: 12, md: 6 }}>
          <Group align="end">
            <ColorInput
-              label={tBoard("field.iconColor.label")}
+              label={t("board.field.iconColor.label")}
              format="hex"
              swatches={Object.values(theme.colors).map((color) => color[6])}
              flex={1}
@@ -98,20 +90,20 @@ export const ColorSettingsContent = ({ form }: Props) => {
              onClick={() => form.setFieldValue("iconColor", "")}
              disabled={!form.values.iconColor}
            >
-              {tBoard("field.clearColor.label")}
+              {t("board.field.clearColor.label")}
            </Button>
          </Group>
        </Grid.Col>
        <Grid.Col span={{ sm: 12, md: 6 }}>
          <Select
-            label={tBoard("field.itemRadius.label")}
-            description={tBoard("field.itemRadius.description")}
+            label={t("board.field.itemRadius.label")}
+            description={t("board.field.itemRadius.description")}
            data={[
-              { label: tBoard("field.itemRadius.option.xs"), value: "xs" },
-              { label: tBoard("field.itemRadius.option.sm"), value: "sm" },
-              { label: tBoard("field.itemRadius.option.md"), value: "md" },
-              { label: tBoard("field.itemRadius.option.lg"), value: "lg" },
-              { label: tBoard("field.itemRadius.option.xl"), value: "xl" },
+              { label: t("board.field.itemRadius.option.xs"), value: "xs" },
+              { label: t("board.field.itemRadius.option.sm"), value: "sm" },
+              { label: t("board.field.itemRadius.option.md"), value: "md" },
+              { label: t("board.field.itemRadius.option.lg"), value: "lg" },
+              { label: t("board.field.itemRadius.option.xl"), value: "xl" },
            ]}
            {...form.getInputProps("itemRadius")}
          />
@@ -128,8 +120,7 @@ interface ColorsPreviewProps {
 const ColorsPreview = ({ previewColor }: ColorsPreviewProps) => {
  const theme = useMantineTheme();

-  const colors =
-    previewColor && hexRegex.test(previewColor) ? generateColorScale(previewColor) : generateColorScale("#000000");
+  const colors = previewColor && hexRegex.test(previewColor) ? generateColors(previewColor) : generateColors("#000000");

  return (
    <Group gap={0} wrap="nowrap">
@@ -23,7 +23,7 @@ interface Props {
 }

 export const BackgroundSettingsContent = ({ form }: Props) => {
-  const tBoard = useI18n("board");
+  const t = useI18n();
  const { data: session } = useSession();

  const [debouncedSearch] = useDebouncedValue(form.values.backgroundImageUrl ?? "", 200);
@@ -44,7 +44,7 @@ export const BackgroundSettingsContent = ({ form }: Props) => {
  const backgroundImageRepeatData = useBackgroundOptionData("backgroundImageRepeat", backgroundImageRepeats);

  return (
-    <SectionCard title={tBoard("setting.section.background.title")}>
+    <SectionCard title={t("board.setting.section.background.title")}>
      <Grid>
        <Grid.Col span={12}>
          <Group wrap="nowrap" gap="xs" w="100%" align="start">
@@ -67,8 +67,8 @@ export const BackgroundSettingsContent = ({ form }: Props) => {
              }
              // We filter it on the server
              filter={({ options }) => options}
-              label={tBoard("field.backgroundImageUrl.label")}
-              placeholder={`${tBoard("field.backgroundImageUrl.placeholder")}...`}
+              label={t("board.field.backgroundImageUrl.label")}
+              placeholder={`${t("board.field.backgroundImageUrl.placeholder")}...`}
              renderOption={({ option }) => {
                const current = imageMap.get(option.value);
                if (!current) return null;
@@ -87,13 +87,13 @@ export const BackgroundSettingsContent = ({ form }: Props) => {
              }}
              data={[
                {
-                  group: tBoard("field.backgroundImageUrl.group.your"),
+                  group: t("board.field.backgroundImageUrl.group.your"),
                  items: images
                    .filter((media) => media.creatorId === session?.user.id)
                    .map((media) => `/api/user-medias/${media.id}`),
                },
                {
-                  group: tBoard("field.backgroundImageUrl.group.other"),
+                  group: t("board.field.backgroundImageUrl.group.other"),
                  items: images
                    .filter((media) => media.creatorId !== session?.user.id)
                    .map((media) => `/api/user-medias/${media.id}`),
@@ -123,21 +123,21 @@ export const BackgroundSettingsContent = ({ form }: Props) => {
        </Grid.Col>
        <Grid.Col span={12}>
          <SelectWithDescriptionBadge
-            label={tBoard("field.backgroundImageAttachment.label")}
+            label={t("board.field.backgroundImageAttachment.label")}
            data={backgroundImageAttachmentData}
            {...form.getInputProps("backgroundImageAttachment")}
          />
        </Grid.Col>
        <Grid.Col span={12}>
          <SelectWithDescriptionBadge
-            label={tBoard("field.backgroundImageSize.label")}
+            label={t("board.field.backgroundImageSize.label")}
            data={backgroundImageSizeData}
            {...form.getInputProps("backgroundImageSize")}
          />
        </Grid.Col>
        <Grid.Col span={12}>
          <SelectWithDescriptionBadge
-            label={tBoard("field.backgroundImageRepeat.label")}
+            label={t("board.field.backgroundImageRepeat.label")}
            data={backgroundImageRepeatData}
            {...form.getInputProps("backgroundImageRepeat")}
          />
@@ -176,20 +176,19 @@ const useBackgroundOptionData = <
    defaultValue: keyof TOptions;
  },
 ) => {
-  const tBoard = useI18n("board");
-  const tCommon = useI18n("common");
+  const t = useI18n();

  return data.values.map(
    (value) =>
      ({
-        label: tBoard(`field.${key}.option.${value as string}.label` as never),
-        description: tBoard(`field.${key}.option.${value as string}.description` as never),
+        label: t(`board.field.${key}.option.${value as string}.label` as never),
+        description: t(`board.field.${key}.option.${value as string}.description` as never),
        value: value as string,
        badge:
          data.defaultValue === value
            ? {
                color: "blue",
-                label: tCommon("select.badge.recommended"),
+                label: t("common.select.badge.recommended"),
              }
            : undefined,
      }) satisfies SelectItemWithDescriptionBadge,
@@ -13,13 +13,13 @@ interface Props {
 }

 export const BehaviorSettingsContent = ({ form }: Props) => {
-  const t = useI18n("board");
+  const t = useI18n();

  return (
-    <SectionCard title={t("setting.section.behavior.title")}>
+    <SectionCard title={t("board.setting.section.behavior.title")}>
      <Switch
-        label={t("field.disableStatus.label")}
-        description={t("field.disableStatus.description")}
+        label={t("board.field.disableStatus.label")}
+        description={t("board.field.disableStatus.description")}
        {...form.getInputProps("disableStatus", { type: "checkbox" })}
      />
    </SectionCard>
@@ -19,7 +19,7 @@ export const BoardAccessSettings = ({ board, initialPermissions }: Props) => {
  const groupMutation = clientApi.board.saveGroupBoardPermissions.useMutation();
  const userMutation = clientApi.board.saveUserBoardPermissions.useMutation();
  const utils = clientApi.useUtils();
-  const tBoard = useI18n("board");
+  const t = useI18n();

  const { data: permissions } = clientApi.board.getBoardPermissions.useQuery(
    {
@@ -52,7 +52,7 @@ export const BoardAccessSettings = ({ board, initialPermissions }: Props) => {
        mutate: userMutation.mutate,
        isPending: userMutation.isPending,
      }}
-      translate={(key) => tBoard(`setting.section.access.permission.item.${key}.label` as never)}
+      translate={(key) => t(`board.setting.section.access.permission.item.${key}.label`)}
      permission={{
        items: boardPermissions,
        default: "view",
@@ -10,7 +10,7 @@ import { IconInfoCircle } from "@tabler/icons-react";

 import { useSession } from "@homarr/auth/client";
 import type { UseFormReturnType } from "@homarr/form";
-import { useI18n } from "@homarr/translation/client";
+import { useI18n, useScopedI18n } from "@homarr/translation/client";

 import { SectionCard } from "~/components/manage/section-card";
 import { WorkshopCssImportButton } from "~/components/workshop/workshop-css-import-button";
@@ -24,11 +24,11 @@ interface Props {
 export const CustomCssSettingsContent = ({ form }: Props) => {
  const { data: session } = useSession();
  const isAdmin = session?.user.permissions.includes("admin") ?? false;
-  const t = useI18n("board");
-  const customCssT = useI18n("board.field.customCss");
+  const t = useI18n();
+  const customCssT = useScopedI18n("board.field.customCss");

  return (
-    <SectionCard title={t("setting.section.customCss.title")}>
+    <SectionCard title={t("board.setting.section.customCss.title")}>
      <CustomCssInput {...form.getInputProps("customCss")} />

      <Alert variant="light" color="cyan" title={customCssT("customClassesAlert.title")} icon={<IconInfoCircle />}>
@@ -46,7 +46,7 @@ interface CustomCssInputProps {
 }

 const CustomCssInput = ({ value, onChange, error }: CustomCssInputProps) => {
-  const customCssT = useI18n("board.field.customCss");
+  const customCssT = useScopedI18n("board.field.customCss");

  return (
    <Input.Wrapper
@@ -1,87 +1,85 @@
 "use client";

-import { useEffect, useRef, useState } from "react";
+import { useCallback } from "react";
 import { useRouter } from "next/navigation";
-import { Box, Button, Group, TextInput } from "@mantine/core";
+import { Button } from "@mantine/core";

 import { clientApi } from "@homarr/api/client";
 import { useRequiredBoard } from "@homarr/boards/context";
-import { useZodForm } from "@homarr/form";
-import { useI18n } from "@homarr/translation/client";
-import { InlineConfirmButton } from "@homarr/ui";
-import { boardRenameSchema } from "@homarr/validation/board";
+import { useConfirmModal, useModalAction } from "@homarr/modals";
+import { useScopedI18n } from "@homarr/translation/client";

+import { BoardRenameModal } from "~/components/board/modals/board-rename-modal";
 import { DangerZoneItem, DangerZoneRoot } from "~/components/manage/danger-zone";

 export const DangerZoneSettingsContent = ({ hideVisibility }: { hideVisibility: boolean }) => {
  const board = useRequiredBoard();
-  const t = useI18n("board.setting");
-  const tCommonAction = useI18n("common.action");
+  const t = useScopedI18n("board.setting");
  const router = useRouter();
-  const utils = clientApi.useUtils();
-  const [isRenaming, setIsRenaming] = useState(false);
-  const renameInputRef = useRef<HTMLInputElement>(null);
-  const renameForm = useZodForm(boardRenameSchema.omit({ id: true }), {
-    initialValues: {
-      name: board.name,
-    },
-  });
-  const { mutate: renameBoard, isPending: isRenamePending } = clientApi.board.renameBoard.useMutation({
-    onSettled() {
-      void utils.board.getBoardByName.invalidate({ name: board.name });
-      void utils.board.getHomeBoard.invalidate();
-    },
-  });
+  const { openConfirmModal } = useConfirmModal();
+  const { openModal } = useModalAction(BoardRenameModal);
  const { mutate: changeVisibility, isPending: isChangeVisibilityPending } =
    clientApi.board.changeBoardVisibility.useMutation();
  const { mutate: deleteBoard, isPending: isDeletePending } = clientApi.board.deleteBoard.useMutation();
+  const utils = clientApi.useUtils();
  const visibility = board.isPublic ? "public" : "private";

-  useEffect(() => {
-    if (isRenaming) renameInputRef.current?.focus();
-  }, [isRenaming]);
-
-  const handleRename = renameForm.onSubmit((values) => {
-    renameBoard(
-      { id: board.id, name: values.name },
-      {
-        onSuccess() {
-          router.push(`/boards/${values.name}/settings`);
-        },
-      },
-    );
-  });
-
-  const cancelRename = () => {
-    renameForm.reset();
-    setIsRenaming(false);
-  };
-
-  const handleVisibilityChange = () => {
-    changeVisibility(
-      {
+  const onRenameClick = useCallback(
+    () =>
+      openModal({
        id: board.id,
-        visibility: visibility === "public" ? "private" : "public",
-      },
-      {
-        onSettled() {
-          void utils.board.getBoardByName.invalidate({ name: board.name });
-          void utils.board.getHomeBoard.invalidate();
-        },
-      },
-    );
-  };
+        previousName: board.name,
+        onSuccess: (name) => router.push(`/boards/${name}/settings`),
+      }),
+    [board.id, board.name, router, openModal],
+  );

-  const handleDelete = () => {
-    deleteBoard(
-      { id: board.id },
-      {
-        onSettled: () => {
-          router.push("/");
-        },
+  const onVisibilityClick = useCallback(() => {
+    openConfirmModal({
+      title: t(`section.dangerZone.action.visibility.confirm.${visibility}.title`),
+      children: t(`section.dangerZone.action.visibility.confirm.${visibility}.description`),
+      onConfirm: () => {
+        changeVisibility(
+          {
+            id: board.id,
+            visibility: visibility === "public" ? "private" : "public",
+          },
+          {
+            onSettled() {
+              void utils.board.getBoardByName.invalidate({ name: board.name });
+              void utils.board.getHomeBoard.invalidate();
+            },
+          },
+        );
      },
-    );
-  };
+    });
+  }, [
+    board.id,
+    board.name,
+    changeVisibility,
+    t,
+    utils.board.getBoardByName,
+    utils.board.getHomeBoard,
+    visibility,
+    openConfirmModal,
+  ]);
+
+  const onDeleteClick = useCallback(() => {
+    openConfirmModal({
+      title: t("section.dangerZone.action.delete.confirm.title"),
+      children: t("section.dangerZone.action.delete.confirm.description"),
+      onConfirm: () => {
+        deleteBoard(
+          { id: board.id },
+          {
+            onSettled: () => {
+              router.push("/");
+            },
+          },
+        );
+      },
+    });
+  }, [board.id, deleteBoard, router, t, openConfirmModal]);

  return (
    <DangerZoneRoot>
@@ -89,28 +87,9 @@ export const DangerZoneSettingsContent = ({ hideVisibility }: { hideVisibility:
        label={t("section.dangerZone.action.rename.label")}
        description={t("section.dangerZone.action.rename.description")}
        action={
-          isRenaming ? (
-            <Box component="form" onSubmit={handleRename}>
-              <Group wrap="wrap" justify="end">
-                <TextInput
-                  ref={renameInputRef}
-                  aria-label={t("section.dangerZone.action.rename.label")}
-                  size="sm"
-                  {...renameForm.getInputProps("name")}
-                />
-                <Button variant="default" onClick={cancelRename} disabled={isRenamePending}>
-                  {tCommonAction("cancel")}
-                </Button>
-                <Button type="submit" color="red" loading={isRenamePending}>
-                  {tCommonAction("confirm")}
-                </Button>
-              </Group>
-            </Box>
-          ) : (
-            <Button variant="subtle" color="red" onClick={() => setIsRenaming(true)}>
-              {t("section.dangerZone.action.rename.button")}
-            </Button>
-          )
+          <Button variant="subtle" color="red" onClick={onRenameClick}>
+            {t("section.dangerZone.action.rename.button")}
+          </Button>
        }
      />
      {!hideVisibility && (
@@ -118,31 +97,19 @@ export const DangerZoneSettingsContent = ({ hideVisibility }: { hideVisibility:
          label={t("section.dangerZone.action.visibility.label")}
          description={t(`section.dangerZone.action.visibility.description.${visibility}`)}
          action={
-            <InlineConfirmButton
-              variant="subtle"
-              color="red"
-              loading={isChangeVisibilityPending}
-              onConfirm={handleVisibilityChange}
-              confirmLabel={tCommonAction("confirm")}
-            >
+            <Button variant="subtle" color="red" loading={isChangeVisibilityPending} onClick={onVisibilityClick}>
              {t(`section.dangerZone.action.visibility.button.${visibility}`)}
-            </InlineConfirmButton>
+            </Button>
          }
        />
      )}
      <DangerZoneItem
-        label={tCommonAction("delete")}
+        label={t("section.dangerZone.action.delete.label")}
        description={t("section.dangerZone.action.delete.description")}
        action={
-          <InlineConfirmButton
-            variant="subtle"
-            color="red"
-            loading={isDeletePending}
-            onConfirm={handleDelete}
-            confirmLabel={tCommonAction("confirm")}
-          >
-            {tCommonAction("delete")}
-          </InlineConfirmButton>
+          <Button variant="subtle" color="red" loading={isDeletePending} onClick={onDeleteClick}>
+            {t("section.dangerZone.action.delete.button")}
+          </Button>
        }
      />
    </DangerZoneRoot>
@@ -8,9 +8,9 @@ import { useUpdateBoard } from "@homarr/boards/updater";
 import type { UseFormReturnType } from "@homarr/form";
 import { IconPicker } from "@homarr/forms-collection";
 import { useI18n } from "@homarr/translation/client";
-import { useSettings } from "@homarr/settings";

 import { SectionCard } from "~/components/manage/section-card";
+import { createMetaTitle } from "~/metadata";
 import type { Board } from "../../_types";
 import type { FormValues } from "./_settings-form";

@@ -20,27 +20,25 @@ interface Props {
 }

 export const GeneralSettingsContent = ({ board, form }: Props) => {
-  const t = useI18n("board");
-  const { branding } = useSettings();
-  const defaultMetaTitle = t("content.metaTitle", { boardName: board.name });
+  const t = useI18n();

  useLogoPreview(form.values.logoImageUrl);
-  const metaTitleStatus = useMetaTitlePreview(form.values.metaTitle, defaultMetaTitle);
+  const metaTitleStatus = useMetaTitlePreview(form.values.metaTitle);

  return (
-    <SectionCard title={t("setting.section.general.title")}>
+    <SectionCard title={t("board.setting.section.general.title")}>
      <Grid>
        <Grid.Col span={{ xs: 12, md: 6 }}>
          <TextInput
-            label={t("field.pageTitle.label")}
-            placeholder={branding.appName}
+            label={t("board.field.pageTitle.label")}
+            placeholder="Homarr"
            {...form.getInputProps("pageTitle")}
          />
        </Grid.Col>
        <Grid.Col span={{ xs: 12, md: 6 }}>
          <TextInput
-            label={t("field.metaTitle.label")}
-            placeholder={defaultMetaTitle}
+            label={t("board.field.metaTitle.label")}
+            placeholder={createMetaTitle(t("board.content.metaTitle", { boardName: board.name }))}
            rightSection={metaTitleStatus.isPending && <Loader size="xs" />}
            {...form.getInputProps("metaTitle")}
          />
@@ -48,16 +46,16 @@ export const GeneralSettingsContent = ({ board, form }: Props) => {
        <Grid.Col span={{ xs: 12, md: 6 }}>
          <IconPicker
            {...form.getInputProps("logoImageUrl")}
-            label={t("field.logoImageUrl.label")}
-            placeholder={branding.logoImageUrl ?? "/logo/logo.png"}
+            label={t("board.field.logoImageUrl.label")}
+            placeholder="/logo/logo.png"
            withAsterisk={false}
          />
        </Grid.Col>
        <Grid.Col span={{ xs: 12, md: 6 }}>
          <IconPicker
            {...form.getInputProps("faviconImageUrl")}
-            label={t("field.faviconImageUrl.label")}
-            placeholder={branding.faviconImageUrl ?? branding.logoImageUrl ?? "/logo/logo.png"}
+            label={t("board.field.faviconImageUrl.label")}
+            placeholder="/logo/logo.png"
            withAsterisk={false}
          />
        </Grid.Col>
@@ -78,9 +76,9 @@ const useLogoPreview = (url: string | null) => {
  }, [logoDebounced, updateBoard]);
 };

-const useMetaTitlePreview = (title: string | null, fallbackTitle: string) => {
+const useMetaTitlePreview = (title: string | null) => {
  const [metaTitleDebounced] = useDebouncedValue(title ?? "", 200);
-  useDocumentTitle(metaTitleDebounced.trim() || fallbackTitle);
+  useDocumentTitle(metaTitleDebounced);

  return {
    isPending: (title ?? "") !== metaTitleDebounced,
@@ -6,10 +6,10 @@ import { IconLayoutGrid } from "@tabler/icons-react";
 import type { RouterOutputs } from "@homarr/api";
 import type { BoardPreviewLayout } from "@homarr/boards/layout-preview";
 import { getRepresentativeLayoutWidth, projectBoardLayout } from "@homarr/boards/layout-preview";
-import { getBoardLaneColumnCount, getRootSectionLane, getWidgetName } from "@homarr/definitions";
+import { getBoardLaneColumnCount, getRootSectionLane } from "@homarr/definitions";
 import { useI18n } from "@homarr/translation/client";
 import { MaskedOrNormalImage } from "@homarr/ui";
-import { widgetCatalogIcons } from "@homarr/ui/widget-icons";
+import { widgetCatalogIcons } from "@homarr/widgets/catalog";

 import type { Board } from "../../_types";
 import classes from "./_layout-preview.module.css";
@@ -23,8 +23,6 @@ interface Props {
 }

 export const LayoutPreview = ({ board, layout, layouts, sourceLayout, apps }: Props) => {
-  const tBoard = useI18n("board");
-  const tSection = useI18n("section");
  const t = useI18n();
  const elements = projectBoardLayout(board, sourceLayout, layout);
  const representativeWidth = getRepresentativeLayoutWidth(layout, layouts);
@@ -44,13 +42,13 @@ export const LayoutPreview = ({ board, layout, layouts, sourceLayout, apps }: Pr
          {representativeWidth}px
        </Badge>
        <Text size="xs">
-          {layout.columnCount} {tBoard("setting.section.layout.preview.columns")}
+          {layout.columnCount} {t("board.setting.section.layout.preview.columns")}
        </Text>
      </Group>
      <Box w={{ base: "100%", md: `max(${previewWidth}, 14rem)` }} maw="100%" className={classes.canvas}>
        {elements.length === 0 ? (
          <Text size="xs" c="dimmed" ta="center" py="xl">
-            {tBoard("setting.section.layout.preview.empty")}
+            {t("board.setting.section.layout.preview.empty")}
          </Text>
        ) : (
          <Stack gap="xs">
@@ -78,8 +76,8 @@ export const LayoutPreview = ({ board, layout, layouts, sourceLayout, apps }: Pr
                      const containerLabel =
                        container?.kind === "container" && container.options.title
                          ? container.options.title
-                          : tSection("container.untitled");
-                      const label = app?.name ?? (item ? getWidgetName(item.kind, t) : containerLabel);
+                          : t("section.container.untitled");
+                      const label = app?.name ?? (item ? t(`widget.${item.kind}.name`) : containerLabel);
                      const WidgetIcon = item ? widgetCatalogIcons[item.kind] : IconLayoutGrid;

                      return (
@@ -23,9 +23,9 @@ import { IconEdit, IconRefresh } from "@tabler/icons-react";
 import { clientApi } from "@homarr/api/client";
 import { createId } from "@homarr/common";
 import type { UseFormReturnType } from "@homarr/form";
+import { useConfirmModal } from "@homarr/modals";
 import { showErrorNotification } from "@homarr/notifications";
 import { useI18n } from "@homarr/translation/client";
-import { InlineConfirmButton } from "@homarr/ui";

 import { SectionCard } from "~/components/manage/section-card";
 import type { Board } from "../../_types";
@@ -40,21 +40,18 @@ interface Props {
  saveSettingsAsync: () => Promise<FormValues | null>;
 }

-const layoutRoleOrder = { base: 0, custom: 1, mobile: 2 } as const;
-
 export const LayoutSettingsContent = ({ board, form, isSaving, saveSettingsAsync }: Props) => {
-  const tBoard = useI18n("board");
-  const tLayout = useI18n("layout");
-  const tCommon = useI18n("common");
+  const t = useI18n();
  const router = useRouter();
  const utils = clientApi.useUtils();
+  const { openConfirmModal } = useConfirmModal();
  const [editingLayoutId, setEditingLayoutId] = useState<string | null>(null);
  const [resettingLayoutId, setResettingLayoutId] = useState<string | null>(null);
  const { mutateAsync: resetLayout } = clientApi.board.resetLayout.useMutation({
    onError() {
      showErrorNotification({
-        title: tCommon("notification.update.error"),
-        message: tCommon("notification.update.error"),
+        title: t("common.notification.update.error"),
+        message: t("common.notification.update.error"),
      });
    },
  });
@@ -85,35 +82,45 @@ export const LayoutSettingsContent = ({ board, form, isSaving, saveSettingsAsync
    }
  };

-  const handleReset = async (layout: FormValues["layouts"][number]) => {
-    setResettingLayoutId(layout.id);
-    try {
-      const canonicalLayout = board.layouts.find((candidate) => candidate.id === layout.id);
-      if (!canonicalLayout) return;
+  const confirmReset = (layout: FormValues["layouts"][number]) => {
+    openConfirmModal({
+      title: t("board.setting.section.layout.reset.confirm.title", { layoutName: layout.name }),
+      children: t("board.setting.section.layout.reset.confirm.message"),
+      confirmProps: { children: t("board.setting.section.layout.reset.action"), color: "red" },
+      onConfirm() {
+        setResettingLayoutId(layout.id);
+        void (async () => {
+          try {
+            const savedValues = form.isDirty() ? await saveSettingsAsync() : form.values;
+            const canonicalLayout = savedValues ? findCanonicalLayout(savedValues.layouts, layout) : undefined;
+            if (!canonicalLayout) return;

-      await resetLayout({ boardId: board.id, layoutId: canonicalLayout.id });
-      await utils.board.getBoardByName.invalidate({ name: board.name });
-      router.refresh();
-    } catch {
-      // The mutation callback displays the error notification.
-    } finally {
-      setResettingLayoutId(null);
-    }
+            await resetLayout({ boardId: board.id, layoutId: canonicalLayout.id });
+            await utils.board.getBoardByName.invalidate({ name: board.name });
+            router.refresh();
+          } catch {
+            // The mutation callback displays the error notification.
+          } finally {
+            setResettingLayoutId(null);
+          }
+        })();
+      },
+    });
  };

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

  return (
-    <SectionCard title={tBoard("setting.section.layout.title")}>
+    <SectionCard title={t("board.setting.section.layout.title")}>
      <Stack gap="lg">
        <Group justify="space-between" align="flex-start" wrap="wrap">
          <Stack gap={2} maw="52rem">
-            <Text fw={500}>{tBoard("setting.section.layout.responsive.title")}</Text>
-            <Text size="sm">{tBoard("setting.section.layout.responsive.description")}</Text>
+            <Text fw={500}>{t("board.setting.section.layout.responsive.title")}</Text>
+            <Text size="sm">{t("board.setting.section.layout.responsive.description")}</Text>
          </Stack>
          <Button
            type="button"
@@ -121,36 +128,40 @@ 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: t("board.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")}
+            {t("board.setting.section.layout.responsive.action.add")}
          </Button>
        </Group>

-        {displayedLayouts.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
+            .filter((candidate) => candidate.role === "custom" && candidate.id !== layout.id)
+            .map((candidate) => candidate.breakpoint);
+          const baseBreakpoint = form.values.layouts.find((candidate) => candidate.role === "base")?.breakpoint ?? 768;

          return (
            <Fieldset
              key={layout.id}
              legend={
                <Group gap="xs">
-                  <Text>{layout.name || tBoard(`setting.section.layout.role.${layout.role}` as never)}</Text>
+                  <Text>{layout.name || t(`board.setting.section.layout.role.${layout.role}`)}</Text>
                  <Badge size="sm" variant="default">
-                    {tBoard(`setting.section.layout.role.${layout.role}` as never)}
+                    {t(`board.setting.section.layout.role.${layout.role}`)}
                  </Badge>
                </Group>
              }
@@ -159,10 +170,10 @@ export const LayoutSettingsContent = ({ board, form, isSaving, saveSettingsAsync
              <Grid gap={{ base: "lg", xl: "xl" }} align="flex-start">
                <Grid.Col span={{ base: 12, md: 6, lg: 4 }}>
                  <Stack gap="md">
-                    <TextInput {...form.getInputProps(`layouts.${index}.name`)} label={tCommon("field.name")} />
-                    <Input.Wrapper label={tLayout("field.columnCount.label")}>
+                    <TextInput {...form.getInputProps(`layouts.${index}.name`)} label={t("layout.field.name.label")} />
+                    <Input.Wrapper label={t("layout.field.columnCount.label")}>
                      <Slider
-                        thumbLabel={`${tLayout("field.columnCount.label")} — ${layout.name}`}
+                        thumbLabel={`${t("layout.field.columnCount.label")} — ${layout.name}`}
                        mt="xs"
                        min={1}
                        max={24}
@@ -183,16 +194,20 @@ export const LayoutSettingsContent = ({ board, form, isSaving, saveSettingsAsync
                    </Input.Wrapper>
                    <NumberInput
                      {...form.getInputProps(`layouts.${index}.breakpoint`)}
-                      label={tLayout("field.breakpoint.label")}
+                      label={t("layout.field.breakpoint.label")}
                      description={
                        layout.role === "mobile"
-                          ? tBoard("setting.section.layout.mobile.breakpointDescription")
-                          : tLayout("field.breakpoint.description")
+                          ? t("board.setting.section.layout.mobile.breakpointDescription")
+                          : t("layout.field.breakpoint.description")
                      }
                      disabled={layout.role === "mobile"}
                      styles={{ description: { color: "var(--mantine-color-text)" } }}
-                      min={layout.role === "mobile" ? 0 : 1}
-                      max={32767}
+                      min={
+                        layout.role === "base"
+                          ? Math.max(1, ...customBreakpoints.map((breakpoint) => breakpoint + 1))
+                          : 1
+                      }
+                      max={layout.role === "custom" ? baseBreakpoint - 1 : 32767}
                    />
                  </Stack>
                </Grid.Col>
@@ -223,17 +238,16 @@ export const LayoutSettingsContent = ({ board, form, isSaving, saveSettingsAsync
              <Group justify="space-between" mt="lg" gap="sm" wrap="wrap">
                <Group gap="xs">
                  {layout.role !== "base" && persistedLayout && (
-                    <InlineConfirmButton
+                    <Button
                      type="button"
                      variant="default"
                      leftSection={<IconRefresh size={16} color="var(--mantine-color-red-5)" />}
                      loading={resettingLayoutId === layout.id}
                      disabled={isSaving}
-                      onConfirm={() => handleReset(layout)}
-                      confirmLabel={tCommon("action.confirm")}
+                      onClick={() => confirmReset(layout)}
                    >
-                      {tBoard("setting.section.layout.reset.action")}
-                    </InlineConfirmButton>
+                      {t("board.setting.section.layout.reset.action")}
+                    </Button>
                  )}
                  {layout.role === "custom" && (
                    <Button
@@ -248,7 +262,7 @@ export const LayoutSettingsContent = ({ board, form, isSaving, saveSettingsAsync
                        );
                      }}
                    >
-                      {tCommon("action.remove")}
+                      {t("common.action.remove")}
                    </Button>
                  )}
                </Group>
@@ -261,8 +275,8 @@ export const LayoutSettingsContent = ({ board, form, isSaving, saveSettingsAsync
                  onClick={() => void openLayoutEditorAsync(layout)}
                >
                  {form.isDirty() || !persistedLayout
-                    ? tBoard("setting.section.layout.edit.saveAndEdit")
-                    : tBoard("setting.section.layout.edit.action")}
+                    ? t("board.setting.section.layout.edit.saveAndEdit")
+                    : t("board.setting.section.layout.edit.action")}
                </Button>
              </Group>
            </Fieldset>
@@ -308,16 +322,16 @@ const gutterMarks = [
 ];

 const GutterSettings = ({ left, right, columnCount, onLeftChange, onRightChange }: GutterSettingsProps) => {
-  const t = useI18n("layout");
+  const t = useI18n();
  const maxGutterWidth = Math.min(3, Math.max(1, columnCount - 1));

  return (
    <Paper className={classes.gutterSettings} p="md">
      <Stack gap="md">
        <Box>
-          <Text fw={600}>{t("field.gutters.label")}</Text>
+          <Text fw={600}>{t("layout.field.gutters.label")}</Text>
          <Text size="sm" c="dimmed">
-            {t("field.gutters.description")}
+            {t("layout.field.gutters.description")}
          </Text>
        </Box>

@@ -357,7 +371,7 @@ const GutterControl = ({
  max: number;
  onChange: (value: number) => void;
 }) => {
-  const t = useI18n("layout");
+  const t = useI18n();
  const enabled = value > 0;

  return (
@@ -366,10 +380,10 @@ const GutterControl = ({
        checked={enabled}
        disabled={max < 1}
        onChange={(event) => onChange(event.currentTarget.checked ? Math.min(2, max) : 0)}
-        label={t(`field.gutters.${side}.label` as never)}
+        label={t(`layout.field.gutters.${side}.label`)}
      />
      {enabled && (
-        <Input.Wrapper label={t("field.gutters.width.label")}>
+        <Input.Wrapper label={t("layout.field.gutters.width.label")}>
          <Slider
            mt="xs"
            min={1}
@@ -377,7 +391,7 @@ const GutterControl = ({
            value={Math.min(value, max)}
            marks={gutterMarks.filter((mark) => mark.value <= max)}
            restrictToMarks
-            thumbLabel={t(`field.gutters.${side}.thumbLabel` as never)}
+            thumbLabel={t(`layout.field.gutters.${side}.thumbLabel`)}
            onChange={(nextValue) => onChange(Math.min(nextValue, max))}
          />
        </Input.Wrapper>
@@ -387,7 +401,7 @@ const GutterControl = ({
 };

 const GutterPreview = ({ left, right, columnCount }: { left: number; right: number; columnCount: number }) => {
-  const t = useI18n("layout");
+  const t = useI18n();
  const safeColumnCount = Math.max(1, columnCount);
  const main = Math.max(1, safeColumnCount - left - right);
  const tracks = [left > 0 ? `${left}fr` : null, `${main}fr`, right > 0 ? `${right}fr` : null]
@@ -397,7 +411,7 @@ const GutterPreview = ({ left, right, columnCount }: { left: number; right: numb
  return (
    <Box
      className={classes.gutterPreview}
-      aria-label={t("field.gutters.preview.label")}
+      aria-label={t("layout.field.gutters.preview.label")}
      style={{ gridTemplateColumns: tracks }}
    >
      {left > 0 && <Box className={classes.previewGutter} data-side="left" />}
@@ -10,11 +10,10 @@ import { revalidatePathActionAsync } from "@homarr/common/client";
 import { env } from "@homarr/common/env";
 import { useZodForm } from "@homarr/form";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
-import { useSettings } from "@homarr/settings";
-import { useI18n } from "@homarr/translation/client";
+import { useI18n, useScopedI18n } from "@homarr/translation/client";
 import { boardSaveLayoutsSchema, boardSavePartialSettingsSchema } from "@homarr/validation/board";

-import { homarrLogoPath } from "~/components/layout/logo/constants";
+import { homarrLogoPath } from "~/components/layout/logo/homarr-logo";
 import { SectionCard } from "~/components/manage/section-card";
 import { UnsavedChangesBar } from "~/components/manage/unsaved-changes-bar";

@@ -87,9 +86,8 @@ interface BoardSettingsFormProps {
 }

 export const BoardSettingsForm = ({ board, permissions, hasFullAccess, hideVisibility }: BoardSettingsFormProps) => {
-  const t = useI18n("common");
-  const tSection = useI18n("board.setting.section");
-  const { branding } = useSettings();
+  const t = useI18n();
+  const tSection = useScopedI18n("board.setting.section");
  const { updateBoard } = useUpdateBoard();
  const savePartialSettings = useSavePartialSettingsMutation(board);
  const saveLayouts = useSaveLayoutsMutation(board);
@@ -144,9 +142,7 @@ export const BoardSettingsForm = ({ board, permissions, hasFullAccess, hideVisib
      const [, canonicalLayouts] = await Promise.all([
        partialSettingsChanged
          ? savePartialSettings.mutateAsync({ id: board.id, ...partialSettings }).then(() => {
-              updateFavicon(
-                values.faviconImageUrl ?? branding.faviconImageUrl ?? branding.logoImageUrl ?? homarrLogoPath,
-              );
+              updateFavicon(values.faviconImageUrl ?? homarrLogoPath);
            })
          : Promise.resolve(),
        layoutsChanged ? saveLayouts.mutateAsync({ id: board.id, layouts }) : Promise.resolve(null),
@@ -160,14 +156,14 @@ export const BoardSettingsForm = ({ board, permissions, hasFullAccess, hideVisib
      form.resetDirty(canonicalValues);
      await revalidatePathActionAsync(`/boards/${board.name}/settings`);
      showSuccessNotification({
-        title: t("notification.update.success"),
-        message: t("notification.update.success"),
+        title: t("common.notification.update.success"),
+        message: t("common.notification.update.success"),
      });
      return canonicalValues;
    } catch {
      showErrorNotification({
-        title: t("notification.update.error"),
-        message: t("notification.update.error"),
+        title: t("common.notification.update.error"),
+        message: t("common.notification.update.error"),
      });
      return null;
    }
@@ -204,10 +200,10 @@ export const BoardSettingsForm = ({ board, permissions, hasFullAccess, hideVisib
          {form.isDirty() && (
            <UnsavedChangesBar>
              <Button type="button" disabled={isPending} variant="default" onClick={handleDiscard}>
-                {t("action.discard")}
+                {t("common.action.discard")}
              </Button>
              <Button loading={isPending} type="submit" disabled={!form.isValid()}>
-                {t("action.saveChanges")}
+                {t("common.action.saveChanges")}
              </Button>
            </UnsavedChangesBar>
          )}
@@ -6,7 +6,7 @@ import { api } from "@homarr/api/server";
 import { capitalize } from "@homarr/common";
 import { db } from "@homarr/db";
 import { getServerSettingByKeyAsync } from "@homarr/db/queries";
-import { getI18n } from "@homarr/translation/server";
+import { getScopedI18n } from "@homarr/translation/server";

 import { getBoardPermissionsAsync } from "~/components/board/permissions/server";
 import { BoardSettingsForm } from "./_settings-form";
@@ -46,7 +46,7 @@ export default async function BoardSettingsPage(props: Props) {
  const { board, permissions } = await getBoardAndPermissionsAsync(params);
  const boardSettings = await getServerSettingByKeyAsync(db, "board");
  const { hasFullAccess, hasChangeAccess } = await getBoardPermissionsAsync(board);
-  const t = await getI18n("board.setting");
+  const t = await getScopedI18n("board.setting");

  if (!hasChangeAccess) {
    notFound();
@@ -12,8 +12,7 @@ import { createLogger } from "@homarr/core/infrastructure/logs";
 import { ModalProvider } from "@homarr/modals";

 import { MainHeader } from "~/components/layout/header";
-import { appShellLogoHeight } from "~/components/layout/constants";
-import { BoardLogo, BoardLogoWithTitle } from "~/components/layout/logo/board-logo";
+import { BoardLogoWithTitle } from "~/components/layout/logo/board-logo";
 import { ClientShell } from "~/components/layout/shell";
 import { BoardTourGate } from "~/components/onboarding/board-tour-gate";
 import { env } from "~/env";
@@ -28,17 +27,13 @@ import { BoardMantineProvider } from "./(content)/_theme";
 const logger = createLogger({ module: "createBoardLayout" });

 interface CreateBoardLayoutProps<TParams extends Params> {
-  headerActions?: JSX.Element;
-  headerBoardEditAction?: JSX.Element;
-  headerBoardSettingsAction?: JSX.Element;
+  headerActions: JSX.Element;
  getInitialBoardAsync: (params: TParams) => Promise<Board>;
  withTour?: boolean;
 }

 export const createBoardLayout = <TParams extends Params>({
  headerActions,
-  headerBoardEditAction,
-  headerBoardSettingsAction,
  getInitialBoardAsync: getInitialBoard,
  withTour = false,
 }: CreateBoardLayoutProps<TParams>) => {
@@ -110,11 +105,8 @@ export const createBoardLayout = <TParams extends Params>({
              <BoardTourGate enabled={shouldRunBoardTour}>
                <ClientShell hasNavigation={false}>
                  <MainHeader
-                    logo={<BoardLogo size={appShellLogoHeight} />}
-                    logoWithTitle={<BoardLogoWithTitle size="md" />}
+                    logo={<BoardLogoWithTitle size="md" hideTitleOnMobile />}
                    actions={headerActions}
-                    boardEditAction={headerBoardEditAction}
-                    boardSettingsAction={headerBoardSettingsAction}
                    hasNavigation={false}
                  />
                  <AppShellMain data-advanced-focus-background>{children}</AppShellMain>
@@ -16,7 +16,7 @@ import {
 } from "@mantine/core";
 import { IconCheck, IconKey, IconLock } from "@tabler/icons-react";

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

 interface RequestDetails {
  widgetName: string;
@@ -31,8 +31,7 @@ interface RequestDetails {
 }

 export function CustomWidgetConfigurationEntry({ token }: { token: string }) {
-  const t = useI18n("customWidget.secretEntry");
-  const tSecret = useI18n("customWidget.secret");
+  const t = useScopedI18n("customWidget.secretEntry");
  const [details, setDetails] = useState<RequestDetails | null>(null);
  const [values, setValues] = useState<Record<string, string>>({});
  const [baseUrl, setBaseUrl] = useState("");
@@ -121,7 +120,7 @@ export function CustomWidgetConfigurationEntry({ token }: { token: string }) {
                return (
                  <Input
                    key={kind}
-                    label={tSecret(kind)}
+                    label={t(`field.${kind}`)}
                    leftSection={<IconKey size={16} />}
                    value={values[kind] ?? ""}
                    onChange={(event) => setValues((current) => ({ ...current, [kind]: event.currentTarget.value }))}
@@ -27,7 +27,6 @@ import { SettingsProvider } from "@homarr/settings";
 import { SpotlightProvider } from "@homarr/spotlight";
 import type { SupportedLanguage } from "@homarr/translation";
 import { isLocaleRTL, isLocaleSupported } from "@homarr/translation";
-import { getI18n } from "@homarr/translation/server";
 import { resolveHomarrUrlConfig } from "@homarr/workshop/schema";

 import { Analytics } from "~/components/layout/analytics";
@@ -54,45 +53,35 @@ const fontSans = Inter({

 const logger = createLogger({ module: "rootLayout" });

-export const generateMetadata = async (): Promise<Metadata> => {
-  const [serverSettings, colorScheme, t] = await Promise.all([
-    getRscServerSettingsAsync(),
-    getCurrentColorSchemeAsync(),
-    getI18n("metadata"),
-  ]);
-  const { appName, faviconImageUrl, logoImageUrl } = serverSettings.branding;
-  const logo = logoImageUrl ?? "/logo/logo.png";
-  const favicon = faviconImageUrl ?? logo;
-  const description = t("description");
+// eslint-disable-next-line no-restricted-syntax
+export const generateMetadata = async (): Promise<Metadata> => ({
+  title: "Homarr",
+  description:
+    "A self-hosted dashboard for the *arr stack and your entire homelab. Integrates with 50+ services, real-time widgets, no config files.",
+  openGraph: {
+    title: "Homarr Dashboard",
+    description:
+      "A self-hosted dashboard for the *arr stack and your entire homelab. Integrates with 50+ services, real-time widgets, no config files.",
+    url: env.HOMARR_WEBSITE_URL,
+    siteName: "Homarr",
+  },
+  icons: {
+    icon: "/logo/logo.png",
+    apple: "/logo/logo.png",
+  },
+  appleWebApp: {
+    title: "Homarr",
+    capable: true,
+    startupImage: { url: "/logo/logo.png" },
+    statusBarStyle: (await getCurrentColorSchemeAsync()) === "dark" ? "black-translucent" : "default",
+  },
+});

-  return {
-    title: {
-      default: appName,
-      template: `%s • ${appName}`,
-    },
-    description,
-    openGraph: {
-      title: t("dashboardTitle", { appName }),
-      description,
-      url: env.HOMARR_WEBSITE_URL,
-      siteName: appName,
-    },
-    icons: {
-      icon: favicon,
-      apple: logo,
-    },
-    appleWebApp: {
-      title: appName,
-      capable: true,
-      startupImage: { url: logo },
-      statusBarStyle: colorScheme === "dark" ? "black-translucent" : "default",
-    },
-  };
-};
-
-export const generateViewport = async (): Promise<Viewport> => {
-  const serverSettings = await getRscServerSettingsAsync();
-  return { themeColor: serverSettings.branding.primaryColor };
+export const viewport: Viewport = {
+  themeColor: [
+    { media: "(prefers-color-scheme: light)", color: "white" },
+    { media: "(prefers-color-scheme: dark)", color: "black" },
+  ],
 };

 export default async function Layout(props: {
@@ -105,7 +94,6 @@ export default async function Layout(props: {
  }

  const sessionPromise = auth();
-  const serverSettingsPromise = getRscServerSettingsAsync();
  const userPromise = sessionPromise.then((session) =>
    session
      ? getRscUserSettingsAsync(session.user.id).catch((error: unknown) => {
@@ -114,20 +102,18 @@ export default async function Layout(props: {
        })
      : null,
  );
-  const assistantAvailabilityPromise = sessionPromise.then(async (session): Promise<AssistantAvailability> => {
-    if (!session) return "unauthenticated";
-
-    try {
-      const availability = await api.assistant.getAvailability();
-      return availability.enabled ? "enabled" : "unconfigured";
-    } catch {
-      return "error";
-    }
-  });
+  const assistantAvailabilityPromise: Promise<AssistantAvailability> = sessionPromise.then((session) =>
+    !session
+      ? "unauthenticated"
+      : api.assistant
+          .getAvailability()
+          .then((availability) => (availability.enabled ? "enabled" : "unconfigured"))
+          .catch(() => "error"),
+  );
  const [session, user, serverSettings, colorScheme, assistantAvailability] = await Promise.all([
    sessionPromise,
    userPromise,
-    serverSettingsPromise,
+    getRscServerSettingsAsync(),
    getCurrentColorSchemeAsync(),
    assistantAvailabilityPromise,
  ]);
@@ -162,7 +148,6 @@ export default async function Layout(props: {
          },
          search: { defaultSearchEngineId: serverSettings.search.defaultSearchEngineId },
          user: { enableGravatar: serverSettings.user.enableGravatar },
-          branding: serverSettings.branding,
        }}
        {...innerProps}
      />
@@ -171,9 +156,7 @@ export default async function Layout(props: {
    (innerProps) => <TRPCReactProvider {...innerProps} />,
    (innerProps) => <DayJsLoader {...innerProps} />,
    (innerProps) => <NextIntlClientProvider {...innerProps} />,
-    (innerProps) => (
-      <CustomMantineProvider {...innerProps} defaultColorScheme={colorScheme} branding={serverSettings.branding} />
-    ),
+    (innerProps) => <CustomMantineProvider {...innerProps} defaultColorScheme={colorScheme} />,
    (innerProps) => <ModalProvider {...innerProps} />,
    (innerProps) => <SpotlightProvider {...innerProps} />,
    (innerProps) => <AssistantGate availability={assistantAvailability} {...innerProps} />,
@@ -1,14 +1,12 @@
 import { Box, Group, Image, Stack, Title } from "@mantine/core";

-import { getI18n } from "@homarr/translation/server";
+import { getScopedI18n } from "@homarr/translation/server";
 import { IntegrationMarquee } from "@homarr/ui";
-import { getRscServerSettingsAsync } from "@homarr/api/server-settings-server";

 import classes from "./hero-banner.module.css";

 export const HeroBanner = async () => {
-  const [t, serverSettings] = await Promise.all([getI18n("management.page.home"), getRscServerSettingsAsync()]);
-  const { appName, logoImageUrl } = serverSettings.branding;
+  const t = await getScopedI18n("management.page.home");

  return (
    <Box className={classes.bannerContainer} p={{ base: "lg", md: "3rem" }} bg="dark.6" pos="relative">
@@ -16,17 +14,9 @@ export const HeroBanner = async () => {
        <Title fz={{ base: "h4", md: "h2" }} c="dimmed">
          {t("heroBanner.title")}
        </Title>
-        <Group gap="sm" wrap="nowrap">
-          <Image
-            src={logoImageUrl ?? "/logo/logo.png"}
-            alt={`${appName} logo`}
-            w="auto"
-            h={{ base: 48, md: 64 }}
-            maw={{ base: 128, md: 192 }}
-            fit="contain"
-            style={{ flexShrink: 0 }}
-          />
-          <Title fz={{ base: "h3", md: "h1" }}>{t("heroBanner.subtitle", { app: appName })}</Title>
+        <Group gap="xs" wrap="nowrap">
+          <Image src="/logo/logo.png" w={{ base: 32, md: 40 }} h={{ base: 32, md: 40 }} />
+          <Title fz={{ base: "h3", md: "h1" }}>{t("heroBanner.subtitle", { app: "Homarr" })}</Title>
        </Group>
      </Stack>
      <Box visibleFrom="md" className={classes.scrollContainer} w={"30%"} top={0} right={0} pos="absolute">
@@ -35,10 +35,11 @@ import {

 import { capitalize, objectEntries } from "@homarr/common";
 import { hotkeys } from "@homarr/definitions";
-import { getI18n } from "@homarr/translation/server";
+import { getScopedI18n } from "@homarr/translation/server";

-import { homarrLogoPath } from "~/components/layout/logo/constants";
+import { homarrLogoPath } from "~/components/layout/logo/homarr-logo";
 import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
+import { createMetaTitle } from "~/metadata";
 import { getDependenciesAsync, getPackageVersion } from "~/versions/package-reader";
 import githubContributors from "@static-data/contributors.json";
 import openCollectiveContributors from "@static-data/opencollective-contributors.json";
@@ -46,15 +47,15 @@ import crowdinContributors from "@static-data/translators.json";
 import classes from "./about.module.css";

 export async function generateMetadata() {
-  const t = await getI18n("management");
+  const t = await getScopedI18n("management");

  return {
-    title: t("metaTitle"),
+    title: createMetaTitle(t("metaTitle")),
  };
 }

 export default async function AboutPage() {
-  const t = await getI18n("management.page.about");
+  const t = await getScopedI18n("management.page.about");
  const version = getPackageVersion();
  const dependencies = await getDependenciesAsync();

@@ -1,57 +1,65 @@
 "use client";

 import { useCallback } from "react";
-import { InlineConfirmActionIcon } from "@homarr/ui";
+import { ActionIcon } from "@mantine/core";
 import { IconTrash } from "@tabler/icons-react";

 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
+import { useConfirmModal } from "@homarr/modals";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
-import { useI18n } from "@homarr/translation/client";
+import { useScopedI18n } from "@homarr/translation/client";

 interface AppDeleteButtonProps {
  app: RouterOutputs["app"]["all"][number];
 }

 export const AppDeleteButton = ({ app }: AppDeleteButtonProps) => {
-  const t = useI18n("app.page.delete");
-  const tCommon = useI18n("common");
+  const t = useScopedI18n("app.page.delete");
+  const tList = useScopedI18n("app.page.list.action");
+  const { openConfirmModal } = useConfirmModal();
  const { mutate, isPending } = clientApi.app.delete.useMutation();

-  const onConfirm = useCallback(() => {
-    mutate(
-      { id: app.id },
-      {
-        onSuccess: () => {
-          showSuccessNotification({
-            title: tCommon("notification.delete.success"),
-            message: t("notification.success.message"),
-          });
-          void revalidatePathActionAsync("/manage/apps");
-        },
-        onError: () => {
-          showErrorNotification({
-            title: tCommon("notification.delete.error"),
-            message: t("notification.error.message"),
-          });
-        },
+  const onClick = useCallback(() => {
+    openConfirmModal({
+      title: t("title"),
+      children: t("message", {
+        name: app.name,
+      }),
+      onConfirm: () => {
+        mutate(
+          { id: app.id },
+          {
+            onSuccess: () => {
+              showSuccessNotification({
+                title: t("notification.success.title"),
+                message: t("notification.success.message"),
+              });
+              void revalidatePathActionAsync("/manage/apps");
+            },
+            onError: () => {
+              showErrorNotification({
+                title: t("notification.error.title"),
+                message: t("notification.error.message"),
+              });
+            },
+          },
+        );
      },
-    );
-  }, [app.id, mutate, t, tCommon]);
+    });
+  }, [app, mutate, t, openConfirmModal]);

  return (
-    <InlineConfirmActionIcon
-      confirmLabel={tCommon("action.confirm")}
-      confirmationAriaLabel={tCommon("action.confirm")}
-      onConfirm={onConfirm}
+    <ActionIcon
      loading={isPending}
      variant="subtle"
      color="red"
      size={44}
-      aria-label={tCommon("action.deleteNamed", { name: app.name })}
+      onClick={onClick}
+      aria-label={tList("delete", { name: app.name })}
    >
      <IconTrash color="red" size={16} stroke={1.5} />
-    </InlineConfirmActionIcon>
+    </ActionIcon>
  );
 };
@@ -9,7 +9,7 @@ import { clientApi } from "@homarr/api/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
 import { AppForm } from "@homarr/forms-collection";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
-import { useI18n } from "@homarr/translation/client";
+import { useI18n, useScopedI18n } from "@homarr/translation/client";
 import type { appManageSchema } from "@homarr/validation/app";

 interface AppEditFormProps {
@@ -17,14 +17,14 @@ interface AppEditFormProps {
 }

 export const AppEditForm = ({ app }: AppEditFormProps) => {
-  const tScoped = useI18n("app.page.edit.notification");
-  const tCommon = useI18n("common");
+  const tScoped = useScopedI18n("app.page.edit.notification");
+  const t = useI18n();
  const router = useRouter();

  const { mutate, isPending } = clientApi.app.update.useMutation({
    onSuccess: () => {
      showSuccessNotification({
-        title: tCommon("notification.update.success"),
+        title: tScoped("success.title"),
        message: tScoped("success.message"),
      });
      void revalidatePathActionAsync("/manage/apps").then(() => {
@@ -33,7 +33,7 @@ export const AppEditForm = ({ app }: AppEditFormProps) => {
    },
    onError: () => {
      showErrorNotification({
-        title: tCommon("notification.update.error"),
+        title: tScoped("error.title"),
        message: tScoped("error.message"),
      });
    },
@@ -52,7 +52,7 @@ export const AppEditForm = ({ app }: AppEditFormProps) => {
  return (
    <AppForm
      buttonLabels={{
-        submit: tCommon("action.save"),
+        submit: t("common.action.save"),
      }}
      initialValues={app}
      handleSubmit={handleSubmit}
Author	SHA1	Message	Date
Thomas Camlong	193a536a2d	chore: remove paseo worktree config	2026-08-21 17:36:44 +02:00
Thomas Camlong	c8df2fbe5f	fix(cli): resolve PR review feedback and improve command execution	2026-08-21 17:01:29 +02:00
Thomas Camlong	7c4c1ffbe7	docs(cli): add local harness agent skill	2026-08-21 16:23:18 +02:00
Thomas Camlong	84b000afda	docs(cli): update developer CLI documentation and add nerd font requirement	2026-08-21 16:21:41 +02:00
Thomas Camlong	7710abcf26	feat(cli): rework developer CLI with non-blocking tasks and GitHub CI checks Rebuild the developer CLI and interactive TUI from the ground up using Bubble Tea v2, Lip Gloss v2, and non-blocking background workers. Adds support for background docker pulls with live per-layer byte progress, build log streaming, interactive container shells, dynamic sidebar tabs (logs / build / ci), and gh cli integration to view or watch CI checks.	2026-08-21 15:40:04 +02:00