chore: validate CODEOWNERS in CI and act

Split workflow into validate (PR + act) and update (dev bot PR). Add structure checks per GitHub docs, API error validation, and act config.
chore: add per-widget/integration CODEOWNERS generator
2026-06-04 15:37:31 +02:00 · 2026-06-04 15:24:07 +02:00
216 changed files with 1860 additions and 14036 deletions
@@ -0,0 +1,2 @@
+-P ubuntu-latest=catthehacker/ubuntu:act-latest
+--container-architecture linux/amd64
@@ -19,7 +19,10 @@ body:
  - type: textarea
    attributes:
      label: Additional information
-      description: Add any other information related to the integration.
+      description: |
+        Add any other information related to the integration.
+
+        After your integration is merged to `dev`, a bot PR updates [CODEOWNERS](https://github.com/homarr-labs/homarr/blob/dev/CODEOWNERS) so you are requested on future PRs touching your folders. Run `pnpm scripts:generate-codeowners` locally for faster updates. Add email mappings in `scripts/codeowners-overrides.json` if the generator cannot resolve your GitHub user.
  - type: dropdown
    attributes:
      label: Public API available?
@@ -19,7 +19,10 @@ body:
  - type: textarea
    attributes:
      label: Additional information
-      description: Add any other information related to the widget.
+      description: |
+        Add any other information related to the widget.
+
+        After your widget is merged to `dev`, a bot PR updates [CODEOWNERS](https://github.com/homarr-labs/homarr/blob/dev/CODEOWNERS) so you are requested on future PRs touching your folders. Run `pnpm scripts:generate-codeowners` locally for faster updates. Add email mappings in `scripts/codeowners-overrides.json` if the generator cannot resolve your GitHub user.
  - type: dropdown
    attributes:
      label: Are you willing to contribute this yourself?
@@ -0,0 +1,131 @@
+name: Update CODEOWNERS
+
+on:
+  workflow_dispatch: {}
+  pull_request:
+    paths:
+      - CODEOWNERS
+      - packages/widgets/src/**
+      - packages/integrations/src/**
+      - packages/api/src/router/widgets/**
+      - packages/cron-jobs/src/jobs/**
+      - scripts/generate-codeowners.mts
+      - scripts/validate-codeowners.mts
+      - scripts/codeowners-overrides.json
+  push:
+    paths:
+      - packages/widgets/src/**
+      - packages/integrations/src/**
+      - packages/api/src/router/widgets/**
+      - packages/cron-jobs/src/jobs/**
+      - scripts/generate-codeowners.mts
+      - scripts/validate-codeowners.mts
+      - scripts/codeowners-overrides.json
+    branches:
+      - dev
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  validate:
+    name: Validate CODEOWNERS
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Use Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version-file: .nvmrc
+
+      - uses: pnpm/action-setup@v6
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Check CODEOWNERS is up to date
+        run: pnpm exec tsx ./scripts/generate-codeowners.mts --check
+
+      - name: Validate CODEOWNERS
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+        run: pnpm exec tsx ./scripts/validate-codeowners.mts
+
+  update:
+    name: Open CODEOWNERS update PR
+    needs: validate
+    if: github.event_name == 'push' && github.ref == 'refs/heads/dev'
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    concurrency:
+      group: update-codeowners
+      cancel-in-progress: false
+    steps:
+      - name: Obtain token
+        id: obtainToken
+        uses: actions/create-github-app-token@v3
+        with:
+          private-key: ${{ secrets.HOMARR_UPDATE_CONTRIBUTORS_PRIVATE_KEY }}
+          client-id: ${{ vars.HOMARR_UPDATE_CONTRIBUTORS_APP_ID }}
+          permission-contents: write
+          permission-pull-requests: write
+
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+        env:
+          GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
+
+      - name: Use Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version-file: .nvmrc
+
+      - uses: pnpm/action-setup@v6
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Generate CODEOWNERS
+        env:
+          GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
+        run: pnpm scripts:generate-codeowners
+
+      - name: Validate CODEOWNERS
+        env:
+          GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+        run: pnpm exec tsx ./scripts/validate-codeowners.mts
+
+      - name: Create Pull Request
+        id: create-pull-request
+        uses: peter-evans/create-pull-request@v8
+        with:
+          token: ${{ steps.obtainToken.outputs.token }}
+          branch: update-codeowners
+          base: dev
+          title: "chore: update widget/integration CODEOWNERS"
+          delete-branch: true
+          commit-message: "chore: update widget/integration CODEOWNERS"
+          body: |
+            This PR updates per-widget and per-integration CODEOWNERS entries from git history.
+
+            Unmapped authors can be added in `scripts/codeowners-overrides.json`.
+
+      - name: Install GitHub CLI
+        run: sudo apt-get install -y gh
+
+      - name: Enable auto-merge
+        if: steps.create-pull-request.outputs.pull-request-number != ''
+        env:
+          GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
+        run: |
+          gh pr merge ${{ steps.create-pull-request.outputs.pull-request-number }} --auto --squash
@@ -11,3 +11,86 @@ pnpm-lock.yaml
 pnpm-workspace.yaml
 Dockerfile
 docker-compose.yml
+
+# BEGIN GENERATED widget/integration owners
+/packages/api/src/router/widgets/anchor-notes.ts /packages/integrations/src/anchor/ /packages/widgets/src/anchor-note/ @omariqbal
+/packages/api/src/router/widgets/app.ts /packages/widgets/src/app/ @manuel-rw
+/packages/api/src/router/widgets/calendar.ts /packages/widgets/src/calendar/ @manuel-rw
+/packages/api/src/router/widgets/coolify.ts /packages/integrations/src/coolify/ /packages/widgets/src/coolify/ @Rhiz3K
+/packages/api/src/router/widgets/dns-hole.ts /packages/cron-jobs/src/jobs/integrations/dns-hole.ts /packages/widgets/src/dns-hole/controls/ @manuel-rw
+/packages/api/src/router/widgets/dns-hole.ts /packages/cron-jobs/src/jobs/integrations/dns-hole.ts /packages/widgets/src/dns-hole/summary/ @manuel-rw
+/packages/api/src/router/widgets/downloads.ts /packages/cron-jobs/src/jobs/integrations/downloads.ts /packages/widgets/src/downloads/ @manuel-rw
+/packages/api/src/router/widgets/firewall.ts /packages/cron-jobs/src/jobs/integrations/firewall.ts /packages/widgets/src/firewall/ @Oupsman
+/packages/api/src/router/widgets/health-monitoring.ts /packages/cron-jobs/src/jobs/integrations/health-monitoring.ts /packages/widgets/src/health-monitoring/ @dgshue
+/packages/api/src/router/widgets/immich.ts /packages/integrations/src/immich/ /packages/widgets/src/immich/album-carousel/ @manuel-rw
+/packages/api/src/router/widgets/immich.ts /packages/integrations/src/immich/ /packages/widgets/src/immich/server-stats/ @manuel-rw
+/packages/api/src/router/widgets/indexer-manager.ts /packages/cron-jobs/src/jobs/integrations/indexer-manager.ts /packages/widgets/src/indexer-manager/ @manuel-rw
+/packages/api/src/router/widgets/media-release.ts /packages/widgets/src/media-releases/ @manuel-rw
+/packages/api/src/router/widgets/media-requests.ts /packages/cron-jobs/src/jobs/integrations/media-requests.ts /packages/widgets/src/media-requests/list/ @manuel-rw
+/packages/api/src/router/widgets/media-requests.ts /packages/cron-jobs/src/jobs/integrations/media-requests.ts /packages/widgets/src/media-requests/stats/ @manuel-rw
+/packages/api/src/router/widgets/media-server.ts /packages/cron-jobs/src/jobs/integrations/media-server.ts /packages/widgets/src/media-server/ @manuel-rw
+/packages/api/src/router/widgets/media-transcoding.ts /packages/cron-jobs/src/jobs/integrations/media-transcoding.ts /packages/integrations/src/media-transcoding/ /packages/widgets/src/media-transcoding/ @manuel-rw
+/packages/api/src/router/widgets/minecraft.ts /packages/widgets/src/minecraft/server-status/ @manuel-rw
+/packages/api/src/router/widgets/network-controller.ts /packages/cron-jobs/src/jobs/integrations/network-controller.ts /packages/widgets/src/network-controller/network-status/ @pitschi
+/packages/api/src/router/widgets/network-controller.ts /packages/cron-jobs/src/jobs/integrations/network-controller.ts /packages/widgets/src/network-controller/summary/ @pitschi
+/packages/api/src/router/widgets/notebook.ts /packages/widgets/src/notebook/ @manuel-rw
+/packages/api/src/router/widgets/notifications.ts /packages/cron-jobs/src/jobs/integrations/notifications.ts /packages/widgets/src/notifications/ @itzTheMeow
+/packages/api/src/router/widgets/releases.ts /packages/widgets/src/releases/ @Aandree5
+/packages/api/src/router/widgets/rssFeed.ts /packages/widgets/src/rssFeed/ @manuel-rw
+/packages/api/src/router/widgets/smart-home.ts /packages/cron-jobs/src/jobs/integrations/home-assistant.ts /packages/widgets/src/smart-home/entity-state/ @manuel-rw
+/packages/api/src/router/widgets/smart-home.ts /packages/cron-jobs/src/jobs/integrations/home-assistant.ts /packages/widgets/src/smart-home/execute-automation/ @manuel-rw
+/packages/api/src/router/widgets/speedtest-tracker.ts /packages/integrations/src/speedtest-tracker/ /packages/widgets/src/speedtest-tracker/ @kylegrieder
+/packages/api/src/router/widgets/stocks.ts /packages/widgets/src/stocks/ @jackwellerreal
+/packages/api/src/router/widgets/timetable.ts /packages/cron-jobs/src/jobs/integrations/timetable.ts /packages/widgets/src/timetable/ @manuel-rw
+/packages/api/src/router/widgets/tracearr.ts /packages/cron-jobs/src/jobs/integrations/tracearr.ts /packages/integrations/src/tracearr/ /packages/widgets/src/tracearr/ @StrandedTurtle
+/packages/api/src/router/widgets/umami.ts /packages/cron-jobs/src/jobs/integrations/umami.ts /packages/integrations/src/umami/ /packages/widgets/src/umami/ @febrile42
+/packages/api/src/router/widgets/weather.ts /packages/cron-jobs/src/jobs/weather.ts /packages/widgets/src/weather/ @manuel-rw
+/packages/cron-jobs/src/jobs/docker.ts /packages/widgets/src/docker/ @ashtonbatty
+/packages/cron-jobs/src/jobs/integrations/dns-hole.ts /packages/integrations/src/pi-hole/ @manuel-rw
+/packages/cron-jobs/src/jobs/integrations/downloads.ts /packages/integrations/src/download-client/aria2/ @manuel-rw
+/packages/cron-jobs/src/jobs/integrations/downloads.ts /packages/integrations/src/download-client/deluge/ @manuel-rw
+/packages/cron-jobs/src/jobs/integrations/downloads.ts /packages/integrations/src/download-client/nzbget/ @manuel-rw
+/packages/cron-jobs/src/jobs/integrations/downloads.ts /packages/integrations/src/download-client/qbittorrent/ @manuel-rw
+/packages/cron-jobs/src/jobs/integrations/downloads.ts /packages/integrations/src/download-client/sabnzbd/ @manuel-rw
+/packages/cron-jobs/src/jobs/integrations/downloads.ts /packages/integrations/src/download-client/slskd/ @manuel-rw
+/packages/cron-jobs/src/jobs/integrations/downloads.ts /packages/integrations/src/download-client/transmission/ @manuel-rw
+/packages/cron-jobs/src/jobs/integrations/home-assistant.ts /packages/integrations/src/homeassistant/ @manuel-rw
+/packages/cron-jobs/src/jobs/integrations/media-organizer.ts /packages/integrations/src/media-organizer/lidarr/ @NicolasNewman
+/packages/cron-jobs/src/jobs/integrations/media-organizer.ts /packages/integrations/src/media-organizer/radarr/ @manuel-rw
+/packages/cron-jobs/src/jobs/integrations/media-organizer.ts /packages/integrations/src/media-organizer/readarr/ @manuel-rw
+/packages/cron-jobs/src/jobs/integrations/media-organizer.ts /packages/integrations/src/media-organizer/sonarr/ @manuel-rw
+/packages/integrations/src/adguard-home/ @manuel-rw
+/packages/integrations/src/codeberg/ @Aandree5
+/packages/integrations/src/dashdot/ @dgshue
+/packages/integrations/src/docker-hub/ @Aandree5
+/packages/integrations/src/emby/ @manuel-rw
+/packages/integrations/src/github-container-registry/ @manuel-rw
+/packages/integrations/src/github/ @manuel-rw
+/packages/integrations/src/gitlab/ @Aandree5
+/packages/integrations/src/glances/ @dgshue
+/packages/integrations/src/ical/ @NicolasNewman
+/packages/integrations/src/jellyfin/ @manuel-rw
+/packages/integrations/src/jellyseerr/ @manuel-rw
+/packages/integrations/src/linuxserverio/ @Aandree5
+/packages/integrations/src/nextcloud/ @manuel-rw
+/packages/integrations/src/npm/ @Aandree5
+/packages/integrations/src/ntfy/ @manuel-rw
+/packages/integrations/src/openmediavault/ @dgshue
+/packages/integrations/src/opnsense/ @manuel-rw
+/packages/integrations/src/overseerr/ @manuel-rw
+/packages/integrations/src/plex/ @manuel-rw
+/packages/integrations/src/prowlarr/ @manuel-rw
+/packages/integrations/src/proxmox/ @manuel-rw
+/packages/integrations/src/quay/ @Aandree5
+/packages/integrations/src/search-ch/ @manuel-rw
+/packages/integrations/src/seerr/ @manuel-rw
+/packages/integrations/src/truenas/ @dgshue
+/packages/integrations/src/unifi-controller/ @manuel-rw
+/packages/integrations/src/unraid/ @dgshue
+/packages/widgets/src/bookmarks/ @manuel-rw
+/packages/widgets/src/clock/ @manuel-rw
+/packages/widgets/src/iframe/ @manuel-rw
+/packages/widgets/src/system-disks/ @manuel-rw
+/packages/widgets/src/system-resources/ @kylegrieder
+/packages/widgets/src/video/ @manuel-rw
+# END GENERATED widget/integration owners
@@ -18,7 +18,6 @@
    "@dnd-kit/modifiers": "catalog:",
    "@dnd-kit/sortable": "catalog:",
    "@dnd-kit/utilities": "catalog:",
-    "@gfazioli/mantine-onboarding-tour": "catalog:",
    "@homarr/analytics": "workspace:^0.1.0",
    "@homarr/api": "workspace:^0.1.0",
    "@homarr/auth": "workspace:^0.1.0",
@@ -17,13 +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 { createHeadersCallbackForSource, getTrpcUrl } from "@homarr/api/shared";
 import { env } from "@homarr/common/env";
-import { showWarningNotification } from "@homarr/notifications";

 const getWebSocketProtocol = () => {
  // window is not defined on server side
@@ -59,20 +56,6 @@ export function TRPCReactProvider(props: PropsWithChildren) {
          queries: {
            staleTime: 5 * 1000,
          },
-          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.",
-                });
-              }
-            },
-          },
        },
      }),
  );
@@ -1,14 +1,11 @@
 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";

@@ -40,13 +37,6 @@ 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">
          <LoginForm
            providers={env.AUTH_PROVIDERS}
@@ -38,7 +38,6 @@ export const createBoardContentPage = <TParams extends Record<string, unknown>>(
    layout: createBoardLayout({
      headerActions: <BoardContentHeaderActions />,
      getInitialBoardAsync: getInitialBoard,
-      withTour: true,
    }),
    // eslint-disable-next-line no-restricted-syntax
    page: async ({ params }: { params: Promise<TParams> }) => {
@@ -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,10 +108,6 @@ const AddMenu = () => {
    });
  }, [openAppSelectModal, createItem]);

-  const handleAddIntegration = useCallback(() => {
-    openIntegrationSelectModal({});
-  }, [openIntegrationSelectModal]);
-
  return (
    <Menu position="bottom-end">
      <Menu.Target>
@@ -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">
+      <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;
@@ -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>
@@ -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>
-);
@@ -1,2 +0,0 @@
-export const onboardingContentWidth = 64 * 16;
-export const onboardingMaxWidth = "90vw";
@@ -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">
      <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>
  );
 };

@@ -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">
      <form onSubmit={form.onSubmit(handleSubmitAsync)}>
        <Stack>
          <TextInput
@@ -50,6 +48,6 @@ export const InitGroup = () => {
          </Button>
        </Stack>
      </form>
-    </InitStepCard>
+    </Card>
  );
 };
@@ -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" withBorder={false}>
      <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>
  );
 };
@@ -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">
        <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>
@@ -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>
-  );
-};
@@ -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>
-  );
-};
@@ -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">
          <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">
          <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")}
@@ -1,17 +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 { getScopedI18n } from "@homarr/translation/server";

-import { InitStepCard } from "../../_components/init-step-card";
 import { InitStartButton } from "./next-button";

 export const InitStart = async () => {
  const tStart = await getScopedI18n("init.step.start");

  return (
-    <InitStepCard>
+    <Card w={64 * 6} maw="90vw">
      <Stack>
        <Text>{tStart("description")}</Text>

@@ -28,6 +27,6 @@ export const InitStart = async () => {
          {tStart("action.importOldmarr")}
        </InitStartButton>
      </Stack>
-    </InitStepCard>
+    </Card>
  );
 };
@@ -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">
      <InitUserForm />
-    </InitStepCard>
+    </Card>
  );
 };
@@ -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">
@@ -1,7 +1,6 @@
 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";
@@ -26,7 +25,6 @@ import { isLocaleRTL, isLocaleSupported } from "@homarr/translation";

 import { Analytics } from "~/components/layout/analytics";
 import { CrowdinLiveTranslation } from "~/components/layout/crowdin-live-translation";
-
 import { SearchEngineOptimization } from "~/components/layout/search-engine-optimization";
 import { ServiceWorkerRegistration } from "~/components/layout/service-worker-registration";
 import { getCurrentColorSchemeAsync } from "~/theme/color-scheme";
@@ -11,7 +11,6 @@ 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 { MobileAffixButton } from "~/components/manage/mobile-affix-button";
 import { NoResults } from "~/components/no-results";
@@ -46,11 +45,9 @@ export default async function AppsPage(props: AppsPageProps) {
      title={t("page.list.title")}
      primaryAction={
        canCreate ? (
-          <TourTarget id="manage-apps-create">
-            <MobileAffixButton component={Link} href="/manage/apps/new">
-              {t("page.create.title")}
-            </MobileAffixButton>
-          </TourTarget>
+          <MobileAffixButton component={Link} href="/manage/apps/new">
+            {t("page.create.title")}
+          </MobileAffixButton>
        ) : undefined
      }
      toolbar={<SearchInput placeholder={`${t("search")}...`} defaultValue={searchParams.search} flexExpand />}
@@ -59,13 +56,11 @@ export default async function AppsPage(props: AppsPageProps) {
    >
      {apps.length === 0 && <AppNoResults />}
      {apps.length > 0 && (
-        <TourTarget id="manage-apps-list">
-          <Stack gap="sm">
-            {apps.map((app) => (
-              <AppCard key={app.id} app={app} />
-            ))}
-          </Stack>
-        </TourTarget>
+        <Stack gap="sm">
+          {apps.map((app) => (
+            <AppCard key={app.id} app={app} />
+          ))}
+        </Stack>
      )}
    </ManagePageLayout>
  );
@@ -28,7 +28,6 @@ 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 { BoardCardMenuDropdown } from "./_components/board-card-menu-dropdown";
@@ -43,26 +42,18 @@ export default async function ManageBoardsPage() {
  return (
    <ManagePageLayout
      title={t("title")}
-      primaryAction={
-        canCreateBoards ? (
-          <TourTarget id="manage-boards-create">
-            <CreateBoardButton />
-          </TourTarget>
-        ) : undefined
-      }
+      primaryAction={canCreateBoards ? <CreateBoardButton /> : 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>
+        <Grid>
+          {boards.map((board) => (
+            <GridCol span={{ base: 12, md: 6 }} key={board.id}>
+              <BoardCard board={board} />
+            </GridCol>
+          ))}
+        </Grid>
      )}
    </ManagePageLayout>
  );
@@ -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>
+  );
+};
@@ -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")}
-    />
-  );
-};
@@ -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>
@@ -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,
  {
@@ -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} />;
-};
@@ -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>
    </>
@@ -1,4 +1,5 @@
 import { Fragment } from "react";
+import type { PropsWithChildren } from "react";
 import { redirect } from "next/navigation";
 import {
  AccordionControl,
@@ -7,8 +8,12 @@ import {
  ActionIcon,
  ActionIconGroup,
  Anchor,
+  Button,
  Divider,
  Group,
+  Menu,
+  MenuDropdown,
+  MenuTarget,
  Stack,
  Table,
  TableTbody,
@@ -18,7 +23,7 @@ import {
  TableTr,
  Text,
 } from "@mantine/core";
-import { IconPencil, IconPlugX } from "@tabler/icons-react";
+import { IconChevronDown, IconPencil, IconPlugX } from "@tabler/icons-react";

 import type { RouterOutputs } from "@homarr/api";
 import { api } from "@homarr/api/server";
@@ -29,12 +34,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 { ManageMobilePrimaryAction } from "~/components/manage/manage-mobile-primary-action";
 import { ManagePageLayout } from "~/components/manage/manage-page-layout";
-import { MobileAffixButton } from "~/components/manage/mobile-affix-button";
 import { NoResults } from "~/components/no-results";
+import { env } from "~/env";
 import { ActiveTabAccordion } from "../../../../components/active-tab-accordion";
 import { DeleteIntegrationActionButton } from "./_integration-buttons";
+import { IntegrationCreateDropdownContent } from "./new/_integration-new-dropdown";
 import classes from "./page.module.css";

 interface IntegrationsPageProps {
@@ -61,22 +67,41 @@ export default async function IntegrationsPage(props: IntegrationsPageProps) {
      title={t("page.list.title")}
      primaryAction={
        canCreateIntegrations ? (
-          <TourTarget id="manage-integrations-create">
-            <MobileAffixButton component={Link} href="/manage/integrations/new">
-              {t("action.create")}
-            </MobileAffixButton>
-          </TourTarget>
+          <ManageMobilePrimaryAction>
+            <IntegrationSelectMenu>
+              <MenuTarget>
+                <Button rightSection={<IconChevronDown size={16} stroke={1.5} />}>{t("action.create")}</Button>
+              </MenuTarget>
+            </IntegrationSelectMenu>
+          </ManageMobilePrimaryAction>
        ) : undefined
      }
      floatingPrimaryAction={canCreateIntegrations}
    >
-      <TourTarget id="manage-integrations-list">
-        <IntegrationList integrations={integrations} activeTab={searchParams.tab} />
-      </TourTarget>
+      <IntegrationList integrations={integrations} activeTab={searchParams.tab} />
    </ManagePageLayout>
  );
 }

+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 +134,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 +152,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 +173,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 +184,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 +201,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>
@@ -36,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");
@@ -46,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,
@@ -62,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,
@@ -79,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"),
@@ -161,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"),
@@ -200,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>;
 }
@@ -1,29 +0,0 @@
-"use client";
-
-import { Group, Slider, Text } from "@mantine/core";
-import { IconTextSize } from "@tabler/icons-react";
-
-import { useLogContext } from "./log-context";
-
-export const LogFontSizeSlider = () => {
-  const { fontSize, setFontSize } = useLogContext();
-
-  return (
-    <Group gap="xs" wrap="nowrap" w={160}>
-      <IconTextSize size={18} style={{ flexShrink: 0 }} />
-      <Slider
-        min={10}
-        max={24}
-        step={1}
-        value={fontSize}
-        onChange={setFontSize}
-        label={(val) => `${val}px`}
-        style={{ flex: 1 }}
-        size="xs"
-      />
-      <Text size="xs" c="dimmed" w={32} ta="right">
-        {fontSize}px
-      </Text>
-    </Group>
-  );
-};
@@ -6,23 +6,10 @@ import { createContext, useContext, useMemo, useState } from "react";
 import type { LogLevel } from "@homarr/core/infrastructure/logs/constants";
 import { logLevels } from "@homarr/core/infrastructure/logs/constants";

-const FONT_SIZE_KEY = "homarr-log-font-size";
-const DEFAULT_FONT_SIZE = 14;
-
-const readStoredFontSize = () => {
-  if (typeof window === "undefined") return DEFAULT_FONT_SIZE;
-  const stored = localStorage.getItem(FONT_SIZE_KEY);
-  if (!stored) return DEFAULT_FONT_SIZE;
-  const parsed = Number(stored);
-  return Number.isFinite(parsed) ? Math.min(Math.max(parsed, 10), 24) : DEFAULT_FONT_SIZE;
-};
-
 const LogContext = createContext<{
  level: LogLevel;
  setLevel: (level: LogLevel) => void;
  activeLevels: LogLevel[];
-  fontSize: number;
-  setFontSize: (size: number) => void;
 } | null>(null);

 interface LogContextProviderProps extends PropsWithChildren {
@@ -31,19 +18,9 @@ interface LogContextProviderProps extends PropsWithChildren {

 export const LogContextProvider = ({ defaultLevel, children }: LogContextProviderProps) => {
  const [level, setLevel] = useState(defaultLevel);
-  const [fontSize, setFontSizeRaw] = useState(readStoredFontSize);
  const activeLevels = useMemo(() => logLevels.slice(0, logLevels.indexOf(level) + 1), [level]);

-  const setFontSize = (size: number) => {
-    setFontSizeRaw(size);
-    localStorage.setItem(FONT_SIZE_KEY, String(size));
-  };
-
-  return (
-    <LogContext.Provider value={{ level, setLevel, activeLevels, fontSize, setFontSize }}>
-      {children}
-    </LogContext.Provider>
-  );
+  return <LogContext.Provider value={{ level, setLevel, activeLevels }}>{children}</LogContext.Provider>;
 };

 export const useLogContext = () => {
@@ -13,7 +13,6 @@ import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 import { fullHeightWithoutHeaderAndFooter } from "~/constants";
 import { createMetaTitle } from "~/metadata";
 import { ClientSideTerminalComponent } from "./client";
-import { LogFontSizeSlider } from "./font-size-slider";
 import { LogLevelSelection } from "./level-selection";
 import { LogContextProvider } from "./log-context";

@@ -39,10 +38,7 @@ export default async function LogsManagementPage() {
    <LogContextProvider defaultLevel={logsEnv.LEVEL}>
      <Group justify="space-between" align="center" wrap="nowrap">
        <DynamicBreadcrumb />
-        <Group gap="md" wrap="nowrap">
-          <LogFontSizeSlider />
-          <LogLevelSelection />
-        </Group>
+        <LogLevelSelection />
      </Group>
      <Box style={{ borderRadius: 6 }} h={fullHeightWithoutHeaderAndFooter} p="md" bg="black">
        <ClientSideTerminalComponent />
@@ -13,11 +13,9 @@ import classes from "./terminal.module.css";

 export const TerminalComponent = () => {
  const ref = useRef<HTMLDivElement>(null);
-  const { activeLevels, fontSize } = useLogContext();
+  const { activeLevels } = useLogContext();

  const terminalRef = useRef<Terminal>(null);
-  const fitAddonRef = useRef<FitAddon>(null);
-
  clientApi.log.subscribe.useSubscription(
    {
      levels: activeLevels,
@@ -28,6 +26,7 @@ export const TerminalComponent = () => {
        terminalRef.current?.refresh(0, terminalRef.current.rows - 1);
      },
      onError(err) {
+        // This makes sense as logging might cause an infinite loop
        alert(err);
      },
    },
@@ -44,14 +43,14 @@ export const TerminalComponent = () => {
      cursorBlink: false,
      disableStdin: true,
      convertEol: true,
-      fontSize,
    });
    terminalRef.current.open(ref.current);
    terminalRef.current.loadAddon(canvasAddon);

+    // This is a hack to make sure the terminal is rendered before we try to fit it
+    // You can blame @Meierschlumpf for this
    setTimeout(() => {
      const fitAddon = new FitAddon();
-      fitAddonRef.current = fitAddon;
      terminalRef.current?.loadAddon(fitAddon);
      fitAddon.fit();
    });
@@ -61,12 +60,5 @@ export const TerminalComponent = () => {
      canvasAddon.dispose();
    };
  }, []);
-
-  useEffect(() => {
-    if (!terminalRef.current) return;
-    terminalRef.current.options.fontSize = fontSize;
-    fitAddonRef.current?.fit();
-  }, [fontSize]);
-
  return <Box ref={ref} id="terminal" className={classes.outerTerminal} h="100%"></Box>;
 };
@@ -1,53 +0,0 @@
-"use client";
-
-import { Badge, Button, Group, Stack, Text } from "@mantine/core";
-import { IconRefresh } from "@tabler/icons-react";
-
-import { clientApi } from "@homarr/api/client";
-import { showSuccessNotification } from "@homarr/notifications";
-import { useScopedI18n } from "@homarr/translation/client";
-
-export const ResetTours = () => {
-  const t = useScopedI18n("management.page.user.setting.general.item.onboardingTours");
-  const utils = clientApi.useUtils();
-  const { data: tourStatus } = clientApi.user.getTourStatus.useQuery();
-  const { mutate: resetTours, isPending } = clientApi.user.resetTours.useMutation({
-    onSuccess() {
-      showSuccessNotification({
-        title: t("resetSuccess.title"),
-        message: t("resetSuccess.message"),
-      });
-      void utils.user.getTourStatus.invalidate();
-    },
-  });
-
-  const tours = [
-    { key: "management" as const, completed: tourStatus?.completedManageTour ?? false },
-    { key: "dashboard" as const, completed: tourStatus?.completedBoardTour ?? false },
-  ];
-
-  return (
-    <Stack gap="xs">
-      <Group gap="xs">
-        {tours.map(({ key, completed }) => (
-          <Badge key={key} color={completed ? "green" : "gray"} variant="light">
-            {t(`name.${key}`)}: {completed ? t("status.completed") : t("status.notStarted")}
-          </Badge>
-        ))}
-      </Group>
-      <Text size="sm" c="dimmed">
-        {t("description")}
-      </Text>
-      <Button
-        leftSection={<IconRefresh size={16} />}
-        variant="light"
-        size="sm"
-        w="fit-content"
-        onClick={() => resetTours()}
-        loading={isPending}
-      >
-        {t("reset")}
-      </Button>
-    </Stack>
-  );
-};
@@ -13,7 +13,6 @@ import { canAccessUserEditPage } from "../access";
 import { DeleteUserButton } from "./_components/_delete-user-button";
 import { UserGeneralSettingsForm } from "./_components/_general-settings-form";
 import { UserProfileAvatarForm } from "./_components/_profile-avatar-form";
-import { ResetTours } from "./_components/_reset-tours";

 interface Props {
  params: Promise<{
@@ -88,13 +87,6 @@ export default async function EditUserPage(props: Props) {
        </Box>
      </Group>

-      {session?.user.id === user.id && (
-        <Stack mb="lg">
-          <Title order={2}>{tGeneral("item.onboardingTours.title")}</Title>
-          <ResetTours />
-        </Stack>
-      )}
-
      <DangerZoneRoot>
        <DangerZoneItem
          label={t("user.action.delete.label")}
@@ -6,7 +6,6 @@ import { isProviderEnabled } from "@homarr/auth/server";
 import { getScopedI18n } from "@homarr/translation/server";
 import { 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 { createMetaTitle } from "~/metadata";
@@ -39,18 +38,14 @@ export default async function UsersPage() {
      title={t("list.title")}
      primaryAction={
        credentialsProviderEnabled ? (
-          <TourTarget id="manage-users-create">
-            <MobileAffixButton component={Link} href="/manage/users/create">
-              {t("create.title")}
-            </MobileAffixButton>
-          </TourTarget>
+          <MobileAffixButton component={Link} href="/manage/users/create">
+            {t("create.title")}
+          </MobileAffixButton>
        ) : undefined
      }
      floatingPrimaryAction={credentialsProviderEnabled}
    >
-      <TourTarget id="manage-users-list">
-        <UserListComponent initialUserList={userList} />
-      </TourTarget>
+      <UserListComponent initialUserList={userList} />
    </ManagePageLayout>
  );
 }
@@ -85,7 +85,6 @@ const BoardItemMenuInner = ({ offset, item, resetErrorBoundary }: BoardItemMenuP
        ),
        integrationSupport: "supportedIntegrations" in currentDefinition,
        settings,
-        appId: item.kind === "app" ? (item.options.appId as string | undefined) : undefined,
      },
      {
        title(t) {
@@ -1,11 +1,11 @@
 import { useCallback, useRef } from "react";
-import { Grid, NumberInput, Stack } from "@mantine/core";
+import { Button, Grid, Group, NumberInput, Stack } from "@mantine/core";
 import { z } from "zod/v4";

 import { useZodForm } from "@homarr/form";
 import type { GridStack } from "@homarr/gridstack";
-import { createModal, ModalFormFooter, modalSizeForm } from "@homarr/modals";
-import { useI18n } from "@homarr/translation/client";
+import { createModal } from "@homarr/modals";
+import { useI18n, useScopedI18n } from "@homarr/translation/client";

 import type { Item, SectionItem } from "~/app/[locale]/boards/_types";

@@ -16,7 +16,9 @@ interface InnerProps {
 }

 export const ItemMoveModal = createModal<InnerProps>(({ actions, innerProps }) => {
+  const tCommon = useScopedI18n("common");
  const t = useI18n();
+  // Keep track of the maximum width based on the x offset
  const maxWidthRef = useRef(innerProps.columnCount - innerProps.item.xOffset);
  const form = useZodForm(
    z.object({
@@ -36,6 +38,7 @@ export const ItemMoveModal = createModal<InnerProps>(({ actions, innerProps }) =
        height: innerProps.item.height,
      },
      onValuesChange(values, previous) {
+        // Update the maximum width when the x offset changes
        if (values.xOffset !== previous.xOffset) {
          maxWidthRef.current = innerProps.columnCount - values.xOffset;
        }
@@ -67,7 +70,6 @@ export const ItemMoveModal = createModal<InnerProps>(({ actions, innerProps }) =
          <Grid.Col span={{ base: 12, md: 6 }}>
            <NumberInput
              label={t("item.moveResize.field.xOffset.label")}
-              data-autofocus
              min={0}
              max={innerProps.columnCount - 1}
              {...form.getInputProps("xOffset")}
@@ -91,7 +93,12 @@ export const ItemMoveModal = createModal<InnerProps>(({ actions, innerProps }) =
            <NumberInput label={t("item.moveResize.field.height.label")} min={1} {...form.getInputProps("height")} />
          </Grid.Col>
        </Grid>
-        <ModalFormFooter onCancel={actions.closeModal} />
+        <Group justify="end">
+          <Button variant="subtle" onClick={actions.closeModal}>
+            {tCommon("action.cancel")}
+          </Button>
+          <Button type="submit">{tCommon("action.saveChanges")}</Button>
+        </Group>
      </Stack>
    </form>
  );
@@ -99,5 +106,5 @@ export const ItemMoveModal = createModal<InnerProps>(({ actions, innerProps }) =
  defaultTitle(t) {
    return t("item.moveResize.title");
  },
-  size: modalSizeForm,
+  size: "lg",
 });
@@ -1,14 +1,14 @@
 import { useMemo, useState } from "react";
-import { Avatar, Box, Button, Card, Center, Group, Stack, Text, Tooltip } from "@mantine/core";
+import { Avatar, Button, Card, Center, Grid, Group, Input, Stack, Text, Tooltip } from "@mantine/core";
+import { IconSearch } from "@tabler/icons-react";

 import { clientApi } from "@homarr/api/client";
 import { createId, objectEntries } from "@homarr/common";
 import { getIconUrl, getIntegrationName } from "@homarr/definitions";
 import type { IntegrationKind, WidgetKind } from "@homarr/definitions";
-import { createModal, modalSizeSelect, useModalAction } from "@homarr/modals";
+import { createModal, useModalAction } from "@homarr/modals";
 import { useSettings } from "@homarr/settings";
 import { useI18n } from "@homarr/translation/client";
-import { SelectGridLayout, selectGridCardHeight } from "@homarr/ui";
 import type { TablerIcon } from "@homarr/ui";
 import { reduceWidgetOptionsWithDefaultValues, widgetImports } from "@homarr/widgets";
 import { WidgetEditModal } from "@homarr/widgets/modals";
@@ -86,31 +86,32 @@ export const ItemSelectModal = createModal<void>(({ actions }) => {
  };

  return (
-    <SelectGridLayout
-      search={search}
-      onSearchChange={setSearch}
-      placeholder={`${t("item.create.search")}...`}
-      onSearchKeyDown={(event) => {
-        if (event.key === "Enter" && filteredItems.length === 1) {
-          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          handleAdd(filteredItems[0]!.kind);
-        }
-      }}
-    >
-      {filteredItems.map((item) => (
-        <WidgetItem key={item.kind} item={item} onSelect={() => handleAdd(item.kind)} />
-      ))}
+    <Stack>
+      <Input
+        value={search}
+        onChange={(event) => setSearch(event.currentTarget.value)}
+        leftSection={<IconSearch />}
+        placeholder={`${t("item.create.search")}...`}
+        data-autofocus
+        onKeyDown={(event) => {
+          // Add item if there is only one item in the list and user presses Enter
+          if (event.key === "Enter" && filteredItems.length === 1) {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            handleAdd(filteredItems[0]!.kind);
+          }
+        }}
+      />

-      {filteredItems.length === 0 && (
-        <Center p="xl">
-          <Text c="dimmed">{t("common.noResults")}</Text>
-        </Center>
-      )}
-    </SelectGridLayout>
+      <Grid>
+        {filteredItems.map((item) => (
+          <WidgetItem key={item.kind} item={item} onSelect={() => handleAdd(item.kind)} />
+        ))}
+      </Grid>
+    </Stack>
  );
 }).withOptions({
  defaultTitle: (t) => t("item.create.title"),
-  size: modalSizeSelect,
+  size: "xl",
 });

 const WidgetItem = ({
@@ -129,58 +130,46 @@ const WidgetItem = ({
  const t = useI18n();

  return (
-    <Card
-      h={selectGridCardHeight}
-      withBorder
-      pos="relative"
-      style={{ overflow: "hidden", "--_hover-opacity": "0" }}
-      onMouseEnter={(e) => e.currentTarget.style.setProperty("--_hover-opacity", "1")}
-      onMouseLeave={(e) => e.currentTarget.style.setProperty("--_hover-opacity", "0")}
-    >
-      <Stack h="100%" gap="xs">
-        <Group gap="sm" wrap="nowrap" align="flex-start">
-          <item.icon size={22} style={{ flexShrink: 0, marginTop: 2 }} />
-          <Text lh={1.2} style={{ whiteSpace: "normal" }} fw={500} size="sm" lineClamp={2}>
-            {item.name}
-          </Text>
-        </Group>
-        <Tooltip label={item.description} multiline w={250} disabled={!item.description}>
-          <Text lh={1.2} style={{ whiteSpace: "normal" }} size="xs" c="dimmed" lineClamp={1}>
-            {item.description}
-          </Text>
-        </Tooltip>
-        <SupportedIntegrations integrations={item.supportedIntegrations} />
-      </Stack>
-      <Box
-        pos="absolute"
-        bottom={0}
-        left={0}
-        right={0}
-        p="xs"
-        style={{
-          opacity: "var(--_hover-opacity)",
-          transition: "opacity 150ms ease",
-          background: "linear-gradient(transparent, var(--mantine-color-body) 30%)",
-        }}
-      >
-        <Button onClick={onSelect} variant="light" size="xs" fullWidth>
-          {t(`item.create.addToBoard`)}
-        </Button>
-      </Box>
-    </Card>
+    <Grid.Col span={{ xs: 12, sm: 4, md: 3 }}>
+      <Card h="100%">
+        <Stack justify="space-between" h="100%">
+          <Stack gap="xs">
+            <Center>
+              <item.icon />
+            </Center>
+            <Text lh={1.2} style={{ whiteSpace: "normal" }} ta="center">
+              {item.name}
+            </Text>
+            <Text lh={1.2} style={{ whiteSpace: "normal" }} size="xs" ta="center" c="dimmed">
+              {item.description}
+            </Text>
+          </Stack>
+          <SupportedIntegrations mt="auto" integrations={item.supportedIntegrations} />
+          <Button onClick={onSelect} variant="light" size="xs" fullWidth>
+            {t(`item.create.addToBoard`)}
+          </Button>
+        </Stack>
+      </Card>
+    </Grid.Col>
  );
 };

-const SupportedIntegrations = ({ integrations }: { integrations: IntegrationKind[] }) => {
+interface SupportedIntegrationsProps {
+  integrations: IntegrationKind[];
+  mt: string;
+}
+
+const SupportedIntegrations = ({ integrations, mt }: SupportedIntegrationsProps) => {
  if (integrations.length === 0) {
    return null;
  }

+  // When there are 8 or more integrations, we show 6 and a "+X" avatar. Otherwise, we show all integrations.
  const countToShow = integrations.length >= 8 ? 6 : 7;
  const moreCount = integrations.length - countToShow;

  return (
-    <Group gap={2} mt="auto">
+    <Center mt={mt}>
      <Tooltip.Group closeDelay={100}>
        <Group gap={2}>
          {integrations.slice(0, countToShow).map((integration) => (
@@ -206,6 +195,6 @@ const SupportedIntegrations = ({ integrations }: { integrations: IntegrationKind
          )}
        </Group>
      </Tooltip.Group>
-    </Group>
+    </Center>
  );
 };
@@ -1,8 +1,8 @@
-import { Stack, TextInput } from "@mantine/core";
+import { Button, Group, Stack, TextInput } from "@mantine/core";
 import { z } from "zod/v4";

 import { useZodForm } from "@homarr/form";
-import { createModal, ModalFormFooter, modalSizeForm } from "@homarr/modals";
+import { createModal } from "@homarr/modals";
 import { useI18n } from "@homarr/translation/client";

 interface Category {
@@ -36,10 +36,13 @@ export const CategoryEditModal = createModal<InnerProps>(({ actions, innerProps
    >
      <Stack>
        <TextInput label={t("section.category.field.name.label")} data-autofocus {...form.getInputProps("name")} />
-        <ModalFormFooter onCancel={actions.closeModal} submitLabel={innerProps.submitLabel} />
+        <Group justify="right">
+          <Button onClick={actions.closeModal} variant="subtle" color="gray">
+            {t("common.action.cancel")}
+          </Button>
+          <Button type="submit">{innerProps.submitLabel}</Button>
+        </Group>
      </Stack>
    </form>
  );
-}).withOptions({
-  size: modalSizeForm,
-});
+}).withOptions({});
@@ -1,10 +1,10 @@
 "use client";

-import { CloseButton, ColorInput, Stack, TextInput, useMantineTheme } from "@mantine/core";
+import { Button, CloseButton, ColorInput, Group, Stack, TextInput, useMantineTheme } from "@mantine/core";
 import type { z } from "zod/v4";

 import { useZodForm } from "@homarr/form";
-import { createModal, ModalFormFooter, modalSizeForm } from "@homarr/modals";
+import { createModal } from "@homarr/modals";
 import { useI18n } from "@homarr/translation/client";
 import { TextMultiSelect } from "@homarr/ui";
 import { dynamicSectionOptionsSchema } from "@homarr/validation/shared";
@@ -31,7 +31,7 @@ export const DynamicSectionEditModal = createModal<ModalProps>(({ actions, inner
      })}
    >
      <Stack>
-        <TextInput label={t("section.dynamic.option.title.label")} data-autofocus {...form.getInputProps("title")} />
+        <TextInput label={t("section.dynamic.option.title.label")} {...form.getInputProps("title")} />
        <TextMultiSelect
          label={t("section.dynamic.option.customCssClasses.label")}
          {...form.getInputProps("customCssClasses")}
@@ -48,7 +48,14 @@ export const DynamicSectionEditModal = createModal<ModalProps>(({ actions, inner
          }
          {...form.getInputProps("borderColor")}
        />
-        <ModalFormFooter onCancel={actions.closeModal} />
+        <Group justify="end">
+          <Group justify="end" w={{ base: "100%", xs: "auto" }}>
+            <Button onClick={actions.closeModal} variant="subtle" color="gray">
+              {t("common.action.cancel")}
+            </Button>
+            <Button type="submit">{t("common.action.saveChanges")}</Button>
+          </Group>
+        </Group>
      </Stack>
    </form>
  );
@@ -56,5 +63,5 @@ export const DynamicSectionEditModal = createModal<ModalProps>(({ actions, inner
  defaultTitle(t) {
    return t("item.edit.title");
  },
-  size: modalSizeForm,
+  size: "lg",
 });
@@ -1,95 +0,0 @@
-import { objectEntries } from "@homarr/common";
-import type { IntegrationKind, WidgetKind } from "@homarr/definitions";
-import {
-  featuredIntegrations,
-  getIntegrationName,
-  hiddenFromOnboarding,
-  integrationDefs,
-  integrationKinds,
-} from "@homarr/definitions";
-import { widgetImports } from "@homarr/widgets";
-
-const buildWidgetsByIntegration = () => {
-  const map = Object.fromEntries(integrationKinds.map((kind) => [kind, [] as WidgetKind[]])) as Record<
-    IntegrationKind,
-    WidgetKind[]
-  >;
-
-  for (const [widgetKind, widget] of objectEntries(widgetImports)) {
-    const supported =
-      "supportedIntegrations" in widget.definition
-        ? (widget.definition.supportedIntegrations as IntegrationKind[])
-        : [];
-    for (const kind of supported) {
-      if (kind in map) {
-        map[kind].push(widgetKind);
-      }
-    }
-  }
-  return map;
-};
-
-export const widgetsByIntegration = buildWidgetsByIntegration();
-
-export const categoryTranslationKeys: Record<string, string> = {
-  dnsHole: "integration.category.dnsHole",
-  mediaService: "integration.category.mediaService",
-  calendar: "integration.category.calendar",
-  mediaSearch: "integration.category.mediaSearch",
-  mediaRelease: "integration.category.mediaRelease",
-  mediaRequest: "integration.category.mediaRequest",
-  downloadClient: "integration.category.downloadClient",
-  usenet: "integration.category.usenet",
-  torrent: "integration.category.torrent",
-  miscellaneous: "integration.category.miscellaneous",
-  smartHomeServer: "integration.category.smartHomeServer",
-  indexerManager: "integration.category.indexerManager",
-  healthMonitoring: "integration.category.healthMonitoring",
-  search: "integration.category.search",
-  mediaTranscoding: "integration.category.mediaTranscoding",
-  networkController: "integration.category.networkController",
-  releasesProvider: "integration.category.releasesProvider",
-  notifications: "integration.category.notifications",
-  firewall: "integration.category.firewall",
-  timetable: "integration.category.timetable",
-  photoService: "integration.category.photoService",
-  notes: "integration.category.notes",
-  mediaMonitoring: "integration.category.mediaMonitoring",
-  speedtest: "integration.category.speedtest",
-  analytics: "integration.category.analytics",
-};
-
-export interface IntegrationGridItem {
-  kind: IntegrationKind;
-  name: string;
-  categories: string[];
-  widgets: WidgetKind[];
-}
-
-export const buildSortedIntegrations = (
-  options: { enableMockIntegration?: boolean; onboarding?: boolean } = {},
-): IntegrationGridItem[] =>
-  integrationKinds
-    .filter((kind) => {
-      if (options.onboarding && hiddenFromOnboarding.has(kind)) return false;
-      if (options.onboarding && widgetsByIntegration[kind].length === 0) return false;
-      if (!options.enableMockIntegration && kind === "mock") return false;
-      return true;
-    })
-    .map((kind) => ({
-      kind,
-      name: getIntegrationName(kind),
-      categories: [...new Set(integrationDefs[kind].category.flat())] as string[],
-      widgets: widgetsByIntegration[kind],
-    }))
-    .sort((left, right) => {
-      const leftIdx = featuredIntegrations.indexOf(left.kind);
-      const rightIdx = featuredIntegrations.indexOf(right.kind);
-      if (leftIdx !== -1 && rightIdx !== -1) return leftIdx - rightIdx;
-      if (leftIdx !== -1) return -1;
-      if (rightIdx !== -1) return 1;
-      return right.widgets.length - left.widgets.length || left.name.localeCompare(right.name);
-    });
-
-export const filterIntegrations = (items: IntegrationGridItem[], search: string) =>
-  items.filter((i) => i.name.toLowerCase().includes(search.toLowerCase().trim()));
@@ -1,140 +0,0 @@
-"use client";
-
-import { useCallback, useMemo, useState } from "react";
-import { Badge, Card, Center, Group, Stack, Text, Tooltip } from "@mantine/core";
-import { IconBrandDocker, IconCheck, IconPuzzle } from "@tabler/icons-react";
-
-import type { IntegrationKind } from "@homarr/definitions";
-import { useI18n } from "@homarr/translation/client";
-import { IntegrationAvatar, SelectGridLayout, selectGridCardHeight } from "@homarr/ui";
-
-import { buildSortedIntegrations, categoryTranslationKeys, filterIntegrations } from "./integration-grid-shared";
-
-interface IntegrationMultiSelectGridProps {
-  selectedKinds: IntegrationKind[];
-  onSelectionChange: (kinds: IntegrationKind[]) => void;
-  enableMockIntegration?: boolean;
-  onboarding?: boolean;
-  detectedKinds?: Set<IntegrationKind>;
-}
-
-export const IntegrationMultiSelectGrid = ({
-  selectedKinds: selectedKindsArray,
-  onSelectionChange,
-  enableMockIntegration = false,
-  onboarding = false,
-  detectedKinds,
-}: IntegrationMultiSelectGridProps) => {
-  const [search, setSearch] = useState("");
-  const selectedKinds = useMemo(() => new Set(selectedKindsArray), [selectedKindsArray]);
-  const t = useI18n();
-
-  const toggleKind = useCallback(
-    (kind: IntegrationKind) => {
-      const current = new Set(selectedKindsArray);
-      if (current.has(kind)) {
-        current.delete(kind);
-      } else {
-        current.add(kind);
-      }
-      onSelectionChange(Array.from(current));
-    },
-    [selectedKindsArray, onSelectionChange],
-  );
-
-  const integrations = useMemo(
-    () => buildSortedIntegrations({ enableMockIntegration, onboarding }),
-    [enableMockIntegration, onboarding],
-  );
-
-  const sorted = useMemo(() => {
-    if (!detectedKinds || detectedKinds.size === 0) return integrations;
-    const detected = integrations.filter((i) => detectedKinds.has(i.kind));
-    const rest = integrations.filter((i) => !detectedKinds.has(i.kind));
-    return [...detected, ...rest];
-  }, [integrations, detectedKinds]);
-
-  const filtered = useMemo(() => filterIntegrations(sorted, search), [sorted, search]);
-
-  return (
-    <SelectGridLayout
-      search={search}
-      onSearchChange={setSearch}
-      placeholder={`${t("integration.page.list.search")}...`}
-      disableScroll={onboarding}
-      disableAutoFocus={onboarding}
-    >
-      {filtered.map((integration) => {
-        const isSelected = selectedKinds.has(integration.kind);
-        const isDetected = detectedKinds?.has(integration.kind) ?? false;
-        return (
-          <Card
-            key={integration.kind}
-            h={selectGridCardHeight}
-            style={{
-              cursor: "pointer",
-              borderColor: isSelected ? "var(--mantine-color-blue-6)" : undefined,
-              borderWidth: isSelected ? 2 : undefined,
-            }}
-            onClick={() => toggleKind(integration.kind)}
-            withBorder
-          >
-            <Stack justify="space-between" h="100%" gap="xs">
-              <Group gap="sm" wrap="nowrap" align="flex-start">
-                <IntegrationAvatar kind={integration.kind} size="sm" />
-                <Text fw={500} lh={1.2} size="sm" lineClamp={2} style={{ flex: 1 }}>
-                  {integration.name}
-                </Text>
-                {isSelected && <IconCheck size={18} color="var(--mantine-color-blue-6)" style={{ flexShrink: 0 }} />}
-              </Group>
-
-              <Stack gap={4} mt="auto">
-                {isDetected && (
-                  <Badge variant="light" color="teal" size="xs" leftSection={<IconBrandDocker size={12} />}>
-                    {t("integration.grid.detected")}
-                  </Badge>
-                )}
-                <Group gap={4} wrap="wrap">
-                  {integration.categories.slice(0, 2).map((cat) => (
-                    <Badge key={cat} variant="light" size="xs">
-                      {categoryTranslationKeys[cat] ? t(categoryTranslationKeys[cat] as never) : cat}
-                    </Badge>
-                  ))}
-                </Group>
-                {integration.widgets.length > 0 ? (
-                  <Tooltip
-                    multiline
-                    w={200}
-                    label={
-                      <Stack gap={4}>
-                        {integration.widgets.map((widgetKind) => (
-                          <Text key={widgetKind} size="xs">
-                            {t(`widget.${widgetKind}.name`)}
-                          </Text>
-                        ))}
-                      </Stack>
-                    }
-                  >
-                    <Badge variant="light" color="blue" size="sm" leftSection={<IconPuzzle size={12} />}>
-                      {t("integration.grid.widgetCount", { count: String(integration.widgets.length) })}
-                    </Badge>
-                  </Tooltip>
-                ) : (
-                  <Badge variant="light" color="gray" size="sm">
-                    {t("integration.grid.noWidgets")}
-                  </Badge>
-                )}
-              </Stack>
-            </Stack>
-          </Card>
-        );
-      })}
-
-      {filtered.length === 0 && (
-        <Center p="xl">
-          <Text c="dimmed">{t("common.noResults")}</Text>
-        </Center>
-      )}
-    </SelectGridLayout>
-  );
-};
@@ -1,90 +0,0 @@
-"use client";
-
-import { useMemo, useState } from "react";
-import { Badge, Card, Center, Group, Stack, Text, Tooltip } from "@mantine/core";
-import { IconPuzzle } from "@tabler/icons-react";
-
-import type { IntegrationKind } from "@homarr/definitions";
-import { useI18n } from "@homarr/translation/client";
-import { IntegrationAvatar, SelectGridLayout, selectGridCardHeight } from "@homarr/ui";
-
-import { buildSortedIntegrations, categoryTranslationKeys, filterIntegrations } from "./integration-grid-shared";
-
-interface IntegrationSelectGridProps {
-  onSelect: (kind: IntegrationKind) => void;
-  enableMockIntegration?: boolean;
-}
-
-export const IntegrationSelectGrid = ({ onSelect, enableMockIntegration = false }: IntegrationSelectGridProps) => {
-  const [search, setSearch] = useState("");
-  const t = useI18n();
-
-  const integrations = useMemo(() => buildSortedIntegrations({ enableMockIntegration }), [enableMockIntegration]);
-  const filtered = useMemo(() => filterIntegrations(integrations, search), [integrations, search]);
-
-  return (
-    <SelectGridLayout
-      search={search}
-      onSearchChange={setSearch}
-      placeholder={`${t("integration.page.list.search")}...`}
-    >
-      {filtered.map((integration) => (
-        <Card
-          key={integration.kind}
-          h={selectGridCardHeight}
-          style={{ cursor: "pointer" }}
-          onClick={() => onSelect(integration.kind)}
-          withBorder
-        >
-          <Stack justify="space-between" h="100%" gap="xs">
-            <Group gap="sm" wrap="nowrap" align="flex-start">
-              <IntegrationAvatar kind={integration.kind} size="sm" />
-              <Text fw={500} lh={1.2} size="sm" lineClamp={2}>
-                {integration.name}
-              </Text>
-            </Group>
-
-            <Stack gap={4} mt="auto">
-              <Group gap={4} wrap="wrap">
-                {integration.categories.slice(0, 2).map((cat) => (
-                  <Badge key={cat} variant="light" size="xs">
-                    {categoryTranslationKeys[cat] ? t(categoryTranslationKeys[cat] as never) : cat}
-                  </Badge>
-                ))}
-              </Group>
-              {integration.widgets.length > 0 ? (
-                <Tooltip
-                  multiline
-                  w={200}
-                  label={
-                    <Stack gap={4}>
-                      {integration.widgets.map((widgetKind) => (
-                        <Text key={widgetKind} size="xs">
-                          {t(`widget.${widgetKind}.name`)}
-                        </Text>
-                      ))}
-                    </Stack>
-                  }
-                >
-                  <Badge variant="light" color="blue" size="sm" leftSection={<IconPuzzle size={12} />}>
-                    {t("integration.grid.widgetCount", { count: String(integration.widgets.length) })}
-                  </Badge>
-                </Tooltip>
-              ) : (
-                <Badge variant="light" color="gray" size="sm">
-                  {t("integration.grid.noWidgets")}
-                </Badge>
-              )}
-            </Stack>
-          </Stack>
-        </Card>
-      ))}
-
-      {filtered.length === 0 && (
-        <Center p="xl">
-          <Text c="dimmed">{t("common.noResults")}</Text>
-        </Center>
-      )}
-    </SelectGridLayout>
-  );
-};
@@ -1,56 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import { Group, ScrollArea, Title } from "@mantine/core";
-import { IconArrowLeft } from "@tabler/icons-react";
-
-import type { IntegrationKind } from "@homarr/definitions";
-import { getIntegrationName } from "@homarr/definitions";
-import { createModal, modalSizeSelect } from "@homarr/modals";
-import { IntegrationAvatar } from "@homarr/ui";
-
-import { NewIntegrationForm } from "~/app/[locale]/manage/integrations/new/_integration-new-form";
-import { IntegrationSelectGrid } from "./integration-select-grid";
-
-interface IntegrationSelectModalProps {
-  onSuccess?: () => void;
-  enableMockIntegration?: boolean;
-}
-
-export const IntegrationSelectModal = createModal<IntegrationSelectModalProps>(({ actions, innerProps }) => {
-  const [step, setStep] = useState<"select" | "form">("select");
-  const [selectedKind, setSelectedKind] = useState<IntegrationKind | null>(null);
-
-  const handleSelect = (kind: IntegrationKind) => {
-    setSelectedKind(kind);
-    setStep("form");
-  };
-
-  const handleBack = () => {
-    setStep("select");
-    setSelectedKind(null);
-  };
-
-  const handleSuccess = () => {
-    innerProps.onSuccess?.();
-    actions.closeModal();
-  };
-
-  if (step === "form" && selectedKind) {
-    return (
-      <ScrollArea.Autosize mah="80vh">
-        <Group gap="xs" mb="md" style={{ cursor: "pointer" }} onClick={handleBack}>
-          <IconArrowLeft size={18} />
-          <IntegrationAvatar kind={selectedKind} size="sm" />
-          <Title order={4}>{getIntegrationName(selectedKind)}</Title>
-        </Group>
-        <NewIntegrationForm kind={selectedKind} onSuccess={handleSuccess} onCancel={handleBack} />
-      </ScrollArea.Autosize>
-    );
-  }
-
-  return <IntegrationSelectGrid onSelect={handleSelect} enableMockIntegration={innerProps.enableMockIntegration} />;
-}).withOptions({
-  defaultTitle: (t) => t("integration.action.create"),
-  size: modalSizeSelect,
-});
@@ -6,7 +6,6 @@ import { Link } from "@homarr/ui";

 import { ClientBurger } from "./header/burger";
 import { DesktopSearchInput, MobileSearchButton } from "./header/search";
-import { TourTarget } from "./header/tour-target";
 import { UserButton } from "./header/user";
 import { HomarrLogoWithTitle } from "./logo/homarr-logo";

@@ -26,15 +25,11 @@ export const MainHeader = ({ logo, actions, hasNavigation = true }: Props) => {
            {logo ?? <HomarrLogoWithTitle size="md" />}
          </UnstyledButton>
        </Group>
-        <TourTarget id="board-search">
-          <DesktopSearchInput />
-        </TourTarget>
+        <DesktopSearchInput />
        <Group h="100%" align="center" justify="end" style={{ flex: 1 }} wrap="nowrap">
          {actions}
          <MobileSearchButton />
-          <TourTarget id="board-user-menu">
-            <UserButton />
-          </TourTarget>
+          <UserButton />
        </Group>
      </Group>
      <Spotlight />
@@ -1,11 +0,0 @@
-"use client";
-
-import type { ReactNode } from "react";
-import { OnboardingTour } from "@gfazioli/mantine-onboarding-tour";
-import { Box } from "@mantine/core";
-
-export const TourTarget = ({ id, children }: { id: string; children: ReactNode }) => (
-  <OnboardingTour.Target id={id}>
-    <Box data-tour-target={id}>{children}</Box>
-  </OnboardingTour.Target>
-);
@@ -2,7 +2,6 @@

 import type { ReactNode } from "react";
 import { usePathname } from "next/navigation";
-import { OnboardingTour } from "@gfazioli/mantine-onboarding-tour";
 import { NavLink } from "@mantine/core";

 import { Link } from "@homarr/ui";
@@ -10,15 +9,9 @@ import { Link } from "@homarr/ui";
 export const CommonNavLink = (props: ClientNavigationLink) =>
  "href" in props ? <NavLinkHref {...props} /> : <NavLinkWithItems {...props} />;

-const TourTarget = ({ id, children }: { id?: string; children: ReactNode }) => {
-  if (!id) return <>{children}</>;
-  return <OnboardingTour.Target id={id}>{children}</OnboardingTour.Target>;
-};
-
 const NavLinkHref = (props: NavigationLinkHref) => {
  const pathname = usePathname();
-  const tourId = props["data-onboarding-tour-id"];
-  const link = props.external ? (
+  return props.external ? (
    <NavLink component="a" label={props.label} leftSection={props.icon} href={props.href} target="_blank" />
  ) : (
    <NavLink
@@ -29,26 +22,23 @@ const NavLinkHref = (props: NavigationLinkHref) => {
      active={pathname === props.href}
    />
  );
-  return <TourTarget id={tourId}>{link}</TourTarget>;
 };

 const NavLinkWithItems = (props: NavigationLinkWithItems) => {
  const pathname = usePathname();
  const isActive = props.items.some((item) => item.href === pathname);
-  const nav = (
+  return (
    <NavLink label={props.label} leftSection={props.icon} defaultOpened={isActive}>
      {props.items.map((item) => (
        <NavLinkHref key={item.label} {...item} />
      ))}
    </NavLink>
  );
-  return <TourTarget id={props["data-onboarding-tour-id"]}>{nav}</TourTarget>;
 };

 interface CommonNavigationLinkProps {
  label: string;
  icon: ReactNode;
-  "data-onboarding-tour-id"?: string;
 }

 interface NavigationLinkHref extends CommonNavigationLinkProps {
@@ -27,7 +27,7 @@ export const MainNavigation = ({ headerSection, footerSection, links }: MainNavi
            return null;
          }

-          const { icon: TablerIcon, iconProps, "data-onboarding-tour-id": tourId, ...props } = link;
+          const { icon: TablerIcon, iconProps, ...props } = link;
          const Icon =
            typeof TablerIcon === "string" ? (
              <Image src={TablerIcon} w={20} h={20} />
@@ -38,20 +38,17 @@ export const MainNavigation = ({ headerSection, footerSection, links }: MainNavi
          if ("items" in props) {
            clientLink = {
              ...props,
-              "data-onboarding-tour-id": tourId,
              items: props.items
                .filter((item) => !item.hidden)
                .map((item) => {
-                  const { "data-onboarding-tour-id": itemTourId, ...rest } = item;
                  return {
-                    ...rest,
-                    "data-onboarding-tour-id": itemTourId,
+                    ...item,
                    icon: <item.icon size={20} stroke={1.5} {...iconProps} />,
                  };
                }),
            } as ClientNavigationLink;
          } else {
-            clientLink = { ...props, "data-onboarding-tour-id": tourId } as ClientNavigationLink;
+            clientLink = props as ClientNavigationLink;
          }
          return <CommonNavLink key={index} {...clientLink} icon={Icon} />;
        })}
@@ -66,7 +63,6 @@ interface CommonNavigationLinkProps {
  icon: TablerIcon | string;
  iconProps?: TablerIconProps;
  hidden?: boolean;
-  "data-onboarding-tour-id"?: string;
 }

 interface NavigationLinkHref extends CommonNavigationLinkProps {
@@ -1,108 +0,0 @@
-"use client";
-
-import type { PropsWithChildren } from "react";
-import { useMemo } from "react";
-import type { OnboardingTourStep } from "@gfazioli/mantine-onboarding-tour";
-
-import { clientApi } from "@homarr/api/client";
-import { useRequiredBoard } from "@homarr/boards/context";
-import { createDocumentationLink } from "@homarr/definitions";
-import { useScopedI18n } from "@homarr/translation/client";
-
-import { useBoardPermissions } from "~/components/board/permissions/client";
-import { TourShell } from "./tour-shell";
-import { TourStepContent } from "./tour-step-content";
-
-export const BoardTourProvider = ({ children }: PropsWithChildren) => {
-  const t = useScopedI18n("onboardingTour.board");
-  const board = useRequiredBoard();
-  const { hasChangeAccess } = useBoardPermissions(board);
-  const utils = clientApi.useUtils();
-  const { data: tourStatus } = clientApi.user.getTourStatus.useQuery();
-  const { mutate: completeTour } = clientApi.user.completeTour.useMutation({
-    onSuccess() {
-      void utils.user.getTourStatus.invalidate();
-    },
-  });
-
-  const started = tourStatus !== undefined && !tourStatus.completedBoardTour;
-
-  const handleEnd = () => {
-    utils.user.getTourStatus.setData(undefined, {
-      completedManageTour: tourStatus?.completedManageTour ?? false,
-      completedBoardTour: true,
-    });
-    completeTour({ tour: "board" });
-  };
-
-  const steps = useMemo(() => {
-    const allSteps: (OnboardingTourStep & { requiresChangeAccess?: boolean })[] = [
-      {
-        id: "board-search",
-        title: t("welcome.title"),
-        content: (
-          <TourStepContent
-            description={t("welcome.description")}
-            documentationHref={createDocumentationLink(
-              "/docs/getting-started/after-the-installation",
-              "#creating-your-first-board",
-            )}
-          />
-        ),
-      },
-      {
-        id: "board-edit-mode",
-        title: t("editMode.title"),
-        requiresChangeAccess: true,
-        content: (
-          <TourStepContent
-            description={t("editMode.description")}
-            documentationHref={createDocumentationLink(
-              "/docs/getting-started/after-the-installation",
-              "#arrange-and-organize-your-board",
-            )}
-          />
-        ),
-      },
-      {
-        id: "board-settings",
-        title: t("settings.title"),
-        requiresChangeAccess: true,
-        content: (
-          <TourStepContent
-            description={t("settings.description")}
-            documentationHref={createDocumentationLink("/docs/management/boards")}
-          />
-        ),
-      },
-      {
-        id: "board-switcher",
-        title: t("switcher.title"),
-        content: (
-          <TourStepContent
-            description={t("switcher.description")}
-            documentationHref={createDocumentationLink("/docs/management/boards")}
-          />
-        ),
-      },
-      {
-        id: "board-user-menu",
-        title: t("userMenu.title"),
-        content: (
-          <TourStepContent
-            description={t("userMenu.description")}
-            documentationHref={createDocumentationLink("/docs/management/users")}
-          />
-        ),
-      },
-    ];
-
-    return allSteps.filter((step) => !step.requiresChangeAccess || hasChangeAccess) as OnboardingTourStep[];
-  }, [hasChangeAccess, t]);
-
-  return (
-    <TourShell steps={steps} started={started} onEnd={handleEnd} position={{ base: "bottom", sm: "left" }}>
-      {children}
-    </TourShell>
-  );
-};
@@ -1,220 +0,0 @@
-"use client";
-
-import type { PropsWithChildren } from "react";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { usePathname, useRouter } from "next/navigation";
-import type { OnboardingTourFocusRevealProps, OnboardingTourStep } from "@gfazioli/mantine-onboarding-tour";
-import { useMediaQuery } from "@mantine/hooks";
-import {
-  IconAffiliateFilled,
-  IconAppsFilled,
-  IconLayoutDashboardFilled,
-  IconPlus,
-  IconUserFilled,
-} from "@tabler/icons-react";
-
-import { clientApi } from "@homarr/api/client";
-import { createDocumentationLink } from "@homarr/definitions";
-import { useScopedI18n } from "@homarr/translation/client";
-
-import { TourShell } from "./tour-shell";
-import { TourStepContent } from "./tour-step-content";
-
-interface ManageTourProviderProps extends PropsWithChildren {
-  isAdmin: boolean;
-}
-
-const stepRoutes: Record<string, string> = {
-  "manage-welcome": "/manage",
-  "manage-boards-list": "/manage/boards",
-  "manage-boards-create": "/manage/boards",
-  "manage-apps-list": "/manage/apps",
-  "manage-apps-create": "/manage/apps",
-  "manage-integrations-list": "/manage/integrations",
-  "manage-integrations-create": "/manage/integrations",
-  "manage-users-list": "/manage/users",
-  "manage-users-create": "/manage/users",
-};
-
-const usersStepFocusRevealProps: OnboardingTourFocusRevealProps = {
-  withReveal: false,
-  popoverProps: {
-    position: "bottom",
-    middlewares: { shift: { padding: 16 }, flip: true },
-  },
-};
-
-export const ManageTourProvider = ({ children, isAdmin }: ManageTourProviderProps) => {
-  const t = useScopedI18n("onboardingTour.manage");
-  const utils = clientApi.useUtils();
-  const { data: tourStatus } = clientApi.user.getTourStatus.useQuery();
-  const { mutate: completeTour } = clientApi.user.completeTour.useMutation({
-    onSuccess() {
-      void utils.user.getTourStatus.invalidate();
-    },
-  });
-  const isMobile = useMediaQuery("(max-width: 48em)");
-  const pathname = usePathname();
-  const router = useRouter();
-
-  const isManageHome = /^(\/[^/]+)?\/manage\/?$/.test(pathname);
-  const isManageSection = /^(\/[^/]+)?\/manage(\/.*)?$/.test(pathname);
-
-  const [tourActive, setTourActive] = useState(false);
-  const [tourDismissed, setTourDismissed] = useState(false);
-  const wasManageTourCompletedRef = useRef(tourStatus?.completedManageTour);
-
-  useEffect(() => {
-    if (tourDismissed) return;
-    if (isManageHome && tourStatus !== undefined && !tourStatus.completedManageTour && !isMobile) {
-      setTourActive(true);
-    }
-  }, [isManageHome, tourStatus, isMobile, tourDismissed]);
-
-  useEffect(() => {
-    if (!isManageSection) {
-      setTourActive(false);
-    }
-  }, [isManageSection]);
-
-  useEffect(() => {
-    const wasCompleted = wasManageTourCompletedRef.current;
-    const isCompleted = tourStatus?.completedManageTour;
-    if (wasCompleted === true && isCompleted === false) {
-      setTourDismissed(false);
-    }
-    wasManageTourCompletedRef.current = isCompleted;
-  }, [tourStatus?.completedManageTour]);
-
-  const handleEnd = useCallback(() => {
-    setTourDismissed(true);
-    setTourActive(false);
-    utils.user.getTourStatus.setData(undefined, {
-      completedManageTour: true,
-      completedBoardTour: tourStatus?.completedBoardTour ?? false,
-    });
-    completeTour({ tour: "manage" });
-    router.push("/manage");
-  }, [completeTour, router, tourStatus?.completedBoardTour, utils.user.getTourStatus]);
-
-  const steps = useMemo(() => {
-    const allSteps: (OnboardingTourStep & { adminOnly?: boolean })[] = [
-      {
-        id: "manage-welcome",
-        title: t("welcome.title"),
-        content: (
-          <TourStepContent
-            description={t("welcome.description")}
-            documentationHref={createDocumentationLink("/docs/category/management")}
-          />
-        ),
-      },
-      {
-        id: "manage-boards-list",
-        title: t("boardsList.title"),
-        content: (
-          <TourStepContent
-            description={t("boardsList.description")}
-            documentationHref={createDocumentationLink("/docs/management/boards")}
-            icon={<IconLayoutDashboardFilled size={18} />}
-          />
-        ),
-      },
-      {
-        id: "manage-boards-create",
-        title: t("boardsCreate.title"),
-        content: (
-          <TourStepContent
-            description={t("boardsCreate.description")}
-            documentationHref={createDocumentationLink("/docs/management/boards")}
-            icon={<IconPlus size={18} />}
-          />
-        ),
-      },
-      {
-        id: "manage-apps-list",
-        title: t("appsList.title"),
-        content: (
-          <TourStepContent
-            description={t("appsList.description")}
-            documentationHref={createDocumentationLink("/docs/management/apps")}
-            icon={<IconAppsFilled size={18} />}
-          />
-        ),
-      },
-      {
-        id: "manage-apps-create",
-        title: t("appsCreate.title"),
-        content: (
-          <TourStepContent
-            description={t("appsCreate.description")}
-            documentationHref={createDocumentationLink("/docs/management/apps")}
-            icon={<IconPlus size={18} />}
-          />
-        ),
-      },
-      {
-        id: "manage-integrations-list",
-        title: t("integrationsList.title"),
-        content: (
-          <TourStepContent
-            description={t("integrationsList.description")}
-            documentationHref={createDocumentationLink("/docs/management/integrations")}
-            icon={<IconAffiliateFilled size={18} />}
-          />
-        ),
-      },
-      {
-        id: "manage-integrations-create",
-        title: t("integrationsCreate.title"),
-        content: (
-          <TourStepContent
-            description={t("integrationsCreate.description")}
-            documentationHref={createDocumentationLink("/docs/management/integrations")}
-            icon={<IconPlus size={18} />}
-          />
-        ),
-      },
-      {
-        id: "manage-users-list",
-        title: t("usersList.title"),
-        adminOnly: true,
-        focusRevealProps: usersStepFocusRevealProps,
-        content: (
-          <TourStepContent
-            description={t("usersList.description")}
-            documentationHref={createDocumentationLink("/docs/management/users")}
-            icon={<IconUserFilled size={18} />}
-          />
-        ),
-      },
-      {
-        id: "manage-users-create",
-        title: t("usersCreate.title"),
-        adminOnly: true,
-        focusRevealProps: usersStepFocusRevealProps,
-        content: (
-          <TourStepContent
-            description={t("usersCreate.description")}
-            documentationHref={createDocumentationLink("/docs/management/users")}
-            icon={<IconPlus size={18} />}
-          />
-        ),
-      },
-    ];
-
-    return allSteps.filter((step) => !step.adminOnly || isAdmin) as OnboardingTourStep[];
-  }, [isAdmin, t]);
-
-  return (
-    <TourShell
-      steps={steps}
-      started={tourActive}
-      onEnd={handleEnd}
-      stepRoutes={stepRoutes}
-      position={{ base: "bottom", sm: "right" }}
-    >
-      {children}
-    </TourShell>
-  );
-};
@@ -1,197 +0,0 @@
-"use client";
-
-import type { PropsWithChildren } from "react";
-import { useCallback, useEffect, useRef } from "react";
-import { useRouter } from "next/navigation";
-import type { OnboardingTourController, OnboardingTourStep } from "@gfazioli/mantine-onboarding-tour";
-import { OnboardingTour } from "@gfazioli/mantine-onboarding-tour";
-import { Button, Center, Group, Image, Kbd, Text } from "@mantine/core";
-import type { FloatingPosition } from "@mantine/core";
-
-import { useI18n } from "@homarr/translation/client";
-
-import { homarrLogoPath } from "~/components/layout/logo/homarr-logo";
-
-interface TourShellProps extends PropsWithChildren {
-  steps: OnboardingTourStep[];
-  started: boolean;
-  onEnd: () => void;
-  stepRoutes?: Record<string, string>;
-  position?: FloatingPosition | Record<string, FloatingPosition>;
-}
-
-type TourController = OnboardingTourController;
-
-const stepIndexFromController = (controller: TourController) => controller.currentStepIndex ?? 0;
-
-const stepAtOffset = (controller: TourController, offset: number) => {
-  const index = stepIndexFromController(controller) + offset;
-  return controller.tour[index];
-};
-
-const pollForElement = (targetId: string, callback: () => void) => {
-  const interval = setInterval(() => {
-    const targetElement = document.querySelector(`[data-tour-target="${targetId}"]`);
-    if (targetElement) {
-      clearInterval(interval);
-      callback();
-    }
-  }, 50);
-  const timeout = setTimeout(() => clearInterval(interval), 5000);
-  return () => {
-    clearInterval(interval);
-    clearTimeout(timeout);
-  };
-};
-
-const isTypingTarget = (target: EventTarget | null) => {
-  if (!(target instanceof HTMLElement)) return false;
-  const tag = target.tagName;
-  return tag === "INPUT" || tag === "TEXTAREA" || tag === "SELECT" || target.isContentEditable;
-};
-
-interface TourForwardButtonProps {
-  label: string;
-  onClick: () => void;
-}
-
-const TourForwardButton = ({ label, onClick }: TourForwardButtonProps) => {
-  return (
-    <Button size="sm" variant="light" onClick={onClick} rightSection={<Kbd size="xs">↵</Kbd>}>
-      {label}
-    </Button>
-  );
-};
-
-interface TourDoneButtonProps {
-  label: string;
-  onClick: () => void;
-}
-
-const TourDoneButton = ({ label, onClick }: TourDoneButtonProps) => {
-  return (
-    <Button size="sm" onClick={onClick} rightSection={<Kbd size="xs">↵</Kbd>}>
-      {label}
-    </Button>
-  );
-};
-
-export const TourShell = ({ steps, started, onEnd, stepRoutes, position, children }: TourShellProps) => {
-  const t = useI18n();
-  const router = useRouter();
-  const forwardActionRef = useRef<(() => void) | null>(null);
-
-  const navigateAndAdvance = useCallback(
-    (currentStepId: string | undefined, targetStepId: string | undefined, advance: () => void) => {
-      if (!stepRoutes || !targetStepId) {
-        advance();
-        return;
-      }
-
-      const currentRoute = currentStepId ? stepRoutes[currentStepId] : undefined;
-      const targetRoute = stepRoutes[targetStepId];
-
-      if (targetRoute && targetRoute !== currentRoute) {
-        router.push(targetRoute);
-        pollForElement(targetStepId, advance);
-      } else {
-        advance();
-      }
-    },
-    [router, stepRoutes],
-  );
-
-  const bindForwardAction = useCallback((controller: TourController, action: () => void) => {
-    forwardActionRef.current = action;
-    return action;
-  }, []);
-
-  useEffect(() => {
-    if (!started) {
-      forwardActionRef.current = null;
-      return;
-    }
-
-    const onKeyDown = (event: KeyboardEvent) => {
-      if (event.key !== "Enter" || event.shiftKey || event.ctrlKey || event.metaKey || event.altKey) return;
-      if (isTypingTarget(event.target)) return;
-      event.preventDefault();
-      forwardActionRef.current?.();
-    };
-
-    window.addEventListener("keydown", onKeyDown);
-    return () => window.removeEventListener("keydown", onKeyDown);
-  }, [started]);
-
-  return (
-    <OnboardingTour
-      tour={steps}
-      started={started}
-      onOnboardingTourEnd={onEnd}
-      withStepper={false}
-      header={(controller) => (
-        <>
-          <Group justify="center" gap={4} py={4}>
-            <Text size="sm" fw={600}>
-              {stepIndexFromController(controller) + 1}
-            </Text>
-            <Text size="sm" c="dimmed">
-              /
-            </Text>
-            <Text size="sm" c="dimmed">
-              {controller.tour.length}
-            </Text>
-          </Group>
-          {stepIndexFromController(controller) === 0 && (
-            <Center py="xs">
-              <Image src={homarrLogoPath} alt="Homarr" w={64} h={64} fit="contain" />
-            </Center>
-          )}
-        </>
-      )}
-      nextStepNavigation={(controller) => {
-        const nextStep = stepAtOffset(controller, 1);
-        const action = bindForwardAction(controller, () => {
-          navigateAndAdvance(controller.currentStep?.id, nextStep?.id, () => controller.nextStep());
-        });
-        return <TourForwardButton label={t("onboardingTour.next")} onClick={action} />;
-      }}
-      endStepNavigation={(controller) => {
-        const action = bindForwardAction(controller, () => controller.endTour());
-        return <TourDoneButton label={t("onboardingTour.done")} onClick={action} />;
-      }}
-      prevStepNavigation={(controller) => (
-        <Button
-          size="sm"
-          variant="default"
-          onClick={() => {
-            const prevStep = stepAtOffset(controller, -1);
-            navigateAndAdvance(controller.currentStep?.id, prevStep?.id, () => controller.prevStep());
-          }}
-        >
-          {t("onboardingTour.prev")}
-        </Button>
-      )}
-      skipNavigation={(controller) => (
-        <Button size="sm" variant="subtle" color="gray" onClick={() => controller.skipTour()}>
-          {t("onboardingTour.skip")}
-        </Button>
-      )}
-      withPrevButton
-      focusRevealProps={{
-        disableTargetInteraction: true,
-        popoverProps: {
-          position: position ?? { base: "bottom", sm: "right" },
-          width: 420,
-          shadow: "xl",
-          radius: "lg",
-          middlewares: { shift: { padding: 16 }, flip: true },
-        },
-      }}
-      cutoutPadding={12}
-      cutoutRadius={12}
-    >
-      {children}
-    </OnboardingTour>
-  );
-};
@@ -1,39 +0,0 @@
-"use client";
-
-import type { ReactNode } from "react";
-import { Anchor, Divider, Group, Stack, Text, ThemeIcon } from "@mantine/core";
-import { IconExternalLink } from "@tabler/icons-react";
-
-import { useI18n } from "@homarr/translation/client";
-
-interface TourStepContentProps {
-  description: string;
-  documentationHref: string;
-  icon?: ReactNode;
-}
-
-export const TourStepContent = ({ description, documentationHref, icon }: TourStepContentProps) => {
-  const t = useI18n();
-
-  return (
-    <Stack gap="sm">
-      <Group gap="sm" wrap="nowrap" align="flex-start">
-        {icon && (
-          <ThemeIcon variant="light" size="lg" radius="md" mt={2}>
-            {icon}
-          </ThemeIcon>
-        )}
-        <Text size="sm" lh={1.7} style={{ flex: 1 }}>
-          {description}
-        </Text>
-      </Group>
-      <Divider />
-      <Anchor href={documentationHref} target="_blank" size="xs" fw={500}>
-        <Group gap={4} wrap="nowrap">
-          <IconExternalLink size={14} />
-          {t("onboardingTour.learnMore")}
-        </Group>
-      </Anchor>
-    </Stack>
-  );
-};
@@ -3,7 +3,6 @@ import { createBooleanSchema, createEnv } from "@homarr/core/infrastructure/env"
 export const env = createEnv({
  server: {
    UNSAFE_ENABLE_MOCK_INTEGRATION: createBooleanSchema(false),
-    DEMO_MODE: createBooleanSchema(false),
  },
  experimental__runtimeEnv: process.env,
 });
@@ -19,9 +19,6 @@

 <!-- Links -->
 <p align="center">
-  <a href="https://demo.homarr.dev">
-    <strong>Live Demo 🎮</strong>
-  </a> •
  <a href="https://homarr.dev/docs/category/installation-1/">
    <strong>Install 💻</strong>
  </a> •
@@ -31,7 +31,6 @@ describe("Onboarding", () => {
      confirmPassword: "Comp(exP4sswOrd",
    });
    await actions.processSettingsStepAsync();
-    await actions.processIntegrationsStepAsync();

    // Assert
    await assertions.assertFinishStepVisibleAsync();
@@ -73,7 +72,6 @@ describe("Onboarding", () => {
      name: externalGroupName,
    });
    await actions.processSettingsStepAsync();
-    await actions.processIntegrationsStepAsync();

    // Assert
    await assertions.assertFinishStepVisibleAsync();
@@ -51,9 +51,4 @@ export class OnboardingActions {
    await this.page.waitForSelector("text=Analytics");
    await this.page.locator("css=button[type='submit']").click();
  }
-
-  public async processIntegrationsStepAsync() {
-    await this.page.waitForSelector("text=integrations you'd like to connect");
-    await this.page.locator("button", { hasText: "Skip for now" }).click();
-  }
 }
@@ -3,7 +3,7 @@ import { eq } from "drizzle-orm";
 import { expect } from "vitest";

 import * as sqliteSchema from "../../../packages/db/schema/sqlite";
-import type { OnboardingStep } from "../../../packages/definitions/src";
+import { OnboardingStep } from "../../../packages/definitions/src";
 import { credentialsAdminGroup } from "../../../packages/definitions/src/group";
 import type { SqliteDatabase } from "../e2e-db";

@@ -57,6 +57,6 @@ export class OnboardingAssertions {
  }

  public async assertFinishStepVisibleAsync() {
-    await this.page.waitForSelector("text=completed the setup", { timeout: 15000 });
+    await this.page.waitForSelector("text=completed the setup", { timeout: 5000 });
  }
 }
@@ -25,6 +25,8 @@
    "release": "semantic-release",
    "scripts:update-bug-report-template": "tsx ./scripts/update-bug-report-template.mts",
    "scripts:update-readme-integrations": "tsx ./scripts/update-integration-list.mts",
+    "scripts:generate-codeowners": "tsx ./scripts/generate-codeowners.mts",
+    "scripts:validate-codeowners": "tsx ./scripts/validate-codeowners.mts",
    "start": "concurrently \"pnpm with-env node apps/tasks/tasks.cjs\" \"pnpm with-env node apps/websocket/wssServer.cjs\" \"pnpm -F nextjs start\"",
    "test": "cross-env NODE_ENV=development CI=true vitest run --exclude e2e --coverage.enabled ",
    "test:e2e": "cross-env NODE_ENV=development CI=true vitest e2e",
@@ -1,14 +1,12 @@
 import { z } from "zod/v4";

-import { createBooleanSchema, createEnv } from "@homarr/core/infrastructure/env";
+import { createEnv } from "@homarr/core/infrastructure/env";

 export const env = createEnv({
  server: {
    KUBERNETES_SERVICE_ACCOUNT_NAME: z.string().optional(),
-    DEMO_MODE: createBooleanSchema(false),
  },
  runtimeEnv: {
    KUBERNETES_SERVICE_ACCOUNT_NAME: process.env.KUBERNETES_SERVICE_ACCOUNT_NAME,
-    DEMO_MODE: process.env.DEMO_MODE,
  },
 });
@@ -2,11 +2,11 @@ import { TRPCError } from "@trpc/server";

 import { env } from "@homarr/docker/env";

-import { isDemoMode, publicProcedure } from "../trpc";
+import { publicProcedure } from "../trpc";

 export const dockerMiddleware = () => {
  return publicProcedure.use(async ({ next }) => {
-    if (env.ENABLE_DOCKER || isDemoMode) {
+    if (env.ENABLE_DOCKER) {
      return await next();
    }
    throw new TRPCError({
@@ -1,7 +1,7 @@
 import z from "zod/v4";

 import packageJson from "../../../../package.json";
-import { createTRPCRouter, isDemoMode, publicProcedure, protectedProcedure } from "../trpc";
+import { createTRPCRouter, protectedProcedure } from "../trpc";

 export const infoRouter = createTRPCRouter({
  getInfo: protectedProcedure
@@ -13,5 +13,4 @@ export const infoRouter = createTRPCRouter({
        version: packageJson.version,
      };
    }),
-  isDemoMode: publicProcedure.query(() => isDemoMode),
 });
@@ -1,8 +1,6 @@
 import { TRPCError } from "@trpc/server";
 import { z } from "zod/v4";

-import { hasQueryAccessToIntegrationsAsync } from "@homarr/auth/server";
-import { constructIntegrationPermissions } from "@homarr/auth/shared";
 import { createId, objectEntries } from "@homarr/common";
 import { decryptSecret, encryptSecret } from "@homarr/common/server";
 import { createLogger } from "@homarr/core/infrastructure/logs";
@@ -16,9 +14,11 @@ import {
  integrations,
  integrationSecrets,
  integrationUserPermissions,
+  searchEngines,
 } from "@homarr/db/schema";
 import type { IntegrationSecretKind } from "@homarr/definitions";
 import {
+  getIconUrl,
  getIntegrationKindsByCategory,
  getPermissionsWithParents,
  integrationCategories,
@@ -33,7 +33,6 @@ import {
  integrationSavePermissionsSchema,
  integrationUpdateSchema,
 } from "@homarr/validation/integration";
-import { mediaRequestOptionsSchema, mediaRequestRequestSchema } from "@homarr/validation/widgets/media-request";

 import { createOneIntegrationMiddleware } from "../../middlewares/integration";
 import { createTRPCRouter, permissionRequiredProcedure, protectedProcedure, publicProcedure } from "../../trpc";
@@ -42,7 +41,6 @@ import { MissingSecretError, testConnectionAsync } from "./integration-test-conn
 import { mapTestConnectionError } from "./map-test-connection-error";

 const logger = createLogger({ module: "integrationRouter" });
-const mediaRequestSearchKinds = getIntegrationKindsByCategory("mediaSearch");

 export const integrationRouter = createTRPCRouter({
  all: protectedProcedure.query(async ({ ctx }) => {
@@ -82,7 +80,7 @@ export const integrationRouter = createTRPCRouter({
          },
        };
      })
-      .toSorted(
+      .sort(
        (integrationA, integrationB) =>
          integrationKinds.indexOf(integrationA.kind) - integrationKinds.indexOf(integrationB.kind),
      );
@@ -130,7 +128,7 @@ export const integrationRouter = createTRPCRouter({
          },
        };
      })
-      .toSorted(
+      .sort(
        (integrationA, integrationB) =>
          integrationKinds.indexOf(integrationA.kind) - integrationKinds.indexOf(integrationB.kind),
      );
@@ -181,7 +179,7 @@ export const integrationRouter = createTRPCRouter({
            },
          };
        })
-        .toSorted(
+        .sort(
          (integrationA, integrationB) =>
            integrationKinds.indexOf(integrationA.kind) - integrationKinds.indexOf(integrationB.kind),
        );
@@ -316,7 +314,20 @@ export const integrationRouter = createTRPCRouter({
        url: input.url,
      });

-      // Media request search is a first-class Spotlight action. Do not create a search engine for it.
+      if (
+        input.attemptSearchEngineCreation &&
+        integrationDefs[input.kind].category.flatMap((category) => category).includes("search")
+      ) {
+        const icon = getIconUrl(input.kind);
+        await ctx.db.insert(searchEngines).values({
+          id: createId(),
+          name: input.name,
+          integrationId,
+          type: "fromIntegration",
+          iconUrl: icon,
+          short: await getNextValidShortNameForSearchEngineAsync(ctx.db, input.name),
+        });
+      }
    }),
  update: protectedProcedure.input(integrationUpdateSchema).mutation(async ({ ctx, input }) => {
    await throwIfActionForbiddenAsync(ctx, eq(integrations.id, input.id), "full");
@@ -484,7 +495,7 @@ export const integrationRouter = createTRPCRouter({
    });

    return {
-      inherited: dbGroupPermissions.toSorted((permissionA, permissionB) => {
+      inherited: dbGroupPermissions.sort((permissionA, permissionB) => {
        return permissionA.group.name.localeCompare(permissionB.group.name);
      }),
      users: userPermissions
@@ -492,7 +503,7 @@ export const integrationRouter = createTRPCRouter({
          user,
          permission,
        }))
-        .toSorted((permissionA, permissionB) => {
+        .sort((permissionA, permissionB) => {
          return (permissionA.user.name ?? "").localeCompare(permissionB.user.name ?? "");
        }),
      groups: dbGroupIntegrationPermission
@@ -503,7 +514,7 @@ export const integrationRouter = createTRPCRouter({
          },
          permission,
        }))
-        .toSorted((permissionA, permissionB) => {
+        .sort((permissionA, permissionB) => {
          return permissionA.group.name.localeCompare(permissionB.group.name);
        }),
    };
@@ -607,149 +618,8 @@ export const integrationRouter = createTRPCRouter({
      const integrationInstance = await createIntegrationAsync(ctx.integration);
      return await integrationInstance.searchAsync(encodeURI(input.query));
    }),
-  mediaRequestSearchTargets: protectedProcedure.query(async ({ ctx }) => {
-    const integrationsWithAccess = await getAccessibleMediaRequestSearchIntegrationsAsync(ctx);
-
-    return integrationsWithAccess.map((integration) => {
-      const permissions = constructIntegrationPermissions(integration, ctx.session);
-
-      return {
-        id: integration.id,
-        name: integration.name,
-        kind: integration.kind,
-        url: integration.url,
-        permissions: {
-          hasInteractAccess: permissions.hasInteractAccess,
-        },
-      };
-    });
-  }),
-  searchMediaRequests: protectedProcedure
-    .input(
-      z.object({
-        query: z.string(),
-        integrationIds: z.array(z.string()).optional(),
-      }),
-    )
-    .query(async ({ ctx, input }) => {
-      const query = input.query.trim();
-      if (query.length === 0) return [];
-
-      const integrationsWithAccess = await getAccessibleMediaRequestSearchIntegrationsAsync(ctx, input.integrationIds);
-
-      const results = await Promise.all(
-        integrationsWithAccess.map(async (integration) => {
-          const integrationInstance = await createIntegrationAsync({
-            id: integration.id,
-            name: integration.name,
-            url: integration.url,
-            kind: integration.kind as (typeof mediaRequestSearchKinds)[number],
-            externalUrl: integration.app?.href ?? null,
-            decryptedSecrets: integration.secrets.map((secret) => ({
-              ...secret,
-              value: decryptSecret(secret.value),
-            })),
-          });
-          const permissions = constructIntegrationPermissions(integration, ctx.session);
-
-          return await integrationInstance.searchAsync(encodeURI(query)).then((searchResults) =>
-            searchResults.map((result) => ({
-              ...result,
-              integration: {
-                id: integration.id,
-                name: integration.name,
-                kind: integration.kind,
-                url: integration.url,
-                permissions: {
-                  hasInteractAccess: permissions.hasInteractAccess,
-                },
-              },
-            })),
-          );
-        }),
-      );
-
-      return results.flat();
-    }),
-  getMediaRequestOptions: protectedProcedure
-    .concat(createOneIntegrationMiddleware("query", "jellyseerr", "overseerr", "seerr"))
-    .input(mediaRequestOptionsSchema)
-    .query(async ({ ctx, input }) => {
-      const integration = await createIntegrationAsync(ctx.integration);
-      return await integration.getSeriesInformationAsync(input.mediaType, input.mediaId);
-    }),
-  requestMedia: protectedProcedure
-    .concat(createOneIntegrationMiddleware("interact", "jellyseerr", "overseerr", "seerr"))
-    .input(mediaRequestRequestSchema)
-    .mutation(async ({ ctx, input }) => {
-      const integration = await createIntegrationAsync(ctx.integration);
-      return await integration.requestMediaAsync(input.mediaType, input.mediaId, input.seasons);
-    }),
 });

-interface IntegrationRouterContext {
-  db: Database;
-  session: Parameters<typeof hasQueryAccessToIntegrationsAsync>[2];
-}
-
-const getAccessibleMediaRequestSearchIntegrationsAsync = async (
-  ctx: IntegrationRouterContext,
-  integrationIds?: string[],
-) => {
-  const groupsOfCurrentUser = await ctx.db.query.groupMembers.findMany({
-    where: eq(groupMembers.userId, ctx.session?.user.id ?? ""),
-  });
-
-  const integrationsFromDb = await ctx.db.query.integrations.findMany({
-    where:
-      integrationIds && integrationIds.length > 0
-        ? and(inArray(integrations.id, integrationIds), inArray(integrations.kind, mediaRequestSearchKinds))
-        : inArray(integrations.kind, mediaRequestSearchKinds),
-    orderBy: asc(integrations.name),
-    with: {
-      app: true,
-      secrets: true,
-      items: {
-        with: {
-          item: true,
-        },
-      },
-      userPermissions: {
-        where: eq(integrationUserPermissions.userId, ctx.session?.user.id ?? ""),
-      },
-      groupPermissions: {
-        where: inArray(
-          integrationGroupPermissions.groupId,
-          groupsOfCurrentUser.map((group) => group.groupId),
-        ),
-      },
-    },
-  });
-
-  if (integrationIds && integrationsFromDb.length !== integrationIds.length) {
-    throw new TRPCError({
-      code: "NOT_FOUND",
-      message: "One or more media request search integrations were not found",
-    });
-  }
-
-  const integrationsWithAccess = await Promise.all(
-    integrationsFromDb.map(async (integration) => ({
-      integration,
-      hasAccess: await hasQueryAccessToIntegrationsAsync(ctx.db, [integration], ctx.session),
-    })),
-  );
-
-  if (integrationIds && integrationsWithAccess.some(({ hasAccess }) => !hasAccess)) {
-    throw new TRPCError({
-      code: "FORBIDDEN",
-      message: "User does not have permission to query one or more media request search integrations",
-    });
-  }
-
-  return integrationsWithAccess.filter(({ hasAccess }) => hasAccess).map(({ integration }) => integration);
-};
-
 interface UpdateSecretInput {
  integrationId: string;
  value: string;
@@ -770,6 +640,35 @@ interface AddSecretInput {
  kind: IntegrationSecretKind;
 }

+const getNextValidShortNameForSearchEngineAsync = async (db: Database, integrationName: string) => {
+  const searchEngines = await db.query.searchEngines.findMany({
+    columns: {
+      short: true,
+    },
+  });
+
+  const usedShortNames = searchEngines.flatMap((searchEngine) => searchEngine.short.toLowerCase());
+  const nameByIntegrationName = integrationName.slice(0, 1).toLowerCase();
+
+  if (!usedShortNames.includes(nameByIntegrationName)) {
+    return nameByIntegrationName;
+  }
+
+  // 8 is max length constraint
+  for (let i = 2; i < 9999999; i++) {
+    const generatedName = `${nameByIntegrationName}${i}`;
+    if (usedShortNames.includes(generatedName)) {
+      continue;
+    }
+
+    return generatedName;
+  }
+
+  throw new Error(
+    "Unable to automatically generate a short name. All possible variations were exhausted. Please disable the automatic creation and choose one later yourself.",
+  );
+};
+
 const addSecretAsync = async (db: Database, input: AddSecretInput) => {
  await db.insert(integrationSecrets).values({
    kind: input.kind,
@@ -76,9 +76,6 @@ const nextSteps: Partial<Record<OnboardingStep, Partial<Record<OnboardingStep, N
    settings: true,
  },
  settings: {
-    integrations: true,
-  },
-  integrations: {
    finish: true,
  },
 };
@@ -1,57 +1,12 @@
-import { TRPCError } from "@trpc/server";
 import { z } from "zod/v4";

-import { createId } from "@homarr/common";
-import { encryptSecret } from "@homarr/common/server";
-import { eq, like, or } from "@homarr/db";
-import { placeAllWidgetsAsync } from "@homarr/db/queries";
-import {
-  apps,
-  groups,
-  icons,
-  integrationItems,
-  integrations,
-  integrationSecrets,
-  itemLayouts,
-  items,
-  onboarding,
-} from "@homarr/db/schema";
-import {
-  everyoneGroup,
-  extractContainerImageName,
-  getIconUrl,
-  integrationKinds,
-  integrationSecretKinds,
-  matchIntegrationKindFromContainer,
-  onboardingSteps,
-} from "@homarr/definitions";
-import type { IntegrationKind } from "@homarr/definitions";
+import { onboarding } from "@homarr/db/schema";
+import { onboardingSteps } from "@homarr/definitions";
 import { zodEnumFromArray } from "@homarr/validation/enums";

-import { createTRPCRouter, onboardingProcedure, publicProcedure } from "../../trpc";
-import { MissingSecretError, testConnectionAsync } from "../integration/integration-test-connection";
-import { mapTestConnectionError } from "../integration/map-test-connection-error";
+import { createTRPCRouter, publicProcedure } from "../../trpc";
 import { getOnboardingOrFallbackAsync, nextOnboardingStepAsync } from "./onboard-queries";

-interface PortInfo {
-  IP?: string;
-  PublicPort?: number;
-}
-
-interface SuggestedUrlResult {
-  url: string;
-  publishedPort: number | null;
-}
-
-const buildSuggestedUrl = (ports: PortInfo[] | undefined, host: string): SuggestedUrlResult => {
-  const port = ports?.[0];
-  if (port?.PublicPort) {
-    const ip = port.IP && port.IP !== "0.0.0.0" && port.IP !== "::" ? port.IP : host;
-    return { url: `http://${ip}:${port.PublicPort}`, publishedPort: port.PublicPort };
-  }
-  return { url: "", publishedPort: null };
-};
-
 export const onboardRouter = createTRPCRouter({
  currentStep: publicProcedure.query(async ({ ctx }) => {
    return await getOnboardingOrFallbackAsync(ctx.db);
@@ -78,249 +33,4 @@ export const onboardRouter = createTRPCRouter({
      step: "start",
    });
  }),
-  createIntegration: onboardingProcedure
-    .requiresStep("integrations")
-    .input(
-      z.object({
-        name: z.string().nonempty().max(127),
-        url: z.string().nonempty(),
-        kind: zodEnumFromArray(integrationKinds),
-        secrets: z.array(
-          z.object({
-            kind: zodEnumFromArray(integrationSecretKinds),
-            value: z.string().nonempty(),
-          }),
-        ),
-      }),
-    )
-    .mutation(async ({ ctx, input }) => {
-      const result = await testConnectionAsync({
-        id: "new",
-        name: input.name,
-        url: input.url,
-        kind: input.kind,
-        secrets: input.secrets,
-      }).catch((error) => {
-        if (!(error instanceof MissingSecretError)) throw error;
-
-        throw new TRPCError({
-          code: "BAD_REQUEST",
-          message: error.message,
-        });
-      });
-
-      if (!result.success) {
-        return { error: mapTestConnectionError(result.error) };
-      }
-
-      const integrationId = createId();
-      const appId = createId();
-
-      await ctx.db.insert(apps).values({
-        id: appId,
-        name: input.name,
-        iconUrl: getIconUrl(input.kind),
-        href: input.url,
-        pingUrl: input.url,
-        description: null,
-      });
-
-      await ctx.db.insert(integrations).values({
-        id: integrationId,
-        name: input.name,
-        url: input.url,
-        kind: input.kind,
-        appId,
-      });
-
-      if (input.secrets.length >= 1) {
-        await ctx.db.insert(integrationSecrets).values(
-          input.secrets.map((secret) => ({
-            kind: secret.kind,
-            value: encryptSecret(secret.value),
-            integrationId,
-          })),
-        );
-      }
-    }),
-  discoverDockerServices: onboardingProcedure.requiresStep("integrations").query(async ({ ctx }) => {
-    const emptyResult = {
-      integrations: [] as {
-        containerId: string;
-        containerName: string;
-        kind: IntegrationKind;
-        suggestedUrl: string;
-        publishedPort: number | null;
-        iconUrl: string | null;
-      }[],
-      apps: [] as {
-        containerId: string;
-        containerName: string;
-        suggestedUrl: string;
-        publishedPort: number | null;
-        iconUrl: string | null;
-      }[],
-    };
-
-    try {
-      const { DockerSingleton, dockerLabels } = await import("@homarr/docker");
-
-      const dockerInstances = DockerSingleton.getInstances();
-      if (dockerInstances.length === 0) {
-        return { status: "empty" as const, ...emptyResult };
-      }
-
-      const results = await Promise.allSettled(
-        dockerInstances.map(async ({ instance, host }) => {
-          const containerList = await instance.listContainers({ all: false });
-          return containerList.filter((c) => !(dockerLabels.hide in c.Labels)).map((c) => ({ ...c, host }));
-        }),
-      );
-
-      const containers = results.flatMap((r) => (r.status === "fulfilled" ? r.value : []));
-
-      if (containers.length === 0) {
-        return { status: "empty" as const, ...emptyResult };
-      }
-
-      const likeQueries = containers.map((c) => like(icons.name, `%${extractContainerImageName(c.Image)}%`));
-      const dbIcons = likeQueries.length > 0 ? await ctx.db.query.icons.findMany({ where: or(...likeQueries) }) : [];
-
-      const seenKinds = new Set<IntegrationKind>();
-      const discoveredIntegrations = emptyResult.integrations;
-      const discoveredApps = emptyResult.apps;
-
-      const cdnIconUrl = (slug: string) =>
-        `https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/${slug}.svg`;
-
-      const strictIconMatch = (imageName: string) => {
-        const normalized = imageName.toLowerCase().trim();
-        if (normalized.length < 3) return null;
-        const exact = dbIcons.find((icon) => icon.name.toLowerCase() === normalized);
-        if (exact) return exact.url;
-        return dbIcons.find((icon) => icon.name.toLowerCase().startsWith(normalized))?.url ?? null;
-      };
-
-      for (const container of containers) {
-        const imageName = extractContainerImageName(container.Image);
-        const containerName = container.Names[0]?.split("/")[1] ?? "Unknown";
-        const dbIcon = strictIconMatch(imageName);
-        const iconUrl = dbIcon ?? cdnIconUrl(imageName.toLowerCase());
-
-        const { url: suggestedUrl, publishedPort } = buildSuggestedUrl(container.Ports, container.host);
-
-        const kind = matchIntegrationKindFromContainer({
-          image: container.Image,
-          name: containerName,
-        });
-
-        if (kind && !seenKinds.has(kind)) {
-          seenKinds.add(kind);
-          discoveredIntegrations.push({
-            containerId: container.Id,
-            containerName,
-            kind,
-            suggestedUrl,
-            publishedPort,
-            iconUrl,
-          });
-        } else if (!kind && dbIcon) {
-          discoveredApps.push({
-            containerId: container.Id,
-            containerName,
-            suggestedUrl,
-            publishedPort,
-            iconUrl,
-          });
-        }
-      }
-
-      return {
-        status: "success" as const,
-        integrations: discoveredIntegrations,
-        apps: discoveredApps,
-      };
-    } catch {
-      return { status: "unavailable" as const, ...emptyResult };
-    }
-  }),
-  createAppsFromDiscovery: onboardingProcedure
-    .requiresStep("integrations")
-    .input(
-      z.array(
-        z.object({
-          name: z.string().nonempty().max(127),
-          href: z.string().nullable(),
-          iconUrl: z.string().nullable(),
-        }),
-      ),
-    )
-    .mutation(async ({ ctx, input }) => {
-      if (input.length === 0) return;
-      const defaultIcon = "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/homarr.svg";
-      await ctx.db.insert(apps).values(
-        input.map((app) => ({
-          id: createId(),
-          name: app.name,
-          iconUrl: app.iconUrl ?? defaultIcon,
-          href: app.href,
-          description: null,
-        })),
-      );
-    }),
-  setupIntegrations: onboardingProcedure.requiresStep("integrations").mutation(async ({ ctx }) => {
-    const db = ctx.db;
-
-    const allIntegrations = await db.query.integrations.findMany();
-    const allApps = await db.query.apps.findMany();
-
-    const board = await db.query.boards.findFirst({
-      with: {
-        sections: true,
-        layouts: true,
-      },
-    });
-
-    if (!board) {
-      await nextOnboardingStepAsync(db, undefined);
-      return;
-    }
-
-    const everyoneGroupRow = await db.query.groups.findFirst({
-      where: eq(groups.name, everyoneGroup),
-    });
-    if (everyoneGroupRow && !everyoneGroupRow.homeBoardId) {
-      await db.update(groups).set({ homeBoardId: board.id }).where(eq(groups.id, everyoneGroupRow.id));
-    }
-
-    const section = board.sections.find((boardSection) => boardSection.kind === "empty");
-    const layout = board.layouts[0];
-
-    if (section && layout) {
-      const existingItems = await db.query.items.findMany({
-        where: eq(items.boardId, board.id),
-      });
-      for (const item of existingItems) {
-        await db.delete(integrationItems).where(eq(integrationItems.itemId, item.id));
-        await db.delete(itemLayouts).where(eq(itemLayouts.itemId, item.id));
-      }
-      if (existingItems.length > 0) {
-        await db.delete(items).where(eq(items.boardId, board.id));
-      }
-
-      await placeAllWidgetsAsync(
-        db,
-        {
-          boardId: board.id,
-          sectionId: section.id,
-          layoutId: layout.id,
-          columnCount: layout.columnCount,
-        },
-        allIntegrations,
-        allApps,
-      );
-    }
-
-    await nextOnboardingStepAsync(db, undefined);
-  }),
 });
@@ -6,9 +6,12 @@ import { createLogger } from "@homarr/core/infrastructure/logs";
 import { asc, eq, like } from "@homarr/db";
 import { getServerSettingByKeyAsync, updateServerSettingByKeyAsync } from "@homarr/db/queries";
 import { searchEngines, users } from "@homarr/db/schema";
+import { createIntegrationAsync } from "@homarr/integrations";
 import { byIdSchema, paginatedSchema, searchSchema } from "@homarr/validation/common";
 import { searchEngineEditSchema, searchEngineManageSchema } from "@homarr/validation/search-engine";
+import { mediaRequestOptionsSchema, mediaRequestRequestSchema } from "@homarr/validation/widgets/media-request";

+import { createOneIntegrationMiddleware } from "../../middlewares/integration";
 import { createTRPCRouter, permissionRequiredProcedure, protectedProcedure, publicProcedure } from "../../trpc";

 const logger = createLogger({ module: "searchEngineRouter" });
@@ -145,6 +148,20 @@ export const searchEngineRouter = createTRPCRouter({
      limit: input.limit,
    });
  }),
+  getMediaRequestOptions: protectedProcedure
+    .concat(createOneIntegrationMiddleware("query", "jellyseerr", "overseerr"))
+    .input(mediaRequestOptionsSchema)
+    .query(async ({ ctx, input }) => {
+      const integration = await createIntegrationAsync(ctx.integration);
+      return await integration.getSeriesInformationAsync(input.mediaType, input.mediaId);
+    }),
+  requestMedia: protectedProcedure
+    .concat(createOneIntegrationMiddleware("interact", "jellyseerr", "overseerr"))
+    .input(mediaRequestRequestSchema)
+    .mutation(async ({ ctx, input }) => {
+      const integration = await createIntegrationAsync(ctx.integration);
+      return await integration.requestMediaAsync(input.mediaType, input.mediaId, input.seasons);
+    }),
  create: permissionRequiredProcedure
    .requiresPermission("search-engine-create")
    .input(searchEngineManageSchema)
@@ -4,7 +4,7 @@ import { describe, expect, test, vi } from "vitest";
 import type { Session } from "@homarr/auth";
 import { createId } from "@homarr/common";
 import { encryptSecret } from "@homarr/common/server";
-import { apps, integrations, integrationSecrets, integrationUserPermissions, users } from "@homarr/db/schema";
+import { apps, integrations, integrationSecrets } from "@homarr/db/schema";
 import { createDb } from "@homarr/db/test";
 import type { GroupPermissionKey } from "@homarr/definitions";

@@ -59,127 +59,6 @@ describe("all should return all integrations", () => {
  });
 });

-describe("mediaRequestSearchTargets should return accessible media search integrations", () => {
-  test("with integration use access should only return media request search integrations", async () => {
-    const db = createDb();
-    const caller = integrationRouter.createCaller({
-      db,
-      deviceType: undefined,
-      session: defaultSessionWithPermissions(["integration-use-all"]),
-    });
-
-    await db.insert(integrations).values([
-      {
-        id: "1",
-        name: "Jellyseerr",
-        kind: "jellyseerr",
-        url: "http://jellyseerr.local",
-      },
-      {
-        id: "2",
-        name: "Jellyfin",
-        kind: "jellyfin",
-        url: "http://jellyfin.local",
-      },
-    ]);
-
-    const result = await caller.mediaRequestSearchTargets();
-
-    expect(result).toHaveLength(1);
-    expect(result[0]!.id).toBe("1");
-    expect(result[0]!.kind).toBe("jellyseerr");
-  });
-
-  test("without access should not return media request search integrations", async () => {
-    const db = createDb();
-    const caller = integrationRouter.createCaller({
-      db,
-      deviceType: undefined,
-      session: defaultSessionWithPermissions(),
-    });
-
-    await db.insert(integrations).values({
-      id: "1",
-      name: "Jellyseerr",
-      kind: "jellyseerr",
-      url: "http://jellyseerr.local",
-    });
-
-    const result = await caller.mediaRequestSearchTargets();
-
-    expect(result).toHaveLength(0);
-  });
-
-  test("with direct integration use access should return media request search integrations", async () => {
-    const db = createDb();
-    const caller = integrationRouter.createCaller({
-      db,
-      deviceType: undefined,
-      session: defaultSessionWithPermissions(),
-    });
-
-    await db.insert(integrations).values({
-      id: "1",
-      name: "Jellyseerr",
-      kind: "jellyseerr",
-      url: "http://jellyseerr.local",
-    });
-    await db.insert(users).values({ id: defaultUserId });
-    await db.insert(integrationUserPermissions).values({
-      integrationId: "1",
-      userId: defaultUserId,
-      permission: "use",
-    });
-
-    const result = await caller.mediaRequestSearchTargets();
-
-    expect(result).toHaveLength(1);
-    expect(result[0]!.id).toBe("1");
-  });
-});
-
-describe("searchMediaRequests should validate scoped integrations", () => {
-  test("with a non media search integration should throw not found", async () => {
-    const db = createDb();
-    const caller = integrationRouter.createCaller({
-      db,
-      deviceType: undefined,
-      session: defaultSessionWithPermissions(["integration-use-all"]),
-    });
-
-    await db.insert(integrations).values({
-      id: "1",
-      name: "Jellyfin",
-      kind: "jellyfin",
-      url: "http://jellyfin.local",
-    });
-
-    await expect(caller.searchMediaRequests({ query: "matrix", integrationIds: ["1"] })).rejects.toThrow(
-      "One or more media request search integrations were not found",
-    );
-  });
-
-  test("without query access to a scoped media search integration should throw forbidden", async () => {
-    const db = createDb();
-    const caller = integrationRouter.createCaller({
-      db,
-      deviceType: undefined,
-      session: defaultSessionWithPermissions(),
-    });
-
-    await db.insert(integrations).values({
-      id: "1",
-      name: "Jellyseerr",
-      kind: "jellyseerr",
-      url: "http://jellyseerr.local",
-    });
-
-    await expect(caller.searchMediaRequests({ query: "matrix", integrationIds: ["1"] })).rejects.toThrow(
-      "User does not have permission to query one or more media request search integrations",
-    );
-  });
-});
-
 describe("byId should return an integration by id", () => {
  test("with full access should return an integration by id", async () => {
    const db = createDb();
@@ -329,7 +208,7 @@ describe("create should create a new integration", () => {
    expect(dbSecret!.updatedAt).toEqual(fakeNow);
  });

-  test("with create integration access should not create a search engine for media request search integrations", async () => {
+  test("with create integration access should create a new integration when creating search engine", async () => {
    const db = createDb();
    const caller = integrationRouter.createCaller({
      db,
@@ -364,7 +243,12 @@ describe("create should create a new integration", () => {
    expect(dbSecret!.value).toMatch(/^[a-f0-9]+.[a-f0-9]+$/);
    expect(dbSecret!.updatedAt).toEqual(fakeNow);

-    expect(dbSearchEngine).toBeUndefined();
+    expect(dbSearchEngine!.integrationId).toBe(dbIntegration!.id);
+    expect(dbSearchEngine!.short).toBe("j");
+    expect(dbSearchEngine!.name).toBe(input.name);
+    expect(dbSearchEngine!.iconUrl).toBe(
+      "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/jellyseerr.svg",
+    );
  });

  test("with create integration access should create a new integration with new linked app", async () => {
@@ -278,8 +278,6 @@ export const userRouter = createTRPCRouter({
        defaultSearchEngineId: true,
        openSearchInNewTab: true,
        ddgBangs: true,
-        completedManageTour: true,
-        completedBoardTour: true,
      }),
    )
    .meta({ openapi: { method: "GET", path: "/api/users/{userId}", tags: ["users"], protect: true } })
@@ -306,8 +304,6 @@ export const userRouter = createTRPCRouter({
          defaultSearchEngineId: true,
          openSearchInNewTab: true,
          ddgBangs: true,
-          completedManageTour: true,
-          completedBoardTour: true,
        },
        where: eq(users.id, input.userId),
      });
@@ -546,7 +542,7 @@ export const userRouter = createTRPCRouter({
        .set({
          pingIconsEnabled: input.pingIconsEnabled,
        })
-        .where(eq(users.id, input.id));
+        .where(eq(users.id, ctx.session.user.id));
    }),
  changeDdgBangs: protectedProcedure
    .input(convertIntersectionToZodObject(userDdgBangsSchema.and(byIdSchema)))
@@ -607,41 +603,8 @@ export const userRouter = createTRPCRouter({
        .set({
          firstDayOfWeek: input.firstDayOfWeek,
        })
-        .where(eq(users.id, input.id));
+        .where(eq(users.id, ctx.session.user.id));
    }),
-  completeTour: protectedProcedure
-    .input(z.object({ tour: z.enum(["manage", "board"]) }))
-    .mutation(async ({ input, ctx }) => {
-      const columnByTour = {
-        manage: { completedManageTour: true },
-        board: { completedBoardTour: true },
-      } as const;
-
-      await ctx.db.update(users).set(columnByTour[input.tour]).where(eq(users.id, ctx.session.user.id));
-    }),
-  resetTours: protectedProcedure.mutation(async ({ ctx }) => {
-    await ctx.db
-      .update(users)
-      .set({
-        completedManageTour: false,
-        completedBoardTour: false,
-      })
-      .where(eq(users.id, ctx.session.user.id));
-  }),
-  getTourStatus: protectedProcedure.query(async ({ ctx }) => {
-    const user = await ctx.db.query.users.findFirst({
-      columns: {
-        completedManageTour: true,
-        completedBoardTour: true,
-      },
-      where: eq(users.id, ctx.session.user.id),
-    });
-
-    return {
-      completedManageTour: user?.completedManageTour ?? false,
-      completedBoardTour: user?.completedBoardTour ?? false,
-    };
-  }),
 });

 const createUserAsync = async (db: Database, input: Omit<z.infer<typeof userBaseCreateSchema>, "groupIds">) => {
@@ -31,5 +31,4 @@ export const widgetRouter = createTRPCRouter({
  tracearr: lazy(() => import("./tracearr").then((mod) => mod.tracearrRouter)),
  speedtestTracker: lazy(() => import("./speedtest-tracker").then((mod) => mod.speedtestTrackerRouter)),
  umami: lazy(() => import("./umami").then((mod) => mod.umamiRouter)),
-  ups: lazy(() => import("./ups").then((mod) => mod.upsRouter)),
 });
@@ -1,51 +0,0 @@
-import { observable } from "@trpc/server/observable";
-
-import { getIntegrationKindsByCategory } from "@homarr/definitions";
-import type { UpsSummary } from "@homarr/integrations/types";
-import { upsSummariesRequestHandler } from "@homarr/request-handler/ups";
-
-import { createManyIntegrationMiddleware } from "../../middlewares/integration";
-import { createTRPCRouter, publicProcedure } from "../../trpc";
-
-export const upsRouter = createTRPCRouter({
-  getSummaries: publicProcedure
-    .concat(createManyIntegrationMiddleware("query", ...getIntegrationKindsByCategory("ups")))
-    .query(async ({ ctx }) => {
-      const results = await Promise.all(
-        ctx.integrations.map(async (integration) => {
-          const innerHandler = upsSummariesRequestHandler.handler(integration, {});
-          const { data, timestamp } = await innerHandler.getCachedOrUpdatedDataAsync({ forceUpdate: false });
-
-          return {
-            integrationId: integration.id,
-            integrationName: integration.name,
-            integrationUrl: integration.url,
-            summaries: data,
-            updatedAt: timestamp,
-          };
-        }),
-      );
-
-      return results;
-    }),
-  subscribeSummaries: publicProcedure
-    .concat(createManyIntegrationMiddleware("query", ...getIntegrationKindsByCategory("ups")))
-    .subscription(({ ctx }) => {
-      return observable<{ integrationId: string; summaries: UpsSummary[]; timestamp: Date }>((emit) => {
-        const unsubscribes = ctx.integrations.map((integration) => {
-          const innerHandler = upsSummariesRequestHandler.handler(integration, {});
-          return innerHandler.subscribe((summaries) => {
-            emit.next({
-              integrationId: integration.id,
-              summaries,
-              timestamp: new Date(),
-            });
-          });
-        });
-
-        return () => {
-          unsubscribes.forEach((unsubscribe) => unsubscribe());
-        };
-      });
-    }),
-});
@@ -18,7 +18,6 @@ import { createLogger } from "@homarr/core/infrastructure/logs";
 import { db } from "@homarr/db";
 import type { GroupPermissionKey, OnboardingStep } from "@homarr/definitions";

-import { env } from "./env";
 import { getOnboardingOrFallbackAsync } from "./router/onboard/onboard-queries";

 const logger = createLogger({ module: "trpc" });
@@ -88,20 +87,6 @@ export const createCallerFactory = t.createCallerFactory;
 */
 export const createTRPCRouter = t.router;

-export const isDemoMode = env.DEMO_MODE;
-
-const enforceDemoModeReadOnly = t.middleware(({ ctx, next, type }) => {
-  if (env.DEMO_MODE && type === "mutation") {
-    throw new TRPCError({
-      code: "FORBIDDEN",
-      message: "Mutations are disabled in demo mode",
-    });
-  }
-  return next({ ctx });
-});
-
-const baseProcedure = env.DEMO_MODE ? t.procedure.use(enforceDemoModeReadOnly) : t.procedure;
-
 /**
 * Public (unauthed) procedure
 *
@@ -109,14 +94,19 @@ const baseProcedure = env.DEMO_MODE ? t.procedure.use(enforceDemoModeReadOnly) :
 * tRPC API. It does not guarantee that a user querying is authorized, but you
 * can still access user session data if they are logged in
 */
-export const publicProcedure = baseProcedure;
+export const publicProcedure = t.procedure;

+/**
+ * Reusable middleware that enforces users are logged in before running the
+ * procedure
+ */
 const enforceUserIsAuthed = t.middleware(({ ctx, next }) => {
  if (!ctx.session?.user) {
    throw new TRPCError({ code: "UNAUTHORIZED" });
  }
  return next({
    ctx: {
+      // infers the `session` as non-nullable
      session: { ...ctx.session, user: ctx.session.user },
    },
  });
@@ -131,7 +121,7 @@ const enforceUserIsAuthed = t.middleware(({ ctx, next }) => {
 *
 * @see https://trpc.io/docs/procedures
 */
-export const protectedProcedure = baseProcedure.use(enforceUserIsAuthed);
+export const protectedProcedure = t.procedure.use(enforceUserIsAuthed);

 /**
 * Procedure that requires a specific permission
@@ -1,11 +1,7 @@
 import type { ReadonlyHeaders } from "next/dist/server/web/spec-extension/adapters/headers";

 export const removeTrailingSlash = (path: string) => {
-  let end = path.length;
-  while (end > 0 && path.charAt(end - 1) === "/") {
-    end--;
-  }
-  return path.slice(0, end);
+  return path.at(-1) === "/" ? path.substring(0, path.length - 1) : path;
 };

 export const extractBaseUrlFromHeaders = (
@@ -1,2 +0,0 @@
-ALTER TABLE `user` ADD `completed_manage_tour` boolean DEFAULT false NOT NULL;--> statement-breakpoint
-ALTER TABLE `user` ADD `completed_board_tour` boolean DEFAULT false NOT NULL;
@@ -274,13 +274,6 @@
      "when": 1775400000000,
      "tag": "0038_add_user_ddg_bangs",
      "breakpoints": true
-    },
-    {
-      "idx": 39,
-      "version": "5",
-      "when": 1779199104477,
-      "tag": "0039_add_user_onboarding_tour_status",
-      "breakpoints": true
    }
  ]
 }
@@ -1,2 +0,0 @@
-ALTER TABLE "user" ADD COLUMN "completed_manage_tour" boolean DEFAULT false NOT NULL;--> statement-breakpoint
-ALTER TABLE "user" ADD COLUMN "completed_board_tour" boolean DEFAULT false NOT NULL;
@@ -36,13 +36,6 @@
      "when": 1775400000000,
      "tag": "0004_add_user_ddg_bangs",
      "breakpoints": true
-    },
-    {
-      "idx": 5,
-      "version": "7",
-      "when": 1779199097716,
-      "tag": "0005_add_user_onboarding_tour_status",
-      "breakpoints": true
    }
  ]
 }
@@ -1,38 +1,29 @@
-import SuperJSON from "superjson";
-
 import { createId, objectKeys } from "@homarr/common";
 import {
  createDocumentationLink,
  credentialsAdminGroup,
-  defaultBookmarkApps,
  everyoneGroup,
  getIntegrationDefaultUrl,
  getIntegrationName,
  integrationDefs,
  integrationKinds,
 } from "@homarr/definitions";
-import type { WidgetKind } from "@homarr/definitions";
 import { defaultServerSettings, defaultServerSettingsKeys } from "@homarr/server-settings";

 import type { Database } from "..";
 import { eq } from "..";
-import { getMaxGroupPositionAsync, placeAllWidgetsAsync } from "../queries";
+import { getMaxGroupPositionAsync } from "../queries";
 import {
  getServerSettingByKeyAsync,
  insertServerSettingByKeyAsync,
  updateServerSettingByKeyAsync,
 } from "../queries/server-setting";
-
 import {
-  apps,
  boards,
  groupMembers,
  groupPermissions,
  groups,
-  integrationItems,
  integrations,
-  itemLayouts,
-  items,
  layouts,
  onboarding,
  searchEngines,
@@ -47,11 +38,8 @@ export const seedDataAsync = async (db: Database) => {
  await seedServerSettingsAsync(db);
  await seedDefaultSearchEnginesAsync(db);
  await seedDefaultIntegrationsAsync(db);
-  await seedDefaultAppsAsync(db);
-  await seedDefaultBoardAsync(db);
-  await seedBoardWidgetsAsync(db);

-  if (["1", "yes", "t", "true"].includes((process.env.DEMO_MODE ?? "").toLowerCase())) {
+  if (process.env.DEMO_MODE === "true") {
    await seedDemoUserAsync(db);
  }
 };
@@ -221,192 +209,6 @@ const seedDefaultIntegrationsAsync = async (db: Database) => {
  console.log(`Created ${createdCount} default integrations through seeding process`);
 };

-const seedDefaultAppsAsync = async (db: Database) => {
-  const existingApps = await db.$count(apps);
-  if (existingApps > 0) {
-    console.log("Skipping seeding of default apps as some already exist");
-    return;
-  }
-
-  for (const app of defaultBookmarkApps) {
-    await db.insert(apps).values({
-      id: createId(),
-      name: app.name,
-      iconUrl: app.iconUrl,
-      href: app.href,
-    });
-  }
-  console.log(`Created ${defaultBookmarkApps.length} default apps through seeding process`);
-};
-
-const seedDefaultBoardAsync = async (db: Database) => {
-  const existingBoard = await db.query.boards.findFirst();
-
-  if (existingBoard) {
-    console.log("Skipping seeding of default board as one already exists");
-    return;
-  }
-
-  const boardId = createId();
-  await db.insert(boards).values({
-    id: boardId,
-    name: "dashboard",
-    isPublic: false,
-  });
-  await db.insert(sections).values({
-    id: createId(),
-    kind: "empty",
-    xOffset: 0,
-    yOffset: 0,
-    boardId,
-  });
-  await db.insert(layouts).values({
-    id: createId(),
-    name: "Base",
-    columnCount: 10,
-    breakpoint: 0,
-    boardId,
-  });
-
-  const everyoneGroupRow = await db.query.groups.findFirst({
-    where: eq(groups.name, everyoneGroup),
-  });
-  if (everyoneGroupRow) {
-    await db.update(groups).set({ homeBoardId: boardId }).where(eq(groups.id, everyoneGroupRow.id));
-    console.log("Set default board as home board for everyone group");
-  }
-
-  console.log("Created default board 'dashboard' through seed");
-};
-
-interface DemoWidget {
-  kind: WidgetKind;
-  width: number;
-  height: number;
-  needsIntegration: boolean;
-  options?: Record<string, unknown>;
-}
-
-const demoApps = [
-  {
-    name: "Sonarr",
-    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/sonarr.svg",
-    href: "https://sonarr.tv",
-  },
-  {
-    name: "Radarr",
-    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/radarr.svg",
-    href: "https://radarr.video",
-  },
-  {
-    name: "Plex",
-    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/plex.svg",
-    href: "https://plex.tv",
-  },
-  {
-    name: "Jellyfin",
-    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/jellyfin.svg",
-    href: "https://jellyfin.org",
-  },
-  {
-    name: "Proxmox",
-    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/proxmox.svg",
-    href: "https://proxmox.com",
-  },
-  {
-    name: "Pi-hole",
-    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/pi-hole.svg",
-    href: "https://pi-hole.net",
-  },
-  {
-    name: "Grafana",
-    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/grafana.svg",
-    href: "https://grafana.com",
-  },
-  {
-    name: "Portainer",
-    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/portainer.svg",
-    href: "https://portainer.io",
-  },
-  {
-    name: "Home Assistant",
-    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/home-assistant.svg",
-    href: "https://home-assistant.io",
-  },
-  {
-    name: "Nextcloud",
-    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/nextcloud.svg",
-    href: "https://nextcloud.com",
-  },
-  {
-    name: "qBittorrent",
-    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/qbittorrent.svg",
-    href: "https://qbittorrent.org",
-  },
-  {
-    name: "Overseerr",
-    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/overseerr.svg",
-    href: "https://overseerr.dev",
-  },
-] as const;
-
-const buildDemoWidgets = (appIds: string[]): DemoWidget[] => [
-  // Row 1: calendar + downloads + clock = 12
-  { kind: "calendar", width: 5, height: 3, needsIntegration: true },
-  { kind: "downloads", width: 5, height: 3, needsIntegration: true },
-  { kind: "clock", width: 2, height: 1, needsIntegration: false },
-  // Row 2: healthMonitoring + bookmarks = 12
-  { kind: "healthMonitoring", width: 6, height: 3, needsIntegration: true },
-  {
-    kind: "bookmarks",
-    width: 6,
-    height: 3,
-    needsIntegration: false,
-    options: { title: "Homelab", items: appIds, layout: "grid", openNewTab: true },
-  },
-  // Row 3: mediaServer + mediaTranscoding + dnsHoleSummary = 12
-  { kind: "mediaServer", width: 3, height: 2, needsIntegration: true },
-  { kind: "mediaTranscoding", width: 3, height: 2, needsIntegration: true },
-  { kind: "dnsHoleSummary", width: 6, height: 2, needsIntegration: true },
-  // Row 4: dnsHoleControls + mediaReleases + notifications = 12
-  { kind: "dnsHoleControls", width: 2, height: 1, needsIntegration: true },
-  { kind: "mediaReleases", width: 4, height: 2, needsIntegration: true },
-  { kind: "notifications", width: 6, height: 2, needsIntegration: true },
-  // Row 5: requestList + requestStats + indexerManager = 12
-  { kind: "mediaRequests-requestList", width: 4, height: 3, needsIntegration: true },
-  { kind: "mediaRequests-requestStats", width: 4, height: 2, needsIntegration: true },
-  { kind: "indexerManager", width: 4, height: 2, needsIntegration: true },
-  // Row 6: networkControllerSummary + networkControllerStatus + rssFeed = 12
-  { kind: "networkControllerSummary", width: 3, height: 2, needsIntegration: true },
-  { kind: "networkControllerStatus", width: 3, height: 2, needsIntegration: true },
-  {
-    kind: "rssFeed",
-    width: 6,
-    height: 2,
-    needsIntegration: false,
-    options: {
-      feedUrls: ["https://selfh.st/rss/", "https://hnrss.org/newest?q=self-hosted"],
-      maximumAmountPosts: 20,
-      textLinesClamp: 2,
-      hideDescription: false,
-    },
-  },
-  // Row 7-8: app widgets (2x1 each, 6 per row = 12)
-  ...appIds.map(
-    (appId): DemoWidget => ({
-      kind: "app",
-      width: 2,
-      height: 1,
-      needsIntegration: false,
-      options: { appId, openInNewTab: true, showTitle: true, pingEnabled: false },
-    }),
-  ),
-  // Row 9: notebook + dockerContainers + weather = 12
-  { kind: "notebook", width: 4, height: 4, needsIntegration: false },
-  { kind: "dockerContainers", width: 6, height: 2, needsIntegration: false },
-  { kind: "weather", width: 2, height: 1, needsIntegration: false },
-];
-
 const seedDemoUserAsync = async (db: Database) => {
  const existingUser = await db.query.users.findFirst({
    where: eq(users.name, "demo"),
@@ -423,7 +225,7 @@ const seedDemoUserAsync = async (db: Database) => {
    id: userId,
    name: "demo",
    email: "demo@example.com",
-    password: "$2b$10$odRXt5e95kSQV5Axmk/FeO6GVOxuRQQ8NnRcBA78Wg4V3kZxPY68u",
+    password: "$2b$10$c5AaQb0oj32/bui5Z55PyOb7pY.iEkXYqgdD8MjS9LjSjLMeOkZu2",
  });

  const maxPosition = await getMaxGroupPositionAsync(db);
@@ -448,27 +250,6 @@ const seedDemoUserAsync = async (db: Database) => {
    previousStep: "settings",
  });

-  const integrationId = createId();
-  await db.insert(integrations).values({
-    id: integrationId,
-    name: "Demo Integration",
-    url: "https://demo.homarr.dev",
-    kind: "mock",
-    appId: null,
-  });
-
-  const appIds: string[] = [];
-  for (const app of demoApps) {
-    const appId = createId();
-    appIds.push(appId);
-    await db.insert(apps).values({
-      id: appId,
-      name: app.name,
-      iconUrl: app.iconUrl,
-      href: app.href,
-    });
-  }
-
  const boardId = createId();
  await db.insert(boards).values({
    id: boardId,
@@ -476,93 +257,23 @@ const seedDemoUserAsync = async (db: Database) => {
    isPublic: false,
    creatorId: userId,
  });
-
-  const sectionId = createId();
  await db.insert(sections).values({
-    id: sectionId,
+    id: createId(),
    kind: "empty",
    xOffset: 0,
    yOffset: 0,
    boardId,
  });
-
-  const layoutId = createId();
  await db.insert(layouts).values({
-    id: layoutId,
+    id: createId(),
    name: "Base",
    columnCount: 12,
    breakpoint: 0,
    boardId,
  });
-
-  const demoWidgets = buildDemoWidgets(appIds);
-  let xOffset = 0;
-  let yOffset = 0;
-  let rowMaxHeight = 0;
-  for (const widget of demoWidgets) {
-    if (xOffset + widget.width > 12) {
-      xOffset = 0;
-      yOffset += rowMaxHeight;
-      rowMaxHeight = 0;
-    }
-    rowMaxHeight = Math.max(rowMaxHeight, widget.height);
-    const itemId = createId();
-    await db.insert(items).values({
-      id: itemId,
-      boardId,
-      kind: widget.kind,
-      ...(widget.options ? { options: SuperJSON.stringify(widget.options) } : {}),
-    });
-    await db.insert(itemLayouts).values({
-      itemId,
-      sectionId,
-      layoutId,
-      xOffset,
-      yOffset,
-      width: widget.width,
-      height: widget.height,
-    });
-    if (widget.needsIntegration) {
-      await db.insert(integrationItems).values({
-        itemId,
-        integrationId,
-      });
-    }
-    xOffset += widget.width;
-  }
-
  await db.update(users).set({ homeBoardId: boardId }).where(eq(users.id, userId));

  console.log(
-    "Demo mode enabled: created demo user, mock integration, and sample board with widgets. Disable by setting DEMO_MODE=false.",
+    "Your instance has enabled demo mode. Homarr therefore created example data for your demo. You can disable demo mode anytime by setting the env 'DEMO_MODE' to 'false' or unset it.",
  );
 };
-
-const seedBoardWidgetsAsync = async (db: Database) => {
-  const existingItems = await db.$count(items);
-  if (existingItems > 0) {
-    console.log("Skipping seeding of board widgets as some already exist");
-    return;
-  }
-
-  const board = await db.query.boards.findFirst({
-    with: { sections: true, layouts: true },
-  });
-  if (!board) return;
-
-  const section = board.sections.find((sec) => sec.kind === "empty");
-  const layout = board.layouts[0];
-  if (!section || !layout) return;
-
-  const allIntegrations = await db.query.integrations.findMany();
-  const allApps = await db.query.apps.findMany();
-
-  const count = await placeAllWidgetsAsync(
-    db,
-    { boardId: board.id, sectionId: section.id, layoutId: layout.id, columnCount: layout.columnCount },
-    allIntegrations,
-    allApps,
-  );
-
-  console.log(`Placed ${count} widgets on board`);
-};
@@ -1,2 +0,0 @@
-ALTER TABLE `user` ADD `completed_manage_tour` integer DEFAULT false NOT NULL;--> statement-breakpoint
-ALTER TABLE `user` ADD `completed_board_tour` integer DEFAULT false NOT NULL;
@@ -260,13 +260,6 @@
      "when": 1775400000000,
      "tag": "0036_add_user_ddg_bangs",
      "breakpoints": true
-    },
-    {
-      "idx": 37,
-      "version": "6",
-      "when": 1779199046805,
-      "tag": "0037_add_user_onboarding_tour_status",
-      "breakpoints": true
    }
  ]
 }
@@ -1,4 +1,3 @@
 export * from "./item";
 export * from "./server-setting";
 export * from "./group";
-export * from "./widget-placement";
@@ -1,148 +0,0 @@
-import superjson from "superjson";
-
-import { createId } from "@homarr/common";
-import {
-  defaultBookmarkApps,
-  defaultWidgetConfigs,
-  emptySuperJSON,
-  getWidgetKindsForIntegration,
-} from "@homarr/definitions";
-import type { WidgetKind } from "@homarr/definitions";
-
-import type { Database } from "..";
-import { integrationItems, itemLayouts, items } from "../schema";
-import type { Integration } from "../schema";
-
-const widgetConfigMap = new Map(defaultWidgetConfigs.map((config) => [config.kind, config]));
-
-interface BoardTarget {
-  boardId: string;
-  sectionId: string;
-  layoutId: string;
-  columnCount: number;
-}
-
-interface PlacementContext extends BoardTarget {
-  xOffset: number;
-  yOffset: number;
-  rowMaxHeight: number;
-}
-
-const placeWidgetAsync = async (
-  db: Database,
-  ctx: PlacementContext,
-  kind: WidgetKind,
-  linkedIntegrationIds: string[],
-  options?: string,
-  size?: { width: number; height: number },
-) => {
-  const itemWidth = size?.width ?? 2;
-  const itemHeight = size?.height ?? 2;
-
-  if (ctx.xOffset + itemWidth > ctx.columnCount) {
-    ctx.xOffset = 0;
-    ctx.yOffset += ctx.rowMaxHeight;
-    ctx.rowMaxHeight = 0;
-  }
-
-  const itemId = createId();
-  await db.insert(items).values({
-    id: itemId,
-    boardId: ctx.boardId,
-    kind,
-    options: options ?? emptySuperJSON,
-    advancedOptions: emptySuperJSON,
-  });
-
-  await db.insert(itemLayouts).values({
-    itemId,
-    sectionId: ctx.sectionId,
-    layoutId: ctx.layoutId,
-    xOffset: ctx.xOffset,
-    yOffset: ctx.yOffset,
-    width: itemWidth,
-    height: itemHeight,
-  });
-
-  for (const integrationId of linkedIntegrationIds) {
-    await db.insert(integrationItems).values({ itemId, integrationId });
-  }
-
-  ctx.rowMaxHeight = Math.max(ctx.rowMaxHeight, itemHeight);
-  ctx.xOffset += itemWidth;
-};
-
-interface App {
-  id: string;
-  name: string;
-}
-
-export const placeAllWidgetsAsync = async (
-  db: Database,
-  target: BoardTarget,
-  allIntegrations: Integration[],
-  allApps: App[],
-) => {
-  const ctx: PlacementContext = {
-    ...target,
-    xOffset: 0,
-    yOffset: 0,
-    rowMaxHeight: 0,
-  };
-
-  const placedWidgets = new Set<WidgetKind>();
-
-  for (const integration of allIntegrations) {
-    for (const widgetKind of getWidgetKindsForIntegration(integration.kind)) {
-      if (placedWidgets.has(widgetKind)) continue;
-      const config = widgetConfigMap.get(widgetKind);
-      if (config?.skip) continue;
-      placedWidgets.add(widgetKind);
-
-      const matchingIds = allIntegrations
-        .filter((row) => getWidgetKindsForIntegration(row.kind).includes(widgetKind))
-        .map((row) => row.id);
-
-      const options = config?.options ? superjson.stringify(config.options) : undefined;
-      await placeWidgetAsync(
-        db,
-        ctx,
-        widgetKind,
-        matchingIds,
-        options,
-        config && { width: config.width, height: config.height },
-      );
-    }
-  }
-
-  for (const app of allApps) {
-    await placeWidgetAsync(
-      db,
-      ctx,
-      "app",
-      [],
-      superjson.stringify({ appId: app.id, openInNewTab: true, showTitle: true }),
-      { width: 1, height: 1 },
-    );
-  }
-
-  const bookmarkAppNames = new Set(defaultBookmarkApps.map((bookmark) => bookmark.name));
-  const bookmarkAppIds = allApps.filter((app) => bookmarkAppNames.has(app.name)).map((app) => app.id);
-
-  for (const config of defaultWidgetConfigs) {
-    if (config.skip || placedWidgets.has(config.kind)) continue;
-    placedWidgets.add(config.kind);
-
-    let options = config.options ? { ...config.options } : undefined;
-    if (config.kind === "bookmarks" && bookmarkAppIds.length > 0) {
-      options = { ...options, items: bookmarkAppIds };
-    }
-
-    await placeWidgetAsync(db, ctx, config.kind, [], options ? superjson.stringify(options) : undefined, {
-      width: config.width,
-      height: config.height,
-    });
-  }
-
-  return placedWidgets.size + allApps.length;
-};
@@ -80,8 +80,6 @@ export const users = mysqlTable("user", {
  colorScheme: varchar({ length: 5 }).$type<ColorScheme>().default("dark").notNull(),
  firstDayOfWeek: tinyint().$type<DayOfWeek>().default(1).notNull(), // Defaults to Monday
  pingIconsEnabled: boolean().default(false).notNull(),
-  completedManageTour: boolean().default(false).notNull(),
-  completedBoardTour: boolean().default(false).notNull(),
 });

 export const accounts = mysqlTable(
@@ -79,8 +79,6 @@ export const users = pgTable("user", {
  colorScheme: varchar({ length: 5 }).$type<ColorScheme>().default("dark").notNull(),
  firstDayOfWeek: smallint().$type<DayOfWeek>().default(1).notNull(), // Defaults to Monday
  pingIconsEnabled: boolean().default(false).notNull(),
-  completedManageTour: boolean().default(false).notNull(),
-  completedBoardTour: boolean().default(false).notNull(),
 });

 export const accounts = pgTable(
@@ -62,8 +62,6 @@ export const users = sqliteTable("user", {
  colorScheme: text().$type<ColorScheme>().default("dark").notNull(),
  firstDayOfWeek: int().$type<DayOfWeek>().default(1).notNull(), // Defaults to Monday
  pingIconsEnabled: int({ mode: "boolean" }).default(false).notNull(),
-  completedManageTour: int({ mode: "boolean" }).default(false).notNull(),
-  completedBoardTour: int({ mode: "boolean" }).default(false).notNull(),
 });

 export const accounts = sqliteTable(
@@ -1,90 +0,0 @@
-import { objectKeys } from "@homarr/common";
-
-import { integrationDefs } from "./integration";
-import type { IntegrationKind } from "./integration";
-
-export const extractContainerImageName = (image: string): string => image.split("/").at(-1)?.split(":").at(0) ?? "";
-
-const extractIconSlug = (iconUrl: string): string => {
-  const filename = iconUrl.split("/").pop() ?? "";
-  return filename.replace(/\.(svg|png)$/, "").toLowerCase();
-};
-
-export const integrationIconSlugs: Record<IntegrationKind, string> = Object.fromEntries(
-  objectKeys(integrationDefs).map((kind) => [kind, extractIconSlug(integrationDefs[kind].iconUrl)]),
-) as Record<IntegrationKind, string>;
-
-const integrationAliases: Partial<Record<IntegrationKind, readonly string[]>> = {
-  piHole: ["pihole", "pi-hole"],
-  adGuardHome: ["adguardhome", "adguard-home", "adguard"],
-  homeAssistant: ["homeassistant", "home-assistant", "hass"],
-  openmediavault: ["omv"],
-  qBittorrent: ["qbittorrent"],
-  sabNzbd: ["sabnzbd"],
-  nzbGet: ["nzbget"],
-  unifiController: ["unifi", "unifi-controller"],
-  jellyseerr: ["jellyseerr"],
-  overseerr: ["overseerr"],
-  dashDot: ["dashdot", "dash-dot", "dash."],
-  speedtestTracker: ["speedtest-tracker"],
-  searchCh: ["search-ch"],
-  gitHubContainerRegistry: ["ghcr"],
-  linuxServerIO: ["linuxserver"],
-  coolify: ["coolify"],
-  truenas: ["truenas"],
-};
-
-export const matchIntegrationKind = (search: string): IntegrationKind | null => {
-  const normalized = search.toLowerCase().trim();
-  if (!normalized) return null;
-
-  for (const kind of objectKeys(integrationDefs)) {
-    if (kind.toLowerCase() === normalized) return kind;
-    if (integrationDefs[kind].name.toLowerCase() === normalized) return kind;
-  }
-
-  for (const kind of objectKeys(integrationDefs)) {
-    if (integrationIconSlugs[kind] === normalized) return kind;
-  }
-
-  for (const [kind, aliases] of Object.entries(integrationAliases) as [IntegrationKind, readonly string[]][]) {
-    if (aliases.some((alias) => alias === normalized)) return kind;
-  }
-
-  for (const kind of objectKeys(integrationDefs)) {
-    if (normalized.includes(kind.toLowerCase())) return kind;
-    if (normalized.includes(integrationIconSlugs[kind])) return kind;
-  }
-
-  return null;
-};
-
-const notDockerDiscoverable = new Set<IntegrationKind>([
-  "dockerHub",
-  "github",
-  "gitlab",
-  "npm",
-  "codeberg",
-  "linuxServerIO",
-  "gitHubContainerRegistry",
-  "quay",
-  "ical",
-  "searchCh",
-  "mock",
-]);
-
-interface ContainerMatchInput {
-  image: string;
-  name: string;
-}
-
-export const matchIntegrationKindFromContainer = (container: ContainerMatchInput): IntegrationKind | null => {
-  const imageName = extractContainerImageName(container.image);
-  const fromImage = matchIntegrationKind(imageName);
-  if (fromImage && !notDockerDiscoverable.has(fromImage)) return fromImage;
-
-  const fromName = matchIntegrationKind(container.name);
-  if (fromName && !notDockerDiscoverable.has(fromName)) return fromName;
-
-  return null;
-};
@@ -12,8 +12,5 @@ export * from "./docs";
 export * from "./cookie";
 export * from "./search-engine";
 export * from "./onboarding";
-export * from "./widget-integration-map";
 export * from "./emptysuperjson";
 export * from "./hotkeys";
-export * from "./docker-integration-match";
-export * from "./integration-url-template";
@@ -1,41 +0,0 @@
-import { removeTrailingSlash } from "@homarr/common";
-
-import { integrationIconSlugs } from "./docker-integration-match";
-import type { IntegrationKind } from "./integration";
-import { getIntegrationDefaultPort } from "./integration";
-
-export type UrlTemplateMode = "hostPort" | "subdomain";
-
-const getSlugForKind = (kind: IntegrationKind): string => integrationIconSlugs[kind];
-
-const buildUrl = (slug: string, host: string, mode: UrlTemplateMode, port?: number): string => {
-  const modeBuilders: Record<UrlTemplateMode, () => string> = {
-    subdomain: () => `https://${slug}.${host}`,
-    hostPort: () => (port ? `http://${host}:${port}` : `http://${host}`),
-  };
-  return modeBuilders[mode]();
-};
-
-export const buildIntegrationUrl = (
-  kind: IntegrationKind,
-  baseHost: string,
-  mode: UrlTemplateMode,
-  dockerPort?: number,
-): string => {
-  const host = removeTrailingSlash(baseHost.trim());
-  if (!host) return "";
-  const port = dockerPort ?? getIntegrationDefaultPort(kind);
-  return buildUrl(getSlugForKind(kind), host, mode, port ?? undefined);
-};
-
-export const buildAppUrl = (
-  containerName: string,
-  baseHost: string,
-  mode: UrlTemplateMode,
-  dockerPort?: number,
-): string => {
-  const host = removeTrailingSlash(baseHost.trim());
-  if (!host) return "";
-  const slug = containerName.toLowerCase().replace(/[^a-z0-9-]/g, "-");
-  return buildUrl(slug, host, mode, dockerPort);
-};
@@ -1,4 +1,4 @@
-import { objectKeys, removeTrailingSlash } from "@homarr/common";
+import { objectKeys } from "@homarr/common";
 import type { AtLeastOneOf } from "@homarr/common/types";

 import { createDocumentationLink } from "./docs";
@@ -27,9 +27,7 @@ interface integrationDefinition {
  secretKinds: AtLeastOneOf<IntegrationSecretKind[]>; // at least one secret kind set is required
  category: AtLeastOneOf<IntegrationCategory>;
  documentationUrl: string | null;
-  defaultUrl?: string;
-  defaultPort?: number;
-  apiKeySettingsPath?: string;
+  defaultUrl?: string; // optional default URL for the integration
 }

 export const integrationDefs = {
@@ -39,8 +37,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/sabnzbd.svg",
    category: ["downloadClient", "usenet"],
    documentationUrl: createDocumentationLink("/docs/integrations/sabnzbd"),
-    defaultPort: 8080,
-    apiKeySettingsPath: "/config/general/",
  },
  nzbGet: {
    name: "NZBGet",
@@ -48,7 +44,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/nzbget.svg",
    category: ["downloadClient", "usenet"],
    documentationUrl: createDocumentationLink("/docs/integrations/nzbget"),
-    defaultPort: 6789,
  },
  deluge: {
    name: "Deluge",
@@ -56,7 +51,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/deluge.svg",
    category: ["downloadClient", "torrent"],
    documentationUrl: createDocumentationLink("/docs/integrations/deluge"),
-    defaultPort: 8112,
  },
  transmission: {
    name: "Transmission",
@@ -64,7 +58,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/transmission.svg",
    category: ["downloadClient", "torrent"],
    documentationUrl: createDocumentationLink("/docs/integrations/transmission"),
-    defaultPort: 9091,
  },
  qBittorrent: {
    name: "qBittorrent",
@@ -72,8 +65,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/qbittorrent.svg",
    category: ["downloadClient", "torrent"],
    documentationUrl: createDocumentationLink("/docs/integrations/q-bittorent"),
-    defaultPort: 8080,
-    apiKeySettingsPath: "/#/settings/webui",
  },
  aria2: {
    name: "Aria2",
@@ -81,7 +72,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/PapirusDevelopmentTeam/papirus_icons@latest/src/system_downloads_3.svg",
    category: ["downloadClient", "torrent", "miscellaneous"],
    documentationUrl: createDocumentationLink("/docs/integrations/aria2"),
-    defaultPort: 6800,
  },
  slskd: {
    name: "Slskd",
@@ -89,7 +79,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/slskd.svg",
    category: ["downloadClient", "miscellaneous"],
    documentationUrl: createDocumentationLink("/docs/integrations/slskd"),
-    defaultPort: 5030,
  },
  sonarr: {
    name: "Sonarr",
@@ -97,8 +86,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/sonarr.svg",
    category: ["calendar"],
    documentationUrl: createDocumentationLink("/docs/integrations/sonarr"),
-    defaultPort: 8989,
-    apiKeySettingsPath: "/settings/general",
  },
  radarr: {
    name: "Radarr",
@@ -106,8 +93,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/radarr.svg",
    category: ["calendar"],
    documentationUrl: createDocumentationLink("/docs/integrations/radarr"),
-    defaultPort: 7878,
-    apiKeySettingsPath: "/settings/general",
  },
  lidarr: {
    name: "Lidarr",
@@ -115,8 +100,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/lidarr.svg",
    category: ["calendar"],
    documentationUrl: createDocumentationLink("/docs/integrations/lidarr"),
-    defaultPort: 8686,
-    apiKeySettingsPath: "/settings/general",
  },
  readarr: {
    name: "Readarr",
@@ -124,8 +107,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/readarr.svg",
    category: ["calendar"],
    documentationUrl: createDocumentationLink("/docs/integrations/readarr"),
-    defaultPort: 8787,
-    apiKeySettingsPath: "/settings/general",
  },
  prowlarr: {
    name: "Prowlarr",
@@ -133,8 +114,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/prowlarr.svg",
    category: ["indexerManager"],
    documentationUrl: createDocumentationLink("/docs/integrations/prowlarr"),
-    defaultPort: 9696,
-    apiKeySettingsPath: "/settings/general",
  },
  jellyfin: {
    name: "Jellyfin",
@@ -142,8 +121,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/jellyfin.svg",
    category: ["mediaService", "mediaRelease"],
    documentationUrl: createDocumentationLink("/docs/integrations/jellyfin"),
-    defaultPort: 8096,
-    apiKeySettingsPath: "/web/index.html#!/dashboard/keys",
  },
  emby: {
    name: "Emby",
@@ -151,7 +128,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/emby.svg",
    category: ["mediaService", "mediaRelease"],
    documentationUrl: createDocumentationLink("/docs/integrations/emby"),
-    defaultPort: 8096,
  },
  plex: {
    name: "Plex",
@@ -159,7 +135,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/plex.svg",
    category: ["mediaService", "mediaRelease"],
    documentationUrl: createDocumentationLink("/docs/integrations/plex"),
-    defaultPort: 32400,
  },
  jellyseerr: {
    name: "Jellyseerr",
@@ -167,8 +142,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/jellyseerr.svg",
    category: ["mediaSearch", "mediaRequest", "search"],
    documentationUrl: createDocumentationLink("/docs/integrations/jellyseerr"),
-    defaultPort: 5055,
-    apiKeySettingsPath: "/settings",
  },
  seerr: {
    name: "Seerr",
@@ -176,8 +149,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/seerr.svg",
    category: ["mediaSearch", "mediaRequest", "search"],
    documentationUrl: createDocumentationLink("/docs/integrations/seerr"),
-    defaultPort: 5055,
-    apiKeySettingsPath: "/settings",
  },
  overseerr: {
    name: "Overseerr",
@@ -185,8 +156,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/overseerr.svg",
    category: ["mediaSearch", "mediaRequest", "search"],
    documentationUrl: createDocumentationLink("/docs/integrations/overseerr"),
-    defaultPort: 5055,
-    apiKeySettingsPath: "/settings",
  },
  piHole: {
    name: "Pi-hole",
@@ -194,7 +163,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/pi-hole.svg",
    category: ["dnsHole"],
    documentationUrl: createDocumentationLink("/docs/integrations/pi-hole"),
-    defaultPort: 80,
  },
  adGuardHome: {
    name: "AdGuard Home",
@@ -202,7 +170,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/adguard-home.svg",
    category: ["dnsHole"],
    documentationUrl: createDocumentationLink("/docs/integrations/adguard-home"),
-    defaultPort: 3000,
  },
  homeAssistant: {
    name: "Home Assistant",
@@ -210,7 +177,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/home-assistant.svg",
    category: ["smartHomeServer", "calendar"],
    documentationUrl: createDocumentationLink("/docs/integrations/home-assistant"),
-    defaultPort: 8123,
  },
  openmediavault: {
    name: "OpenMediaVault",
@@ -218,7 +184,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/openmediavault.svg",
    category: ["healthMonitoring"],
    documentationUrl: createDocumentationLink("/docs/integrations/open-media-vault"),
-    defaultPort: 80,
  },
  dashDot: {
    name: "Dash.",
@@ -233,7 +198,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/glances.svg",
    category: ["healthMonitoring"],
    documentationUrl: null,
-    defaultPort: 61208,
  },
  tdarr: {
    name: "Tdarr",
@@ -241,7 +205,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/png/tdarr.png",
    category: ["mediaTranscoding"],
    documentationUrl: createDocumentationLink("/docs/integrations/tdarr"),
-    defaultPort: 8265,
  },
  proxmox: {
    name: "Proxmox",
@@ -249,7 +212,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/proxmox.svg",
    category: ["healthMonitoring"],
    documentationUrl: createDocumentationLink("/docs/integrations/proxmox"),
-    defaultPort: 8006,
  },
  nextcloud: {
    name: "Nextcloud",
@@ -257,7 +219,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/nextcloud.svg",
    category: ["calendar", "notifications"],
    documentationUrl: createDocumentationLink("/docs/integrations/nextcloud"),
-    defaultPort: 443,
  },
  unifiController: {
    name: "Unifi Controller",
@@ -265,7 +226,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/png/unifi.png",
    category: ["networkController"],
    documentationUrl: createDocumentationLink("/docs/integrations/unifi-controller"),
-    defaultPort: 8443,
  },
  opnsense: {
    name: "OPNsense",
@@ -273,7 +233,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/opnsense.svg",
    category: ["firewall"],
    documentationUrl: createDocumentationLink("/docs/integrations/opnsense"),
-    defaultPort: 443,
  },
  github: {
    name: "Github",
@@ -345,7 +304,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/ntfy.svg",
    category: ["notifications"],
    documentationUrl: createDocumentationLink("/docs/integrations/ntfy"),
-    defaultPort: 80,
  },
  ical: {
    name: "iCal",
@@ -360,7 +318,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/anchor.svg",
    category: ["notes"],
    documentationUrl: createDocumentationLink("/docs/integrations/anchor"),
-    defaultPort: 8080,
  },
  truenas: {
    name: "TrueNAS",
@@ -368,7 +325,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/truenas.svg",
    category: ["healthMonitoring"],
    documentationUrl: createDocumentationLink("/docs/integrations/truenas"),
-    defaultPort: 80,
  },
  unraid: {
    name: "Unraid",
@@ -376,7 +332,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/unraid.svg",
    category: ["healthMonitoring"],
    documentationUrl: createDocumentationLink("/docs/integrations/unraid"),
-    defaultPort: 80,
  },
  coolify: {
    name: "Coolify",
@@ -385,12 +340,12 @@ export const integrationDefs = {
    category: ["healthMonitoring"],
    // @ts-expect-error - docs page will be created when integration is merged
    documentationUrl: createDocumentationLink("/docs/integrations/coolify"),
-    defaultPort: 8000,
  },
  searchCh: {
    name: "Search.ch",
    secretKinds: [[]],
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/search-ch.png",
+    defaultUrl: "https://search.ch",
    category: ["timetable"],
    documentationUrl: createDocumentationLink("/docs/integrations/search-ch"),
  },
@@ -400,7 +355,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/immich.svg",
    category: ["photoService"],
    documentationUrl: createDocumentationLink("/docs/integrations/immich"),
-    defaultPort: 2283,
  },
  tracearr: {
    name: "Tracearr",
@@ -408,7 +362,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/tracearr.svg",
    category: ["mediaMonitoring"],
    documentationUrl: createDocumentationLink("/docs/integrations/tracearr"),
-    defaultPort: 7040,
  },
  speedtestTracker: {
    name: "Speedtest Tracker",
@@ -416,7 +369,6 @@ export const integrationDefs = {
    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/speedtest-tracker.png",
    category: ["speedtest"],
    documentationUrl: createDocumentationLink("/docs/integrations/speedtest-tracker"),
-    defaultPort: 80,
  },
  umami: {
    name: "Umami",
@@ -425,14 +377,6 @@ export const integrationDefs = {
    category: ["analytics"],
    defaultUrl: "https://api.umami.is/v1",
    documentationUrl: createDocumentationLink("/docs/integrations/umami"),
-    defaultPort: 3000,
-  },
-  peaNut: {
-    name: "PeaNUT",
-    secretKinds: [["username", "password"], []],
-    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/peanut.svg",
-    category: ["ups"],
-    documentationUrl: null,
  },
  // This integration only returns mock data, it is used during development (but can also be used in production by directly going to the create page)
  mock: {
@@ -452,7 +396,6 @@ export const integrationDefs = {
      "networkController",
      "notifications",
      "smartHomeServer",
-      "ups",
    ],
    documentationUrl: null,
  },
@@ -475,19 +418,6 @@ export const getIntegrationDefaultUrl = (integration: IntegrationKind) => {
  return "defaultUrl" in definition ? definition.defaultUrl : undefined;
 };

-export const getIntegrationDefaultPort = (kind: IntegrationKind): number | undefined => {
-  const definition = integrationDefs[kind];
-  return "defaultPort" in definition ? definition.defaultPort : undefined;
-};
-
-export const getIntegrationApiKeyUrl = (integrationUrl: string, kind: IntegrationKind): string | null => {
-  const definition = integrationDefs[kind];
-  if (!("apiKeySettingsPath" in definition)) return null;
-  const base = removeTrailingSlash(integrationUrl);
-  if (!base) return null;
-  return `${base}${definition.apiKeySettingsPath}`;
-};
-
 /**
 * Get all integration kinds that share a category, typed only by the kinds belonging to the category
 * @param category Category to filter by, belonging to IntegrationCategory
@@ -540,7 +470,6 @@ export const integrationCategories = [
  "mediaMonitoring",
  "speedtest",
  "analytics",
-  "ups",
 ] as const;

 export type IntegrationCategory = (typeof integrationCategories)[number];
@@ -1,2 +1,2 @@
-export const onboardingSteps = ["start", "import", "user", "group", "settings", "integrations", "finish"] as const;
+export const onboardingSteps = ["start", "import", "user", "group", "settings", "finish"] as const;
 export type OnboardingStep = (typeof onboardingSteps)[number];
@@ -1,29 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import { getIntegrationApiKeyUrl } from "../integration";
-
-describe("getIntegrationApiKeyUrl", () => {
-  it("builds URL for sonarr", () => {
-    expect(getIntegrationApiKeyUrl("http://192.168.1.10:8989", "sonarr")).toBe(
-      "http://192.168.1.10:8989/settings/general",
-    );
-  });
-
-  it("builds URL for jellyfin", () => {
-    expect(getIntegrationApiKeyUrl("http://media.local:8096", "jellyfin")).toBe(
-      "http://media.local:8096/web/index.html#!/dashboard/keys",
-    );
-  });
-
-  it("returns null for integrations without apiKeySettingsPath", () => {
-    expect(getIntegrationApiKeyUrl("http://localhost", "plex")).toBeNull();
-  });
-
-  it("returns null for empty URL", () => {
-    expect(getIntegrationApiKeyUrl("", "sonarr")).toBeNull();
-  });
-
-  it("strips trailing slash from base URL", () => {
-    expect(getIntegrationApiKeyUrl("http://sonarr.local/", "sonarr")).toBe("http://sonarr.local/settings/general");
-  });
-});
@@ -1,119 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import {
-  extractContainerImageName,
-  matchIntegrationKind,
-  matchIntegrationKindFromContainer,
-} from "../docker-integration-match";
-
-describe("extractContainerImageName", () => {
-  it("extracts name from full image reference", () => {
-    expect(extractContainerImageName("linuxserver/sonarr:latest")).toBe("sonarr");
-  });
-
-  it("extracts name from ghcr image", () => {
-    expect(extractContainerImageName("ghcr.io/org/radarr:v5")).toBe("radarr");
-  });
-
-  it("handles plain image name", () => {
-    expect(extractContainerImageName("jellyfin")).toBe("jellyfin");
-  });
-
-  it("handles empty string", () => {
-    expect(extractContainerImageName("")).toBe("");
-  });
-});
-
-describe("matchIntegrationKind", () => {
-  it("matches exact kind name", () => {
-    expect(matchIntegrationKind("sonarr")).toBe("sonarr");
-  });
-
-  it("matches case-insensitively", () => {
-    expect(matchIntegrationKind("Sonarr")).toBe("sonarr");
-  });
-
-  it("matches icon slug for pi-hole", () => {
-    expect(matchIntegrationKind("pi-hole")).toBe("piHole");
-  });
-
-  it("matches alias pihole", () => {
-    expect(matchIntegrationKind("pihole")).toBe("piHole");
-  });
-
-  it("matches alias adguardhome", () => {
-    expect(matchIntegrationKind("adguardhome")).toBe("adGuardHome");
-  });
-
-  it("matches alias homeassistant", () => {
-    expect(matchIntegrationKind("homeassistant")).toBe("homeAssistant");
-  });
-
-  it("matches substring in image name", () => {
-    expect(matchIntegrationKind("hotio-sonarr")).toBe("sonarr");
-  });
-
-  it("returns null for unknown", () => {
-    expect(matchIntegrationKind("nginx")).toBeNull();
-  });
-
-  it("returns null for empty string", () => {
-    expect(matchIntegrationKind("")).toBeNull();
-  });
-});
-
-describe("matchIntegrationKindFromContainer", () => {
-  it("matches from image name first", () => {
-    expect(
-      matchIntegrationKindFromContainer({
-        image: "linuxserver/sonarr:latest",
-        name: "my-sonarr",
-      }),
-    ).toBe("sonarr");
-  });
-
-  it("falls back to container name", () => {
-    expect(
-      matchIntegrationKindFromContainer({
-        image: "custom/myapp:latest",
-        name: "radarr",
-      }),
-    ).toBe("radarr");
-  });
-
-  it("returns null when neither matches", () => {
-    expect(
-      matchIntegrationKindFromContainer({
-        image: "nginx:latest",
-        name: "web-proxy",
-      }),
-    ).toBeNull();
-  });
-
-  it("excludes dockerHub even when image contains docker", () => {
-    expect(
-      matchIntegrationKindFromContainer({
-        image: "portainer/portainer-ce:latest",
-        name: "docker-proxy",
-      }),
-    ).toBeNull();
-  });
-
-  it("excludes ical from container matching", () => {
-    expect(
-      matchIntegrationKindFromContainer({
-        image: "ical-relay:latest",
-        name: "ical",
-      }),
-    ).toBeNull();
-  });
-
-  it("excludes github from container matching", () => {
-    expect(
-      matchIntegrationKindFromContainer({
-        image: "github-runner:latest",
-        name: "github-actions",
-      }),
-    ).toBeNull();
-  });
-});
@@ -1,41 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import { getIntegrationDefaultPort } from "../integration";
-import { buildIntegrationUrl } from "../integration-url-template";
-
-describe("buildIntegrationUrl", () => {
-  it("builds subdomain URL", () => {
-    expect(buildIntegrationUrl("sonarr", "homelab.local", "subdomain")).toBe("https://sonarr.homelab.local");
-  });
-
-  it("builds hostPort URL with default port", () => {
-    expect(buildIntegrationUrl("sonarr", "192.168.1.1", "hostPort")).toBe("http://192.168.1.1:8989");
-  });
-
-  it("uses docker port over default port", () => {
-    expect(buildIntegrationUrl("sonarr", "192.168.1.1", "hostPort", 9999)).toBe("http://192.168.1.1:9999");
-  });
-
-  it("builds hostPort URL without port when none known", () => {
-    expect(buildIntegrationUrl("mock", "192.168.1.1", "hostPort")).toBe("http://192.168.1.1");
-  });
-
-  it("strips trailing slashes from host", () => {
-    expect(buildIntegrationUrl("sonarr", "homelab.local/", "subdomain")).toBe("https://sonarr.homelab.local");
-    expect(buildIntegrationUrl("sonarr", "homelab.local///", "subdomain")).toBe("https://sonarr.homelab.local");
-  });
-
-  it("returns empty string for empty host", () => {
-    expect(buildIntegrationUrl("sonarr", "", "subdomain")).toBe("");
-  });
-
-  it("uses pi-hole slug for subdomain mode", () => {
-    expect(buildIntegrationUrl("piHole", "example.com", "subdomain")).toBe("https://pi-hole.example.com");
-  });
-
-  it("reads default ports from integration definitions", () => {
-    expect(getIntegrationDefaultPort("radarr")).toBe(7878);
-    expect(getIntegrationDefaultPort("prowlarr")).toBe(9696);
-    expect(getIntegrationDefaultPort("jellyfin")).toBe(8096);
-  });
-});
@@ -1,113 +0,0 @@
-import { createDocumentationLink } from "./docs";
-import type { IntegrationKind } from "./integration";
-import { getIntegrationKindsByCategory } from "./integration";
-import type { WidgetKind } from "./widget";
-
-/**
- * Static mapping of widget kinds to the integration kinds they support.
- * Mirrors the supportedIntegrations declared in each widget definition
- * but lives in @homarr/definitions so server-side code (API layer)
- * can use it without importing @homarr/widgets.
- */
-export const widgetIntegrationSupport: Partial<Record<WidgetKind, readonly IntegrationKind[]>> = {
-  dnsHoleSummary: getIntegrationKindsByCategory("dnsHole"),
-  dnsHoleControls: getIntegrationKindsByCategory("dnsHole"),
-  "smartHome-entityState": getIntegrationKindsByCategory("smartHomeServer"),
-  "smartHome-executeAutomation": getIntegrationKindsByCategory("smartHomeServer"),
-  mediaServer: getIntegrationKindsByCategory("mediaService"),
-  calendar: getIntegrationKindsByCategory("calendar"),
-  downloads: getIntegrationKindsByCategory("downloadClient"),
-  "mediaRequests-requestList": getIntegrationKindsByCategory("mediaRequest"),
-  "mediaRequests-requestStats": getIntegrationKindsByCategory("mediaRequest"),
-  mediaTranscoding: getIntegrationKindsByCategory("mediaTranscoding"),
-  networkControllerSummary: getIntegrationKindsByCategory("networkController"),
-  networkControllerStatus: getIntegrationKindsByCategory("networkController"),
-  indexerManager: getIntegrationKindsByCategory("indexerManager"),
-  healthMonitoring: getIntegrationKindsByCategory("healthMonitoring"),
-  firewall: getIntegrationKindsByCategory("firewall"),
-  notifications: getIntegrationKindsByCategory("notifications"),
-  mediaReleases: ["emby", "jellyfin", "plex"],
-  systemResources: ["dashDot", "openmediavault", "truenas", "unraid", "glances"],
-  systemDisks: ["dashDot", "openmediavault", "truenas", "unraid"],
-  coolify: ["coolify"],
-  timetable: ["searchCh"],
-  "immich-serverStats": ["immich"],
-  "immich-albumCarousel": ["immich"],
-  tracearr: ["tracearr"],
-  speedtestTracker: ["speedtestTracker"],
-  anchorNote: ["anchor"],
-};
-
-export const getWidgetKindsForIntegration = (integrationKind: IntegrationKind): WidgetKind[] => {
-  const result: WidgetKind[] = [];
-  for (const [widgetKind, supportedIntegrations] of Object.entries(widgetIntegrationSupport)) {
-    if (supportedIntegrations.includes(integrationKind)) {
-      result.push(widgetKind as WidgetKind);
-    }
-  }
-  return result;
-};
-
-export interface DefaultWidgetConfig {
-  kind: WidgetKind;
-  width: number;
-  height: number;
-  options?: Record<string, unknown>;
-  skip?: boolean;
-}
-
-export const defaultWidgetConfigs: DefaultWidgetConfig[] = [
-  { kind: "clock", width: 2, height: 1 },
-  { kind: "weather", width: 2, height: 1, options: { showCity: true, hasForecast: true, forecastDayCount: 3 } },
-  { kind: "bookmarks", width: 2, height: 2, options: { title: "Useful Links", layout: "grid", openNewTab: true } },
-];
-
-export const generalWidgets: WidgetKind[] = defaultWidgetConfigs
-  .filter((config) => !config.skip)
-  .map((config) => config.kind);
-
-export const featuredIntegrations: readonly IntegrationKind[] = [
-  "sonarr",
-  "radarr",
-  "prowlarr",
-  "sabNzbd",
-  "qBittorrent",
-  "seerr",
-  "jellyfin",
-];
-
-export const hiddenFromOnboarding = new Set<IntegrationKind>([
-  "searchCh",
-  "github",
-  "dockerHub",
-  "gitlab",
-  "npm",
-  "codeberg",
-  "linuxServerIO",
-  "gitHubContainerRegistry",
-  "quay",
-  "mock",
-]);
-
-export const defaultBookmarkApps = [
-  {
-    name: "Homarr Docs",
-    href: createDocumentationLink("/docs/getting-started"),
-    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/homarr.svg",
-  },
-  {
-    name: "Homarr GitHub",
-    href: "https://github.com/homarr-labs/homarr",
-    iconUrl: "https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/svg/github.svg",
-  },
-  {
-    name: "Help Translate",
-    href: createDocumentationLink("/docs/community/translations"),
-    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/homarr.svg",
-  },
-  {
-    name: "Support Homarr",
-    href: "https://opencollective.com/homarr",
-    iconUrl: "https://cdn.jsdelivr.net/gh/loganmarchione/homelab-svg-assets@latest/assets/opencollective.svg",
-  },
-];