Merge branch 'dev' into perf/parallelize-board-prefetch

Board fetch + auth() now run concurrently via Promise.all instead of
sequentially. Widget prefetches for all kinds also run in parallel
alongside integration permission loading.

.cursor/plans/revert_demo_mcp_8d8927a6.plan.md

@@ -1,197 +0,0 @@
----
-name: Revert Demo MCP
-overview: Revert the demo-specific MCP accommodations (API key bypass, read-only filtering, demo UI) since demo MCP is an edge case with poor ROI. Replace with a clear "MCP not available in demo mode" message. Keep the core MCP feature intact for real instances.
-todos:
-   - id: revert-backend
-     content: Revert demoSafe procedure, apiKeys demo bypass, isDemoMode export from mcp.ts
-     status: pending
-   - id: revert-mcp-route
-     content: Remove isDemoMode filtering and demo SERVER_INSTRUCTIONS from MCP route
-     status: pending
-   - id: revert-ui
-     content: Remove isDemoMode prop plumbing; add demo-not-supported Alert via info.isDemoMode
-     status: pending
-   - id: verify
-     content: Run lint + typecheck; smoke-test demo vs non-demo MCP tab
-     status: pending
-isProject: false
----
-
-# Revert Demo MCP Accommodations
-
-## Why Docker works but integrations do not
-
-Demo mode has **two different mock mechanisms**:
-
-```mermaid
-flowchart TB
-  subgraph dockerPath [Docker - works in demo]
-    MCP1[MCP docker_getContainers]
-    Handler[docker.ts request handler]
-    MockContainers[Hardcoded mockContainers]
-    MCP1 --> Handler
-    Handler -->|"if DEMO_MODE"| MockContainers
-  end
-
-  subgraph integrationPath [Integrations - confusing in demo]
-    MCP2[MCP widget tools e.g. calendar_findAllEvents]
-    TRPC[tRPC procedure]
-    RH[cached-integration-request-handler]
-    Kind{integration.kind}
-    Mock[MockIntegration fake data]
-    Real[Sonarr/Radarr HTTP - fails]
-    MCP2 --> TRPC --> RH --> Kind
-    Kind -->|mock| Mock
-    Kind -->|sonarr/radarr| Real
-  end
-```
-
-- **Docker**:
-  [`packages/request-handler/src/docker.ts`](packages/request-handler/src/docker.ts)
-  checks `DEMO_MODE` directly and returns inline fake containers. No integration
-  record needed.
-- **Everything else**: Demo seed creates **one** integration with `kind: "mock"`
-  ([`packages/db/migrations/seed.ts`](packages/db/migrations/seed.ts)), not
-  Sonarr/Radarr/Overseerr.
-  [`MockIntegration`](packages/integrations/src/mock/mock-integration.ts) can
-  serve calendar, downloads, health, DNS, media server, etc. **if** callers pass
-  that integration ID.
-- **Why it felt broken**: MCP tool descriptions tell AI clients to look for
-  "Overseerr/Sonarr IDs". Demo has none. Tools like
-  `integration_searchMediaRequests` hard-filter to `mediaSearch` kinds
-  (`overseerr`, `jellyseerr`, `seerr`) — `mock` is excluded from that category
-  in
-  [`packages/definitions/src/integration.ts`](packages/definitions/src/integration.ts).
-
-Fixing this properly means extending the mock integration system (new
-`searchAsync`, category changes, middleware relaxations, instruction rewrites)
-for a feature almost nobody will use on the public demo.
-
-## Option comparison
-
-|                      | **Revert (chosen)**         | **Minimal fix**                                | **Full fix**                                        |
-| -------------------- | --------------------------- | ---------------------------------------------- | --------------------------------------------------- |
-| **Effort**           | ~1 hour, ~100 lines removed | ~2 hours                                       | 1-2 days                                            |
-| **Files touched**    | 8 MCP/demo-specific files   | 8 + route instructions                         | 15+ across integrations, definitions, seed, routers |
-| **Risk**             | Low                         | Low-medium                                     | Medium (mock/search semantics)                      |
-| **Demo MCP outcome** | Clearly unsupported         | Partial (widget reads only, no search/request) | Near-full read coverage                             |
-| **Maintenance**      | None ongoing                | Instructions drift with tool changes           | Mock parity with real integrations                  |
-
-**Recommendation: Revert.** The demo accommodation code added special-case
-plumbing (`demoSafePermissionRequiredProcedure`, dual mutation guards, hardcoded
-UI strings) for a workflow that still cannot deliver a convincing "homelab AI"
-experience without substantial integration-layer work.
-
-## What to revert (demo MCP accommodations only)
-
-These changes were added specifically for demo + MCP. **Do not revert** the core
-MCP server, OAuth, Scalar docs, tool descriptions, or `normalizeSchema`.
-
-### Backend (3 files)
-
-1. [`packages/api/src/trpc.ts`](packages/api/src/trpc.ts)
-   - Remove `demoSafePermissionRequiredProcedure` export (~12 lines)
-   - Keep existing `enforceDemoModeReadOnly` (pre-dates MCP; used by whole app)
-
-2. [`packages/api/src/router/apiKeys.ts`](packages/api/src/router/apiKeys.ts)
-   - Change `create` back to `permissionRequiredProcedure` (mutations blocked in
-     demo again)
-   - Remove `isDemoMode` guard on `delete` (global demo middleware already
-     blocks delete mutations)
-   - Remove `TRPCError` / `isDemoMode` imports if unused
-
-3. [`packages/api/src/mcp.ts`](packages/api/src/mcp.ts)
-   - Stop exporting `isDemoMode`; keep only `createTRPCContext` and `mcpRouter`
-
-### MCP route (1 file)
-
-4. [`apps/nextjs/src/app/api/mcp/[transport]/route.ts`](apps/nextjs/src/app/api/mcp/[transport]/route.ts)
-   - Remove `isDemoMode` import and all demo branches:
-     - `ListToolsRequestSchema` mutation filter
-     - `CallToolRequestSchema` mutation rejection
-     - `SERVER_INSTRUCTIONS` demo section
-   - Keep `getToolType` / `buildToolTypeMap` only if still needed elsewhere;
-     otherwise remove dead code from demo-only filtering
-
-### UI (4 files)
-
-5. [`apps/nextjs/src/app/[locale]/manage/tools/api/page.tsx`](apps/nextjs/src/app/[locale]/manage/tools/api/page.tsx)
-   - Remove `isDemoMode` import from `@homarr/api/mcp`
-   - Stop passing `isDemoMode` to child components
-
-6. [`apps/nextjs/src/app/[locale]/manage/tools/api/components/api-page-tabs.tsx`](apps/nextjs/src/app/[locale]/manage/tools/api/components/api-page-tabs.tsx)
-   - Remove `isDemoMode` prop from interface and `McpInstructions` call
-
-7. [`apps/nextjs/src/app/[locale]/manage/tools/api/components/mcp-instructions.tsx`](apps/nextjs/src/app/[locale]/manage/tools/api/components/mcp-instructions.tsx)
-   - Remove `isDemoMode` prop
-   - Replace current demo banner with a single **Alert**: MCP requires a
-     self-hosted instance; demo mode does not support MCP (API key creation and
-     write tools are disabled)
-   - Use `clientApi.info.isDemoMode.useQuery()` or pass `isDemoMode` from server
-     via existing `api.info.isDemoMode()` tRPC query (already exists in
-     [`packages/api/src/router/info.ts`](packages/api/src/router/info.ts)) —
-     avoids re-exporting from `@homarr/api/mcp`
-
-8. [`apps/nextjs/src/app/[locale]/manage/tools/api/components/api-keys.tsx`](apps/nextjs/src/app/[locale]/manage/tools/api/components/api-keys.tsx)
-   - Remove `isDemoMode` prop and conditional delete-column spread
-   - Delete button hidden automatically in demo because `apiKeys.delete`
-     mutation is blocked by global `enforceDemoModeReadOnly`
-
-## What to add instead
-
-- **MCP tab**: When `info.isDemoMode` is true, show a prominent notice at the
-  top of
-  [`mcp-instructions.tsx`](apps/nextjs/src/app/[locale]/manage/tools/api/components/mcp-instructions.tsx)
-  explaining MCP is for self-hosted instances only.
-- **Optional**: Disable/hide the "Create API Key" button on the MCP tab in demo
-  (mutations will fail anyway).
-- **No changes** to integrations, definitions, seed, or mock services.
-
-## Files NOT impacted by revert
-
-Core MCP feature stays as-is:
-
-- [`apps/nextjs/src/app/api/mcp/[transport]/route.ts`](apps/nextjs/src/app/api/mcp/[transport]/route.ts)
-  — auth, rate limiting, `normalizeSchema`, `SERVER_INSTRUCTIONS` (minus demo
-  section)
-- OAuth routes under `apps/nextjs/src/app/api/mcp/oauth/`
-- All MCP-enabled routers in `packages/api/src/router/`
-- [`packages/api/src/mcp.ts`](packages/api/src/mcp.ts) — eager router (minus
-  `isDemoMode` export)
-- Scalar UI, dynamic tools table,
-  [`.cursor/rules/mcp-integration.mdc`](.cursor/rules/mcp-integration.mdc)
-
-Pre-existing demo infrastructure (unchanged):
-
-- [`packages/request-handler/src/docker.ts`](packages/request-handler/src/docker.ts)
-  — Docker mock containers
-- [`packages/db/migrations/seed.ts`](packages/db/migrations/seed.ts) — mock
-  integration + demo board
-- [`packages/integrations/src/mock/`](packages/integrations/src/mock/) — mock
-  services for widgets on demo board UI
-
-## Verification
-
-1. `pnpm lint` and `pnpm typecheck` pass
-2. Demo mode (`DEMO_MODE=true`):
-   - MCP tab shows "not supported" notice
-   - API key create fails with existing "Mutations are disabled in demo mode"
-   - `docker_getContainers` still works on demo board UI (unchanged; separate
-     code path)
-3. Non-demo mode: MCP unchanged (all tools listed, mutations work with
-   permissions)
-
-## Commit strategy
-
-Single focused commit on `feat/add-mcp-server`:
-
-```
-revert(mcp): drop demo-mode accommodations for MCP
-
-MCP is intended for self-hosted instances. Remove demo-specific API key
-bypass, read-only tool filtering, and demo UI plumbing. Show a clear
-notice on the MCP tab when demo mode is active.
-```
-
-Then push to the existing PR (no force-push needed unless you want another
-squash).

.cursor/rules/mcp-integration.mdc

@@ -1,103 +0,0 @@
----
-description: How to expose tRPC procedures as MCP tools for AI clients
-globs: packages/api/src/router/**/*.ts
-alwaysApply: false
----
-
-# MCP Integration Guide
-
-Every new tRPC procedure that provides useful functionality should be exposed as an MCP tool so AI assistants (Claude, Cursor, etc.) can use it. This is a first-class feature of Homarr.
-
-## Adding MCP to a procedure
-
-Add `.meta({ mcp: { enabled: true, description: "..." } })` to the procedure chain:
-
-```typescript
-// Read-only tool (query)
-myProcedure: protectedProcedure
-  .meta({ mcp: { enabled: true, description: "Get all items with their status and metadata" } })
-  .input(z.object({ limit: z.number().default(50) }))
-  .query(async ({ ctx, input }) => { ... })
-
-// Write tool (mutation)
-myAction: protectedProcedure
-  .meta({ mcp: { enabled: true, description: "Delete an item by ID. Requires interact permission on the integration" } })
-  .input(z.object({ id: z.string() }))
-  .mutation(async ({ ctx, input }) => { ... })
-
-// No-input procedure (z.void) — works fine, no .input() needed
-getAll: protectedProcedure
-  .meta({ mcp: { enabled: true, description: "List all resources" } })
-  .query(async ({ ctx }) => { ... })
-```
-
-The `.meta()` call must come **before** `.input()` and `.query()`/`.mutation()` in the chain.
-
-## Writing good descriptions
-
-The description is the **only thing** an AI sees to decide when and how to use the tool. Write it like you're explaining to a colleague who has never used Homarr.
-
-**Must include:**
-- What the tool returns or does
-- Which integrations/services it works with (if applicable)
-- How to get required IDs (e.g., "Use integration_all to get the integrationId")
-- Permission requirements (if non-obvious)
-
-**Good:**
-```
-"Get calendar events for upcoming and recent media releases. Fetches from all connected Sonarr (TV), Radarr (movies), Lidarr (music), and Readarr (books) integrations. Requires integrationIds from integration_all"
-```
-
-**Bad:**
-```
-"Get calendar events"
-```
-
-**For tools that return permission fields**, explain what they mean:
-```
-"List all integrations. Returns permissions.hasUseAccess (read) and permissions.hasInteractAccess (actions) — false means the API key lacks that permission, not an error"
-```
-
-## Registering in the MCP router
-
-After adding `.meta()` to procedures, you must register the router in `packages/api/src/mcp.ts`. This file uses **eager imports** (no `lazy()`) because MCP tool extraction requires synchronous access to all procedure definitions.
-
-```typescript
-// packages/api/src/mcp.ts
-import { myNewRouter } from "./router/my-new-feature";
-
-export const mcpRouter = createTRPCRouter({
-  // ... existing routers
-  myFeature: myNewRouter,
-});
-```
-
-**If your router is nested** (e.g., widget sub-routers), import and register the sub-router directly — do not import a parent that uses `lazy()`.
-
-## What to expose vs. what to skip
-
-**Expose:**
-- Data queries (list, search, get by ID)
-- Actions users would ask an AI to do (toggle, create, delete, approve)
-- Status checks (health, stats, summaries)
-
-**Skip:**
-- Subscriptions (WebSocket-only, not supported by MCP)
-- Internal procedures (session management, onboarding steps)
-- File upload/download procedures
-- Procedures that return non-serializable data (streams, blobs)
-
-## Input schema rules
-
-- Use `z.object({...})` for inputs — this maps cleanly to MCP tool parameters
-- `z.void()` (no `.input()`) works — the MCP handler patches these to accept empty objects
-- Avoid `z.union()` or `z.discriminatedUnion()` at the top level — AI clients struggle with these
-- Use `.default()` on optional fields so the AI doesn't need to guess values
-
-## Checklist for new features
-
-1. Add `.meta({ mcp: { enabled: true, description: "..." } })` to relevant procedures
-2. Import and register the router in `packages/api/src/mcp.ts` (eager, no lazy)
-3. Write descriptions that explain what the tool does, what it needs, and what it returns
-4. If the tool requires an ID from another tool, say which one in the description
-5. Test with `curl` against `/api/mcp/mcp` to verify the tool appears in `tools/list`

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -33,7 +33,6 @@ body:
       options:
         # The below comment is used to insert a new version with on-release.yml
         #NEXT_VERSION#
-        - 1.64.0
         - 1.62.0
         - 1.61.0
         - 1.60.1-beta.1

.github/workflows/code-quality.yml

@@ -42,14 +42,14 @@ jobs:
       - name: Get changed files
         id: changed
         run: |
-          git diff --name-only --diff-filter=ACMR origin/${{ github.base_ref }}...HEAD -- '*.ts' '*.tsx' '*.js' '*.jsx' > /tmp/changed-files
+          FILES=$(git diff --name-only --diff-filter=ACMR origin/${{ github.base_ref }}...HEAD -- '*.ts' '*.tsx' '*.js' '*.jsx' | tr '\n' ' ')
-          echo "count=$(wc -l < /tmp/changed-files | tr -d '[:space:]')" >> $GITHUB_OUTPUT
+          echo "files=$FILES" >> $GITHUB_OUTPUT
 
       - name: Auto-fix lint + format
-        if: steps.changed.outputs.count != '0'
+        if: steps.changed.outputs.files != ''
         run: |
-          xargs -r -a /tmp/changed-files pnpm exec oxlint --fix || true
+          pnpm exec oxlint --fix ${{ steps.changed.outputs.files }} || true
-          xargs -r -a /tmp/changed-files pnpm exec oxfmt --write
+          pnpm exec oxfmt --write ${{ steps.changed.outputs.files }}
 
       - name: Commit fixes
         uses: stefanzweifel/git-auto-commit-action@v5

.github/workflows/deployment-docker-image.yml

@@ -66,7 +66,7 @@ jobs:
       - uses: actions/setup-node@v6
         if: env.SKIP_RELEASE == 'false'
         with:
-          node-version: 24.16.0
+          node-version: 24.15.0
           package-manager-cache: false
       - run: npm i -g pnpm
         if: env.SKIP_RELEASE == 'false'

.gitignore

@@ -66,7 +66,8 @@ e2e/shared/tmp
 #personal backgrounds
 apps/nextjs/public/images/background.png
 
-
+# next-intl
+en.d.json.ts
 
 # personal agent config
 AGENTS.md

.mise.toml

@@ -1,3 +0,0 @@
-[tools]
-node = "24.16.0"
-pnpm = "10.33.4"

.nvmrc

@@ -1 +1 @@
-24.16.0
+24.15.0

CHANGELOG.md

@@ -1,67 +1,3 @@
-## [1.64.0](https://github.com/homarr-labs/homarr/compare/v1.63.0...v1.64.0) (2026-06-05)
-
-### Features
-
-* add comprehensive demo mode with mock integrations ([#5870](https://github.com/homarr-labs/homarr/issues/5870)) ([0a64679](https://github.com/homarr-labs/homarr/commit/0a6467979a5e3b3e3eae6252c31fca1d9af54dc1))
-* add PeaNUT integration and UPS monitoring widget ([#5862](https://github.com/homarr-labs/homarr/issues/5862)) ([0dc2558](https://github.com/homarr-labs/homarr/commit/0dc2558fafedcbba246c2e968d00cc541ab9f84e))
-* **docker:** add container logs modal and stats columns ([#4807](https://github.com/homarr-labs/homarr/issues/4807)) ([dbf021e](https://github.com/homarr-labs/homarr/commit/dbf021e04a785b44ad0e2ce45634de371d76de6d))
-* media request search as first-class spotlight mode ([#5823](https://github.com/homarr-labs/homarr/issues/5823)) ([3d3e305](https://github.com/homarr-labs/homarr/commit/3d3e3059a98b36b6e64e3aad90f715e334baff3e))
-* **onboarding:** enhance integration setup with Docker discovery and URL templating ([#5607](https://github.com/homarr-labs/homarr/issues/5607)) ([dd7a490](https://github.com/homarr-labs/homarr/commit/dd7a4908a36a71c1d0d1e41524eb8fd9bf53ca4d))
-* **onboarding:** guided management and board tours ([#5756](https://github.com/homarr-labs/homarr/issues/5756)) ([0b663a7](https://github.com/homarr-labs/homarr/commit/0b663a7fc6c017b9fbe78c019f06d46ee95f165f))
-* **widgets:** add in-place app editing in widget edit modal ([#5809](https://github.com/homarr-labs/homarr/issues/5809)) ([99346f2](https://github.com/homarr-labs/homarr/commit/99346f288bcfc701c41fecaab6f7bc0438d80563))
-
-### Bug Fixes
-
-* add bookmark widget option to toggle card borders ([#5854](https://github.com/homarr-labs/homarr/issues/5854)) ([41fe592](https://github.com/homarr-labs/homarr/commit/41fe5928f19207d02b04e64c2caac49d896f72ce))
-* **auth:** relax password complexity requirements to suggestions-only ([#5764](https://github.com/homarr-labs/homarr/issues/5764)) ([fd10788](https://github.com/homarr-labs/homarr/commit/fd107888385557ededcf51576c6320a1960690f2))
-* **db:** log when UNSAFE_ENABLE_MOCK_INTEGRATION is enabled during seeding ([efd37dc](https://github.com/homarr-labs/homarr/commit/efd37dca93be7f5f362331e9b5c2a95a87e24379))
-* disable onboarding tours when demo mode is enabled ([68f24e3](https://github.com/homarr-labs/homarr/commit/68f24e34d580e3a155c37ca37c3ffd61f296bd0c))
-* **docker:** restore container selection toolbar broken by Mantine v9 ([#5855](https://github.com/homarr-labs/homarr/issues/5855)) ([fe4598f](https://github.com/homarr-labs/homarr/commit/fe4598f7221a2861b8c5ae0cfd267e8c4fbf48df))
-* **immich:** respect app color scheme in server-stats widget ([#5859](https://github.com/homarr-labs/homarr/issues/5859)) ([2c6b7a8](https://github.com/homarr-labs/homarr/commit/2c6b7a818e9d32b414b024d711a3b64533e61cb9))
-* redirect to login after credentials logout instead of crashing on current page ([#5819](https://github.com/homarr-labs/homarr/issues/5819)) ([cc24f07](https://github.com/homarr-labs/homarr/commit/cc24f070db26337a4a2d87d68c7f142ed1118584))
-* sync docs sitemap and remove stale coolify ts-expect-error ([4f5f3e1](https://github.com/homarr-labs/homarr/commit/4f5f3e14a129a94295d4b8ffb7d3702fdb4f6a74))
-* **ui:** restore pre-v9 light variant colors ([#5856](https://github.com/homarr-labs/homarr/issues/5856)) ([a755692](https://github.com/homarr-labs/homarr/commit/a755692d81b80b5ff83051a3b7261c01ac10321b))
-
-## [1.63.0](https://github.com/homarr-labs/homarr/compare/v1.62.0...v1.63.0) (2026-05-29)
-
-### Features
-
-* **auth:** support custom token endpoint auth methods ([#5806](https://github.com/homarr-labs/homarr/issues/5806)) ([be61602](https://github.com/homarr-labs/homarr/commit/be61602576a8bec4bb7e4928d36e0854e926264d))
-* auto-open widget settings on add with all integrations pre-selected ([#5767](https://github.com/homarr-labs/homarr/issues/5767)) ([f10bb3a](https://github.com/homarr-labs/homarr/commit/f10bb3ae23fefc9779332733706aa567cc40ba48))
-* **board:** persist category collapse state in localStorage for guests ([#5714](https://github.com/homarr-labs/homarr/issues/5714)) ([66212b4](https://github.com/homarr-labs/homarr/commit/66212b4e475738e61d2ea78f3a7e72d7a610bf12)), closes [#3355](https://github.com/homarr-labs/homarr/issues/3355)
-* **manage:** unified management page layout ([#5758](https://github.com/homarr-labs/homarr/issues/5758)) ([c252b4f](https://github.com/homarr-labs/homarr/commit/c252b4f9accc4523f222354c73f687714640701f))
-* **users:** rework general settings ([#4915](https://github.com/homarr-labs/homarr/issues/4915)) ([2991777](https://github.com/homarr-labs/homarr/commit/2991777b0a0ae72522d0769a86a91250d618dbe6))
-
-### Bug Fixes
-
-* matine ui fixes for concistency ([#5733](https://github.com/homarr-labs/homarr/issues/5733)) ([4454e3f](https://github.com/homarr-labs/homarr/commit/4454e3fb7afa624ee2f1eaec015f2725e664ac46))
-* parse Speedtest Tracker created_at as local time ([#5751](https://github.com/homarr-labs/homarr/issues/5751)) ([b19549b](https://github.com/homarr-labs/homarr/commit/b19549b601636bcbc2fadaa270a77a9fdb48b77a))
-* prevent GitHub releases check from blocking app on API failure ([#5807](https://github.com/homarr-labs/homarr/issues/5807)) ([6cc2ac5](https://github.com/homarr-labs/homarr/commit/6cc2ac56a920563c47aaaab1b33b19a9b6d5ecee))
-* **ui:** use imported theme instead of undefined createTheme ([4a67bf0](https://github.com/homarr-labs/homarr/commit/4a67bf0ef30ff8d10b06d2d3719ccab792395669))
-
-### Performance Improvements
-
-* **boards:** parallelize board page data fetching ([#5736](https://github.com/homarr-labs/homarr/issues/5736)) ([8f03a38](https://github.com/homarr-labs/homarr/commit/8f03a38de5b9b385da7ffcc9a963be00710acb5e))
-
-## [1.62.0](https://github.com/homarr-labs/homarr/compare/v1.61.1...v1.62.0) (2026-05-22)
-
-### Features
-
-* **seed:** add demo mode with pre-seeded user ([#5739](https://github.com/homarr-labs/homarr/issues/5739)) ([dade477](https://github.com/homarr-labs/homarr/commit/dade477b3226765eb614e66588ebee84c45cb688))
-
-### Bug Fixes
-
-* **deps:** update dependency better-sqlite3 to ^12.10.0 ([#5727](https://github.com/homarr-labs/homarr/issues/5727)) ([044ad9e](https://github.com/homarr-labs/homarr/commit/044ad9edf9c1dc9b50b9591dea0b5f0cce4be01a))
-* **docker:** improve icon matching ([#5693](https://github.com/homarr-labs/homarr/issues/5693)) ([7cd30b6](https://github.com/homarr-labs/homarr/commit/7cd30b640cbf47e4678abda18f83c0924f039b1b))
-* exclude .env files from Docker build context ([#5738](https://github.com/homarr-labs/homarr/issues/5738)) ([fa73763](https://github.com/homarr-labs/homarr/commit/fa737638a812372d904207fe7af5bd7c6f53d159))
-* **tracearr:** support absolute image urls ([#5654](https://github.com/homarr-labs/homarr/issues/5654)) ([7a12721](https://github.com/homarr-labs/homarr/commit/7a1272146c597c1f9df89d74b8389f70e7cdd61a))
-
-### Performance Improvements
-
-* (next branch) reduce idle memory on startup ([#5637](https://github.com/homarr-labs/homarr/issues/5637)) ([5ee84f8](https://github.com/homarr-labs/homarr/commit/5ee84f8cf464c308729281cb4db572950ba85a82))
-* **boards:** remove loading overlay and show board immediately ([#5735](https://github.com/homarr-labs/homarr/issues/5735)) ([df4b57b](https://github.com/homarr-labs/homarr/commit/df4b57bd414d4402522f9210b1470d0561c37274))
-* **memory:** combine 3 node processes into one ([#5600](https://github.com/homarr-labs/homarr/issues/5600)) ([a1aa550](https://github.com/homarr-labs/homarr/commit/a1aa5505a365688b456090a882770e561479833e))
-
 ## [1.61.1](https://github.com/homarr-labs/homarr/compare/v1.61.0...v1.61.1) (2026-05-18)
 
 ### Bug Fixes

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:24.16.0-alpine AS base
+FROM node:24.15.0-alpine AS base
 
 FROM base AS builder
 RUN apk add --no-cache libc6-compat

apps/nextjs/next.config.ts

@@ -5,30 +5,18 @@ import "@homarr/common/env";
 import "@homarr/core/infrastructure/logs/env";
 import "@homarr/docker/env";
 
-import { readFileSync } from "fs";
-
 import type { NextConfig } from "next";
 import createNextIntlPlugin from "next-intl/plugin";
 
-const homarrVersion = (() => {
-  for (const candidate of ["../../package.json", "./package.json"]) {
-    try {
-      const pkg = JSON.parse(readFileSync(candidate, "utf-8"));
-      if (pkg.name === "homarr") return pkg.version as string;
-    } catch {}
-  }
-  return "unknown";
-})();
-
 // Package path does not work... so we need to use relative path
 const withNextIntl = createNextIntlPlugin({
+  experimental: {
+    createMessagesDeclaration: "../../packages/translation/src/lang/en.json",
+  },
   requestConfig: "../../packages/translation/src/request.ts",
 });
 
 const nextConfig: NextConfig = {
-  env: {
-    HOMARR_VERSION: homarrVersion,
-  },
   output: "standalone",
   reactStrictMode: true,
   // react compiler breaks mantine-react-table, so disabled for now
@@ -39,7 +27,7 @@ const nextConfig: NextConfig = {
    * dockerode is required in the external server packages because of https://github.com/homarr-labs/homarr/issues/612
    * isomorphic-dompurify and jsdom are required, see https://github.com/kkomelin/isomorphic-dompurify/issues/356
    */
-  serverExternalPackages: ["dockerode", "isomorphic-dompurify", "jsdom", "better-sqlite3"],
+  serverExternalPackages: ["dockerode", "isomorphic-dompurify", "jsdom"],
   experimental: {
     optimizePackageImports: ["@mantine/core", "@mantine/hooks", "@tabler/icons-react"],
     turbopackFileSystemCacheForDev: true,

apps/nextjs/package.json

@@ -7,7 +7,7 @@
     "build": "pnpm with-env next build",
     "clean": "git clean -xdf .next .turbo node_modules",
     "dev": "pnpm with-env next dev",
-    "format": "oxfmt .",
+    "format": "oxfmt --check .",
     "lint": "oxlint",
     "start": "pnpm with-env next start",
     "typecheck": "tsc --noEmit",
@@ -18,7 +18,6 @@
     "@dnd-kit/modifiers": "catalog:",
     "@dnd-kit/sortable": "catalog:",
     "@dnd-kit/utilities": "catalog:",
-    "@gfazioli/mantine-onboarding-tour": "catalog:",
     "@homarr/analytics": "workspace:^0.1.0",
     "@homarr/api": "workspace:^0.1.0",
     "@homarr/auth": "workspace:^0.1.0",
@@ -56,10 +55,7 @@
     "@mantine/hooks": "catalog:",
     "@mantine/modals": "catalog:",
     "@mantine/tiptap": "catalog:",
-    "@modelcontextprotocol/sdk": "catalog:",
-    "@scalar/api-reference-react": "catalog:",
     "@tabler/icons-react": "catalog:",
-    "@tanstack/query-persist-client-core": "catalog:",
     "@tanstack/react-query": "catalog:",
     "@tanstack/react-query-devtools": "catalog:",
     "@tanstack/react-query-next-experimental": "catalog:",
@@ -75,18 +71,11 @@
     "clsx": "catalog:",
     "dayjs": "catalog:",
     "dotenv": "catalog:",
-    "drizzle-orm": "catalog:",
     "flag-icons": "catalog:",
     "glob": "catalog:",
-    "adm-zip": "catalog:",
-    "better-sqlite3": "catalog:",
     "isomorphic-dompurify": "catalog:",
-    "jszip": "catalog:",
     "jotai": "catalog:",
-    "lucide-react": "catalog:",
-    "mantine-datatable": "catalog:",
     "mantine-react-table": "catalog:",
-    "mcp-handler": "catalog:",
     "next": "catalog:",
     "postcss-preset-mantine": "catalog:",
     "prismjs": "catalog:",
@@ -95,22 +84,20 @@
     "react-error-boundary": "catalog:",
     "react-simple-code-editor": "catalog:",
     "sass": "catalog:",
-    "sql.js": "catalog:",
     "superjson": "catalog:",
-    "trpc-to-mcp": "catalog:",
+    "swagger-ui-react": "catalog:",
     "use-deep-compare-effect": "catalog:",
     "yaml": "catalog:",
     "zod": "catalog:"
   },
   "devDependencies": {
     "@homarr/tsconfig": "workspace:^0.1.0",
-    "@types/adm-zip": "catalog:",
-    "@types/better-sqlite3": "catalog:",
     "@types/chroma-js": "catalog:",
     "@types/node": "catalog:",
     "@types/prismjs": "catalog:",
     "@types/react": "catalog:",
     "@types/react-dom": "catalog:",
+    "@types/swagger-ui-react": "catalog:",
     "concurrently": "catalog:",
     "node-loader": "catalog:",
     "typescript": "catalog:"

apps/nextjs/src/app/.well-known/oauth-authorization-server/route.ts

@@ -1,32 +0,0 @@
-import { headers } from "next/headers";
-
-import { extractBaseUrlFromHeaders } from "@homarr/common";
-
-const corsHeaders = {
-  "Access-Control-Allow-Origin": "*",
-  "Access-Control-Allow-Methods": "GET, OPTIONS",
-  "Access-Control-Allow-Headers": "*",
-};
-
-export async function GET() {
-  const baseUrl = extractBaseUrlFromHeaders(await headers());
-
-  return Response.json(
-    {
-      issuer: baseUrl,
-      authorization_endpoint: `${baseUrl}/api/mcp/oauth/authorize`,
-      token_endpoint: `${baseUrl}/api/mcp/oauth/token`,
-      registration_endpoint: `${baseUrl}/api/mcp/oauth/register`,
-      response_types_supported: ["code"],
-      grant_types_supported: ["authorization_code"],
-      code_challenge_methods_supported: ["S256"],
-      token_endpoint_auth_methods_supported: ["none"],
-      scopes_supported: ["mcp:tools"],
-    },
-    { headers: corsHeaders },
-  );
-}
-
-export async function OPTIONS() {
-  return new Response(null, { status: 204, headers: corsHeaders });
-}

apps/nextjs/src/app/.well-known/oauth-protected-resource/route.ts

@@ -1,25 +0,0 @@
-import { headers } from "next/headers";
-
-import { extractBaseUrlFromHeaders } from "@homarr/common";
-
-const corsHeaders = {
-  "Access-Control-Allow-Origin": "*",
-  "Access-Control-Allow-Methods": "GET, OPTIONS",
-  "Access-Control-Allow-Headers": "*",
-};
-
-export async function GET() {
-  const baseUrl = extractBaseUrlFromHeaders(await headers());
-
-  return Response.json(
-    {
-      resource: baseUrl,
-      authorization_servers: [baseUrl],
-    },
-    { headers: corsHeaders },
-  );
-}
-
-export async function OPTIONS() {
-  return new Response(null, { status: 204, headers: corsHeaders });
-}

apps/nextjs/src/app/[locale]/_client-providers/mantine.tsx

@@ -2,14 +2,13 @@
 
 import type { PropsWithChildren } from "react";
 import type { MantineColorScheme, MantineColorSchemeManager } from "@mantine/core";
-import { DirectionProvider, MantineProvider, v8CssVariablesResolver } from "@mantine/core";
+import { createTheme, DirectionProvider, MantineProvider } from "@mantine/core";
 import dayjs from "dayjs";
 
 import { clientApi } from "@homarr/api/client";
 import { useSession } from "@homarr/auth/client";
 import { parseCookies, setClientCookie } from "@homarr/common";
 import { colorSchemeCookieKey } from "@homarr/definitions";
-import { theme } from "@homarr/ui";
 
 export const CustomMantineProvider = ({
   children,
@@ -21,8 +20,10 @@ export const CustomMantineProvider = ({
       <MantineProvider
         defaultColorScheme={defaultColorScheme}
         colorSchemeManager={manager}
-        theme={theme}
+        theme={createTheme({
-        cssVariablesResolver={v8CssVariablesResolver}
+          primaryColor: "red",
+          autoContrast: true,
+        })}
       >
         {children}
       </MantineProvider>

apps/nextjs/src/app/[locale]/_client-providers/query-cache-persister.ts

@@ -1,49 +0,0 @@
-import type { AsyncStorage, PersistedQuery } from "@tanstack/query-persist-client-core";
-import { experimental_createQueryPersister } from "@tanstack/query-persist-client-core";
-import { parse, stringify } from "superjson";
-
-import { fetchApi } from "@homarr/api/client";
-import {
-  getActiveQueryCacheBoardId,
-  isPersistableWidgetQueryKey,
-  queryCacheStoragePrefix,
-} from "@homarr/api/query-cache";
-
-const queryCacheStorage = {
-  async getItem(_key) {
-    return null;
-  },
-  async setItem(key, value) {
-    const boardId = getActiveQueryCacheBoardId();
-    if (!boardId) return;
-
-    try {
-      await fetchApi.queryCache.setItem.mutate({ boardId, key, value });
-    } catch {
-      // Query persistence is best-effort; failed writes should not affect widget rendering.
-    }
-  },
-  async removeItem(key) {
-    const boardId = getActiveQueryCacheBoardId();
-    if (!boardId) return;
-
-    try {
-      await fetchApi.queryCache.removeItem.mutate({ boardId, key });
-    } catch {
-      // Query persistence is best-effort; failed removals should not affect widget rendering.
-    }
-  },
-} satisfies AsyncStorage<string>;
-
-export const createWidgetQueryPersister = () =>
-  experimental_createQueryPersister<string>({
-    storage: typeof window === "undefined" ? undefined : queryCacheStorage,
-    maxAge: Number.POSITIVE_INFINITY,
-    prefix: queryCacheStoragePrefix,
-    refetchOnRestore: true,
-    serialize: (query) => stringify(query),
-    deserialize: (value) => parse<PersistedQuery>(value),
-    filters: {
-      predicate: (query) => isPersistableWidgetQueryKey(query.queryKey),
-    },
-  });

apps/nextjs/src/app/[locale]/_client-providers/trpc.tsx

@@ -17,16 +17,10 @@ import {
 import superjson from "superjson";
 import type { SuperJSONResult } from "superjson";
 
-import { TRPCClientError } from "@trpc/client";
-
 import type { AppRouter } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
-import { queryCacheDefaultStaleTimeMs } from "@homarr/api/query-cache";
 import { createHeadersCallbackForSource, getTrpcUrl } from "@homarr/api/shared";
 import { env } from "@homarr/common/env";
-import { showWarningNotification } from "@homarr/notifications";
-
-import { createWidgetQueryPersister } from "./query-cache-persister";
 
 const getWebSocketProtocol = () => {
   // window is not defined on server side
@@ -55,28 +49,12 @@ const wsClient = createWSClient({
 });
 
 export function TRPCReactProvider(props: PropsWithChildren) {
-  const [queryPersister] = useState(() => createWidgetQueryPersister());
   const [queryClient] = useState(
     () =>
       new QueryClient({
         defaultOptions: {
           queries: {
-            persister: queryPersister.persisterFn,
+            staleTime: 5 * 1000,
-            staleTime: queryCacheDefaultStaleTimeMs,
-          },
-          mutations: {
-            onError(error) {
-              if (
-                error instanceof TRPCClientError &&
-                error.data?.code === "FORBIDDEN" &&
-                error.message === "Mutations are disabled in demo mode"
-              ) {
-                showWarningNotification({
-                  title: "Demo mode",
-                  message: "This action is disabled in demo mode.",
-                });
-              }
-            },
           },
         },
       }),

apps/nextjs/src/app/[locale]/auth/invite/[id]/page.tsx

@@ -59,7 +59,7 @@ export default async function InviteUsagePage(props: InviteUsagePageProps) {
             {t("subtitle")}
           </Text>
         </Stack>
-        <Card w={64 * 6} maw="90vw">
+        <Card withBorder w={64 * 6} maw="90vw">
           <RegistrationForm invite={invite} />
         </Card>
         <Text size="xs" c="gray.5" ta="center">

apps/nextjs/src/app/[locale]/auth/login/_login-form.tsx

@@ -9,7 +9,7 @@ import { z } from "zod/v4";
 
 import { signIn } from "@homarr/auth/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
-import type { UseFormReturnType } from "@homarr/form";
+import type { useForm } from "@homarr/form";
 import { useZodForm } from "@homarr/form";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useScopedI18n } from "@homarr/translation/client";
@@ -162,7 +162,7 @@ export const LoginForm = ({ providers, oidcClientName, isOidcAutoLoginEnabled, c
 
 interface SubmitButtonProps {
   isPending: boolean;
-  form: UseFormReturnType<FormType>;
+  form: ReturnType<typeof useForm<FormType, (values: FormType) => FormType>>;
   provider: "credentials" | "ldap";
 }
 
@@ -198,7 +198,7 @@ const PasswordForgottenCollapse = ({ username }: PasswordForgottenCollapseProps)
         {tForgotPassword("label")}
       </Anchor>
 
-      <Collapse expanded={visible}>
+      <Collapse in={visible}>
         <Card>
           <Stack gap="xs">
             <Text size="sm">{tForgotPassword("description")}</Text>

apps/nextjs/src/app/[locale]/auth/login/page.tsx

@@ -1,14 +1,11 @@
 import { redirect } from "next/navigation";
-import { Alert, Card, Center, Code, Stack, Text, Title } from "@mantine/core";
+import { Card, Center, Stack, Text, Title } from "@mantine/core";
-import { IconLogin } from "@tabler/icons-react";
 
 import { env } from "@homarr/auth/env";
 import { auth } from "@homarr/auth/next";
 import { getScopedI18n } from "@homarr/translation/server";
 import { sanitizeRedirectionUrl } from "@homarr/validation/redirection-url";
 
-import { env as appEnv } from "~/env";
-
 import { HomarrLogoWithTitle } from "~/components/layout/logo/homarr-logo";
 import { LoginForm } from "./_login-form";
 
@@ -40,14 +37,7 @@ export default async function Login(props: LoginProps) {
             {t("subtitle")}
           </Text>
         </Stack>
-        {appEnv.DEMO_MODE && (
+        <Card withBorder w={64 * 6} maw="90vw">
-          <Alert icon={<IconLogin size={18} />} color="blue" variant="light" w={64 * 6} maw="90vw">
-            <Text size="sm" fw={500}>
-              Demo mode is enabled. Sign in with username <Code>demo</Code> and password <Code>demo</Code>
-            </Text>
-          </Alert>
-        )}
-        <Card w={64 * 6} maw="90vw">
           <LoginForm
             providers={env.AUTH_PROVIDERS}
             oidcClientName={env.AUTH_OIDC_CLIENT_NAME}

apps/nextjs/src/app/[locale]/boards/(content)/_creator.tsx

@@ -1,13 +1,10 @@
 import type { Metadata } from "next";
-import { Suspense } from "react";
 import { TRPCError } from "@trpc/server";
 
 // Placed here because gridstack styles are used for board content
 import "~/styles/gridstack.scss";
 
-import type { DehydratedState } from "@tanstack/react-query";
 import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
-import { parse } from "superjson";
 
 import { getQueryClient } from "@homarr/api/server";
 import { IntegrationProvider } from "@homarr/auth/client";
@@ -17,7 +14,6 @@ import { isNullOrWhitespace } from "@homarr/common";
 import { createLogger } from "@homarr/core/infrastructure/logs";
 import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
 import type { WidgetKind } from "@homarr/definitions";
-import { getAllQueryCacheAsync } from "@homarr/redis";
 import { getI18n } from "@homarr/translation/server";
 import { prefetchForKindAsync } from "@homarr/widgets/prefetch";
 
@@ -42,7 +38,6 @@ export const createBoardContentPage = <TParams extends Record<string, unknown>>(
     layout: createBoardLayout({
       headerActions: <BoardContentHeaderActions />,
       getInitialBoardAsync: getInitialBoard,
-      withTour: true,
     }),
     // eslint-disable-next-line no-restricted-syntax
     page: async ({ params }: { params: Promise<TParams> }) => {
@@ -76,14 +71,9 @@ export const createBoardContentPage = <TParams extends Record<string, unknown>>(
         ),
       ]);
 
-      const userId = session?.user.id ?? "anonymous";
-
       return (
         <HydrationBoundary state={dehydrate(queryClient)}>
           <IntegrationProvider integrations={integrations}>
-            <Suspense>
-              <QueryCacheHydration userId={userId} boardId={board.id} />
-            </Suspense>
             <DynamicClientBoard />
           </IntegrationProvider>
         </HydrationBoundary>
@@ -117,37 +107,3 @@ export const createBoardContentPage = <TParams extends Record<string, unknown>>(
     },
   };
 };
-
-interface PersistedEntry {
-  state: { data: unknown; dataUpdatedAt: number; status: string };
-  queryKey: unknown[];
-  queryHash: string;
-}
-
-async function QueryCacheHydration({ userId, boardId }: { userId: string; boardId: string }) {
-  try {
-    const entries = await getAllQueryCacheAsync(userId, boardId);
-    const queries: DehydratedState["queries"] = [];
-
-    for (const serialized of Object.values(entries)) {
-      try {
-        const persisted = parse<PersistedEntry>(serialized);
-        if (persisted.state.status !== "success") continue;
-
-        queries.push({
-          state: persisted.state as DehydratedState["queries"][number]["state"],
-          queryKey: persisted.queryKey,
-          queryHash: persisted.queryHash,
-        });
-      } catch {
-        // skip malformed entries
-      }
-    }
-
-    if (queries.length === 0) return null;
-
-    return <HydrationBoundary state={{ mutations: [], queries }} />;
-  } catch {
-    return null;
-  }
-}

apps/nextjs/src/app/[locale]/boards/(content)/_header-actions.tsx

@@ -2,8 +2,7 @@
 
 import { useCallback, useEffect } from "react";
 import { useRouter } from "next/navigation";
-import { OnboardingTour } from "@gfazioli/mantine-onboarding-tour";
+import { Group, Menu, ScrollArea } from "@mantine/core";
-import { Box, Group, Menu, ScrollArea } from "@mantine/core";
 import { useHotkeys } from "@mantine/hooks";
 import {
   IconBox,
@@ -12,7 +11,6 @@ import {
   IconLayoutBoard,
   IconPencil,
   IconPencilOff,
-  IconPlug,
   IconPlus,
   IconReplace,
   IconResize,
@@ -38,16 +36,14 @@ import { useBoardPermissions } from "~/components/board/permissions/client";
 import { useCategoryActions } from "~/components/board/sections/category/category-actions";
 import { CategoryEditModal } from "~/components/board/sections/category/category-edit-modal";
 import { useDynamicSectionActions } from "~/components/board/sections/dynamic/dynamic-actions";
-import { IntegrationSelectModal } from "~/components/integration/integration-select-modal";
 import { HeaderButton } from "~/components/layout/header/button";
 
 export const BoardContentHeaderActions = () => {
   const [isEditMode] = useEditMode();
   const board = useRequiredBoard();
   const { hasChangeAccess } = useBoardPermissions(board);
-  const { data: demoMode, isLoading } = clientApi.info.isDemoMode.useQuery();
 
-  if (!hasChangeAccess || isLoading) {
+  if (!hasChangeAccess) {
     return <SelectBoardsMenu />;
   }
 
@@ -55,15 +51,11 @@ export const BoardContentHeaderActions = () => {
     <>
       {isEditMode && <AddMenu />}
 
-      <EditModeMenu demoMode={demoMode ?? false} />
+      <EditModeMenu />
 
-      {!demoMode && (
+      <HeaderButton href={`/boards/${board.name}/settings`}>
-        <OnboardingTour.Target id="board-settings">
+        <IconSettings stroke={1.5} />
-          <HeaderButton href={`/boards/${board.name}/settings`}>
+      </HeaderButton>
-            <IconSettings stroke={1.5} />
-          </HeaderButton>
-        </OnboardingTour.Target>
-      )}
 
       <SelectBoardsMenu />
     </>
@@ -75,7 +67,6 @@ const AddMenu = () => {
   const { openModal: openCategoryEditModal } = useModalAction(CategoryEditModal);
   const { openModal: openItemSelectModal } = useModalAction(ItemSelectModal);
   const { openModal: openAppSelectModal } = useModalAction(AppSelectModal);
-  const { openModal: openIntegrationSelectModal } = useModalAction(IntegrationSelectModal);
   const { addCategoryToEnd } = useCategoryActions();
   const { addDynamicSection } = useDynamicSectionActions();
   const { createItem } = useItemActions();
@@ -117,12 +108,8 @@ const AddMenu = () => {
     });
   }, [openAppSelectModal, createItem]);
 
-  const handleAddIntegration = useCallback(() => {
-    openIntegrationSelectModal({});
-  }, [openIntegrationSelectModal]);
-
   return (
-    <Menu position="bottom-end">
+    <Menu position="bottom-end" withArrow>
       <Menu.Target>
         <HeaderButton w="auto" px={4}>
           <Group gap={4} wrap="nowrap">
@@ -140,10 +127,6 @@ const AddMenu = () => {
           {t("app.action.add")}
         </Menu.Item>
 
-        <Menu.Item leftSection={<IconPlug size={20} />} onClick={handleAddIntegration}>
-          {t("integration.action.create")}
-        </Menu.Item>
-
         <Menu.Divider />
 
         <Menu.Item leftSection={<IconBoxAlignTop size={20} />} onClick={handleAddCategory}>
@@ -158,7 +141,7 @@ const AddMenu = () => {
   );
 };
 
-const EditModeMenu = ({ demoMode }: { demoMode: boolean }) => {
+const EditModeMenu = () => {
   const [isEditMode, { open, close }] = useEditMode();
   const board = useRequiredBoard();
   const utils = clientApi.useUtils();
@@ -181,28 +164,18 @@ const EditModeMenu = ({ demoMode }: { demoMode: boolean }) => {
     },
   });
 
-  const discardDemoChanges = useCallback(() => {
-    void utils.board.getBoardByName.invalidate({ name: board.name });
-    close();
-  }, [utils, board.name, close]);
-
   const toggle = useCallback(() => {
-    if (isEditMode) {
+    if (isEditMode) return saveBoard(board);
-      if (demoMode) return discardDemoChanges();
-      return saveBoard(board);
-    }
     open();
-  }, [board, isEditMode, demoMode, saveBoard, open, discardDemoChanges]);
+  }, [board, isEditMode, saveBoard, open]);
 
   useHotkeys([[hotkeys.toggleBoardEdit, toggle]]);
   usePreventLeaveWithDirty(isEditMode);
 
   return (
-    <OnboardingTour.Target id="board-edit-mode">
+    <HeaderButton onClick={toggle} loading={isPending}>
-      <HeaderButton onClick={toggle} loading={isPending}>
+      {isEditMode ? <IconPencilOff stroke={1.5} /> : <IconPencil stroke={1.5} />}
-        {isEditMode ? <IconPencilOff stroke={1.5} /> : <IconPencil stroke={1.5} />}
+    </HeaderButton>
-      </HeaderButton>
-    </OnboardingTour.Target>
   );
 };
 
@@ -210,31 +183,27 @@ const SelectBoardsMenu = () => {
   const { data: boards = [] } = clientApi.board.getAllBoards.useQuery();
 
   return (
-    <OnboardingTour.Target id="board-switcher">
+    <Menu position="bottom-end" withArrow>
-      <Box>
+      <Menu.Target>
-        <Menu position="bottom-end">
+        <HeaderButton w="auto" px={4}>
-          <Menu.Target>
+          <IconReplace stroke={1.5} />
-            <HeaderButton w="auto" px={4}>
+        </HeaderButton>
-              <IconReplace stroke={1.5} />
+      </Menu.Target>
-            </HeaderButton>
+      <Menu.Dropdown style={{ transform: "translate(-7px, 0)" }}>
-          </Menu.Target>
+        <ScrollArea.Autosize mah={300}>
-          <Menu.Dropdown style={{ transform: "translate(-7px, 0)" }}>
+          {boards.map((board) => (
-            <ScrollArea.Autosize mah={300}>
+            <Menu.Item
-              {boards.map((board) => (
+              key={board.id}
-                <Menu.Item
+              component={Link}
-                  key={board.id}
+              href={`/boards/${board.name}`}
-                  component={Link}
+              leftSection={<IconLayoutBoard size={20} />}
-                  href={`/boards/${board.name}`}
+            >
-                  leftSection={<IconLayoutBoard size={20} />}
+              {board.name}
-                >
+            </Menu.Item>
-                  {board.name}
+          ))}
-                </Menu.Item>
+        </ScrollArea.Autosize>
-              ))}
+      </Menu.Dropdown>
-            </ScrollArea.Autosize>
+    </Menu>
-          </Menu.Dropdown>
-        </Menu>
-      </Box>
-    </OnboardingTour.Target>
   );
 };
 
@@ -275,7 +244,7 @@ const usePreventLeaveWithDirty = (isDirty: boolean) => {
     };
 
     const handleBeforeUnload = (event: BeforeUnloadEvent) => {
-      if (env.NODE_ENV === "development") return;
+      if (env.NODE_ENV === "development") return; // Allow to reload in development
 
       event.preventDefault();
       event.returnValue = true;

apps/nextjs/src/app/[locale]/boards/(content)/_theme.tsx

@@ -2,7 +2,7 @@
 
 import type { PropsWithChildren } from "react";
 import type { MantineColorsTuple } from "@mantine/core";
-import { colorsTuple, createTheme, darken, lighten, MantineProvider, rem, v8CssVariablesResolver } from "@mantine/core";
+import { colorsTuple, createTheme, darken, lighten, MantineProvider, rem } from "@mantine/core";
 
 import { useRequiredBoard } from "@homarr/boards/context";
 import type { ColorScheme } from "@homarr/definitions";
@@ -24,7 +24,6 @@ export const BoardMantineProvider = ({
     },
     primaryColor: "primaryColor",
     autoContrast: true,
-    defaultRadius: "sm",
     fontSizes: {
       "2xl": rem(24),
       "3xl": rem(28),
@@ -33,12 +32,7 @@ export const BoardMantineProvider = ({
   });
 
   return (
-    <MantineProvider
+    <MantineProvider defaultColorScheme={defaultColorScheme} theme={theme} colorSchemeManager={colorSchemeManager}>
-      defaultColorScheme={defaultColorScheme}
-      theme={theme}
-      colorSchemeManager={colorSchemeManager}
-      cssVariablesResolver={v8CssVariablesResolver}
-    >
       {children}
     </MantineProvider>
   );

apps/nextjs/src/app/[locale]/boards/[name]/settings/_appereance.tsx

@@ -83,7 +83,7 @@ export const ColorSettingsContent = ({ board }: Props) => {
             <Anchor onClick={toggle}>{showPreview ? t("common.preview.hide") : t("common.preview.show")}</Anchor>
           </Grid.Col>
           <Grid.Col span={12}>
-            <Collapse expanded={showPreview}>
+            <Collapse in={showPreview}>
               <Stack>
                 <ColorsPreview previewColor={form.values.primaryColor} />
                 <ColorsPreview previewColor={form.values.secondaryColor} />

apps/nextjs/src/app/[locale]/boards/_layout-creator.tsx

@@ -11,7 +11,6 @@ import { createLogger } from "@homarr/core/infrastructure/logs";
 import { MainHeader } from "~/components/layout/header";
 import { BoardLogoWithTitle } from "~/components/layout/logo/board-logo";
 import { ClientShell } from "~/components/layout/shell";
-import { BoardTourProvider } from "~/components/onboarding/board-tour";
 import { getCurrentColorSchemeAsync } from "~/theme/color-scheme";
 import type { Board } from "./_types";
 import type { Params } from "./(content)/_creator";
@@ -21,21 +20,14 @@ import { BoardMantineProvider } from "./(content)/_theme";
 
 const logger = createLogger({ module: "createBoardLayout" });
 
-const BoardTourWrapper = ({ hasSession, children }: PropsWithChildren<{ hasSession: boolean }>) => {
-  if (!hasSession) return <>{children}</>;
-  return <BoardTourProvider>{children}</BoardTourProvider>;
-};
-
 interface CreateBoardLayoutProps<TParams extends Params> {
   headerActions: JSX.Element;
   getInitialBoardAsync: (params: TParams) => Promise<Board>;
-  withTour?: boolean;
 }
 
 export const createBoardLayout = <TParams extends Params>({
   headerActions,
   getInitialBoardAsync: getInitialBoard,
-  withTour = false,
 }: CreateBoardLayoutProps<TParams>) => {
   const Layout = async ({
     params,
@@ -69,16 +61,14 @@ export const createBoardLayout = <TParams extends Params>({
           <EditModeProvider>
             <BoardMantineProvider defaultColorScheme={colorScheme}>
               <CustomCss />
-              <BoardTourWrapper hasSession={withTour && !!session}>
+              <ClientShell hasNavigation={false}>
-                <ClientShell hasNavigation={false}>
+                <MainHeader
-                  <MainHeader
+                  logo={<BoardLogoWithTitle size="md" hideTitleOnMobile />}
-                    logo={<BoardLogoWithTitle size="md" hideTitleOnMobile />}
+                  actions={headerActions}
-                    actions={headerActions}
+                  hasNavigation={false}
-                    hasNavigation={false}
+                />
-                  />
+                <AppShellMain>{children}</AppShellMain>
-                  <AppShellMain>{children}</AppShellMain>
+              </ClientShell>
-                </ClientShell>
-              </BoardTourWrapper>
             </BoardMantineProvider>
           </EditModeProvider>
         </BoardReadyProvider>

apps/nextjs/src/app/[locale]/init/_components/init-step-card.tsx

@@ -1,12 +0,0 @@
-import type { PropsWithChildren } from "react";
-import { Card } from "@mantine/core";
-
-interface InitStepCardProps {
-  withBorder?: boolean;
-}
-
-export const InitStepCard = ({ children, withBorder = true }: PropsWithChildren<InitStepCardProps>) => (
-  <Card w="100%" withBorder={withBorder}>
-    {children}
-  </Card>
-);

apps/nextjs/src/app/[locale]/init/_constants.ts

@@ -1,2 +0,0 @@
-export const onboardingContentWidth = 64 * 16;
-export const onboardingMaxWidth = "90vw";

apps/nextjs/src/app/[locale]/init/_steps/finish/init-finish.tsx

@@ -1,27 +1,39 @@
 import type { MantineColor } from "@mantine/core";
-import { Button, Stack, Text } from "@mantine/core";
+import { Button, Card, Stack, Text } from "@mantine/core";
-import { IconBook2, IconLayoutDashboard, IconMailForward } from "@tabler/icons-react";
+import { IconBook2, IconCategoryPlus, IconLayoutDashboard, IconMailForward } from "@tabler/icons-react";
 
 import { isProviderEnabled } from "@homarr/auth/server";
 import { getMantineColor } from "@homarr/common";
+import { db } from "@homarr/db";
 import { createDocumentationLink } from "@homarr/definitions";
 import { getScopedI18n } from "@homarr/translation/server";
 import { Link } from "@homarr/ui";
 import type { TablerIcon } from "@homarr/ui";
 
-import { InitStepCard } from "../../_components/init-step-card";
-
 export const InitFinish = async () => {
+  const firstBoard = await db.query.boards.findFirst({ columns: { name: true } });
   const tFinish = await getScopedI18n("init.step.finish");
 
   return (
-    <InitStepCard>
+    <Card w={64 * 6} maw="90vw" withBorder>
       <Stack>
         <Text>{tFinish("description")}</Text>
 
-        <InternalLinkButton href="/auth/login?callbackUrl=/" iconProps={{ icon: IconLayoutDashboard, color: "blue" }}>
+        {firstBoard ? (
-          {tFinish("action.goToBoard", { name: "dashboard" })}
+          <InternalLinkButton
-        </InternalLinkButton>
+            href={`/auth/login?callbackUrl=/boards/${firstBoard.name}`}
+            iconProps={{ icon: IconLayoutDashboard, color: "blue" }}
+          >
+            {tFinish("action.goToBoard", { name: firstBoard.name })}
+          </InternalLinkButton>
+        ) : (
+          <InternalLinkButton
+            href="/auth/login?callbackUrl=/manage/boards"
+            iconProps={{ icon: IconCategoryPlus, color: "blue" }}
+          >
+            {tFinish("action.createBoard")}
+          </InternalLinkButton>
+        )}
 
         {isProviderEnabled("credentials") && (
           <InternalLinkButton
@@ -39,7 +51,7 @@ export const InitFinish = async () => {
           {tFinish("action.docs")}
         </ExternalLinkButton>
       </Stack>
-    </InitStepCard>
+    </Card>
   );
 };
 

apps/nextjs/src/app/[locale]/init/_steps/group/init-group.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { Button, Stack, TextInput } from "@mantine/core";
+import { Button, Card, Stack, TextInput } from "@mantine/core";
 import { IconArrowRight } from "@tabler/icons-react";
 import type { z } from "zod/v4";
 
@@ -10,8 +10,6 @@ import { useZodForm } from "@homarr/form";
 import { useI18n } from "@homarr/translation/client";
 import { groupCreateSchema } from "@homarr/validation/group";
 
-import { InitStepCard } from "../../_components/init-step-card";
-
 export const InitGroup = () => {
   const t = useI18n();
   const { mutateAsync } = clientApi.group.createInitialExternalGroup.useMutation({
@@ -36,7 +34,7 @@ export const InitGroup = () => {
   };
 
   return (
-    <InitStepCard>
+    <Card w={64 * 6} maw="90vw" withBorder>
       <form onSubmit={form.onSubmit(handleSubmitAsync)}>
         <Stack>
           <TextInput
@@ -50,6 +48,6 @@ export const InitGroup = () => {
           </Button>
         </Stack>
       </form>
-    </InitStepCard>
+    </Card>
   );
 };

apps/nextjs/src/app/[locale]/init/_steps/import/file-info-card.tsx

@@ -1,12 +1,10 @@
-import { ActionIcon, Button, Group, Text } from "@mantine/core";
+import { ActionIcon, Button, Card, Group, Text } from "@mantine/core";
 import type { FileWithPath } from "@mantine/dropzone";
 import { IconPencil } from "@tabler/icons-react";
 
 import { humanFileSize } from "@homarr/common";
 import { useScopedI18n } from "@homarr/translation/client";
 
-import { InitStepCard } from "../../_components/init-step-card";
-
 interface FileInfoCardProps {
   file: FileWithPath;
   onRemove: () => void;
@@ -15,7 +13,7 @@ interface FileInfoCardProps {
 export const FileInfoCard = ({ file, onRemove }: FileInfoCardProps) => {
   const tFileInfo = useScopedI18n("init.step.import.fileInfo");
   return (
-    <InitStepCard withBorder={false}>
+    <Card w={64 * 12 + 8} maw="90vw">
       <Group justify="space-between" align="center" wrap="nowrap">
         <Group>
           <Text fw={500} lineClamp={1} style={{ wordBreak: "break-all" }}>
@@ -38,6 +36,6 @@ export const FileInfoCard = ({ file, onRemove }: FileInfoCardProps) => {
           <IconPencil size={16} stroke={1.5} />
         </ActionIcon>
       </Group>
-    </InitStepCard>
+    </Card>
   );
 };

apps/nextjs/src/app/[locale]/init/_steps/import/init-import.tsx

@@ -1,14 +1,13 @@
 "use client";
 
 import { startTransition, useState } from "react";
-import { Stack } from "@mantine/core";
+import { Card, Stack } from "@mantine/core";
 import type { FileWithPath } from "@mantine/dropzone";
 
 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
 import { InitialOldmarrImport } from "@homarr/old-import/components";
 
-import { InitStepCard } from "../../_components/init-step-card";
 import { FileInfoCard } from "./file-info-card";
 import { ImportDropZone } from "./import-dropzone";
 
@@ -21,7 +20,7 @@ export const InitImport = () => {
 
   if (!file) {
     return (
-      <InitStepCard>
+      <Card w={64 * 12 + 8} maw="90vw" withBorder>
         <ImportDropZone
           loading={isPending}
           updateFile={(file) => {
@@ -41,12 +40,12 @@ export const InitImport = () => {
             });
           }}
         />
-      </InitStepCard>
+      </Card>
     );
   }
 
   return (
-    <Stack w="100%" mb="sm">
+    <Stack mb="sm">
       <FileInfoCard file={file} onRemove={() => setFile(null)} />
       {analyseResult !== null && <InitialOldmarrImport file={file} analyseResult={analyseResult} />}
     </Stack>

apps/nextjs/src/app/[locale]/init/_steps/integrations/docker-discovery-panel.tsx

@@ -1,209 +0,0 @@
-"use client";
-
-import { useEffect, useRef, useState } from "react";
-import {
-  Avatar,
-  Badge,
-  Card,
-  Collapse,
-  Group,
-  Loader,
-  Paper,
-  ScrollArea,
-  SimpleGrid,
-  Stack,
-  Text,
-  ThemeIcon,
-  UnstyledButton,
-} from "@mantine/core";
-import { IconBrandDocker, IconCheck, IconChevronDown } from "@tabler/icons-react";
-
-import type { IntegrationKind } from "@homarr/definitions";
-import { getIntegrationName } from "@homarr/definitions";
-import { useScopedI18n } from "@homarr/translation/client";
-import { IntegrationAvatar } from "@homarr/ui";
-
-export interface DiscoveredIntegration {
-  containerId: string;
-  containerName: string;
-  kind: IntegrationKind;
-  suggestedUrl: string;
-  publishedPort: number | null;
-  iconUrl: string | null;
-}
-
-export interface DiscoveredApp {
-  containerId: string;
-  containerName: string;
-  suggestedUrl: string;
-  publishedPort: number | null;
-  iconUrl: string | null;
-}
-
-interface DockerDiscoveryIndicatorProps {
-  integrations: DiscoveredIntegration[];
-  apps: DiscoveredApp[];
-  selectedAppIds: Set<string>;
-  onToggleApp: (containerId: string) => void;
-  isLoading: boolean;
-}
-
-const APP_CARD_HEIGHT = 80;
-
-export const DockerDiscoveryIndicator = ({
-  integrations,
-  apps,
-  selectedAppIds,
-  onToggleApp,
-  isLoading,
-}: DockerDiscoveryIndicatorProps) => {
-  const hasApps = apps.length > 0;
-  const [expanded, setExpanded] = useState(false);
-
-  const expandedOnce = useRef(false);
-  useEffect(() => {
-    if ((hasApps || integrations.length > 0) && !expandedOnce.current) {
-      expandedOnce.current = true;
-      setExpanded(true);
-    }
-  }, [hasApps, integrations.length]);
-
-  const t = useScopedI18n("init.step.integrations.docker");
-  const totalCount = integrations.length + apps.length;
-
-  if (!isLoading && totalCount === 0) return null;
-
-  const selectedAppCount = apps.filter((app) => selectedAppIds.has(app.containerId)).length;
-
-  if (isLoading) {
-    return (
-      <Paper
-        withBorder
-        p="sm"
-        radius="md"
-        style={{
-          borderColor: "var(--mantine-color-blue-4)",
-          background: "var(--mantine-color-blue-light)",
-        }}
-      >
-        <Group gap="sm" wrap="nowrap">
-          <ThemeIcon variant="light" color="blue" size="lg" radius="md">
-            <IconBrandDocker size={20} />
-          </ThemeIcon>
-          <Stack gap={0} style={{ flex: 1 }}>
-            <Text size="sm" fw={600}>
-              {t("scanning")}
-            </Text>
-            <Text size="xs" c="dimmed">
-              {t("scanningDescription")}
-            </Text>
-          </Stack>
-          <Loader size="sm" color="blue" type="dots" />
-        </Group>
-      </Paper>
-    );
-  }
-
-  return (
-    <Paper
-      withBorder
-      p="sm"
-      radius="md"
-      style={{
-        borderColor: "var(--mantine-color-blue-4)",
-        background: "var(--mantine-color-blue-light)",
-      }}
-    >
-      <UnstyledButton onClick={() => setExpanded((prev) => !prev)} w="100%">
-        <Group justify="space-between" wrap="nowrap">
-          <Group gap="sm" wrap="nowrap">
-            <ThemeIcon variant="light" color="blue" size="lg" radius="md">
-              <IconBrandDocker size={20} />
-            </ThemeIcon>
-            <Stack gap={0}>
-              <Text size="sm" fw={600}>
-                {t("detected", { count: String(totalCount) })}
-              </Text>
-              <Text size="xs" c="dimmed">
-                {t("detectedBreakdown", {
-                  integrations: String(integrations.length),
-                  apps: String(apps.length),
-                })}
-              </Text>
-            </Stack>
-          </Group>
-          <IconChevronDown
-            size={16}
-            color="var(--mantine-color-dimmed)"
-            style={{
-              transform: expanded ? "rotate(180deg)" : undefined,
-              transition: "transform 200ms ease",
-            }}
-          />
-        </Group>
-      </UnstyledButton>
-
-      <Collapse expanded={expanded}>
-        <Stack gap="xs" mt="sm">
-          {integrations.length > 0 && (
-            <Stack gap={4}>
-              {integrations.map((integration) => (
-                <Group key={integration.containerId} gap="xs" wrap="nowrap" py={2}>
-                  <IntegrationAvatar kind={integration.kind} size="xs" />
-                  <Text size="xs" fw={500} lineClamp={1} style={{ flex: 1, minWidth: 0 }}>
-                    {integration.containerName}
-                  </Text>
-                  <Badge size="xs" variant="light" color="blue">
-                    {getIntegrationName(integration.kind)}
-                  </Badge>
-                </Group>
-              ))}
-            </Stack>
-          )}
-
-          {hasApps && (
-            <Stack gap="xs">
-              <Text size="xs" fw={500}>
-                {t("appSectionLabel", { count: String(selectedAppCount) })}
-              </Text>
-              <ScrollArea.Autosize mah="30vh">
-                <SimpleGrid cols={{ base: 3, xs: 4, sm: 5 }} spacing="xs">
-                  {apps.map((app) => {
-                    const isSelected = selectedAppIds.has(app.containerId);
-                    return (
-                      <Card
-                        key={app.containerId}
-                        h={APP_CARD_HEIGHT}
-                        p="xs"
-                        withBorder
-                        style={{
-                          cursor: "pointer",
-                          borderColor: isSelected ? "var(--mantine-color-blue-6)" : undefined,
-                          borderWidth: isSelected ? 2 : undefined,
-                          opacity: isSelected ? 1 : 0.6,
-                        }}
-                        onClick={() => onToggleApp(app.containerId)}
-                      >
-                        <Stack justify="space-between" h="100%" gap={4} align="center">
-                          <Group justify="space-between" w="100%" wrap="nowrap">
-                            <Text size="xs" fw={500} lineClamp={1} style={{ flex: 1, minWidth: 0 }}>
-                              {app.containerName}
-                            </Text>
-                            {isSelected && <IconCheck size={14} color="var(--mantine-color-blue-6)" />}
-                          </Group>
-                          <Avatar size="sm" radius="sm" src={app.iconUrl} styles={{ image: { objectFit: "contain" } }}>
-                            {app.containerName.at(0)?.toUpperCase()}
-                          </Avatar>
-                        </Stack>
-                      </Card>
-                    );
-                  })}
-                </SimpleGrid>
-              </ScrollArea.Autosize>
-            </Stack>
-          )}
-        </Stack>
-      </Collapse>
-    </Paper>
-  );
-};

apps/nextjs/src/app/[locale]/init/_steps/integrations/init-integrations.tsx

@@ -1,483 +0,0 @@
-"use client";
-
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { useRouter } from "next/navigation";
-import {
-  ActionIcon,
-  Alert,
-  Avatar,
-  Button,
-  Card,
-  Center,
-  Collapse,
-  Group,
-  Loader,
-  Paper,
-  Progress,
-  SegmentedControl,
-  SimpleGrid,
-  Stack,
-  Text,
-  TextInput,
-  ThemeIcon,
-  Tooltip,
-} from "@mantine/core";
-import { useDisclosure } from "@mantine/hooks";
-import {
-  IconAlertTriangle,
-  IconArrowRight,
-  IconBrandDocker,
-  IconCheck,
-  IconChevronDown,
-  IconSettings,
-} from "@tabler/icons-react";
-
-import { clientApi } from "@homarr/api/client";
-import type { IntegrationKind, UrlTemplateMode } from "@homarr/definitions";
-import { buildAppUrl, buildIntegrationUrl, getIntegrationName } from "@homarr/definitions";
-import { showErrorNotification } from "@homarr/notifications";
-import { useScopedI18n } from "@homarr/translation/client";
-import { IntegrationAvatar } from "@homarr/ui";
-
-import { NewIntegrationForm } from "~/app/[locale]/manage/integrations/new/_integration-new-form";
-import { IntegrationMultiSelectGrid } from "~/components/integration/integration-multi-select-grid";
-import { InitStepCard } from "../../_components/init-step-card";
-
-type Phase = "select" | "configure" | "done";
-
-interface IntegrationDraft {
-  kind: IntegrationKind;
-  initialUrl: string;
-  initialName?: string;
-  dockerPort?: number | null;
-  source: "manual" | "docker";
-}
-
-export const InitIntegrations = () => {
-  const [phase, setPhase] = useState<Phase>("select");
-  const [drafts, setDrafts] = useState<Map<IntegrationKind, IntegrationDraft>>(new Map());
-  const [selectedKinds, setSelectedKinds] = useState<IntegrationKind[]>([]);
-  const [currentIndex, setCurrentIndex] = useState(0);
-  const [baseHost, setBaseHost] = useState("");
-  const [urlMode, setUrlMode] = useState<UrlTemplateMode>("subdomain");
-  const t = useScopedI18n("init.step.integrations");
-  const router = useRouter();
-
-  const { mutateAsync: setupIntegrations } = clientApi.onboard.setupIntegrations.useMutation();
-  const { mutateAsync: createApps } = clientApi.onboard.createAppsFromDiscovery.useMutation();
-
-  const { data: dockerData, isPending: isDockerLoading } = clientApi.onboard.discoverDockerServices.useQuery(
-    undefined,
-    {
-      retry: false,
-      refetchOnWindowFocus: false,
-    },
-  );
-
-  const dockerIntegrations = dockerData?.status === "success" ? dockerData.integrations : [];
-  const dockerApps = dockerData?.status === "success" ? dockerData.apps : [];
-  const totalDetected = dockerIntegrations.length + dockerApps.length;
-
-  const detectedKinds = useMemo(() => new Set(dockerIntegrations.map((i) => i.kind)), [dockerIntegrations]);
-
-  const [selectedAppIds, setSelectedAppIds] = useState<Set<string>>(new Set());
-  const [appsExpanded, setAppsExpanded] = useState(false);
-
-  const dockerApplied = useRef(false);
-  useEffect(() => {
-    if (dockerData?.status !== "success" || dockerApplied.current) return;
-    dockerApplied.current = true;
-
-    const newDrafts = new Map(drafts);
-    const newKinds = new Set(selectedKinds);
-
-    for (const item of dockerData.integrations) {
-      if (!newDrafts.has(item.kind)) {
-        newDrafts.set(item.kind, {
-          kind: item.kind,
-          initialUrl: item.suggestedUrl,
-          initialName: item.containerName,
-          dockerPort: item.publishedPort,
-          source: "docker",
-        });
-      }
-      newKinds.add(item.kind);
-    }
-
-    setDrafts(newDrafts);
-    setSelectedKinds(Array.from(newKinds));
-    setSelectedAppIds(new Set(dockerData.apps.map((app) => app.containerId)));
-    if (dockerData.apps.length > 0) {
-      setAppsExpanded(true);
-    }
-  }, [dockerData]);
-
-  const handleSelectionChange = useCallback((kinds: IntegrationKind[]) => {
-    setSelectedKinds(kinds);
-  }, []);
-
-  const handleToggleApp = useCallback((containerId: string) => {
-    setSelectedAppIds((prev) => {
-      const next = new Set(prev);
-      if (next.has(containerId)) {
-        next.delete(containerId);
-      } else {
-        next.add(containerId);
-      }
-      return next;
-    });
-  }, []);
-
-  const handleContinueToConfig = () => {
-    const newDrafts = new Map(drafts);
-    for (const kind of selectedKinds) {
-      const existing = newDrafts.get(kind);
-      if (baseHost) {
-        newDrafts.set(kind, {
-          kind,
-          initialUrl: buildIntegrationUrl(kind, baseHost, urlMode, existing?.dockerPort ?? undefined),
-          initialName: existing?.initialName,
-          dockerPort: existing?.dockerPort,
-          source: existing?.source ?? "manual",
-        });
-      } else if (!existing) {
-        newDrafts.set(kind, { kind, initialUrl: "", source: "manual" });
-      }
-    }
-    setDrafts(newDrafts);
-    setCurrentIndex(0);
-    setPhase("configure");
-  };
-
-  const finishSetupAsync = async () => {
-    setPhase("done");
-    try {
-      const appsToCreate = dockerApps.filter((app) => selectedAppIds.has(app.containerId));
-      if (appsToCreate.length > 0) {
-        await createApps(
-          appsToCreate.map((app) => {
-            const href = baseHost
-              ? buildAppUrl(app.containerName, baseHost, urlMode, app.publishedPort ?? undefined)
-              : app.suggestedUrl;
-            return {
-              name: app.containerName,
-              href: href || null,
-              iconUrl: app.iconUrl,
-            };
-          }),
-        );
-      }
-      await setupIntegrations();
-      router.refresh();
-    } catch {
-      showErrorNotification({
-        title: t("configure.error.title"),
-        message: t("configure.error.message"),
-      });
-      setPhase("select");
-    }
-  };
-
-  const advanceOrFinish = () => {
-    if (currentIndex + 1 >= selectedKinds.length) {
-      void finishSetupAsync();
-    } else {
-      setCurrentIndex((i) => i + 1);
-    }
-  };
-
-  const backToSelect = () => {
-    setPhase("select");
-    setCurrentIndex(0);
-  };
-
-  if (phase === "done") {
-    return (
-      <InitStepCard>
-        <Center py="xl">
-          <Stack align="center" gap="md">
-            <Loader size="lg" />
-            <Text>{t("configure.finishing")}</Text>
-          </Stack>
-        </Center>
-      </InitStepCard>
-    );
-  }
-
-  if (phase === "configure") {
-    return (
-      <ConfigurePhase
-        selectedKinds={selectedKinds}
-        currentIndex={currentIndex}
-        drafts={drafts}
-        baseHost={baseHost}
-        setBaseHost={setBaseHost}
-        urlMode={urlMode}
-        setUrlMode={setUrlMode}
-        onSuccess={advanceOrFinish}
-        onCancel={backToSelect}
-        onSkip={advanceOrFinish}
-      />
-    );
-  }
-
-  const selectedAppCount = dockerApps.filter((app) => selectedAppIds.has(app.containerId)).length;
-
-  return (
-    <InitStepCard>
-      <Stack>
-        <Text>{t("description")}</Text>
-
-        <Alert variant="outline" color="orange" icon={<IconAlertTriangle />} title={t("urlTemplate.label")}>
-          <Stack gap="xs">
-            <Text size="sm" fw={500}>
-              {t("urlTemplate.warning")}
-            </Text>
-            <Group gap="sm" grow>
-              <TextInput
-                placeholder={t("urlTemplate.placeholder")}
-                value={baseHost}
-                onChange={(e) => setBaseHost(e.currentTarget.value)}
-                data-autofocus
-              />
-              <SegmentedControl
-                value={urlMode}
-                onChange={(value) => setUrlMode(value as UrlTemplateMode)}
-                data={[
-                  { label: t("urlTemplate.mode.subdomain"), value: "subdomain" },
-                  { label: t("urlTemplate.mode.hostPort"), value: "hostPort" },
-                ]}
-                style={{ flex: "0 0 auto" }}
-              />
-            </Group>
-            {baseHost && (
-              <Text size="xs" c="dimmed">
-                {t("urlTemplate.preview", { example: buildIntegrationUrl("sonarr", baseHost, urlMode) })}
-              </Text>
-            )}
-          </Stack>
-        </Alert>
-
-        {isDockerLoading && (
-          <Paper withBorder p="sm" radius="md">
-            <Group gap="sm" wrap="nowrap">
-              <ThemeIcon variant="light" color="blue" size="lg" radius="md">
-                <IconBrandDocker size={20} />
-              </ThemeIcon>
-              <Text size="sm" fw={500}>
-                {t("docker.scanning")}
-              </Text>
-              <Loader size="sm" color="blue" type="dots" />
-            </Group>
-          </Paper>
-        )}
-
-        {!isDockerLoading && totalDetected > 0 && (
-          <Paper withBorder p="sm" radius="md" style={{ borderColor: "var(--mantine-color-teal-4)" }}>
-            <Group gap="sm" wrap="nowrap">
-              <ThemeIcon variant="light" color="teal" size="lg" radius="md">
-                <IconBrandDocker size={20} />
-              </ThemeIcon>
-              <Text size="sm">
-                {t("docker.summary", {
-                  apps: String(totalDetected),
-                  integrations: String(dockerIntegrations.length),
-                })}
-              </Text>
-            </Group>
-          </Paper>
-        )}
-
-        <IntegrationMultiSelectGrid
-          selectedKinds={selectedKinds}
-          onSelectionChange={handleSelectionChange}
-          detectedKinds={detectedKinds}
-          onboarding
-        />
-
-        {dockerApps.length > 0 && (
-          <Paper withBorder p="sm" radius="md">
-            <Stack gap="xs">
-              <Group
-                justify="space-between"
-                wrap="nowrap"
-                style={{ cursor: "pointer" }}
-                onClick={() => setAppsExpanded((prev) => !prev)}
-              >
-                <Text size="sm" fw={500}>
-                  {t("docker.appSectionLabel", { count: String(selectedAppCount) })}
-                </Text>
-                <IconChevronDown
-                  size={16}
-                  color="var(--mantine-color-dimmed)"
-                  style={{
-                    transform: appsExpanded ? "rotate(180deg)" : undefined,
-                    transition: "transform 200ms ease",
-                  }}
-                />
-              </Group>
-              <Collapse expanded={appsExpanded}>
-                <SimpleGrid cols={{ base: 3, xs: 4, sm: 5 }} spacing="xs">
-                  {dockerApps.map((app) => {
-                    const isSelected = selectedAppIds.has(app.containerId);
-                    return (
-                      <Card
-                        key={app.containerId}
-                        h={80}
-                        p="xs"
-                        withBorder
-                        style={{
-                          cursor: "pointer",
-                          borderColor: isSelected ? "var(--mantine-color-blue-6)" : undefined,
-                          borderWidth: isSelected ? 2 : undefined,
-                          opacity: isSelected ? 1 : 0.6,
-                        }}
-                        onClick={() => handleToggleApp(app.containerId)}
-                      >
-                        <Stack justify="space-between" h="100%" gap={4} align="center">
-                          <Group justify="space-between" w="100%" wrap="nowrap">
-                            <Text size="xs" fw={500} lineClamp={1} style={{ flex: 1, minWidth: 0 }}>
-                              {app.containerName}
-                            </Text>
-                            {isSelected && <IconCheck size={14} color="var(--mantine-color-blue-6)" />}
-                          </Group>
-                          <Avatar size="sm" radius="sm" src={app.iconUrl} styles={{ image: { objectFit: "contain" } }}>
-                            {app.containerName.at(0)?.toUpperCase()}
-                          </Avatar>
-                        </Stack>
-                      </Card>
-                    );
-                  })}
-                </SimpleGrid>
-              </Collapse>
-            </Stack>
-          </Paper>
-        )}
-
-        <Group justify="space-between">
-          <Button variant="subtle" onClick={() => void finishSetupAsync()}>
-            {t("action.skip")}
-          </Button>
-          <Button
-            onClick={handleContinueToConfig}
-            disabled={selectedKinds.length === 0 || undefined}
-            rightSection={<IconArrowRight size={16} stroke={1.5} />}
-            suppressHydrationWarning
-          >
-            {t("action.continue")} {selectedKinds.length > 0 && `(${selectedKinds.length})`}
-          </Button>
-        </Group>
-      </Stack>
-    </InitStepCard>
-  );
-};
-
-interface ConfigurePhaseProps {
-  selectedKinds: IntegrationKind[];
-  currentIndex: number;
-  drafts: Map<IntegrationKind, IntegrationDraft>;
-  baseHost: string;
-  setBaseHost: (value: string) => void;
-  urlMode: UrlTemplateMode;
-  setUrlMode: (value: UrlTemplateMode) => void;
-  onSuccess: () => void;
-  onCancel: () => void;
-  onSkip: () => void;
-}
-
-const ConfigurePhase = ({
-  selectedKinds,
-  currentIndex,
-  drafts,
-  baseHost,
-  setBaseHost,
-  urlMode,
-  setUrlMode,
-  onSuccess,
-  onCancel,
-  onSkip,
-}: ConfigurePhaseProps) => {
-  const t = useScopedI18n("init.step.integrations");
-  const [helpersOpen, { toggle: toggleHelpers }] = useDisclosure(false);
-
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- currentIndex is always within bounds of selectedKinds
-  const currentKind = selectedKinds[currentIndex]!;
-  const draft = drafts.get(currentKind);
-  const progress = ((currentIndex + 1) / selectedKinds.length) * 100;
-  const computedUrl = baseHost
-    ? buildIntegrationUrl(currentKind, baseHost, urlMode, draft?.dockerPort ?? undefined)
-    : draft?.initialUrl;
-
-  return (
-    <InitStepCard>
-      <Stack>
-        <Group justify="space-between" align="center">
-          <Group gap="xs">
-            <IntegrationAvatar kind={currentKind} size="sm" />
-            <Text fw={500}>{getIntegrationName(currentKind)}</Text>
-          </Group>
-          <Tooltip label={t("configure.helpers.tooltip")}>
-            <ActionIcon variant={helpersOpen ? "light" : "subtle"} color="gray" onClick={toggleHelpers}>
-              <IconSettings size={18} stroke={1.5} />
-            </ActionIcon>
-          </Tooltip>
-        </Group>
-
-        <Stack gap={4}>
-          <Progress value={progress} size="sm" />
-          <Text size="xs" c="dimmed" ta="center">
-            {t("configure.progress", { current: String(currentIndex + 1), total: String(selectedKinds.length) })}
-          </Text>
-        </Stack>
-
-        <Collapse expanded={helpersOpen}>
-          <Stack
-            gap="xs"
-            p="xs"
-            style={{ background: "var(--mantine-color-default-hover)", borderRadius: "var(--mantine-radius-sm)" }}
-          >
-            <Text size="xs" c="dimmed">
-              {t("configure.helpers.description")}
-            </Text>
-            <Group gap="sm" grow>
-              <TextInput
-                size="xs"
-                placeholder={t("urlTemplate.placeholder")}
-                value={baseHost}
-                onChange={(e) => setBaseHost(e.currentTarget.value)}
-              />
-              <SegmentedControl
-                size="xs"
-                value={urlMode}
-                onChange={(value) => setUrlMode(value as UrlTemplateMode)}
-                data={[
-                  { label: t("urlTemplate.mode.subdomain"), value: "subdomain" },
-                  { label: t("urlTemplate.mode.hostPort"), value: "hostPort" },
-                ]}
-                style={{ flex: "0 0 auto" }}
-              />
-            </Group>
-            {baseHost && (
-              <Text size="xs" c="dimmed">
-                {t("urlTemplate.preview", {
-                  example: buildIntegrationUrl(currentKind, baseHost, urlMode, draft?.dockerPort ?? undefined),
-                })}
-              </Text>
-            )}
-          </Stack>
-        </Collapse>
-
-        <NewIntegrationForm
-          key={currentKind}
-          kind={currentKind}
-          initialUrl={computedUrl}
-          initialName={draft?.initialName}
-          onSuccess={onSuccess}
-          onCancel={onCancel}
-          onSkip={onSkip}
-          isOnboarding
-        />
-      </Stack>
-    </InitStepCard>
-  );
-};

apps/nextjs/src/app/[locale]/init/_steps/settings/init-settings.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { Button, Group, Stack, Switch, Text } from "@mantine/core";
+import { Button, Card, Group, Stack, Switch, Text } from "@mantine/core";
 import { IconArrowRight } from "@tabler/icons-react";
 import type { z } from "zod/v4";
 
@@ -13,8 +13,6 @@ import type { TranslationObject } from "@homarr/translation";
 import { useI18n, useScopedI18n } from "@homarr/translation/client";
 import { settingsInitSchema } from "@homarr/validation/settings";
 
-import { InitStepCard } from "../../_components/init-step-card";
-
 export const InitSettings = () => {
   const tSection = useScopedI18n("management.page.settings.section");
   const t = useI18n();
@@ -31,8 +29,8 @@ export const InitSettings = () => {
 
   return (
     <form onSubmit={form.onSubmit(handleSubmitAsync)}>
-      <Stack w="100%">
+      <Stack>
-        <InitStepCard>
+        <Card w={64 * 12 + 8} maw="90vw" withBorder>
           <Stack gap="sm">
             <Text fw={500}>{tSection("analytics.title")}</Text>
 
@@ -40,8 +38,8 @@ export const InitSettings = () => {
               <AnalyticsRow kind="general" {...form.getInputProps("analytics.enableGeneral", { type: "checkbox" })} />
             </Stack>
           </Stack>
-        </InitStepCard>
+        </Card>
-        <InitStepCard>
+        <Card w={64 * 12 + 8} maw="90vw" withBorder>
           <Stack gap="sm">
             <Text fw={500}>{tSection("crawlingAndIndexing.title")}</Text>
 
@@ -64,7 +62,7 @@ export const InitSettings = () => {
               />
             </Stack>
           </Stack>
-        </InitStepCard>
+        </Card>
 
         <Button type="submit" loading={form.submitting} rightSection={<IconArrowRight size={16} stroke={1.5} />}>
           {t("common.action.continue")}

apps/nextjs/src/app/[locale]/init/_steps/start/init-start.tsx

@@ -1,20 +1,16 @@
-import { Stack, Text } from "@mantine/core";
+import { Card, Stack, Text } from "@mantine/core";
 import { IconFileImport, IconPlayerPlay } from "@tabler/icons-react";
 
 import { getMantineColor } from "@homarr/common";
-import { dbEnv } from "@homarr/core/infrastructure/db/env";
 import { getScopedI18n } from "@homarr/translation/server";
 
-import { InitStepCard } from "../../_components/init-step-card";
-import { InitSqliteRestore } from "./sqlite-restore";
 import { InitStartButton } from "./next-button";
 
 export const InitStart = async () => {
   const tStart = await getScopedI18n("init.step.start");
-  const isSqlite = dbEnv.DRIVER === "better-sqlite3";
 
   return (
-    <InitStepCard>
+    <Card w={64 * 6} maw="90vw" withBorder>
       <Stack>
         <Text>{tStart("description")}</Text>
 
@@ -30,8 +26,7 @@ export const InitStart = async () => {
         >
           {tStart("action.importOldmarr")}
         </InitStartButton>
-        {isSqlite && <InitSqliteRestore />}
       </Stack>
-    </InitStepCard>
+    </Card>
   );
 };

apps/nextjs/src/app/[locale]/init/_steps/start/sqlite-restore.tsx

@@ -1,43 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import { Button, Collapse, Stack, Text } from "@mantine/core";
-import { IconDatabaseImport } from "@tabler/icons-react";
-
-import { getMantineColor } from "@homarr/common";
-import { useScopedI18n } from "@homarr/translation/client";
-
-import { DatabaseRestoreFlow } from "~/components/backup";
-
-export const InitSqliteRestore = () => {
-  const t = useScopedI18n("init.step.start.action");
-  const [expanded, setExpanded] = useState(false);
-
-  if (expanded) {
-    return (
-      <Stack gap="sm">
-        <Button
-          variant="subtle"
-          size="xs"
-          onClick={() => setExpanded(false)}
-        >
-          {t("backToOptions")}
-        </Button>
-        <Text size="sm" c="dimmed">
-          {t("restoreSqliteDescription")}
-        </Text>
-        <DatabaseRestoreFlow variant="standalone" />
-      </Stack>
-    );
-  }
-
-  return (
-    <Button
-      onClick={() => setExpanded(true)}
-      variant="default"
-      leftSection={<IconDatabaseImport color={getMantineColor("orange", 6)} size={16} stroke={1.5} />}
-    >
-      {t("restoreSqlite")}
-    </Button>
-  );
-};

apps/nextjs/src/app/[locale]/init/_steps/user/init-user-form.tsx

@@ -1,15 +1,15 @@
 "use client";
 
-import { Button, Stack, TextInput } from "@mantine/core";
+import { Button, PasswordInput, Stack, TextInput } from "@mantine/core";
 import type { z } from "zod/v4";
 
 import { clientApi } from "@homarr/api/client";
 import { signIn } from "@homarr/auth/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
 import { useZodForm } from "@homarr/form";
-import { UserCreatePasswordFields } from "@homarr/forms-collection";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useScopedI18n } from "@homarr/translation/client";
+import { CustomPasswordInput } from "@homarr/ui";
 import { userInitSchema } from "@homarr/validation/user";
 
 export const InitUserForm = () => {
@@ -59,10 +59,12 @@ export const InitUserForm = () => {
       >
         <Stack gap="lg">
           <TextInput label={t("field.username.label")} {...form.getInputProps("username")} />
-          <UserCreatePasswordFields
+          <CustomPasswordInput
-            passwordInputProps={form.getInputProps("password")}
+            withPasswordRequirements
-            confirmPasswordInputProps={form.getInputProps("confirmPassword")}
+            label={t("field.password.label")}
+            {...form.getInputProps("password")}
           />
+          <PasswordInput label={t("field.passwordConfirm.label")} {...form.getInputProps("confirmPassword")} />
           <Button type="submit" fullWidth loading={isPending}>
             {t("action.create")}
           </Button>

apps/nextjs/src/app/[locale]/init/_steps/user/init-user.tsx

@@ -1,10 +1,11 @@
-import { InitStepCard } from "../../_components/init-step-card";
+import { Card } from "@mantine/core";
+
 import { InitUserForm } from "./init-user-form";
 
 export const InitUser = () => {
   return (
-    <InitStepCard>
+    <Card w={64 * 6} maw="90vw" withBorder>
       <InitUserForm />
-    </InitStepCard>
+    </Card>
   );
 };

apps/nextjs/src/app/[locale]/init/page.tsx

@@ -9,12 +9,10 @@ import { getScopedI18n } from "@homarr/translation/server";
 import { CurrentColorSchemeCombobox } from "~/components/color-scheme/current-color-scheme-combobox";
 import { CurrentLanguageCombobox } from "~/components/language/current-language-combobox";
 import { HomarrLogoWithTitle } from "~/components/layout/logo/homarr-logo";
-import { onboardingContentWidth, onboardingMaxWidth } from "./_constants";
 import { BackToStart } from "./_steps/back";
 import { InitFinish } from "./_steps/finish/init-finish";
 import { InitGroup } from "./_steps/group/init-group";
 import { InitImport } from "./_steps/import/init-import";
-import { InitIntegrations } from "./_steps/integrations/init-integrations";
 import { InitSettings } from "./_steps/settings/init-settings";
 import { InitStart } from "./_steps/start/init-start";
 import { InitUser } from "./_steps/user/init-user";
@@ -25,7 +23,6 @@ const stepComponents: Record<OnboardingStep, null | (() => MaybePromise<JSX.Elem
   user: InitUser,
   group: InitGroup,
   settings: InitSettings,
-  integrations: InitIntegrations,
   finish: InitFinish,
 };
 
@@ -38,7 +35,7 @@ export default async function InitPage() {
   return (
     <Box mih="100dvh">
       <Center>
-        <Stack align="center" mt="xl" w={onboardingContentWidth} maw={onboardingMaxWidth}>
+        <Stack align="center" mt="xl">
           <HomarrLogoWithTitle size="lg" />
           <Stack gap={6} align="center">
             <Title order={3} fw={400} ta="center">

apps/nextjs/src/app/[locale]/layout.tsx

@@ -1,11 +1,9 @@
 import type { Metadata, Viewport } from "next";
 import { Inter } from "next/font/google";
 
-import "@gfazioli/mantine-onboarding-tour/styles.css";
 import "@homarr/notifications/styles.css";
 import "@homarr/spotlight/styles.css";
 import "@homarr/ui/styles.css";
-import "mantine-datatable/styles.css";
 import "~/styles/color-scheme.scss";
 import "~/styles/scroll-area.scss";
 
@@ -27,7 +25,6 @@ import { isLocaleRTL, isLocaleSupported } from "@homarr/translation";
 
 import { Analytics } from "~/components/layout/analytics";
 import { CrowdinLiveTranslation } from "~/components/layout/crowdin-live-translation";
-
 import { SearchEngineOptimization } from "~/components/layout/search-engine-optimization";
 import { ServiceWorkerRegistration } from "~/components/layout/service-worker-registration";
 import { getCurrentColorSchemeAsync } from "~/theme/color-scheme";
@@ -47,13 +44,13 @@ const fontSans = Inter({
 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.",
+    "Simplify the management of your server with Homarr - a sleek, modern dashboard that puts all of your apps and services at your fingertips.",
   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.",
+      "Simplify the management of your server with Homarr - a sleek, modern dashboard that puts all of your apps and services at your fingertips.",
     url: "https://homarr.dev",
-    siteName: "Homarr",
+    siteName: "Homarr Documentation",
   },
   icons: {
     icon: "/logo/logo.png",
@@ -145,7 +142,7 @@ export default async function Layout(props: {
       </head>
       <body className={["font-sans", fontSans.variable].join(" ")}>
         <StackedProvider>
-          <Notifications pauseResetOnHover="notification" />
+          <Notifications />
           <ServiceWorkerRegistration />
           {props.children}
         </StackedProvider>

apps/nextjs/src/app/[locale]/manage/_components/hero-banner.tsx

@@ -45,6 +45,7 @@ export const HeroBanner = async () => {
                     <Image
                       key={`grid-column-${columnIndex}-scroll-1-${index}`}
                       src={icon}
+                      radius="md"
                       fit={"contain"}
                       w={50}
                       h={50}
@@ -56,6 +57,7 @@ export const HeroBanner = async () => {
                     <Image
                       key={`grid-column-${columnIndex}-scroll-2-${index}`}
                       src={icon}
+                      radius="md"
                       fit={"contain"}
                       w={50}
                       h={50}

apps/nextjs/src/app/[locale]/manage/about/page.tsx

@@ -90,7 +90,9 @@ export default async function AboutPage() {
         <Group py="lg">
           <Image src={homarrLogoPath} width={100} height={100} alt="" />
           <Stack gap={0}>
-            <Title order={1}>Homarr</Title>
+            <Title order={1} tt="uppercase">
+              Homarr
+            </Title>
             <Title order={2}>{t("version", { version })}</Title>
           </Stack>
         </Group>
@@ -193,9 +195,9 @@ export default async function AboutPage() {
                     href={`https://www.npmjs.com/package/${name}`}
                     target="_blank"
                   >
-                    <Card radius="md" p="xs" className={classes.dependencyCard}>
+                    <Card withBorder radius="md" p="xs" className={classes.dependencyCard}>
                       <Group gap="sm" wrap="nowrap">
-                        <ThemeIcon variant="light" size="lg">
+                        <ThemeIcon variant="light" size="lg" radius="md">
                           <IconPackage size="1.5rem" stroke={1.5} />
                         </ThemeIcon>
 

apps/nextjs/src/app/[locale]/manage/apps/page.tsx

@@ -1,6 +1,6 @@
 import { Fragment } from "react";
 import { redirect } from "next/navigation";
-import { ActionIcon, ActionIconGroup, Anchor, Avatar, Card, Group, Stack, Text } from "@mantine/core";
+import { ActionIcon, ActionIconGroup, Anchor, Avatar, Card, Group, Stack, Text, Title } from "@mantine/core";
 import { IconBox, IconPencil } from "@tabler/icons-react";
 import { z } from "zod/v4";
 
@@ -11,9 +11,9 @@ import type { inferSearchParamsFromSchema } from "@homarr/common/types";
 import { getI18n, getScopedI18n } from "@homarr/translation/server";
 import { Link, SearchInput, TablePagination } from "@homarr/ui";
 
-import { TourTarget } from "~/components/layout/header/tour-target";
+import { ManageContainer } from "~/components/manage/manage-container";
-import { ManagePageLayout } from "~/components/manage/manage-page-layout";
 import { MobileAffixButton } from "~/components/manage/mobile-affix-button";
+import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 import { NoResults } from "~/components/no-results";
 import { AppDeleteButton } from "./_app-delete-button";
 
@@ -39,35 +39,34 @@ export default async function AppsPage(props: AppsPageProps) {
   const { items: apps, totalCount } = await api.app.getPaginated(searchParams);
   const t = await getScopedI18n("app");
 
-  const canCreate = session.user.permissions.includes("app-create");
-
   return (
-    <ManagePageLayout
+    <ManageContainer>
-      title={t("page.list.title")}
+      <DynamicBreadcrumb />
-      primaryAction={
+      <Stack>
-        canCreate ? (
+        <Title>{t("page.list.title")}</Title>
-          <TourTarget id="manage-apps-create">
+        <Group justify="space-between" align="center">
+          <SearchInput placeholder={`${t("search")}...`} defaultValue={searchParams.search} flexExpand />
+          {session.user.permissions.includes("app-create") && (
             <MobileAffixButton component={Link} href="/manage/apps/new">
               {t("page.create.title")}
             </MobileAffixButton>
-          </TourTarget>
+          )}
-        ) : undefined
+        </Group>
-      }
+        {apps.length === 0 && <AppNoResults />}
-      toolbar={<SearchInput placeholder={`${t("search")}...`} defaultValue={searchParams.search} flexExpand />}
+        {apps.length > 0 && (
-      footer={<TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />}
-      floatingPrimaryAction={canCreate}
-    >
-      {apps.length === 0 && <AppNoResults />}
-      {apps.length > 0 && (
-        <TourTarget id="manage-apps-list">
           <Stack gap="sm">
             {apps.map((app) => (
               <AppCard key={app.id} app={app} />
             ))}
           </Stack>
-        </TourTarget>
+        )}
-      )}
+
-    </ManagePageLayout>
+        {/* Added margin to not hide pagination behind affix-button */}
+        <Group justify="end" mb={48}>
+          <TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />
+        </Group>
+      </Stack>
+    </ManageContainer>
   );
 }
 
@@ -80,7 +79,7 @@ const AppCard = async ({ app }: AppCardProps) => {
   const session = await auth();
 
   return (
-    <Card>
+    <Card withBorder>
       <Group justify="space-between" wrap="nowrap">
         <Group align="top" justify="start" wrap="nowrap" style={{ flex: "1" }}>
           <Avatar

apps/nextjs/src/app/[locale]/manage/boards/_components/create-board-button.tsx

@@ -1,38 +1,43 @@
 "use client";
 
-import { Button, Menu } from "@mantine/core";
+import { Affix, Button, Menu } from "@mantine/core";
 import { IconCategoryPlus, IconChevronDown, IconFileImport } from "@tabler/icons-react";
 
 import { useModalAction } from "@homarr/modals";
 import { AddBoardModal, ImportBoardModal } from "@homarr/modals-collection";
 import { useI18n } from "@homarr/translation/client";
 
-import { ManageMobilePrimaryAction } from "~/components/manage/manage-mobile-primary-action";
-
 export const CreateBoardButton = () => {
   const t = useI18n();
   const { openModal: openAddModal } = useModalAction(AddBoardModal);
   const { openModal: openImportModal } = useModalAction(ImportBoardModal);
 
+  const buttonGroupContent = (
+    <>
+      <Button leftSection={<IconCategoryPlus size="1rem" />} onClick={openAddModal}>
+        {t("management.page.board.action.new.label")}
+      </Button>
+      <Menu position="bottom-end">
+        <Menu.Target>
+          <Button px="xs" ms={1}>
+            <IconChevronDown size="1rem" />
+          </Button>
+        </Menu.Target>
+        <Menu.Dropdown>
+          <Menu.Item onClick={openImportModal} leftSection={<IconFileImport size="1rem" />}>
+            {t("board.action.oldImport.label")}
+          </Menu.Item>
+        </Menu.Dropdown>
+      </Menu>
+    </>
+  );
+
   return (
-    <ManageMobilePrimaryAction>
+    <>
-      <Button.Group>
+      <Button.Group visibleFrom="md">{buttonGroupContent}</Button.Group>
-        <Button leftSection={<IconCategoryPlus size="1rem" />} onClick={openAddModal}>
+      <Affix hiddenFrom="md" position={{ bottom: 20, right: 20 }}>
-          {t("management.page.board.action.new.label")}
+        <Button.Group>{buttonGroupContent}</Button.Group>
-        </Button>
+      </Affix>
-        <Menu position="bottom-end">
+    </>
-          <Menu.Target>
-            <Button px="xs" ms={1}>
-              <IconChevronDown size="1rem" />
-            </Button>
-          </Menu.Target>
-          <Menu.Dropdown>
-            <Menu.Item onClick={openImportModal} leftSection={<IconFileImport size="1rem" />}>
-              {t("board.action.oldImport.label")}
-            </Menu.Item>
-          </Menu.Dropdown>
-        </Menu>
-      </Button.Group>
-    </ManageMobilePrimaryAction>
   );
 };

apps/nextjs/src/app/[locale]/manage/boards/page.tsx

@@ -9,17 +9,12 @@ import {
   Group,
   Menu,
   MenuTarget,
+  Stack,
   Text,
+  Title,
   Tooltip,
 } from "@mantine/core";
-import {
+import { IconDeviceMobile, IconDotsVertical, IconHomeFilled, IconLock, IconWorld } from "@tabler/icons-react";
-  IconDeviceMobile,
-  IconDotsVertical,
-  IconHomeFilled,
-  IconLayoutDashboard,
-  IconLock,
-  IconWorld,
-} from "@tabler/icons-react";
 
 import type { RouterOutputs } from "@homarr/api";
 import { api } from "@homarr/api/server";
@@ -28,9 +23,8 @@ import { getScopedI18n } from "@homarr/translation/server";
 import { Link, UserAvatar } from "@homarr/ui";
 
 import { getBoardPermissionsAsync } from "~/components/board/permissions/server";
-import { TourTarget } from "~/components/layout/header/tour-target";
+import { ManageContainer } from "~/components/manage/manage-container";
-import { ManagePageLayout } from "~/components/manage/manage-page-layout";
+import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
-import { NoResults } from "~/components/no-results";
 import { BoardCardMenuDropdown } from "./_components/board-card-menu-dropdown";
 import { CreateBoardButton } from "./_components/create-board-button";
 
@@ -41,30 +35,23 @@ export default async function ManageBoardsPage() {
   const canCreateBoards = session?.user.permissions.includes("board-create");
 
   return (
-    <ManagePageLayout
+    <ManageContainer>
-      title={t("title")}
+      <DynamicBreadcrumb />
-      primaryAction={
+      <Stack>
-        canCreateBoards ? (
+        <Group justify="space-between">
-          <TourTarget id="manage-boards-create">
+          <Title mb="md">{t("title")}</Title>
-            <CreateBoardButton />
+          {canCreateBoards && <CreateBoardButton />}
-          </TourTarget>
+        </Group>
-        ) : undefined
+
-      }
+        <Grid mb={{ base: "xl", md: 0 }}>
-      floatingPrimaryAction={canCreateBoards}
+          {boards.map((board) => (
-    >
+            <GridCol span={{ base: 12, md: 6 }} key={board.id}>
-      {boards.length === 0 && <NoResults icon={IconLayoutDashboard} title={t("noResults.title")} />}
+              <BoardCard board={board} />
-      {boards.length > 0 && (
+            </GridCol>
-        <TourTarget id="manage-boards-list">
+          ))}
-          <Grid>
+        </Grid>
-            {boards.map((board) => (
+      </Stack>
-              <GridCol span={{ base: 12, md: 6 }} key={board.id}>
+    </ManageContainer>
-                <BoardCard board={board} />
-              </GridCol>
-            ))}
-          </Grid>
-        </TourTarget>
-      )}
-    </ManagePageLayout>
   );
 }
 
@@ -79,14 +66,16 @@ const BoardCard = async ({ board }: BoardCardProps) => {
   const VisibilityIcon = board.isPublic ? IconWorld : IconLock;
 
   return (
-    <Card>
+    <Card radius="lg" withBorder>
       <CardSection p="sm" withBorder>
         <Group justify="space-between" align="center">
           <Group gap="sm">
             <Tooltip label={t(`visibility.${visibility}`)}>
               <VisibilityIcon size={20} stroke={1.5} />
             </Tooltip>
-            <Text fw={700}>{board.name}</Text>
+            <Text fw="bolder" tt="uppercase">
+              {board.name}
+            </Text>
           </Group>
 
           <Group>
@@ -134,7 +123,6 @@ const BoardCard = async ({ board }: BoardCardProps) => {
                   style={{ borderTop: "none", borderBottom: "none", borderRight: "none", borderRadius: 0 }}
                   variant="default"
                   size="lg"
-                  aria-label={t("action.settings.label")}
                 >
                   <IconDotsVertical size={16} stroke={1.5} />
                 </ActionIcon>

apps/nextjs/src/app/[locale]/manage/integrations/_components/secrets/integration-secret-card.tsx

@@ -33,7 +33,7 @@ export const SecretCard = ({ secret, children, onCancel }: SecretCardProps) => {
   const KindIcon = integrationSecretIcons[secret.kind];
 
   return (
-    <Card>
+    <Card withBorder>
       <Stack>
         <Group justify="space-between">
           <Group>
@@ -58,12 +58,7 @@ export const SecretCard = ({ secret, children, onCancel }: SecretCardProps) => {
               </Tooltip>
             )}
             {isPublic ? (
-              <ActionIcon
+              <ActionIcon color="gray" variant="subtle" onClick={togglePublicSecretDisplay}>
-                color="gray"
-                variant="subtle"
-                onClick={togglePublicSecretDisplay}
-                aria-label={t(publicSecretDisplayOpened ? "common.action.hide" : "common.action.show")}
-              >
                 <DisplayIcon size={16} stroke={1.5} />
               </ActionIcon>
             ) : null}
@@ -84,7 +79,7 @@ export const SecretCard = ({ secret, children, onCancel }: SecretCardProps) => {
             </Button>
           </Group>
         </Group>
-        <Collapse expanded={editMode}>{children}</Collapse>
+        <Collapse in={editMode}>{children}</Collapse>
       </Stack>
     </Card>
   );

apps/nextjs/src/app/[locale]/manage/integrations/_components/secrets/integration-secret-icons.ts

@@ -8,7 +8,6 @@ import {
   IconPasswordUser,
   IconPlug,
   IconServer,
-  IconTag,
   IconUser,
 } from "@tabler/icons-react";
 
@@ -29,5 +28,4 @@ export const integrationSecretIcons = {
   githubAppId: IconCode,
   githubInstallationId: IconPlug,
   privateKey: IconKey,
-  slug: IconTag,
 } satisfies Record<IntegrationSecretKind, TablerIcon>;

apps/nextjs/src/app/[locale]/manage/integrations/_components/secrets/integration-secret-segmented-control.tsx

@@ -12,7 +12,7 @@ interface FormType {
 interface SecretKindsSegmentedControlProps<TFormType extends FormType> {
   defaultKinds?: IntegrationSecretKind[];
   secretKinds: IntegrationSecretKind[][];
-  form: UseFormReturnType<TFormType, TFormType>;
+  form: UseFormReturnType<TFormType, (values: TFormType) => TFormType>;
 }
 
 export const SecretKindsSegmentedControl = <TFormType extends FormType>({

apps/nextjs/src/app/[locale]/manage/integrations/_components/test-connection/integration-test-connection-error.tsx

@@ -18,7 +18,7 @@ export const IntegrationTestConnectionError = ({ error, url }: IntegrationTestCo
   const causeArray = useMemo(() => toCauseArray(error.cause), [error.cause]);
 
   return (
-    <Card style={{ borderColor: getMantineColor("red", 8) }}>
+    <Card withBorder style={{ borderColor: getMantineColor("red", 8) }}>
       <Stack>
         <Stack gap="sm">
           <Text size="lg" fw={500} c="red.8">

apps/nextjs/src/app/[locale]/manage/integrations/_components/test-connection/test-connection-certificate.tsx

@@ -216,7 +216,7 @@ export const CertificateDetailsCard = ({ certificate }: CertificateDetailsProps)
   const tCertificateField = useScopedI18n("certificate.field");
 
   return (
-    <Card>
+    <Card withBorder>
       <Text fw={500}>{tDetails("title")}</Text>
       <Group justify="space-between">
         <Text size="sm" c="dimmed">

apps/nextjs/src/app/[locale]/manage/integrations/new/_integration-new-dropdown.tsx

@@ -0,0 +1,59 @@
+"use client";
+
+import type { ChangeEvent } from "react";
+import React, { useMemo, useState } from "react";
+import { Flex, Group, Menu, ScrollArea, Text, TextInput } from "@mantine/core";
+import { IconSearch } from "@tabler/icons-react";
+
+import { getIntegrationName, integrationKinds } from "@homarr/definitions";
+import { useI18n } from "@homarr/translation/client";
+import { IntegrationAvatar, Link } from "@homarr/ui";
+
+interface IntegrationCreateDropdownContentProps {
+  enableMockIntegration: boolean;
+}
+
+export const IntegrationCreateDropdownContent = ({ enableMockIntegration }: IntegrationCreateDropdownContentProps) => {
+  const t = useI18n();
+  const [search, setSearch] = useState("");
+
+  const filteredKinds = useMemo(() => {
+    return integrationKinds
+      .filter((kind) => enableMockIntegration || kind !== "mock")
+      .filter((kind) => getIntegrationName(kind).toLowerCase().includes(search.toLowerCase().trim()))
+      .sort((kindA, kindB) => getIntegrationName(kindA).localeCompare(getIntegrationName(kindB)));
+  }, [search, enableMockIntegration]);
+
+  const handleSearch = React.useCallback(
+    (event: ChangeEvent<HTMLInputElement>) => setSearch(event.target.value),
+    [setSearch],
+  );
+
+  return (
+    <Flex direction={{ base: "column-reverse", md: "column" }} gap="sm">
+      <TextInput
+        leftSection={<IconSearch stroke={1.5} size={20} />}
+        placeholder={t("integration.page.list.search")}
+        value={search}
+        data-autofocus
+        onChange={handleSearch}
+        variant="filled"
+      />
+
+      {filteredKinds.length > 0 ? (
+        <ScrollArea.Autosize mah={384}>
+          {filteredKinds.map((kind) => (
+            <Menu.Item component={Link} href={`/manage/integrations/new?kind=${kind}`} key={kind}>
+              <Group>
+                <IntegrationAvatar kind={kind} size="sm" />
+                <Text size="sm">{getIntegrationName(kind)}</Text>
+              </Group>
+            </Menu.Item>
+          ))}
+        </ScrollArea.Autosize>
+      ) : (
+        <Menu.Item disabled>{t("common.noResults")}</Menu.Item>
+      )}
+    </Flex>
+  );
+};

apps/nextjs/src/app/[locale]/manage/integrations/new/_integration-new-form-wrapper.tsx

@@ -1,26 +0,0 @@
-"use client";
-
-import { useRouter } from "next/navigation";
-
-import type { IntegrationKind } from "@homarr/definitions";
-
-import { NewIntegrationForm } from "./_integration-new-form";
-
-interface IntegrationNewFormWrapperProps {
-  kind: IntegrationKind;
-  initialUrl?: string;
-  initialName?: string;
-}
-
-export const IntegrationNewFormWrapper = ({ kind, initialUrl, initialName }: IntegrationNewFormWrapperProps) => {
-  const router = useRouter();
-
-  return (
-    <NewIntegrationForm
-      kind={kind}
-      initialUrl={initialUrl}
-      initialName={initialName}
-      onSuccess={() => router.push("/manage/integrations")}
-    />
-  );
-};

apps/nextjs/src/app/[locale]/manage/integrations/new/_integration-new-form.tsx

@@ -1,9 +1,9 @@
 "use client";
 
 import { startTransition, useState } from "react";
+import { useRouter } from "next/navigation";
 import {
   Alert,
-  Anchor,
   Button,
   Checkbox,
   Collapse,
@@ -16,7 +16,7 @@ import {
   Text,
   TextInput,
 } from "@mantine/core";
-import { IconCheck, IconExternalLink, IconInfoCircle, IconKey } from "@tabler/icons-react";
+import { IconCheck, IconInfoCircle } from "@tabler/icons-react";
 import { z } from "zod/v4";
 
 import { clientApi } from "@homarr/api/client";
@@ -27,7 +27,6 @@ import type { IntegrationKind } from "@homarr/definitions";
 import {
   getAllSecretKindOptions,
   getIconUrl,
-  getIntegrationApiKeyUrl,
   getIntegrationDefaultUrl,
   getIntegrationName,
   integrationDefs,
@@ -46,13 +45,9 @@ import { IntegrationTestConnectionError } from "../_components/test-connection/i
 import type { AnyMappedTestConnectionError } from "../_components/test-connection/types";
 
 interface NewIntegrationFormProps {
-  kind: IntegrationKind;
+  searchParams: Partial<z.infer<typeof integrationCreateSchema>> & {
-  initialUrl?: string;
+    kind: IntegrationKind;
-  initialName?: string;
+  };
-  onSuccess: () => void;
-  onCancel?: () => void;
-  onSkip?: () => void;
-  isOnboarding?: boolean;
 }
 
 const formSchema = integrationCreateSchema.omit({ kind: true, app: true }).and(
@@ -63,48 +58,39 @@ const formSchema = integrationCreateSchema.omit({ kind: true, app: true }).and(
   }),
 );
 
-export const NewIntegrationForm = ({
+export const NewIntegrationForm = ({ searchParams }: NewIntegrationFormProps) => {
-  kind,
-  initialUrl,
-  initialName,
-  onSuccess,
-  onCancel,
-  onSkip,
-  isOnboarding = false,
-}: NewIntegrationFormProps) => {
   const t = useI18n();
-  const secretKinds = getAllSecretKindOptions(kind);
+  const secretKinds = getAllSecretKindOptions(searchParams.kind);
   const hasUrlSecret = secretKinds.some((kinds) => kinds.includes("url"));
+  const router = useRouter();
   const { data: session } = useSession();
-  const canCreateApps = !isOnboarding && (session?.user.permissions.includes("app-create") ?? false);
+  const canCreateApps = session?.user.permissions.includes("app-create") ?? false;
 
-  let url = initialUrl ?? getIntegrationDefaultUrl(kind) ?? "";
+  let url = searchParams.url ?? getIntegrationDefaultUrl(searchParams.kind) ?? "";
   if (hasUrlSecret) {
+    // Placeholder Url, replaced with origin of the secret Url on submit
     url = "http://localhost";
   }
   const form = useZodForm(formSchema, {
     initialValues: {
-      name: initialName ?? getIntegrationName(kind),
+      name: searchParams.name ?? getIntegrationName(searchParams.kind),
       url,
       secrets: secretKinds[0].map((kind) => ({
         kind,
         value: "",
       })),
-      attemptSearchEngineCreation: !isOnboarding,
+      attemptSearchEngineCreation: true,
-      hasApp: !isOnboarding,
+      hasApp: false,
-      appHref: isOnboarding ? null : url,
+      appHref: url,
       appId: null,
     },
   });
 
-  const { mutateAsync: createIntegrationAsync, isPending: isCreatePending } = clientApi.integration.create.useMutation({
+  const { mutateAsync: createIntegrationAsync, isPending } = clientApi.integration.create.useMutation({
     async onSuccess() {
       await revalidatePathActionAsync("/manage/integrations");
     },
   });
-  const { mutateAsync: createOnboardingIntegrationAsync, isPending: isOnboardingCreatePending } =
-    clientApi.onboard.createIntegration.useMutation();
-  const isPending = isCreatePending || isOnboardingCreatePending;
   const [error, setError] = useState<null | AnyMappedTestConnectionError>(null);
 
   const handleSubmitAsync = async ({ appId, appHref, hasApp, ...values }: FormType) => {
@@ -112,39 +98,6 @@ export const NewIntegrationForm = ({
       ? new URL(values.secrets.find((secret) => secret.kind === "url")?.value ?? values.url).origin
       : values.url;
 
-    const onMutationSuccess = (data: { error?: AnyMappedTestConnectionError } | undefined | void) => {
-      if (data && "error" in data && data.error) {
-        setError(data.error);
-        showErrorNotification({
-          title: t("integration.page.create.notification.error.title"),
-          message: t("integration.page.create.notification.error.message"),
-        });
-        return;
-      }
-
-      showSuccessNotification({
-        title: t("integration.page.create.notification.success.title"),
-        message: t("integration.page.create.notification.success.message"),
-      });
-
-      onSuccess();
-    };
-
-    const onMutationError = () => {
-      showErrorNotification({
-        title: t("integration.page.create.notification.error.title"),
-        message: t("integration.page.create.notification.error.message"),
-      });
-    };
-
-    if (isOnboarding) {
-      await createOnboardingIntegrationAsync(
-        { kind, name: values.name, url, secrets: values.secrets },
-        { onSuccess: onMutationSuccess, onError: onMutationError },
-      );
-      return;
-    }
-
     const hasCustomHref = appHref !== null && appHref.trim().length >= 1;
 
     const app = hasApp
@@ -153,21 +106,49 @@ export const NewIntegrationForm = ({
         : {
             name: values.name,
             href: hasCustomHref ? appHref : url,
-            iconUrl: getIconUrl(kind),
+            iconUrl: getIconUrl(searchParams.kind),
             description: null,
             pingUrl: url,
           }
       : undefined;
 
     await createIntegrationAsync(
-      { kind, ...values, url, app },
+      {
-      { onSuccess: onMutationSuccess, onError: onMutationError },
+        kind: searchParams.kind,
+        ...values,
+        url,
+        app,
+      },
+      {
+        onSuccess(data) {
+          // We do it this way as we are unable to send a typesafe error through onError
+          if (data?.error) {
+            setError(data.error);
+            showErrorNotification({
+              title: t("integration.page.create.notification.error.title"),
+              message: t("integration.page.create.notification.error.message"),
+            });
+            return;
+          }
+
+          showSuccessNotification({
+            title: t("integration.page.create.notification.success.title"),
+            message: t("integration.page.create.notification.success.message"),
+          });
+
+          router.push("/manage/integrations");
+        },
+        onError: () => {
+          showErrorNotification({
+            title: t("integration.page.create.notification.error.title"),
+            message: t("integration.page.create.notification.error.message"),
+          });
+        },
+      },
     );
   };
 
-  const integrationCategories = integrationDefs[kind].category.flat();
+  const supportsSearchEngine = integrationDefs[searchParams.kind].category.flat().includes("search");
-  const supportsSearchEngine =
-    integrationCategories.includes("search") && !integrationCategories.includes("mediaSearch");
 
   return (
     <form onSubmit={form.onSubmit((value) => void handleSubmitAsync(value))}>
@@ -194,39 +175,27 @@ export const NewIntegrationForm = ({
                 <Text c={"blue"}>{t("integration.secrets.noSecretsRequired.text")}</Text>
               </Alert>
             )}
-            <ApiKeySettingsLink kind={kind} url={form.values.url} />
           </Stack>
         </Fieldset>
 
         {error !== null && <IntegrationTestConnectionError error={error} url={form.values.url} />}
 
-        {!isOnboarding && supportsSearchEngine && (
+        {supportsSearchEngine && (
           <Checkbox
             label={t("integration.field.attemptSearchEngineCreation.label")}
             description={t("integration.field.attemptSearchEngineCreation.description", {
-              kind: getIntegrationName(kind),
+              kind: getIntegrationName(searchParams.kind),
             })}
             {...form.getInputProps("attemptSearchEngineCreation", { type: "checkbox" })}
           />
         )}
 
-        {!isOnboarding && <AppForm form={form} canCreateApps={canCreateApps} />}
+        <AppForm form={form} canCreateApps={canCreateApps} />
 
         <Group justify="end" align="center">
-          {onCancel ? (
+          <Button variant="default" component={Link} href="/manage/integrations">
-            <Button variant="default" onClick={onCancel}>
+            {t("common.action.backToOverview")}
-              {t("common.action.backToOverview")}
+          </Button>
-            </Button>
-          ) : (
-            <Button variant="default" component={Link} href="/manage/integrations">
-              {t("common.action.backToOverview")}
-            </Button>
-          )}
-          {onSkip && (
-            <Button variant="default" onClick={onSkip}>
-              {t("common.action.skip")}
-            </Button>
-          )}
           <Button type="submit" loading={isPending}>
             {t("integration.testConnection.action.create")}
           </Button>
@@ -257,7 +226,7 @@ const AppForm = ({ form, canCreateApps }: { form: UseFormReturnType<FormType>; c
         description={t("integration.field.createApp.description")}
       />
 
-      <Collapse expanded={form.values.hasApp}>
+      <Collapse in={form.values.hasApp}>
         <Fieldset legend={t("integration.field.app.sectionTitle")}>
           <Stack gap="sm">
             {canCreateApps && (
@@ -297,40 +266,6 @@ const AppForm = ({ form, canCreateApps }: { form: UseFormReturnType<FormType>; c
   );
 };
 
-const normalizeUrl = (raw: string): string | null => {
-  try {
-    return new URL(raw).href;
-  } catch {
-    // Bare IP / hostname — prepend http:// and retry
-  }
-  try {
-    return new URL(`http://${raw}`).href;
-  } catch {
-    return null;
-  }
-};
-
-const ApiKeySettingsLink = ({ kind, url }: { kind: IntegrationKind; url: string }) => {
-  const t = useI18n();
-  const apiKeyUrl = getIntegrationApiKeyUrl(url, kind);
-  if (!apiKeyUrl) return null;
-
-  const resolved = normalizeUrl(url);
-  if (!resolved) return null;
-
-  const fullApiKeyUrl = getIntegrationApiKeyUrl(resolved, kind);
-
-  return (
-    <Anchor href={fullApiKeyUrl ?? apiKeyUrl} target="_blank" rel="noopener noreferrer" size="sm">
-      <Group gap={4}>
-        <IconKey size={14} stroke={1.5} />
-        <Text size="sm">{t("integration.field.apiKeySettings.label")}</Text>
-        <IconExternalLink size={14} stroke={1.5} />
-      </Group>
-    </Anchor>
-  );
-};
-
 type IntegrationAppSelectProps = Modify<
   GetInputPropsReturnType,
   {

apps/nextjs/src/app/[locale]/manage/integrations/new/_integration-new-select-grid.tsx

@@ -1,21 +0,0 @@
-"use client";
-
-import { useRouter } from "next/navigation";
-
-import type { IntegrationKind } from "@homarr/definitions";
-
-import { IntegrationSelectGrid } from "~/components/integration/integration-select-grid";
-
-interface IntegrationNewSelectGridProps {
-  enableMockIntegration: boolean;
-}
-
-export const IntegrationNewSelectGrid = ({ enableMockIntegration }: IntegrationNewSelectGridProps) => {
-  const router = useRouter();
-
-  const handleSelect = (kind: IntegrationKind) => {
-    router.push(`/manage/integrations/new?kind=${kind}`);
-  };
-
-  return <IntegrationSelectGrid onSelect={handleSelect} enableMockIntegration={enableMockIntegration} />;
-};

apps/nextjs/src/app/[locale]/manage/integrations/new/page.tsx

@@ -3,21 +3,21 @@ import { Container, Group, Stack, Title } from "@mantine/core";
 import { z } from "zod/v4";
 
 import { auth } from "@homarr/auth/next";
+import type { IntegrationKind } from "@homarr/definitions";
 import { getIntegrationName, integrationKinds } from "@homarr/definitions";
 import { getScopedI18n } from "@homarr/translation/server";
 import { IntegrationAvatar } from "@homarr/ui";
+import type { integrationCreateSchema } from "@homarr/validation/integration";
 
 import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
-import { env } from "~/env";
+import { NewIntegrationForm } from "./_integration-new-form";
-import { IntegrationNewFormWrapper } from "./_integration-new-form-wrapper";
-import { IntegrationNewSelectGrid } from "./_integration-new-select-grid";
 
 interface NewIntegrationPageProps {
-  searchParams: Promise<{
+  searchParams: Promise<
-    kind?: string;
+    Partial<z.infer<typeof integrationCreateSchema>> & {
-    url?: string;
+      kind: IntegrationKind;
-    name?: string;
+    }
-  }>;
+  >;
 }
 
 export default async function IntegrationsNewPage(props: NewIntegrationPageProps) {
@@ -28,20 +28,8 @@ export default async function IntegrationsNewPage(props: NewIntegrationPageProps
   }
 
   const result = z.enum(integrationKinds).safeParse(searchParams.kind);
-
   if (!result.success) {
-    const t = await getScopedI18n("integration");
+    notFound();
-    return (
-      <>
-        <DynamicBreadcrumb />
-        <Container>
-          <Stack>
-            <Title>{t("action.create")}</Title>
-            <IntegrationNewSelectGrid enableMockIntegration={env.UNSAFE_ENABLE_MOCK_INTEGRATION} />
-          </Stack>
-        </Container>
-      </>
-    );
   }
 
   const tCreate = await getScopedI18n("integration.page.create");
@@ -57,7 +45,7 @@ export default async function IntegrationsNewPage(props: NewIntegrationPageProps
             <IntegrationAvatar kind={currentKind} size="md" />
             <Title>{tCreate("title", { name: getIntegrationName(currentKind) })}</Title>
           </Group>
-          <IntegrationNewFormWrapper kind={currentKind} initialUrl={searchParams.url} initialName={searchParams.name} />
+          <NewIntegrationForm searchParams={searchParams} />
         </Stack>
       </Container>
     </>

apps/nextjs/src/app/[locale]/manage/integrations/page.module.css

@@ -8,7 +8,7 @@
   border: 1px solid transparent;
   position: relative;
   z-index: 0;
-  transition: background-color 150ms ease;
+  transition: transform 150ms ease;
   overflow: hidden;
 
   &[data-first="true"] {
@@ -20,9 +20,11 @@
   }
 
   &[data-active] {
+    transform: scale(1.01);
     z-index: 1;
     background-color: var(--mantine-color-body);
     border-color: light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
+    box-shadow: var(--mantine-shadow-md);
     border-radius: var(--mantine-radius-lg);
   }
 }

apps/nextjs/src/app/[locale]/manage/integrations/page.tsx

@@ -1,4 +1,5 @@
 import { Fragment } from "react";
+import type { PropsWithChildren } from "react";
 import { redirect } from "next/navigation";
 import {
   AccordionControl,
@@ -6,9 +7,15 @@ import {
   AccordionPanel,
   ActionIcon,
   ActionIconGroup,
+  Affix,
   Anchor,
+  Box,
+  Button,
   Divider,
   Group,
+  Menu,
+  MenuDropdown,
+  MenuTarget,
   Stack,
   Table,
   TableTbody,
@@ -17,8 +24,9 @@ import {
   TableThead,
   TableTr,
   Text,
+  Title,
 } from "@mantine/core";
-import { IconPencil, IconPlugX } from "@tabler/icons-react";
+import { IconChevronDown, IconChevronUp, IconPencil, IconPlugX } from "@tabler/icons-react";
 
 import type { RouterOutputs } from "@homarr/api";
 import { api } from "@homarr/api/server";
@@ -29,12 +37,13 @@ import { getIntegrationName } from "@homarr/definitions";
 import { getScopedI18n } from "@homarr/translation/server";
 import { CountBadge, IntegrationAvatar, Link } from "@homarr/ui";
 
-import { TourTarget } from "~/components/layout/header/tour-target";
+import { ManageContainer } from "~/components/manage/manage-container";
-import { ManagePageLayout } from "~/components/manage/manage-page-layout";
+import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
-import { MobileAffixButton } from "~/components/manage/mobile-affix-button";
 import { NoResults } from "~/components/no-results";
+import { env } from "~/env";
 import { ActiveTabAccordion } from "../../../../components/active-tab-accordion";
 import { DeleteIntegrationActionButton } from "./_integration-buttons";
+import { IntegrationCreateDropdownContent } from "./new/_integration-new-dropdown";
 import classes from "./page.module.css";
 
 interface IntegrationsPageProps {
@@ -57,26 +66,60 @@ export default async function IntegrationsPage(props: IntegrationsPageProps) {
   const canCreateIntegrations = session.user.permissions.includes("integration-create");
 
   return (
-    <ManagePageLayout
+    <ManageContainer>
-      title={t("page.list.title")}
+      <DynamicBreadcrumb />
-      primaryAction={
+      <Stack>
-        canCreateIntegrations ? (
+        <Group justify="space-between" align="center">
-          <TourTarget id="manage-integrations-create">
+          <Title>{t("page.list.title")}</Title>
-            <MobileAffixButton component={Link} href="/manage/integrations/new">
+
-              {t("action.create")}
+          {canCreateIntegrations && (
-            </MobileAffixButton>
+            <>
-          </TourTarget>
+              <Box>
-        ) : undefined
+                <IntegrationSelectMenu>
-      }
+                  <Affix hiddenFrom="md" position={{ bottom: 20, right: 20 }}>
-      floatingPrimaryAction={canCreateIntegrations}
+                    <MenuTarget>
-    >
+                      <Button rightSection={<IconChevronUp size={16} stroke={1.5} />}>{t("action.create")}</Button>
-      <TourTarget id="manage-integrations-list">
+                    </MenuTarget>
+                  </Affix>
+                </IntegrationSelectMenu>
+              </Box>
+
+              <Box visibleFrom="md">
+                <IntegrationSelectMenu>
+                  <MenuTarget>
+                    <Button rightSection={<IconChevronDown size={16} stroke={1.5} />}>{t("action.create")}</Button>
+                  </MenuTarget>
+                </IntegrationSelectMenu>
+              </Box>
+            </>
+          )}
+        </Group>
+
         <IntegrationList integrations={integrations} activeTab={searchParams.tab} />
-      </TourTarget>
+      </Stack>
-    </ManagePageLayout>
+    </ManageContainer>
   );
 }
 
+const IntegrationSelectMenu = ({ children }: PropsWithChildren) => {
+  return (
+    <Menu
+      width={256}
+      trapFocus
+      position="bottom-end"
+      withinPortal
+      shadow="md"
+      keepMounted={false}
+      withInitialFocusPlaceholder={false}
+    >
+      {children}
+      <MenuDropdown>
+        <IntegrationCreateDropdownContent enableMockIntegration={env.UNSAFE_ENABLE_MOCK_INTEGRATION} />
+      </MenuDropdown>
+    </Menu>
+  );
+};
+
 interface IntegrationListProps {
   integrations: RouterOutputs["integration"]["all"];
   activeTab?: IntegrationKind;
@@ -109,12 +152,12 @@ const IntegrationList = async ({ integrations, activeTab }: IntegrationListProps
 
   return (
     <ActiveTabAccordion defaultValue={activeTab} radius="lg" classNames={classes}>
-      {entries.map(([kind, kindIntegrations], index) => (
+      {entries.map(([kind, integrations], index) => (
         <AccordionItem key={kind} value={kind} data-first={index === 0} data-last={index === entries.length - 1}>
           <AccordionControl icon={<IntegrationAvatar size="sm" kind={kind} radius="sm" />}>
             <Group>
               <Text>{getIntegrationName(kind)}</Text>
-              <CountBadge count={kindIntegrations.length} />
+              <CountBadge count={integrations.length} />
             </Group>
           </AccordionControl>
           <AccordionPanel>
@@ -127,7 +170,7 @@ const IntegrationList = async ({ integrations, activeTab }: IntegrationListProps
                 </TableTr>
               </TableThead>
               <TableTbody>
-                {kindIntegrations.map((integration) => (
+                {integrations.map((integration) => (
                   <TableTr key={integration.id}>
                     <TableTd>{integration.name}</TableTd>
                     <TableTd>
@@ -148,7 +191,7 @@ const IntegrationList = async ({ integrations, activeTab }: IntegrationListProps
                             >
                               <IconPencil size={16} stroke={1.5} />
                             </ActionIcon>
-                            <DeleteIntegrationActionButton integration={integration} count={kindIntegrations.length} />
+                            <DeleteIntegrationActionButton integration={integration} count={integrations.length} />
                           </ActionIconGroup>
                         )}
                       </Group>
@@ -159,9 +202,9 @@ const IntegrationList = async ({ integrations, activeTab }: IntegrationListProps
             </Table>
 
             <Stack gap="xs" hiddenFrom="md">
-              {kindIntegrations.map((integration, integrationIndex) => (
+              {integrations.map((integration, index) => (
                 <Fragment key={integration.id}>
-                  {integrationIndex !== 0 && <Divider />}
+                  {index !== 0 && <Divider />}
                   <Stack gap={0}>
                     <Group justify="space-between" align="center" wrap="nowrap">
                       <Text>{integration.name}</Text>
@@ -176,7 +219,7 @@ const IntegrationList = async ({ integrations, activeTab }: IntegrationListProps
                           >
                             <IconPencil size={16} stroke={1.5} />
                           </ActionIcon>
-                          <DeleteIntegrationActionButton integration={integration} count={kindIntegrations.length} />
+                          <DeleteIntegrationActionButton integration={integration} count={integrations.length} />
                         </ActionIconGroup>
                       )}
                     </Group>

apps/nextjs/src/app/[locale]/manage/layout.tsx

@@ -10,7 +10,6 @@ import {
   IconBrandTablerFilled,
   IconCertificate,
   IconClipboardListFilled,
-  IconDatabaseExport,
   IconDirectionsFilled,
   IconGitFork,
   IconHelpSquareRoundedFilled,
@@ -29,7 +28,6 @@ import {
 import { auth } from "@homarr/auth/next";
 import { isProviderEnabled } from "@homarr/auth/server";
 import { createDocumentationLink } from "@homarr/definitions";
-import { dbEnv } from "@homarr/core/infrastructure/db/env";
 import { env } from "@homarr/docker/env";
 import { getScopedI18n } from "@homarr/translation/server";
 
@@ -38,7 +36,6 @@ import { homarrLogoPath } from "~/components/layout/logo/homarr-logo";
 import type { NavigationLink } from "~/components/layout/navigation";
 import { MainNavigation } from "~/components/layout/navigation";
 import { ClientShell } from "~/components/layout/shell";
-import { ManageTourProvider } from "~/components/onboarding/manage-tour";
 
 export default async function ManageLayout({ children }: PropsWithChildren) {
   const t = await getScopedI18n("management.navbar");
@@ -48,13 +45,11 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
       label: t("items.home"),
       icon: IconHomeFilled,
       href: "/manage",
-      "data-onboarding-tour-id": "manage-welcome",
     },
     {
       icon: IconLayoutDashboardFilled,
       href: "/manage/boards",
       label: t("items.boards"),
-      "data-onboarding-tour-id": "manage-boards",
     },
     {
       icon: IconBox,
@@ -64,14 +59,12 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
       iconProps: {
         strokeWidth: 2.5,
       },
-      "data-onboarding-tour-id": "manage-apps",
     },
     {
       icon: IconAffiliateFilled,
       href: "/manage/integrations",
       label: t("items.integrations"),
       hidden: !session,
-      "data-onboarding-tour-id": "manage-integrations",
     },
     {
       icon: IconSearch,
@@ -81,20 +74,17 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
       iconProps: {
         strokeWidth: 2.5,
       },
-      "data-onboarding-tour-id": "manage-search-engines",
     },
     {
       icon: IconPhotoFilled,
       href: "/manage/medias",
       label: t("items.medias"),
       hidden: !session,
-      "data-onboarding-tour-id": "manage-medias",
     },
     {
       icon: IconUserFilled,
       label: t("items.users.label"),
       hidden: !session?.user.permissions.includes("admin"),
-      "data-onboarding-tour-id": "manage-users",
       items: [
         {
           label: t("items.users.items.manage"),
@@ -156,12 +146,6 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
           href: "/manage/tools/tasks",
           hidden: !session?.user.permissions.includes("admin"),
         },
-        {
-          label: t("items.tools.items.backup"),
-          icon: IconDatabaseExport,
-          href: "/manage/tools/backup",
-          hidden: !session?.user.permissions.includes("admin") || dbEnv.DRIVER !== "better-sqlite3",
-        },
       ],
     },
     {
@@ -169,7 +153,6 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
       href: "/manage/settings",
       icon: IconSettingsFilled,
       hidden: !session?.user.permissions.includes("admin"),
-      "data-onboarding-tour-id": "manage-settings",
     },
     {
       label: t("items.help.label"),
@@ -208,17 +191,11 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
     },
   ];
 
-  const isAdmin = session?.user.permissions.includes("admin") ?? false;
+  return (
-
-  const shell = (
     <ClientShell hasNavigation>
       <MainHeader></MainHeader>
       <MainNavigation links={navigationLinks}></MainNavigation>
       <AppShellMain>{children}</AppShellMain>
     </ClientShell>
   );
-
-  if (!session) return shell;
-
-  return <ManageTourProvider isAdmin={isAdmin}>{shell}</ManageTourProvider>;
 }

apps/nextjs/src/app/[locale]/manage/medias/page.tsx

@@ -4,15 +4,17 @@ import {
   Anchor,
   Group,
   Image,
+  Stack,
   Table,
   TableTbody,
   TableTd,
   TableTh,
   TableThead,
   TableTr,
+  Title,
   Tooltip,
 } from "@mantine/core";
-import { IconExternalLink, IconPhoto } from "@tabler/icons-react";
+import { IconExternalLink } from "@tabler/icons-react";
 import { z } from "zod/v4";
 
 import type { RouterOutputs } from "@homarr/api";
@@ -24,9 +26,8 @@ import { createLocalImageUrl } from "@homarr/icons/local";
 import { getI18n } from "@homarr/translation/server";
 import { Link, SearchInput, TablePagination, UserAvatar } from "@homarr/ui";
 
-import { ManageMobilePrimaryAction } from "~/components/manage/manage-mobile-primary-action";
+import { ManageContainer } from "~/components/manage/manage-container";
-import { ManagePageLayout } from "~/components/manage/manage-page-layout";
+import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
-import { NoResults } from "~/components/no-results";
 import { CopyMedia } from "./_actions/copy-media";
 import { DeleteMedia } from "./_actions/delete-media";
 import { IncludeFromAllUsersSwitch } from "./_actions/show-all";
@@ -47,7 +48,7 @@ interface MediaListPageProps {
   searchParams: Promise<inferSearchParamsFromSchema<typeof searchParamsSchema>>;
 }
 
-export default async function MediaListPage(props: MediaListPageProps) {
+export default async function GroupsListPage(props: MediaListPageProps) {
   const session = await auth();
 
   if (!session) {
@@ -57,31 +58,22 @@ export default async function MediaListPage(props: MediaListPageProps) {
   const t = await getI18n();
   const searchParams = searchParamsSchema.parse(await props.searchParams);
   const { items: medias, totalCount } = await api.media.getPaginated(searchParams);
-  const canUpload = session.user.permissions.includes("media-upload");
 
   return (
-    <ManagePageLayout
+    <ManageContainer>
-      title={t("media.plural")}
+      <DynamicBreadcrumb />
-      primaryAction={
+      <Stack>
-        canUpload ? (
+        <Title>{t("media.plural")}</Title>
-          <ManageMobilePrimaryAction>
+        <Group justify="space-between">
-            <UploadMediaButton />
+          <Group>
-          </ManageMobilePrimaryAction>
+            <SearchInput placeholder={`${t("media.search")}...`} defaultValue={searchParams.search} />
-        ) : undefined
+            {session.user.permissions.includes("media-view-all") && (
-      }
+              <IncludeFromAllUsersSwitch defaultChecked={searchParams.includeFromAllUsers} />
-      toolbar={
+            )}
-        <Group>
+          </Group>
-          <SearchInput placeholder={`${t("media.search")}...`} defaultValue={searchParams.search} />
+
-          {session.user.permissions.includes("media-view-all") && (
+          {session.user.permissions.includes("media-upload") && <UploadMediaButton />}
-            <IncludeFromAllUsersSwitch defaultChecked={searchParams.includeFromAllUsers} />
-          )}
         </Group>
-      }
-      footer={<TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />}
-      floatingPrimaryAction={canUpload}
-    >
-      {medias.length === 0 && <NoResults icon={IconPhoto} title={t("media.noResults.title")} />}
-      {medias.length > 0 && (
         <Table striped highlightOnHover>
           <TableThead>
             <TableTr>
@@ -98,8 +90,13 @@ export default async function MediaListPage(props: MediaListPageProps) {
             ))}
           </TableTbody>
         </Table>
-      )}
+
-    </ManagePageLayout>
+        {/* Added margin to not hide pagination behind affix-button */}
+        <Group justify="end" mb={48}>
+          <TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />
+        </Group>
+      </Stack>
+    </ManageContainer>
   );
 }
 

apps/nextjs/src/app/[locale]/manage/not-found.tsx

@@ -7,7 +7,9 @@ export default async function NotFound() {
   return (
     <Center h="100%">
       <Stack align="center">
-        <Title order={1}>{t("title")}</Title>
+        <Title order={1} tt="uppercase">
+          {t("title")}
+        </Title>
         <Text>{t("text")}</Text>
       </Stack>
     </Center>

apps/nextjs/src/app/[locale]/manage/page.tsx

@@ -29,20 +29,20 @@ export default async function ManagementPage() {
       <Space h="md" />
       <SimpleGrid cols={{ xs: 1, sm: 2, md: 3 }}>
         {statistics.map((statistic) => (
-          <Card component={Link} href={statistic.path} key={statistic.path}>
+          <Card component={Link} href={statistic.path} key={statistic.path} radius="lg">
             <Group justify="space-between" wrap="nowrap">
               <Group wrap="nowrap">
-                <Text size="xl" fw={700}>
+                <Text size="2.4rem" fw="bolder">
                   {statistic.count}
                 </Text>
                 <Stack gap={0}>
-                  <Text c="dimmed" size="xs">
+                  <Text c="red" size="xs">
                     {t(`statisticLabel.${statistic.subtitleKey}`)}
                   </Text>
-                  <Text fw={600}>{t(`statistic.${statistic.titleKey}`)}</Text>
+                  <Text fw="bold">{t(`statistic.${statistic.titleKey}`)}</Text>
                 </Stack>
               </Group>
-              <IconArrowRight size={16} stroke={1.5} color="var(--mantine-color-dimmed)" />
+              <IconArrowRight />
             </Group>
           </Card>
         ))}

apps/nextjs/src/app/[locale]/manage/search-engines/page.tsx

@@ -1,5 +1,5 @@
 import { redirect } from "next/navigation";
-import { ActionIcon, ActionIconGroup, Anchor, Avatar, Card, Group, Stack, Text } from "@mantine/core";
+import { ActionIcon, ActionIconGroup, Anchor, Avatar, Card, Group, Stack, Text, Title } from "@mantine/core";
 import { IconPencil, IconSearch } from "@tabler/icons-react";
 import { z } from "zod/v4";
 
@@ -10,8 +10,9 @@ import type { inferSearchParamsFromSchema } from "@homarr/common/types";
 import { getI18n, getScopedI18n } from "@homarr/translation/server";
 import { Link, SearchInput, TablePagination } from "@homarr/ui";
 
-import { ManagePageLayout } from "~/components/manage/manage-page-layout";
+import { ManageContainer } from "~/components/manage/manage-container";
 import { MobileAffixButton } from "~/components/manage/mobile-affix-button";
+import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 import { NoResults } from "~/components/no-results";
 import { SearchEngineDeleteButton } from "./_search-engine-delete-button";
 
@@ -37,31 +38,34 @@ export default async function SearchEnginesPage(props: SearchEnginesPageProps) {
 
   const tEngine = await getScopedI18n("search.engine");
 
-  const canCreate = session.user.permissions.includes("search-engine-create");
-
   return (
-    <ManagePageLayout
+    <ManageContainer>
-      title={tEngine("page.list.title")}
+      <DynamicBreadcrumb />
-      primaryAction={
+      <Stack>
-        canCreate ? (
+        <Title>{tEngine("page.list.title")}</Title>
-          <MobileAffixButton component={Link} href="/manage/search-engines/new">
+        <Group justify="space-between" align="center">
-            {tEngine("page.create.title")}
+          <SearchInput placeholder={`${tEngine("search")}...`} defaultValue={searchParams.search} flexExpand />
-          </MobileAffixButton>
+          {session.user.permissions.includes("search-engine-create") && (
-        ) : undefined
+            <MobileAffixButton component={Link} href="/manage/search-engines/new">
-      }
+              {tEngine("page.create.title")}
-      toolbar={<SearchInput placeholder={`${tEngine("search")}...`} defaultValue={searchParams.search} flexExpand />}
+            </MobileAffixButton>
-      footer={<TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />}
+          )}
-      floatingPrimaryAction={canCreate}
+        </Group>
-    >
+        {searchEngines.length === 0 && <SearchEngineNoResults />}
-      {searchEngines.length === 0 && <SearchEngineNoResults />}
+        {searchEngines.length > 0 && (
-      {searchEngines.length > 0 && (
+          <Stack gap="sm">
-        <Stack gap="sm">
+            {searchEngines.map((searchEngine) => (
-          {searchEngines.map((searchEngine) => (
+              <SearchEngineCard key={searchEngine.id} searchEngine={searchEngine} />
-            <SearchEngineCard key={searchEngine.id} searchEngine={searchEngine} />
+            ))}
-          ))}
+          </Stack>
-        </Stack>
+        )}
-      )}
+
-    </ManagePageLayout>
+        {/* Added margin to not hide pagination behind affix-button */}
+        <Group justify="end" mb={48}>
+          <TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />
+        </Group>
+      </Stack>
+    </ManageContainer>
   );
 }
 
@@ -74,7 +78,7 @@ const SearchEngineCard = async ({ searchEngine }: SearchEngineCardProps) => {
   const session = await auth();
 
   return (
-    <Card>
+    <Card withBorder>
       <Group justify="space-between" wrap="nowrap">
         <Group align="top" justify="start" wrap="nowrap" style={{ flex: 1 }}>
           <Avatar

apps/nextjs/src/app/[locale]/manage/settings/_components/analytics.settings.tsx

@@ -41,8 +41,8 @@ export const AnalyticsSettings = ({ initialData }: AnalyticsSettingsProps) => {
     <>
       <Title order={2}>{t("title")}</Title>
 
-      <Card pos="relative">
+      <Card pos="relative" withBorder>
-        <LoadingOverlay visible={isPending} />
+        <LoadingOverlay visible={isPending} zIndex={1000} overlayProps={{ radius: "sm", blur: 2 }} />
         <Stack>
           <SwitchSetting form={form} formKey="enableGeneral" title={t("general.title")} text={t("general.text")} />
         </Stack>

apps/nextjs/src/app/[locale]/manage/settings/_components/crawling-and-indexing.settings.tsx

@@ -41,11 +41,11 @@ export const CrawlingAndIndexingSettings = ({ initialData }: CrawlingAndIndexing
     <>
       <Title order={2}>{t("title")}</Title>
 
-      <Card pos="relative">
+      <Card pos="relative" withBorder>
         <Text c={"dimmed"} mb={"lg"}>
           {t("warning")}
         </Text>
-        <LoadingOverlay visible={isPending} />
+        <LoadingOverlay visible={isPending} zIndex={1000} overlayProps={{ radius: "sm", blur: 2 }} />
         <Stack>
           <SwitchSetting form={form} formKey="noIndex" title={t("noIndex.title")} text={t("noIndex.text")} />
           <SwitchSetting form={form} formKey="noFollow" title={t("noFollow.title")} text={t("noFollow.text")} />

apps/nextjs/src/app/[locale]/manage/settings/_components/setting-switch.tsx

@@ -15,7 +15,7 @@ export const SwitchSetting = <TFormValue extends Record<string, boolean>>({
   disabled,
 }: {
   form: Modify<
-    UseFormReturnType<TFormValue, TFormValue>,
+    UseFormReturnType<TFormValue, () => TFormValue>,
     {
       setFieldValue: (key: keyof TFormValue, value: (previous: boolean) => boolean) => void;
     }

apps/nextjs/src/app/[locale]/manage/tools/api/components/api-page-tabs.tsx

@@ -1,58 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import type { ReactNode } from "react";
-import { Tabs, TabsList, TabsPanel, TabsTab } from "@mantine/core";
-import { IconBrain, IconCode, IconKey } from "@tabler/icons-react";
-
-import { McpInstructions } from "./mcp-instructions";
-
-export interface McpToolGroup {
-  namespace: string;
-  tools: { name: string; description: string; type: "query" | "mutation" }[];
-}
-
-interface ApiPageTabsProps {
-  documentationLabel: string;
-  apiKeyLabel: string;
-  mcpLabel: string;
-  documentationPanel: ReactNode;
-  authenticationPanel: ReactNode;
-  baseUrl: string;
-  hasApiKeys: boolean;
-  toolGroups: McpToolGroup[];
-}
-
-export function ApiPageTabs({
-  documentationLabel,
-  apiKeyLabel,
-  mcpLabel,
-  documentationPanel,
-  authenticationPanel,
-  baseUrl,
-  hasApiKeys,
-  toolGroups,
-}: ApiPageTabsProps) {
-  const [activeTab, setActiveTab] = useState<string | null>("documentation");
-
-  return (
-    <Tabs value={activeTab} onChange={setActiveTab}>
-      <TabsList>
-        <TabsTab value="documentation" leftSection={<IconCode size={16} />}>
-          {documentationLabel}
-        </TabsTab>
-        <TabsTab value="authentication" leftSection={<IconKey size={16} />}>
-          {apiKeyLabel}
-        </TabsTab>
-        <TabsTab value="mcp" leftSection={<IconBrain size={16} />}>
-          {mcpLabel}
-        </TabsTab>
-      </TabsList>
-      <TabsPanel value="authentication">{authenticationPanel}</TabsPanel>
-      <TabsPanel value="documentation">{documentationPanel}</TabsPanel>
-      <TabsPanel value="mcp">
-        <McpInstructions baseUrl={baseUrl} hasApiKeys={hasApiKeys} toolGroups={toolGroups} />
-      </TabsPanel>
-    </Tabs>
-  );
-}

apps/nextjs/src/app/[locale]/manage/tools/api/components/mcp-instructions.tsx

@@ -1,343 +0,0 @@
-"use client";
-
-import {
-  Accordion,
-  AccordionControl,
-  AccordionItem,
-  AccordionPanel,
-  ActionIcon,
-  Alert,
-  Badge,
-  Button,
-  Code,
-  CopyButton,
-  Group,
-  List,
-  ListItem,
-  Stack,
-  Text,
-  ThemeIcon,
-  Title,
-} from "@mantine/core";
-import {
-  IconAlertTriangle,
-  IconBrain,
-  IconCheck,
-  IconCopy,
-  IconKey,
-  IconLock,
-  IconPlus,
-  IconPlugConnected,
-  IconSparkles,
-  IconTerminal,
-  IconTools,
-  IconWorld,
-} from "@tabler/icons-react";
-
-import { clientApi } from "@homarr/api/client";
-import { revalidatePathActionAsync } from "@homarr/common/client";
-import { useModalAction } from "@homarr/modals";
-import { useScopedI18n } from "@homarr/translation/client";
-
-import { CopyApiKeyModal } from "./copy-api-key-modal";
-import type { McpToolGroup } from "./api-page-tabs";
-import classes from "./mcp-tools-accordion.module.css";
-
-const toolTypeDisplay: Record<"query" | "mutation", { color: string; method: string }> = {
-  query: { color: "blue", method: "GET" },
-  mutation: { color: "orange", method: "POST" },
-};
-
-interface McpInstructionsProps {
-  baseUrl: string;
-  hasApiKeys: boolean;
-  toolGroups: McpToolGroup[];
-}
-
-export function McpInstructions({ baseUrl, hasApiKeys, toolGroups }: McpInstructionsProps) {
-  const t = useScopedI18n("management.page.tool.api.tab.mcp");
-  const { openModal } = useModalAction(CopyApiKeyModal);
-  const { mutate: createApiKey, isPending } = clientApi.apiKeys.create.useMutation({
-    async onSuccess(data) {
-      openModal({ apiKey: data.apiKey });
-      await revalidatePathActionAsync("/manage/tools/api");
-    },
-  });
-  const mcpUrl = `${baseUrl}/api/mcp/mcp`;
-
-  const streamableHttpConfig = JSON.stringify(
-    {
-      mcpServers: {
-        homarr: {
-          url: mcpUrl,
-          headers: {
-            ApiKey: "<your-api-key>",
-          },
-        },
-      },
-    },
-    null,
-    2,
-  );
-
-  const stdioConfig = JSON.stringify(
-    {
-      mcpServers: {
-        homarr: {
-          command: "npx",
-          args: ["-y", "mcp-remote", mcpUrl, "--header", "ApiKey:<your-api-key>"],
-        },
-      },
-    },
-    null,
-    2,
-  );
-
-  const testCommand = `curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json, text/event-stream" -H "ApiKey: <your-api-key>" -d '{"jsonrpc":"2.0","method":"initialize","params":{"protocolVersion":"2025-03-26","capabilities":{},"clientInfo":{"name":"test","version":"1.0"}},"id":1}' ${mcpUrl}`;
-
-  return (
-    <Stack gap="xl" p="md">
-      <Group gap="sm" align="center">
-        <ThemeIcon variant="light" size="xl" radius="md">
-          <IconBrain size={24} />
-        </ThemeIcon>
-        <div>
-          <Title order={3}>{t("title")}</Title>
-          <Text size="sm" c="dimmed">
-            {t("subtitle")}
-          </Text>
-        </div>
-      </Group>
-
-      <Alert variant="light" icon={<IconSparkles size={18} />}>
-        <Text size="sm">{t("description")}</Text>
-      </Alert>
-
-      {!hasApiKeys && (
-        <Alert variant="light" color="yellow" icon={<IconKey size={18} />}>
-          <Group justify="space-between" align="center">
-            <Text size="sm">{t("noApiKey")}</Text>
-            <Button
-              size="compact-sm"
-              variant="filled"
-              leftSection={<IconPlus size={14} />}
-              onClick={() => createApiKey()}
-              loading={isPending}
-            >
-              {t("createApiKeyButton")}
-            </Button>
-          </Group>
-        </Alert>
-      )}
-
-      <div>
-        <Title order={5} mb="xs">
-          <Group gap="xs">
-            <IconPlugConnected size={16} />
-            {t("endpoint.title")}
-          </Group>
-        </Title>
-        <CopyableCode value={mcpUrl} copyLabel={t("copy")} />
-      </div>
-
-      <div>
-        <Title order={5} mb="xs">
-          <Group gap="xs">
-            <IconLock size={16} />
-            {t("authentication.title")}
-          </Group>
-        </Title>
-        <Text size="sm" mb="sm">
-          {t("authentication.intro")}
-        </Text>
-
-        <Accordion variant="separated" defaultValue="apikey">
-          <AccordionItem value="apikey">
-            <AccordionControl>
-              <Group gap="xs">
-                <IconKey size={16} />
-                {t("authentication.apiKey.title")}
-              </Group>
-            </AccordionControl>
-            <AccordionPanel>
-              <Stack gap="xs">
-                <Text size="sm">{t("authentication.apiKey.description")}</Text>
-                <Text size="xs" c="dimmed">
-                  {t("authentication.permissions")}
-                </Text>
-              </Stack>
-            </AccordionPanel>
-          </AccordionItem>
-
-          <AccordionItem value="oauth">
-            <AccordionControl>
-              <Group gap="xs">
-                <IconWorld size={16} />
-                {t("authentication.oauth.title")}
-              </Group>
-            </AccordionControl>
-            <AccordionPanel>
-              <Stack gap="xs">
-                <Text size="sm">{t("authentication.oauth.description")}</Text>
-                <Text size="xs" c="dimmed">
-                  {t("authentication.oauth.hint")}
-                </Text>
-              </Stack>
-            </AccordionPanel>
-          </AccordionItem>
-        </Accordion>
-      </div>
-
-      <div>
-        <Title order={5} mb="sm">
-          {t("clientConfig.title")}
-        </Title>
-        <Accordion variant="separated" defaultValue="streamable-http">
-          <AccordionItem value="streamable-http">
-            <AccordionControl>
-              <Group gap="xs">
-                <Badge size="xs" variant="filled">
-                  {t("clientConfig.streamableHttp.recommended")}
-                </Badge>
-                {t("clientConfig.streamableHttp.title")}
-              </Group>
-            </AccordionControl>
-            <AccordionPanel>
-              <Stack gap="sm">
-                <Text size="sm" fw={500}>
-                  {t("clientConfig.streamableHttp.worksWith")}
-                </Text>
-                <Text size="sm" c="dimmed">
-                  {t("clientConfig.streamableHttp.addToConfig")}
-                </Text>
-                <List size="xs" spacing={4}>
-                  <ListItem>
-                    {t("clientConfig.streamableHttp.cursor", {
-                      name: "Cursor",
-                      file: ".cursor/mcp.json",
-                    })}
-                  </ListItem>
-                  <ListItem>
-                    {t("clientConfig.streamableHttp.claudeDesktop", {
-                      name: "Claude Desktop",
-                      file: "claude_desktop_config.json",
-                    })}
-                  </ListItem>
-                  <ListItem>
-                    {t("clientConfig.streamableHttp.claudeCode", {
-                      name: "Claude Code",
-                      file: ".claude/mcp.json",
-                      command: "claude mcp add homarr",
-                    })}
-                  </ListItem>
-                  <ListItem>
-                    {t("clientConfig.streamableHttp.vsCodeCopilot", {
-                      name: "VS Code Copilot",
-                      file: ".vscode/mcp.json",
-                    })}
-                  </ListItem>
-                </List>
-                <CopyableCode value={streamableHttpConfig} copyLabel={t("copy")} />
-                <Alert variant="light" color="yellow" icon={<IconAlertTriangle size={16} />} p="xs">
-                  <Text size="xs">{t("clientConfig.streamableHttp.replaceHint")}</Text>
-                </Alert>
-              </Stack>
-            </AccordionPanel>
-          </AccordionItem>
-
-          <AccordionItem value="stdio">
-            <AccordionControl>{t("clientConfig.stdio.title")}</AccordionControl>
-            <AccordionPanel>
-              <Stack gap="sm">
-                <Text size="sm" c="dimmed">
-                  {t("clientConfig.stdio.description", { dependency: "npx" })}
-                </Text>
-                <CopyableCode value={stdioConfig} copyLabel={t("copy")} />
-              </Stack>
-            </AccordionPanel>
-          </AccordionItem>
-        </Accordion>
-      </div>
-
-      <div>
-        <Title order={5} mb="xs">
-          <Group gap="xs">
-            <IconTerminal size={16} />
-            {t("testConnection.title")}
-          </Group>
-        </Title>
-        <Text size="sm" c="dimmed" mb="xs">
-          {t("testConnection.description")}
-        </Text>
-        <CopyableCode value={testCommand} copyLabel={t("copy")} />
-        <Text size="xs" c="dimmed" mt="xs">
-          {t("testConnection.hint")}
-        </Text>
-      </div>
-
-      <div>
-        <Title order={5} mb="xs">
-          <Group gap="xs">
-            <IconTools size={16} />
-            {t("availableTools.title")}
-          </Group>
-        </Title>
-        <Text size="sm" c="dimmed" mb="sm">
-          {t("availableTools.description", {
-            count: String(toolGroups.reduce((sum, g) => sum + g.tools.length, 0)),
-          })}
-        </Text>
-        <Accordion variant="separated" multiple>
-          {toolGroups.map((group) => (
-            <AccordionItem key={group.namespace} value={group.namespace}>
-              <AccordionControl>
-                <Group gap="xs">
-                  <Text size="sm" fw={600}>
-                    {group.namespace}
-                  </Text>
-                  <Badge size="xs" variant="light" circle>
-                    {group.tools.length}
-                  </Badge>
-                </Group>
-              </AccordionControl>
-              <AccordionPanel>
-                <Stack gap={6}>
-                  {group.tools.map((tool) => (
-                    <div key={tool.name} className={classes.toolRow}>
-                      <Badge size="sm" w={50} radius="xs" variant="light" color={toolTypeDisplay[tool.type].color}>
-                        {toolTypeDisplay[tool.type].method}
-                      </Badge>
-                      <div>
-                        <Code fz="xs" fw={600}>
-                          {tool.name}
-                        </Code>
-                        <Text size="xs" c="dimmed" lh={1.4}>
-                          {tool.description}
-                        </Text>
-                      </div>
-                    </div>
-                  ))}
-                </Stack>
-              </AccordionPanel>
-            </AccordionItem>
-          ))}
-        </Accordion>
-      </div>
-    </Stack>
-  );
-}
-
-function CopyableCode({ value, copyLabel }: { value: string; copyLabel: string }) {
-  return (
-    <Code block pos="relative" style={{ whiteSpace: "pre-wrap" }}>
-      {value}
-      <CopyButton value={value}>
-        {({ copied, copy }) => (
-          <ActionIcon variant="subtle" size="sm" onClick={copy} pos="absolute" top={8} right={8} title={copyLabel}>
-            {copied ? <IconCheck size={14} /> : <IconCopy size={14} />}
-          </ActionIcon>
-        )}
-      </CopyButton>
-    </Code>
-  );
-}

apps/nextjs/src/app/[locale]/manage/tools/api/components/mcp-tools-accordion.module.css

@@ -1,6 +0,0 @@
-.toolRow {
-  display: grid;
-  grid-template-columns: 42px 1fr;
-  align-items: first baseline;
-  gap: var(--mantine-spacing-xs);
-}

apps/nextjs/src/app/[locale]/manage/tools/api/components/scalar-api-reference.tsx

@@ -1,35 +0,0 @@
-"use client";
-
-import { useComputedColorScheme } from "@mantine/core";
-import { ApiReferenceReact } from "@scalar/api-reference-react";
-
-import "@scalar/api-reference-react/style.css";
-import "./scalar-theme.css";
-
-interface ScalarApiReferenceProps {
-  document: object;
-}
-
-export function ScalarApiReference({ document }: ScalarApiReferenceProps) {
-  const colorScheme = useComputedColorScheme("light");
-
-  return (
-    <ApiReferenceReact
-      configuration={{
-        content: document,
-        layout: "classic",
-        theme: "alternate",
-        showSidebar: false,
-        hideDarkModeToggle: true,
-        hideSearch: true,
-        hiddenClients: true,
-        showDeveloperTools: "never",
-        defaultOpenAllTags: true,
-        forceDarkModeState: colorScheme,
-        authentication: {
-          preferredSecurityScheme: "apikey",
-        },
-      }}
-    />
-  );
-}

apps/nextjs/src/app/[locale]/manage/tools/api/components/scalar-theme.css

@@ -1,51 +0,0 @@
-.light-mode {
-  --scalar-background-1: var(--mantine-color-body);
-  --scalar-background-2: var(--mantine-color-gray-0);
-  --scalar-background-3: var(--mantine-color-gray-1);
-  --scalar-background-card: var(--mantine-color-white);
-  --scalar-background-accent: rgba(0, 0, 0, 0.04);
-
-  --scalar-color-1: var(--mantine-color-text);
-  --scalar-color-2: var(--mantine-color-dimmed);
-  --scalar-color-3: var(--mantine-color-dimmed);
-  --scalar-color-accent: var(--mantine-color-red-6);
-
-  --scalar-border-color: var(--mantine-color-gray-3);
-
-  --scalar-button-1: var(--mantine-color-dark-7);
-  --scalar-button-1-hover: var(--mantine-color-dark-5);
-  --scalar-button-1-color: var(--mantine-color-white);
-
-  --scalar-scrollbar-color: rgba(0, 0, 0, 0.18);
-  --scalar-scrollbar-color-active: rgba(0, 0, 0, 0.36);
-}
-
-.dark-mode {
-  --scalar-background-1: var(--mantine-color-body);
-  --scalar-background-2: var(--mantine-color-dark-6);
-  --scalar-background-3: var(--mantine-color-dark-5);
-  --scalar-background-card: var(--mantine-color-dark-6);
-  --scalar-background-accent: rgba(255, 255, 255, 0.06);
-
-  --scalar-color-1: var(--mantine-color-text);
-  --scalar-color-2: var(--mantine-color-dimmed);
-  --scalar-color-3: var(--mantine-color-dimmed);
-  --scalar-color-accent: var(--mantine-color-red-6);
-
-  --scalar-border-color: var(--mantine-color-dark-4);
-
-  --scalar-button-1: rgba(255, 255, 255, 0.9);
-  --scalar-button-1-hover: rgba(255, 255, 255, 0.8);
-  --scalar-button-1-color: var(--mantine-color-dark-7);
-
-  --scalar-scrollbar-color: rgba(255, 255, 255, 0.18);
-  --scalar-scrollbar-color-active: rgba(255, 255, 255, 0.36);
-}
-
-.scalar-card,
-.scalar-api-client__item,
-.dark-mode .dark-mode.scalar-card {
-  --scalar-background-1: var(--scalar-background-card);
-  --scalar-background-2: var(--scalar-background-card);
-  --scalar-background-3: var(--scalar-background-card);
-}

apps/nextjs/src/app/[locale]/manage/tools/api/components/swagger-ui.tsx

@@ -0,0 +1,23 @@
+"use client";
+
+import type { OpenAPIObject } from "openapi3-ts/oas31";
+import SwaggerUI from "swagger-ui-react";
+
+// workaround for CSS that cannot be processed by next.js, https://github.com/swagger-api/swagger-ui/issues/10045
+import "../swagger-ui-dark.css";
+import "../swagger-ui-overrides.css";
+import "../swagger-ui.css";
+
+interface SwaggerUIClientProps {
+  document: OpenAPIObject;
+}
+
+export const SwaggerUIClient = ({ document }: SwaggerUIClientProps) => {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const requestInterceptor = (req: Record<string, any>) => {
+    req.credentials = "omit";
+    return req;
+  };
+
+  return <SwaggerUI requestInterceptor={requestInterceptor} spec={document} />;
+};

apps/nextjs/src/app/[locale]/manage/tools/api/page.tsx

@@ -1,57 +1,16 @@
 import { headers } from "next/headers";
 import { notFound } from "next/navigation";
-import { Stack } from "@mantine/core";
+import { Stack, Tabs, TabsList, TabsPanel, TabsTab } from "@mantine/core";
 
-import { mcpRouter } from "@homarr/api/mcp";
 import { openApiDocument } from "@homarr/api/open-api";
 import { api } from "@homarr/api/server";
 import { auth } from "@homarr/auth/next";
 import { extractBaseUrlFromHeaders } from "@homarr/common";
 import { getScopedI18n } from "@homarr/translation/server";
 
+import { SwaggerUIClient } from "~/app/[locale]/manage/tools/api/components/swagger-ui";
 import { createMetaTitle } from "~/metadata";
-import { extractMcpTools } from "~/app/api/mcp/_extract-tools";
 import { ApiKeysManagement } from "./components/api-keys";
-import { ApiPageTabs } from "./components/api-page-tabs";
-import { ScalarApiReference } from "./components/scalar-api-reference";
-
-import type { McpToolGroup } from "./components/api-page-tabs";
-
-let cachedToolGroups: McpToolGroup[] | null = null;
-
-function getMcpToolGroups(): McpToolGroup[] {
-  if (cachedToolGroups) return cachedToolGroups;
-
-  const tools = extractMcpTools();
-
-  const procedures = (mcpRouter as any)._def.procedures as Record<string, { _def?: { type?: string } }>;
-  const procedureTypeMap = new Map<string, "query" | "mutation">();
-  for (const [key, proc] of Object.entries(procedures)) {
-    const type = proc?._def?.type;
-    if (type === "query" || type === "mutation") {
-      procedureTypeMap.set(key, type);
-    }
-  }
-
-  const groups = new Map<string, McpToolGroup["tools"]>();
-  for (const tool of tools) {
-    const namespace = tool.pathInRouter[0] ?? "other";
-    if (!groups.has(namespace)) {
-      groups.set(namespace, []);
-    }
-    const procedureKey = tool.pathInRouter.join(".");
-    groups.get(namespace)?.push({
-      name: tool.name,
-      description: tool.description,
-      type: procedureTypeMap.get(procedureKey) ?? "query",
-    });
-  }
-  cachedToolGroups = Array.from(groups.entries()).map(([namespace, items]) => ({
-    namespace,
-    tools: items,
-  }));
-  return cachedToolGroups;
-}
 
 export async function generateMetadata() {
   const session = await auth();
@@ -71,25 +30,24 @@ export default async function ApiPage() {
   if (!session?.user.permissions.includes("admin")) {
     notFound();
   }
-  const requestHeaders = await headers();
+  const document = openApiDocument(extractBaseUrlFromHeaders(await headers()));
-  const baseUrl = extractBaseUrlFromHeaders(requestHeaders);
-  const document = openApiDocument(baseUrl);
   const apiKeys = await api.apiKeys.getAll();
   const t = await getScopedI18n("management.page.tool.api.tab");
-  const toolGroups = getMcpToolGroups();
 
   return (
     <Stack>
-      <ApiPageTabs
+      <Tabs defaultValue={"documentation"}>
-        documentationLabel={t("documentation.label")}
+        <TabsList>
-        apiKeyLabel={t("apiKey.label")}
+          <TabsTab value={"documentation"}>{t("documentation.label")}</TabsTab>
-        mcpLabel={t("mcp.label")}
+          <TabsTab value={"authentication"}>{t("apiKey.label")}</TabsTab>
-        documentationPanel={<ScalarApiReference document={document} />}
+        </TabsList>
-        authenticationPanel={<ApiKeysManagement apiKeys={apiKeys} />}
+        <TabsPanel value={"authentication"}>
-        baseUrl={baseUrl}
+          <ApiKeysManagement apiKeys={apiKeys} />
-        hasApiKeys={apiKeys.length > 0}
+        </TabsPanel>
-        toolGroups={toolGroups}
+        <TabsPanel value={"documentation"}>
-      />
+          <SwaggerUIClient document={document} />
+        </TabsPanel>
+      </Tabs>
     </Stack>
   );
 }

apps/nextjs/src/app/[locale]/manage/tools/api/swagger-ui-overrides.css

@@ -0,0 +1,4 @@
+.swagger-ui .info {
+  margin: 0 !important;
+  margin-bottom: 20px !important;
+}

apps/nextjs/src/app/[locale]/manage/tools/backup/_components/backup-export-card.tsx

@@ -1,87 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import { Alert, Button, Card, Group, Stack, Text, Title } from "@mantine/core";
-import { IconAlertTriangle, IconDatabaseExport, IconDownload } from "@tabler/icons-react";
-
-import { useScopedI18n } from "@homarr/translation/client";
-
-import { DangerousActionConfirmation } from "~/components/backup/dangerous-action-confirmation";
-
-export const BackupExportCard = () => {
-  const t = useScopedI18n("management.page.tool.backup.export");
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  const [showConfirm, setShowConfirm] = useState(false);
-
-  const handleExport = async () => {
-    setLoading(true);
-    setError(null);
-    try {
-      const response = await fetch("/api/backup/export");
-      if (!response.ok) {
-        const errorMessage = await response.json().then(
-          (data) => data.error,
-          () => `Server returned ${response.status}`,
-        );
-        throw new Error(errorMessage ?? t("error"));
-      }
-
-      const blob = await response.blob();
-      const url = URL.createObjectURL(blob);
-      const filename = response.headers.get("Content-Disposition")?.match(/filename="(.+)"/)?.[1] ?? "homarr-backup.zip";
-
-      const a = document.createElement("a");
-      a.href = url;
-      a.download = filename;
-      a.click();
-      URL.revokeObjectURL(url);
-      setShowConfirm(false);
-    } catch (err) {
-      setError(err instanceof Error ? err.message : t("error"));
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  return (
-    <Card withBorder>
-      <Stack gap="sm">
-        <Group gap="sm">
-          <IconDatabaseExport size={24} />
-          <Title order={4}>{t("title")}</Title>
-        </Group>
-        <Text size="sm" c="dimmed">
-          {t("description")}
-        </Text>
-        {error && (
-          <Alert color="red" icon={<IconAlertTriangle size={16} />}>
-            {error}
-          </Alert>
-        )}
-
-        {showConfirm ? (
-          <DangerousActionConfirmation
-            title={t("confirm.title")}
-            warningTitle={t("confirm.warningTitle")}
-            warningBody={t("confirm.warningBody")}
-            typePrompt={t("confirm.typePrompt", { phrase: "I understand" })}
-            submitLabel={t("confirm.submit")}
-            submitIcon={<IconDownload size={16} />}
-            cancelLabel={t("confirm.cancel")}
-            onConfirm={handleExport}
-            onCancel={() => setShowConfirm(false)}
-            disabled={loading}
-            color="orange"
-          />
-        ) : (
-          <Group>
-            <Button leftSection={<IconDownload size={16} />} loading={loading} onClick={() => setShowConfirm(true)}>
-              {t("button")}
-            </Button>
-          </Group>
-        )}
-      </Stack>
-    </Card>
-  );
-};

apps/nextjs/src/app/[locale]/manage/tools/backup/_components/backup-import-card.tsx

@@ -1,27 +0,0 @@
-"use client";
-
-import { Card, Group, Stack, Text, Title } from "@mantine/core";
-import { IconDatabaseImport } from "@tabler/icons-react";
-
-import { useScopedI18n } from "@homarr/translation/client";
-
-import { DatabaseRestoreFlow } from "~/components/backup";
-
-export const BackupImportCard = () => {
-  const t = useScopedI18n("management.page.tool.backup.import");
-
-  return (
-    <Card withBorder>
-      <Stack gap="md">
-        <Group gap="sm">
-          <IconDatabaseImport size={24} />
-          <Title order={4}>{t("title")}</Title>
-        </Group>
-        <Text size="sm" c="dimmed">
-          {t("description")}
-        </Text>
-        <DatabaseRestoreFlow />
-      </Stack>
-    </Card>
-  );
-};

apps/nextjs/src/app/[locale]/manage/tools/backup/page.tsx

@@ -1,40 +0,0 @@
-import { notFound } from "next/navigation";
-import { Stack, Title } from "@mantine/core";
-
-import { auth } from "@homarr/auth/next";
-import { dbEnv } from "@homarr/core/infrastructure/db/env";
-import { getScopedI18n } from "@homarr/translation/server";
-
-import { createMetaTitle } from "~/metadata";
-import { BackupExportCard } from "./_components/backup-export-card";
-import { BackupImportCard } from "./_components/backup-import-card";
-
-export async function generateMetadata() {
-  const session = await auth();
-  if (!session?.user.permissions.includes("admin") || dbEnv.DRIVER !== "better-sqlite3") {
-    return {};
-  }
-
-  const t = await getScopedI18n("management.page.tool.backup");
-
-  return {
-    title: createMetaTitle(t("metaTitle")),
-  };
-}
-
-export default async function BackupPage() {
-  const session = await auth();
-  if (!session?.user.permissions.includes("admin") || dbEnv.DRIVER !== "better-sqlite3") {
-    notFound();
-  }
-
-  const t = await getScopedI18n("management.page.tool.backup");
-
-  return (
-    <Stack>
-      <Title>{t("title")}</Title>
-      <BackupExportCard />
-      <BackupImportCard />
-    </Stack>
-  );
-}

apps/nextjs/src/app/[locale]/manage/tools/certificates/page.tsx

@@ -79,7 +79,7 @@ export default async function CertificatesPage({ params }: CertificatesPageProps
 
         <SimpleGrid cols={{ sm: 1, lg: 2, xl: 3 }} spacing="lg">
           {x509Certificates.map((cert) => (
-            <Card key={cert.fileName}>
+            <Card key={cert.fileName} withBorder>
               <Group wrap="nowrap">
                 {cert.isError ? (
                   <IconAlertTriangle

apps/nextjs/src/app/[locale]/manage/tools/docker/docker-table.tsx

@@ -1,26 +1,23 @@
 "use client";
 
-import { useRouter } from "next/navigation";
 import type { MantineColor } from "@mantine/core";
-import { ActionIcon, Avatar, Badge, Box, Button, Group, Menu, Text, Tooltip } from "@mantine/core";
+import { Avatar, Badge, Box, Button, Group, Text } from "@mantine/core";
 import {
   IconCategoryPlus,
-  IconDots,
-  IconFileText,
   IconPlayerPlay,
   IconPlayerStop,
   IconRefresh,
   IconRotateClockwise,
   IconTrash,
 } from "@tabler/icons-react";
-import type { MRT_ColumnDef, MRT_Row } from "mantine-react-table";
+import type { MRT_ColumnDef } from "mantine-react-table";
 import { MantineReactTable } from "mantine-react-table";
 
 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
-import { humanFileSize, useTimeAgo } from "@homarr/common";
+import { useTimeAgo } from "@homarr/common";
 import type { ContainerState } from "@homarr/docker";
-import { containerStateColorMap, cpuUsageColor, memoryUsageColor, safeValue } from "@homarr/docker/shared";
+import { containerStateColorMap } from "@homarr/docker/shared";
 import { useModalAction } from "@homarr/modals";
 import { AddDockerAppToHomarr } from "@homarr/modals-collection";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
@@ -30,30 +27,25 @@ import type { TablerIcon } from "@homarr/ui";
 import { OverflowBadge } from "@homarr/ui";
 import { useTranslatedMantineReactTable } from "@homarr/ui/hooks";
 
-type DockerContainer = RouterOutputs["docker"]["getContainers"]["containers"][number];
+const createColumns = (
-
+  t: TranslationFunction,
-const createContainerLogsPath = (container: Pick<DockerContainer, "id" | "name">) =>
+): MRT_ColumnDef<RouterOutputs["docker"]["getContainers"]["containers"][number]>[] => [
-  `/manage/tools/docker/logs/${container.id}?name=${encodeURIComponent(container.name)}`;
-
-const createColumns = (t: TranslationFunction): MRT_ColumnDef<DockerContainer>[] => [
   {
     accessorKey: "name",
     header: t("docker.field.name.label"),
     Cell({ renderedCellValue, row }) {
       return (
-        <Group gap="xs" wrap="nowrap">
+        <Group gap="xs">
           <Avatar
             variant="outline"
-            radius="sm"
+            radius="lg"
             size="md"
             styles={{ image: { objectFit: "contain" } }}
             src={row.original.iconUrl}
           >
             {row.original.name.at(0)?.toUpperCase()}
           </Avatar>
-          <Text truncate="end" maw={500}>
+          <Text>{renderedCellValue}</Text>
-            {renderedCellValue}
-          </Text>
         </Group>
       );
     },
@@ -84,11 +76,11 @@ const createColumns = (t: TranslationFunction): MRT_ColumnDef<DockerContainer>[]
     maxSize: 200,
     Cell({ renderedCellValue, cell }) {
       return (
-        <Tooltip label={cell.row.original.image} multiline maw={400}>
+        <Box maw={200}>
-          <Box maw={200}>
+          <Text truncate="end" title={cell.row.original.image}>
-            <Text truncate="end">{renderedCellValue}</Text>
+            {renderedCellValue}
-          </Box>
+          </Text>
-        </Tooltip>
+        </Box>
       );
     },
   },
@@ -103,79 +95,18 @@ const createColumns = (t: TranslationFunction): MRT_ColumnDef<DockerContainer>[]
       );
     },
   },
-  {
-    id: "cpuUsage",
-    accessorKey: "cpuUsage",
-    size: 120,
-    header: t("docker.field.stats.cpu.label"),
-    enableHiding: true,
-    sortingFn: (rowA, rowB) => {
-      const cpuUsageA = safeValue(rowA.original.cpuUsage);
-      const cpuUsageB = safeValue(rowB.original.cpuUsage);
-
-      return cpuUsageA - cpuUsageB;
-    },
-    Cell({ row }) {
-      const cpuUsage = safeValue(row.original.cpuUsage);
-
-      return (
-        <Text size="sm" c={cpuUsageColor(cpuUsage, row.original.state)}>
-          {cpuUsage.toFixed(2)}%
-        </Text>
-      );
-    },
-  },
-  {
-    id: "memoryUsage",
-    accessorKey: "memoryUsage",
-    size: 140,
-    header: t("docker.field.stats.memory.label"),
-    enableHiding: true,
-    sortingFn: (rowA, rowB) => {
-      const memoryUsageA = safeValue(rowA.original.memoryUsage);
-      const memoryUsageB = safeValue(rowB.original.memoryUsage);
-
-      return memoryUsageA - memoryUsageB;
-    },
-    Cell({ row }) {
-      const bytesUsage = safeValue(row.original.memoryUsage);
-
-      return (
-        <Text size="sm" c={memoryUsageColor(bytesUsage, row.original.state)}>
-          {humanFileSize(bytesUsage)}
-        </Text>
-      );
-    },
-  },
 ];
 
-export function DockerTable({ containers, timestamp }: RouterOutputs["docker"]["getContainers"]) {
+export function DockerTable(initialData: RouterOutputs["docker"]["getContainers"]) {
   const t = useI18n();
   const tDocker = useScopedI18n("docker");
   const { data } = clientApi.docker.getContainers.useQuery(undefined, {
-    initialData: { containers, timestamp },
+    initialData,
     refetchOnMount: false,
     refetchOnWindowFocus: false,
     refetchOnReconnect: false,
   });
   const relativeTime = useTimeAgo(data.timestamp);
-  const utils = clientApi.useUtils();
-  const { mutate, isPending } = clientApi.docker.invalidate.useMutation({
-    async onSuccess() {
-      await utils.docker.getContainers.invalidate();
-      showSuccessNotification({
-        title: tDocker("action.refresh.notification.success.title"),
-        message: tDocker("action.refresh.notification.success.message"),
-      });
-    },
-    onError() {
-      showErrorNotification({
-        title: tDocker("action.refresh.notification.error.title"),
-        message: tDocker("action.refresh.notification.error.message"),
-      });
-    },
-  });
-
   const table = useTranslatedMantineReactTable({
     data: data.containers,
     enableDensityToggle: false,
@@ -183,8 +114,6 @@ export function DockerTable({ containers, timestamp }: RouterOutputs["docker"]["
     enableColumnFilters: false,
     enablePagination: false,
     enableRowSelection: true,
-    enableRowActions: true,
-    positionActionsColumn: "last",
     positionToolbarAlertBanner: "top",
     enableTableFooter: false,
     enableBottomToolbar: false,
@@ -195,15 +124,36 @@ export function DockerTable({ containers, timestamp }: RouterOutputs["docker"]["
       autoFocus: true,
     },
 
-    initialState: { density: "xs", showGlobalFilter: true, columnVisibility: { cpuUsage: false, memoryUsage: false } },
+    initialState: { density: "xs", showGlobalFilter: true },
-    mantineTableBodyCellProps: { style: { padding: "4px 8px" } },
+    renderTopToolbarCustomActions: () => {
-    mantineTableHeadCellProps: { style: { padding: "4px 8px" } },
+      const utils = clientApi.useUtils();
-    renderRowActions: ({ row }: { row: MRT_Row<DockerContainer> }) => <ContainerRowMenu container={row.original} />,
+      const { mutate, isPending } = clientApi.docker.invalidate.useMutation({
-    renderTopToolbarCustomActions: () => (
+        async onSuccess() {
-      <Button variant="default" rightSection={<IconRefresh size="1rem" />} onClick={() => mutate()} loading={isPending}>
+          await utils.docker.getContainers.invalidate();
-        {tDocker("action.refresh.label")}
+          showSuccessNotification({
-      </Button>
+            title: tDocker("action.refresh.notification.success.title"),
-    ),
+            message: tDocker("action.refresh.notification.success.message"),
+          });
+        },
+        onError() {
+          showErrorNotification({
+            title: tDocker("action.refresh.notification.error.title"),
+            message: tDocker("action.refresh.notification.error.message"),
+          });
+        },
+      });
+
+      return (
+        <Button
+          variant="default"
+          rightSection={<IconRefresh size="1rem" />}
+          onClick={() => mutate()}
+          loading={isPending}
+        >
+          {tDocker("action.refresh.label")}
+        </Button>
+      );
+    },
     renderToolbarAlertBannerContent: ({ groupedAlert, table }) => {
       const dockerContainers = table.getSelectedRowModel().rows.map((row) => row.original);
       return (
@@ -231,104 +181,28 @@ export function DockerTable({ containers, timestamp }: RouterOutputs["docker"]["
   );
 }
 
-const containerActions: { action: "start" | "stop" | "restart" | "remove"; icon: TablerIcon; color: MantineColor }[] = [
-  { action: "start", icon: IconPlayerPlay, color: "green" },
-  { action: "stop", icon: IconPlayerStop, color: "red" },
-  { action: "restart", icon: IconRotateClockwise, color: "orange" },
-  { action: "remove", icon: IconTrash, color: "red" },
-];
-
-const ContainerRowMenu = ({ container }: { container: DockerContainer }) => {
-  const t = useScopedI18n("docker.action");
-  const router = useRouter();
-  const utils = clientApi.useUtils();
-  const { openModal } = useModalAction(AddDockerAppToHomarr);
-
-  const useContainerAction = (action: "start" | "stop" | "restart" | "remove") =>
-    clientApi.docker[`${action}All`].useMutation({
-      async onSettled() {
-        await utils.docker.getContainers.invalidate();
-      },
-      onSuccess() {
-        showSuccessNotification({
-          title: t(`${action}.notification.success.title`),
-          message: t(`${action}.notification.success.message`),
-        });
-      },
-      onError() {
-        showErrorNotification({
-          title: t(`${action}.notification.error.title`),
-          message: t(`${action}.notification.error.message`),
-        });
-      },
-    });
-
-  const mutations = {
-    start: useContainerAction("start"),
-    stop: useContainerAction("stop"),
-    restart: useContainerAction("restart"),
-    remove: useContainerAction("remove"),
-  };
-
-  return (
-    <Menu withinPortal position="bottom-end" shadow="sm">
-      <Menu.Target>
-        <ActionIcon variant="subtle" color="gray" onClick={(e) => e.stopPropagation()}>
-          <IconDots size="1rem" />
-        </ActionIcon>
-      </Menu.Target>
-      <Menu.Dropdown>
-        <Menu.Item
-          leftSection={<IconFileText size="1rem" />}
-          onClick={() => router.push(createContainerLogsPath(container))}
-        >
-          {t("logs.label")}
-        </Menu.Item>
-        <Menu.Divider />
-        {containerActions.map(({ action, icon: Icon, color }) => (
-          <Menu.Item
-            key={action}
-            leftSection={<Icon size="1rem" />}
-            color={color}
-            onClick={() => mutations[action].mutate({ ids: [container.id] })}
-          >
-            {t(`${action}.label`)}
-          </Menu.Item>
-        ))}
-        <Menu.Divider />
-        <Menu.Item
-          leftSection={<IconCategoryPlus size="1rem" />}
-          color="red"
-          onClick={() => openModal({ selectedContainers: [container] })}
-        >
-          {t("addToHomarr.label")}
-        </Menu.Item>
-      </Menu.Dropdown>
-    </Menu>
-  );
-};
-
 interface ContainerActionBarProps {
-  selectedContainers: DockerContainer[];
+  selectedContainers: RouterOutputs["docker"]["getContainers"]["containers"];
 }
 
 const ContainerActionBar = ({ selectedContainers }: ContainerActionBarProps) => {
   const t = useScopedI18n("docker.action");
   const { openModal } = useModalAction(AddDockerAppToHomarr);
+  const handleClick = () => {
+    openModal({
+      selectedContainers,
+    });
+  };
 
   const selectedIds = selectedContainers.map((container) => container.id);
 
   return (
     <Group gap="xs">
-      {containerActions.map(({ action, icon, color }) => (
+      <ContainerActionBarButton icon={IconPlayerPlay} color="green" action="start" selectedIds={selectedIds} />
-        <ContainerActionBarButton key={action} icon={icon} color={color} action={action} selectedIds={selectedIds} />
+      <ContainerActionBarButton icon={IconPlayerStop} color="red" action="stop" selectedIds={selectedIds} />
-      ))}
+      <ContainerActionBarButton icon={IconRotateClockwise} color="orange" action="restart" selectedIds={selectedIds} />
-      <Button
+      <ContainerActionBarButton icon={IconTrash} color="red" action="remove" selectedIds={selectedIds} />
-        leftSection={<IconCategoryPlus />}
+      <Button leftSection={<IconCategoryPlus />} color={"red"} onClick={handleClick} variant="light" radius="md">
-        color="red"
-        onClick={() => openModal({ selectedContainers })}
-        variant="light"
-      >
         {t("addToHomarr.label")}
       </Button>
     </Group>
@@ -379,6 +253,7 @@ const ContainerActionBarButton = (props: ContainerActionBarButtonProps) => {
       onClick={handleClickAsync}
       loading={isPending}
       variant="light"
+      radius="md"
     >
       {t(`${props.action}.label`)}
     </Button>

apps/nextjs/src/app/[locale]/manage/tools/docker/logs/[containerId]/client.tsx

@@ -1,10 +0,0 @@
-"use client";
-
-import dynamic from "next/dynamic";
-
-export const ClientSideDockerLogsTerminal = dynamic(
-  () => import("./terminal").then(({ DockerLogsTerminal }) => DockerLogsTerminal),
-  {
-    ssr: false,
-  },
-);

apps/nextjs/src/app/[locale]/manage/tools/docker/logs/[containerId]/page.tsx

@@ -1,47 +0,0 @@
-import { notFound } from "next/navigation";
-import { Box, Group } from "@mantine/core";
-
-import { api } from "@homarr/api/server";
-import { auth } from "@homarr/auth/next";
-import { env } from "@homarr/docker/env";
-
-import "@xterm/xterm/css/xterm.css";
-
-import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
-import { fullHeightWithoutHeaderAndFooter } from "~/constants";
-import { ClientSideDockerLogsTerminal } from "./client";
-
-interface DockerContainerLogsPageProps {
-  params: Promise<{ containerId: string }>;
-  searchParams: Promise<{ name?: string }>;
-}
-
-export default async function DockerContainerLogsPage({ params, searchParams }: DockerContainerLogsPageProps) {
-  const session = await auth();
-  if (!(session?.user.permissions.includes("admin") && env.ENABLE_DOCKER)) {
-    notFound();
-  }
-
-  const { containerId } = await params;
-  const { name } = await searchParams;
-
-  try {
-    await api.docker.logs({ id: containerId, tail: 1 });
-  } catch {
-    notFound();
-  }
-
-  return (
-    <>
-      <Group justify="space-between" align="center" wrap="nowrap">
-        <DynamicBreadcrumb
-          dynamicMappings={new Map([[containerId, name ?? containerId]])}
-          nonInteractable={[containerId]}
-        />
-      </Group>
-      <Box style={{ borderRadius: 6 }} h={fullHeightWithoutHeaderAndFooter} p="md" bg="black">
-        <ClientSideDockerLogsTerminal containerId={containerId} />
-      </Box>
-    </>
-  );
-}

apps/nextjs/src/app/[locale]/manage/tools/docker/logs/[containerId]/terminal.module.css

@@ -1,3 +0,0 @@
-.outerTerminal > div {
-  height: 100%;
-}

apps/nextjs/src/app/[locale]/manage/tools/docker/logs/[containerId]/terminal.tsx

@@ -1,81 +0,0 @@
-"use client";
-
-import { useCallback, useEffect, useRef } from "react";
-import { Box } from "@mantine/core";
-import { CanvasAddon } from "@xterm/addon-canvas";
-import { FitAddon } from "@xterm/addon-fit";
-import { Terminal } from "@xterm/xterm";
-
-import { clientApi } from "@homarr/api/client";
-
-import classes from "./terminal.module.css";
-
-interface DockerLogsTerminalProps {
-  containerId: string;
-}
-
-export const DockerLogsTerminal = ({ containerId }: DockerLogsTerminalProps) => {
-  const ref = useRef<HTMLDivElement>(null);
-  const terminalRef = useRef<Terminal | null>(null);
-  const pendingLogsRef = useRef<string[]>([]);
-  const isTerminalReadyRef = useRef(false);
-
-  const writeToTerminal = useCallback((data: string) => {
-    if (!isTerminalReadyRef.current || !terminalRef.current) {
-      pendingLogsRef.current.push(data);
-      return;
-    }
-
-    terminalRef.current.write(data);
-    terminalRef.current.refresh(0, terminalRef.current.rows - 1);
-  }, []);
-
-  clientApi.docker.subscribeLogs.useSubscription(
-    { id: containerId, tail: 200 },
-    {
-      onData: writeToTerminal,
-      onError(err) {
-        writeToTerminal(`\r\n\x1b[31m${err.message}\x1b[0m`);
-      },
-    },
-  );
-
-  useEffect(() => {
-    if (!ref.current) {
-      return () => undefined;
-    }
-
-    const canvasAddon = new CanvasAddon();
-
-    terminalRef.current = new Terminal({
-      cursorBlink: false,
-      disableStdin: true,
-      convertEol: true,
-      fontSize: 14,
-    });
-    terminalRef.current.open(ref.current);
-    terminalRef.current.loadAddon(canvasAddon);
-
-    isTerminalReadyRef.current = true;
-    const terminal = terminalRef.current;
-    pendingLogsRef.current.forEach((data) => terminal.write(data));
-    pendingLogsRef.current = [];
-    terminal.refresh(0, terminal.rows - 1);
-
-    setTimeout(() => {
-      const fitAddon = new FitAddon();
-      terminalRef.current?.loadAddon(fitAddon);
-      fitAddon.fit();
-    });
-
-    return () => {
-      isTerminalReadyRef.current = false;
-      pendingLogsRef.current = [];
-      canvasAddon.dispose();
-      terminalRef.current?.dispose();
-      terminalRef.current = null;
-    };
-  }, [writeToTerminal]);
-
-  return <Box ref={ref} className={classes.outerTerminal} h="100%" />;
-};

apps/nextjs/src/app/[locale]/manage/tools/kubernetes/cluster-dashboard/header-card/header-card.module.css

@@ -4,16 +4,28 @@
   overflow: hidden;
   padding: var(--mantine-spacing-xs);
   padding-left: calc(var(--mantine-spacing-xs) * 2);
-  border-left: 1px solid var(--mantine-color-blue-6);
+
-  background-color: light-dark(
+  @mixin hover {
-    var(--mantine-color-blue-0),
+    box-shadow: var(--mantine-shadow-md);
-    color-mix(in oklch, var(--mantine-color-blue-9), transparent 85%)
+  }
-  );
+
+  &::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    width: 6px;
+    background-image: linear-gradient(0, var(--mantine-color-blue-4), var(--mantine-color-blue-9));
+  }
 
   @mixin rtl {
     padding-left: var(--mantine-spacing-xs);
     padding-right: calc(var(--mantine-spacing-xs) * 2);
-    border-left: none;
+
-    border-right: 1px solid var(--mantine-color-blue-6);
+    &::before {
+      left: unset;
+      right: 0;
+    }
   }
 }

apps/nextjs/src/app/[locale]/manage/tools/kubernetes/cluster-dashboard/header-card/header-card.tsx

@@ -23,6 +23,7 @@ export function HeaderCard(props: HeaderCardProps) {
       <Flex align="center" justify={isRTL ? "space-between" : "flex-start"} gap="md" direction={"row"}>
         <ThemeIcon
           size="xl"
+          radius="md"
           variant="gradient"
           gradient={{
             deg: 0,

apps/nextjs/src/app/[locale]/manage/tools/kubernetes/cluster-dashboard/resource-gauge/resource-gauge.tsx

@@ -8,8 +8,6 @@ import { useCurrentLocale, useI18n } from "@homarr/translation/client";
 import { ResourceIcon } from "~/app/[locale]/manage/tools/kubernetes/cluster-dashboard/resource-gauge/resource-icon";
 import classes from "./resource-gauge.module.css";
 
-const KUBERNETES_BRAND_COLOR = "#326ce5";
-
 interface KubernetesResourceGaugeProps {
   kubernetesCapacity: KubernetesCapacity;
 }
@@ -20,8 +18,8 @@ export function ResourceGauge(props: KubernetesResourceGaugeProps) {
   const isRTL = Boolean(isLocaleRTL(currentLocale));
 
   return (
-    <Paper className={classes.paper} mt={20}>
+    <Paper radius="md" withBorder className={classes.paper} mt={20}>
-      <ThemeIcon className={classes.icon} size={60} radius={60} bg={KUBERNETES_BRAND_COLOR}>
+      <ThemeIcon className={classes.icon} size={60} radius={60} bg={"#326ce5"}>
         <ResourceIcon type={props.kubernetesCapacity.type} />
       </ThemeIcon>
 

apps/nextjs/src/app/[locale]/manage/tools/kubernetes/cluster-dashboard/resource-tile/resource-tile.tsx

@@ -17,7 +17,12 @@ interface ResourceTileProps {
 export function ResourceTile(props: ResourceTileProps) {
   const t = useI18n();
   return (
-    <Card component={Link} href={`/manage/tools/kubernetes/${props.label}`} className={classes.cardContainer}>
+    <Card
+      withBorder
+      component={Link}
+      href={`/manage/tools/kubernetes/${props.label}`}
+      className={classes.cardContainer}
+    >
       <Group justify="space-between" wrap="nowrap">
         <Image src={`/images/kubernetes/${props.label}.svg`} alt={props.label} width={64} height={64} />
         <Group gap="xs">

apps/nextjs/src/app/[locale]/manage/tools/logs/font-size-slider.tsx

@@ -1,29 +0,0 @@
-"use client";
-
-import { Group, Slider, Text } from "@mantine/core";
-import { IconTextSize } from "@tabler/icons-react";
-
-import { useLogContext } from "./log-context";
-
-export const LogFontSizeSlider = () => {
-  const { fontSize, setFontSize } = useLogContext();
-
-  return (
-    <Group gap="xs" wrap="nowrap" w={160}>
-      <IconTextSize size={18} style={{ flexShrink: 0 }} />
-      <Slider
-        min={10}
-        max={24}
-        step={1}
-        value={fontSize}
-        onChange={setFontSize}
-        label={(val) => `${val}px`}
-        style={{ flex: 1 }}
-        size="xs"
-      />
-      <Text size="xs" c="dimmed" w={32} ta="right">
-        {fontSize}px
-      </Text>
-    </Group>
-  );
-};

apps/nextjs/src/app/[locale]/manage/tools/logs/level-selection.tsx

@@ -2,14 +2,12 @@
 
 import { Select } from "@mantine/core";
 
-import { logLevelConfiguration, logLevels } from "@homarr/core/infrastructure/logs/constants";
 import type { LogLevel } from "@homarr/core/infrastructure/logs/constants";
+import { logLevelConfiguration, logLevels } from "@homarr/core/infrastructure/logs/constants";
 import { useI18n } from "@homarr/translation/client";
 
 import { useLogContext } from "./log-context";
 
-const levelByValue = Object.fromEntries(logLevels.map((logLevel) => [logLevel, logLevel])) as Record<string, LogLevel>;
-
 export const LogLevelSelection = () => {
   const { level, setLevel } = useLogContext();
   const t = useI18n();
@@ -21,12 +19,7 @@ export const LogLevelSelection = () => {
         label: `${logLevelConfiguration[level].prefix} ${t(`log.level.option.${level}`)}`,
       }))}
       value={level}
-      onChange={(value) => {
+      onChange={(value) => setLevel(value as LogLevel)}
-        const nextLevel = value && levelByValue[value];
-        if (nextLevel) {
-          setLevel(nextLevel);
-        }
-      }}
       checkIconPosition="right"
     />
   );

apps/nextjs/src/app/[locale]/manage/tools/logs/log-context.tsx

@@ -6,23 +6,10 @@ import { createContext, useContext, useMemo, useState } from "react";
 import type { LogLevel } from "@homarr/core/infrastructure/logs/constants";
 import { logLevels } from "@homarr/core/infrastructure/logs/constants";
 
-const FONT_SIZE_KEY = "homarr-log-font-size";
-const DEFAULT_FONT_SIZE = 14;
-
-const readStoredFontSize = () => {
-  if (typeof window === "undefined") return DEFAULT_FONT_SIZE;
-  const stored = localStorage.getItem(FONT_SIZE_KEY);
-  if (!stored) return DEFAULT_FONT_SIZE;
-  const parsed = Number(stored);
-  return Number.isFinite(parsed) ? Math.min(Math.max(parsed, 10), 24) : DEFAULT_FONT_SIZE;
-};
-
 const LogContext = createContext<{
   level: LogLevel;
   setLevel: (level: LogLevel) => void;
   activeLevels: LogLevel[];
-  fontSize: number;
-  setFontSize: (size: number) => void;
 } | null>(null);
 
 interface LogContextProviderProps extends PropsWithChildren {
@@ -31,19 +18,9 @@ interface LogContextProviderProps extends PropsWithChildren {
 
 export const LogContextProvider = ({ defaultLevel, children }: LogContextProviderProps) => {
   const [level, setLevel] = useState(defaultLevel);
-  const [fontSize, setFontSizeRaw] = useState(readStoredFontSize);
   const activeLevels = useMemo(() => logLevels.slice(0, logLevels.indexOf(level) + 1), [level]);
 
-  const setFontSize = (size: number) => {
+  return <LogContext.Provider value={{ level, setLevel, activeLevels }}>{children}</LogContext.Provider>;
-    setFontSizeRaw(size);
-    localStorage.setItem(FONT_SIZE_KEY, String(size));
-  };
-
-  return (
-    <LogContext.Provider value={{ level, setLevel, activeLevels, fontSize, setFontSize }}>
-      {children}
-    </LogContext.Provider>
-  );
 };
 
 export const useLogContext = () => {

apps/nextjs/src/app/[locale]/manage/tools/logs/page.tsx

@@ -13,7 +13,6 @@ import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 import { fullHeightWithoutHeaderAndFooter } from "~/constants";
 import { createMetaTitle } from "~/metadata";
 import { ClientSideTerminalComponent } from "./client";
-import { LogFontSizeSlider } from "./font-size-slider";
 import { LogLevelSelection } from "./level-selection";
 import { LogContextProvider } from "./log-context";
 
@@ -39,10 +38,7 @@ export default async function LogsManagementPage() {
     <LogContextProvider defaultLevel={logsEnv.LEVEL}>
       <Group justify="space-between" align="center" wrap="nowrap">
         <DynamicBreadcrumb />
-        <Group gap="md" wrap="nowrap">
+        <LogLevelSelection />
-          <LogFontSizeSlider />
-          <LogLevelSelection />
-        </Group>
       </Group>
       <Box style={{ borderRadius: 6 }} h={fullHeightWithoutHeaderAndFooter} p="md" bg="black">
         <ClientSideTerminalComponent />

apps/nextjs/src/app/[locale]/manage/tools/logs/terminal.tsx

@@ -13,11 +13,9 @@ import classes from "./terminal.module.css";
 
 export const TerminalComponent = () => {
   const ref = useRef<HTMLDivElement>(null);
-  const { activeLevels, fontSize } = useLogContext();
+  const { activeLevels } = useLogContext();
 
   const terminalRef = useRef<Terminal>(null);
-  const fitAddonRef = useRef<FitAddon>(null);
-
   clientApi.log.subscribe.useSubscription(
     {
       levels: activeLevels,
@@ -28,6 +26,7 @@ export const TerminalComponent = () => {
         terminalRef.current?.refresh(0, terminalRef.current.rows - 1);
       },
       onError(err) {
+        // This makes sense as logging might cause an infinite loop
         alert(err);
       },
     },
@@ -44,30 +43,22 @@ export const TerminalComponent = () => {
       cursorBlink: false,
       disableStdin: true,
       convertEol: true,
-      fontSize,
     });
     terminalRef.current.open(ref.current);
     terminalRef.current.loadAddon(canvasAddon);
 
+    // This is a hack to make sure the terminal is rendered before we try to fit it
+    // You can blame @Meierschlumpf for this
     setTimeout(() => {
       const fitAddon = new FitAddon();
-      fitAddonRef.current = fitAddon;
       terminalRef.current?.loadAddon(fitAddon);
       fitAddon.fit();
     });
 
     return () => {
-      canvasAddon.dispose();
       terminalRef.current?.dispose();
-      terminalRef.current = null;
+      canvasAddon.dispose();
     };
   }, []);
-
-  useEffect(() => {
-    if (!terminalRef.current) return;
-    terminalRef.current.options.fontSize = fontSize;
-    fitAddonRef.current?.fit();
-  }, [fontSize]);
-
   return <Box ref={ref} id="terminal" className={classes.outerTerminal} h="100%"></Box>;
 };

apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-home-board.tsx

@@ -0,0 +1,85 @@
+"use client";
+
+import { Button, Group, Stack } from "@mantine/core";
+import type { z } from "zod/v4";
+
+import type { RouterOutputs } from "@homarr/api";
+import { clientApi } from "@homarr/api/client";
+import { revalidatePathActionAsync } from "@homarr/common/client";
+import { useZodForm } from "@homarr/form";
+import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
+import { useI18n } from "@homarr/translation/client";
+import { userChangeHomeBoardsSchema } from "@homarr/validation/user";
+
+import type { Board } from "~/app/[locale]/boards/_types";
+import { BoardSelect } from "~/components/board/board-select";
+
+interface ChangeHomeBoardFormProps {
+  user: RouterOutputs["user"]["getById"];
+  boardsData: Pick<Board, "id" | "name" | "logoImageUrl">[];
+}
+
+export const ChangeHomeBoardForm = ({ user, boardsData }: ChangeHomeBoardFormProps) => {
+  const t = useI18n();
+  const { mutate, isPending } = clientApi.user.changeHomeBoards.useMutation({
+    async onSettled() {
+      await revalidatePathActionAsync(`/manage/users/${user.id}`);
+    },
+    onSuccess(_, variables) {
+      form.setInitialValues({
+        homeBoardId: variables.homeBoardId,
+        mobileHomeBoardId: variables.mobileHomeBoardId,
+      });
+      showSuccessNotification({
+        message: t("user.action.changeHomeBoard.notification.success.message"),
+      });
+    },
+    onError() {
+      showErrorNotification({
+        message: t("user.action.changeHomeBoard.notification.error.message"),
+      });
+    },
+  });
+  const form = useZodForm(userChangeHomeBoardsSchema, {
+    initialValues: {
+      homeBoardId: user.homeBoardId,
+      mobileHomeBoardId: user.mobileHomeBoardId,
+    },
+  });
+
+  const handleSubmit = (values: FormType) => {
+    mutate({
+      userId: user.id,
+      ...values,
+    });
+  };
+
+  return (
+    <form onSubmit={form.onSubmit(handleSubmit)}>
+      <Stack gap="md">
+        <BoardSelect
+          label={t("management.page.user.setting.general.item.board.type.general")}
+          clearable
+          boards={boardsData}
+          w="100%"
+          {...form.getInputProps("homeBoardId")}
+        />
+        <BoardSelect
+          label={t("management.page.user.setting.general.item.board.type.mobile")}
+          clearable
+          boards={boardsData}
+          w="100%"
+          {...form.getInputProps("mobileHomeBoardId")}
+        />
+
+        <Group justify="end">
+          <Button type="submit" loading={isPending}>
+            {t("common.action.save")}
+          </Button>
+        </Group>
+      </Stack>
+    </form>
+  );
+};
+
+type FormType = z.infer<typeof userChangeHomeBoardsSchema>;

apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-search-preferences.tsx

@@ -0,0 +1,84 @@
+"use client";
+
+import { Button, Group, Select, Stack, Switch } from "@mantine/core";
+import type { z } from "zod/v4";
+
+import type { RouterOutputs } from "@homarr/api";
+import { clientApi } from "@homarr/api/client";
+import { revalidatePathActionAsync } from "@homarr/common/client";
+import { useZodForm } from "@homarr/form";
+import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
+import { useI18n } from "@homarr/translation/client";
+import { userChangeSearchPreferencesSchema } from "@homarr/validation/user";
+
+interface ChangeSearchPreferencesFormProps {
+  user: RouterOutputs["user"]["getById"];
+  searchEnginesData: { value: string; label: string }[];
+}
+
+export const ChangeSearchPreferencesForm = ({ user, searchEnginesData }: ChangeSearchPreferencesFormProps) => {
+  const t = useI18n();
+  const { mutate, isPending } = clientApi.user.changeSearchPreferences.useMutation({
+    async onSettled() {
+      await revalidatePathActionAsync(`/manage/users/${user.id}`);
+    },
+    onSuccess(_, variables) {
+      form.setInitialValues({
+        defaultSearchEngineId: variables.defaultSearchEngineId,
+        openInNewTab: variables.openInNewTab,
+        ddgBangsEnabled: variables.ddgBangsEnabled,
+      });
+      showSuccessNotification({
+        message: t("user.action.changeSearchPreferences.notification.success.message"),
+      });
+    },
+    onError() {
+      showErrorNotification({
+        message: t("user.action.changeSearchPreferences.notification.error.message"),
+      });
+    },
+  });
+  const form = useZodForm(userChangeSearchPreferencesSchema, {
+    initialValues: {
+      defaultSearchEngineId: user.defaultSearchEngineId,
+      openInNewTab: user.openSearchInNewTab,
+      ddgBangsEnabled: user.ddgBangs,
+    },
+  });
+
+  const handleSubmit = (values: FormType) => {
+    mutate({
+      userId: user.id,
+      ...values,
+    });
+  };
+
+  return (
+    <form onSubmit={form.onSubmit(handleSubmit)}>
+      <Stack gap="md">
+        <Select
+          label={t("user.field.defaultSearchEngine.label")}
+          w="100%"
+          data={searchEnginesData}
+          {...form.getInputProps("defaultSearchEngineId")}
+        />
+        <Switch
+          label={t("user.field.openSearchInNewTab.label")}
+          {...form.getInputProps("openInNewTab", { type: "checkbox" })}
+        />
+        <Switch
+          label={t("user.field.ddgBangs.label")}
+          {...form.getInputProps("ddgBangsEnabled", { type: "checkbox" })}
+        />
+
+        <Group justify="end">
+          <Button type="submit" loading={isPending}>
+            {t("common.action.save")}
+          </Button>
+        </Group>
+      </Stack>
+    </form>
+  );
+};
+
+type FormType = z.infer<typeof userChangeSearchPreferencesSchema>;

apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_first-day-of-week.tsx

@@ -0,0 +1,83 @@
+"use client";
+
+import { Button, Group, Radio, Stack } from "@mantine/core";
+import type { DayOfWeek } from "@mantine/dates";
+import dayjs from "dayjs";
+import localeData from "dayjs/plugin/localeData";
+import type { z } from "zod/v4";
+
+import type { RouterOutputs } from "@homarr/api";
+import { clientApi } from "@homarr/api/client";
+import { revalidatePathActionAsync } from "@homarr/common/client";
+import { useZodForm } from "@homarr/form";
+import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
+import { useI18n } from "@homarr/translation/client";
+import { userFirstDayOfWeekSchema } from "@homarr/validation/user";
+
+dayjs.extend(localeData);
+
+interface FirstDayOfWeekProps {
+  user: RouterOutputs["user"]["getById"];
+}
+
+const weekDays = dayjs.weekdays(false);
+
+export const FirstDayOfWeek = ({ user }: FirstDayOfWeekProps) => {
+  const t = useI18n();
+  const { mutate, isPending } = clientApi.user.changeFirstDayOfWeek.useMutation({
+    async onSettled() {
+      await revalidatePathActionAsync(`/manage/users/${user.id}`);
+    },
+    onSuccess(_, variables) {
+      form.setInitialValues({
+        firstDayOfWeek: variables.firstDayOfWeek as DayOfWeek,
+      });
+      showSuccessNotification({
+        message: t("user.action.changeFirstDayOfWeek.notification.success.message"),
+      });
+    },
+    onError() {
+      showErrorNotification({
+        message: t("user.action.changeFirstDayOfWeek.notification.error.message"),
+      });
+    },
+  });
+  const form = useZodForm(userFirstDayOfWeekSchema, {
+    initialValues: {
+      firstDayOfWeek: user.firstDayOfWeek as DayOfWeek,
+    },
+  });
+
+  const handleSubmit = (values: FormType) => {
+    mutate({
+      id: user.id,
+      ...values,
+    });
+  };
+
+  const inputProps = form.getInputProps("firstDayOfWeek");
+  const onChange = inputProps.onChange as (value: number) => void;
+  const value = (inputProps.value as number).toString();
+
+  return (
+    <form onSubmit={form.onSubmit(handleSubmit)}>
+      <Stack gap="md">
+        <Radio.Group {...inputProps} value={value} onChange={(value) => onChange(parseInt(value))}>
+          <Group mt="xs">
+            <Radio value="1" label={weekDays[1]} />
+            <Radio value="6" label={weekDays[6]} />
+            <Radio value="0" label={weekDays[0]} />
+          </Group>
+        </Radio.Group>
+
+        <Group justify="end">
+          <Button type="submit" loading={isPending}>
+            {t("common.action.save")}
+          </Button>
+        </Group>
+      </Stack>
+    </form>
+  );
+};
+
+type FormType = z.infer<typeof userFirstDayOfWeekSchema>;

apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx

@@ -1,332 +0,0 @@
-"use client";
-
-import { useEffect, useMemo, useRef } from "react";
-import {
-  Button,
-  Card,
-  Divider,
-  Group,
-  Radio,
-  Select,
-  SimpleGrid,
-  Stack,
-  Switch,
-  Text,
-  TextInput,
-  Title,
-} from "@mantine/core";
-import type { DayOfWeek } from "@mantine/dates";
-import dayjs from "dayjs";
-import localeData from "dayjs/plugin/localeData";
-import { z } from "zod/v4";
-
-import type { RouterOutputs } from "@homarr/api";
-import { clientApi } from "@homarr/api/client";
-import { revalidatePathActionAsync } from "@homarr/common/client";
-import { env } from "@homarr/common/env";
-import { useZodForm } from "@homarr/form";
-import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
-import { useI18n, useScopedI18n } from "@homarr/translation/client";
-import {
-  userChangeHomeBoardsSchema,
-  userChangeSearchPreferencesSchema,
-  userEditProfileSchema,
-  userFirstDayOfWeekSchema,
-  userPingIconsEnabledSchema,
-} from "@homarr/validation/user";
-
-import type { Board } from "~/app/[locale]/boards/_types";
-import { BoardSelect } from "~/components/board/board-select";
-import { CurrentLanguageCombobox } from "~/components/language/current-language-combobox";
-
-dayjs.extend(localeData);
-
-const userGeneralSettingsSchema = z.object({
-  name: userEditProfileSchema.shape.name,
-  email: userEditProfileSchema.shape.email,
-  homeBoardId: userChangeHomeBoardsSchema.shape.homeBoardId,
-  mobileHomeBoardId: userChangeHomeBoardsSchema.shape.mobileHomeBoardId,
-  defaultSearchEngineId: userChangeSearchPreferencesSchema.shape.defaultSearchEngineId,
-  openInNewTab: userChangeSearchPreferencesSchema.shape.openInNewTab,
-  ddgBangsEnabled: userChangeSearchPreferencesSchema.shape.ddgBangsEnabled,
-  firstDayOfWeek: userFirstDayOfWeekSchema.shape.firstDayOfWeek,
-  pingIconsEnabled: userPingIconsEnabledSchema.shape.pingIconsEnabled,
-});
-
-type FormValues = z.infer<typeof userGeneralSettingsSchema>;
-
-const FIRST_DAY_OPTIONS: { value: DayOfWeek; labelKey: number }[] = [
-  { value: 1, labelKey: 1 },
-  { value: 6, labelKey: 6 },
-  { value: 0, labelKey: 0 },
-];
-
-interface UserGeneralSettingsFormProps {
-  user: RouterOutputs["user"]["getById"];
-  boardsData: Pick<Board, "id" | "name" | "logoImageUrl">[];
-  searchEnginesData: { value: string; label: string }[];
-  showLanguageSelector?: boolean;
-}
-
-const buildInitialValues = (user: RouterOutputs["user"]["getById"]): FormValues => ({
-  name: user.name ?? "",
-  email: user.email ?? "",
-  homeBoardId: user.homeBoardId,
-  mobileHomeBoardId: user.mobileHomeBoardId,
-  defaultSearchEngineId: user.defaultSearchEngineId,
-  openInNewTab: user.openSearchInNewTab,
-  ddgBangsEnabled: user.ddgBangs,
-  firstDayOfWeek: user.firstDayOfWeek as DayOfWeek,
-  pingIconsEnabled: user.pingIconsEnabled,
-});
-
-export const UserGeneralSettingsForm = ({
-  user,
-  boardsData,
-  searchEnginesData,
-  showLanguageSelector = false,
-}: UserGeneralSettingsFormProps) => {
-  const t = useI18n();
-  const tGeneral = useScopedI18n("management.page.user.setting.general");
-  const isCredentialsUser = user.provider === "credentials";
-
-  const editProfileMutation = clientApi.user.editProfile.useMutation();
-  const changeHomeBoardsMutation = clientApi.user.changeHomeBoards.useMutation();
-  const changeSearchPreferencesMutation = clientApi.user.changeSearchPreferences.useMutation();
-  const changeFirstDayOfWeekMutation = clientApi.user.changeFirstDayOfWeek.useMutation();
-  const changePingIconsEnabledMutation = clientApi.user.changePingIconsEnabled.useMutation();
-
-  const initialValues = buildInitialValues(user);
-  const initialValuesRef = useRef(initialValues);
-
-  const form = useZodForm(userGeneralSettingsSchema, {
-    initialValues,
-  });
-
-  const isDirtyRef = useRef(false);
-  isDirtyRef.current = form.isDirty();
-
-  const weekDays = useMemo(() => dayjs.weekdays(false), []);
-
-  const mutations = [
-    editProfileMutation,
-    changeHomeBoardsMutation,
-    changeSearchPreferencesMutation,
-    changeFirstDayOfWeekMutation,
-    changePingIconsEnabledMutation,
-  ];
-  const isPending = mutations.some((m) => m.isPending);
-
-  useEffect(() => {
-    const handler = (e: BeforeUnloadEvent) => {
-      if (env.NODE_ENV === "development") return;
-      if (isDirtyRef.current) e.preventDefault();
-    };
-    window.addEventListener("beforeunload", handler);
-    return () => window.removeEventListener("beforeunload", handler);
-  }, []);
-
-  const handleSubmitAsync = async (values: FormValues) => {
-    const parsed = userGeneralSettingsSchema.safeParse(values);
-    if (!parsed.success) return;
-
-    const defaults = initialValuesRef.current;
-    const changed = <K extends keyof FormValues>(...fields: K[]) =>
-      fields.some((f) => (f === "email" ? (values[f] || null) !== (defaults[f] || null) : values[f] !== defaults[f]));
-
-    const saveActions: { when: boolean; action: () => Promise<unknown> }[] = [
-      {
-        when: isCredentialsUser && changed("name", "email"),
-        action: () =>
-          editProfileMutation.mutateAsync({ id: user.id, name: parsed.data.name, email: parsed.data.email ?? "" }),
-      },
-      {
-        when: changed("homeBoardId", "mobileHomeBoardId"),
-        action: () =>
-          changeHomeBoardsMutation.mutateAsync({
-            userId: user.id,
-            homeBoardId: parsed.data.homeBoardId,
-            mobileHomeBoardId: parsed.data.mobileHomeBoardId,
-          }),
-      },
-      {
-        when: changed("defaultSearchEngineId", "openInNewTab", "ddgBangsEnabled"),
-        action: () =>
-          changeSearchPreferencesMutation.mutateAsync({
-            userId: user.id,
-            defaultSearchEngineId: parsed.data.defaultSearchEngineId,
-            openInNewTab: parsed.data.openInNewTab,
-            ddgBangsEnabled: parsed.data.ddgBangsEnabled,
-          }),
-      },
-      {
-        when: changed("firstDayOfWeek"),
-        action: () =>
-          changeFirstDayOfWeekMutation.mutateAsync({ id: user.id, firstDayOfWeek: parsed.data.firstDayOfWeek }),
-      },
-      {
-        when: changed("pingIconsEnabled"),
-        action: () =>
-          changePingIconsEnabledMutation.mutateAsync({ id: user.id, pingIconsEnabled: parsed.data.pingIconsEnabled }),
-      },
-    ];
-
-    const promises = saveActions.filter((s) => s.when).map((s) => s.action());
-    if (promises.length === 0) return;
-
-    try {
-      await Promise.all(promises);
-      const newValues = { ...parsed.data, email: parsed.data.email ?? "" };
-      initialValuesRef.current = newValues;
-      form.setInitialValues(newValues);
-      form.resetDirty();
-      await revalidatePathActionAsync(`/manage/users/${user.id}`);
-      showSuccessNotification({
-        title: t("common.notification.update.success"),
-        message: t("common.notification.update.success"),
-      });
-    } catch {
-      showErrorNotification({
-        title: t("common.notification.update.error"),
-        message: t("common.notification.update.error"),
-      });
-    }
-  };
-
-  const handleDiscard = () => {
-    form.setValues(initialValuesRef.current);
-    form.resetDirty();
-  };
-
-  const firstDayOfWeekInputProps = form.getInputProps("firstDayOfWeek");
-  const firstDayOfWeekOnChange = firstDayOfWeekInputProps.onChange as (value: number) => void;
-  const firstDayOfWeekValue = (firstDayOfWeekInputProps.value as number).toString();
-
-  return (
-    <form onSubmit={form.onSubmit(handleSubmitAsync)}>
-      <Stack gap="lg">
-        <SimpleGrid cols={{ base: 1, md: 2 }} spacing="lg" verticalSpacing="lg">
-          <Card withBorder bg="transparent">
-            <Stack gap="md">
-              <Stack gap={2}>
-                <Title order={3}>{t("user.name")}</Title>
-                {!isCredentialsUser && (
-                  <Text c="dimmed" size="sm">
-                    {t("management.page.user.fieldsDisabledExternalProvider")}
-                  </Text>
-                )}
-              </Stack>
-              <Divider />
-              <TextInput
-                disabled={!isCredentialsUser}
-                label={t("user.field.username.label")}
-                withAsterisk
-                {...form.getInputProps("name")}
-              />
-              <TextInput
-                disabled={!isCredentialsUser}
-                label={t("user.field.email.label")}
-                {...form.getInputProps("email")}
-              />
-            </Stack>
-          </Card>
-
-          <Card withBorder bg="transparent">
-            <Stack gap="md">
-              <Stack gap={2}>
-                <Title order={3}>{tGeneral("item.board.title")}</Title>
-              </Stack>
-              <Divider />
-              <BoardSelect
-                label={tGeneral("item.board.type.general")}
-                clearable
-                boards={boardsData}
-                w="100%"
-                withinPortal
-                {...form.getInputProps("homeBoardId")}
-              />
-              <BoardSelect
-                label={tGeneral("item.board.type.mobile")}
-                clearable
-                boards={boardsData}
-                w="100%"
-                withinPortal
-                {...form.getInputProps("mobileHomeBoardId")}
-              />
-            </Stack>
-          </Card>
-
-          <Card withBorder bg="transparent">
-            <Stack gap="md">
-              <Stack gap={2}>
-                <Title order={3}>{tGeneral("item.search")}</Title>
-              </Stack>
-              <Divider />
-              <Select
-                label={t("user.field.defaultSearchEngine.label")}
-                w="100%"
-                data={searchEnginesData}
-                comboboxProps={{ withinPortal: true }}
-                {...form.getInputProps("defaultSearchEngineId")}
-              />
-              <Switch
-                label={t("user.field.openSearchInNewTab.label")}
-                {...form.getInputProps("openInNewTab", { type: "checkbox" })}
-              />
-              <Switch
-                label={t("user.field.ddgBangs.label")}
-                {...form.getInputProps("ddgBangsEnabled", { type: "checkbox" })}
-              />
-            </Stack>
-          </Card>
-
-          <Card withBorder bg="transparent">
-            <Stack gap="md">
-              <Stack gap={2}>
-                <Title order={3}>{tGeneral("item.language")}</Title>
-              </Stack>
-              <Divider />
-              {showLanguageSelector && <CurrentLanguageCombobox withinPortal />}
-              <Title order={4}>{tGeneral("item.firstDayOfWeek")}</Title>
-              <Radio.Group
-                {...firstDayOfWeekInputProps}
-                value={firstDayOfWeekValue}
-                onChange={(nextValue: string) => firstDayOfWeekOnChange(parseInt(nextValue, 10))}
-              >
-                <Group mt="xs" wrap="wrap">
-                  {FIRST_DAY_OPTIONS.map(({ value: dayValue, labelKey }) => (
-                    <Radio key={dayValue} value={dayValue.toString()} label={weekDays[labelKey]} />
-                  ))}
-                </Group>
-              </Radio.Group>
-              <Divider my="xs" />
-              <Title order={4}>{tGeneral("item.accessibility")}</Title>
-              <Switch
-                label={t("user.field.pingIconsEnabled.label")}
-                {...form.getInputProps("pingIconsEnabled", { type: "checkbox" })}
-              />
-            </Stack>
-          </Card>
-        </SimpleGrid>
-
-        <div style={{ position: "sticky", bottom: 20 }}>
-          {form.isDirty() && (
-            <Card withBorder>
-              <Group justify="space-between" wrap="wrap">
-                <Text fw={500}>{t("common.unsavedChanges")}</Text>
-                <Group>
-                  <Button disabled={isPending} variant="default" onClick={handleDiscard}>
-                    {t("common.action.discard")}
-                  </Button>
-                  <Button loading={isPending} type="submit" disabled={!form.isValid()}>
-                    {t("common.action.saveChanges")}
-                  </Button>
-                </Group>
-              </Group>
-            </Card>
-          )}
-        </div>
-      </Stack>
-    </form>
-  );
-};

apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_ping-icons-enabled.tsx

@@ -0,0 +1,69 @@
+"use client";
+
+import { Button, Group, Stack, Switch } from "@mantine/core";
+import type { z } from "zod/v4";
+
+import type { RouterOutputs } from "@homarr/api";
+import { clientApi } from "@homarr/api/client";
+import { revalidatePathActionAsync } from "@homarr/common/client";
+import { useZodForm } from "@homarr/form";
+import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
+import { useI18n } from "@homarr/translation/client";
+import { userPingIconsEnabledSchema } from "@homarr/validation/user";
+
+interface PingIconsEnabledProps {
+  user: RouterOutputs["user"]["getById"];
+}
+
+export const PingIconsEnabled = ({ user }: PingIconsEnabledProps) => {
+  const t = useI18n();
+  const { mutate, isPending } = clientApi.user.changePingIconsEnabled.useMutation({
+    async onSettled() {
+      await revalidatePathActionAsync(`/manage/users/${user.id}`);
+    },
+    onSuccess(_, variables) {
+      form.setInitialValues({
+        pingIconsEnabled: variables.pingIconsEnabled,
+      });
+      showSuccessNotification({
+        message: t("user.action.changePingIconsEnabled.notification.success.message"),
+      });
+    },
+    onError() {
+      showErrorNotification({
+        message: t("user.action.changePingIconsEnabled.notification.error.message"),
+      });
+    },
+  });
+  const form = useZodForm(userPingIconsEnabledSchema, {
+    initialValues: {
+      pingIconsEnabled: user.pingIconsEnabled,
+    },
+  });
+
+  const handleSubmit = (values: FormType) => {
+    mutate({
+      id: user.id,
+      ...values,
+    });
+  };
+
+  return (
+    <form onSubmit={form.onSubmit(handleSubmit)}>
+      <Stack gap="md">
+        <Switch
+          {...form.getInputProps("pingIconsEnabled", { type: "checkbox" })}
+          label={t("user.field.pingIconsEnabled.label")}
+        />
+
+        <Group justify="end">
+          <Button type="submit" loading={isPending}>
+            {t("common.action.save")}
+          </Button>
+        </Group>
+      </Stack>
+    </form>
+  );
+};
+
+type FormType = z.infer<typeof userPingIconsEnabledSchema>;

apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_profile-avatar-form.tsx

@@ -2,7 +2,7 @@
 
 import { useCallback } from "react";
 import { Box, Button, FileButton, Menu, UnstyledButton } from "@mantine/core";
-import { useDisclosure, useMediaQuery } from "@mantine/hooks";
+import { useDisclosure } from "@mantine/hooks";
 import { IconPencil, IconPhotoEdit, IconPhotoX } from "@tabler/icons-react";
 
 import type { RouterOutputs } from "@homarr/api";
@@ -25,7 +25,6 @@ export const UserProfileAvatarForm = ({ user }: UserProfileAvatarForm) => {
     },
   });
   const [opened, { toggle }] = useDisclosure(false);
-  const isMobile = useMediaQuery("(max-width: 48em)");
   const { openConfirmModal } = useConfirmModal();
   const t = useI18n();
   const tManageAvatar = useScopedI18n("user.action.manageAvatar");
@@ -95,11 +94,11 @@ export const UserProfileAvatarForm = ({ user }: UserProfileAvatarForm) => {
   }, [mutate, user.id, openConfirmModal, tManageAvatar]);
 
   return (
-    <Box pos="relative" display="flex" style={{ justifyContent: isMobile ? "center" : undefined }}>
+    <Box pos="relative">
-      <Menu opened={opened} keepMounted onChange={toggle} position="bottom-start" withArrow withinPortal>
+      <Menu opened={opened} keepMounted onChange={toggle} position="bottom-start" withArrow>
         <Menu.Target>
           <UnstyledButton onClick={toggle}>
-            <UserAvatar user={user} size={isMobile ? 120 : 200} />
+            <UserAvatar user={user} size={200} />
             <Button
               component="div"
               pos="absolute"