fix: prevent white background flash and overscroll on Safari iOS

- Set background-color: #101010 on html/body/.App so the Safari iOS rubber-band overscroll area is dark instead of white - Always render body background style in ViewLoader (not just during Suspense fallback) so keyColour param and --background-color-override propagate to the body for the overscroll region - Add viewport-fit=cover, apple-mobile-web-app meta tags for proper iOS notch/safe-area handling - Fix manifest.json background_color from #ffffff to #101010 - Align theme_color across both manifests to #101010 https://claude.ai/code/session_016z5vU45pexTdkQV2eHJqh4
2026-08-09 17:33:55 +00:00 · 2026-05-09 16:35:53 +00:00
330 changed files with 4958 additions and 15062 deletions
@@ -1,5 +0,0 @@
-# CodeGraph data files — local to each machine, not for committing.
-# Ignore everything in .codegraph/ except this file itself, so transient
-# files (the database, daemon.pid, sockets, logs) never show up in git.
-*
-!.gitignore
@@ -20,13 +20,13 @@ jobs:
          node-version-file: '.nvmrc'

      - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v4

      - name: Get pnpm store directory
        run: echo "PNPM_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV

      - name: Setup pnpm cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: ${{ env.PNPM_STORE_PATH }}
          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}
@@ -15,13 +15,13 @@ jobs:
      - uses: actions/checkout@v6

      - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v4

      - name: Get pnpm store directory
        run: echo "PNPM_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV

      - name: Setup pnpm cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: ${{ env.PNPM_STORE_PATH }}
          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}
@@ -17,13 +17,13 @@ jobs:
          node-version-file: '.nvmrc'

      - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v4

      - name: Get pnpm store directory
        run: echo "PNPM_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV

      - name: Setup pnpm cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: ${{ env.PNPM_STORE_PATH }}
          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}
@@ -74,7 +74,7 @@ jobs:
          node-version-file: '.nvmrc'

      - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v4

      - name: Install dependencies
        run: pnpm install --frozen-lockfile
@@ -111,7 +111,7 @@ jobs:
          node-version-file: '.nvmrc'

      - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v4

      - name: Install dependencies
        run: pnpm install --frozen-lockfile
@@ -18,13 +18,13 @@ jobs:
          node-version-file: '.nvmrc'

      - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v4

      - name: Get pnpm store directory
        run: echo "PNPM_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV

      - name: Setup pnpm cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: ${{ env.PNPM_STORE_PATH }}
          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}
@@ -15,18 +15,14 @@ jobs:
    steps:
      - uses: actions/checkout@v6

-      - uses: actions/setup-node@v6
-        with:
-          node-version-file: '.nvmrc'
-
      - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v4

      - name: Get pnpm store directory
        run: echo "PNPM_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV

      - name: Setup pnpm cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: ${{ env.PNPM_STORE_PATH }}
          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}
@@ -58,18 +54,14 @@ jobs:
    steps:
      - uses: actions/checkout@v6

-      - uses: actions/setup-node@v6
-        with:
-          node-version-file: '.nvmrc'
-
      - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v4

      - name: Get pnpm store directory
        run: echo "PNPM_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV

      - name: Setup pnpm cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: ${{ env.PNPM_STORE_PATH }}
          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}
@@ -82,18 +74,18 @@ jobs:
      - name: Get installed Playwright version
        run: echo "PLAYWRIGHT_VERSION=$(pnpm ls @playwright/test --parseable | cut -s -d '@' -f3 | cut -d '/' -f1)" >> $GITHUB_ENV
      - name: Cache playwright binaries
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: |
            ~/.cache/ms-playwright
          key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
          restore-keys: |
            ${{ runner.os }}-playwright-
-      - run: pnpm playwright install --with-deps
+      - run: npx playwright install --with-deps
        if: steps.playwright-cache.outputs.cache-hit != 'true'

      - name: Install Playwright Browsers
-        run: pnpm playwright install --with-deps
+        run: npx playwright install --with-deps

      - name: Run Playwright tests
        run: pnpm e2e
@@ -54,6 +54,3 @@ ontime-data/

 # temporary write files
 **.tmp
-
-# Claude Code metadata
-.claude/
@@ -1 +1 @@
-v22.22.3
+v22.15.1
@@ -1,4 +1,4 @@
-ARG NODE_VERSION=22.22.2
+ARG NODE_VERSION=22.15.1
 FROM node:${NODE_VERSION}-alpine

 # Set environment variables
@@ -1,6 +1,6 @@
 {
  "name": "@getontime/cli",
-  "version": "4.12.0",
+  "version": "4.7.0",
  "author": "Carlos Valente",
  "description": "Time keeping for live events",
  "repository": "https://github.com/cpvalente/ontime",
@@ -6,8 +6,9 @@
    <link rel="icon" href="favicon.ico" />
    <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
    <meta name="theme-color" content="#101010" />
-    <meta name="ontime" content="ontime - time keeping for live events" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+    <meta name="ontime" content="ontime - time keeping for live events" />
    <link rel="apple-touch-icon" href="ontime-logo.png" />
    <link rel="icon" type="image/png" href="ontime-logo.png" />
    <link rel="manifest" href="site.webmanifest" />
@@ -18,13 +19,6 @@
  <body>
    <noscript>You need to enable JavaScript to run this app.</noscript>
    <div id="root"></div>
-    <script>
-      if (/\/timer\/?$/.test(window.location.pathname) && typeof Promise.any !== 'function') {
-        var b = document.querySelector('base');
-        var base = b ? (b.getAttribute('href') || '').replace(/\/$/, '') : '';
-        window.location.replace(base + '/timer-legacy' + window.location.search);
-      }
-    </script>
    <script type="module" src="/src/index.tsx"></script>
  </body>
 </html>
@@ -1,10 +1,10 @@
 {
  "name": "ontime-ui",
-  "version": "4.12.0",
+  "version": "4.7.0",
  "private": true,
  "type": "module",
  "dependencies": {
-    "@base-ui/react": "1.6.0",
+    "@base-ui/react": "1.3.0",
    "@codemirror/commands": "^6.0.0",
    "@codemirror/lang-css": "^6.0.0",
    "@codemirror/state": "^6.0.0",
@@ -12,27 +12,28 @@
    "@dnd-kit/core": "^6.3.1",
    "@dnd-kit/sortable": "^10.0.0",
    "@dnd-kit/utilities": "^3.2.2",
-    "@fontsource/open-sans": "^5.2.7",
+    "@fontsource/open-sans": "^5.2.6",
    "@mantine/hooks": "^8.3.7",
-    "@sentry/react": "^10.59.0",
+    "@sentry/react": "^10.2.0",
    "@table-nav/react": "^0.0.7",
-    "@tanstack/react-query": "^5.101.0",
-    "@tanstack/react-query-devtools": "^5.101.0",
+    "@tanstack/react-query": "^5.85.9",
+    "@tanstack/react-query-devtools": "^5.85.9",
    "@tanstack/react-table": "^8.21.3",
-    "@uiw/codemirror-theme-vscode": "^4.25.10",
+    "@uiw/codemirror-theme-vscode": "^4.25.9",
    "autosize": "^6.0.1",
-    "axios": "^1.18.0",
+    "axios": "^1.12.2",
    "csv-stringify": "^6.6.0",
    "qrcode": "^1.5.4",
-    "react": "^19.2.7",
-    "react-colorful": "^5.7.0",
-    "react-dom": "^19.2.7",
+    "react": "^19.2.3",
+    "react-colorful": "^5.6.1",
+    "react-dom": "^19.2.3",
    "react-fast-compare": "^3.2.2",
-    "react-hook-form": "^7.80.0",
-    "react-icons": "5.6.0",
-    "react-router": "^8.0.1",
-    "react-virtuoso": "^4.18.7",
-    "zustand": "^5.0.14"
+    "react-hook-form": "^7.72.0",
+    "react-icons": "5.5.0",
+    "react-router": "^7.11.0",
+    "react-virtuoso": "^4.17.0",
+    "web-vitals": "^5.1.0",
+    "zustand": "^5.0.9"
  },
  "scripts": {
    "addversion": "node -p \"'export const ONTIME_VERSION = ' + JSON.stringify(require('../../package.json').version) + ';'\" > src/ONTIME_VERSION.js",
@@ -50,8 +51,7 @@
    "production": [
      ">0.2%",
      "not dead",
-      "not op_mini all",
-      "safari >= 14.1"
+      "not op_mini all"
    ],
    "development": [
      "last 1 chrome version",
@@ -64,10 +64,8 @@
    "@types/qrcode": "^1.5.6",
    "@types/react": "^19.1.12",
    "@types/react-dom": "^19.1.9",
-    "@vitejs/plugin-legacy": "^8.0.1",
    "@vitejs/plugin-react": "5.2.0",
    "babel-plugin-react-compiler": "1.0.0",
-    "happy-dom": "^20.9.0",
    "ontime-types": "workspace:*",
    "ontime-utils": "workspace:*",
    "sass": "^1.57.1",
@@ -75,6 +73,7 @@
    "vite": "8.0.1",
    "vite-plugin-compression2": "2.5.1",
    "vite-plugin-svgr": "4.5.0",
+    "vite-tsconfig-paths": "6.1.1",
    "vitest": "catalog:"
  }
 }
@@ -14,6 +14,6 @@
  "scope": "./",
  "start_url": "./",
  "display": "",
-  "theme_color": "#121212",
+  "theme_color": "#101010",
  "background_color": "#101010"
 }
@@ -2,7 +2,7 @@
  "name": "",
  "short_name": "",
  "icons": [{ "src": "ontime-logo.png", "sizes": "295x295", "type": "image/png" }],
-  "theme_color": "#121212",
+  "theme_color": "#101010",
  "background_color": "#101010",
  "display": "standalone"
 }
@@ -6,7 +6,6 @@ import {
  ProjectRundownsList,
  RenumberCues,
  Rundown,
-  RundownImportPayload,
  TransientEventPayload,
 } from 'ontime-types';

@@ -35,17 +34,19 @@ export async function fetchCurrentRundown(options?: RequestOptions): Promise<Run
    throw new Error('Invalid rundown payload');
  }
  return res.data;
-}

-/**
- * HTTP request to fetch all entries in the given rundown
- */
-export async function fetchRundown(rundownId: RundownId, options?: RequestOptions): Promise<Rundown> {
-  const res = await axios.get(`${rundownPath}/${rundownId}`, { signal: options?.signal });
-  if (!isValidRundown(res.data)) {
-    throw new Error('Invalid rundown payload');
+  function isValidRundown(x: any): x is Rundown {
+    return (
+      x &&
+      typeof x === 'object' &&
+      typeof x.id === 'string' &&
+      Array.isArray(x.order) &&
+      Array.isArray(x.flatOrder) &&
+      x.entries &&
+      typeof x.entries === 'object' &&
+      typeof x.revision === 'number'
+    );
  }
-  return res.data;
 }

 /**
@@ -83,15 +84,6 @@ export async function deleteRundown(rundownId: RundownId): Promise<AxiosResponse
  return axios.delete(`${rundownPath}/${rundownId}`);
 }

-/**
- * HTTP request to apply an imported rundown using a merge strategy or into a new rundown
- */
-export async function importRundownWithOptions(
-  payload: RundownImportPayload,
-): Promise<AxiosResponse<ProjectRundownsList>> {
-  return axios.post(`${rundownPath}/import`, payload);
-}
-
 // #endregion operations on project rundowns ======================
 // #region operations on rundown entries ==========================

@@ -176,13 +168,6 @@ export async function postCloneEntry(
  return axios.post(`${rundownPath}/${rundownId}/clone/${entryId}`, options);
 }

-/**
- * HTTP request events duration to fit inside the group target
- */
-export async function requestFitGroupTarget(rundownId: RundownId, eventId: EntryId): Promise<AxiosResponse<Rundown>> {
-  return axios.post(`${rundownPath}/${rundownId}/${eventId}/fit-group-duration`);
-}
-
 /**
 * HTTP request for grouping a list of entries into a group
 */
@@ -212,16 +197,3 @@ export async function requestDeleteAll(rundownId: RundownId): Promise<AxiosRespo
 }

 // #endregion operations on rundown entries =======================
-
-function isValidRundown(x: any): x is Rundown {
-  return (
-    x &&
-    typeof x === 'object' &&
-    typeof x.id === 'string' &&
-    Array.isArray(x.order) &&
-    Array.isArray(x.flatOrder) &&
-    x.entries &&
-    typeof x.entries === 'object' &&
-    typeof x.revision === 'number'
-  );
-}
@@ -1,82 +1,24 @@
-.section {
-  display: flex;
-  flex-direction: column;
-  gap: 0.75rem;
-  padding: 0.75rem;
-  background-color: $gray-1300;
-  border: 1px solid $gray-1100;
-  border-radius: $component-border-radius-md;
-}
-
-.sectionHeader {
-  display: flex;
-  flex-direction: column;
-  gap: 0.25rem;
-}
-
-.separator {
-  display: flex;
-  align-items: center;
-  gap: 0.75rem;
-  color: $gray-500;
-  font-size: $inner-section-text-size;
-  font-weight: 600;
-  letter-spacing: 0.08em;
-  text-transform: uppercase;
-
-  &::before,
-  &::after {
-    content: '';
-    flex: 1;
-    border-top: 1px solid $gray-1100;
-  }
-}
-
 .textEntry {
+  grid-area: input;
  display: flex;
  align-items: center;
  gap: 0.5rem;
-  flex: 1;
-  min-width: 0;
  color: $label-gray;
 }

 .inlineEntry {
  display: grid;
-  grid-template-columns: minmax(0, 1fr) auto;
-  align-items: center;
-  gap: 0.75rem;
+  grid-template-areas:
+    'label label'
+    'input btn';
+  grid-template-columns: 1fr auto;
+  column-gap: 0.5rem;
 }

 .redirect {
-  margin-left: auto;
+  grid-area: btn;
 }

 .label {
-  color: $gray-200;
-  font-size: $text-body-size;
-  font-weight: 600;
-}
-
-.description {
-  color: $gray-500;
-  font-size: $inner-section-text-size;
-}
-
-.origin {
-  flex: 0 0 auto;
-  color: $gray-500;
-  font-size: $inner-section-text-size;
-  white-space: nowrap;
-}
-
-@media (max-width: $min-tablet) {
-  .inlineEntry {
-    grid-template-columns: 1fr;
-    align-items: stretch;
-  }
-
-  .redirect {
-    align-self: flex-end;
-  }
+  color: $label-gray;
 }
@@ -1,7 +1,6 @@
 import { useState } from 'react';
 import { IoArrowForward } from 'react-icons/io5';

-import { baseURI } from '../../../externals';
 import { navigatorConstants } from '../../../viewerConfig';
 import useUrlPresets from '../../hooks-query/useUrlPresets';
 import { setClientRemote } from '../../hooks/useSocket';
@@ -9,7 +8,7 @@ import Button from '../buttons/Button';
 import Dialog from '../dialog/Dialog';
 import Info from '../info/Info';
 import Input from '../input/input/Input';
-import ExternalLink from '../link/external-link/ExternalLink';
+import AppLink from '../link/app-link/AppLink';
 import Select from '../select/Select';

 import style from './RedirectClientModal.module.scss';
@@ -45,7 +44,6 @@ export function RedirectClientModal({ id, isOpen, name, currentPath, origin, onC
  };

  const enabledPresets = data.filter((preset) => preset.enabled);
-  const settingsUrl = `${window.location.origin}${baseURI}/?settings=sharing__presets`;

  const viewOptions = [
    ...navigatorConstants.map((view) => ({
@@ -68,46 +66,34 @@ export function RedirectClientModal({ id, isOpen, name, currentPath, origin, onC
      bodyElements={
        <>
          <Info>
-            <Info.Body>
-              Remotely redirect the client to a different URL. Choose a custom path or select a URL Preset.
-            </Info.Body>
-            <Info.Footer>
-              <ExternalLink href={settingsUrl}>Manage URL Presets</ExternalLink>
-            </Info.Footer>
+            Remotely redirect the client to a different URL. <br />
+            Either by entering a custom path or selecting a URL Preset.
+            <br />
+            <br />
+            <AppLink search='settings=sharing__presets'>Manage URL Presets</AppLink>
          </Info>
-          <section className={style.section}>
-            <div className={style.sectionHeader}>
-              <span className={style.label}>Enter custom path</span>
-              <span className={style.description}>Type the path the client should open.</span>
-            </div>
-            <div className={style.inlineEntry}>
-              <label className={style.textEntry}>
-                <span className={style.origin}>{origin}</span>
-                <Input placeholder='eg. /timer' fluid value={path} onChange={(event) => setPath(event.target.value)} />
-              </label>
-              <Button
-                variant='primary'
-                aria-label='Redirect to custom path'
-                disabled={path === currentPath || path === ''}
-                className={style.redirect}
-                onClick={() => handleRedirect(path)}
-              >
-                Redirect
-                <IoArrowForward />
-              </Button>
-            </div>
-          </section>
-          <div className={style.separator} role='separator'>
-            <span>Or</span>
+          <div className={style.inlineEntry}>
+            <span className={style.label}>Enter custom path</span>
+            <label className={style.textEntry}>
+              {origin}
+              <Input placeholder='eg. /timer' fluid value={path} onChange={(event) => setPath(event.target.value)} />
+            </label>
+            <Button
+              variant='primary'
+              aria-label='Redirect'
+              disabled={path === currentPath || path === ''}
+              className={style.redirect}
+              onClick={() => handleRedirect(path)}
+            >
+              Redirect
+              <IoArrowForward />
+            </Button>
          </div>
-          <section className={style.section}>
-            <div className={style.sectionHeader}>
-              <span className={style.label}>Select view or URL Preset</span>
-              <span className={style.description}>Choose from the available destinations.</span>
-            </div>
+          <div>
+            <span className={style.label}>Select View or URL Preset</span>
            <div className={style.inlineEntry}>
              <label className={style.textEntry}>
-                <span className={style.origin}>{origin}</span>
+                {origin}
                <Select
                  fluid
                  options={viewOptions}
@@ -129,7 +115,7 @@ export function RedirectClientModal({ id, isOpen, name, currentPath, origin, onC
                Redirect <IoArrowForward />
              </Button>
            </div>
-          </section>
+          </div>
        </>
      }
    />
@@ -1,13 +0,0 @@
-@use '../../../theme/ontimeStyles' as *;
-
-.form {
-  padding: 0.25rem 0.5rem 0.5rem;
-}
-
-.label {
-  display: flex;
-  flex-direction: column;
-  gap: 0.5rem;
-  color: $label-gray;
-  font-size: $inner-section-text-size;
-}
@@ -5,8 +5,6 @@ import { setClientRemote } from '../../hooks/useSocket';
 import Dialog from '../dialog/Dialog';
 import Input from '../input/input/Input';

-import style from './RenameClientModal.module.scss';
-
 interface RenameClientModalProps {
  id: string;
  name?: string;
@@ -33,22 +31,9 @@ export function RenameClientModal({ id, name: currentName = '', isOpen, onClose
      isOpen={isOpen}
      title={`Rename Client: ${currentName}`}
      showCloseButton
-      showBackdrop
      onClose={onClose}
      bodyElements={
-        <div className={style.form}>
-          <label className={style.label}>
-            Client name
-            <Input
-              height='large'
-              fluid
-              autoComplete='off'
-              placeholder='New name'
-              value={name}
-              onChange={(event) => setName(event.target.value)}
-            />
-          </label>
-        </div>
+        <Input height='large' placeholder='New name' value={name} onChange={(event) => setName(event.target.value)} />
      }
      footerElements={
        <>
@@ -1,16 +1,12 @@
 .dialog {
  position: fixed;
-  top: 10vh;
+  top: 10%;
  left: 50%;

  transform: translateX(-50%);

-  box-sizing: border-box;
-  width: min(600px, 90vw);
-  max-height: calc(90vh - 1rem);
-  display: flex;
-  flex-direction: column;
  padding-inline: 1rem;
+  min-width: min(600px, 90vw);

  background-color: $gray-1250;
  color: $ui-white;
@@ -47,8 +43,7 @@
  flex-direction: column;
  gap: 0.5rem;

-  flex: 1;
-  min-height: 0;
+  max-height: min(80vh, 600px);
  overflow-y: auto;
 }

@@ -58,5 +53,4 @@
  align-items: center;
  justify-content: end;
  gap: 1rem;
-  flex-wrap: wrap;
 }
@@ -3,8 +3,8 @@ import { ChangeEvent, KeyboardEvent, RefObject, useCallback, useEffect, useMemo,

 interface UseReactiveTextInputReturn {
  value: string;
-  onChange: (event: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
-  onBlur: (event: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
+  onChange: (event: ChangeEvent) => void;
+  onBlur: (event: ChangeEvent) => void;
  onKeyDown: (event: KeyboardEvent<HTMLElement>) => void;
 }

@@ -15,9 +15,7 @@ export default function useReactiveTextInput(
  options?: {
    submitOnEnter?: boolean;
    submitOnCtrlEnter?: boolean;
-    submitOnTab?: boolean;
    onCancelUpdate?: () => void;
-    onTabCancel?: () => void;
    allowSubmitSameValue?: boolean;
    allowKeyboardNavigation?: boolean;
  },
@@ -25,10 +23,6 @@ export default function useReactiveTextInput(
  const [text, setText] = useState<string>(initialText);
  // track whether we are submitting via a submit key (eg enter) and avoid submitting again on blur
  const isKeyboardSubmitting = useRef(false);
-  // track escape to prevent the subsequent blur from submitting
-  const isEscaping = useRef(false);
-  // track tab-out to prevent blur from submitting (used by timer cells)
-  const isTabbing = useRef(false);

  useEffect(() => {
    if (typeof initialText === 'undefined') {
@@ -84,7 +78,6 @@ export default function useReactiveTextInput(
   * @param {string} valueToSubmit
   */
  const handleEscape = useCallback(() => {
-    isEscaping.current = true;
    // No need to update if it hasn't changed
    setText(initialText);
    // force the text to be the initial value
@@ -148,30 +141,16 @@ export default function useReactiveTextInput(
        event.stopPropagation();
      }

-      // for cells that opt out of tab-submit, track tab-out without preventing navigation
-      if (event.key === 'Tab' && options?.submitOnTab === false) {
-        isTabbing.current = true;
-      }
-
      hotKeyHandler(event);
    };
-  }, [handleEscape, handleSubmit, options?.submitOnCtrlEnter, options?.submitOnEnter, options?.submitOnTab, text]);
+  }, [handleEscape, handleSubmit, options?.submitOnCtrlEnter, options?.submitOnEnter, text]);

  return {
    value: text,
-    onChange: (event) => handleChange(event.target.value),
-    onBlur: (event) => {
-      if (isTabbing.current) {
-        isTabbing.current = false;
-        (options?.onTabCancel ?? options?.onCancelUpdate)?.();
-        return;
-      }
-      if (isEscaping.current) {
-        isEscaping.current = false;
-        return;
-      }
+    onChange: (event: ChangeEvent) => handleChange((event.target as HTMLInputElement).value),
+    onBlur: (event: ChangeEvent) => {
      if (!isKeyboardSubmitting.current) {
-        handleSubmit(event.target.value);
+        handleSubmit((event.target as HTMLInputElement).value);
      }
    },
    onKeyDown: keyHandler,
@@ -1,14 +0,0 @@
-.kbd {
-  display: inline-block;
-  min-width: 1.5rem;
-  padding: 0.0625rem 0.375rem;
-  border-radius: 2px;
-  background-color: $gray-1100;
-  color: $ui-white;
-  box-shadow: 0 0 3px rgba(0, 0, 0, 0.4);
-  font-family: monospace;
-  font-size: calc(1rem - 4px);
-  line-height: 1.5;
-  text-align: center;
-  white-space: nowrap;
-}
@@ -1,7 +0,0 @@
-import { PropsWithChildren } from 'react';
-
-import style from './Kbd.module.scss';
-
-export default function Kbd({ children }: PropsWithChildren) {
-  return <kbd className={style.kbd}>{children}</kbd>;
-}
@@ -21,15 +21,4 @@
    outline: none;
    box-shadow: 0 1px 0 0 currentColor;
  }
-
-  &:hover .icon,
-  &:focus-visible .icon {
-    transform: translateX(0.25rem);
-  }
-}
-
-.icon {
-  flex: 0 0 1.5em;
-  font-size: 1em;
-  transition: transform $transition-time-action;
 }
@@ -1,5 +1,5 @@
 import { MouseEvent, ReactNode } from 'react';
-import { HiArrowLongRight } from 'react-icons/hi2';
+import { IoOpenOutline } from 'react-icons/io5';

 import { openLink } from '../../../utils/linkUtils';
 import { cx } from '../../../utils/styleUtils';
@@ -10,10 +10,9 @@ interface ExternalLinkProps {
  href: string;
  children: ReactNode;
  inline?: boolean;
-  className?: string;
 }

-export default function ExternalLink({ href, inline, className, children }: ExternalLinkProps) {
+export default function ExternalLink({ href, inline, children }: ExternalLinkProps) {
  const handleClick = (event: MouseEvent) => {
    event.preventDefault();
    openLink(href);
@@ -24,11 +23,10 @@ export default function ExternalLink({ href, inline, className, children }: Exte
      href='#!'
      target='_blank'
      rel='noreferrer'
-      className={cx([style.link, inline && style.inline, className])}
+      className={cx([style.link, inline && style.inline])}
      onClick={handleClick}
    >
-      {children}
-      <HiArrowLongRight className={style.icon} />
+      {children} <IoOpenOutline style={{ fontSize: '1em' }} />
    </a>
  );
 }
@@ -4,13 +4,10 @@
  left: 50%;
  transform: translateX(-50%);

-  box-sizing: border-box;
-  width: min(880px, 90vw);
+  padding-inline: 1rem;
+  min-width: min(880px, 90vw);
  min-height: min(200px, 10vh);
-  max-height: calc(90vh - 1rem);
-
-  display: flex;
-  flex-direction: column;
+  max-width: min(1200px, 90vw);

  background-color: $gray-1250;
  color: $ui-white;
@@ -20,21 +17,14 @@
  outline: none;
 }

-.compact {
-  min-width: 0;
-  width: min(680px, 90vw);
-}
-
-.small {
-  min-width: 0;
-  width: min(480px, 90vw);
-}
-
 .wide {
  top: 4vh;
-  width: min(1800px, 98vw);
-  height: min(88vh, calc(96vh - 1rem));
-  min-height: 0;
+  min-width: min(1280px, 96vw);
+  max-width: min(1600px, 96vw);
+  height: 88vh;
+  max-height: 88vh;
+  display: flex;
+  flex-direction: column;
 }

 .backdrop {
@@ -51,19 +41,15 @@

 .title {
  padding-block: 1rem;
-  padding-inline: 1rem;

  display: flex;
  align-items: center;
  justify-content: space-between;
-  gap: 1rem;
 }

 .titleText {
-  min-width: 0;
  font-size: 1rem;
  font-weight: 600;
-  overflow-wrap: anywhere;
 }

 .body {
@@ -71,23 +57,21 @@
  flex-direction: column;
  gap: 0.5rem;

-  flex: 1;
-  min-height: 0;
-  padding: 0.5rem 1rem;
+  max-height: 60vh;
  overflow-y: auto;
-  scroll-padding-block: 0.5rem;
 }

 .wide .body {
+  flex: 1;
+  min-height: 0;
+  max-height: none;
  overflow: hidden;
 }

 .footer {
  padding-block: 1rem;
-  padding-inline: 1rem;
  display: flex;
  align-items: center;
  justify-content: end;
  gap: 1rem;
-  flex-wrap: wrap;
 }
@@ -12,7 +12,7 @@ interface ModalProps {
  title?: string;
  showCloseButton?: boolean;
  showBackdrop?: boolean;
-  size?: 'small' | 'compact' | 'default' | 'wide';
+  size?: 'default' | 'wide';
  bodyElements: ReactNode;
  footerElements?: ReactNode;
  onClose: () => void;
@@ -38,7 +38,7 @@ export default function Modal({
    >
      <BaseDialog.Portal>
        {showBackdrop && <BaseDialog.Backdrop className={style.backdrop} />}
-        <BaseDialog.Popup aria-label={title} className={cx([style.modal, style[size]])}>
+        <BaseDialog.Popup aria-label={title} className={cx([style.modal, size === 'wide' && style.wide])}>
          <div className={style.title}>
            {title ? <BaseDialog.Title className={style.titleText}>{title}</BaseDialog.Title> : <div />}
            {showCloseButton && (
@@ -38,6 +38,8 @@ $progress-bar-br: 3px;
 .multiprogress-bar__indicator-bar {
  background-color: var(--background-color-override, $ui-black);
  opacity: 0.8;
+  transition: 1s linear;
+  transition-property: width;

  .multiprogress-bar--ignore-css-override & {
    background-color: $ui-black;
@@ -1,6 +1,5 @@
 import { MaybeNumber } from 'ontime-types';

-import { useAnimatedProgress } from '../../hooks/useAnimatedProgress';
 import { getProgress } from '../../utils/getProgress';
 import { cx } from '../../utils/styleUtils';

@@ -9,7 +8,6 @@ import './MultiPartProgressBar.scss';
 interface MultiPartProgressBar {
  now: MaybeNumber;
  complete: MaybeNumber;
-  eventId?: string | null;
  normalColor: string;
  warning?: MaybeNumber;
  warningColor: string;
@@ -25,7 +23,6 @@ export default function MultiPartProgressBar(props: MultiPartProgressBar) {
  const {
    now,
    complete,
-    eventId,
    normalColor,
    warning,
    warningColor,
@@ -37,7 +34,7 @@ export default function MultiPartProgressBar(props: MultiPartProgressBar) {
    className = '',
  } = props;

-  const percentRemaining = 100 - useAnimatedProgress(now, complete, eventId);
+  const percentRemaining = 100 - getProgress(now, complete);
  const dangerWidth = danger ? 100 - getProgress(danger, complete) : 0;
  const warningWidth = warning ? 100 - dangerWidth - getProgress(warning, complete) : 0;
  const isOvertime = now !== null && now < 0;
@@ -8,7 +8,6 @@ import { useLocation } from 'react-router';
 import { isLocalhost, supportsFullscreen } from '../../../externals';
 import { canUseWakeLock, useKeepAwakeOptions } from '../../../features/keep-awake/useWakeLock';
 import { navigatorConstants } from '../../../viewerConfig';
-import useUrlPresets from '../../hooks-query/useUrlPresets';
 import { useIsSmallScreen } from '../../hooks/useIsSmallScreen';
 import { useClientStore } from '../../stores/clientStore';
 import { useViewOptionsStore } from '../../stores/viewOptions';
@@ -106,8 +105,6 @@ function NavigationMenu({ isOpen, onClose }: NavigationMenuProps) {
                {route.label}
              </ClientLink>
            ))}
-
-            <PresetNavigation isSmallScreen={isSmallScreen} onClose={onClose} />
          </div>

          {isLocalhost && (
@@ -120,27 +117,3 @@ function NavigationMenu({ isOpen, onClose }: NavigationMenuProps) {
    </Dialog.Root>
  );
 }
-
-function PresetNavigation({ isSmallScreen, onClose }: { isSmallScreen: boolean; onClose: () => void }) {
-  const location = useLocation();
-  const { data: urlPresets } = useUrlPresets();
-  const navPresets = urlPresets.filter((preset) => preset.enabled && preset.displayInNav);
-
-  if (navPresets.length === 0) return null;
-
-  return (
-    <>
-      <hr className={style.separator} />
-      {navPresets.map((preset) => (
-        <ClientLink
-          key={preset.alias}
-          to={`preset/${preset.alias}`}
-          current={location.pathname === `/preset/${preset.alias}`}
-          postAction={isSmallScreen ? onClose : undefined}
-        >
-          {preset.alias}
-        </ClientLink>
-      ))}
-    </>
-  );
-}
@@ -1,8 +1,6 @@
 import { useDisclosure, useHotkeys } from '@mantine/hooks';
 import { memo } from 'react';
-import { useSearchParams } from 'react-router';

-import { hasCustomParams } from '../../stores/savedViewParams';
 import { useViewParamsEditorStore } from '../view-params-editor/viewParamsEditor.store';
 import FloatingNavigation from './floating-navigation/FloatingNavigation';
 import NavigationMenu from './NavigationMenu';
@@ -19,8 +17,6 @@ export default memo(ViewNavigationMenu);
 function ViewNavigationMenu({ isNavigationLocked, suppressSettings }: ViewNavigationMenuProps) {
  const [isMenuOpen, menuHandler] = useDisclosure();
  const { open: showEditFormDrawer } = useViewParamsEditorStore();
-  const [searchParams] = useSearchParams();
-  const hasSavedChanges = hasCustomParams(searchParams);

  useHotkeys([
    [
@@ -50,7 +46,6 @@ function ViewNavigationMenu({ isNavigationLocked, suppressSettings }: ViewNaviga
      <FloatingNavigation
        toggleMenu={isNavigationLocked ? undefined : menuHandler.toggle}
        toggleSettings={suppressSettings ? undefined : showEditFormDrawer}
-        hasSavedChanges={hasSavedChanges}
      />
      {!isNavigationLocked && <NavigationMenu isOpen={isMenuOpen} onClose={menuHandler.close} />}
    </>
@@ -1,29 +1,4 @@
-.trailing {
-  display: inline-flex;
-  align-items: center;
-  gap: 0.5rem;
-  margin-left: auto;
-}
-
 .linkIcon {
+  margin-left: auto;
  @include rotate-fourty-five;
 }
-
-.indicator {
-  width: 0.5rem;
-  height: 0.5rem;
-  border-radius: 50%;
-  background-color: $active-indicator;
-  pointer-events: none;
-  flex-shrink: 0;
-}
-
-.clear {
-  opacity: 0.6;
-  transition: opacity $transition-time-action;
-
-  &:hover,
-  &:focus-visible {
-    opacity: 1;
-  }
-}
@@ -1,17 +1,9 @@
-import { MouseEvent, PropsWithChildren } from 'react';
-import { IoArrowUp, IoCloseOutline } from 'react-icons/io5';
-import { useLocation, useNavigate, useSearchParams } from 'react-router';
+import { PropsWithChildren } from 'react';
+import { IoArrowUp } from 'react-icons/io5';
+import { useNavigate } from 'react-router';

 import { useElectronEvent } from '../../../hooks/useElectronEvent';
-import {
-  hasCustomParams,
-  reservedParams,
-  stripReservedParams,
-  useSavedViewParams,
-} from '../../../stores/savedViewParams';
 import { handleLinks } from '../../../utils/linkUtils';
-import IconButton from '../../buttons/IconButton';
-import Tooltip from '../../tooltip/Tooltip';
 import NavigationMenuItem from '../navigation-menu-item/NavigationMenuItem';

 import style from './ClientLink.module.scss';
@@ -24,104 +16,32 @@ interface ClientLinkProps {

 export default function ClientLink({ current, to, postAction, children }: PropsWithChildren<ClientLinkProps>) {
  const { isElectron } = useElectronEvent();
+  const navigate = useNavigate();

  if (isElectron) {
    return (
-      <ElectronNavigationItem current={current} to={to} postAction={postAction}>
+      <NavigationMenuItem
+        active={current}
+        onClick={() => {
+          handleLinks(to);
+          postAction?.();
+        }}
+      >
        {children}
-      </ElectronNavigationItem>
+        <IoArrowUp className={style.linkIcon} />
+      </NavigationMenuItem>
    );
  }

  return (
-    <BrowserNavigationItem current={current} to={to} postAction={postAction}>
+    <NavigationMenuItem
+      active={current}
+      onClick={() => {
+        navigate(`/${to}`);
+        postAction?.();
+      }}
+    >
      {children}
-    </BrowserNavigationItem>
-  );
-}
-
-function ElectronNavigationItem({ current, to, postAction, children }: PropsWithChildren<ClientLinkProps>) {
-  const navigateToLink = () => {
-    handleLinks(to);
-    postAction?.();
-  };
-
-  return (
-    <NavigationMenuItem active={current} onClick={navigateToLink}>
-      {children}
-      <span className={style.trailing}>
-        <IoArrowUp className={style.linkIcon} />
-      </span>
-    </NavigationMenuItem>
-  );
-}
-
-function BrowserNavigationItem({ current, to, postAction, children }: PropsWithChildren<ClientLinkProps>) {
-  const navigate = useNavigate();
-  const location = useLocation();
-  const [searchParams, setSearchParams] = useSearchParams();
-  const { params: savedParams, save, clear } = useSavedViewParams();
-
-  /**
-   * Save the params of the view we are leaving and resolve the destination,
-   * restoring any params previously saved for the target view.
-   */
-  const resolveDestination = () => {
-    const currentView = location.pathname.replace(/^\//, '');
-    save(currentView, stripReservedParams(location.search));
-    const restored = savedParams[to];
-    return `${to}${restored ? `?${restored}` : ''}`;
-  };
-
-  const isCustomised = current ? hasCustomParams(searchParams) : Boolean(savedParams[to]);
-
-  const navigateToLink = () => {
-    const destination = resolveDestination();
-    navigate(`/${destination}`);
-    postAction?.();
-  };
-
-  /**
-   * Clear the saved settings for this route without navigating to it.
-   * When it is the current view, also reset the live URL to its defaults.
-   */
-  const clearViewSettings = (event: MouseEvent) => {
-    event.stopPropagation();
-    clear(to);
-
-    // if mounted, clear the URL params
-    if (current) {
-      const preserved = new URLSearchParams();
-      reservedParams.forEach((key) => {
-        const value = searchParams.get(key);
-        if (value !== null) preserved.set(key, value);
-      });
-      setSearchParams(preserved);
-    }
-  };
-
-  return (
-    <NavigationMenuItem active={current} onClick={navigateToLink}>
-      {children}
-      {isCustomised && (
-        <span className={style.trailing}>
-          <span className={style.indicator} aria-hidden data-testid='client-link__saved-indicator' />
-          <Tooltip
-            text='Reset to default'
-            render={
-              <IconButton
-                variant='ghosted-white'
-                size='small'
-                className={style.clear}
-                aria-label='Reset to default'
-                onClick={clearViewSettings}
-              />
-            }
-          >
-            <IoCloseOutline />
-          </Tooltip>
-        </span>
-      )}
    </NavigationMenuItem>
  );
 }
@@ -22,19 +22,3 @@
  top: 0;
  z-index: $zindex-nav;
 }
-
-.buttonWithIndicator {
-  position: relative;
-  display: inline-flex;
-}
-
-.indicator {
-  position: absolute;
-  top: -0.15rem;
-  right: -0.15rem;
-  width: 0.6rem;
-  height: 0.6rem;
-  border-radius: 50%;
-  background-color: $active-indicator;
-  pointer-events: none;
-}
@@ -9,10 +9,9 @@ import style from './FloatingNavigation.module.scss';
 interface FloatingNavigationProps {
  toggleMenu?: () => void;
  toggleSettings?: () => void;
-  hasSavedChanges?: boolean;
 }

-export default function FloatingNavigation({ toggleMenu, toggleSettings, hasSavedChanges }: FloatingNavigationProps) {
+export default function FloatingNavigation({ toggleMenu, toggleSettings }: FloatingNavigationProps) {
  const isButtonShown = useFadeOutOnInactivity(true);

  return (
@@ -21,18 +20,15 @@ export default function FloatingNavigation({ toggleMenu, toggleSettings, hasSave
      className={cx([style.fadeable, style.buttonContainer, !isButtonShown && style.hidden])}
    >
      {toggleMenu && (
-        <div className={style.buttonWithIndicator}>
-          <IconButton
-            variant='subtle-white'
-            size='xlarge'
-            onClick={toggleMenu}
-            aria-label='toggle menu'
-            data-testid='navigation__toggle-menu'
-          >
-            <IoApps />
-          </IconButton>
-          {hasSavedChanges && <span className={style.indicator} data-testid='navigation__saved-indicator' />}
-        </div>
+        <IconButton
+          variant='subtle-white'
+          size='xlarge'
+          onClick={toggleMenu}
+          aria-label='toggle menu'
+          data-testid='navigation__toggle-menu'
+        >
+          <IoApps />
+        </IconButton>
      )}
      {toggleSettings && (
        <IconButton
@@ -14,4 +14,6 @@ $progress-bar-br: 3px;
 .progress-bar__indicator {
  height: $progress-bar-size;
  background-color: var(--timer-progress-override, $accent-color);
+  transition: 1s linear;
+  transition-property: width;
 }
@@ -1,18 +1,18 @@
 import { MaybeNumber } from 'ontime-types';

-import { useAnimatedProgress } from '../../hooks/useAnimatedProgress';
+import { getProgress } from '../../utils/getProgress';

 import './ProgressBar.scss';

 interface ProgressBarProps {
  current: MaybeNumber;
  duration: MaybeNumber;
-  eventId?: string | null;
  className?: string;
 }

-export default function ProgressBar({ current, duration, eventId, className }: ProgressBarProps) {
-  const progress = useAnimatedProgress(current, duration, eventId);
+export default function ProgressBar(props: ProgressBarProps) {
+  const { current, duration, className } = props;
+  const progress = getProgress(current, duration);

  return (
    <div className={`progress-bar__bg ${className}`}>
@@ -1,43 +1,18 @@
-@use '@/theme/viewerDefs' as *;
-
 .emptyContainer {
  width: 100%;
  text-align: center;
-  color: var(--secondary-color-override, $viewer-secondary-color);
+  color: $white-10;

  .empty {
-    display: block;
-    width: min(100%, 14rem);
-    margin: 0 auto -1.5rem;
-    opacity: 0.6;
+    width: 100%;
+    opacity: 0.8;
  }

  .text {
    display: block;
    margin-inline: auto;
-    font-weight: 400;
-    font-size: clamp(1rem, 1.55vw, 1.5rem);
-    line-height: 1.35;
-    max-width: min(100%, 40rem);
-  }
-
-  &.error {
-    color: $error-red;
-
-    .empty {
-      opacity: 0.35;
-      filter: grayscale(1);
-    }
-
-    .text {
-      margin-top: 0.5rem;
-    }
-  }
-
-  .errorIcon {
-    display: block;
-    width: 1.5rem;
-    height: 1.5rem;
-    margin: -0.125rem auto 0;
+    font-weight: 600;
+    font-size: 2em;
+    max-width: 600px;
  }
 }
@@ -1,5 +1,4 @@
 import { CSSProperties } from 'react';
-import { IoWarningOutline } from 'react-icons/io5';

 import EmptyImage from '../../../assets/images/empty.svg?react';
 import { cx } from '../../utils/styleUtils';
@@ -10,18 +9,12 @@ interface EmptyProps {
  text?: string;
  injectedStyles?: CSSProperties;
  className?: string;
-  variant?: 'error';
 }

-export default function Empty({ text, className, injectedStyles, variant }: EmptyProps) {
+export default function Empty({ text, className, injectedStyles }: EmptyProps) {
  return (
-    <div
-      className={cx([style.emptyContainer, variant === 'error' && style.error, className])}
-      style={injectedStyles}
-      role={variant === 'error' ? 'alert' : undefined}
-    >
+    <div className={cx([style.emptyContainer, className])} style={injectedStyles}>
      <EmptyImage className={style.empty} />
-      {variant === 'error' && <IoWarningOutline className={style.errorIcon} aria-hidden />}
      {text && <span className={style.text}>{text}</span>}
    </div>
  );
@@ -1,11 +0,0 @@
-.fill {
-  box-sizing: border-box;
-  width: 100%;
-  height: 100%;
-  min-height: 0;
-  flex: 1;
-
-  display: grid;
-  place-items: start center;
-  padding: clamp(4rem, 20dvh, 12rem) 1.5rem 1rem;
-}
@@ -1,19 +0,0 @@
-import { cx } from '../../utils/styleUtils';
-import Empty from './Empty';
-
-import style from './EmptyFill.module.scss';
-
-interface EmptyFillProps {
-  text?: string;
-  /** placed on the fill wrapper — e.g. to assign a grid-area in a grid parent */
-  className?: string;
-}
-
-/** Container-filling empty/loading state for panels and grid/flex cells. */
-export default function EmptyFill({ text, className }: EmptyFillProps) {
-  return (
-    <div className={cx([style.fill, className])}>
-      <Empty text={text} />
-    </div>
-  );
-}
@@ -6,7 +6,7 @@
  box-sizing: border-box; /* reset */
  overflow: hidden;
  width: 100%; /* restrict the page width to viewport */
-  height: 100dvh;
+  height: 100vh;

  font-family: var(--font-family-override, $viewer-font-family);
  background: var(--background-color-override, $viewer-background-color);
@@ -16,6 +16,5 @@
  display: flex;
  flex-direction: column;
  align-items: center;
-  justify-content: center;
-  padding-block: 5rem;
+  padding-top: 5rem;
 }
@@ -7,13 +7,12 @@ import style from './EmptyPage.module.scss';
 interface EmptyPageProps {
  text?: string;
  injectedStyles?: CSSProperties;
-  variant?: 'error';
 }

-export default function EmptyPage({ text, injectedStyles, variant }: EmptyPageProps) {
+export default function EmptyPage({ text, injectedStyles }: EmptyPageProps) {
  return (
    <div className={style.page}>
-      <Empty text={text} injectedStyles={injectedStyles} variant={variant} />
+      <Empty text={text} injectedStyles={injectedStyles} />
    </div>
  );
 }
@@ -8,11 +8,13 @@
    padding-top: 10vh;
  }

-  .inline {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    gap: 1rem;
-    margin-top: 1em;
+  .empty {
+    width: 100%;
+    opacity: 0.8;
+  }
+
+  .text {
+    font-weight: 600;
+    font-size: 2em;
  }
 }
@@ -1,32 +1,18 @@
-import { SupportedEntry } from 'ontime-types';
-import { IoAdd } from 'react-icons/io5';
-
-import { useTranslation } from '../../../translation/TranslationProvider';
-import Button from '../buttons/Button';
-import Empty from './Empty';
+import EmptyImage from '../../../assets/images/empty.svg?react';

 import style from './EmptyTableBody.module.scss';

 interface EmptyTableBodyProps {
-  handleAddNew?: (type: SupportedEntry) => void;
+  text: string;
 }

-export default function EmptyTableBody({ handleAddNew }: EmptyTableBodyProps) {
-  const { getLocalizedString } = useTranslation();
-  const text = getLocalizedString('common.no_data');
+export default function EmptyTableBody({ text }: EmptyTableBodyProps) {
  return (
    <tbody className={style.emptyContainer}>
      <tr>
        <td colSpan={99} className={style.emptyCell}>
-          <Empty text={text} injectedStyles={{ marginTop: '5vh' }} />
-          {handleAddNew && (
-            <div className={style.inline}>
-              <Button onClick={() => handleAddNew(SupportedEntry.Event)} variant='primary' size='large'>
-                <IoAdd />
-                Create Event
-              </Button>
-            </div>
-          )}
+          <EmptyImage className={style.empty} />
+          {text && <span className={style.text}>{text}</span>}
        </td>
      </tr>
    </tbody>
@@ -11,11 +11,6 @@
  color: $ui-white;
 }

-.active {
-  border: 1px solid $green-700;
-  color: $green-400;
-}
-
 .warning {
  background-color: $orange-1300;
  color: $orange-300;
@@ -6,7 +6,7 @@ import style from './Tag.module.scss';

 interface TagProps {
  className?: string;
-  variant?: 'default' | 'active' | 'warning';
+  variant?: 'default' | 'warning';
 }

 export default function Tag({ className, variant = 'default', children }: PropsWithChildren<TagProps>) {
@@ -6,7 +6,6 @@ import { useSearchParams } from 'react-router';

 import useViewSettings from '../../hooks-query/useViewSettings';
 import { useIsSmallScreen } from '../../hooks/useIsSmallScreen';
-import { useSavedViewParams } from '../../stores/savedViewParams';
 import Button from '../buttons/Button';
 import IconButton from '../buttons/IconButton';
 import Info from '../info/Info';
@@ -28,7 +27,6 @@ function ViewParamsEditor({ target, viewOptions }: EditFormDrawerProps) {
  const [searchParams, setSearchParams] = useSearchParams();
  const { data: viewSettings } = useViewSettings();
  const { isOpen, close } = useViewParamsEditorStore();
-  const clearSavedParams = useSavedViewParams((store) => store.clear);
  const isSmallScreen = useIsSmallScreen();

  const getPreservedParams = () => getPreservedSearchParams(searchParams, viewOptions);
@@ -38,7 +36,6 @@ function ViewParamsEditor({ target, viewOptions }: EditFormDrawerProps) {
  };

  const resetParams = () => {
-    clearSavedParams(target);
    setSearchParams(getPreservedParams());
  };

@@ -12,7 +12,6 @@ import {
  renameRundown,
 } from '../api/rundown';

-//TODO: make suspends so we don't have to deal with no value all over
 /**
 * Project rundowns
 */
@@ -4,7 +4,7 @@ import { useEffect, useMemo } from 'react';

 import { queryRefetchIntervalSlow } from '../../ontimeConfig';
 import { CURRENT_RUNDOWN_QUERY_KEY, getRundownQueryKey } from '../api/constants';
-import { fetchCurrentRundown, fetchRundown } from '../api/rundown';
+import { fetchCurrentRundown } from '../api/rundown';
 import { useSelectedEventId } from '../hooks/useSocket';
 import { ExtendedEntry, getFlatRundownMetadata, getRundownMetadata } from '../utils/rundownMetadata';
 import { useProjectRundowns } from './useProjectRundowns';
@@ -20,11 +20,7 @@ const cachedRundownPlaceholder: Rundown = {
 };

 /**
- * Normalised rundown data for the currently loaded rundown.
- *
- * Bootstraps via the `/current` alias so the first paint is a single round-trip,
- * independent of the project rundown list. Once the loaded id is known, the
- * query key swaps to the id-keyed cache that is shared with `useRundownById`.
+ * Normalised rundown data
 */
 export default function useRundown() {
  const queryClient = useQueryClient();
@@ -38,13 +34,12 @@ export default function useRundown() {
    refetchInterval: queryRefetchIntervalSlow,
  });

-  // Seed the id-keyed cache when fetching via the bootstrap alias
+  // Seed the ID-based cache when fetching via the 'current' alias (bootstrap)
  useEffect(() => {
    if (!data || loadedRundownId) return;
    queryClient.setQueryData(getRundownQueryKey(data.id), data);
  }, [data, loadedRundownId, queryClient]);

-  // Once we have the ID, drop the temporary current cache
  useEffect(() => {
    if (!loadedRundownId) return;
    queryClient.removeQueries({ queryKey: CURRENT_RUNDOWN_QUERY_KEY, exact: true });
@@ -119,21 +114,3 @@ export function useRundownAuxData() {
  }, [data]);
  return { data: filteredData, status };
 }
-
-/**
- * Provides access to a specific rundown by ID.
- * When rundownId is null/undefined the query is disabled and returns the placeholder.
- */
-export function useRundownById(rundownId: string | null | undefined) {
-  const enabled = Boolean(rundownId);
-
-  const { data, status, isError, refetch, isFetching } = useQuery<Rundown>({
-    queryKey: getRundownQueryKey(rundownId ?? ''),
-    queryFn: ({ signal }) => fetchRundown(rundownId!, { signal }),
-    enabled,
-    placeholderData: (previousData, _previousQuery) => previousData,
-    refetchInterval: queryRefetchIntervalSlow,
-  });
-
-  return { data: data ?? cachedRundownPlaceholder, status, isError, refetch, isFetching };
-}
@@ -1,54 +0,0 @@
-import { EntryId, Rundown } from 'ontime-types';
-import { useMemo } from 'react';
-
-import { useSelectedEventId } from '../hooks/useSocket';
-import { getFlatRundownMetadata, type ExtendedEntry } from '../utils/rundownMetadata';
-import { useProjectRundowns } from './useProjectRundowns';
-import { useRundownById } from './useRundown';
-
-export type RundownSource = {
-  rundownId: string | null;
-  rundown: Rundown;
-  flatRundown: ExtendedEntry[];
-  status: string;
-  selectedEventId: EntryId | null;
-};
-
-/**
- * Explicitly scoped rundown data for views that may operate on a non-loaded rundown.
- */
-export function useScopedRundown(rundownId: string | null): RundownSource {
-  const { data: projectRundowns } = useProjectRundowns();
-  return useRundownSource(rundownId, projectRundowns.loaded || null);
-}
-
-/**
- * Loaded-rundown source for views that must follow the active runtime rundown.
- */
-export function useLoadedRundownSource(): RundownSource {
-  const { data: projectRundowns } = useProjectRundowns();
-  const loadedRundownId = projectRundowns.loaded || null;
-  return useRundownSource(loadedRundownId, loadedRundownId);
-}
-
-function useRundownSource(rundownId: string | null, loadedRundownId: string | null): RundownSource {
-  const isLoadedTarget = rundownId !== null && rundownId === loadedRundownId;
-  const runtimeSelectedEventId = useSelectedEventId();
-  const effectiveSelectedEventId = isLoadedTarget ? runtimeSelectedEventId : null;
-  const { data: rundown, status } = useRundownById(rundownId);
-  const flatRundown = useMemo(
-    () => getFlatRundownMetadata(rundown, effectiveSelectedEventId),
-    [effectiveSelectedEventId, rundown],
-  );
-
-  return useMemo(
-    () => ({
-      rundownId,
-      rundown,
-      flatRundown,
-      status,
-      selectedEventId: effectiveSelectedEventId,
-    }),
-    [effectiveSelectedEventId, flatRundown, rundown, rundownId, status],
-  );
-}
@@ -1,49 +0,0 @@
-import { EntryId, MaybeNumber, Playback } from 'ontime-types';
-import { useEffect, useRef, useState } from 'react';
-
-import { getProgress } from '../utils/getProgress';
-import { useIsOnline, usePlayback } from './useSocket';
-
-/**
- * Returns the live completion percentage (0–100) of a countdown, interpolated locally.
- */
-export function useAnimatedProgress(current: MaybeNumber, duration: MaybeNumber, eventId?: EntryId | null): number {
-  const playback = usePlayback();
-  const isOnline = useIsOnline();
-  const isRunning = playback === Playback.Play || playback === Playback.Roll;
-
-  const baseline = useRef({ current, duration, eventId, playback, at: performance.now() });
-  const [, setTick] = useState(0);
-  const now = performance.now();
-
-  const hasAuthoritativeUpdate =
-    baseline.current.current !== current || // handle timer updates
-    baseline.current.duration !== duration || // handle duration changes
-    baseline.current.eventId !== eventId || // handle event changing
-    baseline.current.playback !== playback; // handle playback changes
-
-  if (hasAuthoritativeUpdate) {
-    // Reset during render so an event change is reflected in this very paint.
-    baseline.current = { current, duration, eventId, playback, at: now };
-  }
-
-  // There is only something to animate while a connected timer is counting down towards 0.
-  const shouldAnimate = isOnline && isRunning && current !== null && current > 0 && duration !== null;
-
-  // while counting down, re-render every animation frame so the derived progress stays smooth
-  useEffect(() => {
-    if (!shouldAnimate) {
-      return;
-    }
-    let frame = requestAnimationFrame(function tick() {
-      setTick((value) => value + 1);
-      frame = requestAnimationFrame(tick);
-    });
-    return () => cancelAnimationFrame(frame);
-  }, [shouldAnimate]);
-
-  // Derive from the anchor plus elapsed time at render; freeze while disconnected or not running.
-  const anchored = baseline.current.current;
-  const value = isOnline && isRunning && anchored !== null ? anchored - (now - baseline.current.at) : anchored;
-  return getProgress(value, duration);
-}
@@ -1,6 +1,7 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import {
  EntryId,
+  InsertOptions,
  MaybeString,
  OntimeDelay,
  OntimeEntry,
@@ -15,7 +16,6 @@ import {
  TimeStrategy,
  isOntimeEvent,
  isOntimeGroup,
-  isOntimeMilestone,
 } from 'ontime-types';
 import {
  MILLIS_PER_SECOND,
@@ -49,7 +49,6 @@ import {
  requestEventSwap,
  requestGroupEntries,
  requestUngroup,
-  requestFitGroupTarget,
 } from '../api/rundown';
 import { logAxiosError } from '../api/utils';
 import { useEditorSettings } from '../stores/editorSettings';
@@ -60,26 +59,13 @@ export type EventOptions = Partial<{
  before: MaybeString;
  // options of entries of type OntimeEvent
  linkPrevious: boolean;
-  /** the timing reference for the new entry, usually the same as after */
  lastEventId: MaybeString;
 }>;

-type ClientInsertOptions = {
-  after?: EntryId;
-  before?: EntryId;
-};
-
 /**
- * Gather utilities for actions on entries in the loaded rundown.
+ * Gather utilities for actions on entries
 */
-export const useEntryActions = () => useEntryActionsForRundown(undefined);
-
-/**
- * Gather utilities for actions on entries in an explicitly selected rundown.
- */
-export const useScopedEntryActions = (rundownId: string | null) => useEntryActionsForRundown(rundownId ?? '');
-
-function useEntryActionsForRundown(scopedRundownId: string | undefined) {
+export const useEntryActions = () => {
  const queryClient = useQueryClient();
  const {
    linkPrevious,
@@ -89,16 +75,15 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
    defaultDangerTime,
    defaultTimerType,
    defaultEndAction,
-    inheritGroupColour,
  } = useEditorSettings();

  const resolveCurrentRundownQueryKey = useCallback(() => {
-    if (scopedRundownId !== undefined) {
-      return getRundownQueryKey(scopedRundownId);
-    }
    const loadedRundownId = queryClient.getQueryData<ProjectRundownsList>(PROJECT_RUNDOWNS)?.loaded;
-    return loadedRundownId ? getRundownQueryKey(loadedRundownId) : CURRENT_RUNDOWN_QUERY_KEY;
-  }, [queryClient, scopedRundownId]);
+    if (loadedRundownId) {
+      return getRundownQueryKey(loadedRundownId);
+    }
+    return CURRENT_RUNDOWN_QUERY_KEY;
+  }, [queryClient]);

  /**
   * Returns the currently loaded rundown
@@ -126,7 +111,7 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
   * @private
   */
  const { mutateAsync: addEntryMutation } = useMutation({
-    mutationFn: ([rundownId, entry]: [string, PatchWithId & ClientInsertOptions]) => postAddEntry(rundownId, entry),
+    mutationFn: ([rundownId, entry]: [string, PatchWithId & InsertOptions]) => postAddEntry(rundownId, entry),
    onMutate: async ([_rundownId, entry]) => {
      const queryKey = resolveCurrentRundownQueryKey();
      await queryClient.cancelQueries({ queryKey });
@@ -155,9 +140,8 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
        addToRundown(
          newRundown,
          optimisticEntry,
-          parent ? (newRundown.entries[parent.id] as OntimeGroup) : null,
          afterId,
-          entry.before ?? null,
+          parent ? (newRundown.entries[parent.id] as OntimeGroup) : null,
        );

        queryClient.setQueryData<Rundown>(queryKey, newRundown);
@@ -200,7 +184,7 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
        throw new Error('Rundown not initialised');
      }

-      const newEntry: PatchWithId & ClientInsertOptions = { ...entry, id: generateId() };
+      const newEntry: PatchWithId & InsertOptions = { ...entry, id: generateId() };

      // handle adding options that concern all event types
      if (options?.after) {
@@ -212,8 +196,8 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {

      // ************* CHECK OPTIONS specific to events
      if (isOntimeEvent(newEntry)) {
-        // last event id is the timing reference of the previous OntimeEvent in rundown
        if (options?.lastEventId) {
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- we know this is a value
          const previousEvent = rundownData.entries[options?.lastEventId];
          if (isOntimeEvent(previousEvent)) {
            newEntry.timeStart = previousEvent.timeEnd;
@@ -248,14 +232,6 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
        }
      }

-      if (inheritGroupColour && (isOntimeEvent(newEntry) || isOntimeMilestone(newEntry)) && !newEntry.colour) {
-        const parentId = resolveInsertParent(rundownData, newEntry);
-        const maybeParent = parentId ? rundownData.entries[parentId] : null;
-        if (maybeParent && isOntimeGroup(maybeParent)) {
-          newEntry.colour = maybeParent.colour;
-        }
-      }
-
      try {
        await addEntryMutation([rundownId, newEntry]);
      } catch (error) {
@@ -271,7 +247,6 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
      defaultTimerType,
      defaultEndAction,
      defaultTimeStrategy,
-      inheritGroupColour,
      addEntryMutation,
    ],
  );
@@ -291,7 +266,7 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
   * Clone an entry
   */
  const clone = useCallback(
-    async (entryId: EntryId, options?: ClientInsertOptions) => {
+    async (entryId: EntryId, options?: InsertOptions) => {
      try {
        const rundownId = getCurrentRundownData()?.id;
        if (!rundownId) {
@@ -467,27 +442,7 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
        return previousEnd;
      }
    },
-    [getCurrentRundownData, updateEntryMutation, queryClient, resolveCurrentRundownQueryKey],
-  );
-
-  /**
-   * Updates time of existing event so it satisfies the group target duration
-   * @param eventId {EntryId} - id of the event
-   */
-  const matchGroupDuration = useCallback(
-    async (eventId: EntryId) => {
-      const rundownId = getCurrentRundownData()?.id;
-      if (!rundownId) {
-        throw new Error('Rundown not initialised');
-      }
-
-      try {
-        await requestFitGroupTarget(rundownId, eventId);
-      } catch (error) {
-        logAxiosError('Error updating event', error);
-      }
-    },
-    [getCurrentRundownData],
+    [getCurrentRundownData, updateEntryMutation, queryClient],
  );

  /**
@@ -1030,7 +985,6 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
      swapEvents,
      updateEntry,
      updateTimer,
-      matchGroupDuration,
    }),
    [
      addEntry,
@@ -1048,10 +1002,9 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
      swapEvents,
      updateEntry,
      updateTimer,
-      matchGroupDuration,
    ],
  );
-}
+};

 /**
 * Utility to optimistically delete entries from client cache
@@ -1086,7 +1039,7 @@ function optimisticDeleteEntries(entryIds: EntryId[], rundown: Rundown) {
 /**
 * Utility to create an optimistic entry for immediate cache insertion
 */
-function createOptimisticEntry(payload: PatchWithId & ClientInsertOptions): OntimeEntry {
+function createOptimisticEntry(payload: PatchWithId & InsertOptions): OntimeEntry {
  const { after: _after, before: _before, ...entryData } = payload;
  const id = entryData.id;
  let parent: EntryId | null = null;
@@ -139,17 +139,6 @@ export const setEventPlayback = {
  pause: () => sendSocket('pause', undefined),
 };

-export const useTimerProgress = createSelector((state: RuntimeStore) => ({
-  playback: state.timer.playback,
-  phase: state.timer.phase,
-  addedTime: state.timer.addedTime,
-  secondaryTimer: state.timer.secondaryTimer,
-  current: state.timer.current,
-  expectedFinish: state.timer.expectedFinish,
-  startedAt: state.timer.startedAt,
-  isCountToEnd: state.eventNow?.countToEnd ?? false,
-}));
-
 export const useTimer = createSelector((state: RuntimeStore) => ({
  ...state.timer,
 }));
@@ -163,7 +152,6 @@ export const useNextFlag = createSelector((state: RuntimeStore) => ({
 export const useProgressData = createSelector((state: RuntimeStore) => ({
  current: state.timer.current,
  duration: state.timer.duration,
-  eventId: state.eventNow?.id ?? null,
  timeWarning: state.eventNow?.timeWarning ?? null,
  timeDanger: state.eventNow?.timeDanger ?? null,
 }));
@@ -1,87 +0,0 @@
-import { hasCustomParams, stripReservedParams, useSavedViewParams } from '../savedViewParams';
-
-describe('savedViewParams store', () => {
-  beforeEach(() => {
-    useSavedViewParams.getState().clearAll();
-  });
-
-  it('saves and restores params per view', () => {
-    useSavedViewParams.getState().save('timer', 'hideSeconds=true');
-    useSavedViewParams.getState().save('backstage', 'showProgress=false');
-
-    expect(useSavedViewParams.getState().params.timer).toBe('hideSeconds=true');
-    expect(useSavedViewParams.getState().params.backstage).toBe('showProgress=false');
-  });
-
-  it('overwrites the saved params for a view on subsequent saves', () => {
-    useSavedViewParams.getState().save('timer', 'hideSeconds=true');
-    useSavedViewParams.getState().save('timer', 'hideSeconds=false');
-
-    expect(useSavedViewParams.getState().params.timer).toBe('hideSeconds=false');
-  });
-
-  it('does not store an entry for an empty search string', () => {
-    useSavedViewParams.getState().save('timer', '');
-
-    expect(useSavedViewParams.getState().params).toEqual({});
-  });
-
-  it('removes a previously saved entry when saved with an empty search string', () => {
-    useSavedViewParams.getState().save('timer', 'hideSeconds=true');
-    useSavedViewParams.getState().save('timer', '');
-
-    expect(useSavedViewParams.getState().params).toEqual({});
-  });
-
-  it('ignores empty view keys', () => {
-    useSavedViewParams.getState().save('', 'hideSeconds=true');
-
-    expect(useSavedViewParams.getState().params).toEqual({});
-  });
-
-  it('clears the saved params for a single view without touching others', () => {
-    useSavedViewParams.getState().save('timer', 'hideSeconds=true');
-    useSavedViewParams.getState().save('backstage', 'showProgress=false');
-    useSavedViewParams.getState().clear('timer');
-
-    expect(useSavedViewParams.getState().params).toEqual({ backstage: 'showProgress=false' });
-  });
-
-  it('is a no-op when clearing a view without saved params', () => {
-    useSavedViewParams.getState().save('backstage', 'showProgress=false');
-    useSavedViewParams.getState().clear('timer');
-
-    expect(useSavedViewParams.getState().params).toEqual({ backstage: 'showProgress=false' });
-  });
-
-  it('clears all saved params', () => {
-    useSavedViewParams.getState().save('timer', 'hideSeconds=true');
-    useSavedViewParams.getState().clearAll();
-
-    expect(useSavedViewParams.getState().params).toEqual({});
-  });
-});
-
-describe('stripReservedParams', () => {
-  it('removes reserved auth/preset params while keeping view customisation', () => {
-    expect(stripReservedParams('hideSeconds=true&token=abc&n=1&alias=my')).toBe('hideSeconds=true');
-  });
-
-  it('returns an empty string when only reserved params are present', () => {
-    expect(stripReservedParams('token=abc&n=1&alias=my')).toBe('');
-  });
-});
-
-describe('hasCustomParams', () => {
-  it('is true when a non-reserved param is present', () => {
-    expect(hasCustomParams(new URLSearchParams('hideSeconds=true&token=abc'))).toBe(true);
-  });
-
-  it('is false when only reserved params are present', () => {
-    expect(hasCustomParams(new URLSearchParams('token=abc&n=1&alias=my'))).toBe(false);
-  });
-
-  it('is false when there are no params', () => {
-    expect(hasCustomParams(new URLSearchParams(''))).toBe(false);
-  });
-});
@@ -12,10 +12,8 @@ type EditorSettingsStore = {
  defaultDangerTime: string;
  defaultTimerType: TimerType;
  defaultEndAction: EndAction;
-  inheritGroupColour: boolean;
  setDefaultDuration: (defaultDuration: string) => void;
  setLinkPrevious: (linkPrevious: boolean) => void;
-  setInheritGroupColour: (inheritGroupColour: boolean) => void;
  setTimeStrategy: (timeStrategy: TimeStrategy) => void;
  setWarnTime: (warnTime: string) => void;
  setDangerTime: (dangerTime: string) => void;
@@ -31,7 +29,6 @@ export const editorSettingsDefaults = {
  dangerTime: '00:01:00', // 60000 same as backend
  timerType: TimerType.CountDown,
  endAction: EndAction.None,
-  inheritGroupColour: false,
 };

 enum EditorSettingsKeys {
@@ -42,7 +39,6 @@ enum EditorSettingsKeys {
  DefaultDangerTime = 'ontime-default-danger-time',
  DefaultTimerType = 'ontime-default-timer-type',
  DefaultEndAction = 'ontime-default-end-action',
-  InheritGroupColour = 'ontime-inherit-group-colour',
 }

 export const useEditorSettings = create<EditorSettingsStore>((set) => {
@@ -63,10 +59,6 @@ export const useEditorSettings = create<EditorSettingsStore>((set) => {
      localStorage.getItem(EditorSettingsKeys.DefaultEndAction),
      editorSettingsDefaults.endAction,
    ),
-    inheritGroupColour: booleanFromLocalStorage(
-      EditorSettingsKeys.InheritGroupColour,
-      editorSettingsDefaults.inheritGroupColour,
-    ),

    setDefaultDuration: (defaultDuration) =>
      set(() => {
@@ -105,10 +97,5 @@ export const useEditorSettings = create<EditorSettingsStore>((set) => {
        localStorage.setItem(EditorSettingsKeys.DefaultEndAction, String(defaultEndAction));
        return { defaultEndAction };
      }),
-    setInheritGroupColour: (inheritGroupColour) =>
-      set(() => {
-        localStorage.setItem(EditorSettingsKeys.InheritGroupColour, String(inheritGroupColour));
-        return { inheritGroupColour };
-      }),
  };
 });
@@ -1,62 +0,0 @@
-import { create } from 'zustand';
-
-// params that are auth/preset markers, not user view customisation (see common/utils/urlPresets.ts)
-export const reservedParams = new Set(['token', 'n', 'alias']);
-
-interface SavedViewParamsStore {
-  params: Record<string, string>; // view key (e.g. "timer") -> search string without leading "?"
-  save: (view: string, search: string) => void;
-  clear: (view: string) => void;
-  clearAll: () => void;
-}
-
-/**
- * Remembers the last view parameters used for each view so they can be
- * restored when the user navigates back to that view through the menu.
- * In-memory only: persists across SPA navigation, resets on a full page reload.
- */
-export const useSavedViewParams = create<SavedViewParamsStore>((set) => ({
-  params: {},
-  save: (view, search) =>
-    set((state) => {
-      // ignore empty view keys and do not store empty entries, so the
-      // "saved changes" indicator only reflects genuine customisation
-      if (!view) return state;
-      const params = { ...state.params };
-      if (search) {
-        params[view] = search;
-      } else {
-        delete params[view];
-      }
-      return { params };
-    }),
-  clear: (view) =>
-    set((state) => {
-      if (!state.params[view]) return state;
-      const params = { ...state.params };
-      delete params[view];
-      return { params };
-    }),
-  clearAll: () => set({ params: {} }),
-}));
-
-/**
- * Removes reserved (auth/preset) params from a search string, keeping only
- * genuine view customisation.
- */
-export function stripReservedParams(search: string): string {
-  const sp = new URLSearchParams(search);
-  reservedParams.forEach((key) => sp.delete(key));
-  return sp.toString();
-}
-
-/**
- * Whether the search params contain any genuine view customisation,
- * ignoring reserved params.
- */
-export function hasCustomParams(searchParams: URLSearchParams): boolean {
-  for (const key of searchParams.keys()) {
-    if (!reservedParams.has(key)) return true;
-  }
-  return false;
-}
@@ -1,4 +1,4 @@
-import { hostToBaseUrl, linkToOtherHost } from '../linkUtils';
+import { linkToOtherHost } from '../linkUtils';

 describe('linkToOTherHost', () => {
  it('should handle electron links', () => {
@@ -22,18 +22,3 @@ describe('linkToOTherHost', () => {
    expect(destination).toBe('https://app.getontime.no/user-hash/path');
  });
 });
-
-describe('hostToBaseUrl', () => {
-  it('uses http when the page is plain http', () => {
-    expect(hostToBaseUrl('192.168.10.166', 4001, 'http://localhost:4001')).toBe('http://192.168.10.166:4001');
-  });
-
-  it('keeps https when the page reaches the server over TLS on the same port', () => {
-    expect(hostToBaseUrl('192.168.10.166', 4001, 'https://localhost:4001')).toBe('https://192.168.10.166:4001');
-  });
-
-  it('falls back to http when the page is https on a different port (TLS proxy)', () => {
-    // the raw server port does not speak TLS, an https link to it would fail
-    expect(hostToBaseUrl('192.168.10.166', 4001, 'https://ontime.example.com')).toBe('http://192.168.10.166:4001');
-  });
-});
@@ -1,25 +0,0 @@
-import { describe, expect, it } from 'vitest';
-
-import { removeFileExtension } from '../uploadUtils';
-
-describe('removeFileExtension()', () => {
-  it('removes a trailing extension', () => {
-    expect(removeFileExtension('show.xlsx')).toBe('show');
-  });
-
-  it('only removes the last extension', () => {
-    expect(removeFileExtension('my.show.xlsx')).toBe('my.show');
-  });
-
-  it('returns the name unchanged when there is no extension', () => {
-    expect(removeFileExtension('rundown')).toBe('rundown');
-  });
-
-  it('does not treat a leading dot as an extension', () => {
-    expect(removeFileExtension('.gitignore')).toBe('.gitignore');
-  });
-
-  it('handles an empty string', () => {
-    expect(removeFileExtension('')).toBe('');
-  });
-});
@@ -37,16 +37,6 @@ describe('getRouteFromPreset()', () => {
      alias: 'demopage',
      target: OntimeView.Timer,
      search: 'user=guest',
-      displayInNav: false,
-      options: {},
-    },
-  ];
-  const disabledPresets: URLPreset[] = [
-    {
-      enabled: false,
-      alias: 'demopage',
-      target: OntimeView.Timer,
-      search: 'user=guest',
      options: {},
    },
  ];
@@ -57,21 +47,6 @@ describe('getRouteFromPreset()', () => {
    expect(getRouteFromPreset(location, presets)).toStrictEqual('timer?user=guest&alias=demopage');
  });

-  it('checks if the current location matches an enabled preset target', () => {
-    const location = resolvePath('/timer');
-    expect(getRouteFromPreset(location, presets)).toStrictEqual('timer?user=guest&alias=demopage');
-  });
-
-  it('does not redirect disabled presets', () => {
-    const location = resolvePath('/demopage');
-    expect(getRouteFromPreset(location, disabledPresets)).toBeNull();
-  });
-
-  it('returns null when already on a preset path', () => {
-    const location = resolvePath('/preset/demopage');
-    expect(getRouteFromPreset(location, presets)).toBeNull();
-  });
-
  it('returns null if the current location is the exact match of an unwrapped alias', () => {
    // we make the current location be the alias
    const location = resolvePath('/timer?user=guest&alias=demopage');
@@ -106,11 +81,6 @@ describe('getRouteFromPreset()', () => {
      const location = resolvePath('/demopage?n=1&token=123');
      expect(getRouteFromPreset(location, presets)).toBe('timer?user=guest&alias=demopage&n=1&token=123');
    });
-
-    it('redirects stale unwrapped params back to the saved preset params while preserving feature params', () => {
-      const location = resolvePath('/timer?user=admin&alias=demopage&n=1&token=123');
-      expect(getRouteFromPreset(location, presets)).toBe('timer?user=guest&alias=demopage&n=1&token=123');
-    });
  });

  describe('cuesheet presets', () => {
@@ -120,7 +90,6 @@ describe('getRouteFromPreset()', () => {
        alias: 'cuesheet-4685d6',
        target: OntimeView.Cuesheet,
        search: '',
-        displayInNav: false,
        options: {
          read: 'full',
          write: '-',
@@ -133,7 +102,6 @@ describe('getRouteFromPreset()', () => {
        alias: 'cuesheet-basic',
        target: OntimeView.Cuesheet,
        search: '',
-        displayInNav: false,
      },
    ];
    const cuesheetPresetWithNavLock: URLPreset[] = [
@@ -142,7 +110,6 @@ describe('getRouteFromPreset()', () => {
        alias: 'cuesheet-locked',
        target: OntimeView.Cuesheet,
        search: 'n=1',
-        displayInNav: false,
      },
    ];

@@ -224,7 +191,6 @@ describe('generateUrlPresetOptions', () => {
        target: 'timer',
        search: 'param1=value1&param2=value2',
        enabled: true,
-        displayInNav: false,
      },
    ],
    [
@@ -236,7 +202,6 @@ describe('generateUrlPresetOptions', () => {
        target: 'timer',
        search: 'param1=value1&param2=value2',
        enabled: true,
-        displayInNav: false,
      },
    ],
    [
@@ -248,7 +213,6 @@ describe('generateUrlPresetOptions', () => {
        target: 'timer',
        search: 'param1=value1&param2=value2',
        enabled: true,
-        displayInNav: false,
      },
    ],
    [
@@ -260,7 +224,6 @@ describe('generateUrlPresetOptions', () => {
        target: 'timer',
        search: 'param1=value1&param2=value2',
        enabled: true,
-        displayInNav: false,
      },
    ],
  ])('should generate URL preset options for %s', (_description, alias, url, expected) => {
@@ -37,12 +37,7 @@ export function handleLinks(
  event?.preventDefault();

  const destination = new URL(externalServerUrl);
-  // split off any query string so it is not encoded into the pathname
-  const [pathname, search] = location.split('?');
-  destination.pathname = externalBaseURI ? `${externalBaseURI}/${pathname}` : pathname;
-  if (search) {
-    destination.search = search;
-  }
+  destination.pathname = externalBaseURI ? `${externalBaseURI}/${location}` : location;
  openLink(destination.toString());
 }

@@ -59,17 +54,3 @@ export function linkToOtherHost(
  }
  return destination.toString();
 }
-
-/**
- * Builds a base URL for reaching the Ontime server on a given network interface.
- * The Ontime server itself only speaks HTTP, so we only keep https when the page
- * already reaches the server over TLS on that same port (eg. a proxy in front of it);
- * any other explicit server port gets http.
- * externalServerUrl is used for testing
- */
-export function hostToBaseUrl(host: string, port: number, externalServerUrl: string = serverURL): string {
-  const page = new URL(externalServerUrl);
-  const pagePort = page.port === '' ? (page.protocol === 'https:' ? 443 : 80) : Number(page.port);
-  const scheme = page.protocol === 'https:' && pagePort === port ? 'https' : 'http';
-  return `${scheme}://${host}:${port}`;
-}
@@ -3,7 +3,9 @@ import {
  Log,
  MaybeNumber,
  MessageTag,
+  ProjectRundownsList,
  RefetchKey,
+  Rundown,
  RuntimeStore,
  WsPacketToClient,
  WsPacketToServer,
@@ -14,17 +16,16 @@ import {
  APP_SETTINGS,
  CLIENT_LIST,
  CSS_OVERRIDE,
-  CURRENT_RUNDOWN_QUERY_KEY,
  CUSTOM_FIELDS,
  PROJECT_DATA,
+  CURRENT_RUNDOWN_QUERY_KEY,
+  PROJECT_RUNDOWNS,
  REPORT,
-  RUNDOWN,
  RUNTIME,
  TRANSLATION,
  URL_PRESETS,
  VIEW_SETTINGS,
  getRundownQueryKey,
-  PROJECT_RUNDOWNS,
 } from '../api/constants';
 import { invalidateAllCaches } from '../api/utils';
 import { ontimeQueryClient } from '../queryClient';
@@ -180,7 +181,7 @@ export const connectSocket = () => {
        }
        case MessageTag.Refetch: {
          // the refetch message signals that the rundown has changed in the server side
-          const { target, revision, rundownId } = payload;
+          const { target, revision } = payload;
          switch (target) {
            case RefetchKey.All:
              invalidateAllCaches();
@@ -195,7 +196,7 @@ export const connectSocket = () => {
              ontimeQueryClient.invalidateQueries({ queryKey: REPORT });
              break;
            case RefetchKey.Rundown: {
-              maybeInvalidateRundownCache(revision, rundownId);
+              maybeInvalidateRundownCache(revision);
              break;
            }
            case RefetchKey.UrlPresets:
@@ -213,9 +214,6 @@ export const connectSocket = () => {
            case RefetchKey.Settings:
              ontimeQueryClient.invalidateQueries({ queryKey: APP_SETTINGS });
              break;
-            case RefetchKey.ProjectRundowns:
-              ontimeQueryClient.invalidateQueries({ queryKey: PROJECT_RUNDOWNS });
-              break;
            default: {
              target satisfies never;
              break;
@@ -234,30 +232,34 @@ export const connectSocket = () => {
  };
 };

-export function maybeInvalidateRundownCache(revision: MaybeNumber, rundownId?: string) {
-  if (!rundownId) {
-    // we omit rundownId to signify invalidate all rundowns
-    ontimeQueryClient.invalidateQueries({ queryKey: RUNDOWN });
-    ontimeQueryClient.invalidateQueries({ queryKey: CURRENT_RUNDOWN_QUERY_KEY, exact: true });
-    return;
-  }
-
-  // skip if we dont recognise the ID the revision is lower
-  const queryKey = getRundownQueryKey(rundownId);
-  const cachedRundown = ontimeQueryClient.getQueryData<{ revision: number }>(queryKey);
+/**
+ * When we receive a refetch message for the rundown
+ * check which rundown needs to be invalidated
+ */
+export function maybeInvalidateRundownCache(revision: MaybeNumber) {
+  const loadedRundownId: string | undefined = (ontimeQueryClient.getQueryData(PROJECT_RUNDOWNS) as ProjectRundownsList)
+    ?.loaded;

+  const activeRundownQueryKey = loadedRundownId ? getRundownQueryKey(loadedRundownId) : CURRENT_RUNDOWN_QUERY_KEY;
+  const cachedRundown = ontimeQueryClient.getQueryData<Rundown>(activeRundownQueryKey);
  if (revision === cachedRundown?.revision) {
-    // we already have the latest change
    return;
  }

-  ontimeQueryClient.invalidateQueries({ queryKey, exact: true });
+  ontimeQueryClient.invalidateQueries({ queryKey: activeRundownQueryKey, exact: true });

-  // keep current alias in sync with the ID-based cache
-  const loadedRundownId = ontimeQueryClient.getQueryData<{ loaded: string }>(PROJECT_RUNDOWNS)?.loaded;
-  if (!loadedRundownId || loadedRundownId === rundownId) {
+  if (loadedRundownId) {
+    // Keep bootstrap alias in sync with the ID-based cache
    ontimeQueryClient.invalidateQueries({ queryKey: CURRENT_RUNDOWN_QUERY_KEY, exact: true });
+  } else {
+    // During bootstrap, loadedRundownId is not yet known.
+    // Invalidate any ID-based rundown caches that may have been seeded early.
+    ontimeQueryClient.invalidateQueries({
+      predicate: (query) => query.queryKey[0] === 'rundown' && query.queryKey[1] !== 'current',
+    });
  }
+
+  ontimeQueryClient.invalidateQueries({ queryKey: CUSTOM_FIELDS });
 }

 export function sendSocket<T extends MessageTag | ApiActionTag>(
@@ -3,9 +3,7 @@ import {
  MILLIS_PER_HOUR,
  MILLIS_PER_MINUTE,
  MILLIS_PER_SECOND,
-  dayInMs,
  formatFromMillis,
-  getExpectedEnd,
  getExpectedStart,
 } from 'ontime-utils';

@@ -31,11 +29,6 @@ export function nowInMillis(): number {
  return elapsed;
 }

-export function normaliseWallClock(time: number): number {
-  const timeOfDay = time % dayInMs;
-  return timeOfDay < 0 ? timeOfDay + dayInMs : timeOfDay;
-}
-
 /**
 * @description Resolves format from url and store
 * @return {string|null} A format string like "hh:mm:ss a" or null
@@ -187,13 +180,15 @@ export function getExpectedTimesFromExtendedEvent(
      ...state,
    },
  );
-  const expectedEnd = getExpectedEnd(event, expectedStart, state.currentDay);
+
  const plannedEnd = event.timeStart + event.duration + event.delay;

  return {
    expectedStart,
    timeToStart: expectedStart - state.clock,
-    expectedEnd,
+    expectedEnd: event.countToEnd
+      ? Math.max(expectedStart + event.duration, plannedEnd)
+      : expectedStart + event.duration,
    plannedEnd,
  };
 }
@@ -38,18 +38,6 @@ export function validateProjectFile(file: File) {
  }
 }

-/**
- * Removes a trailing file extension from a file name (e.g. "show.xlsx" -> "show")
- * A leading dot (dotfiles like ".gitignore") is not treated as an extension
- */
-export function removeFileExtension(fileName: string): string {
-  const lastDot = fileName.lastIndexOf('.');
-  if (lastDot <= 0) {
-    return fileName;
-  }
-  return fileName.slice(0, lastDot);
-}
-
 export function isExcelFile(file: File | null) {
  return file?.name.endsWith('.xlsx');
 }
@@ -194,7 +194,6 @@ export function generateUrlPresetOptions(alias: string, userUrl: string): URLPre
    target: path,
    search: url.searchParams.toString(),
    enabled: true,
-    displayInNav: false,
  };
 }

@@ -205,7 +204,7 @@ function isPresettableView(view: string): view is OntimeViewPresettable {
 /**
 * Check if current location is a preset path
 */
-function isPresetPath(location: Path): boolean {
-  const firstSegment = location.pathname.split('/').find(Boolean);
-  return firstSegment === 'preset';
+export function isPresetPath(location: Path): boolean {
+  const segments = location.pathname.split('/').filter(Boolean);
+  return segments[0] === 'preset';
 }
@@ -9,7 +9,6 @@ export const apiRepoLatest = 'https://api.github.com/repos/cpvalente/ontime/rele
 export const websiteUrl = 'https://www.getontime.no';
 export const discordUrl = 'https://discord.com/invite/eje3CSUEXm';
 export const subredditUrl = 'https://www.reddit.com/r/ontimeapp/';
-export const youtubeUrl = 'https://www.youtube.com/@ontimeapp';

 export const documentationUrl = 'https://docs.getontime.no';
 export const customFieldsDocsUrl = 'https://docs.getontime.no/features/custom-fields/';
@@ -1,21 +0,0 @@
-import { describe, expect, it } from 'vitest';
-
-import { matchesSettingsOptionQuery } from '../useAppSettingsMenu';
-
-describe('matchesSettingsOptionQuery', () => {
-  const option = {
-    id: 'settings__general',
-    label: 'General settings',
-    keywords: ['pin', 'time zone'],
-  };
-
-  it('does not match an empty or whitespace-only query', () => {
-    expect(matchesSettingsOptionQuery(option, '')).toBe(false);
-    expect(matchesSettingsOptionQuery(option, '   ')).toBe(false);
-  });
-
-  it('matches keywords case-insensitively', () => {
-    expect(matchesSettingsOptionQuery(option, 'PIN')).toBe(true);
-    expect(matchesSettingsOptionQuery(option, 'TIME ZONE')).toBe(true);
-  });
-});
@@ -1,4 +1,9 @@
-$content-max-width: 1280px;
+.corner {
+  position: fixed;
+  top: 6rem;
+  right: 4rem;
+  z-index: $zindex-floating;
+}

 .contentWrapper {
  display: flex;
@@ -9,29 +14,9 @@ $content-max-width: 1280px;
  position: relative;
 }

-.corner {
-  flex: 0 0 auto;
-  display: flex;
-  justify-content: flex-end;
-  // width is needed so the button can align to the right of the capped
-  // column, auto margins alone would shrink this to fit and centre it
-  width: 100%;
-  max-width: $content-max-width;
-  margin-inline: auto;
-  padding: 0 1rem 0.5rem;
-  box-sizing: border-box;
-}
-
 .content {
-  box-sizing: border-box;
-  // as with .corner, the width is needed to fill the capped column, otherwise
-  // auto margins shrink this to fit and each panel ends up its own width
-  width: 100%;
-  max-width: $content-max-width;
-  margin: 0 auto 1rem;
-  padding-inline: 1rem;
+  margin: 1rem;
  overflow-y: auto;
  flex-grow: 1;
-  // room for the last section to scroll to the top of the viewport
-  padding-bottom: 40vh;
+  padding-bottom: 300px;
 }
@@ -12,12 +12,12 @@ interface PanelContentProps {
 export default function PanelContent({ onClose, children }: PropsWithChildren<PanelContentProps>) {
  return (
    <div className={style.contentWrapper}>
+      <div className={style.content}>{children}</div>
      <div className={style.corner}>
        <Button size='large' onClick={onClose}>
          Close settings <IoClose />
        </Button>
      </div>
-      <div className={style.content}>{children}</div>
    </div>
  );
 }
@@ -1,13 +1,3 @@
-.container {
-  width: min(30vw, 300px);
-  flex: 0 0 min(30vw, 300px);
-  min-width: min(30vw, 300px);
-  display: flex;
-  flex-direction: column;
-  gap: 0.75rem;
-  overflow-y: auto;
-}
-
 .tabs,
 ul {
  list-style: none;
@@ -16,20 +6,22 @@ ul {
 }

 .tabs {
+  width: min(30vw, 300px);
+  flex: 0 0 min(30vw, 300px);
+  min-width: min(30vw, 300px);
  display: flex;
  flex-direction: column;
+  overflow-y: auto;
 }

 .primary,
 .secondary {
  padding: 0.25rem 1rem;
  margin-right: 1rem;
-  border-radius: 2px;

-  &:focus-visible {
+  &:focus {
    background-color: $gray-1000;
-    outline: 2px solid $blue-500;
-    outline-offset: -2px;
+    outline: 0;
  }

  &:hover {
@@ -40,21 +32,14 @@ ul {

 .primary {
  font-size: 1rem;
+  border-radius: 2px;
  display: flex;
  align-items: center;
  gap: 0.5rem;
-  border-left: 3px solid transparent;
-
-  &.groupActive {
-    color: $blue-400;
-    font-weight: 600;
-  }

  &.active {
-    color: $ui-white;
-    border-left-color: $blue-400;
-    background-color: rgba($blue-500, 0.16);
-    font-weight: 600;
+    color: $blue-400;
+    background-color: $gray-1100;
  }

  &.highlight {
@@ -68,6 +53,10 @@ ul {
      background-color: $red-400;
    }
  }
+
+  &.split {
+    margin-top: 1rem;
+  }
 }

 .secondary {
@@ -77,9 +66,6 @@ ul {
  font-size: $inner-section-text-size;

  &.active {
-    color: $ui-white;
-    border-left-color: $blue-400;
-    background-color: rgba($blue-500, 0.16);
-    font-weight: 600;
+    color: $blue-400;
  }
 }
@@ -1,18 +1,10 @@
-import { Fragment, useState } from 'react';
+import { Fragment } from 'react';

 import Tooltip from '../../../common/components/tooltip/Tooltip';
 import { isKeyEnter } from '../../../common/utils/keyEvent';
 import { cx } from '../../../common/utils/styleUtils';
-import * as Panel from '../panel-utils/PanelUtils';
-import {
-  filterSettingsOptions,
-  matchesSettingsOptionQuery,
-  SettingsOption,
-  SettingsOptionId,
-  useAppSettingsMenu,
-} from '../useAppSettingsMenu';
+import { SettingsOption, SettingsOptionId, useAppSettingsMenu } from '../useAppSettingsMenu';
 import useAppSettingsNavigation from '../useAppSettingsNavigation';
-import SettingsSearch from './SettingsSearch';

 import style from './PanelList.module.scss';

@@ -24,57 +16,23 @@ interface PanelListProps extends PanelBaseProps {
  selectedPanel: string;
 }

-/** Returns the first matching setting, preferring a matching child over its non-matching group. */
-function getFirstResultId(results: SettingsOption[], query: string): SettingsOptionId | null {
-  const firstResult = results[0];
-  if (!firstResult) {
-    return null;
-  }
-
-  if (matchesSettingsOptionQuery(firstResult, query.trim().toLowerCase())) {
-    return firstResult.id as SettingsOptionId;
-  }
-
-  return (firstResult.secondary?.[0]?.id as SettingsOptionId | undefined) ?? null;
-}
-
 export default function PanelList({ selectedPanel, location }: PanelListProps) {
  const { options } = useAppSettingsMenu();
-  const { setLocation } = useAppSettingsNavigation();
-  const [query, setQuery] = useState('');
-
-  const results = filterSettingsOptions(options, query);
-
-  const handleSearchSubmit = () => {
-    const target = getFirstResultId(results, query);
-    if (target) {
-      setLocation(target);
-      setQuery('');
-    }
-  };

  return (
-    <div className={style.container}>
-      <SettingsSearch query={query} onQueryChange={setQuery} onSubmit={handleSearchSubmit} />
-
-      {results.length === 0 ? (
-        <Panel.EmptyState title='No settings match' description={`Nothing found for "${query.trim()}"`} />
-      ) : (
-        <ul className={style.tabs}>
-          {results.map((panel) => {
-            const isSelected = selectedPanel === panel.id;
-            if (panel.highlight) {
-              return (
-                <Tooltip key={panel.id} text={panel.highlight} render={<span />}>
-                  <PanelListItem panel={panel} location={location} isSelected={isSelected} />
-                </Tooltip>
-              );
-            }
-            return <PanelListItem key={panel.id} panel={panel} location={location} isSelected={isSelected} />;
-          })}
-        </ul>
-      )}
-    </div>
+    <ul className={style.tabs}>
+      {options.map((panel) => {
+        const isSelected = selectedPanel === panel.id;
+        if (panel.highlight) {
+          return (
+            <Tooltip key={panel.id} text={panel.highlight} render={<span />}>
+              <PanelListItem panel={panel} location={location} isSelected={isSelected} />
+            </Tooltip>
+          );
+        }
+        return <PanelListItem key={panel.id} panel={panel} location={location} isSelected={isSelected} />;
+      })}
+    </ul>
  );
 }

@@ -84,15 +42,14 @@ interface PanelListItemProps {
  location?: string;
 }

-function PanelListItem({ panel, isSelected, location }: PanelListItemProps) {
+function PanelListItem(props: PanelListItemProps) {
+  const { panel, isSelected, location } = props;
  const { setLocation } = useAppSettingsNavigation();
-  const hasSelectedChild = Boolean(
-    isSelected && panel.secondary?.some((secondary) => secondary.id.split('__')[1] === location),
-  );
+
  const classes = cx([
    style.primary,
-    isSelected && !hasSelectedChild && style.active,
-    hasSelectedChild && style.groupActive,
+    isSelected && style.active,
+    panel.split && style.split,
    panel.highlight && style.highlight,
  ]);

@@ -125,7 +82,6 @@ function PanelListItem({ panel, isSelected, location }: PanelListItemProps) {
              }
            }}
            className={secondaryClasses}
-            tabIndex={0}
            role='button'
          >
            {secondary.label}
@@ -1,24 +0,0 @@
-.search {
-  position: relative;
-  display: flex;
-  align-items: center;
-  flex: 0 0 auto;
-  margin: 0.25rem 1rem 0.25rem 0.25rem;
-}
-
-.icon {
-  position: absolute;
-  left: 0.5rem;
-  color: $gray-400;
-  pointer-events: none;
-}
-
-.input {
-  padding-left: 2rem;
-  padding-right: 2rem;
-}
-
-.clear {
-  position: absolute;
-  right: 0.25rem;
-}
@@ -1,60 +0,0 @@
-import { KeyboardEvent, useRef } from 'react';
-import { IoClose, IoSearch } from 'react-icons/io5';
-
-import IconButton from '../../../common/components/buttons/IconButton';
-import Input from '../../../common/components/input/input/Input';
-
-import style from './SettingsSearch.module.scss';
-
-interface SettingsSearchProps {
-  query: string;
-  onQueryChange: (query: string) => void;
-  onSubmit: () => void;
-}
-
-export default function SettingsSearch({ query, onQueryChange, onSubmit }: SettingsSearchProps) {
-  const searchRef = useRef<HTMLInputElement>(null);
-  const isSearching = query.trim().length > 0;
-
-  const handleKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
-    if (event.key === 'Escape' && isSearching) {
-      // Do not let the settings panel close while the user is clearing a search.
-      event.stopPropagation();
-      onQueryChange('');
-      return;
-    }
-
-    if (event.key === 'Enter') {
-      onSubmit();
-    }
-  };
-
-  return (
-    <div className={style.search}>
-      <IoSearch className={style.icon} />
-      <Input
-        ref={searchRef}
-        value={query}
-        onChange={(event) => onQueryChange(event.target.value)}
-        onKeyDown={handleKeyDown}
-        placeholder='Search settings'
-        className={style.input}
-        fluid
-      />
-      {isSearching && (
-        <IconButton
-          variant='ghosted-white'
-          size='small'
-          aria-label='Clear search'
-          className={style.clear}
-          onClick={() => {
-            onQueryChange('');
-            searchRef.current?.focus();
-          }}
-        >
-          <IoClose />
-        </IconButton>
-      )}
-    </div>
-  );
-}
@@ -1,26 +1,24 @@
 $inner-padding: 1rem;
-$card-padding: 2rem;

 .header {
-  font-size: 1.5rem;
+  font-size: 2rem;
  padding-bottom: 0.5rem;
  border-bottom: 1px solid $white-10;
  font-weight: 600;
 }

 .subheader {
-  font-size: 1.125rem;
+  font-size: 1.5rem;
  padding-bottom: 0.5rem;
  font-weight: 600;
  display: flex;
  align-items: center;
  justify-content: space-between;
-  gap: 1rem;
 }

 .title {
-  font-size: 1rem;
-  padding: 0 var(--panel-card-padding, #{$card-padding});
+  font-size: 1.375rem;
+  padding: 0 2rem;
  font-weight: 600;
  display: flex;
  align-items: center;
@@ -37,12 +35,10 @@ $card-padding: 2rem;
  color: $ui-white;
 }

-// width is owned by the panel content column, which caps and centres itself.
-// sections must stay full width so top level cards line up with Panel.Header
-// and nested sections fill their card rather than shrinking to fit
 .section {
  position: relative;
  margin-top: 2rem;
+  max-width: 850px;
 }

 .indent {
@@ -55,10 +51,8 @@ $card-padding: 2rem;
 }

 .card {
-  --panel-card-padding: #{$card-padding};
-
  position: relative;
-  padding: var(--panel-card-padding);
+  padding: 2rem;
  background-color: $white-3;
  border: 1px solid $gray-1100;
  border-radius: 3px;
@@ -82,10 +76,10 @@ $card-padding: 2rem;
  color: $error-red;
 }

-// tables scroll with the panel rather than owning a nested scroll area,
-// which keeps the sticky table head anchored to the panel viewport
 .pad {
-  padding: 0 var(--panel-card-padding, #{$card-padding});
+  padding: 0 2rem;
+  max-height: 550px;
+  overflow-y: scroll;
 }

 .table {
@@ -103,13 +97,10 @@ $card-padding: 2rem;
  }

  th {
-    font-weight: 600;
-    color: $gray-300;
-    font-size: calc(1rem - 3px);
-    letter-spacing: 0.02em;
-    vertical-align: bottom;
+    font-weight: 400;
+    color: $gray-400;
    white-space: nowrap;
-    text-transform: uppercase;
+    text-transform: capitalize;
  }

  th,
@@ -121,17 +112,6 @@ $card-padding: 2rem;
    background-color: $white-1;
  }

-  // active rows use a panel-local class today; keep the treatment here so all
-  // settings tables share the same state without each panel owning its colours
-  tr[class*='current'] {
-    background-color: rgba($blue-500, 0.16);
-
-    > td:first-child {
-      box-shadow: inset 3px 0 $blue-400;
-      font-weight: 500;
-    }
-  }
-
  // allow highlighting table elements
  tr[data-warn='true'],
  td[data-warn='true'] {
@@ -140,7 +120,7 @@ $card-padding: 2rem;
 }

 .listGroup {
-  padding: 0 var(--panel-card-padding, #{$card-padding});
+  padding: 0 2rem;

  > li:not(:last-child) {
    border-bottom: 1px solid $white-10;
@@ -153,17 +133,6 @@ $card-padding: 2rem;
  align-items: center;
  gap: 1rem;
  padding: 0.5rem 0;
-
-  &.interactive {
-    margin-inline: calc(var(--panel-card-padding, #{$card-padding}) * -1);
-    padding: 0.75rem var(--panel-card-padding, #{$card-padding});
-    transition: background-color $transition-time-action;
-
-    &:hover,
-    &:focus-within {
-      background-color: $white-3;
-    }
-  }
 }

 .fieldTitle {
@@ -194,13 +163,14 @@ $card-padding: 2rem;
 .divider {
  border: none;
  border-top: 1px solid $white-10;
-  margin: 1rem calc(var(--panel-card-padding, #{$card-padding}) * -1);
+  margin: 1rem -2rem;
 }

 .overlay {
  position: absolute;
  z-index: $zindex-backdrop;
-  inset: 0;
+  width: 100%;
+  height: 100%;
  backdrop-filter: blur(2px);
  display: grid;
  place-content: center;
@@ -218,35 +188,19 @@ $card-padding: 2rem;
  animation: animloader 1s ease-in infinite;
 }

-.emptyState {
-  padding: 3rem 1.5rem;
+.empty {
+  background-color: $black-10;
  text-align: center;
-}
+  color: $muted-gray;

-.emptyMessage {
-  width: min(30rem, 100%);
-  margin-inline: auto;
-}
+  td {
+    padding-block: 5rem;
+  }

-.emptyTitle {
-  margin-bottom: 0.25rem;
-  color: rgba($gray-200, 0.72);
-  font-size: calc(1rem + 2px);
-  font-weight: 400;
-}
-
-.emptyBody {
-  color: rgba($gray-200, 0.55);
-  font-size: calc(1rem - 3px);
-  line-height: 1.5;
-}
-
-.emptyAction {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 0.5rem;
-  margin-top: 1rem;
+  button {
+    margin-top: 1rem;
+    margin-inline: auto;
+  }
 }

 .inlineElements {
@@ -285,3 +239,14 @@ $card-padding: 2rem;
    opacity: 0;
  }
 }
+
+@keyframes animloader {
+  0% {
+    transform: scale(0);
+    opacity: 0.6;
+  }
+  100% {
+    transform: scale(1);
+    opacity: 0;
+  }
+}
@@ -1,5 +1,7 @@
 import { HTMLAttributes, PropsWithChildren, ReactNode } from 'react';
+import { IoAdd } from 'react-icons/io5';

+import Button from '../../../common/components/buttons/Button';
 import { cx } from '../../../common/utils/styleUtils';

 import style from './PanelUtils.module.scss';
@@ -60,29 +62,16 @@ export function Table({ className, children }: { className?: string; children: R
  );
 }

-export interface EmptyStateProps {
-  title: string;
-  description?: ReactNode;
-  action?: ReactNode;
-}
-
-export function EmptyState({ title, description, action }: EmptyStateProps) {
+export function TableEmpty({ label, handleClick }: { label?: string; handleClick?: () => void }) {
  return (
-    <div className={style.emptyState}>
-      <div className={style.emptyMessage}>
-        <div className={style.emptyTitle}>{title}</div>
-        {description && <div className={style.emptyBody}>{description}</div>}
-        {action && <div className={style.emptyAction}>{action}</div>}
-      </div>
-    </div>
-  );
-}
-
-export function TableEmpty(props: EmptyStateProps) {
-  return (
-    <tr>
+    <tr className={style.empty}>
      <td colSpan={99}>
-        <EmptyState {...props} />
+        <div>{label ?? 'No data yet'}</div>
+        {handleClick && (
+          <Button onClick={handleClick} disabled={!handleClick} variant='primary'>
+            New <IoAdd />
+          </Button>
+        )}
      </td>
    </tr>
  );
@@ -92,8 +81,8 @@ export function ListGroup({ className, children }: { className?: string; childre
  return <ul className={cx([style.listGroup, className])}>{children}</ul>;
 }

-export function ListItem({ children, interactive = false }: { children: ReactNode; interactive?: boolean }) {
-  return <li className={cx([style.listItem, interactive && style.interactive])}>{children}</li>;
+export function ListItem({ children }: { children: ReactNode }) {
+  return <li className={style.listItem}>{children}</li>;
 }

 export function Field({
@@ -1,4 +1,4 @@
-import Info from '../../../../common/components/info/Info';
+import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
 import {
  buyMeACoffeeUrl,
  discordUrl,
@@ -7,12 +7,9 @@ import {
  githubUrl,
  subredditUrl,
  websiteUrl,
-  youtubeUrl,
 } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';
 import AppVersion from './AppVersion';
-import CloudPanel from './CloudPanel';
-import ExternalLinkRow from './ExternalLinkRow';

 export default function AboutPanel() {
  return (
@@ -21,49 +18,27 @@ export default function AboutPanel() {
      <Panel.Section>
        <Panel.Card>
          <Panel.SubHeader>Ontime</Panel.SubHeader>
-          <Panel.Divider />
-          <Info>Free, open-source software for managing rundowns and event timers.</Info>
-          <Panel.ListGroup>
-            <ExternalLinkRow href={websiteUrl} title='www.getontime.no' description='App site and downloads' />
-            <ExternalLinkRow
-              href={githubSponsorUrl}
-              title='GitHub Sponsors'
-              description='Support development through GitHub'
-            />
-            <ExternalLinkRow
-              href={buyMeACoffeeUrl}
-              title='Buy Me a Coffee'
-              description='Make a one-time contribution'
-            />
-          </Panel.ListGroup>
-        </Panel.Card>
-      </Panel.Section>
-      <CloudPanel />
-      <Panel.Section>
-        <Panel.Card>
-          <Panel.SubHeader>Current version</Panel.SubHeader>
-          <Panel.Divider />
-          <Panel.ListGroup>
-            <AppVersion />
-          </Panel.ListGroup>
-        </Panel.Card>
-      </Panel.Section>
-      <Panel.Section>
-        <Panel.Card>
-          <Panel.SubHeader>Helpful links</Panel.SubHeader>
-          <Panel.Divider />
-          <Panel.ListGroup>
-            <ExternalLinkRow
-              href={documentationUrl}
-              title='Read the docs'
-              description='Setup guides and feature documentation'
-            />
-            <ExternalLinkRow href={githubUrl} title='GitHub' description='Report issues or contribute to Ontime' />
-            <ExternalLinkRow href={youtubeUrl} title='YouTube' description='Watch tutorials and feature walkthroughs' />
-            <ExternalLinkRow href={discordUrl} title='Discord' description='Get help and share suggestions' />
-            <ExternalLinkRow href={subredditUrl} title='Reddit' description='Join the Ontime community discussion' />
-          </Panel.ListGroup>
+          <Panel.Paragraph>
+            Free, open-source software for managing rundowns and event timers
+            <ExternalLink href={websiteUrl}>www.getontime.no</ExternalLink>
+          </Panel.Paragraph>
+          <Panel.Paragraph>
+            Considering sponsoring our work
+            <ExternalLink href={githubSponsorUrl}>GitHub Sponsors</ExternalLink>
+            <ExternalLink href={buyMeACoffeeUrl}>Buy Me a Coffee</ExternalLink>
+          </Panel.Paragraph>
+          <Panel.Paragraph>
+            If you are looking for an online version of Ontime, consider trying out our cloud service
+            <ExternalLink href={websiteUrl}>www.getontime.no</ExternalLink>
+          </Panel.Paragraph>
        </Panel.Card>
+        <Panel.SubHeader>Current version</Panel.SubHeader>
+        <AppVersion />
+        <Panel.SubHeader>Links</Panel.SubHeader>
+        <ExternalLink href={documentationUrl}>Read the docs</ExternalLink>
+        <ExternalLink href={githubUrl}>Follow the project on GitHub</ExternalLink>
+        <ExternalLink href={discordUrl}>Discord server</ExternalLink>
+        <ExternalLink href={subredditUrl}>Subreddit</ExternalLink>
      </Panel.Section>
    </>
  );
@@ -1,7 +0,0 @@
-.updateIndicator {
-  width: 0.5em;
-  height: 0.5em;
-  flex: 0 0 auto;
-  border-radius: 99px;
-  background-color: $red-400;
-}
@@ -1,47 +1,35 @@
 import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
 import useAppVersion from '../../../../common/hooks-query/useAppVersion';
-import { appVersion, isOntimeCloud, websiteUrl } from '../../../../externals';
+import { appVersion, isOntimeCloud } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';

-import style from './AppVersion.module.scss';
-
 export default function AppVersion() {
  const { data, isError } = useAppVersion();

  if (isError) {
    return (
-      <Panel.ListItem>
-        <Panel.Field title={`Ontime ${appVersion}`} description='' error='Could not fetch version information' />
-      </Panel.ListItem>
+      <Panel.Paragraph>
+        {`You are currently using Ontime version ${appVersion}`}
+        <Panel.Error>Could not fetch version information</Panel.Error>
+      </Panel.Paragraph>
    );
  }

  if (data.hasUpdates) {
    return (
-      <Panel.ListItem>
-        <Panel.Field
-          title={
-            <>
-              <span className={style.updateIndicator} aria-hidden='true' />
-              {`Ontime ${appVersion}`}
-            </>
-          }
-          description={
-            isOntimeCloud
-              ? `Version ${data.version} is available. Restart your stage to update.`
-              : `Version ${data.version} is available.`
-          }
-        />
-        {!isOntimeCloud && (
-          <ExternalLink href={websiteUrl}>Download the latest version from Ontime's page</ExternalLink>
+      <Panel.Paragraph>
+        {`You are currently using Ontime version ${appVersion}.`}
+        <br />
+        <br />
+        {`A new version ${data.version} is available.`} <br />
+        {isOntimeCloud ? (
+          'You can restart your stage to get the latest available version.'
+        ) : (
+          <ExternalLink href={data.url}>Please visit the release page to download</ExternalLink>
        )}
-      </Panel.ListItem>
+      </Panel.Paragraph>
    );
  }

-  return (
-    <Panel.ListItem>
-      <Panel.Field title={`Ontime ${appVersion}`} description='You are using the latest version.' />
-    </Panel.ListItem>
-  );
+  return <Panel.Paragraph>{`You are currently using the latest version of Ontime: ${appVersion}`}</Panel.Paragraph>;
 }
@@ -1,74 +0,0 @@
-.card {
-  padding: 1.5rem;
-  border-color: rgba($action-blue, 0.42);
-  background-color: rgba($action-blue, 0.06);
-}
-
-.eyebrow {
-  color: $action-text-color;
-  font-size: calc(1rem - 3px);
-  font-weight: 700;
-  letter-spacing: 0.08em;
-  text-transform: uppercase;
-}
-
-.title {
-  margin-top: 0.35rem;
-  font-size: 1.5rem;
-  font-weight: 600;
-  line-height: 1.15;
-}
-
-.description {
-  display: flex;
-  flex-direction: column;
-  gap: 0.75rem;
-  max-width: 33rem;
-  margin-top: 0.9rem;
-  color: $gray-300;
-  line-height: 1.5;
-}
-
-.portability {
-  padding-top: 0.75rem;
-  border-top: 1px solid $white-10;
-  color: $gray-400;
-  font-size: calc(1rem - 2px);
-}
-
-.benefits {
-  display: grid;
-  grid-template-columns: repeat(2, minmax(0, 1fr));
-  gap: 0.75rem 1rem;
-  margin-top: 1.5rem;
-  padding: 0;
-  list-style: none;
-
-  li {
-    display: flex;
-    align-items: flex-start;
-    gap: 0.5rem;
-    line-height: 1.4;
-  }
-
-  svg {
-    flex: 0 0 auto;
-    margin-top: 0.1rem;
-    color: $action-text-color;
-    font-size: 1.1rem;
-  }
-}
-
-.actions {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  gap: 1rem;
-  margin-top: 1.5rem;
-}
-
-@media (max-width: $min-tablet) {
-  .benefits {
-    grid-template-columns: 1fr;
-  }
-}
@@ -1,52 +0,0 @@
-import { IoCheckmarkCircle } from 'react-icons/io5';
-
-import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
-import { isOntimeCloud, websiteUrl } from '../../../../externals';
-import * as Panel from '../../panel-utils/PanelUtils';
-
-import style from './CloudPanel.module.scss';
-
-export default function CloudPanel() {
-  if (isOntimeCloud) {
-    return null;
-  }
-
-  return (
-    <Panel.Section>
-      <Panel.Card className={style.card}>
-        <span className={style.eyebrow}>Ontime Cloud</span>
-        <h3 className={style.title}>Run Ontime online with zero setup</h3>
-        <p className={style.description}>
-          <span>
-            Ontime Cloud lets you run and share Ontime online with your team. Subscriptions support continued
-            development while Ontime remains fully open-source and self-hostable.
-          </span>
-          <span className={style.portability}>
-            Project files work locally and in Cloud, so your shows can move freely.
-          </span>
-        </p>
-        <ul className={style.benefits}>
-          <li>
-            <IoCheckmarkCircle />
-            Start in minutes, with no setup or maintenance
-          </li>
-          <li>
-            <IoCheckmarkCircle />
-            Coordinate multi-track rundowns with Overview views
-          </li>
-          <li>
-            <IoCheckmarkCircle />
-            Manage every instance from one dashboard
-          </li>
-          <li>
-            <IoCheckmarkCircle />
-            Share secure read-only views with collaborators
-          </li>
-        </ul>
-        <div className={style.actions}>
-          <ExternalLink href={websiteUrl}>Learn more about Ontime Cloud</ExternalLink>
-        </div>
-      </Panel.Card>
-    </Panel.Section>
-  );
-}
@@ -1,15 +0,0 @@
-.link {
-  width: calc(100% + (var(--panel-card-padding, 2rem) * 2));
-  margin: -0.75rem calc(var(--panel-card-padding, 2rem) * -1);
-  padding: 0.75rem var(--panel-card-padding, 2rem);
-
-  > :first-child {
-    flex: 1;
-    min-width: 0;
-  }
-}
-
-.action {
-  color: $action-text-color;
-  font-size: calc(1rem - 2px);
-}
@@ -1,21 +0,0 @@
-import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
-import * as Panel from '../../panel-utils/PanelUtils';
-
-import style from './ExternalLinkRow.module.scss';
-
-interface ExternalLinkRowProps {
-  href: string;
-  title: string;
-  description: string;
-}
-
-export default function ExternalLinkRow({ href, title, description }: ExternalLinkRowProps) {
-  return (
-    <Panel.ListItem interactive>
-      <ExternalLink href={href} className={style.link}>
-        <Panel.Field title={title} description={description} />
-        <span className={style.action}>Open</span>
-      </ExternalLink>
-    </Panel.ListItem>
-  );
-}
@@ -1,13 +1,6 @@
 .outerColumn {
-  display: flex;
-  flex-direction: column;
  gap: 2rem;
-  font-size: calc(1rem - 1px);
-  color: $ui-white;
-
-  // the shared modal body owns scrolling for this regular form modal
-  min-height: 100%;
-  padding-block: 0.5rem;
+  margin-bottom: 2rem;

  h3 {
    font-size: 1rem;
@@ -19,12 +19,12 @@ import IconButton from '../../../../common/components/buttons/IconButton';
 import Info from '../../../../common/components/info/Info';
 import Input from '../../../../common/components/input/input/Input';
 import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
-import Modal from '../../../../common/components/modal/Modal';
 import RadioGroup from '../../../../common/components/radio-group/RadioGroup';
 import Select from '../../../../common/components/select/Select';
 import Tag from '../../../../common/components/tag/Tag';
 import useAutomationSettings from '../../../../common/hooks-query/useAutomationSettings';
 import useCustomFields from '../../../../common/hooks-query/useCustomFields';
+import { preventEscape } from '../../../../common/utils/keyEvent';
 import { startsWithHttp } from '../../../../common/utils/regex';
 import * as Panel from '../../panel-utils/PanelUtils';
 import { isAutomation, makeFieldList } from './automationUtils';
@@ -34,7 +34,6 @@ import TemplateInput from './template-input/TemplateInput';
 import style from './AutomationForm.module.scss';

 const integrationsDocsUrl = 'https://docs.getontime.no/api/automation/#using-variables-in-automation';
-const formId = 'automation-form';

 interface AutomationFormProps {
  automation: Automation | AutomationDTO;
@@ -186,320 +185,284 @@ export default function AutomationForm({ automation, onClose }: AutomationFormPr
  const canSubmit = !isSubmitting && isDirty && isValid;

  return (
-    <Modal
-      isOpen
-      onClose={onClose}
-      showBackdrop
-      showCloseButton
-      title={isEdit ? 'Edit automation' : 'Create automation'}
-      bodyElements={
-        <form id={formId} onSubmit={handleSubmit(onSubmit)} className={style.outerColumn}>
-          <div className={style.innerColumn}>
-            <h3>Automation options</h3>
-            <div className={style.titleSection}>
-              <label>
-                Title
-                <Input
-                  {...register('title', { required: { value: true, message: 'Required field' } })}
-                  fluid
-                  placeholder='Load preset'
-                />
-              </label>
-              <Panel.Error>{errors.title?.message}</Panel.Error>
-            </div>
-          </div>
+    <Panel.Indent
+      as='form'
+      name='automation-form'
+      onSubmit={handleSubmit(onSubmit)}
+      className={style.outerColumn}
+      onKeyDown={(event) => preventEscape(event, onClose)}
+    >
+      <Panel.SubHeader>{isEdit ? 'Edit automation' : 'Create automation'}</Panel.SubHeader>
+      <div className={style.innerSection}>
+        <h3>Automation options</h3>
+        <div className={style.titleSection}>
+          <label>
+            Title
+            <Input
+              {...register('title', { required: { value: true, message: 'Required field' } })}
+              fluid
+              placeholder='Load preset'
+            />
+          </label>
+          <Panel.Error>{errors.title?.message}</Panel.Error>
+        </div>
+      </div>

-          <div className={style.innerColumn}>
-            <h3>Filters (optional)</h3>
-            <div className={style.ruleSection}>
-              <label>
-                Trigger outputs if
-                <RadioGroup
-                  orientation='horizontal'
-                  value={watch('filterRule')}
-                  onValueChange={(value) => setValue('filterRule', value, { shouldDirty: true })}
-                  items={[
-                    { value: 'all', label: 'All filters pass' },
-                    { value: 'any', label: 'Any filter passes' },
-                  ]}
-                />
-              </label>
-              {fieldFilters.map((field, index) => {
-                const key = `filters.${index}.field.${field.id}`;
-                return (
-                  <div key={key} className={style.filterSection}>
-                    <label>
-                      Runtime data source
-                      <Select<string | null>
-                        // need to normalize '' to null for the Select to show the placeholder
-                        value={watch(`filters.${index}.field`) || null}
-                        onValueChange={(value) => {
-                          if (value === null) return;
-                          setValue(`filters.${index}.field`, value, { shouldDirty: true });
-                        }}
-                        options={fieldList.map(({ value, label }) => ({
-                          value,
-                          label,
-                          disabled: value === null,
-                        }))}
-                        aria-label='Event field'
-                      />
-                      <Panel.Error>{errors.filters?.[index]?.field?.message}</Panel.Error>
-                    </label>
-                    <label>
-                      Matching condition
-                      <Select
-                        value={watch(`filters.${index}.operator`)}
-                        onValueChange={(value: string | null) => {
-                          if (value === null) return;
-                          setValue(
-                            `filters.${index}.operator`,
-                            value as
-                              | 'equals'
-                              | 'not_equals'
-                              | 'greater_than'
-                              | 'less_than'
-                              | 'contains'
-                              | 'not_contains',
-                            { shouldDirty: true },
-                          );
-                        }}
-                        options={[
-                          { value: 'equals', label: 'equals' },
-                          { value: 'not_equals', label: 'not equals' },
-                          { value: 'contains', label: 'contains' },
-                        ]}
-                        aria-label='Operator'
-                      />
-                      <Panel.Error>{errors.filters?.[index]?.operator?.message}</Panel.Error>
-                    </label>
-                    <label>
-                      Value to match
-                      <Input {...register(`filters.${index}.value`)} fluid placeholder='<empty / no value>' />
-                    </label>
-                    <div>
-                      <span>&nbsp;</span>
-                      <div>
-                        <IconButton
-                          aria-label='Delete'
-                          variant='ghosted-destructive'
-                          onClick={() => removeFilter(index)}
-                        >
-                          <IoTrash />
-                        </IconButton>
-                      </div>
-                    </div>
+      <div className={style.innerSection}>
+        <h3>Filters (optional)</h3>
+        <div className={style.ruleSection}>
+          <label>
+            Trigger outputs if
+            <RadioGroup
+              orientation='horizontal'
+              value={watch('filterRule')}
+              onValueChange={(value) => setValue('filterRule', value, { shouldDirty: true })}
+              items={[
+                { value: 'all', label: 'All filters pass' },
+                { value: 'any', label: 'Any filter passes' },
+              ]}
+            />
+          </label>
+          {fieldFilters.map((field, index) => {
+            const key = `filters.${index}.field.${field.id}`;
+            return (
+              <div key={key} className={style.filterSection}>
+                <label>
+                  Runtime data source
+                  <Select<string | null>
+                    // need to normalize '' to null for the Select to show the placeholder
+                    value={watch(`filters.${index}.field`) || null}
+                    onValueChange={(value) => {
+                      if (value === null) return;
+                      setValue(`filters.${index}.field`, value, { shouldDirty: true });
+                    }}
+                    options={fieldList.map(({ value, label }) => ({
+                      value,
+                      label,
+                      disabled: value === null,
+                    }))}
+                    aria-label='Event field'
+                  />
+                  <Panel.Error>{errors.filters?.[index]?.field?.message}</Panel.Error>
+                </label>
+                <label>
+                  Matching condition
+                  <Select
+                    value={watch(`filters.${index}.operator`)}
+                    onValueChange={(value: string | null) => {
+                      if (value === null) return;
+                      setValue(
+                        `filters.${index}.operator`,
+                        value as 'equals' | 'not_equals' | 'greater_than' | 'less_than' | 'contains' | 'not_contains',
+                        { shouldDirty: true },
+                      );
+                    }}
+                    options={[
+                      { value: 'equals', label: 'equals' },
+                      { value: 'not_equals', label: 'not equals' },
+                      { value: 'contains', label: 'contains' },
+                    ]}
+                    aria-label='Operator'
+                  />
+                  <Panel.Error>{errors.filters?.[index]?.operator?.message}</Panel.Error>
+                </label>
+                <label>
+                  Value to match
+                  <Input {...register(`filters.${index}.value`)} fluid placeholder='<empty / no value>' />
+                </label>
+                <div>
+                  <span>&nbsp;</span>
+                  <div>
+                    <IconButton aria-label='Delete' variant='ghosted-destructive' onClick={() => removeFilter(index)}>
+                      <IoTrash />
+                    </IconButton>
                  </div>
-                );
-              })}
-              <div>
-                <Button onClick={handleAddNewFilter}>
-                  Add filter <IoAdd />
-                </Button>
+                </div>
              </div>
-            </div>
+            );
+          })}
+          <div>
+            <Button onClick={handleAddNewFilter}>
+              Add filter <IoAdd />
+            </Button>
          </div>
+        </div>
+      </div>

-          <div className={style.innerColumn}>
-            <h3>Outputs</h3>
-            <Info>
-              Automation outputs can be used to send data from Ontime to external software <br />
-              or to change properties of Ontime itself. <br /> <br />
-              Use Ontime runtime data in these fields with template strings. Type {'{{'} to see autocomplete, or{' '}
-              <ExternalLink href={integrationsDocsUrl}>read the docs</ExternalLink>
-            </Info>
+      <div className={style.innerColumn}>
+        <h3>Outputs</h3>
+        <Info>
+          Automation outputs can be used to send data from Ontime to external software <br />
+          or to change properties of Ontime itself.
+          <ExternalLink href={integrationsDocsUrl}>See the documentation for templates</ExternalLink>
+        </Info>

-            {fieldOutputs.map((output, index) => {
-              if (isOSCOutput(output)) {
-                const rowErrors = errors.outputs?.[index] as
-                  | {
-                      targetIP?: { message?: string };
-                      targetPort?: { message?: string };
-                      address?: { message?: string };
-                      args?: { message?: string };
-                    }
-                  | undefined;
+        {fieldOutputs.map((output, index) => {
+          if (isOSCOutput(output)) {
+            const rowErrors = errors.outputs?.[index] as
+              | {
+                  targetIP?: { message?: string };
+                  targetPort?: { message?: string };
+                  address?: { message?: string };
+                  args?: { message?: string };
+                }
+              | undefined;

-                return (
-                  <div key={output.id} className={style.outputCard}>
-                    <Tag>OSC</Tag>
-                    <div className={style.oscSection}>
-                      <label>
-                        Target IP
-                        <Input
-                          {...register(`outputs.${index}.targetIP`, {
-                            required: { value: true, message: 'Required field' },
-                          })}
-                          fluid
-                          placeholder='127.0.0.1'
-                        />
-                        <Panel.Error>{rowErrors?.targetIP?.message}</Panel.Error>
-                      </label>
-                      <label>
-                        Target Port
-                        <Input
-                          {...register(`outputs.${index}.targetPort`, {
-                            required: { value: true, message: 'Required field' },
-                            setValueAs: (value) => (value === '' ? 0 : Number(value)),
-                            max: { value: 65535, message: 'Port must be within range 1024 - 65535' },
-                            min: { value: 1024, message: 'Port must be within range 1024 - 65535' },
-                          })}
-                          fluid
-                          type='number'
-                          maxLength={5}
-                          placeholder='8000'
-                        />
-                        <Panel.Error>{rowErrors?.targetPort?.message}</Panel.Error>
-                      </label>
-                      <label>
-                        Address
-                        <TemplateInput
-                          {...register(`outputs.${index}.address`)}
-                          value={output.address}
-                          fluid
-                          placeholder='/cue/start'
-                        />
-                        <Panel.Error>{rowErrors?.address?.message}</Panel.Error>
-                      </label>
-                      <label>
-                        Arguments
-                        <TemplateInput
-                          {...register(`outputs.${index}.args`)}
-                          value={output.args}
-                          fluid
-                          placeholder='1'
-                        />
-                        <Panel.Error>{rowErrors?.args?.message}</Panel.Error>
-                      </label>
-                      <div>
-                        <span>&nbsp;</span>
-                        <Panel.InlineElements relation='inner'>
-                          <Button variant='ghosted-white' onClick={() => handleTestOSCOutput(index)}>
-                            Test
-                          </Button>
-                          <IconButton
-                            aria-label='Delete'
-                            variant='ghosted-destructive'
-                            onClick={() => removeOutput(index)}
-                          >
-                            <IoTrash />
-                          </IconButton>
-                        </Panel.InlineElements>
-                      </div>
-                    </div>
+            return (
+              <div key={output.id} className={style.outputCard}>
+                <Tag>OSC</Tag>
+                <div className={style.oscSection}>
+                  <label>
+                    Target IP
+                    <Input
+                      {...register(`outputs.${index}.targetIP`, {
+                        required: { value: true, message: 'Required field' },
+                      })}
+                      fluid
+                      placeholder='127.0.0.1'
+                    />
+                    <Panel.Error>{rowErrors?.targetIP?.message}</Panel.Error>
+                  </label>
+                  <label>
+                    Target Port
+                    <Input
+                      {...register(`outputs.${index}.targetPort`, {
+                        required: { value: true, message: 'Required field' },
+                        setValueAs: (value) => (value === '' ? 0 : Number(value)),
+                        max: { value: 65535, message: 'Port must be within range 1024 - 65535' },
+                        min: { value: 1024, message: 'Port must be within range 1024 - 65535' },
+                      })}
+                      fluid
+                      type='number'
+                      maxLength={5}
+                      placeholder='8000'
+                    />
+                    <Panel.Error>{rowErrors?.targetPort?.message}</Panel.Error>
+                  </label>
+                  <label>
+                    Address
+                    <Input {...register(`outputs.${index}.address`)} fluid placeholder='/cue/start' />
+                    <Panel.Error>{rowErrors?.address?.message}</Panel.Error>
+                  </label>
+                  <label>
+                    Arguments
+                    <TemplateInput {...register(`outputs.${index}.args`)} value={output.args} placeholder='1' />
+                    <Panel.Error>{rowErrors?.args?.message}</Panel.Error>
+                  </label>
+                  <div>
+                    <span>&nbsp;</span>
+                    <Panel.InlineElements relation='inner'>
+                      <Button variant='ghosted-white' onClick={() => handleTestOSCOutput(index)}>
+                        Test
+                      </Button>
+                      <IconButton aria-label='Delete' variant='ghosted-destructive' onClick={() => removeOutput(index)}>
+                        <IoTrash />
+                      </IconButton>
+                    </Panel.InlineElements>
                  </div>
-                );
-              }
-              if (isHTTPOutput(output)) {
-                const rowErrors = errors.outputs?.[index] as
-                  | {
-                      url?: { message?: string };
-                    }
-                  | undefined;
-                return (
-                  <div key={output.id} className={style.outputCard}>
-                    <Tag>HTTP</Tag>
-                    <div className={style.httpSection}>
-                      <label>
-                        Target URL
-                        <TemplateInput
-                          {...register(`outputs.${index}.url`, {
-                            required: { value: true, message: 'Required field' },
-                            pattern: {
-                              value: startsWithHttp,
-                              message: 'HTTP messages should target http:// or https://',
-                            },
-                          })}
-                          value={output.url}
-                          fluid
-                          placeholder='http://127.0.0.1/start/1'
-                        />
-                        <Panel.Error>{rowErrors?.url?.message}</Panel.Error>
-                      </label>
-                      <div>
-                        <span>&nbsp;</span>
-                        <Panel.InlineElements relation='inner'>
-                          <Button variant='ghosted-white' onClick={() => handleTestHTTPOutput(index)}>
-                            Test
-                          </Button>
-                          <IconButton
-                            aria-label='Delete'
-                            variant='ghosted-destructive'
-                            onClick={() => removeOutput(index)}
-                          >
-                            <IoTrash />
-                          </IconButton>
-                        </Panel.InlineElements>
-                      </div>
-                    </div>
+                </div>
+              </div>
+            );
+          }
+          if (isHTTPOutput(output)) {
+            const rowErrors = errors.outputs?.[index] as
+              | {
+                  url?: { message?: string };
+                }
+              | undefined;
+            return (
+              <div key={output.id} className={style.outputCard}>
+                <Tag>HTTP</Tag>
+                <div className={style.httpSection}>
+                  <label>
+                    Target URL
+                    <Input
+                      {...register(`outputs.${index}.url`, {
+                        required: { value: true, message: 'Required field' },
+                        pattern: {
+                          value: startsWithHttp,
+                          message: 'HTTP messages should target http:// or https://',
+                        },
+                      })}
+                      fluid
+                      placeholder='http://127.0.0.1/start/1'
+                    />
+                    <Panel.Error>{rowErrors?.url?.message}</Panel.Error>
+                  </label>
+                  <div>
+                    <span>&nbsp;</span>
+                    <Panel.InlineElements relation='inner'>
+                      <Button variant='ghosted-white' onClick={() => handleTestHTTPOutput(index)}>
+                        Test
+                      </Button>
+                      <IconButton aria-label='Delete' variant='ghosted-destructive' onClick={() => removeOutput(index)}>
+                        <IoTrash />
+                      </IconButton>
+                    </Panel.InlineElements>
                  </div>
-                );
-              }
+                </div>
+              </div>
+            );
+          }

-              if (isOntimeAction(output)) {
-                const rowErrors = errors.outputs?.[index] as
-                  | {
-                      action?: { message?: string };
-                      time?: { message?: string };
-                      text?: { message?: string };
-                      visible?: { message?: string };
-                      secondarySource?: { message?: string };
-                    }
-                  | undefined;
-                return (
-                  <div key={output.id} className={style.outputCard}>
-                    <Tag>Ontime action</Tag>
-                    <OntimeActionForm
-                      value={output.action}
-                      index={index}
-                      register={register}
-                      rowErrors={rowErrors}
-                      setValue={setValue}
-                      watch={watch}
-                    >
-                      <span>&nbsp;</span>
-                      <Panel.InlineElements relation='inner'>
-                        <Button variant='ghosted-white' onClick={() => handleTestOntimeAction(index)}>
-                          Test
-                        </Button>
-                        <IconButton
-                          aria-label='Delete'
-                          variant='ghosted-destructive'
-                          onClick={() => removeOutput(index)}
-                        >
-                          <IoTrash />
-                        </IconButton>
-                      </Panel.InlineElements>
-                    </OntimeActionForm>
-                  </div>
-                );
-              }
+          if (isOntimeAction(output)) {
+            const rowErrors = errors.outputs?.[index] as
+              | {
+                  action?: { message?: string };
+                  time?: { message?: string };
+                  text?: { message?: string };
+                  visible?: { message?: string };
+                  secondarySource?: { message?: string };
+                }
+              | undefined;
+            return (
+              <div key={output.id} className={style.outputCard}>
+                <Tag>Ontime action</Tag>
+                <OntimeActionForm
+                  value={output.action}
+                  index={index}
+                  register={register}
+                  rowErrors={rowErrors}
+                  setValue={setValue}
+                  watch={watch}
+                >
+                  <span>&nbsp;</span>
+                  <Panel.InlineElements relation='inner'>
+                    <Button variant='ghosted-white' onClick={() => handleTestOntimeAction(index)}>
+                      Test
+                    </Button>
+                    <IconButton aria-label='Delete' variant='ghosted-destructive' onClick={() => removeOutput(index)}>
+                      <IoTrash />
+                    </IconButton>
+                  </Panel.InlineElements>
+                </OntimeActionForm>
+              </div>
+            );
+          }

-              return null;
-            })}
-            <Panel.InlineElements relation='inner'>
-              <Button onClick={handleAddNewOSCOutput}>
-                OSC <IoAdd />
-              </Button>
-              <Button onClick={handleAddNewHTTPOutput}>
-                HTTP <IoAdd />
-              </Button>
-              <Button onClick={handleAddnewOntimeAction}>
-                Ontime action <IoAdd />
-              </Button>
-            </Panel.InlineElements>
-          </div>
-        </form>
-      }
-      footerElements={
-        <>
-          {errors?.root && <Panel.Error>{errors.root.message}</Panel.Error>}
-          <Button onClick={onClose}>Cancel</Button>
-          <Button variant='primary' type='submit' form={formId} disabled={!canSubmit} loading={isSubmitting}>
-            Save
+          // there should be no other output types
+          return null;
+        })}
+        <Panel.InlineElements relation='inner'>
+          <Button onClick={handleAddNewOSCOutput}>
+            OSC <IoAdd />
          </Button>
-        </>
-      }
-    />
+          <Button onClick={handleAddNewHTTPOutput}>
+            HTTP <IoAdd />
+          </Button>
+          <Button onClick={handleAddnewOntimeAction}>
+            Ontime action <IoAdd />
+          </Button>
+        </Panel.InlineElements>
+      </div>
+
+      <Panel.InlineElements align='end'>
+        {errors?.root && <Panel.Error>{errors.root.message}</Panel.Error>}
+        <Button onClick={onClose}>Cancel</Button>
+        <Button variant='primary' type='submit' disabled={!canSubmit} loading={isSubmitting}>
+          Save
+        </Button>
+      </Panel.InlineElements>
+    </Panel.Indent>
  );
 }
@@ -19,27 +19,24 @@ export default function AutomationPanel({ location }: PanelBaseProps) {
  return (
    <>
      <Panel.Header>Automation</Panel.Header>
-      <div ref={settingsRef}>
-        <AutomationSettingsForm
-          enabledAutomations={data.enabledAutomations}
-          enabledOscIn={data.enabledOscIn}
-          oscPortIn={data.oscPortIn}
-          automationState={automationState}
-          oscInputState={oscInputState}
-          isLoading={isLoading}
-        />
-      </div>
-      <div ref={automationsRef}>
-        <AutomationsList automations={data.automations} enabledAutomations={automationState} isLoading={isLoading} />
-      </div>
-      <div ref={triggersRef}>
-        <TriggersList
-          triggers={data.triggers}
-          automations={data.automations}
-          enabledAutomations={automationState}
-          isLoading={isLoading}
-        />
-      </div>
+      <Panel.Section>
+        <Panel.Loader isLoading={isLoading} />
+        <div ref={settingsRef}>
+          <AutomationSettingsForm
+            enabledAutomations={data.enabledAutomations}
+            enabledOscIn={data.enabledOscIn}
+            oscPortIn={data.oscPortIn}
+            automationState={automationState}
+            oscInputState={oscInputState}
+          />
+        </div>
+        <div ref={automationsRef}>
+          <AutomationsList automations={data.automations} enabledAutomations={automationState} />
+        </div>
+        <div ref={triggersRef}>
+          <TriggersList triggers={data.triggers} automations={data.automations} enabledAutomations={automationState} />
+        </div>
+      </Panel.Section>
    </>
  );
 }
@@ -21,7 +21,6 @@ interface AutomationSettingsProps {
  oscPortIn: number;
  automationState?: boolean;
  oscInputState?: boolean;
-  isLoading?: boolean;
 }

 export default function AutomationSettingsForm({
@@ -30,7 +29,6 @@ export default function AutomationSettingsForm({
  oscPortIn,
  automationState,
  oscInputState,
-  isLoading,
 }: AutomationSettingsProps) {
  const {
    handleSubmit,
@@ -67,129 +65,127 @@ export default function AutomationSettingsForm({
  const oscInputEnabled = watch('enabledOscIn');

  return (
-    <Panel.Section>
-      <Panel.Card>
-        <Panel.Loader isLoading={Boolean(isLoading)} />
-        <Panel.SubHeader>
-          Automation settings
-          <Panel.InlineElements>
-            <Button variant='ghosted' onClick={onReset} disabled={!canSubmit}>
-              Revert to saved
-            </Button>
-            <Button
-              variant='primary'
-              type='submit'
-              form='automation-settings-form'
-              disabled={!canSubmit}
-              loading={isSubmitting}
-            >
-              Save
-            </Button>
-          </Panel.InlineElements>
-        </Panel.SubHeader>
-        {errors?.root && <Panel.Error>{errors.root.message}</Panel.Error>}
+    <Panel.Card>
+      <Panel.SubHeader>
+        Automation settings
+        <Panel.InlineElements>
+          <Button variant='ghosted' onClick={onReset} disabled={!canSubmit}>
+            Revert to saved
+          </Button>
+          <Button
+            variant='primary'
+            type='submit'
+            form='automation-settings-form'
+            disabled={!canSubmit}
+            loading={isSubmitting}
+          >
+            Save
+          </Button>
+        </Panel.InlineElements>
+      </Panel.SubHeader>
+      {errors?.root && <Panel.Error>{errors.root.message}</Panel.Error>}

-        <Panel.Divider />
+      <Panel.Divider />

-        <Panel.Section>
-          <Info>
-            <span>Control Ontime and share its data with external systems in your workflow.</span>
-            <span>- Automations allow Ontime to send its data on lifecycle triggers.</span>
-            <span>- OSC Input tells Ontime to listen to messages on the specific port.</span>
-            <ExternalLink href={oscApiDocsUrl}>See the docs</ExternalLink>
-          </Info>
-        </Panel.Section>
+      <Panel.Section>
+        <Info>
+          <p>Control Ontime and share its data with external systems in your workflow.</p>
+          <p>- Automations allow Ontime to send its data on lifecycle triggers.</p>
+          <p>- OSC Input tells Ontime to listen to messages on the specific port.</p>
+          <br />
+          <ExternalLink href={oscApiDocsUrl}>See the docs</ExternalLink>
+        </Info>
+      </Panel.Section>

-        <Panel.Section
-          as='form'
-          id='automation-settings-form'
-          onSubmit={handleSubmit(onSubmit)}
-          onKeyDown={(event) => preventEscape(event, onReset)}
-        >
-          <Panel.Title>Automation</Panel.Title>
-          <Panel.ListGroup>
-            <Panel.ListItem>
-              <Panel.Field
-                title={
-                  <>
-                    <span>Enable automations</span>
-                    {automationState === false && <Tag variant='warning'>OFF</Tag>}
-                  </>
-                }
-                description={
-                  automationState === false
-                    ? 'Automations are OFF. Triggers stay configured, but Ontime will not send messages.'
-                    : 'Allow Ontime to send messages on lifecycle triggers'
-                }
-                descriptionTone={automationState === false ? 'warning' : 'default'}
-                error={errors.enabledAutomations?.message}
-              />
-              <Switch
-                size='large'
-                checked={automationsEnabled}
-                onCheckedChange={(value: boolean) =>
-                  setValue('enabledAutomations', value, { shouldDirty: true, shouldValidate: true })
-                }
-              />
-            </Panel.ListItem>
-          </Panel.ListGroup>
-          <Panel.Title>OSC Input</Panel.Title>
+      <Panel.Section
+        as='form'
+        id='automation-settings-form'
+        onSubmit={handleSubmit(onSubmit)}
+        onKeyDown={(event) => preventEscape(event, onReset)}
+      >
+        <Panel.Loader isLoading={false} />

-          <Panel.ListGroup>
-            {isOntimeCloud && (
-              <Info>For security reasons OSC integrations are not available in the cloud service.</Info>
-            )}
-            <Panel.ListItem>
-              <Panel.Field
-                title={
-                  <>
-                    <span>OSC input</span>
-                    {oscInputState === false && <Tag variant='warning'>OFF</Tag>}
-                  </>
-                }
-                description={
-                  oscInputState === false
-                    ? 'OSC input is OFF. Ontime will not listen for incoming OSC control messages.'
-                    : 'Allow control of Ontime through OSC'
-                }
-                descriptionTone={oscInputState === false ? 'warning' : 'default'}
-                error={errors.enabledOscIn?.message}
-              />
-              <Switch
-                size='large'
-                checked={oscInputEnabled}
-                onCheckedChange={(value: boolean) =>
-                  setValue('enabledOscIn', value, { shouldDirty: true, shouldValidate: true })
-                }
-              />
-            </Panel.ListItem>
-            <Panel.ListItem>
-              <Panel.Field
-                title='Listen on port'
-                description='Port for incoming OSC. Default: 8888'
-                error={errors.oscPortIn?.message}
-              />
-              <Input
-                id='oscPortIn'
-                placeholder='8888'
-                maxLength={5}
-                style={{ textAlign: 'right', width: '5rem' }}
-                type='number'
-                fluid
-                {...register('oscPortIn', {
-                  required: { value: true, message: 'Required field' },
-                  max: { value: 65535, message: 'Port must be within range 1024 - 65535' },
-                  min: { value: 1024, message: 'Port must be within range 1024 - 65535' },
-                  pattern: {
-                    value: isOnlyNumbers,
-                    message: 'Value should be numeric',
-                  },
-                })}
-              />
-            </Panel.ListItem>
-          </Panel.ListGroup>
-        </Panel.Section>
-      </Panel.Card>
-    </Panel.Section>
+        <Panel.Title>Automation</Panel.Title>
+        <Panel.ListGroup>
+          <Panel.ListItem>
+            <Panel.Field
+              title={
+                <>
+                  <span>Enable automations</span>
+                  {automationState === false && <Tag variant='warning'>OFF</Tag>}
+                </>
+              }
+              description={
+                automationState === false
+                  ? 'Automations are OFF. Triggers stay configured, but Ontime will not send messages.'
+                  : 'Allow Ontime to send messages on lifecycle triggers'
+              }
+              descriptionTone={automationState === false ? 'warning' : 'default'}
+              error={errors.enabledAutomations?.message}
+            />
+            <Switch
+              size='large'
+              checked={automationsEnabled}
+              onCheckedChange={(value: boolean) =>
+                setValue('enabledAutomations', value, { shouldDirty: true, shouldValidate: true })
+              }
+            />
+          </Panel.ListItem>
+        </Panel.ListGroup>
+        <Panel.Title>OSC Input</Panel.Title>
+
+        <Panel.ListGroup>
+          {isOntimeCloud && <Info>For security reasons OSC integrations are not available in the cloud service.</Info>}
+          <Panel.ListItem>
+            <Panel.Field
+              title={
+                <>
+                  <span>OSC input</span>
+                  {oscInputState === false && <Tag variant='warning'>OFF</Tag>}
+                </>
+              }
+              description={
+                oscInputState === false
+                  ? 'OSC input is OFF. Ontime will not listen for incoming OSC control messages.'
+                  : 'Allow control of Ontime through OSC'
+              }
+              descriptionTone={oscInputState === false ? 'warning' : 'default'}
+              error={errors.enabledOscIn?.message}
+            />
+            <Switch
+              size='large'
+              checked={oscInputEnabled}
+              onCheckedChange={(value: boolean) =>
+                setValue('enabledOscIn', value, { shouldDirty: true, shouldValidate: true })
+              }
+            />
+          </Panel.ListItem>
+          <Panel.ListItem>
+            <Panel.Field
+              title='Listen on port'
+              description='Port for incoming OSC. Default: 8888'
+              error={errors.oscPortIn?.message}
+            />
+            <Input
+              id='oscPortIn'
+              placeholder='8888'
+              maxLength={5}
+              style={{ textAlign: 'right', width: '5rem' }}
+              type='number'
+              fluid
+              {...register('oscPortIn', {
+                required: { value: true, message: 'Required field' },
+                max: { value: 65535, message: 'Port must be within range 1024 - 65535' },
+                min: { value: 1024, message: 'Port must be within range 1024 - 65535' },
+                pattern: {
+                  value: isOnlyNumbers,
+                  message: 'Value should be numeric',
+                },
+              })}
+            />
+          </Panel.ListItem>
+        </Panel.ListGroup>
+      </Panel.Section>
+    </Panel.Card>
  );
 }
@@ -22,10 +22,10 @@ const automationPlaceholder: AutomationDTO = {
 interface AutomationsListProps {
  automations: NormalisedAutomation;
  enabledAutomations?: boolean;
-  isLoading: boolean;
 }

-export default function AutomationsList({ automations, enabledAutomations, isLoading }: AutomationsListProps) {
+export default function AutomationsList(props: AutomationsListProps) {
+  const { automations, enabledAutomations } = props;
  const { refetch } = useAutomationSettings();
  const [automationFormData, setAutomationFormData] = useState<AutomationDTO | null>(null);
  const [deleteError, setDeleteError] = useState<string | null>(null);
@@ -44,94 +44,89 @@ export default function AutomationsList({ automations, enabledAutomations, isLoa
  const arrayAutomations = Object.keys(automations);

  return (
-    <Panel.Section>
-      <Panel.Card>
-        {automationFormData !== null && (
-          <AutomationForm automation={automationFormData} onClose={() => setAutomationFormData(null)} />
-        )}
-        <Panel.SubHeader>
-          Manage automations
-          <Button onClick={() => setAutomationFormData(automationPlaceholder)}>
-            New <IoAdd />
-          </Button>
-        </Panel.SubHeader>
+    <Panel.Card>
+      <Panel.SubHeader>
+        Manage automations
+        <Button
+          type='submit'
+          disabled={Boolean(automationFormData)}
+          onClick={() => setAutomationFormData(automationPlaceholder)}
+        >
+          New <IoAdd />
+        </Button>
+      </Panel.SubHeader>

-        <Panel.Divider />
+      <Panel.Divider />

-        <Panel.Section>
-          {enabledAutomations === false && (
-            <Info>
-              Automations are disabled. You can still manage automation definitions here, but they will not run until
-              enabled.
-            </Info>
+      {enabledAutomations === false && (
+        <Info>
+          Automations are disabled. You can still manage automation definitions here, but they will not run until
+          enabled.
+        </Info>
+      )}
+
+      {automationFormData !== null && (
+        <AutomationForm automation={automationFormData} onClose={() => setAutomationFormData(null)} />
+      )}
+
+      <Panel.Table>
+        <thead>
+          <tr>
+            <th style={{ width: '45%' }}>Title</th>
+            <th style={{ width: '15%' }}>Trigger rule</th>
+            <th style={{ width: '15%' }}>Filters</th>
+            <th style={{ width: '15%' }}>Outputs</th>
+            <th />
+          </tr>
+        </thead>
+        <tbody>
+          {arrayAutomations.length === 0 && (
+            <Panel.TableEmpty
+              handleClick={!automationFormData ? () => setAutomationFormData(automationPlaceholder) : undefined}
+            />
          )}
-
-          <Panel.Table>
-            <thead>
-              <tr>
-                <th style={{ width: '45%' }}>Title</th>
-                <th style={{ width: '15%' }}>Trigger rule</th>
-                <th style={{ width: '15%' }}>Filters</th>
-                <th style={{ width: '15%' }}>Outputs</th>
-                <th />
-              </tr>
-            </thead>
-            <tbody>
-              {!isLoading && arrayAutomations.length === 0 && (
-                <Panel.TableEmpty
-                  title='No automations yet'
-                  description='An automation sends OSC or HTTP messages, or runs an Ontime action, whenever a trigger fires.'
-                  action={
-                    <Button variant='primary' onClick={() => setAutomationFormData(automationPlaceholder)}>
-                      Create automation <IoAdd />
-                    </Button>
-                  }
-                />
-              )}
-              {arrayAutomations.map((automationId) => {
-                if (!Object.hasOwn(automations, automationId)) {
-                  return null;
-                }
-                return (
-                  <Fragment key={automationId}>
-                    <tr>
-                      <td>{automations[automationId].title}</td>
-                      <td>
-                        <Tag>{automations[automationId].filterRule}</Tag>
-                      </td>
-                      <td>{automations[automationId].filters.length}</td>
-                      <td>{automations[automationId].outputs.length}</td>
-                      <Panel.InlineElements align='end' relation='inner' as='td'>
-                        <IconButton
-                          variant='ghosted-white'
-                          aria-label='Edit entry'
-                          onClick={() => setAutomationFormData(automations[automationId])}
-                        >
-                          <IoPencil />
-                        </IconButton>
-                        <IconButton
-                          variant='ghosted-destructive'
-                          aria-label='Delete entry'
-                          onClick={() => handleDelete(automationId)}
-                        >
-                          <IoTrash />
-                        </IconButton>
-                      </Panel.InlineElements>
-                    </tr>
-                  </Fragment>
-                );
-              })}
-              {deleteError && (
+          {arrayAutomations.map((automationId) => {
+            if (!Object.hasOwn(automations, automationId)) {
+              return null;
+            }
+            return (
+              <Fragment key={automationId}>
                <tr>
-                  <td colSpan={5}>
-                    <Panel.Error>{deleteError}</Panel.Error>
+                  <td>{automations[automationId].title}</td>
+                  <td>
+                    <Tag>{automations[automationId].filterRule}</Tag>
                  </td>
+                  <td>{automations[automationId].filters.length}</td>
+                  <td>{automations[automationId].outputs.length}</td>
+                  <Panel.InlineElements align='end' relation='inner' as='td'>
+                    <IconButton
+                      variant='ghosted-white'
+                      aria-label='Edit entry'
+                      onClick={() => setAutomationFormData(automations[automationId])}
+                    >
+                      <IoPencil />
+                    </IconButton>
+                    <IconButton
+                      variant='ghosted-destructive'
+                      aria-label='Delete entry'
+                      onClick={() => handleDelete(automationId)}
+                    >
+                      <IoTrash />
+                    </IconButton>
+                  </Panel.InlineElements>
                </tr>
-              )}
-            </tbody>
-          </Panel.Table>
-        </Panel.Section>
-      </Panel.Card>
-    </Panel.Section>
+              </Fragment>
+            );
+          })}
+          {deleteError && (
+            <tr>
+              <td colSpan={5}>
+                <Panel.Error>{deleteError}</Panel.Error>
+              </td>
+            </tr>
+          )}
+        </tbody>
+      </Panel.Table>
+    </Panel.Card>
  );
 }
@@ -5,7 +5,6 @@ import { UseFormRegister, UseFormSetValue, UseFormWatch } from 'react-hook-form'
 import Input from '../../../../common/components/input/input/Input';
 import Select from '../../../../common/components/select/Select';
 import * as Panel from '../../panel-utils/PanelUtils';
-import TemplateInput from './template-input/TemplateInput';

 import style from './AutomationForm.module.scss';

@@ -72,8 +71,8 @@ export default function OntimeActionForm({
            { value: 'playback-pause', label: 'Playback: pause' },
            { value: 'playback-roll', label: 'Playback: roll' },

-            { value: 'message-set', label: 'Primary Message' },
-            { value: 'message-secondary', label: 'Secondary Message' },
+            { value: 'message-set', label: 'Primary Message: set' },
+            { value: 'message-secondary', label: 'Secondary Message: source' },
          ]}
        />
        <Panel.Error>{rowErrors?.action?.message}</Panel.Error>
@@ -97,12 +96,7 @@ export default function OntimeActionForm({
        <>
          <label>
            Text (leave empty for no change)
-            <TemplateInput
-              {...register(`outputs.${index}.text`)}
-              value={watch(`outputs.${index}.text`) ?? ''}
-              fluid
-              placeholder='eg: Timer is finished'
-            />
+            <Input {...register(`outputs.${index}.text`)} fluid placeholder='eg: Timer is finished' />
            <Panel.Error>{rowErrors?.text?.message}</Panel.Error>
          </label>
          <label>
@@ -126,48 +120,31 @@ export default function OntimeActionForm({
      )}

      {selectedAction === 'message-secondary' && (
-        <>
-          <label>
-            Text (leave empty for no change)
-            <TemplateInput
-              {...register(`outputs.${index}.text`)}
-              value={watch(`outputs.${index}.text`) ?? ''}
-              fluid
-              placeholder='eg: Next up: keynote'
-            />
-            <Panel.Error>{rowErrors?.text?.message}</Panel.Error>
-          </label>
-          <label>
-            Timer secondary source
-            <Select<SecondarySource | 'no-change' | 'null' | null>
-              onValueChange={(value) => {
-                // null -> no selection
-                if (value === null) return;
-                // no-change -> leave the current secondary source untouched
-                if (value === 'no-change') {
-                  setValue(`outputs.${index}.secondarySource`, undefined, { shouldDirty: true });
-                  return;
-                }
-                // 'null' -> clear the secondary source
-                if (value === 'null') {
-                  setValue(`outputs.${index}.secondarySource`, null, { shouldDirty: true });
-                  return;
-                }
-                setValue(`outputs.${index}.secondarySource`, value, { shouldDirty: true });
-              }}
-              value={watch(`outputs.${index}.secondarySource`) ?? 'no-change'}
-              options={[
-                { value: 'no-change', label: 'No change' },
-                { value: 'aux1', label: 'Auxiliary timer 1' },
-                { value: 'aux2', label: 'Auxiliary timer 2' },
-                { value: 'aux3', label: 'Auxiliary timer 3' },
-                { value: 'secondary', label: 'Secondary' },
-                { value: 'null', label: 'None' }, // allow the user to clear the secondary source
-              ]}
-            />
-            <Panel.Error>{rowErrors?.secondarySource?.message}</Panel.Error>
-          </label>
-        </>
+        <label>
+          Timer secondary source
+          <Select<SecondarySource | 'null' | null>
+            onValueChange={(value) => {
+              // null -> no selection
+              if (value === null) return;
+              // 'null' -> clear the secondary source
+              if (value === 'null') {
+                setValue(`outputs.${index}.secondarySource`, null, { shouldDirty: true });
+                return;
+              }
+              setValue(`outputs.${index}.secondarySource`, value, { shouldDirty: true });
+            }}
+            value={watch(`outputs.${index}.secondarySource`)}
+            options={[
+              { value: null, label: 'Select secondary source' },
+              { value: 'aux1', label: 'Auxiliary timer 1' },
+              { value: 'aux2', label: 'Auxiliary timer 2' },
+              { value: 'aux3', label: 'Auxiliary timer 3' },
+              { value: 'secondary', label: 'Secondary' },
+              { value: 'null', label: 'None' }, // allow the user to clear the secondary source
+            ]}
+          />
+          <Panel.Error>{rowErrors?.secondarySource?.message}</Panel.Error>
+        </label>
      )}

      <div className={style.test}>{children}</div>
@@ -1,4 +1,4 @@
-import { NormalisedAutomation, TimerLifeCycle, Trigger, TriggerDTO } from 'ontime-types';
+import { NormalisedAutomation, TimerLifeCycle, TriggerDTO } from 'ontime-types';
 import { useEffect } from 'react';
 import { useForm } from 'react-hook-form';

@@ -6,21 +6,30 @@ import { addTrigger, editTrigger } from '../../../../common/api/automation';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import Button from '../../../../common/components/buttons/Button';
 import Input from '../../../../common/components/input/input/Input';
-import Modal from '../../../../common/components/modal/Modal';
 import Select from '../../../../common/components/select/Select';
+import { preventEscape } from '../../../../common/utils/keyEvent';
 import * as Panel from '../../panel-utils/PanelUtils';
 import { cycles } from './automationUtils';

-const formId = 'trigger-form';
-
 interface TriggerFormProps {
  automations: NormalisedAutomation;
-  trigger: Trigger | null;
+  initialId?: string;
+  initialTitle?: string;
+  initialAutomationId?: string;
+  initialTrigger?: TimerLifeCycle;
  onCancel: () => void;
  postSubmit: () => void;
 }

-export default function TriggerForm({ automations, trigger, onCancel, postSubmit }: TriggerFormProps) {
+export default function TriggerForm({
+  automations,
+  initialId,
+  initialTitle,
+  initialAutomationId,
+  initialTrigger,
+  onCancel,
+  postSubmit,
+}: TriggerFormProps) {
  const {
    handleSubmit,
    register,
@@ -31,9 +40,9 @@ export default function TriggerForm({ automations, trigger, onCancel, postSubmit
    formState: { errors, isSubmitting, isValid, isDirty },
  } = useForm<TriggerDTO>({
    defaultValues: {
-      title: trigger?.title,
-      trigger: trigger?.trigger ?? (cycles[0].value as TimerLifeCycle | undefined),
-      automationId: trigger?.automationId ?? automations?.[Object.keys(automations)[0]]?.id,
+      title: initialTitle,
+      trigger: initialTrigger ?? (cycles[0].value as TimerLifeCycle | undefined),
+      automationId: initialAutomationId ?? automations?.[Object.keys(automations)[0]]?.id,
    },
    resetOptions: {
      keepDirtyValues: true,
@@ -46,9 +55,10 @@ export default function TriggerForm({ automations, trigger, onCancel, postSubmit
  }, [setFocus]);

  const onSubmit = async (values: TriggerDTO) => {
-    if (trigger) {
+    // if we were passed an ID we are editing a Trigger
+    if (initialId) {
      try {
-        await editTrigger(trigger.id, { id: trigger.id, ...values });
+        await editTrigger(initialId, { id: initialId, ...values });
        postSubmit();
      } catch (error) {
        setError('root', { message: `Failed to save changes to trigger ${maybeAxiosError(error)}` });
@@ -75,63 +85,56 @@ export default function TriggerForm({ automations, trigger, onCancel, postSubmit
  const canSubmit = isDirty && isValid;

  return (
-    <Modal
-      isOpen
-      onClose={onCancel}
-      showBackdrop
-      showCloseButton
-      size='compact'
-      title={trigger ? 'Edit trigger' : 'Create trigger'}
-      bodyElements={
-        <form id={formId} onSubmit={handleSubmit(onSubmit)}>
-          <label>
-            Title
-            <Input
-              {...register('title', { required: { value: true, message: 'Required field' } })}
-              fluid
-              defaultValue={trigger?.title}
-            />
-            <Panel.Error>{errors.title?.message}</Panel.Error>
-          </label>
-          <label>
-            Lifecycle trigger
-            <Select
-              value={watch('trigger')}
-              onValueChange={(value) => {
-                if (value === null) return;
-                setValue('trigger', value as TimerLifeCycle, { shouldDirty: true });
-              }}
-              options={cycles.map((cycle) => ({ value: cycle.value, label: cycle.label }))}
-              aria-label='Lifecycle trigger'
-            />
-            <Panel.Error>{errors.trigger?.message}</Panel.Error>
-          </label>
-          <label>
-            Automation title
-            <Select
-              value={watch('automationId')}
-              onValueChange={(value: string | null) => {
-                if (value === null) return;
-                setValue('automationId', value, { shouldDirty: true });
-              }}
-              options={automationSelect}
-              aria-label='Automation title'
-            />
-            <Panel.Error>{errors.automationId?.message}</Panel.Error>
-          </label>
-        </form>
-      }
-      footerElements={
-        <>
-          {errors.root && <Panel.Error>{errors.root.message}</Panel.Error>}
-          <Button disabled={isSubmitting} onClick={onCancel}>
-            Cancel
-          </Button>
-          <Button type='submit' form={formId} variant='primary' disabled={!canSubmit} loading={isSubmitting}>
-            Save
-          </Button>
-        </>
-      }
-    />
+    <Panel.Indent
+      as='form'
+      name='trigger-form'
+      onSubmit={handleSubmit(onSubmit)}
+      onKeyDown={(event) => preventEscape(event, onCancel)}
+    >
+      <Panel.SubHeader>{initialId ? 'Edit trigger' : 'Create trigger'}</Panel.SubHeader>
+      <label>
+        Title
+        <Input
+          {...register('title', { required: { value: true, message: 'Required field' } })}
+          fluid
+          defaultValue={initialTitle}
+        />
+        <Panel.Error>{errors.title?.message}</Panel.Error>
+      </label>
+      <label>
+        Lifecycle trigger
+        <Select
+          value={watch('trigger')}
+          onValueChange={(value) => {
+            if (value === null) return;
+            setValue('trigger', value as TimerLifeCycle, { shouldDirty: true });
+          }}
+          options={cycles.map((cycle) => ({ value: cycle.value, label: cycle.label }))}
+          aria-label='Lifecycle trigger'
+        />
+        <Panel.Error>{errors.trigger?.message}</Panel.Error>
+      </label>
+      <label>
+        Automation title
+        <Select
+          value={watch('automationId')}
+          onValueChange={(value: string | null) => {
+            if (value === null) return;
+            setValue('automationId', value, { shouldDirty: true });
+          }}
+          options={automationSelect}
+          aria-label='Automation title'
+        />
+        <Panel.Error>{errors.automationId?.message}</Panel.Error>
+      </label>
+      <Panel.InlineElements align='end'>
+        <Button disabled={isSubmitting} onClick={onCancel}>
+          Cancel
+        </Button>
+        <Button type='submit' variant='primary' disabled={!canSubmit} loading={isSubmitting}>
+          Save
+        </Button>
+      </Panel.InlineElements>
+    </Panel.Indent>
  );
 }
@@ -9,33 +9,23 @@ import Info from '../../../../common/components/info/Info';
 import useAutomationSettings from '../../../../common/hooks-query/useAutomationSettings';
 import * as Panel from '../../panel-utils/PanelUtils';
 import { checkDuplicates } from './automationUtils';
-import TriggerForm from './TriggerForm';
+import AutomationForm from './TriggerForm';
 import TriggersListItem from './TriggersListItem';

-type FormState = {
-  isOpen: boolean;
-  trigger?: Trigger;
-};
-
 interface TriggersListProps {
  triggers: Trigger[];
  automations: NormalisedAutomation;
  enabledAutomations?: boolean;
-  isLoading: boolean;
 }

-export default function TriggersList({ triggers, automations, enabledAutomations, isLoading }: TriggersListProps) {
-  const [formState, setFormState] = useState<FormState>({ isOpen: false, trigger: undefined });
+export default function TriggersList(props: TriggersListProps) {
+  const { triggers, automations, enabledAutomations } = props;
+  const [showForm, setShowForm] = useState(false);
  const { refetch } = useAutomationSettings();
  const [deleteError, setDeleteError] = useState<string | null>(null);

-  const openNewForm = () => setFormState({ isOpen: true });
-  const openEditForm = (trigger: Trigger) => setFormState({ isOpen: true, trigger });
-  const closeForm = () => setFormState({ isOpen: false, trigger: undefined });
-
  const handleDelete = async (id: string) => {
    try {
-      setDeleteError(null);
      await deleteTrigger(id);
    } catch (error) {
      setDeleteError(maybeAxiosError(error));
@@ -45,7 +35,7 @@ export default function TriggersList({ triggers, automations, enabledAutomations
  };

  const postSubmit = () => {
-    closeForm();
+    setShowForm(false);
    refetch();
  };

@@ -55,86 +45,70 @@ export default function TriggersList({ triggers, automations, enabledAutomations
  const canAdd = Object.keys(automations).length > 0;

  return (
-    <Panel.Section>
-      <Panel.Card>
-        {formState.isOpen && (
-          <TriggerForm
-            automations={automations}
-            trigger={formState.trigger ?? null}
-            onCancel={closeForm}
-            postSubmit={postSubmit}
-          />
+    <Panel.Card>
+      <Panel.SubHeader>
+        Manage triggers
+        <Button type='submit' form='trigger-form' disabled={!canAdd} loading={false} onClick={() => setShowForm(true)}>
+          New <IoAdd />
+        </Button>
+      </Panel.SubHeader>
+      <Panel.Divider />
+      <Panel.Section>
+        {enabledAutomations === false && (
+          <Info>
+            Automations are disabled. You can still manage triggers here, but they will not run until enabled.
+          </Info>
        )}
-        <Panel.SubHeader>
-          Manage triggers
-          <Button disabled={!canAdd} onClick={openNewForm}>
-            New <IoAdd />
-          </Button>
-        </Panel.SubHeader>
-        <Panel.Divider />
-        <Panel.Section>
-          {enabledAutomations === false && (
-            <Info>
-              Automations are disabled. You can still manage triggers here, but they will not run until enabled.
-            </Info>
-          )}
-          {duplicates && (
-            <Panel.Error>
-              You have created multiple links between the same trigger and automation which can cause performance
-              issues.
-            </Panel.Error>
-          )}
-          <Panel.Table>
-            <thead>
-              <tr>
-                <th style={{ width: '35%' }}>Title</th>
-                <th style={{ width: '25%' }}>Lifecycle trigger</th>
-                <th style={{ width: '25%' }}>Automation</th>
-                <th />
-              </tr>
-            </thead>
-            <tbody>
-              {!isLoading && triggers.length === 0 && (
-                <Panel.TableEmpty
-                  title='No triggers yet'
-                  description={
-                    canAdd
-                      ? 'Triggers run an automation at a given point of the timer lifecycle, like when an event starts or finishes.'
-                      : 'Create an automation first, then add a trigger to decide when it should run.'
-                  }
-                  action={
-                    canAdd && (
-                      <Button variant='primary' onClick={openNewForm}>
-                        Create trigger <IoAdd />
-                      </Button>
-                    )
-                  }
-                />
-              )}
-              {triggers.map((trigger, index) => {
-                return (
-                  <Fragment key={trigger.id}>
-                    <TriggersListItem
-                      automations={automations}
-                      trigger={trigger}
-                      duplicate={duplicates?.includes(index)}
-                      handleEdit={() => openEditForm(trigger)}
-                      handleDelete={() => handleDelete(trigger.id)}
-                    />
-                  </Fragment>
-                );
-              })}
-              {deleteError && (
-                <tr>
-                  <td colSpan={5}>
-                    <Panel.Error>{deleteError}</Panel.Error>
-                  </td>
-                </tr>
-              )}
-            </tbody>
-          </Panel.Table>
-        </Panel.Section>
-      </Panel.Card>
-    </Panel.Section>
+        {duplicates && (
+          <Panel.Error>
+            You have created multiple links between the same trigger and automation which can performance issues.
+          </Panel.Error>
+        )}
+        {showForm && (
+          <AutomationForm automations={automations} onCancel={() => setShowForm(false)} postSubmit={postSubmit} />
+        )}
+        <Panel.Table>
+          <thead>
+            <tr>
+              <th style={{ width: '35%' }}>Title</th>
+              <th style={{ width: '25%' }}>Lifecycle trigger</th>
+              <th style={{ width: '25%' }}>Automation</th>
+              <th />
+            </tr>
+          </thead>
+          <tbody>
+            {!showForm && triggers.length === 0 && (
+              <Panel.TableEmpty
+                label='Create an automation to attach triggers to'
+                handleClick={canAdd ? () => setShowForm(true) : undefined}
+              />
+            )}
+            {triggers.map((trigger, index) => {
+              return (
+                <Fragment key={trigger.id}>
+                  <TriggersListItem
+                    automations={automations}
+                    id={trigger.id}
+                    title={trigger.title}
+                    trigger={trigger.trigger}
+                    automationId={trigger.automationId}
+                    duplicate={duplicates?.includes(index)}
+                    handleDelete={() => handleDelete(trigger.id)}
+                    postSubmit={postSubmit}
+                  />
+                  {deleteError && (
+                    <tr>
+                      <td colSpan={5}>
+                        <Panel.Error>{deleteError}</Panel.Error>
+                      </td>
+                    </tr>
+                  )}
+                </Fragment>
+              );
+            })}
+          </tbody>
+        </Panel.Table>
+      </Panel.Section>
+    </Panel.Card>
  );
 }
@@ -1,21 +1,48 @@
-import { NormalisedAutomation, Trigger } from 'ontime-types';
+import { NormalisedAutomation, TimerLifeCycle } from 'ontime-types';
+import { useState } from 'react';
 import { IoPencil, IoTrash, IoWarningOutline } from 'react-icons/io5';

 import IconButton from '../../../../common/components/buttons/IconButton';
 import Tag from '../../../../common/components/tag/Tag';
 import * as Panel from '../../panel-utils/PanelUtils';
 import { cycles } from './automationUtils';
+import AutomationForm from './TriggerForm';

 interface TriggersListItemProps {
  automations: NormalisedAutomation;
-  trigger: Trigger;
+  id: string;
+  title: string;
+  trigger: TimerLifeCycle;
+  automationId: string;
  duplicate?: boolean;
-  handleEdit: () => void;
  handleDelete: () => void;
+  postSubmit: () => void;
 }

 export default function TriggersListItem(props: TriggersListItemProps) {
-  const { automations, trigger, duplicate, handleEdit, handleDelete } = props;
+  const { automations, id, title, trigger, automationId, duplicate, handleDelete, postSubmit } = props;
+  const [isEditing, setIsEditing] = useState(false);
+
+  if (isEditing) {
+    return (
+      <tr>
+        <td colSpan={99}>
+          <AutomationForm
+            automations={automations}
+            initialId={id}
+            initialTitle={title}
+            initialTrigger={trigger}
+            initialAutomationId={automationId}
+            onCancel={() => setIsEditing(false)}
+            postSubmit={() => {
+              setIsEditing(false);
+              postSubmit();
+            }}
+          />
+        </td>
+      </tr>
+    );
+  }

  return (
    <tr data-warn={duplicate}>
@@ -25,16 +52,16 @@ export default function TriggersListItem(props: TriggersListItemProps) {
            color='#FFBC56' // $orange-500
          />
        )}
-        {trigger.title}
+        {title}
      </Panel.InlineElements>
      <td>
-        <Tag>{cycles.find((cycle) => cycle.value === trigger.trigger)?.label}</Tag>
+        <Tag>{cycles.find((cycle) => cycle.value === trigger)?.label}</Tag>
      </td>
      <td>
-        <Tag>{automations?.[trigger.automationId]?.title}</Tag>
+        <Tag>{automations?.[automationId]?.title}</Tag>
      </td>
      <Panel.InlineElements align='end' relation='inner' as='td'>
-        <IconButton variant='ghosted-white' aria-label='Edit entry' onClick={handleEdit}>
+        <IconButton variant='ghosted-white' aria-label='Edit entry' onClick={() => setIsEditing(true)}>
          <IoPencil />
        </IconButton>
        <IconButton variant='ghosted-destructive' aria-label='Delete entry' onClick={handleDelete}>
@@ -1,67 +1,29 @@
-.inputShell {
+.wrapper {
  position: relative;
 }

-.fluid {
-  width: 100%;
-}
-
-.input {
-  padding-right: 2rem;
-}
-
-.expandButton {
-  position: absolute;
-  top: 50%;
-  right: 0.25rem;
-  transform: translateY(-50%);
-}
-
-.positioner {
-  outline: 0;
-}
-
-.popup {
-  box-sizing: border-box;
-  min-width: var(--anchor-width);
-  max-width: var(--available-width);
-  border: 1px solid $gray-1000;
-  border-radius: $component-border-radius-md;
+.suggestions {
  background: $gray-1250;
-  color: $label-gray;
-}
+  color: $ui-white;

-.list {
-  box-sizing: border-box;
-  max-height: min(20rem, var(--available-height));
-  overflow-y: auto;
-  overscroll-behavior: contain;
+  position: absolute;
+  top: 100%;
+  left: 0;
+  width: 100%;
+  margin: 0;
+  z-index: $zindex-floating;
  padding-block: 0.25rem;
-  outline: 0;
-}

-.item {
-  box-sizing: border-box;
-  padding: 0.25rem 0.5rem;
-  outline: 0;
-  cursor: default;
-  user-select: none;
-  overflow-wrap: anywhere;
+  max-height: 200px;
+  overflow-y: auto;
+  color: $label-gray;

-  &[data-highlighted] {
+  li {
+    padding: 0.25rem;
+  }
+
+  li:hover {
    color: $ui-white;
    background: $blue-700;
  }
 }
-
-.expandedEditor {
-  min-height: min(18rem, 45vh);
-  font-family: monospace;
-  line-height: 1.4;
-}
-
-.footerHint {
-  margin-right: auto;
-  color: $label-gray;
-  font-size: calc(1rem - 2px);
-}
@@ -1,258 +1,69 @@
-import { Autocomplete as BaseAutocomplete } from '@base-ui/react/autocomplete';
-import type { ChangeEvent, ReactNode, Ref } from 'react';
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { IoExpandOutline } from 'react-icons/io5';
+import { mergeRefs, useClickOutside } from '@mantine/hooks';
+import { forwardRef, useMemo, useState } from 'react';

-import Button from '../../../../../common/components/buttons/Button';
-import IconButton from '../../../../../common/components/buttons/IconButton';
-import { type InputProps } from '../../../../../common/components/input/input/Input';
-import Textarea from '../../../../../common/components/input/textarea/Textarea';
-import Modal from '../../../../../common/components/modal/Modal';
+import Input, { type InputProps } from '../../../../../common/components/input/input/Input';
 import useCustomFields from '../../../../../common/hooks-query/useCustomFields';
-import { cx } from '../../../../../common/utils/styleUtils';
-import { makeAutoCompleteList } from './templateInput.utils';
-import { useTemplateAutocomplete } from './useTemplateAutocomplete';
+import { makeAutoCompleteList, matchRemaining, selectFromLastTemplate } from './templateInput.utils';

-import inputStyle from '../../../../../common/components/input/input/Input.module.scss';
 import style from './TemplateInput.module.scss';

-interface TemplateInputProps extends Omit<InputProps, 'value'> {
-  ref?: Ref<HTMLInputElement>;
-  value?: string;
-}
+interface TemplateInputProps extends InputProps {}

-interface TemplateEditorModalProps {
-  autocompleteList: string[];
-  isOpen: boolean;
-  onClose: () => void;
-  onSave: (value: string) => void;
-  value: string;
-}
-
-type TemplateAutocompleteState = ReturnType<typeof useTemplateAutocomplete<HTMLInputElement>>;
-
-interface TemplateAutocompleteRootProps {
-  autocomplete: TemplateAutocompleteState;
-  children: ReactNode;
-  value: string;
-}
-
-function assignRef<T>(ref: Ref<T> | undefined, value: T | null) {
-  if (typeof ref === 'function') {
-    ref(value);
-  } else if (ref) {
-    ref.current = value;
-  }
-}
-
-function emitInputChange(name: string | undefined, value: string, onChange: InputProps['onChange']) {
-  onChange?.({
-    target: { name, value },
-    currentTarget: { name, value },
-  } as ChangeEvent<HTMLInputElement>);
-}
-
-export default function TemplateInput({
-  className,
-  disabled,
-  fluid,
-  height = 'medium',
-  onChange,
-  readOnly,
-  ref,
-  value,
-  variant = 'subtle',
-  ...rest
-}: TemplateInputProps) {
+const TemplateInput = forwardRef(function TemplateInput(props: TemplateInputProps, ref) {
+  const { value, onChange, ...rest } = props;
  const { data } = useCustomFields();
-  const inputRef = useRef<HTMLInputElement | null>(null);
-  const [inputValue, setInputValue] = useState(value || '');
-  const [isExpanded, setIsExpanded] = useState(false);
+  const localRef = useClickOutside(() => setShowSuggestions(false));

  const autocompleteList = useMemo(() => {
    return makeAutoCompleteList(data);
  }, [data]);

-  const updateInputValue = useCallback(
-    (nextValue: string) => {
-      setInputValue(nextValue);
-      emitInputChange(rest.name, nextValue, onChange);
-    },
-    [onChange, rest.name],
-  );
+  const [inputValue, setInputValue] = useState(value || '');
+  const [suggestions, setSuggestions] = useState<string[]>([]);
+  const [showSuggestions, setShowSuggestions] = useState(false);

-  const autocomplete = useTemplateAutocomplete(inputValue, autocompleteList, inputRef, updateInputValue);
-  const { setCursorForValue } = autocomplete;
-
-  // Keep the local autocomplete input in sync when react-hook-form resets or swaps field-array values.
-  useEffect(() => {
-    const nextValue = value || '';
-    setInputValue(nextValue);
-    setCursorForValue(nextValue, nextValue.length);
-  }, [setCursorForValue, value]);
-
-  const setInputRef = useCallback(
-    (element: HTMLInputElement | null) => {
-      inputRef.current = element;
-      assignRef(ref, element);
-    },
-    [ref],
-  );
-
-  const openExpandedEditor = () => {
-    autocomplete.setShowSuggestions(false);
-    setIsExpanded(true);
+  const updateSuggestions = (value: string) => {
+    const template = selectFromLastTemplate(value);
+    return autocompleteList.filter((suggestion) => suggestion.startsWith(template));
  };

-  const closeExpandedEditor = () => {
-    setIsExpanded(false);
-  };
+  const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    setInputValue(event.target.value);

-  const saveExpandedEditor = (nextValue: string) => {
-    updateInputValue(nextValue);
-    autocomplete.setCursorForValue(nextValue, nextValue.length);
-    setIsExpanded(false);
-  };
-
-  return (
-    <>
-      <TemplateAutocompleteRoot autocomplete={autocomplete} value={inputValue}>
-        <div className={cx([style.inputShell, fluid && style.fluid])}>
-          <BaseAutocomplete.Input
-            ref={setInputRef}
-            className={cx([
-              inputStyle.input,
-              inputStyle[variant],
-              inputStyle[height],
-              fluid && inputStyle.fluid,
-              style.input,
-              className,
-            ])}
-            {...rest}
-            disabled={disabled}
-            onClick={autocomplete.updateCursor}
-            onFocus={autocomplete.updateCursor}
-            onKeyUp={autocomplete.updateCursor}
-            onSelect={autocomplete.updateCursor}
-            readOnly={readOnly}
-          />
-          <IconButton
-            aria-label='Expand template editor'
-            className={style.expandButton}
-            disabled={disabled || readOnly}
-            onClick={openExpandedEditor}
-            size='small'
-            title='Expand template editor'
-            variant='ghosted-white'
-          >
-            <IoExpandOutline />
-          </IconButton>
-        </div>
-      </TemplateAutocompleteRoot>
-      <TemplateEditorModal
-        autocompleteList={autocompleteList}
-        isOpen={isExpanded}
-        onClose={closeExpandedEditor}
-        onSave={saveExpandedEditor}
-        value={inputValue}
-      />
-    </>
-  );
-}
-
-function TemplateAutocompleteRoot({ autocomplete, children, value }: TemplateAutocompleteRootProps) {
-  return (
-    <BaseAutocomplete.Root
-      items={autocomplete.suggestions}
-      autoHighlight
-      highlightItemOnHover
-      mode='none'
-      open={autocomplete.open}
-      value={value}
-      onOpenChange={autocomplete.setShowSuggestions}
-      onValueChange={autocomplete.handleValueChange}
-    >
-      {children}
-      <TemplateSuggestionPopup />
-    </BaseAutocomplete.Root>
-  );
-}
-
-function TemplateEditorModal({ autocompleteList, isOpen, onClose, onSave, value }: TemplateEditorModalProps) {
-  const expandedInputRef = useRef<HTMLTextAreaElement | null>(null);
-  const [draftValue, setDraftValue] = useState(value);
-  const autocomplete = useTemplateAutocomplete(draftValue, autocompleteList, expandedInputRef, setDraftValue);
-  const { setShowSuggestions } = autocomplete;
-
-  // Reset the draft whenever the modal opens so cancel never leaks unsaved changes.
-  useEffect(() => {
-    if (!isOpen) {
-      return;
+    if (event.target.value.endsWith('{')) {
+      setShowSuggestions(true);
+      setSuggestions(updateSuggestions(event.target.value));
+    } else if (event.target.value === '' || event.target.value.endsWith('}}')) {
+      setShowSuggestions(false);
+    } else if (showSuggestions) {
+      setSuggestions(updateSuggestions(event.target.value));
    }

-    setDraftValue(value);
-    setShowSuggestions(false);
-  }, [isOpen, setShowSuggestions, value]);
-
-  const handleClose = () => {
-    setShowSuggestions(false);
-    onClose();
+    onChange?.(event);
  };

-  const handleSave = () => {
+  const handleSuggestion = (value: string) => {
+    setInputValue((prev) => {
+      const remaining = matchRemaining(prev as string, value);
+      return prev + remaining;
+    });
    setShowSuggestions(false);
-    onSave(draftValue);
  };

  return (
-    <Modal
-      isOpen={isOpen}
-      onClose={handleClose}
-      showBackdrop
-      showCloseButton
-      title='Edit template'
-      bodyElements={
-        <TemplateAutocompleteRoot autocomplete={autocomplete} value={draftValue}>
-          <BaseAutocomplete.Input
-            autoFocus
-            className={style.expandedEditor}
-            onClick={autocomplete.updateCursor}
-            onFocus={autocomplete.updateCursor}
-            onKeyUp={autocomplete.updateCursor}
-            onSelect={autocomplete.updateCursor}
-            render={<Textarea ref={expandedInputRef} fluid resize='none' rows={8} />}
-          />
-        </TemplateAutocompleteRoot>
-      }
-      footerElements={
-        <>
-          <span className={style.footerHint}>Start a template with {'{{'} to see autocomplete.</span>
-          <Button onClick={handleClose}>Cancel</Button>
-          <Button onClick={handleSave} variant='primary'>
-            Save
-          </Button>
-        </>
-      }
-    />
+    <div className={style.wrapper} ref={mergeRefs(localRef, ref)}>
+      <Input value={inputValue} {...rest} onChange={handleInputChange} fluid />
+      {showSuggestions && suggestions.length > 0 && (
+        <ul className={style.suggestions}>
+          {suggestions.map((suggestion) => (
+            <li key={suggestion} onClick={() => handleSuggestion(suggestion)}>
+              {suggestion}
+            </li>
+          ))}
+        </ul>
+      )}
+    </div>
  );
-}
+});

-function TemplateSuggestionPopup() {
-  return (
-    <BaseAutocomplete.Portal>
-      <BaseAutocomplete.Positioner side='bottom' align='start' className={style.positioner}>
-        <BaseAutocomplete.Popup className={style.popup}>
-          <BaseAutocomplete.List className={style.list}>
-            <BaseAutocomplete.Collection>
-              {(suggestion: string) => (
-                <BaseAutocomplete.Item key={suggestion} value={suggestion} className={style.item}>
-                  {suggestion}
-                </BaseAutocomplete.Item>
-              )}
-            </BaseAutocomplete.Collection>
-          </BaseAutocomplete.List>
-        </BaseAutocomplete.Popup>
-      </BaseAutocomplete.Positioner>
-    </BaseAutocomplete.Portal>
-  );
-}
+export default TemplateInput;
@@ -1,4 +1,4 @@
-import { completeTemplateAtCursor, matchRemaining, selectActiveTemplate } from '../templateInput.utils';
+import { matchRemaining } from '../templateInput.utils';

 describe('matchRemaining()', () => {
  it('should return a partial string needed for autocomplete', () => {
@@ -15,54 +15,3 @@ describe('matchRemaining()', () => {
    expect(matchRemaining('test', 'test')).toBe('');
  });
 });
-
-describe('selectActiveTemplate()', () => {
-  it('returns the last unclosed template fragment', () => {
-    expect(selectActiveTemplate('send {{event')).toBe('{{event');
-    expect(selectActiveTemplate('send {{eventNow.title}} and {{event')).toBe('{{event');
-  });
-
-  it('ignores single braces and closed templates', () => {
-    expect(selectActiveTemplate('send {')).toBe('');
-    expect(selectActiveTemplate('send {{eventNow.title}}')).toBe('');
-  });
-
-  it('only considers templates before the cursor', () => {
-    expect(selectActiveTemplate('send {{event}} then {{timer', 14)).toBe('');
-    expect(selectActiveTemplate('send {{event}} then {{timer', 27)).toBe('{{timer');
-  });
-
-  it('selects a partial template when the cursor is inside a completed template', () => {
-    expect(selectActiveTemplate('send {{timer.current}} after', 12)).toBe('{{timer');
-  });
-});
-
-describe('completeTemplateAtCursor()', () => {
-  it('completes the active template before the cursor', () => {
-    expect(completeTemplateAtCursor('send {{timer after', '{{timer.current}}', 12)).toEqual({
-      value: 'send {{timer.current}} after',
-      cursorIndex: 22,
-    });
-  });
-
-  it('preserves text before and after the cursor', () => {
-    expect(completeTemplateAtCursor('before {{event after', '{{eventNow.title}}', 14)).toEqual({
-      value: 'before {{eventNow.title}} after',
-      cursorIndex: 25,
-    });
-  });
-
-  it('preserves a following template when completing between templates', () => {
-    expect(completeTemplateAtCursor('{{clock}} and {{timer then {{eventNow.title}}', '{{timer.current}}', 21)).toEqual({
-      value: '{{clock}} and {{timer.current}} then {{eventNow.title}}',
-      cursorIndex: 31,
-    });
-  });
-
-  it('replaces the whole template when the cursor is inside a completed template', () => {
-    expect(completeTemplateAtCursor('before {{timer.current}} after', '{{timer.duration}}', 15)).toEqual({
-      value: 'before {{timer.duration}} after',
-      cursorIndex: 25,
-    });
-  });
-});
@@ -54,16 +54,6 @@ const eventStaticPropertiesNext = [
  '{{eventNext.delay}}',
 ];

-const groupStaticPropertiesNow = [
-  '{{groupNow.id}}',
-  '{{groupNow.title}}',
-  '{{groupNow.note}}',
-  '{{groupNow.colour}}',
-  '{{groupNow.timeStart}}',
-  '{{groupNow.timeEnd}}',
-  '{{groupNow.duration}}',
-];
-
 const staticAuxProperties = (index: 1 | 2 | 3) => [
  `{{auxtimer${index}.current}}`,
  `{{auxtimer${index}.duration}}`,
@@ -85,19 +75,12 @@ export function makeAutoCompleteList(customFields: CustomFields): string[] {
    ...Object.entries(customFields).map(([key]) => `{{eventNow.custom.${key}}}`),
    ...eventStaticPropertiesNext,
    ...Object.entries(customFields).map(([key]) => `{{eventNext.custom.${key}}}`),
-    ...groupStaticPropertiesNow,
-    ...Object.entries(customFields).map(([key]) => `{{groupNow.custom.${key}}}`),
    ...staticAuxProperties(1),
    ...staticAuxProperties(2),
    ...staticAuxProperties(3),
  ];
 }

-interface TemplateCompletion {
-  cursorIndex: number;
-  value: string;
-}
-
 /**
 * Returns the partial string b needed to autocomplete string a
 * @example matchRemaining('te', 'test') -> 'st'
@@ -128,54 +111,13 @@ export function matchRemaining(a: string, b: string) {
  return '';
 }

-function getActiveTemplateRange(text: string, cursorIndex = text.length) {
-  const textBeforeCursor = text.slice(0, cursorIndex);
-  const start = textBeforeCursor.lastIndexOf('{{');
-  if (start === -1) {
-    return null;
-  }
-
-  const closeBeforeCursor = textBeforeCursor.lastIndexOf('}}');
-  if (closeBeforeCursor > start) {
-    return null;
-  }
-
-  const closeAfterStart = text.indexOf('}}', start);
-  const nextStartAfterCursor = text.indexOf('{{', cursorIndex);
-  const closesBeforeNextTemplate = nextStartAfterCursor === -1 || closeAfterStart < nextStartAfterCursor;
-  const end = closeAfterStart !== -1 && closesBeforeNextTemplate ? closeAfterStart + 2 : cursorIndex;
-
-  return {
-    end,
-    start,
-    template: text.slice(start, cursorIndex),
-  };
-}
-
 /**
- * Selects the last unclosed starting template before the cursor.
+ * Selects the last starting template in a string
 */
-export function selectActiveTemplate(text: string, cursorIndex = text.length) {
-  return getActiveTemplateRange(text, cursorIndex)?.template ?? '';
-}
-
-/**
- * Replaces the active template fragment before the cursor with the selected suggestion.
- */
-export function completeTemplateAtCursor(
-  text: string,
-  suggestion: string,
-  cursorIndex = text.length,
-): TemplateCompletion {
-  const activeTemplateRange = getActiveTemplateRange(text, cursorIndex);
-  if (!activeTemplateRange) {
-    const value = text + matchRemaining(text, suggestion);
-    return { value, cursorIndex: value.length };
+export function selectFromLastTemplate(text: string) {
+  const lastBraceIndex = text.lastIndexOf('{{');
+  if (lastBraceIndex !== -1) {
+    return text.slice(lastBraceIndex);
  }
-
-  const value = `${text.slice(0, activeTemplateRange.start)}${suggestion}${text.slice(activeTemplateRange.end)}`;
-  return {
-    value,
-    cursorIndex: activeTemplateRange.start + suggestion.length,
-  };
+  return '';
 }
@@ -1,72 +0,0 @@
-import { Autocomplete as BaseAutocomplete } from '@base-ui/react/autocomplete';
-import { useCallback, useMemo, useState, type RefObject } from 'react';
-
-import { completeTemplateAtCursor, selectActiveTemplate } from './templateInput.utils';
-
-type TemplateElement = HTMLInputElement | HTMLTextAreaElement;
-
-function getCursorIndex(element: TemplateElement | null, fallback: string) {
-  return element?.selectionStart ?? fallback.length;
-}
-
-function focusCursor(element: TemplateElement | null, cursorIndex: number) {
-  requestAnimationFrame(() => {
-    element?.focus();
-    element?.setSelectionRange(cursorIndex, cursorIndex);
-  });
-}
-
-export function useTemplateAutocomplete<T extends TemplateElement>(
-  value: string,
-  autocompleteList: string[],
-  elementRef: RefObject<T | null>,
-  onValueChange: (value: string) => void,
-) {
-  const [showSuggestions, setShowSuggestions] = useState(false);
-  const [cursor, setCursor] = useState(value.length);
-
-  const activeTemplate = selectActiveTemplate(value, cursor);
-  const suggestions = useMemo(() => {
-    if (!activeTemplate) {
-      return [];
-    }
-    return autocompleteList.filter((suggestion) => suggestion.startsWith(activeTemplate));
-  }, [activeTemplate, autocompleteList]);
-
-  const setCursorForValue = useCallback((nextValue: string, cursorIndex: number) => {
-    setCursor(cursorIndex);
-    setShowSuggestions(Boolean(selectActiveTemplate(nextValue, cursorIndex)));
-  }, []);
-
-  const updateCursor = useCallback(() => {
-    const cursorIndex = getCursorIndex(elementRef.current, value);
-    setCursorForValue(value, cursorIndex);
-  }, [elementRef, setCursorForValue, value]);
-
-  const handleValueChange = useCallback(
-    (nextValue: string, eventDetails: BaseAutocomplete.Root.ChangeEventDetails) => {
-      if (eventDetails.reason === 'item-press') {
-        eventDetails.cancel();
-        const completed = completeTemplateAtCursor(value, nextValue, cursor);
-        setCursorForValue(completed.value, completed.cursorIndex);
-        onValueChange(completed.value);
-        focusCursor(elementRef.current, completed.cursorIndex);
-        return;
-      }
-
-      const cursorIndex = getCursorIndex(elementRef.current, nextValue);
-      setCursorForValue(nextValue, cursorIndex);
-      onValueChange(nextValue);
-    },
-    [cursor, elementRef, onValueChange, setCursorForValue, value],
-  );
-
-  return {
-    handleValueChange,
-    open: showSuggestions && suggestions.length > 0,
-    setCursorForValue,
-    setShowSuggestions,
-    suggestions,
-    updateCursor,
-  };
-}
@@ -66,10 +66,7 @@ export default function ReportSettings() {
            </thead>
            <tbody>
              {combinedReport.length === 0 && (
-                <Panel.TableEmpty
-                  title='No report data yet'
-                  description='Reports are generated as you run through the show, comparing scheduled times against what actually happened.'
-                />
+                <Panel.TableEmpty label='Reports are generated when running through the show.' />
              )}

              {combinedReport.map((entry) => {
@@ -1,8 +1,7 @@
-import { OntimeView, URLPreset } from 'ontime-types';
+import { URLPreset } from 'ontime-types';
 import { useState } from 'react';
 import { IoAdd, IoOpenOutline, IoPencil, IoTrash } from 'react-icons/io5';

-import { maybeAxiosError } from '../../../../common/api/utils';
 import Button from '../../../../common/components/buttons/Button';
 import IconButton from '../../../../common/components/buttons/IconButton';
 import Info from '../../../../common/components/info/Info';
@@ -23,27 +22,16 @@ const urlPresetsDocs = 'https://docs.getontime.no/features/url-presets/';

 export default function URLPresets() {
  const [formState, setFormState] = useState<FormState>({ isOpen: false, preset: undefined });
-  const [actionError, setActionError] = useState<string | null>(null);
  const { data, status } = useUrlPresets();
-  const { updatePreset, deletePreset, isMutating } = useUpdateUrlPreset();
+  const { deletePreset, isMutating } = useUpdateUrlPreset();

  const openNewForm = () => setFormState({ isOpen: true });
  const openEditForm = (preset: URLPreset) => setFormState({ isOpen: true, preset });
  const closeForm = () => setFormState({ isOpen: false, preset: undefined });

-  const persistPreset = async (preset: URLPreset) => {
-    setActionError(null);
-    try {
-      await updatePreset(preset.alias, preset);
-    } catch (error) {
-      setActionError(maybeAxiosError(error));
-    }
-  };
-
  return (
    <Panel.Section>
      <Panel.Card>
-        {formState.isOpen && <URLPresetForm urlPreset={formState.preset} onClose={closeForm} />}
        <Panel.SubHeader>
          URL presets
          <Button onClick={openNewForm}>
@@ -64,47 +52,23 @@ export default function URLPresets() {
        </Panel.Section>
        <Panel.Section>
          <Panel.Loader isLoading={status === 'pending'} />
-          {actionError && <Panel.Error>{actionError}</Panel.Error>}
+          {formState.isOpen && <URLPresetForm urlPreset={formState.preset} onClose={closeForm} />}
          <Panel.Table>
            <thead>
              <tr>
                <th>Enabled</th>
-                <th>Show in nav</th>
                <th>Target view</th>
                <th>Alias</th>
                <th />
              </tr>
            </thead>
            <tbody>
-              {data.length === 0 && (
-                <Panel.TableEmpty
-                  title='No URL presets yet'
-                  description='A preset gives one of your views a short, memorable address, with all of its options baked in.'
-                  action={
-                    <Button variant='primary' onClick={openNewForm}>
-                      Create preset <IoAdd />
-                    </Button>
-                  }
-                />
-              )}
+              {data.length === 0 && <Panel.TableEmpty handleClick={openNewForm} />}
              {data.map((preset, index) => {
-                const isCuesheet = preset.target === OntimeView.Cuesheet;
                return (
                  <tr key={preset.alias}>
                    <td>
-                      <Switch
-                        checked={preset.enabled}
-                        onCheckedChange={(enabled) => persistPreset({ ...preset, enabled })}
-                        disabled={isMutating}
-                        aria-label='Toggle preset enabled'
-                      />
-                    </td>
-                    <td>
-                      <Switch
-                        checked={preset.displayInNav}
-                        onCheckedChange={(checked) => persistPreset({ ...preset, displayInNav: checked })}
-                        disabled={isMutating || isCuesheet}
-                      />
+                      <Switch defaultChecked={preset.enabled} onCheckedChange={() => {}} />
                    </td>
                    <td>
                      <Tag>{preset.target}</Tag>
@@ -1,18 +1,17 @@
 import { OntimeView, OntimeViewPresettable, URLPreset } from 'ontime-types';
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useRef } from 'react';
 import { useForm } from 'react-hook-form';

 import { maybeAxiosError, unwrapError } from '../../../../../common/api/utils';
 import Button from '../../../../../common/components/buttons/Button';
 import Input from '../../../../../common/components/input/input/Input';
 import Textarea from '../../../../../common/components/input/textarea/Textarea';
-import Modal from '../../../../../common/components/modal/Modal';
 import Select, { SelectOption } from '../../../../../common/components/select/Select';
 import { useUpdateUrlPreset } from '../../../../../common/hooks-query/useUrlPresets';
+import { preventEscape } from '../../../../../common/utils/keyEvent';
 import { isUrlSafe } from '../../../../../common/utils/regex';
 import { enDash } from '../../../../../common/utils/styleUtils';
 import { generateUrlPresetOptions } from '../../../../../common/utils/urlPresets';
-import CuesheetLinkOptions, { CuesheetPermissionValues } from '../../../../sharing/composite/CuesheetLinkOptions';
 import * as Panel from '../../../panel-utils/PanelUtils';

 import style from './URLPresetForm.module.scss';
@@ -28,14 +27,11 @@ const targetOptions: SelectOption<OntimeViewPresettable>[] = [
  { value: OntimeView.ProjectInfo, label: 'Project Info' },
 ];

-const formId = 'url-preset-form';
-
 const defaultValues: URLPreset = {
  alias: '',
  target: OntimeView.Timer,
  search: '',
  enabled: true,
-  displayInNav: false,
 };

 interface URLPresetFormProps {
@@ -65,42 +61,12 @@ export default function URLPresetForm({ urlPreset, onClose }: URLPresetFormProps
  });
  const urlRef = useRef<HTMLInputElement>(null);

-  // Cuesheet read/write permissions live outside react-hook-form
-  const initialPermissions = useRef<CuesheetPermissionValues>({
-    read: urlPreset?.options?.read ?? 'full',
-    write: urlPreset?.options?.write ?? 'full',
-  });
-  const [cuesheetPermissions, setCuesheetPermissions] = useState<CuesheetPermissionValues>(initialPermissions.current);
-
-  // update initial permissions on mount
-  useEffect(() => {
-    initialPermissions.current = {
-      read: urlPreset?.options?.read ?? 'full',
-      write: urlPreset?.options?.write ?? 'full',
-    };
-    setCuesheetPermissions(initialPermissions.current);
-    // oxlint-disable-next-line eslint-plugin-react-hooks/exhaustive-deps -- run on mount
-  }, []);
-
-  const isEditingCuesheet = urlPreset && urlPreset.target === OntimeView.Cuesheet;
-  const isCuesheet = watch('target') === OntimeView.Cuesheet;
-  const permissionsDirty =
-    isCuesheet &&
-    (cuesheetPermissions.read !== initialPermissions.current.read ||
-      cuesheetPermissions.write !== initialPermissions.current.write);
-  const noReadAccess = isCuesheet && cuesheetPermissions.read === '-';
-
  const setupSubmit = async (data: URLPreset) => {
    try {
-      // Preserve / apply cuesheet permissions, which are not part of the form fields
-      const payload: URLPreset =
-        data.target === OntimeView.Cuesheet
-          ? { ...data, target: OntimeView.Cuesheet, options: cuesheetPermissions }
-          : data;
      if (urlPreset) {
-        await updatePreset(urlPreset.alias, payload);
+        await updatePreset(urlPreset.alias, data);
      } else {
-        await addPreset(payload);
+        await addPreset(data);
      }
      onClose();
    } catch (error) {
@@ -108,7 +74,6 @@ export default function URLPresetForm({ urlPreset, onClose }: URLPresetFormProps
    }
  };

-  // focus on alias when the form opens
  useEffect(() => {
    setFocus('alias');
  }, [setFocus]);
@@ -136,101 +101,73 @@ export default function URLPresetForm({ urlPreset, onClose }: URLPresetFormProps
  };

  return (
-    <Modal
-      isOpen
-      onClose={onClose}
-      showBackdrop
-      showCloseButton
-      size='compact'
-      title={urlPreset ? 'Edit URL preset' : 'Create URL preset'}
-      bodyElements={
-        <form id={formId} onSubmit={handleSubmit(setupSubmit)} className={style.column}>
-          <input hidden name='enabled' value='true' />
+    <Panel.Indent
+      as='form'
+      onSubmit={handleSubmit(setupSubmit)}
+      onKeyDown={(event) => preventEscape(event, onClose)}
+      className={style.column}
+    >
+      <input hidden name='enabled' value='true' />

-          <div>1. Enter URL and let Ontime generate the preset options</div>
+      <div>1. Enter URL and let Ontime generate the preset options</div>
+      <Panel.InlineElements>
+        <div>
+          <Panel.Description>Alias</Panel.Description>
+          <Input
+            {...register('alias', {
+              required: 'Alias is required',
+              pattern: {
+                value: isUrlSafe,
+                message: 'Field can only contain URL safe characters (a-z, 0-9, _ and -)',
+              },
+            })}
+          />
+        </div>
+        <div className={style.expand}>
+          <Panel.Description>Generate options (paste URL to generate options)</Panel.Description>
          <Panel.InlineElements>
-            <div>
-              <Panel.Description>Alias</Panel.Description>
-              <Input
-                {...register('alias', {
-                  required: 'Alias is required',
-                  pattern: {
-                    value: isUrlSafe,
-                    message: 'Field can only contain URL safe characters (a-z, 0-9, _ and -)',
-                  },
-                })}
-              />
-            </div>
-            <div className={style.expand}>
-              <Panel.Description>Generate options (paste URL to generate options)</Panel.Description>
-              <Panel.InlineElements>
-                <Input placeholder='Paste URL' fluid ref={urlRef} disabled={isEditingCuesheet} />
-                <Button onClick={generateOptions} disabled={isEditingCuesheet}>
-                  Generate
-                </Button>
-              </Panel.InlineElements>
-            </div>
+            <Input placeholder='Paste URL' fluid ref={urlRef} />
+            <Button onClick={generateOptions}>Generate</Button>
          </Panel.InlineElements>
-          {errors.alias?.message && <Panel.Error>{errors.alias.message}</Panel.Error>}
-          {!isEditingCuesheet && (
-            <>
-              <div>
-                {enDash} or {enDash}
-              </div>
-              <div>2. Choose a view and its parameters</div>
-              <div>
-                <Panel.Description>Target</Panel.Description>
-                <Select
-                  options={targetOptions}
-                  {...register('target', { required: 'Target is required' })}
-                  value={watch('target')}
-                  onValueChange={(value: OntimeViewPresettable | null) => {
-                    if (value === null) return;
-                    setValue('target', value, { shouldDirty: true });
-                  }}
-                />
-              </div>
-              <div>
-                <Panel.Description>Parameters</Panel.Description>
-                <Textarea
-                  fluid
-                  rows={3}
-                  {...register('search', {
-                    validate: validateParams,
-                  })}
-                />
-                <Panel.Error>{errors.search?.message}</Panel.Error>
-              </div>
-            </>
-          )}
-
-          {isCuesheet && (
-            <div>
-              <Panel.Description>Permissions</Panel.Description>
-              <CuesheetLinkOptions
-                initialRead={initialPermissions.current.read}
-                initialWrite={initialPermissions.current.write}
-                onChange={setCuesheetPermissions}
-              />
-            </div>
-          )}
-        </form>
-      }
-      footerElements={
-        <>
-          <Panel.Error>{errors.root?.message}</Panel.Error>
+        </div>
+      </Panel.InlineElements>
+      {errors.alias?.message && <Panel.Error>{errors.alias.message}</Panel.Error>}
+      <div>
+        {enDash} or {enDash}
+      </div>
+      <div>2. Choose a view and its parameters</div>
+      <div>
+        <Panel.Description>Target</Panel.Description>
+        <Select
+          options={targetOptions}
+          {...register('target', { required: 'Target is required' })}
+          value={watch('target')}
+          onValueChange={(value: OntimeViewPresettable | null) => {
+            if (value === null) return;
+            setValue('target', value, { shouldDirty: true });
+          }}
+        />
+      </div>
+      <div>
+        <Panel.Description>Parameters</Panel.Description>
+        <Textarea
+          fluid
+          rows={3}
+          {...register('search', {
+            validate: validateParams,
+          })}
+        />
+        <Panel.Error>{errors.search?.message}</Panel.Error>
+      </div>
+      <div>
+        <Panel.Error>{errors.root?.message}</Panel.Error>
+        <Panel.InlineElements align='end'>
          <Button onClick={onClose}>Cancel</Button>
-          <Button
-            variant='primary'
-            type='submit'
-            form={formId}
-            disabled={!isValid || (!isDirty && !permissionsDirty) || noReadAccess}
-            loading={isSubmitting || isMutating}
-          >
+          <Button variant='primary' type='submit' disabled={!isValid || !isDirty} loading={isSubmitting || isMutating}>
            Save
          </Button>
-        </>
-      }
-    />
+        </Panel.InlineElements>
+      </div>
+    </Panel.Indent>
  );
 }
@@ -13,30 +13,27 @@ import * as Panel from '../../panel-utils/PanelUtils';
 import CustomFieldEntry from './composite/CustomFieldEntry';
 import CustomFieldForm from './composite/CustomFieldForm';

-type CustomFieldEntity = CustomField & { key: CustomFieldKey };
-
-type FormState = {
-  isOpen: boolean;
-  field?: CustomFieldEntity;
-};
-
 export default function CustomFieldSettings() {
  const { data, refetch } = useCustomFields();
-  const [formState, setFormState] = useState<FormState>({ isOpen: false, field: undefined });
+  const [isAdding, setIsAdding] = useState(false);

-  const openNewForm = () => setFormState({ isOpen: true });
-  const openEditForm = (field: CustomFieldEntity) => setFormState({ isOpen: true, field });
-  const closeForm = () => setFormState({ isOpen: false, field: undefined });
+  const handleInitiateCreate = () => {
+    setIsAdding(true);
+  };

-  const handleSubmit = async (customField: CustomField) => {
-    const editing = formState.field;
-    if (editing) {
-      await editCustomField(editing.key, customField);
-    } else {
-      await postCustomField(customField);
-    }
+  const handleCancel = () => {
+    setIsAdding(false);
+  };
+
+  const handleCreate = async (customField: CustomField) => {
+    await postCustomField(customField);
+    refetch();
+    setIsAdding(false);
+  };
+
+  const handleEditField = async (key: CustomFieldKey, customField: CustomField) => {
+    await editCustomField(key, customField);
    refetch();
-    closeForm();
  };

  const handleDelete = async (key: CustomFieldKey) => {
@@ -48,39 +45,28 @@ export default function CustomFieldSettings() {
    }
  };

-  const entries = Object.entries(data);
-
  return (
    <Panel.Section>
      <Panel.Card>
-        {formState.isOpen && (
-          <CustomFieldForm
-            onSubmit={handleSubmit}
-            onCancel={closeForm}
-            initialColour={formState.field?.colour}
-            initialLabel={formState.field?.label}
-            initialKey={formState.field?.key}
-            initialType={formState.field?.type}
-          />
-        )}
        <Panel.SubHeader>
          Custom fields
-          <Button onClick={openNewForm}>
+          <Button onClick={handleInitiateCreate}>
            New <IoAdd />
          </Button>
        </Panel.SubHeader>
        <Panel.Divider />
        <Panel.Section>
          <Info>
-            <span>Custom fields allow for additional information to be added to an event.</span>
-            <span>
-              To use custom fields as a data source in an{' '}
-              <AppLink search='settings=automation__automations'>Automation</AppLink>, please note the generated key.
-            </span>
+            Custom fields allow for additional information to be added to an event.
+            <br />
+            <br />
+            To use custom fields as a data source in an{' '}
+            <AppLink search='settings=automation__automations'>Automation</AppLink>, please note the generated key.
            <ExternalLink href={customFieldsDocsUrl}>See the docs</ExternalLink>
          </Info>
        </Panel.Section>
        <Panel.Section>
+          {isAdding && <CustomFieldForm onSubmit={handleCreate} onCancel={handleCancel} />}
          <Panel.Table>
            <thead>
              <tr>
@@ -92,18 +78,7 @@ export default function CustomFieldSettings() {
              </tr>
            </thead>
            <tbody>
-              {entries.length === 0 && (
-                <Panel.TableEmpty
-                  title='No custom fields yet'
-                  description='Custom fields add your own columns to the rundown, and can be shown in views or used in automations.'
-                  action={
-                    <Button variant='primary' onClick={openNewForm}>
-                      Create custom field <IoAdd />
-                    </Button>
-                  }
-                />
-              )}
-              {entries.map(([key, { colour, label, type }]) => {
+              {Object.entries(data).map(([key, { colour, label, type }]) => {
                return (
                  <CustomFieldEntry
                    key={key}
@@ -111,7 +86,7 @@ export default function CustomFieldSettings() {
                    colour={colour}
                    label={label}
                    type={type}
-                    onEdit={() => openEditForm({ key, colour, label, type })}
+                    onEdit={handleEditField}
                    onDelete={handleDelete}
                  />
                );
--- a/Show More
+++ b/Show More