fix: remove legacy apps/websocket and apps/tasks, exclude build artifacts from tsconfig

- Remove apps/websocket/ (merged into custom server in server.ts)
- Remove apps/tasks/ (merged into custom server in server.ts)
- Exclude customServer.cjs and customServer.css from tsconfig to prevent
  tsc errors when build artifacts are present
- Update pnpm-lock.yaml (removed 138 unnecessary packages)

Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com>
Agent-Logs-Url: https://github.com/homarr-labs/homarr/sessions/bd83b347-563b-494e-b8c6-91fcc199dd79

.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/codebase-context.mdc

@@ -1,191 +0,0 @@
----
-description: Comprehensive Homarr codebase architecture and conventions reference
-alwaysApply: true
----
-
-# Homarr Codebase Context
-
-Homarr is an open-source, self-hosted dashboard for managing homelab services. It integrates with 50+ self-hosted apps (media servers, download clients, DNS, NAS, etc.) and provides a drag-and-drop widget-based UI.
-
-## Tech Stack
-
-- **Monorepo**: pnpm workspaces + Turborepo
-- **Framework**: Next.js (App Router, `output: "standalone"`) — T3 Stack
-- **Language**: TypeScript throughout
-- **ORM**: Drizzle (supports SQLite via better-sqlite3, MySQL, PostgreSQL)
-- **API**: tRPC (HTTP + WebSocket subscriptions) with superjson + OpenAPI bridge via `trpc-to-openapi`
-- **Auth**: NextAuth v5 (database sessions, Credentials/LDAP/OIDC providers)
-- **UI**: Mantine v7 (not Tailwind) + Tabler icons
-- **State**: Jotai (atoms), TanStack Query (server state via tRPC)
-- **Realtime**: WebSocket server (`ws`) for tRPC subscriptions, backed by Redis pub/sub
-- **Cron**: `node-cron` in a standalone Fastify service (`apps/tasks`)
-- **i18n**: next-intl with `[locale]` dynamic segment (prefix mode: `"never"`, locale from cookie)
-- **Testing**: Vitest + jsdom, Playwright for E2E
-- **Package manager**: pnpm 10.33.2, Node >= 24.15.0
-
-## Repository Structure
-
-```
-homarr/
-├── apps/
-│   ├── nextjs/          # Main Next.js application (port 3000)
-│   ├── tasks/           # Cron job runner + Fastify tRPC API (port 3002)
-│   └── websocket/       # Standalone tRPC WebSocket server (port 3001)
-├── packages/
-│   ├── api/             # tRPC appRouter, procedures, OpenAPI
-│   ├── auth/            # NextAuth config, providers, session, API keys
-│   ├── db/              # Drizzle schema (3 DB drivers), migrations, queries
-│   ├── core/            # Env validation, DB/Redis driver factories, logging
-│   ├── definitions/     # Domain enums: WidgetKind, IntegrationKind, permissions
-│   ├── widgets/         # All 39 dashboard widgets (definitions + components)
-│   ├── integrations/    # Integration classes (HTTP clients to external apps)
-│   ├── redis/           # Redis pub/sub channels, caching abstractions
-│   ├── translation/     # next-intl setup, locale configs, lang JSON files
-│   ├── ui/              # Shared Mantine components, theme, hooks
-│   ├── validation/      # Shared zod schemas for API/forms
-│   ├── common/          # Shared utilities, IDs, errors
-│   ├── cron-jobs/       # Cron job implementations (25+ jobs)
-│   ├── cron-jobs-core/  # Cron scheduling primitives
-│   ├── cron-job-api/    # tRPC router for job management (start/stop/trigger)
-│   ├── cron-job-status/ # Cron status via Redis
-│   ├── boards/          # Board context, edit mode, cache updater
-│   ├── modals/          # Modal primitives on Mantine
-│   ├── modals-collection/ # Feature modals (apps, boards, docker, etc.)
-│   ├── form/            # useZodForm (Mantine + zod resolver)
-│   ├── forms-collection/# Reusable form UIs (new app, icon picker, upload)
-│   ├── spotlight/       # Command palette / search with multiple modes
-│   ├── request-handler/ # Server request handlers (feeds, integrations)
-│   ├── notifications/   # Mantine notifications wrapper
-│   ├── docker/          # Dockerode-based Docker access
-│   ├── icons/           # Icon DB/repo integration
-│   ├── image-proxy/     # Image proxy + caching
-│   ├── ping/            # Reachability / ping utilities
-│   ├── analytics/       # Server-side analytics (Umami)
-│   ├── server-settings/ # Server setting keys/types
-│   ├── settings/        # User-facing settings UI context
-│   ├── old-import/      # Legacy Homarr import
-│   ├── old-schema/      # Legacy Homarr zod schemas
-│   └── cli/             # Node CLI for ops (brocli)
-├── tooling/
-│   ├── eslint/          # Shared ESLint configs
-│   ├── prettier/        # Shared Prettier config
-│   ├── typescript/      # Base tsconfig
-│   └── github/          # CI setup action
-├── development/         # Dev docker-compose (Redis, MySQL, PostgreSQL)
-├── e2e/                 # E2E test specs
-└── Dockerfile           # Multi-stage production build
-```
-
-## Three Runtime Services
-
-| Service | Port | Role |
-|---------|------|------|
-| Next.js | 3000 | Main web app (SSR + API routes) |
-| WebSocket | 3001 | tRPC subscriptions via `ws` |
-| Tasks | 3002 | Cron job runner + management API via Fastify |
-
-In Docker, nginx listens on **7575** and proxies to all three. The tasks service authenticates via `CRON_JOB_API_KEY` header.
-
-## Package Dependency Layers
-
-1. **Foundation**: `core` (env, DB drivers, Redis client, logging) → no `@homarr` deps
-2. **Domain**: `definitions` → `common` → `core`
-3. **Data**: `db` → `core`, `definitions`, `common`
-4. **Auth**: `auth` → `db`, `definitions`, `core`, `validation`
-5. **Cross-cutting**: `translation`, `validation`, `redis`, `server-settings`
-6. **Feature backends**: `integrations`, `request-handler`, `cron-jobs`, `docker`, `ping`
-7. **API surface**: `api` → pulls in auth, db, redis, integrations, etc.
-8. **UI stack**: `ui`, `modals`, `form`, `notifications`, `boards`, `spotlight`
-9. **Composed features**: `widgets`, `modals-collection`, `forms-collection`
-
-## Key Patterns
-
-### tRPC
-
-- **Server caller** (RSC): `import { api } from "@homarr/api/server"` → cached caller with auth context
-- **Client hooks**: `import { clientApi } from "@homarr/api/client"` → React Query hooks
-- **Router structure**: `packages/api/src/root.ts` defines top-level namespaces (`user`, `board`, `widget`, `integration`, `docker`, `kubernetes`, etc.)
-- **Procedures**: `publicProcedure`, `protectedProcedure`, `permissionRequiredProcedure`, `onboardingProcedure`
-- **WebSocket subscriptions**: Client uses `wsLink` when `type === "subscription"`, connects to port 3001
-
-### Multi-Database Support
-
-Drizzle schemas exist in three parallel implementations:
-- `packages/db/schema/sqlite.ts`
-- `packages/db/schema/mysql.ts`
-- `packages/db/schema/postgresql.ts`
-
-Selected at runtime via `DB_DRIVER` env (`better-sqlite3` | `mysql2` | `node-postgres`). Migrations are per-engine in `packages/db/migrations/{sqlite,mysql,postgresql}/`.
-
-### Widget System
-
-Widgets are registered in `packages/widgets/src/index.tsx` as `widgetImports` (must satisfy `Record<WidgetKind, ...>`). Each widget:
-- Has a `definition` created via `createWidgetDefinition(kind, { icon, createOptions, supportedIntegrations? })`
-- Uses `optionsBuilder.from(factory => ({ ... }))` for typed options
-- Loads dynamically via `next/dynamic`
-- Fetches data via tRPC client hooks (backed by cron job caches)
-
-### Integration System
-
-Integrations are defined in `packages/definitions/src/integration.ts` (`integrationDefs`) and instantiated via `createIntegrationAsync` in `packages/integrations/src/base/creator.ts`. Each extends abstract `Integration` class with `testConnectionAsync` and typed methods.
-
-### Cron Job System
-
-Jobs defined in `packages/cron-jobs/src/jobs/`. Each job:
-- Uses `createCronJob` with a cron expression
-- Publishes results to Redis channels
-- Widget subscriptions consume those channels via tRPC subscriptions
-- Job management (start/stop/trigger) via `cronJobApi` HTTP client to port 3002
-
-### Modals
-
-Created with `createModal(component).withOptions({ defaultTitle })` from `@homarr/modals`. Opened via `useModalAction(SomeModal)`. Feature modals live in `packages/modals-collection/`.
-
-### Forms
-
-`useZodForm` from `@homarr/form` wraps Mantine `useForm` with zod validation. Shared form UIs in `packages/forms-collection/`.
-
-### Routing (App Router)
-
-- `apps/nextjs/src/app/[locale]/` — all UI routes under locale segment
-- Route groups: `(home)`, `(content)`, `(board)` — don't affect URLs
-- Key routes: `boards/[name]`, `manage/...` (admin), `auth/login`, `init` (onboarding), `widgets/[kind]`
-- Locale driven by cookie (no URL prefix)
-
-### Auth Providers
-
-Configured via `AUTH_PROVIDERS` env. Supports: `credentials` (local), `ldap`, `oidc`. Database sessions with httpOnly cookies. API key auth for programmatic access.
-
-## Environment Variables
-
-Key env vars (from `.env.example`):
-- `DB_DRIVER`: `better-sqlite3` | `mysql2` | `node-postgres`
-- `DB_URL`: Database connection string
-- `AUTH_SECRET`: NextAuth secret
-- `SECRET_ENCRYPTION_KEY`: AES-256-CBC for integration secrets
-- `AUTH_PROVIDERS`: Comma-separated (`credentials`, `ldap`, `oidc`)
-- `CRON_JOB_API_KEY`: Shared key between Next.js and tasks service
-- `REDIS_*`: Redis connection (host, port, password)
-- `ENABLE_KUBERNETES`: Optional Kubernetes integration
-
-## Development Commands
-
-- `pnpm dev` — runs all three services in parallel via Turborepo
-- `pnpm docker:dev` — starts Redis + MySQL + PostgreSQL containers
-- `pnpm db:push` — push schema to SQLite (dev)
-- `pnpm db:studio` — Drizzle Studio
-- `pnpm test` — Vitest unit tests
-- `pnpm test:e2e` — Playwright E2E
-- `pnpm lint` / `pnpm format` — ESLint + Prettier
-- `pnpm typecheck` — tsc --noEmit across all packages
-
-## Conventions
-
-- Workspace packages use `@homarr/` scope
-- All versions managed via pnpm `catalog:` in workspace
-- Path alias `~/*` → `./src/*` in Next.js app
-- Mantine for all UI (no Tailwind) — primary color is red, `autoContrast: true`
-- Icons from `@tabler/icons-react`
-- Drag-and-drop via `@dnd-kit/*`
-- `typescript.ignoreBuildErrors: true` in next.config (types checked separately via `typecheck`)
-- `serverExternalPackages`: `dockerode`, `isomorphic-dompurify`, `jsdom`

.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`

.deepsource.toml

@@ -3,6 +3,9 @@ version = 1
 [[analyzers]]
 name = "javascript"
 
-[analyzers.meta]
-plugins = ["react"]
-environment = ["nodejs"]
+  [analyzers.meta]
+  plugins = ["react"]
+  environment = ["nodejs"]
+
+[[transformers]]
+name = "prettier"

.dockerignore

@@ -9,8 +9,4 @@ README.md
 .git
 dev
 .build
-e2e
-apps/nextjs/.next
-.env
-.env.*
-!.env.example
+e2e

.env.example

@@ -12,6 +12,10 @@ AUTH_SECRET="supersecret"
 # or starting the project without any (which will show a randomly generated one).
 SECRET_ENCRYPTION_KEY=0000000000000000000000000000000000000000000000000000000000000000
 
+# Cron job API key is generated every time the container starts as it is required for communication between nextjs-api and tasks-api
+# export CRON_JOB_API_KEY=$(openssl rand -base64 32)
+# CRON_JOB_API_KEY="your-generated-api-key"
+
 LOG_LEVEL='info'
 
 # This is how you can use the sqlite driver:
@@ -41,20 +45,6 @@ DB_URL='FULL_PATH_TO_YOUR_SQLITE_DB_FILE'
 
 TURBO_TELEMETRY_DISABLED=1
 
-# Turborepo remote cache (optional, for faster CI/local builds)
-# Uncomment and fill in to enable remote caching locally.
-# CI uses GitHub secrets for these values automatically.
-# TURBO_API=https://your-cache-worker.workers.dev
-# TURBO_TEAM=team_your_team
-# TURBO_TOKEN=your-turbo-token
-# TURBO_REMOTE_CACHE_SIGNATURE_KEY=your-signature-key
-
-# Comma-separated paths to Docker-compatible Unix sockets.
-# Useful for connecting to multiple runtimes (Docker + Podman) simultaneously.
-# When unset and no TCP hosts configured, defaults to /var/run/docker.sock.
-# Example: DOCKER_SOCKET_PATHS=/var/run/docker.sock,/run/user/1000/podman/podman.sock
-# DOCKER_SOCKET_PATHS=
-
 # Enable kubernetes tool
 # ENABLE_KUBERNETES=true
 

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -33,20 +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
-        - 1.60.0
-        - 1.59.3
-        - 1.59.2
-        - 1.59.1
-        - 1.59.0
-        - 1.58.1
-        - 1.58.0
-        - 1.57.1
-        - 1.57.0
-        - 1.56.1
         - 1.56.0
         - 1.55.0
         - 1.54.0

.github/ISSUE_TEMPLATE/integration.yml

@@ -25,16 +25,16 @@ body:
       label: Public API available?
       description: Is there a public API available, that we can consume in Homarr?
       options:
-        - "Yes, available on a website"
-        - "Yes, available in the application itself"
-        - "No"
+        - Yes, available on a website
+        - Yes, available in the application itself
+        - No
     validations:
       required: true
   - type: dropdown
     attributes:
       label: Are you willing to contribute this yourself?
       options:
-        - "Yes"
-        - "No"
+      - Yes
+      - No
     validations:
       required: true

.github/ISSUE_TEMPLATE/widget.yml

@@ -24,7 +24,7 @@ body:
     attributes:
       label: Are you willing to contribute this yourself?
       options:
-        - "Yes"
-        - "No"
+        - Yes
+        - No
     validations:
       required: true

.github/actions/prebuilt-debian/action.yaml

@@ -15,11 +15,11 @@ runs:
       with:
         persist-credentials: false
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v4
+      uses: docker/setup-buildx-action@v3
 
     - name: Build docker image for ${{ inputs.architecture }}
       id: build
-      uses: docker/build-push-action@v7
+      uses: docker/build-push-action@v6
       with:
         push: false
         load: true

.github/renovate.json5

@@ -11,12 +11,6 @@
       matchPackageNames: ["tsx"],
       enabled: false,
     },
-    // Reenable once bug with undici v8 is fixed (https://github.com/homarr-labs/homarr/issues/5467)
-    {
-      matchPackageNames: ["undici"],
-      matchNewValue: "8.*",
-      enabled: false,
-    },
     {
       matchUpdateTypes: ["minor", "patch", "pin", "digest"],
       automerge: true,
@@ -37,12 +31,6 @@
       automerge: false,
     },
   ],
-  // Updates lockfile for prebuilt-debian after if package.json is updated, otherwise only root lockfile is updated
-  postUpgradeTasks: {
-    commands: ["cd deployments/prebuilt-debian && pnpm install --ignore-workspace --lockfile-only"],
-    fileFilters: ["deployments/prebuilt-debian/pnpm-lock.yaml"],
-    executionMode: "update",
-  },
   updateInternalDeps: true,
   rangeStrategy: "bump",
   automerge: false,

.github/workflows/automatic-approval.yml

@@ -9,21 +9,16 @@ jobs:
   approve-automatic-prs:
     runs-on: ubuntu-latest
     timeout-minutes: 2
-    # 158783068: homarr-renovate[bot]
-    # 190541745: homarr-crowdin[bot]
-    # 210161987: homarr-update-contributors[bot]
-    # 175486441: homarr-releases[bot]
-    # Extracted from https://api.github.com/users/<username>
-    if: github.actor_id == 158783068 || github.actor_id == 190541745 || github.actor_id == 210161987 || github.actor_id == 175486441
+    if: github.actor_id == 158783068 || github.actor_id == 190541745 || github.actor_id == 210161987 # Id of renovate bot and crowdin bot see https://api.github.com/users/homarr-renovate%5Bbot%5D and https://api.github.com/users/homarr-crowdin%5Bbot%5D and https://api.github.com/users/homarr-update-contributors%5Bbot%5D
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
       - name: Obtain token
         id: obtainToken
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v2
         with:
           private-key: ${{ secrets.RENOVATE_APPROVE_PRIVATE_KEY }}
-          client-id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
+          app-id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
           permission-pull-requests: write # required to approve pull request
 
       - name: Install GitHub CLI

.github/workflows/code-quality.yml

@@ -11,58 +11,21 @@ on:
 
 concurrency:
   group: "${{ github.workflow }}-${{ github.ref }}"
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
 
+# You can leverage Vercel Remote Caching with Turbo to speed up your builds
+# @link https://turborepo.org/docs/core-concepts/remote-caching#remote-caching-on-vercel-builds
 env:
   FORCE_COLOR: 3
-  SKIP_ENV_VALIDATION: true
-  TURBO_API: ${{ secrets.TURBO_API }}
-  TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-  TURBO_REMOTE_CACHE_SIGNATURE_KEY: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
-  TURBO_SCM_BASE: ${{ github.event.pull_request.base.sha || github.event.before || 'HEAD~1' }}
-  TURBO_SCM_HEAD: ${{ github.sha }}
+  TURBO_TEAM: ${{ vars.TURBO_TEAM }}
 
 jobs:
-  lint-format-autofix:
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          ref: ${{ github.head_ref }}
-
-      - name: Setup
-        uses: ./tooling/github/setup
-
-      - 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
-          echo "count=$(wc -l < /tmp/changed-files | tr -d '[:space:]')" >> $GITHUB_OUTPUT
-
-      - name: Auto-fix lint + format
-        if: steps.changed.outputs.count != '0'
-        run: |
-          xargs -r -a /tmp/changed-files pnpm exec oxlint --fix || true
-          xargs -r -a /tmp/changed-files pnpm exec oxfmt --write
-
-      - name: Commit fixes
-        uses: stefanzweifel/git-auto-commit-action@v5
-        with:
-          commit_message: "style: auto-fix lint and format"
-
   lint:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
 
       - name: Setup
         uses: ./tooling/github/setup
@@ -72,35 +35,31 @@ jobs:
         run: cp .env.example .env
 
       - name: Lint
-        run: pnpm turbo lint --affected && pnpm lint:ws
+        run: pnpm lint && pnpm lint:ws
 
   format:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
 
       - name: Setup
         uses: ./tooling/github/setup
 
       - name: Format
-        run: pnpm turbo format --affected --continue
+        run: pnpm format
 
   typecheck:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
 
       - name: Setup
         uses: ./tooling/github/setup
 
       - name: Typecheck
-        run: pnpm turbo typecheck --affected
+        run: turbo typecheck
 
   test:
     runs-on: ubuntu-latest
@@ -123,24 +82,20 @@ jobs:
   e2e:
     runs-on: ubuntu-latest
     timeout-minutes: 15
+
     steps:
       - uses: actions/checkout@v6
       - name: Setup
         uses: ./tooling/github/setup
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
       - name: Build docker image
         id: build-docker-image
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64
           context: .
           push: false
-          load: true
           tags: homarr-e2e
           network: host
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
         env:
           SKIP_ENV_VALIDATION: true
       - name: Install playwright browsers
@@ -154,12 +109,10 @@ jobs:
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
       - name: Setup
         uses: ./tooling/github/setup
       - name: Copy env
         shell: bash
         run: cp .env.example .env
       - name: Build
-        run: pnpm turbo build --affected
+        run: pnpm build

.github/workflows/crowdin-schedule-download.yml

@@ -19,10 +19,10 @@ jobs:
 
       - name: Obtain token
         id: obtainToken
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v2
         with:
           private-key: ${{ secrets.CROWDIN_APP_PRIVATE_KEY }}
-          client-id: ${{ secrets.CROWDIN_APP_ID }}
+          app-id: ${{ secrets.CROWDIN_APP_ID }}
           permission-contents: write # required to commit to crowdin branch
           permission-pull-requests: write # required to create pull request
 

.github/workflows/deployment-beta-release.yml

@@ -1,104 +0,0 @@
-name: "[Deployment] Beta Release"
-
-on:
-  workflow_dispatch:
-    inputs:
-      send-notifications:
-        type: boolean
-        required: false
-        default: true
-        description: Send notifications
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  create-and-merge-pr:
-    runs-on: ubuntu-latest
-    timeout-minutes: 2
-    steps:
-      - name: Discord notification
-        if: ${{ github.event.inputs.send-notifications }}
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
-        with:
-          args: "Beta release has been triggered: [run ${{ github.run_number }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})"
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-      - name: Get Next Version
-        id: semver
-        uses: ietf-tools/semver-action@v1
-        with:
-          token: ${{ github.token }}
-          branch: next
-      - name: Create pull request
-        id: create-pull-request
-        run: 'gh pr create --title "chore(release): release ${{ steps.semver.outputs.next }}-beta" --body "Detected change to be ``${{ steps.semver.outputs.bump }}``<br/>Bump version from ``${{ steps.semver.outputs.current }}`` to ``${{ steps.semver.outputs.next }}-beta``" --base beta --head next --label automerge'
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Discord notification
-        if: ${{ github.event.inputs.send-notifications }}
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
-        with:
-          args: "Created a release PR ${{ steps.create-pull-request.outputs.url }} for version ${{ steps.semver.outputs.next }}-beta (new behaviour: ${{ steps.semver.outputs.bump }})"
-      - name: Obtain token
-        id: obtainApprovalToken
-        uses: actions/create-github-app-token@v3
-        with:
-          private-key: ${{ secrets.RENOVATE_APPROVE_PRIVATE_KEY }}
-          client-id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
-          permission-pull-requests: write
-      - name: Approve PR
-        env:
-          GITHUB_TOKEN: ${{ steps.obtainApprovalToken.outputs.token }}
-        run: |
-          gh pr review --approve --body "Automatically approved by GitHub Action"
-      - name: Obtain token
-        id: obtainMergeToken
-        uses: actions/create-github-app-token@v3
-        with:
-          private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
-          client-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
-          permission-contents: write # write to beta branch (due to merge)
-          permission-pull-requests: write # merge pull request
-      - id: automerge
-        if: ${{ steps.semver.outputs.bump != 'major' }}
-        name: automerge
-        uses: "pascalgn/automerge-action@v0.16.4"
-        env:
-          GITHUB_TOKEN: ${{ steps.obtainMergeToken.outputs.token }}
-          MERGE_METHOD: merge # we prefer merge commits for merging to beta
-          MERGE_COMMIT_MESSAGE: "chore(release): release ${{ steps.semver.outputs.next }}-beta"
-          MERGE_DELETE_BRANCH: false # never set to true!
-          PULL_REQUEST: "${{ steps.create-pull-request.outputs.pr_number }}"
-          MERGE_RETRIES: 20 # 20 retries * MERGE_RETRY_SLEEP until step fails
-          MERGE_RETRY_SLEEP: 10000 # 10 seconds * MERGE_RETRIES until step fails
-          MERGE_REQUIRED_APPROVALS: 0 # do not require approvals
-
-      - name: Merged Discord notification
-        if: ${{ steps.automerge.outputs.mergeResult == 'merged' && github.event.inputs.send-notifications }}
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
-        with:
-          args: "Merged PR ${{ steps.create-pull-request.outputs.url }} for release ${{ steps.semver.outputs.next }}-beta"
-      - name: Major Bump Discord notification
-        if: ${{ steps.semver.outputs.bump == 'major' && github.event.inputs.send-notifications }}
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
-        with:
-          args: "The release PR must be manually merged because the next version is a major version: ${{ steps.create-pull-request.outputs.url }} for release ${{ steps.semver.outputs.next }}-beta"
-      - name: Discord Fail Notification
-        if: failure() && github.event.inputs.send-notifications
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
-        with:
-          args: "The beta release workflow [run ${{ github.run_number }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) has failed"

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

@@ -5,7 +5,6 @@ on:
     branches:
       - main
       - beta
-      - next
       - dev
   workflow_dispatch:
     inputs:
@@ -35,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     env:
-      SKIP_RELEASE: ${{ github.event_name == 'workflow_dispatch' || github.ref_name == 'dev' || github.ref_name == 'next' }}
+      SKIP_RELEASE: ${{ github.event_name == 'workflow_dispatch' || github.ref_name == 'dev' }}
     outputs:
       version: ${{ steps.read-semver.outputs.version || steps.version-fallback.outputs.version }}
       git_ref: ${{ steps.read-git-ref.outputs.ref || github.ref }}
@@ -51,23 +50,23 @@ jobs:
       - name: Obtain token
         if: env.SKIP_RELEASE == 'false'
         id: obtainToken
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v2
         with:
           private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
-          client-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
-          permission-contents: write # required to commit package.json & changelog changes, merge them to dev / next and publish the release
+          app-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
+          permission-contents: write # required to commit package.json & changelog changes, merge them to dev and publish the release
 
       - uses: actions/checkout@v6
         if: env.SKIP_RELEASE == 'false'
         with:
           persist-credentials: false
-      - uses: pnpm/action-setup@v6
+      - uses: pnpm/action-setup@v4
         if: env.SKIP_RELEASE == 'false'
       - uses: actions/setup-node@v6
         if: env.SKIP_RELEASE == 'false'
         with:
-          node-version: 24.16.0
-          package-manager-cache: false
+          node-version: 24.14.0
+          cache: "pnpm"
       - run: npm i -g pnpm
         if: env.SKIP_RELEASE == 'false'
       - name: Install dependencies
@@ -96,21 +95,20 @@ jobs:
         id: read-git-ref
         run: |
           echo "ref=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
-      - name: Update dev / next branch
+      - name: Update dev branch
         if: env.SKIP_RELEASE == 'false'
         continue-on-error: true # Prevent pipeline from failing when merge fails
         env:
           GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
-          UPSTREAM_BRANCH: ${{ github.ref_name == 'main' && 'dev' || 'next' }}
         run: |
           git config user.name "Releases Homarr"
           git config user.email "175486441+homarr-releases[bot]@users.noreply.github.com"
           git remote set-url origin https://x-access-token:${{ steps.obtainToken.outputs.token }}@github.com/${{ github.repository }}.git
-          git fetch origin ${{ env.UPSTREAM_BRANCH }}
-          git checkout ${{ env.UPSTREAM_BRANCH }}
-          git pull origin ${{ env.UPSTREAM_BRANCH }}
+          git fetch origin dev
+          git checkout dev
+          git pull origin dev
           git rebase ${{ github.ref_name }}
-          git push origin ${{ env.UPSTREAM_BRANCH }}
+          git push origin dev
   build-amd64:
     name: Build docker image for amd64
     needs: release
@@ -125,7 +123,7 @@ jobs:
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: "${{ env.GHCR_REPO }}"
 
@@ -137,11 +135,11 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: Build and push by digest
         id: build
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           context: .
           network: host
@@ -164,7 +162,7 @@ jobs:
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: "${{ env.GHCR_REPO }}"
 
@@ -176,11 +174,11 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: Build and push by digest
         id: build
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           context: .
           network: host
@@ -193,7 +191,7 @@ jobs:
     name: Extract amd64 asset from docker image
     needs: [release, build-amd64]
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    timeout-minutes: 2
     steps:
       - name: Extract amd64
         if: needs.release.outputs.skipped == 'false'
@@ -209,7 +207,7 @@ jobs:
     name: Extract arm64 asset from docker image
     needs: [release, build-arm64]
     runs-on: ubuntu-24.04-arm
-    timeout-minutes: 5
+    timeout-minutes: 2
     steps:
       - name: Extract arm64
         if: needs.release.outputs.skipped == 'false'
@@ -233,10 +231,10 @@ jobs:
       - name: Obtain token
         if: needs.release.outputs.skipped == 'false'
         id: obtainToken
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v2
         with:
           private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
-          client-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
+          app-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
           permission-contents: write # required to publish the release
 
       - name: Log in to the Container registry
@@ -276,6 +274,6 @@ jobs:
       - name: Discord notification
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
+        uses: Ilshidur/action-discord@master
         with:
           args: "Successfully deployed images for branch **${{ github.ref_name }}**. Tagged as **${{env.NEXT_VERSION}}**."

.github/workflows/deployment-weekly-release.yml

@@ -21,10 +21,10 @@ jobs:
     timeout-minutes: 2
     steps:
       - name: Discord notification
-        if: ${{ github.event.inputs.send-notifications }}
+        if: ${{ github.events.inputs.send-notifications }}
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
+        uses: Ilshidur/action-discord@master
         with:
           args: "Automatic release has been triggered: [run ${{ github.run_number }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})"
       - name: Checkout repository
@@ -38,23 +38,22 @@ jobs:
           token: ${{ github.token }}
           branch: dev
       - name: Create pull request
-        id: create-pull-request
         run: 'gh pr create --title "chore(release): automatic release ${{ steps.semver.outputs.next }}" --body "**This is an automatic release**.<br/>Manual action may be required for major bumps.<br/>Detected change to be ``${{ steps.semver.outputs.bump }}``<br/>Bump version from ``${{ steps.semver.outputs.current }}`` to ``${{ steps.semver.outputs.next }}``" --base main --head dev --label automerge'
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
       - name: Discord notification
-        if: ${{ github.event.inputs.send-notifications }}
+        if: ${{ github.events.inputs.send-notifications }}
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
+        uses: Ilshidur/action-discord@master
         with:
           args: "Created a release PR ${{ steps.create-pull-request.outputs.url }} for version ${{ steps.semver.outputs.next }} (new behaviour: ${{ steps.semver.outputs.bump }})"
       - name: Obtain token
         id: obtainApprovalToken
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v2
         with:
           private-key: ${{ secrets.RENOVATE_APPROVE_PRIVATE_KEY }}
-          client-id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
+          app-id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
           permission-pull-requests: write
       - name: Approve PR
         env:
@@ -63,10 +62,10 @@ jobs:
           gh pr review --approve --body "Automatically approved by GitHub Action"
       - name: Obtain token
         id: obtainMergeToken
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v2
         with:
           private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
-          client-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
+          app-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
           permission-contents: write # write to main branch (due to merge)
           permission-pull-requests: write # merge pull request
       - id: automerge
@@ -75,7 +74,7 @@ jobs:
         uses: "pascalgn/automerge-action@v0.16.4"
         env:
           GITHUB_TOKEN: ${{ steps.obtainMergeToken.outputs.token }}
-          MERGE_METHOD: merge # we prefer merge commits for merging to main
+          MERGE_METHOD: merge # we prefer merge commits for merging to master
           MERGE_COMMIT_MESSAGE: "chore(release): automatic release ${{ steps.semver.outputs.next }}"
           MERGE_DELETE_BRANCH: false # never set to true!
           PULL_REQUEST: "${{ steps.create-pull-request.outputs.pr_number }}"
@@ -84,23 +83,23 @@ jobs:
           MERGE_REQUIRED_APPROVALS: 0 # do not require approvals
 
       - name: Merged Discord notification
-        if: ${{ steps.automerge.outputs.mergeResult == 'merged' && github.event.inputs.send-notifications }}
+        if: ${{ steps.automerge.outputs.mergeResult == 'merged' && github.events.inputs.send-notifications }}
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
+        uses: Ilshidur/action-discord@master
         with:
           args: "Merged PR ${{ steps.create-pull-request.outputs.url }} for release ${{ steps.semver.outputs.next }}"
       - name: Major Bump Discord notification
-        if: ${{ steps.semver.outputs.bump == 'major' && github.event.inputs.send-notifications }}
+        if: ${{ steps.semver.outputs.bump == 'major' && github.events.inputs.send-notifications }}
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
+        uses: Ilshidur/action-discord@master
         with:
           args: "The release PR must be manually merged because the next version is a major version: ${{ steps.create-pull-request.outputs.url }} for release ${{ steps.semver.outputs.next }}"
       - name: Discord Fail Notification
-        if: failure() && github.event.inputs.send-notifications
+        if: failure() && github.events.inputs.send-notifications
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
+        uses: Ilshidur/action-discord@master
         with:
           args: "The automatic release workflow [run ${{ github.run_number }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) has failed"

.github/workflows/on-release.yml

@@ -12,10 +12,10 @@ jobs:
     steps:
       - name: Obtain token
         id: obtainToken
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v2
         with:
           private-key: ${{ secrets.HOMARR_DOCS_RELEASE_APP_PRIVATE_KEY }}
-          client-id: ${{ vars.HOMARR_DOCS_RELEASE_APP_ID }}
+          app-id: ${{ vars.HOMARR_DOCS_RELEASE_APP_ID }}
           owner: homarr-labs
           repositories: |
             documentation
@@ -45,10 +45,10 @@ jobs:
     steps:
       - name: Obtain token
         id: obtainToken
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v2
         with:
           private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
-          client-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
+          app-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
           permission-contents: write # required to commit to branch
           permission-pull-requests: write # required to create pr & enable automerge
       - name: Checkout code

.github/workflows/skip-renovate-stability-days.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   skip-stability-days:
-    if: ${{ !startsWith(github.head_ref, 'renovate/') && github.event.pull_request.head.repo.full_name == github.repository }}
+    if: ${{ !startsWith(github.head_ref, 'renovate/') }}
     name: Skip Stability Days
     runs-on: ubuntu-latest
     timeout-minutes: 1

.github/workflows/update-contributors.yml

@@ -21,10 +21,10 @@ jobs:
     steps:
       - name: Obtain token
         id: obtainToken
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v2
         with:
           private-key: ${{ secrets.HOMARR_UPDATE_CONTRIBUTORS_PRIVATE_KEY }}
-          client-id: ${{ vars.HOMARR_UPDATE_CONTRIBUTORS_APP_ID }}
+          app-id: ${{ vars.HOMARR_UPDATE_CONTRIBUTORS_APP_ID }}
           permission-contents: write # required to commit to branch
           permission-pull-requests: write # required to create pr & enable automerge
 
@@ -33,7 +33,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
 
-      - uses: pnpm/action-setup@v6
+      - uses: pnpm/action-setup@v4
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v6
         with:

.github/workflows/update-integration-list.yml

@@ -21,10 +21,10 @@ jobs:
     steps:
       - name: Obtain token
         id: obtainToken
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v2
         with:
           private-key: ${{ secrets.HOMARR_UPDATE_CONTRIBUTORS_PRIVATE_KEY }}
-          client-id: ${{ vars.HOMARR_UPDATE_CONTRIBUTORS_APP_ID }}
+          app-id: ${{ vars.HOMARR_UPDATE_CONTRIBUTORS_APP_ID }}
           permission-contents: write # required to commit to branch
           permission-pull-requests: write # required to create pr & enable automerge
       - name: Checkout code

.gitignore

@@ -57,6 +57,7 @@ apps/tasks/tasks.cjs
 apps/tasks/tasks.css
 apps/websocket/wssServer.cjs
 apps/websocket/wssServer.css
+apps/nextjs/customServer.cjs
 apps/nextjs/.million/
 packages/cli/cli.cjs
 
@@ -66,8 +67,8 @@ e2e/shared/tmp
 #personal backgrounds
 apps/nextjs/public/images/background.png
 
+# next-intl
+en.d.json.ts
 
-
-# personal agent config
-AGENTS.md
-.opencode
+# Custom server build artifacts
+apps/nextjs/customServer.css

.mise.toml

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

.nvmrc

@@ -1 +1 @@
-24.16.0
+24.14.0

.oxfmtrc.json

@@ -1,7 +0,0 @@
-{
-  "$schema": "./node_modules/oxfmt/configuration_schema.json",
-  "printWidth": 120,
-  "endOfLine": "lf",
-  "sortPackageJson": true,
-  "ignorePatterns": ["**/*.cjs", "**/lang/**", "static-data/**", "CHANGELOG.md"]
-}

.oxlintrc.json

@@ -1,37 +0,0 @@
-{
-  "$schema": "./node_modules/oxlint/configuration_schema.json",
-  "plugins": ["eslint", "typescript", "unicorn", "oxc", "react", "import", "jsx-a11y"],
-  "categories": {
-    "correctness": "error",
-    "suspicious": "warn",
-    "pedantic": "off",
-    "perf": "off",
-    "style": "off",
-    "restriction": "off",
-    "nursery": "off"
-  },
-  "rules": {
-    "eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_", "varsIgnorePattern": "^_" }],
-    "typescript/consistent-type-imports": ["warn", { "prefer": "type-imports", "fixStyle": "separate-type-imports" }],
-    "typescript/no-non-null-assertion": "error",
-    "import/consistent-type-specifier-style": ["error", "prefer-top-level"],
-    "unicorn/no-new-array": "warn",
-    "unicorn/no-useless-spread": "warn",
-    "unicorn/no-useless-length-check": "warn",
-    "unicorn/no-useless-fallback-in-spread": "warn",
-    "jsx-a11y/prefer-tag-over-role": "warn",
-    "oxc/const-comparisons": "warn",
-    "react-hooks/exhaustive-deps": "warn",
-    "react/no-children-prop": "warn",
-    "jsx-a11y/no-autofocus": "warn",
-    "jsx-a11y/img-redundant-alt": "warn",
-    "react/react-in-jsx-scope": "off"
-  },
-  "options": {
-    "reportUnusedDisableDirectives": "off"
-  },
-  "ignorePatterns": ["**/*.config.js", "**/*.config.mjs", "**/*.cjs", "**/lang/*.d.json.ts", ".next/**"],
-  "settings": {
-    "react": { "version": "19" }
-  }
-}

.vscode/i18n-ally-custom-framework.yml

@@ -31,5 +31,6 @@ scopeRangeRegex: "(?:const|let|var)\\s+t\\s*=\\s*(?:await\\s+)?(?:getScopedI18n|
 # refactorTemplates:
 #  - i18n.get("$1")
 
+
 # If set to true, only enables this custom framework (will disable all built-in frameworks)
-monopoly: true
+monopoly: true

.vscode/launch.json

@@ -15,7 +15,9 @@
       "request": "launch",
       "command": "pnpm docker:dev",
       "cwd": "${workspaceFolder}",
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": [
+        "<node_internals>/**"
+      ]
     },
     {
       "name": "lint fix",
@@ -23,7 +25,9 @@
       "request": "launch",
       "command": "pnpm lint:fix",
       "cwd": "${workspaceFolder}",
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": [
+        "<node_internals>/**"
+      ]
     },
     {
       "name": "format fix",
@@ -31,7 +35,9 @@
       "request": "launch",
       "command": "pnpm format:fix",
       "cwd": "${workspaceFolder}",
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": [
+        "<node_internals>/**"
+      ]
     },
     {
       "name": "db push",
@@ -63,7 +69,9 @@
       "request": "launch",
       "command": "pnpm test",
       "cwd": "${workspaceFolder}",
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": [
+        "<node_internals>/**"
+      ]
     },
     {
       "name": "test ui",
@@ -71,7 +79,9 @@
       "request": "launch",
       "command": "pnpm test:ui",
       "cwd": "${workspaceFolder}",
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": [
+        "<node_internals>/**"
+      ]
     }
   ]
 }

.vscode/settings.json

@@ -1,6 +1,13 @@
 {
+  "eslint.workingDirectories": [
+    {
+      "mode": "auto"
+    }
+  ],
+  "eslint.experimental.useFlatConfig": true,
   "typescript.tsdk": "node_modules\\typescript\\lib",
   "js/ts.implicitProjectConfig.experimentalDecorators": true,
+  "prettier.configPath": "./tooling/prettier/index.mjs",
   "cSpell.words": [
     "ajnart",
     "cqmin",
@@ -27,7 +34,11 @@
   ],
   "i18n-ally.dirStructure": "auto",
   "i18n-ally.displayLanguage": "en",
-  "i18n-ally.enabledFrameworks": ["custom"],
-  "i18n-ally.localesPaths": ["packages/translation/src/lang"],
-  "i18n-ally.keystyle": "nested"
+  "i18n-ally.enabledFrameworks": [
+    "custom"
+  ],
+  "i18n-ally.localesPaths": [
+    "packages/translation/src/lang",
+  ],
+  "i18n-ally.keystyle": "nested",
 }

APPROACHES.md

@@ -0,0 +1,369 @@
+# Memory Optimization Approaches
+
+This document describes the approaches tried and considered for reducing the RAM footprint of Homarr's server processes.
+
+## Baseline Architecture (Before)
+
+Homarr runs **three separate Node.js processes**:
+
+| Process | Port | Purpose |
+|---|---|---|
+| `apps/nextjs` (Next.js) | 3000 | Web UI + API routes |
+| `apps/websocket` (WS server) | 3001 | tRPC WebSocket subscriptions |
+| `apps/tasks` (Tasks/Cron server) | 3002 | Cron job scheduling + management API |
+
+Each process loads its own V8 heap, duplicates shared dependencies (`@homarr/db`, `@homarr/auth`, etc.), and runs its own event loop.
+
+**Measured baseline (dev mode, idle):** ~2,954 MB total RSS
+
+---
+
+## Approach 1: Integrate WebSocket Server into Next.js Custom Server
+
+**Status:** ✅ Implemented
+
+Eliminates `apps/websocket` by handling WebSocket upgrades inside a [Next.js custom server](https://nextjs.org/docs/pages/guides/custom-server):
+
+```ts
+const app = next({ dev, hostname, port, dir });
+const upgradeHandler = app.getUpgradeHandler();
+
+server.on("upgrade", (req, socket, head) => {
+  if (req.url?.startsWith("/websockets")) {
+    wss.handleUpgrade(req, socket, head, (ws) => wss.emit("connection", ws, req));
+  } else {
+    upgradeHandler(req, socket, head); // HMR, etc.
+  }
+});
+```
+
+### PROs
+- Eliminates one V8 heap (~208 MB)
+- WebSocket runs on same port as HTTP (simpler networking/proxying)
+- Shared `@homarr/db` connection pool and module cache
+- `getUpgradeHandler()` properly delegates HMR to Next.js in dev mode
+
+### CONs
+- Custom server disables some Next.js optimizations (automatic static optimization still works with `output: "standalone"`)
+- WebSocket errors could affect the main server process
+- Slightly more complex startup code
+
+---
+
+## Approach 2: Integrate Tasks/Cron Server into Next.js Custom Server
+
+**Status:** ✅ Implemented (combined with Approach 1)
+
+Eliminates `apps/tasks` by running the Fastify tRPC cron API and job scheduler inside the same process:
+
+```ts
+async function startTasksServer() {
+  const tasksServer = fastify({ maxParamLength: 5000 });
+  tasksServer.register(fastifyTRPCPlugin, { ... });
+  await cleanupSessionsAsync();
+  await invalidateUpdateCheckerCacheAsync();
+  await jobGroup.initializeAsync();
+  await jobGroup.startAllAsync();
+  await tasksServer.listen({ port: CRON_JOB_API_PORT });
+  return tasksServer;
+}
+```
+
+### PROs
+- Eliminates another V8 heap (~328 MB)
+- Shared database connection pool across Next.js API routes and cron jobs
+- Single process to manage (simpler Docker, `run.sh`, monitoring)
+- Cron jobs can directly share in-memory state with the web server
+
+### CONs
+- A misbehaving cron job could affect web request latency
+- Fastify still binds to port 3002 for internal tRPC communication (minor overhead)
+- More dependencies in the custom server bundle
+
+---
+
+## Combined Result (Approaches 1 + 2)
+
+| Component | Separate (before) | Integrated (after) |
+|---|---|---|
+| WebSocket server | ~208 MB | — |
+| Tasks/Cron server | ~328 MB | — |
+| Next.js (incl. workers) | ~2,418 MB | — |
+| Custom Server (all-in-one) | — | ~2,007 MB |
+| **Total RSS** | **~2,954 MB** | **~2,007 MB** |
+| **Savings** | — | **~947 MB (~32%)** |
+
+---
+
+## Approach 3: Eliminate Fastify — Direct Function Calls for Cron API
+
+**Status:** 📋 Considered, not implemented
+
+Since the cron job API client (`cronJobApi`) is only used from Next.js API routes (same process now), we could replace the HTTP+tRPC client with direct function calls to `JobManager`:
+
+```ts
+// Before: HTTP call to localhost:3002/trpc
+await cronJobApi.trigger.mutate({ name: "myJob" });
+
+// After: direct call in same process
+await jobManager.triggerAsync("myJob");
+```
+
+### PROs
+- Eliminates Fastify dependency and port 3002 listener entirely
+- Zero network overhead for cron API calls
+- Simpler architecture (no internal HTTP, no API key needed)
+
+### CONs
+- Requires refactoring `packages/api/src/router/cron-jobs.ts` and `packages/cron-job-api`
+- Breaks the clean separation between Next.js API and tasks concerns
+- If the architecture ever splits back to separate processes, this would need to be reverted
+- API key authentication for cron operations would need a different mechanism
+
+---
+
+## Approach 4: Node.js `--max-old-space-size` Flag
+
+**Status:** 📋 Considered, available as user override
+
+Setting `NODE_OPTIONS=--max-old-space-size=N` limits V8 heap growth and forces more aggressive garbage collection.
+
+```dockerfile
+# Example: limit heap to 512 MB
+ENV NODE_OPTIONS="--max-old-space-size=512"
+```
+
+### PROs
+- Can reduce peak memory usage in constrained environments
+- Easy to configure via environment variable
+- No code changes required
+
+### CONs
+- Too low a value causes OOM crashes under load
+- Doesn't reduce actual memory *needed*, just forces earlier GC
+- Default Node.js behavior (~1.7 GB limit on 64-bit) is reasonable for most deployments
+- Different deployments have different memory constraints — no single good default
+
+**Recommendation:** Don't set a default in the Dockerfile. Document as a tuning option for users running on low-memory hosts (e.g., `docker run -e NODE_OPTIONS="--max-old-space-size=512"`).
+
+---
+
+## Approach 5: Next.js `output: "standalone"` (Already in Use)
+
+**Status:** ✅ Already configured
+
+The `next.config.ts` already uses `output: "standalone"`, which:
+- Traces only the files needed for production
+- Creates a minimal `.next/standalone` directory
+- Avoids shipping full `node_modules`
+
+This is already optimized and no further action needed.
+
+---
+
+## Approach 6: Shared Redis Connection Pooling
+
+**Status:** 📋 Considered, not implemented
+
+With all services in one process, Redis connection pools could be shared. Currently, each module may create its own Redis client instance.
+
+### PROs
+- Fewer open connections to Redis
+- Slightly less memory for connection buffers
+
+### CONs
+- Marginal memory savings (Redis connections are lightweight)
+- Requires auditing all Redis usage across packages
+- Risk of connection contention under high load
+
+---
+
+## Summary of Recommendations
+
+| Approach | Impact | Effort | Status |
+|---|---|---|---|
+| 1. Integrate WS server | ~208 MB saved | Low | ✅ Done |
+| 2. Integrate Tasks server | ~328 MB saved | Medium | ✅ Done |
+| 3. Eliminate Fastify | ~10-30 MB saved | High | 📋 Future |
+| 4. `--max-old-space-size` | Configurable | None | 📋 User option |
+| 5. Standalone output | Already optimal | None | ✅ Already done |
+| 6. Shared Redis pools | ~5-10 MB saved | Medium | 📋 Future |
+| 7. Redis-backed initial query data | Faster page loads | Medium | 📋 POC documented |
+| 8. Client-side rendering with ISR shell | Faster TTFB | High | 📋 POC documented |
+
+---
+
+## Approach 7: Redis-Backed TanStack Query Initial Data
+
+**Status:** 📋 POC documented
+
+### Problem
+
+Currently, the dashboard page (`/`) is fully server-rendered on every request:
+
+1. Server calls `api.board.getHomeBoard()` (database query)
+2. Server prefetches all widget data via `prefetchForKindAsync()` (multiple database/integration queries)
+3. Server renders the full React tree with hydration boundary
+4. Client hydrates and takes over
+
+Each page load triggers a cascade: **Client → Next.js Server → tRPC → Database → Back**. For data that doesn't change often (board layout, widget configurations), this is wasteful.
+
+### Approach
+
+Use Redis as a shared cache layer between cron jobs and page loads. Cron jobs already populate Redis with integration data. The idea is to:
+
+1. **Cron jobs write to Redis** (already happening via `createItemAndIntegrationChannel`)
+2. **Server reads from Redis first** instead of hitting the database for widget data
+3. **Pass Redis data as `initialData`** to TanStack Query on the client
+4. **Client-side queries take over** with stale-while-revalidate behavior
+
+```tsx
+// POC: In _creator.tsx, read from Redis cache first for widget prefetching
+import { createItemAndIntegrationChannel } from "@homarr/redis";
+
+// Instead of always calling the database:
+const cachedData = await redisChannel.getAsync();
+if (cachedData) {
+  // Use cached data as initial query data - skip the database call
+  queryClient.setQueryData(queryKey, cachedData.data);
+} else {
+  // Fall back to normal prefetch
+  await prefetchForKindAsync(kind, queryClient, items);
+}
+```
+
+On the client side, TanStack Query's `initialData` option lets us hydrate from cache:
+
+```tsx
+// Client component using cached initial data
+const { data } = useQuery({
+  queryKey: ["widget", widgetId],
+  queryFn: () => fetchWidgetData(widgetId),
+  initialData: cachedWidgetData, // From Redis via server props
+  staleTime: 30_000, // Consider fresh for 30s
+});
+```
+
+### How TanStack Query Initial Data Works
+
+From the [TanStack Query docs](https://tanstack.com/query/v5/docs/framework/react/guides/initial-query-data):
+
+- `initialData` pre-populates the query cache before the component mounts
+- The query still revalidates in the background (stale-while-revalidate)
+- Combined with `staleTime`, the query won't refetch until the data is considered stale
+- This means the page renders instantly with cached data, then silently updates
+
+### PROs
+- **Faster page loads**: Redis reads are ~1ms vs ~50-200ms for database queries with joins
+- **Reduced database load**: Most page views hit Redis instead of SQLite/MySQL/PostgreSQL
+- **Leverages existing infrastructure**: Cron jobs already write widget data to Redis channels
+- **Graceful degradation**: Falls back to normal database queries on cache miss
+- **Non-breaking**: Can be adopted incrementally per widget type
+- **Shared across users**: Non-personal data (board layout, widget data) is the same for all users viewing the same board
+
+### CONs
+- **Cache staleness**: Data may be up to one cron interval old (typically 1-5 minutes)
+- **Cache invalidation complexity**: Need to invalidate Redis when boards are edited
+- **Memory usage**: More data stored in Redis (marginal since it's already stored for pub/sub)
+- **Serialization overhead**: superjson parse/stringify on every cache read
+- **Testing complexity**: Need to test cache hit/miss/stale scenarios
+
+### Estimated Impact
+
+| Metric | Before | After (cache hit) | Improvement |
+|---|---|---|---|
+| Dashboard TTFB | ~200-500ms | ~50-100ms | 2-5x faster |
+| Database queries per page load | 5-20 (depending on widgets) | 0-2 (board + auth only) | ~90% reduction |
+| Redis reads per page load | 0 | 5-20 | Acceptable (~1ms each) |
+
+### Implementation Path
+
+1. Create a `createBoardCacheChannel(boardId)` in `@homarr/redis`
+2. Populate it when boards are saved and when cron jobs update widget data
+3. In `_creator.tsx`, check cache before `prefetchForKindAsync()`
+4. Set `staleTime` to match cron interval for each widget type
+5. Add cache invalidation when boards are edited (`board.saveBoard` mutation)
+
+---
+
+## Approach 8: Client-Side Rendering with ISR Static Shell
+
+**Status:** 📋 POC documented (not recommended for Homarr's use case)
+
+### Concept
+
+Instead of server-rendering the entire dashboard on each request, serve a **static HTML shell** via Next.js ISR (Incremental Static Regeneration) and let the client fetch all dynamic content via TanStack Query.
+
+```tsx
+// Hypothetical ISR dashboard page
+export const revalidate = 60; // Regenerate every 60 seconds
+
+export default function DashboardPage() {
+  // Return a static shell - no server-side data fetching
+  return (
+    <DashboardShell>
+      <Suspense fallback={<BoardSkeleton />}>
+        <ClientBoard /> {/* Fetches via useQuery on mount */}
+      </Suspense>
+    </DashboardShell>
+  );
+}
+```
+
+The client component would then fetch everything:
+
+```tsx
+"use client";
+
+function ClientBoard() {
+  const { data: board, isLoading } = clientApi.board.getHomeBoard.useQuery(undefined, {
+    initialData: undefined, // Could be populated from Redis via API route
+  });
+
+  if (isLoading) return <BoardSkeleton />;
+  return <BoardContent board={board} />;
+}
+```
+
+### How Next.js ISR Works
+
+- On first request, Next.js generates the page and caches it
+- Subsequent requests serve the cached HTML instantly (TTFB ~0ms for CDN)
+- After `revalidate` seconds, the next request triggers background regeneration
+- The stale page is served until the new one is ready (stale-while-revalidate)
+
+### PROs
+- **Near-instant TTFB**: Static HTML served from disk/CDN cache
+- **Reduced server CPU**: No React SSR on every request
+- **Scalable**: Static pages can be served by any CDN or reverse proxy
+- **Good for public boards**: Shared boards viewed by many users benefit most
+
+### CONs
+- **Layout shift (CLS)**: Dashboard appears empty then fills in — bad UX for dashboards
+- **No SSR for SEO**: Not relevant for Homarr (it's a private dashboard app)
+- **Slower perceived load**: Users see a skeleton for 200-500ms while queries run
+- **Authentication complexity**: ISR pages must be the same for all users. Homarr's dashboard is user-specific (permissions, board access), making ISR caching ineffective for the page itself
+- **Breaks existing hydration pattern**: The current `HydrationBoundary` + `dehydrate()` pattern works well and ensures no layout shift
+- **WebSocket subscriptions delayed**: Real-time updates don't start until client JS loads and connects
+
+### Benchmark Comparison (Theoretical)
+
+| Metric | Current (SSR) | Approach 7 (Redis initial data) | Approach 8 (ISR + CSR) |
+|---|---|---|---|
+| TTFB | 200-500ms | 50-100ms | ~10ms (static) |
+| Time to Interactive | 200-500ms | 50-100ms | 200-500ms (same) |
+| Largest Contentful Paint | 200-500ms | 50-100ms | 400-800ms (worse) |
+| Cumulative Layout Shift | ~0 | ~0 | 0.1-0.3 (worse) |
+| Server CPU per request | High | Low | Near zero |
+
+### Recommendation
+
+**Approach 7 (Redis-backed initial data) is recommended over Approach 8 (ISR)** for Homarr because:
+
+1. **Dashboards are personalized**: Board access depends on user permissions, making ISR page-level caching ineffective
+2. **No layout shift**: Users expect the dashboard to appear fully rendered
+3. **Existing infrastructure**: Redis + cron jobs already provide the cache layer needed
+4. **Incremental adoption**: Can be applied per-widget without changing the overall rendering strategy
+5. **ISR is designed for content sites**: Blog posts, documentation pages, product pages — not interactive dashboards with real-time WebSocket subscriptions
+
+ISR could still be useful for specific Homarr pages like `/manage/about` or documentation pages that don't depend on user state, but the main dashboard is not a good candidate.

CODEOWNERS

@@ -3,11 +3,7 @@
 
 # Exempt Renovate‑managed files (no owners)
 package.json
-**/package.json
 package-lock.json
-**/package-lock.json
 pnpm-lock.yaml
-**/pnpm-lock.yaml
-pnpm-workspace.yaml
 Dockerfile
 docker-compose.yml

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:24.16.0-alpine AS base
+FROM node:24.14.0-alpine AS base
 
 FROM base AS builder
 RUN apk add --no-cache libc6-compat
@@ -43,6 +43,7 @@ RUN mkdir -p /var/cache/nginx && \
 COPY --from=builder /app/apps/nextjs/next.config.ts .
 COPY --from=builder /app/apps/nextjs/package.json .
 
+COPY --from=builder /app/apps/nextjs/customServer.cjs ./apps/nextjs/customServer.cjs
 COPY --from=builder /app/node_modules/better-sqlite3/build/Release/better_sqlite3.node /app/build/better_sqlite3.node
 
 COPY --from=builder /app/packages/db/migrations ./db/migrations

apps/nextjs/eslint.config.js

@@ -0,0 +1,13 @@
+import baseConfig from "@homarr/eslint-config/base";
+import nextjsConfig from "@homarr/eslint-config/nextjs";
+import reactConfig from "@homarr/eslint-config/react";
+
+/** @type {import('typescript-eslint').Config} */
+export default [
+  {
+    ignores: [".next/**"],
+  },
+  ...baseConfig,
+  ...reactConfig,
+  ...nextjsConfig,
+];

apps/nextjs/next.config.ts

@@ -5,30 +5,19 @@ import "@homarr/common/env";
 import "@homarr/core/infrastructure/logs/env";
 import "@homarr/docker/env";
 
-import { readFileSync } from "fs";
-
 import type { NextConfig } from "next";
+import MillionLint from "@million/lint";
 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,12 +28,10 @@ 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,
-    preloadEntriesOnStart: false,
-    webpackMemoryOptimizations: true,
   },
   transpilePackages: ["@homarr/ui", "@homarr/notifications", "@homarr/modals", "@homarr/spotlight", "@homarr/widgets"],
   images: {
@@ -55,18 +42,9 @@ const nextConfig: NextConfig = {
       },
     ],
   },
-  // skipcq: JS-0116
   // eslint-disable-next-line @typescript-eslint/require-await,no-restricted-syntax
   async headers() {
     return [
-      {
-        source: "/sw.js",
-        headers: [
-          { key: "Content-Type", value: "application/javascript; charset=utf-8" },
-          { key: "Cache-Control", value: "no-cache, no-store, must-revalidate" },
-          { key: "Content-Security-Policy", value: "default-src 'self'; script-src 'self'" },
-        ],
-      },
       {
         source: "/(.*)", // Apply CSP to all routes
         headers: [
@@ -96,4 +74,8 @@ const nextConfig: NextConfig = {
   },
 };
 
+// Skip transform is used because of webpack loader, without it for example 'Tooltip.Floating' will not work and show an error
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const withMillionLint = MillionLint.next({ rsc: true, skipTransform: true, telemetry: false });
+
 export default withNextIntl(nextConfig);

apps/nextjs/package.json

@@ -4,34 +4,38 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "build": "pnpm with-env next build",
+    "build": "pnpm with-env next build && pnpm build:custom-server",
+    "build:custom-server": "esbuild server.ts --bundle --platform=node --outfile=customServer.cjs --external:next --external:fastify --external:bcrypt --external:@opentelemetry/api --external:deasync --external:cpu-features --loader:.html=text --loader:.scss=text --loader:.node=text",
     "clean": "git clean -xdf .next .turbo node_modules",
-    "dev": "pnpm with-env next dev",
-    "format": "oxfmt .",
-    "lint": "oxlint",
-    "start": "pnpm with-env next start",
+    "dev": "pnpm with-env tsx ./server.ts",
+    "format": "prettier --check . --ignore-path ../../.gitignore",
+    "lint": "eslint",
+    "start": "pnpm with-env node customServer.cjs",
     "typecheck": "tsc --noEmit",
     "with-env": "dotenv -e ../../.env --"
   },
+  "prettier": "@homarr/prettier-config",
   "dependencies": {
-    "@dnd-kit/core": "catalog:",
-    "@dnd-kit/modifiers": "catalog:",
-    "@dnd-kit/sortable": "catalog:",
-    "@dnd-kit/utilities": "catalog:",
-    "@gfazioli/mantine-onboarding-tour": "catalog:",
+    "@dnd-kit/core": "^6.3.1",
+    "@dnd-kit/modifiers": "^9.0.0",
+    "@dnd-kit/sortable": "^10.0.0",
+    "@dnd-kit/utilities": "^3.2.2",
     "@homarr/analytics": "workspace:^0.1.0",
     "@homarr/api": "workspace:^0.1.0",
     "@homarr/auth": "workspace:^0.1.0",
     "@homarr/boards": "workspace:^0.1.0",
     "@homarr/common": "workspace:^0.1.0",
     "@homarr/core": "workspace:^0.1.0",
+    "@homarr/cron-job-api": "workspace:^0.1.0",
     "@homarr/cron-job-status": "workspace:^0.1.0",
+    "@homarr/cron-jobs": "workspace:^0.1.0",
+    "@homarr/cron-jobs-core": "workspace:^0.1.0",
     "@homarr/db": "workspace:^0.1.0",
     "@homarr/definitions": "workspace:^0.1.0",
     "@homarr/docker": "workspace:^0.1.0",
     "@homarr/form": "workspace:^0.1.0",
     "@homarr/forms-collection": "workspace:^0.1.0",
-    "@homarr/gridstack": "catalog:",
+    "@homarr/gridstack": "^1.12.0",
     "@homarr/icons": "workspace:^0.1.0",
     "@homarr/image-proxy": "workspace:^0.1.0",
     "@homarr/integrations": "workspace:^0.1.0",
@@ -40,79 +44,76 @@
     "@homarr/notifications": "workspace:^0.1.0",
     "@homarr/old-import": "workspace:^0.1.0",
     "@homarr/old-schema": "workspace:^0.1.0",
+    "@homarr/ping": "workspace:^0.1.0",
     "@homarr/redis": "workspace:^0.1.0",
+    "@homarr/request-handler": "workspace:^0.1.0",
     "@homarr/server-settings": "workspace:^0.1.0",
     "@homarr/settings": "workspace:^0.1.0",
     "@homarr/spotlight": "workspace:^0.1.0",
-    "@homarr/tasks": "workspace:^0.1.0",
     "@homarr/translation": "workspace:^0.1.0",
     "@homarr/ui": "workspace:^0.1.0",
     "@homarr/validation": "workspace:^0.1.0",
-    "@homarr/websocket": "workspace:^0.1.0",
     "@homarr/widgets": "workspace:^0.1.0",
-    "@mantine/colors-generator": "catalog:",
-    "@mantine/core": "catalog:",
-    "@mantine/dropzone": "catalog:",
-    "@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:",
-    "@trpc/client": "catalog:",
-    "@trpc/next": "catalog:",
-    "@trpc/react-query": "catalog:",
-    "@trpc/server": "catalog:",
-    "@xterm/addon-canvas": "catalog:",
-    "@xterm/addon-fit": "catalog:",
-    "@xterm/xterm": "catalog:",
-    "babel-plugin-react-compiler": "catalog:",
-    "chroma-js": "catalog:",
-    "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:",
-    "react": "catalog:",
-    "react-dom": "catalog:",
-    "react-error-boundary": "catalog:",
-    "react-simple-code-editor": "catalog:",
-    "sass": "catalog:",
-    "sql.js": "catalog:",
-    "superjson": "catalog:",
-    "trpc-to-mcp": "catalog:",
-    "use-deep-compare-effect": "catalog:",
-    "yaml": "catalog:",
-    "zod": "catalog:"
+    "@mantine/colors-generator": "^8.3.16",
+    "@mantine/core": "^8.3.16",
+    "@mantine/dropzone": "^8.3.16",
+    "@mantine/hooks": "^8.3.16",
+    "@mantine/modals": "^8.3.16",
+    "@mantine/tiptap": "^8.3.16",
+    "@million/lint": "1.0.14",
+    "@tabler/icons-react": "^3.40.0",
+    "@tanstack/react-query": "^5.90.21",
+    "@tanstack/react-query-devtools": "^5.91.3",
+    "@tanstack/react-query-next-experimental": "^5.91.0",
+    "@trpc/client": "^11.12.0",
+    "@trpc/next": "^11.12.0",
+    "@trpc/react-query": "^11.12.0",
+    "@trpc/server": "^11.12.0",
+    "@xterm/addon-canvas": "^0.7.0",
+    "@xterm/addon-fit": "0.11.0",
+    "@xterm/xterm": "^6.0.0",
+    "babel-plugin-react-compiler": "^1.0.0",
+    "chroma-js": "^3.2.0",
+    "clsx": "^2.1.1",
+    "dayjs": "^1.11.19",
+    "dotenv": "^17.3.1",
+    "fastify": "^5.7.4",
+    "flag-icons": "^7.5.0",
+    "glob": "^13.0.6",
+    "isomorphic-dompurify": "^3.1.0",
+    "jotai": "^2.18.1",
+    "mantine-react-table": "2.0.0-beta.9",
+    "next": "16.1.6",
+    "postcss-preset-mantine": "^1.18.0",
+    "prismjs": "^1.30.0",
+    "react": "19.2.4",
+    "react-dom": "19.2.4",
+    "react-error-boundary": "^6.1.1",
+    "react-simple-code-editor": "^0.14.1",
+    "sass": "^1.97.3",
+    "superjson": "2.2.6",
+    "swagger-ui-react": "^5.32.0",
+    "use-deep-compare-effect": "^1.8.1",
+    "ws": "^8.19.0",
+    "zod": "^4.2.1"
   },
   "devDependencies": {
+    "@homarr/eslint-config": "workspace:^0.2.0",
+    "@homarr/prettier-config": "workspace:^0.1.0",
     "@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:",
-    "concurrently": "catalog:",
-    "node-loader": "catalog:",
-    "typescript": "catalog:"
+    "@types/chroma-js": "3.1.2",
+    "@types/node": "^24.12.0",
+    "@types/prismjs": "^1.26.6",
+    "@types/react": "19.2.14",
+    "@types/react-dom": "19.2.3",
+    "@types/swagger-ui-react": "^5.18.0",
+    "@types/ws": "^8.18.1",
+    "concurrently": "^9.2.1",
+    "esbuild": "^0.27.3",
+    "eslint": "^9.39.4",
+    "node-loader": "^2.1.0",
+    "prettier": "^3.8.1",
+    "tsx": "4.20.4",
+    "typescript": "^5.9.3"
   }
 }

apps/nextjs/public/sw.js

@@ -1,7 +0,0 @@
-self.addEventListener("install", () => {
-  self.skipWaiting();
-});
-
-self.addEventListener("activate", (event) => {
-  event.waitUntil(self.clients.claim());
-});

apps/nextjs/server.ts

@@ -0,0 +1,318 @@
+// Must be imported first to set up globalThis.AsyncLocalStorage for Next.js
+import "next/dist/server/node-environment-baseline";
+
+// Set up undici HTTP agent override (from tasks app)
+import { setGlobalDispatcher } from "undici";
+import { UndiciHttpAgent } from "@homarr/core/infrastructure/http";
+setGlobalDispatcher(new UndiciHttpAgent());
+
+import { createServer } from "http";
+import path from "path";
+import next from "next";
+import { parse } from "url";
+import { applyWSSHandler } from "@trpc/server/adapters/ws";
+import { WebSocketServer } from "ws";
+import type { FastifyTRPCPluginOptions } from "@trpc/server/adapters/fastify";
+import { fastifyTRPCPlugin } from "@trpc/server/adapters/fastify";
+import fastify from "fastify";
+
+import { appRouter, createTRPCContext } from "@homarr/api/websocket";
+import { getSessionFromToken, sessionTokenCookieName } from "@homarr/auth";
+import { env as authEnv } from "@homarr/auth/env";
+import { parseCookies } from "@homarr/common";
+import { createLogger } from "@homarr/core/infrastructure/logs";
+import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
+import type { JobRouter } from "@homarr/cron-job-api";
+import { jobRouter } from "@homarr/cron-job-api";
+import { CRON_JOB_API_KEY_HEADER, CRON_JOB_API_PATH, CRON_JOB_API_PORT } from "@homarr/cron-job-api/constants";
+import { jobGroup } from "@homarr/cron-jobs";
+import { db, eq, inArray } from "@homarr/db";
+import { cronJobConfigurations, sessions, users } from "@homarr/db/schema";
+import { supportedAuthProviders } from "@homarr/definitions";
+import { updateCheckerRequestHandler } from "@homarr/request-handler/update-checker";
+import { schedule, validate as validateCron } from "node-cron";
+
+const logger = createLogger({ module: "customServer" });
+
+// --- JobManager (from apps/tasks/src/job-manager.ts) ---
+import type { IJobManager } from "@homarr/cron-job-api";
+import type { jobGroup as CronJobGroup, JobGroupKeys } from "@homarr/cron-jobs";
+import type { Database, InferInsertModel } from "@homarr/db";
+
+class JobManager implements IJobManager {
+  constructor(
+    private db: Database,
+    private jobGroup: typeof CronJobGroup,
+  ) {}
+
+  public async startAsync(name: JobGroupKeys): Promise<void> {
+    await this.jobGroup.startAsync(name);
+  }
+  public async triggerAsync(name: JobGroupKeys): Promise<void> {
+    await this.jobGroup.runManuallyAsync(name);
+  }
+  public async stopAsync(name: JobGroupKeys): Promise<void> {
+    await this.jobGroup.stopAsync(name);
+  }
+  public async updateIntervalAsync(name: JobGroupKeys, cron: string): Promise<void> {
+    logger.info("Updating cron job interval", { name, expression: cron });
+    const job = this.jobGroup.getJobRegistry().get(name);
+    if (!job) throw new Error(`Job ${name} not found`);
+    if (!validateCron(cron)) {
+      throw new Error(`Invalid cron expression: ${cron}`);
+    }
+    if (job.preventCustomInterval && cron !== job.cronExpression) {
+      throw new Error(`Custom cron expressions are not allowed for job ${name}`);
+    }
+
+    await this.updateConfigurationAsync(name, { cronExpression: cron });
+    await this.jobGroup.getTask(name)?.destroy();
+
+    this.jobGroup.setTask(
+      name,
+      schedule(cron, () => void job.executeAsync(), {
+        name,
+      }),
+    );
+    logger.info("Cron job interval updated", { name, expression: cron });
+  }
+  public async disableAsync(name: JobGroupKeys): Promise<void> {
+    logger.info("Disabling cron job", { name });
+    const job = this.jobGroup.getJobRegistry().get(name);
+    if (!job) throw new Error(`Job ${name} not found`);
+
+    await this.updateConfigurationAsync(name, { isEnabled: false });
+    await this.jobGroup.stopAsync(name);
+    logger.info("Cron job disabled", { name });
+  }
+  public async enableAsync(name: JobGroupKeys): Promise<void> {
+    logger.info("Enabling cron job", { name });
+    await this.updateConfigurationAsync(name, { isEnabled: true });
+    await this.jobGroup.startAsync(name);
+    logger.info("Cron job enabled", { name });
+  }
+
+  private async updateConfigurationAsync(
+    name: JobGroupKeys,
+    configuration: Omit<Partial<InferInsertModel<typeof cronJobConfigurations>>, "name">,
+  ) {
+    const existingConfig = await this.db.query.cronJobConfigurations.findFirst({
+      where: (table, { eq }) => eq(table.name, name),
+    });
+
+    if (existingConfig) {
+      await this.db
+        .update(cronJobConfigurations)
+        .set({ ...configuration, name: undefined })
+        .where(eq(cronJobConfigurations.name, name));
+      return;
+    }
+
+    const job = this.jobGroup.getJobRegistry().get(name);
+    if (!job) throw new Error(`Job ${name} not found`);
+
+    await this.db.insert(cronJobConfigurations).values({
+      name,
+      cronExpression: configuration.cronExpression ?? job.cronExpression,
+      isEnabled: configuration.isEnabled ?? true,
+    });
+  }
+
+  public async getAllAsync(): Promise<
+    {
+      name: JobGroupKeys;
+      cron: string;
+      preventManualExecution: boolean;
+      preventCustomInterval: boolean;
+      isEnabled: boolean;
+    }[]
+  > {
+    const configurations = await this.db.query.cronJobConfigurations.findMany();
+
+    return [...this.jobGroup.getJobRegistry().entries()].map(([name, job]) => {
+      const config = configurations.find((config) => config.name === name);
+      return {
+        name,
+        cron: config?.cronExpression ?? job.cronExpression,
+        preventManualExecution: job.preventManualExecution,
+        preventCustomInterval: job.preventCustomInterval,
+        isEnabled: config?.isEnabled ?? true,
+      };
+    });
+  }
+}
+
+// --- On-start functions (from apps/tasks/src/on-start/) ---
+async function cleanupSessionsAsync() {
+  try {
+    const currentAuthProviders = authEnv.AUTH_PROVIDERS;
+    const inactiveAuthProviders = supportedAuthProviders.filter((provider) => !currentAuthProviders.includes(provider));
+    const subQuery = db
+      .select({ id: users.id })
+      .from(users)
+      .where(inArray(users.provider, inactiveAuthProviders))
+      .as("sq");
+    const sessionsWithInactiveProviders = await db
+      .select({ userId: sessions.userId })
+      .from(sessions)
+      .rightJoin(subQuery, eq(sessions.userId, subQuery.id));
+
+    const userIds = sessionsWithInactiveProviders.map(({ userId }) => userId).filter((value) => value !== null);
+    await db.delete(sessions).where(inArray(sessions.userId, userIds));
+
+    if (sessionsWithInactiveProviders.length > 0) {
+      logger.info("Deleted sessions for inactive providers", { count: userIds.length });
+    }
+  } catch (error) {
+    logger.error(new Error("Failed to clean up sessions", { cause: error }));
+  }
+}
+
+async function invalidateUpdateCheckerCacheAsync() {
+  try {
+    const handler = updateCheckerRequestHandler.handler({});
+    await handler.invalidateAsync();
+    logger.debug("Update checker cache invalidated");
+  } catch (error) {
+    logger.error(new Error("Failed to invalidate update checker cache", { cause: error }));
+  }
+}
+
+// --- Tasks/Cron Fastify server setup ---
+async function startTasksServer() {
+  const tasksLogger = createLogger({ module: "tasksMain" });
+
+  const tasksServer = fastify({ maxParamLength: 5000 });
+  tasksServer.register(fastifyTRPCPlugin, {
+    prefix: CRON_JOB_API_PATH,
+    trpcOptions: {
+      router: jobRouter,
+      createContext: ({ req }) => ({
+        manager: new JobManager(db, jobGroup),
+        apiKey: req.headers[CRON_JOB_API_KEY_HEADER] as string | undefined,
+      }),
+      onError({ path, error }) {
+        tasksLogger.error(new ErrorWithMetadata("Error in tasks tRPC handler", { path }, { cause: error }));
+      },
+    } satisfies FastifyTRPCPluginOptions<JobRouter>["trpcOptions"],
+  });
+
+  // Run on-start tasks
+  await cleanupSessionsAsync();
+  await invalidateUpdateCheckerCacheAsync();
+
+  // Initialize and start cron jobs
+  await jobGroup.initializeAsync();
+  await jobGroup.startAllAsync();
+
+  try {
+    await tasksServer.listen({ port: CRON_JOB_API_PORT });
+    tasksLogger.info("Tasks web server started successfully", { port: CRON_JOB_API_PORT });
+  } catch (err) {
+    tasksLogger.error(
+      new ErrorWithMetadata("Failed to start tasks web server", { port: CRON_JOB_API_PORT }, { cause: err }),
+    );
+  }
+
+  return tasksServer;
+}
+
+// --- Main server setup ---
+const dev = process.env.NODE_ENV !== "production";
+const hostname = process.env.HOSTNAME || "localhost";
+const port = parseInt(process.env.PORT || "3000", 10);
+// Resolve the directory of this file so Next.js can find the app/pages dirs
+const dir = path.resolve(__dirname);
+
+const app = next({ dev, hostname, port, dir });
+const handle = app.getRequestHandler();
+const upgradeHandler = app.getUpgradeHandler();
+
+app.prepare().then(async () => {
+  const server = createServer((req, res) => {
+    const parsedUrl = parse(req.url!, true);
+    handle(req, res, parsedUrl);
+  });
+
+  // Create WebSocket server in noServer mode so we handle upgrade manually
+  const wss = new WebSocketServer({ noServer: true });
+
+  const wssHandler = applyWSSHandler({
+    wss,
+    router: appRouter,
+    // eslint-disable-next-line no-restricted-syntax
+    createContext: async ({ req }) => {
+      try {
+        const headers = Object.entries(req.headers).map(
+          ([key, value]) => [key, typeof value === "string" ? value : value?.[0]] as [string, string],
+        );
+        const nextHeaders = new Headers(headers);
+
+        const store = parseCookies(nextHeaders.get("cookie") ?? "");
+        const sessionToken = store[sessionTokenCookieName];
+
+        const session = await getSessionFromToken(db, sessionToken);
+
+        return createTRPCContext({
+          headers: nextHeaders,
+          session,
+        });
+      } catch (error) {
+        logger.error(error);
+        return createTRPCContext({
+          headers: new Headers(),
+          session: null,
+        });
+      }
+    },
+    keepAlive: {
+      enabled: true,
+      pingMs: 30000,
+      pongWaitMs: 5000,
+    },
+  });
+
+  // Handle upgrade requests: route /websockets to our WS server,
+  // delegate everything else (e.g. HMR _next/webpack-hmr) to Next.js
+  server.on("upgrade", (req, socket, head) => {
+    if (req.url?.startsWith("/websockets")) {
+      wss.handleUpgrade(req, socket, head, (ws) => {
+        wss.emit("connection", ws, req);
+      });
+    } else {
+      upgradeHandler(req, socket, head);
+    }
+  });
+
+  wss.on("connection", (websocket, incomingMessage) => {
+    logger.info(`➕ Connection (${wss.clients.size}) ${incomingMessage.method} ${incomingMessage.url}`);
+    websocket.once("close", (code, reason) => {
+      logger.info(`➖ Connection (${wss.clients.size}) ${code} ${reason.toString()}`);
+    });
+  });
+
+  // Start the integrated tasks/cron server
+  const tasksServer = await startTasksServer();
+
+  server.once("error", (err) => {
+    logger.error(new ErrorWithMetadata("Server error", {}, { cause: err }));
+    wssHandler.broadcastReconnectNotification();
+    wss.close();
+    tasksServer.close().catch((closeError) => logger.error("Failed to close tasks server", closeError));
+    server.close(() => process.exit(1));
+  });
+
+  server.listen(port, () => {
+    logger.info(`✅ Custom server ready on http://${hostname}:${port}`);
+    logger.info(`✅ WebSocket Server integrated on ws://${hostname}:${port}/websockets`);
+    logger.info(`✅ Tasks/Cron server integrated on port ${CRON_JOB_API_PORT}`);
+  });
+
+  process.on("SIGTERM", () => {
+    logger.info("SIGTERM");
+    wssHandler.broadcastReconnectNotification();
+    wss.close();
+    tasksServer.close().catch((closeError) => logger.error("Failed to close tasks server", closeError));
+    server.close();
+  });
+});

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,27 +2,29 @@
 
 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 type { ColorScheme } from "@homarr/definitions";
 import { colorSchemeCookieKey } from "@homarr/definitions";
-import { theme } from "@homarr/ui";
 
 export const CustomMantineProvider = ({
   children,
   defaultColorScheme,
-}: PropsWithChildren<{ defaultColorScheme: MantineColorScheme }>) => {
+}: PropsWithChildren<{ defaultColorScheme: ColorScheme }>) => {
   const manager = useColorSchemeManager();
   return (
     <DirectionProvider>
       <MantineProvider
         defaultColorScheme={defaultColorScheme}
         colorSchemeManager={manager}
-        theme={theme}
-        cssVariablesResolver={v8CssVariablesResolver}
+        theme={createTheme({
+          primaryColor: "red",
+          autoContrast: true,
+        })}
       >
         {children}
       </MantineProvider>
@@ -33,7 +35,7 @@ export const CustomMantineProvider = ({
 export function useColorSchemeManager(): MantineColorSchemeManager {
   const { data: session } = useSession();
 
-  const updateCookieValue = (value: MantineColorScheme) => {
+  const updateCookieValue = (value: Exclude<MantineColorScheme, "auto">) => {
     setClientCookie(colorSchemeCookieKey, value, { expires: dayjs().add(1, "year").toDate(), path: "/" });
   };
 
@@ -58,6 +60,7 @@ export function useColorSchemeManager(): MantineColorSchemeManager {
     },
 
     set: (value) => {
+      if (value === "auto") return;
       try {
         if (session) {
           mutateColorScheme({ colorScheme: value });

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
@@ -38,13 +32,12 @@ const getWebSocketProtocol = () => {
 };
 
 const constructWebsocketUrl = () => {
-  const fallback = `${getWebSocketProtocol()}://localhost:3001/websockets`;
   if (typeof window === "undefined") {
-    return fallback;
+    return `${getWebSocketProtocol()}://localhost:3000/websockets`;
   }
 
   if (env.NODE_ENV === "development") {
-    return fallback;
+    return `${getWebSocketProtocol()}://localhost:3000/websockets`;
   }
 
   return `${getWebSocketProtocol()}://${window.location.hostname}:${window.location.port}/websockets`;
@@ -55,28 +48,12 @@ const wsClient = createWSClient({
 });
 
 export function TRPCReactProvider(props: PropsWithChildren) {
-  const [queryPersister] = useState(() => createWidgetQueryPersister());
   const [queryClient] = useState(
     () =>
       new QueryClient({
         defaultOptions: {
           queries: {
-            persister: queryPersister.persisterFn,
-            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.",
-                });
-              }
-            },
+            staleTime: 5 * 1000,
           },
         },
       }),

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,11 +9,10 @@ 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";
-import { sanitizeRedirectionUrl } from "@homarr/validation/redirection-url";
 import { userSignInSchema } from "@homarr/validation/user";
 
 type Provider = "credentials" | "ldap" | "oidc";
@@ -71,7 +70,7 @@ export const LoginForm = ({ providers, oidcClientName, isOidcAutoLoginEnabled, c
 
       // Redirect to the callback URL if the response is defined and comes from a credentials provider (ldap or credentials). oidc is redirected automatically.
       await revalidatePathActionAsync("/");
-      router.push(sanitizeRedirectionUrl(callbackUrl));
+      router.push(callbackUrl);
     },
     [t, router, callbackUrl],
   );
@@ -162,7 +161,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 +197,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,13 +1,9 @@
 import { redirect } from "next/navigation";
-import { Alert, Card, Center, Code, Stack, Text, Title } from "@mantine/core";
-import { IconLogin } from "@tabler/icons-react";
+import { Card, Center, Stack, Text, Title } from "@mantine/core";
 
 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";
@@ -23,7 +19,7 @@ export default async function Login(props: LoginProps) {
   const session = await auth();
 
   if (session) {
-    redirect(sanitizeRedirectionUrl(searchParams.callbackUrl));
+    redirect(searchParams.callbackUrl ?? "/");
   }
 
   const t = await getScopedI18n("user.page.login");
@@ -40,14 +36,7 @@ export default async function Login(props: LoginProps) {
             {t("subtitle")}
           </Text>
         </Stack>
-        {appEnv.DEMO_MODE && (
-          <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">
+        <Card withBorder w={64 * 6} maw="90vw">
           <LoginForm
             providers={env.AUTH_PROVIDERS}
             oidcClientName={env.AUTH_OIDC_CLIENT_NAME}

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

@@ -1,27 +1,70 @@
 "use client";
 
-import { Box, Stack } from "@mantine/core";
+import { useCallback, useRef } from "react";
+import { Box, LoadingOverlay, Stack } from "@mantine/core";
 
+import type { RouterOutputs } from "@homarr/api";
+import { clientApi } from "@homarr/api/client";
 import { useCurrentLayout, useRequiredBoard } from "@homarr/boards/context";
 
 import { BoardCategorySection } from "~/components/board/sections/category-section";
 import { BoardEmptySection } from "~/components/board/sections/empty-section";
 import { BoardBackgroundVideo } from "~/components/layout/background";
+import { fullHeightWithoutHeaderAndFooter } from "~/constants";
+import { useIsBoardReady } from "./_ready-context";
+
+let boardName: string | null = null;
+
+export const updateBoardName = (name: string | null) => {
+  boardName = name;
+};
+
+type UpdateCallback = (prev: RouterOutputs["board"]["getHomeBoard"]) => RouterOutputs["board"]["getHomeBoard"];
+
+export const useUpdateBoard = () => {
+  const utils = clientApi.useUtils();
+
+  const updateBoard = useCallback(
+    (updaterWithoutUndefined: UpdateCallback) => {
+      if (!boardName) {
+        throw new Error("Board name is not set");
+      }
+      utils.board.getBoardByName.setData({ name: boardName }, (previous) =>
+        previous ? updaterWithoutUndefined(previous) : previous,
+      );
+    },
+    [utils],
+  );
+
+  return {
+    updateBoard,
+  };
+};
 
 export const ClientBoard = () => {
   const board = useRequiredBoard();
   const currentLayoutId = useCurrentLayout();
+  const isReady = useIsBoardReady();
 
   const fullWidthSortedSections = board.sections
     .filter((section) => section.kind === "empty" || section.kind === "category")
     .sort((sectionA, sectionB) => sectionA.yOffset - sectionB.yOffset);
 
+  const ref = useRef<HTMLDivElement>(null);
+
   return (
     <Box h="100%" pos="relative">
       <BoardBackgroundVideo />
-      <Stack h="100%">
+      <LoadingOverlay
+        visible={!isReady}
+        transitionProps={{ duration: 500 }}
+        loaderProps={{ size: "lg" }}
+        h={fullHeightWithoutHeaderAndFooter}
+      />
+      <Stack ref={ref} h="100%" style={{ visibility: isReady ? "visible" : "hidden" }}>
         {fullWidthSortedSections.map((section) =>
           section.kind === "empty" ? (
+            // Unique keys per layout to always reinitialize the gridstack
             <BoardEmptySection key={`${currentLayoutId}-${section.id}`} section={section} />
           ) : (
             <BoardCategorySection key={`${currentLayoutId}-${section.id}`} section={section} />

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,15 +38,16 @@ 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> }) => {
-      const resolvedParams = await params;
+      const session = await auth();
+      const integrations = await getIntegrationsWithPermissionsAsync(session);
+
+      const board = await getInitialBoard(await params);
       const queryClient = getQueryClient();
 
-      const [board, session] = await Promise.all([getInitialBoard(resolvedParams), auth()]);
-
+      // Prefetch item data
       const itemsMap = board.items.reduce((acc, item) => {
         const existing = acc.get(item.kind);
         if (existing) {
@@ -61,29 +58,21 @@ export const createBoardContentPage = <TParams extends Record<string, unknown>>(
         return acc;
       }, new Map<WidgetKind, Item[]>());
 
-      const [integrations] = await Promise.all([
-        getIntegrationsWithPermissionsAsync(session),
-        ...Array.from(itemsMap).map(([kind, items]) =>
-          prefetchForKindAsync(kind, queryClient, items).catch((error) => {
-            logger.error(
-              new ErrorWithMetadata(
-                "Failed to prefetch widget",
-                { widgetKind: kind, itemCount: items.length },
-                { cause: error },
-              ),
-            );
-          }),
-        ),
-      ]);
-
-      const userId = session?.user.id ?? "anonymous";
+      for (const [kind, items] of itemsMap) {
+        await prefetchForKindAsync(kind, queryClient, items).catch((error) => {
+          logger.error(
+            new ErrorWithMetadata(
+              "Failed to prefetch widget",
+              { widgetKind: kind, itemCount: items.length },
+              { cause: error },
+            ),
+          );
+        });
+      }
 
       return (
         <HydrationBoundary state={dehydrate(queryClient)}>
           <IntegrationProvider integrations={integrations}>
-            <Suspense>
-              <QueryCacheHydration userId={userId} boardId={board.id} />
-            </Suspense>
             <DynamicClientBoard />
           </IntegrationProvider>
         </HydrationBoundary>
@@ -117,37 +106,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 { Box, Group, Menu, ScrollArea } from "@mantine/core";
+import { 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 && (
-        <OnboardingTour.Target id="board-settings">
-          <HeaderButton href={`/boards/${board.name}/settings`}>
-            <IconSettings stroke={1.5} />
-          </HeaderButton>
-        </OnboardingTour.Target>
-      )}
+      <HeaderButton href={`/boards/${board.name}/settings`}>
+        <IconSettings stroke={1.5} />
+      </HeaderButton>
 
       <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 (demoMode) return discardDemoChanges();
-      return saveBoard(board);
-    }
+    if (isEditMode) 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}>
-        {isEditMode ? <IconPencilOff stroke={1.5} /> : <IconPencil stroke={1.5} />}
-      </HeaderButton>
-    </OnboardingTour.Target>
+    <HeaderButton onClick={toggle} loading={isPending}>
+      {isEditMode ? <IconPencilOff stroke={1.5} /> : <IconPencil stroke={1.5} />}
+    </HeaderButton>
   );
 };
 
@@ -210,31 +183,27 @@ const SelectBoardsMenu = () => {
   const { data: boards = [] } = clientApi.board.getAllBoards.useQuery();
 
   return (
-    <OnboardingTour.Target id="board-switcher">
-      <Box>
-        <Menu position="bottom-end">
-          <Menu.Target>
-            <HeaderButton w="auto" px={4}>
-              <IconReplace stroke={1.5} />
-            </HeaderButton>
-          </Menu.Target>
-          <Menu.Dropdown style={{ transform: "translate(-7px, 0)" }}>
-            <ScrollArea.Autosize mah={300}>
-              {boards.map((board) => (
-                <Menu.Item
-                  key={board.id}
-                  component={Link}
-                  href={`/boards/${board.name}`}
-                  leftSection={<IconLayoutBoard size={20} />}
-                >
-                  {board.name}
-                </Menu.Item>
-              ))}
-            </ScrollArea.Autosize>
-          </Menu.Dropdown>
-        </Menu>
-      </Box>
-    </OnboardingTour.Target>
+    <Menu position="bottom-end" withArrow>
+      <Menu.Target>
+        <HeaderButton w="auto" px={4}>
+          <IconReplace stroke={1.5} />
+        </HeaderButton>
+      </Menu.Target>
+      <Menu.Dropdown style={{ transform: "translate(-7px, 0)" }}>
+        <ScrollArea.Autosize mah={300}>
+          {boards.map((board) => (
+            <Menu.Item
+              key={board.id}
+              component={Link}
+              href={`/boards/${board.name}`}
+              leftSection={<IconLayoutBoard size={20} />}
+            >
+              {board.name}
+            </Menu.Item>
+          ))}
+        </ScrollArea.Autosize>
+      </Menu.Dropdown>
+    </Menu>
   );
 };
 
@@ -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;
@@ -295,5 +264,6 @@ const usePreventLeaveWithDirty = (isDirty: boolean) => {
       window.removeEventListener("popstate", handlePopState);
       window.removeEventListener("beforeunload", handleBeforeUnload);
     };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isDirty]);
 };

apps/nextjs/src/app/[locale]/boards/(content)/_ready-context.tsx

@@ -1,19 +1,43 @@
 "use client";
 
 import type { PropsWithChildren } from "react";
-import { createContext, useCallback, useContext } from "react";
+import { createContext, useCallback, useContext, useEffect, useState } from "react";
+import { usePathname } from "next/navigation";
+
+import { clientApi } from "@homarr/api/client";
+import { useRequiredBoard } from "@homarr/boards/context";
 
 const BoardReadyContext = createContext<{
+  isReady: boolean;
   markAsReady: (id: string) => void;
 } | null>(null);
 
 export const BoardReadyProvider = ({ children }: PropsWithChildren) => {
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  const markAsReady = useCallback((_id: string) => {}, []);
+  const pathname = usePathname();
+  const utils = clientApi.useUtils();
+  const board = useRequiredBoard();
+  const [readySections, setReadySections] = useState<string[]>([]);
+
+  // Reset sections required for ready state
+  useEffect(() => {
+    return () => {
+      setReadySections([]);
+    };
+  }, [pathname, utils]);
+
+  useEffect(() => {
+    setReadySections((previous) => previous.filter((id) => board.sections.some((section) => section.id === id)));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [board.sections.length, setReadySections]);
+
+  const markAsReady = useCallback((id: string) => {
+    setReadySections((previous) => (previous.includes(id) ? previous : [...previous, id]));
+  }, []);
 
   return (
     <BoardReadyContext.Provider
       value={{
+        isReady: board.sections.length === readySections.length,
         markAsReady,
       }}
     >
@@ -31,3 +55,13 @@ export const useMarkSectionAsReady = () => {
 
   return context.markAsReady;
 };
+
+export const useIsBoardReady = () => {
+  const context = useContext(BoardReadyContext);
+
+  if (!context) {
+    throw new Error("BoardReadyProvider is required");
+  }
+
+  return context.isReady;
+};

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
-      defaultColorScheme={defaultColorScheme}
-      theme={theme}
-      colorSchemeManager={colorSchemeManager}
-      cssVariablesResolver={v8CssVariablesResolver}
-    >
+    <MantineProvider defaultColorScheme={defaultColorScheme} theme={theme} colorSchemeManager={colorSchemeManager}>
       {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/[name]/settings/_general.tsx

@@ -2,7 +2,7 @@
 
 import { useEffect, useRef } from "react";
 import { Button, Grid, Group, Loader, Stack, TextInput } from "@mantine/core";
-import { useDebouncedValue, useDocumentTitle } from "@mantine/hooks";
+import { useDebouncedValue, useDocumentTitle, useFavicon } from "@mantine/hooks";
 
 import { useUpdateBoard } from "@homarr/boards/updater";
 import { useZodForm } from "@homarr/form";
@@ -10,7 +10,6 @@ import { IconPicker } from "@homarr/forms-collection";
 import { useI18n } from "@homarr/translation/client";
 import { boardSavePartialSettingsSchema } from "@homarr/validation/board";
 
-import { homarrLogoPath } from "~/components/layout/logo/homarr-logo";
 import { createMetaTitle } from "~/metadata";
 import type { Board } from "../../_types";
 import { useSavePartialSettingsMutation } from "./_shared";
@@ -54,6 +53,7 @@ export const GeneralSettingsContent = ({ board }: Props) => {
   );
 
   useLogoPreview(form.values.logoImageUrl);
+  useFaviconPreview(form.values.faviconImageUrl);
   const metaTitleStatus = useMetaTitlePreview(form.values.metaTitle);
 
   // Cleanup for not applied changes of the page title and logo image URL
@@ -75,7 +75,6 @@ export const GeneralSettingsContent = ({ board }: Props) => {
           pageTitle: values.pageTitle,
           logoImageUrl: values.logoImageUrl,
         };
-        updateFavicon(values.faviconImageUrl ?? homarrLogoPath);
         savePartialSettings({
           id: board.id,
           ...values,
@@ -147,13 +146,7 @@ const useMetaTitlePreview = (title: string | null) => {
   };
 };
 
-// Previously we used the useFavicon hook from Mantine
-// However if the user tried to click on a link to a different page
-// it caused an error "Cannot read properties of null (reading 'removeChild')"
-// Probably because the head element was null (https://github.com/mantinedev/mantine/blob/b90d9b81031f45f5d15e75f25138ed6477f65bce/packages/%40mantine/hooks/src/use-favicon/use-favicon.ts#L21)
-// See https://github.com/homarr-labs/homarr/issues/4905
-const updateFavicon = (url: string) => {
-  const link: HTMLLinkElement | null = document.querySelector('link[rel="icon"]');
-  if (!link) return;
-  link.href = url;
+const useFaviconPreview = (url: string | null) => {
+  const [faviconDebounced] = useDebouncedValue(url ?? "", 500);
+  useFavicon(faviconDebounced);
 };

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}>
-                  <MainHeader
-                    logo={<BoardLogoWithTitle size="md" hideTitleOnMobile />}
-                    actions={headerActions}
-                    hasNavigation={false}
-                  />
-                  <AppShellMain>{children}</AppShellMain>
-                </ClientShell>
-              </BoardTourWrapper>
+              <ClientShell hasNavigation={false}>
+                <MainHeader
+                  logo={<BoardLogoWithTitle size="md" hideTitleOnMobile />}
+                  actions={headerActions}
+                  hasNavigation={false}
+                />
+                <AppShellMain>{children}</AppShellMain>
+              </ClientShell>
             </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 { IconBook2, IconLayoutDashboard, IconMailForward } from "@tabler/icons-react";
+import { Button, Card, Stack, Text } from "@mantine/core";
+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" }}>
-          {tFinish("action.goToBoard", { name: "dashboard" })}
-        </InternalLinkButton>
+        {firstBoard ? (
+          <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%">
-        <InitStepCard>
+      <Stack>
+        <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>
-        <InitStepCard>
+        </Card>
+        <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
-            passwordInputProps={form.getInputProps("password")}
-            confirmPasswordInputProps={form.getInputProps("confirmPassword")}
+          <CustomPasswordInput
+            withPasswordRequirements
+            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,12 +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";
 
 import { notFound } from "next/navigation";
@@ -27,9 +24,7 @@ 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";
 import { DayJsLoader } from "./_client-providers/dayjs-loader";
 import { JotaiProvider } from "./_client-providers/jotai";
@@ -47,13 +42,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",
@@ -134,7 +129,7 @@ export default async function Layout(props: {
       dir={direction}
       data-mantine-color-scheme={colorScheme}
       style={{
-        backgroundColor: colorScheme === "dark" ? "#242424" : colorScheme === "auto" ? undefined : "#fff",
+        backgroundColor: colorScheme === "dark" ? "#242424" : "#fff",
       }}
       suppressHydrationWarning
     >
@@ -145,8 +140,7 @@ export default async function Layout(props: {
       </head>
       <body className={["font-sans", fontSans.variable].join(" ")}>
         <StackedProvider>
-          <Notifications pauseResetOnHover="notification" />
-          <ServiceWorkerRegistration />
+          <Notifications />
           {props.children}
         </StackedProvider>
       </body>

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/about.module.css

@@ -1,7 +1,3 @@
 .contributorCard {
   background-color: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-5));
 }
-
-.dependencyCard:hover {
-  background-color: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-5));
-}

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

@@ -12,7 +12,8 @@ import {
   Flex,
   Group,
   Kbd,
-  SimpleGrid,
+  List,
+  ListItem,
   Stack,
   Table,
   TableTbody,
@@ -21,18 +22,9 @@ import {
   TableThead,
   TableTr,
   Text,
-  ThemeIcon,
   Title,
-  UnstyledButton,
 } from "@mantine/core";
-import {
-  IconKeyboard,
-  IconLanguage,
-  IconLibrary,
-  IconMoneybagHeart,
-  IconPackage,
-  IconUsers,
-} from "@tabler/icons-react";
+import { IconKeyboard, IconLanguage, IconLibrary, IconUsers } from "@tabler/icons-react";
 
 import { capitalize, objectEntries } from "@homarr/common";
 import { hotkeys } from "@homarr/definitions";
@@ -41,10 +33,8 @@ import { getScopedI18n } from "@homarr/translation/server";
 import { homarrLogoPath } from "~/components/layout/logo/homarr-logo";
 import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 import { createMetaTitle } from "~/metadata";
-import type { PackageJsonDependencies } from "~/versions/package-reader";
-import { getPackageVersion } from "~/versions/package-reader";
+import { getPackageAttributesAsync } from "~/versions/package-reader";
 import type githubContributorsJson from "../../../../../../../static-data/contributors.json";
-import type openCollectiveContributorsJson from "../../../../../../../static-data/opencollective-contributors.json";
 import type crowdinContributorsJson from "../../../../../../../static-data/translators.json";
 import classes from "./about.module.css";
 
@@ -67,10 +57,7 @@ const getHostAsync = async () => {
 export default async function AboutPage() {
   const baseServerUrl = `http://${await getHostAsync()}`;
   const t = await getScopedI18n("management.page.about");
-  const version = getPackageVersion();
-  const dependencies = (await fetch(`${baseServerUrl}/api/about/dependencies`).then((res) =>
-    res.json(),
-  )) as PackageJsonDependencies;
+  const attributes = await getPackageAttributesAsync();
   const githubContributors = (await fetch(`${baseServerUrl}/api/about/contributors/github`).then((res) =>
     res.json(),
   )) as typeof githubContributorsJson;
@@ -79,10 +66,6 @@ export default async function AboutPage() {
     res.json(),
   )) as typeof crowdinContributorsJson;
 
-  const openCollectiveContributors = (await fetch(`${baseServerUrl}/api/about/contributors/opencollective`).then(
-    (res) => res.json(),
-  )) as typeof openCollectiveContributorsJson;
-
   return (
     <div>
       <DynamicBreadcrumb />
@@ -90,8 +73,10 @@ 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={2}>{t("version", { version })}</Title>
+            <Title order={1} tt="uppercase">
+              Homarr
+            </Title>
+            <Title order={2}>{t("version", { version: attributes.version })}</Title>
           </Stack>
         </Group>
       </Center>
@@ -146,72 +131,31 @@ export default async function AboutPage() {
             </Flex>
           </AccordionPanel>
         </AccordionItem>
-        <AccordionItem value="sponsors">
-          <AccordionControl icon={<IconMoneybagHeart size="1rem" />}>
-            <Stack gap={0}>
-              <Text>{t("accordion.sponsors.title")}</Text>
-              <Text size="sm" c="dimmed">
-                {t("accordion.sponsors.subtitle", {
-                  count: String(openCollectiveContributors.length),
-                })}
-              </Text>
-            </Stack>
-          </AccordionControl>
-          <AccordionPanel>
-            <Flex wrap="wrap" gap="xs">
-              {openCollectiveContributors.map((sponsor) => (
-                <GenericContributorLinkCard
-                  key={sponsor.slug}
-                  link={`https://opencollective.com/${sponsor.slug}`}
-                  image={sponsor.imageUrl}
-                  name={sponsor.name}
-                />
-              ))}
-            </Flex>
-          </AccordionPanel>
-        </AccordionItem>
         <AccordionItem value="libraries">
           <AccordionControl icon={<IconLibrary size="1rem" />}>
             <Stack gap={0}>
               <Text>{t("accordion.libraries.title")}</Text>
               <Text size="sm" c="dimmed">
                 {t("accordion.libraries.subtitle", {
-                  count: String(Object.keys(dependencies).length),
+                  count: String(Object.keys(attributes.dependencies).length),
                 })}
               </Text>
             </Stack>
           </AccordionControl>
           <AccordionPanel>
-            <SimpleGrid cols={{ xs: 1, sm: 2, md: 3, lg: 4, xl: 5 }} spacing="md">
-              {Object.entries(dependencies)
-                .filter(([, value]) => !value.includes("workspace:"))
+            <List>
+              {Object.entries(attributes.dependencies)
                 .sort(([key1], [key2]) => key1.localeCompare(key2))
-                .map(([name, version]) => (
-                  <UnstyledButton
-                    key={name}
-                    component="a"
-                    href={`https://www.npmjs.com/package/${name}`}
-                    target="_blank"
-                  >
-                    <Card radius="md" p="xs" className={classes.dependencyCard}>
-                      <Group gap="sm" wrap="nowrap">
-                        <ThemeIcon variant="light" size="lg">
-                          <IconPackage size="1.5rem" stroke={1.5} />
-                        </ThemeIcon>
-
-                        <Stack gap={0}>
-                          <Text size="sm" fw="bold" lineClamp={1} title={name}>
-                            {name}
-                          </Text>
-                          <Text size="sm" c="dimmed">
-                            v{version.replace("^", "").replace("~", "")}
-                          </Text>
-                        </Stack>
-                      </Group>
-                    </Card>
-                  </UnstyledButton>
+                .map(([key, value]) => (
+                  <ListItem key={key}>
+                    {value.includes("workspace:") ? (
+                      <Text>{key}</Text>
+                    ) : (
+                      <a href={`https://www.npmjs.com/package/${key}`}>{key}</a>
+                    )}
+                  </ListItem>
                 ))}
-            </SimpleGrid>
+            </List>
           </AccordionPanel>
         </AccordionItem>
         <AccordionItem value="hotkeys">

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 { 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 { 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
-      title={t("page.list.title")}
-      primaryAction={
-        canCreate ? (
-          <TourTarget id="manage-apps-create">
+    <ManageContainer>
+      <DynamicBreadcrumb />
+      <Stack>
+        <Title>{t("page.list.title")}</Title>
+        <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
-      }
-      toolbar={<SearchInput placeholder={`${t("search")}...`} defaultValue={searchParams.search} flexExpand />}
-      footer={<TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />}
-      floatingPrimaryAction={canCreate}
-    >
-      {apps.length === 0 && <AppNoResults />}
-      {apps.length > 0 && (
-        <TourTarget id="manage-apps-list">
+          )}
+        </Group>
+        {apps.length === 0 && <AppNoResults />}
+        {apps.length > 0 && (
           <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 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>
-      </Button.Group>
-    </ManageMobilePrimaryAction>
+    <>
+      <Button.Group visibleFrom="md">{buttonGroupContent}</Button.Group>
+      <Affix hiddenFrom="md" position={{ bottom: 20, right: 20 }}>
+        <Button.Group>{buttonGroupContent}</Button.Group>
+      </Affix>
+    </>
   );
 };

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 {
-  IconDeviceMobile,
-  IconDotsVertical,
-  IconHomeFilled,
-  IconLayoutDashboard,
-  IconLock,
-  IconWorld,
-} from "@tabler/icons-react";
+import { IconDeviceMobile, IconDotsVertical, IconHomeFilled, 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 { ManagePageLayout } from "~/components/manage/manage-page-layout";
-import { NoResults } from "~/components/no-results";
+import { ManageContainer } from "~/components/manage/manage-container";
+import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 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
-      title={t("title")}
-      primaryAction={
-        canCreateBoards ? (
-          <TourTarget id="manage-boards-create">
-            <CreateBoardButton />
-          </TourTarget>
-        ) : undefined
-      }
-      floatingPrimaryAction={canCreateBoards}
-    >
-      {boards.length === 0 && <NoResults icon={IconLayoutDashboard} title={t("noResults.title")} />}
-      {boards.length > 0 && (
-        <TourTarget id="manage-boards-list">
-          <Grid>
-            {boards.map((board) => (
-              <GridCol span={{ base: 12, md: 6 }} key={board.id}>
-                <BoardCard board={board} />
-              </GridCol>
-            ))}
-          </Grid>
-        </TourTarget>
-      )}
-    </ManagePageLayout>
+    <ManageContainer>
+      <DynamicBreadcrumb />
+      <Stack>
+        <Group justify="space-between">
+          <Title mb="md">{t("title")}</Title>
+          {canCreateBoards && <CreateBoardButton />}
+        </Group>
+
+        <Grid mb={{ base: "xl", md: 0 }}>
+          {boards.map((board) => (
+            <GridCol span={{ base: 12, md: 6 }} key={board.id}>
+              <BoardCard board={board} />
+            </GridCol>
+          ))}
+        </Grid>
+      </Stack>
+    </ManageContainer>
   );
 }
 
@@ -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
-                color="gray"
-                variant="subtle"
-                onClick={togglePublicSecretDisplay}
-                aria-label={t(publicSecretDisplayOpened ? "common.action.hide" : "common.action.show")}
-              >
+              <ActionIcon color="gray" variant="subtle" onClick={togglePublicSecretDisplay}>
                 <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;
-  initialUrl?: string;
-  initialName?: string;
-  onSuccess: () => void;
-  onCancel?: () => void;
-  onSkip?: () => void;
-  isOnboarding?: boolean;
+  searchParams: Partial<z.infer<typeof integrationCreateSchema>> & {
+    kind: IntegrationKind;
+  };
 }
 
 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 = ({
-  kind,
-  initialUrl,
-  initialName,
-  onSuccess,
-  onCancel,
-  onSkip,
-  isOnboarding = false,
-}: NewIntegrationFormProps) => {
+export const NewIntegrationForm = ({ searchParams }: 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,
-      hasApp: !isOnboarding,
-      appHref: isOnboarding ? null : url,
+      attemptSearchEngineCreation: true,
+      hasApp: false,
+      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 =
-    integrationCategories.includes("search") && !integrationCategories.includes("mediaSearch");
+  const supportsSearchEngine = integrationDefs[searchParams.kind].category.flat().includes("search");
 
   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" onClick={onCancel}>
-              {t("common.action.backToOverview")}
-            </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 variant="default" component={Link} href="/manage/integrations">
+            {t("common.action.backToOverview")}
+          </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 { IntegrationNewFormWrapper } from "./_integration-new-form-wrapper";
-import { IntegrationNewSelectGrid } from "./_integration-new-select-grid";
+import { NewIntegrationForm } from "./_integration-new-form";
 
 interface NewIntegrationPageProps {
-  searchParams: Promise<{
-    kind?: string;
-    url?: string;
-    name?: string;
-  }>;
+  searchParams: Promise<
+    Partial<z.infer<typeof integrationCreateSchema>> & {
+      kind: IntegrationKind;
+    }
+  >;
 }
 
 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");
-    return (
-      <>
-        <DynamicBreadcrumb />
-        <Container>
-          <Stack>
-            <Title>{t("action.create")}</Title>
-            <IntegrationNewSelectGrid enableMockIntegration={env.UNSAFE_ENABLE_MOCK_INTEGRATION} />
-          </Stack>
-        </Container>
-      </>
-    );
+    notFound();
   }
 
   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 { ManagePageLayout } from "~/components/manage/manage-page-layout";
-import { MobileAffixButton } from "~/components/manage/mobile-affix-button";
+import { ManageContainer } from "~/components/manage/manage-container";
+import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 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
-      title={t("page.list.title")}
-      primaryAction={
-        canCreateIntegrations ? (
-          <TourTarget id="manage-integrations-create">
-            <MobileAffixButton component={Link} href="/manage/integrations/new">
-              {t("action.create")}
-            </MobileAffixButton>
-          </TourTarget>
-        ) : undefined
-      }
-      floatingPrimaryAction={canCreateIntegrations}
-    >
-      <TourTarget id="manage-integrations-list">
+    <ManageContainer>
+      <DynamicBreadcrumb />
+      <Stack>
+        <Group justify="space-between" align="center">
+          <Title>{t("page.list.title")}</Title>
+
+          {canCreateIntegrations && (
+            <>
+              <Box>
+                <IntegrationSelectMenu>
+                  <Affix hiddenFrom="md" position={{ bottom: 20, right: 20 }}>
+                    <MenuTarget>
+                      <Button rightSection={<IconChevronUp size={16} stroke={1.5} />}>{t("action.create")}</Button>
+                    </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>
-    </ManagePageLayout>
+      </Stack>
+    </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;
-
-  const shell = (
+  return (
     <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 { ManagePageLayout } from "~/components/manage/manage-page-layout";
-import { NoResults } from "~/components/no-results";
+import { ManageContainer } from "~/components/manage/manage-container";
+import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 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
-      title={t("media.plural")}
-      primaryAction={
-        canUpload ? (
-          <ManageMobilePrimaryAction>
-            <UploadMediaButton />
-          </ManageMobilePrimaryAction>
-        ) : undefined
-      }
-      toolbar={
-        <Group>
-          <SearchInput placeholder={`${t("media.search")}...`} defaultValue={searchParams.search} />
-          {session.user.permissions.includes("media-view-all") && (
-            <IncludeFromAllUsersSwitch defaultChecked={searchParams.includeFromAllUsers} />
-          )}
+    <ManageContainer>
+      <DynamicBreadcrumb />
+      <Stack>
+        <Title>{t("media.plural")}</Title>
+        <Group justify="space-between">
+          <Group>
+            <SearchInput placeholder={`${t("media.search")}...`} defaultValue={searchParams.search} />
+            {session.user.permissions.includes("media-view-all") && (
+              <IncludeFromAllUsersSwitch defaultChecked={searchParams.includeFromAllUsers} />
+            )}
+          </Group>
+
+          {session.user.permissions.includes("media-upload") && <UploadMediaButton />}
         </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
-      title={tEngine("page.list.title")}
-      primaryAction={
-        canCreate ? (
-          <MobileAffixButton component={Link} href="/manage/search-engines/new">
-            {tEngine("page.create.title")}
-          </MobileAffixButton>
-        ) : undefined
-      }
-      toolbar={<SearchInput placeholder={`${tEngine("search")}...`} defaultValue={searchParams.search} flexExpand />}
-      footer={<TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />}
-      floatingPrimaryAction={canCreate}
-    >
-      {searchEngines.length === 0 && <SearchEngineNoResults />}
-      {searchEngines.length > 0 && (
-        <Stack gap="sm">
-          {searchEngines.map((searchEngine) => (
-            <SearchEngineCard key={searchEngine.id} searchEngine={searchEngine} />
-          ))}
-        </Stack>
-      )}
-    </ManagePageLayout>
+    <ManageContainer>
+      <DynamicBreadcrumb />
+      <Stack>
+        <Title>{tEngine("page.list.title")}</Title>
+        <Group justify="space-between" align="center">
+          <SearchInput placeholder={`${tEngine("search")}...`} defaultValue={searchParams.search} flexExpand />
+          {session.user.permissions.includes("search-engine-create") && (
+            <MobileAffixButton component={Link} href="/manage/search-engines/new">
+              {tEngine("page.create.title")}
+            </MobileAffixButton>
+          )}
+        </Group>
+        {searchEngines.length === 0 && <SearchEngineNoResults />}
+        {searchEngines.length > 0 && (
+          <Stack gap="sm">
+            {searchEngines.map((searchEngine) => (
+              <SearchEngineCard key={searchEngine.id} searchEngine={searchEngine} />
+            ))}
+          </Stack>
+        )}
+
+        {/* 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">
-        <LoadingOverlay visible={isPending} />
+      <Card pos="relative" withBorder>
+        <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/appearance-settings-form.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { Group, Text } from "@mantine/core";
-import { IconDeviceDesktop, IconMoon, IconSun } from "@tabler/icons-react";
+import { IconMoon, IconSun } from "@tabler/icons-react";
 
 import type { ColorScheme } from "@homarr/definitions";
 import { colorSchemes } from "@homarr/definitions";
@@ -34,7 +34,6 @@ export const AppearanceSettingsForm = ({ defaultValues }: { defaultValues: Serve
 };
 
 const appearanceIcons = {
-  auto: IconDeviceDesktop,
   light: IconSun,
   dark: IconMoon,
 };

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);
-}