bump version to 3.16.1

fix: prevent storage key conflicts between stages
chore: add demo images to github
2026-07-26 10:38:55 +00:00 · 2025-08-15 19:54:38 +02:00 · 2025-08-15 19:54:38 +02:00 · 2025-08-09 07:01:01 +02:00 · 2025-06-23 20:42:53 +02:00 · 2025-06-23 19:56:53 +02:00
347 changed files with 8951 additions and 3434 deletions
@@ -14,12 +14,12 @@ jobs:
      - name: Use Node.js
        uses: actions/setup-node@v4
        with:
-          node-version: 20
+          node-version: 22

      - name: Setup pnpm
        uses: pnpm/action-setup@v3
        with:
-          version: 9
+          version: 10

      - name: Install dependencies
        run: pnpm install --frozen-lockfile
@@ -56,12 +56,12 @@ jobs:
      - name: Use Node.js
        uses: actions/setup-node@v4
        with:
-          node-version: 20
+          node-version: 22

      - name: Setup pnpm
        uses: pnpm/action-setup@v3
        with:
-          version: 9
+          version: 10

      - name: Install dependencies
        run: pnpm install --frozen-lockfile
@@ -89,12 +89,12 @@ jobs:
      - name: Use Node.js
        uses: actions/setup-node@v4
        with:
-          node-version: 20
+          node-version: 22

      - name: Setup pnpm
        uses: pnpm/action-setup@v3
        with:
-          version: 9
+          version: 10

      - name: Install dependencies
        run: pnpm install --frozen-lockfile
@@ -20,13 +20,13 @@ jobs:
      - name: Use Node.js
        uses: actions/setup-node@v4
        with:
-          node-version: 20
+          node-version: 22
          registry-url: 'https://registry.npmjs.org'

      - name: Setup pnpm
        uses: pnpm/action-setup@v3
        with:
-          version: 9
+          version: 10

      - name: Install dependencies
        run: pnpm install --frozen-lockfile
@@ -17,12 +17,12 @@ jobs:
      - name: Use Node.js
        uses: actions/setup-node@v4
        with:
-          node-version: 20
+          node-version: 22

      - name: Setup pnpm
        uses: pnpm/action-setup@v3
        with:
-          version: 9
+          version: 10

      - name: Install dependencies
        run: pnpm install --frozen-lockfile
@@ -73,12 +73,12 @@ jobs:
      - name: Use Node.js
        uses: actions/setup-node@v4
        with:
-          node-version: 20
+          node-version: 22

      - name: Setup pnpm
        uses: pnpm/action-setup@v3
        with:
-          version: 9
+          version: 10

      - name: Install dependencies
        run: pnpm install --frozen-lockfile
@@ -1 +1 @@
-v20.15.1
+v22.15.1
@@ -9,8 +9,8 @@ Ontime consists of 3 distinct parts
 The steps below will assume you have locally installed the necessary dependencies.
 Other dependencies will be installed as part of the setup

- __node__ (~20)
- __pnpm__ (~9)
+- __node__ (~22)
+- __pnpm__ (~10)
 - __docker__ (only necessary to run and build docker images)

 ## LOCAL DEVELOPMENT
@@ -1,13 +1,13 @@
-FROM node:20-bullseye AS builder
+FROM node:22-bullseye AS builder
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
-RUN npm install -g pnpm@9.5.0
+RUN npm install -g pnpm@10.11.0
 COPY . /app
 WORKDIR /app
 RUN pnpm --filter=ontime-ui --filter=ontime-server --filter=ontime-utils install --config.dedupe-peer-dependents=false --frozen-lockfile
 RUN pnpm --filter=ontime-ui --filter=ontime-server run build:docker

-FROM node:20-alpine
+FROM node:22-alpine

 # Set environment variables
 # Environment Variable to signal that we are running production
@@ -1,6 +1,6 @@
 {
    "name": "@getontime/cli",
-    "version": "3.11.0",
+    "version": "3.16.1",
    "author": "Carlos Valente",
    "description": "Time keeping for live events",
    "repository": "https://github.com/cpvalente/ontime",
@@ -1,6 +1,6 @@
 {
  "name": "ontime-ui",
-  "version": "3.11.0",
+  "version": "3.16.1",
  "private": true,
  "type": "module",
  "dependencies": {
@@ -13,25 +13,28 @@
    "@emotion/styled": "^11.10.6",
    "@fontsource/open-sans": "^5.0.28",
    "@mantine/hooks": "^7.13.3",
-    "@react-icons/all-files": "^4.1.0",
    "@sentry/react": "^8.43.0",
+    "@table-nav/react": "^0.0.7",
    "@tanstack/react-query": "^5.62.7",
    "@tanstack/react-query-devtools": "^5.62.7",
-    "@tanstack/react-table": "^8.20.5",
+    "@tanstack/react-table": "^8.21.3",
    "autosize": "^6.0.1",
    "axios": "^1.2.0",
    "color": "^4.2.3",
    "csv-stringify": "^6.4.5",
    "framer-motion": "^10.10.0",
+    "prismjs": "^1.29.0",
    "react": "^18.3.1",
    "react-colorful": "^5.6.1",
    "react-dom": "^18.3.1",
    "react-fast-compare": "^3.2.2",
    "react-hook-form": "^7.53.1",
+    "react-icons": "5.4.0",
    "react-qr-code": "^2.0.12",
    "react-router-dom": "^6.3.0",
+    "react-simple-code-editor": "^0.14.1",
    "web-vitals": "^3.1.1",
-    "zustand": "^4.5.2"
+    "zustand": "^5.0.3"
  },
  "scripts": {
    "addversion": "node -p \"'export const ONTIME_VERSION = ' + JSON.stringify(require('../../package.json').version) + ';'\" > src/ONTIME_VERSION.js",
@@ -64,11 +67,12 @@
    "@sentry/vite-plugin": "^2.16.1",
    "@tanstack/eslint-plugin-query": "^5.8.4",
    "@types/color": "^3.0.3",
+    "@types/prismjs": "^1.26.5",
    "@types/react": "^18.0.26",
    "@types/react-dom": "^18.0.10",
    "@typescript-eslint/eslint-plugin": "catalog:",
    "@typescript-eslint/parser": "catalog:",
-    "@vitejs/plugin-react": "^4.2.1",
+    "@vitejs/plugin-react": "4.5.1",
    "eslint": "catalog:",
    "eslint-config-prettier": "catalog:",
    "eslint-plugin-jest": "^28.6.0",
@@ -82,10 +86,10 @@
    "prettier": "catalog:",
    "sass": "^1.57.1",
    "typescript": "catalog:",
-    "vite": "^5.2.11",
-    "vite-plugin-compression2": "^1.3.3",
-    "vite-plugin-svgr": "^4.2.0",
-    "vite-tsconfig-paths": "^4.3.1",
+    "vite": "6.3.1",
+    "vite-plugin-compression2": "1.4.0",
+    "vite-plugin-svgr": "4.3.0",
+    "vite-tsconfig-paths": "5.1.4",
    "vitest": "catalog:"
  }
 }
@@ -27,9 +27,9 @@ const MinimalTimerView = React.lazy(() => import('./features/viewers/minimal-tim
 const ClockView = React.lazy(() => import('./features/viewers/clock/Clock'));
 const Countdown = React.lazy(() => import('./features/viewers/countdown/Countdown'));

-const Backstage = React.lazy(() => import('./features/viewers/backstage/Backstage'));
+const Backstage = React.lazy(() => import('./views/backstage/Backstage'));
 const Timeline = React.lazy(() => import('./views/timeline/TimelinePage'));
-const Public = React.lazy(() => import('./features/viewers/public/Public'));
+const Public = React.lazy(() => import('./views/public/Public'));
 const Lower = React.lazy(() => import('./features/viewers/lower-thirds/LowerThird'));
 const StudioClock = React.lazy(() => import('./features/viewers/studio/StudioClock'));
 const ProjectInfo = React.lazy(() => import('./views/project-info/ProjectInfo'));
@@ -158,7 +158,14 @@ export default function AppRouter() {
        {/*/!* Protected Routes *!/*/}
        <Route path='/editor' element={<Editor />} />
        <Route path='/cuesheet' element={<PCuesheet />} />
-        <Route path='/op' element={<POperator />} />
+        <Route
+          path='/op'
+          element={
+            <ViewLoader>
+              <POperator />
+            </ViewLoader>
+          }
+        />

        {/*/!* Protected Routes - Elements *!/*/}
        <Route
@@ -0,0 +1,30 @@
+import axios from 'axios';
+
+import { apiEntryUrl } from './constants';
+
+const assetsPath = `${apiEntryUrl}/assets`;
+
+/**
+ * HTTP request to get css contents
+ */
+export async function getCSSContents(): Promise<string> {
+  const res = await axios.get(`${assetsPath}/css`);
+  return res.data;
+}
+
+/**
+ * HTTP request to post css contents
+ */
+export async function postCSSContents(css: string): Promise<void> {
+  await axios.post(`${assetsPath}/css`, {
+    css,
+  });
+}
+
+/**
+ * HTTP request to restore default css
+ */
+export async function restoreCSSContents(): Promise<string> {
+  const res = await axios.post(`${assetsPath}/css/restore`);
+  return res.data;
+}
@@ -14,6 +14,7 @@ export const SHEET_STATE = ['sheetState'];
 export const URL_PRESETS = ['urlpresets'];
 export const VIEW_SETTINGS = ['viewSettings'];
 export const CLIENT_LIST = ['clientList'];
+export const REPORT = ['report'];

 // API URLs
 export const apiEntryUrl = `${serverURL}/data`;
@@ -1,7 +1,8 @@
 import axios, { AxiosResponse } from 'axios';
 import { DatabaseModel, MessageResponse, ProjectData, ProjectFileListResponse, QuickStartData } from 'ontime-types';

-import { makeCSV, makeTable } from '../../views/cuesheet/cuesheet.utils';
+import { makeTable } from '../../views/cuesheet/cuesheet.utils';
+import { makeCSVFromArrayOfArrays } from '../utils/csv';

 import { apiEntryUrl } from './constants';
 import { createBlob, downloadBlob } from './utils';
@@ -42,7 +43,7 @@ export async function downloadCSV(fileName: string = 'rundown') {
    const { project, rundown, customFields } = data;

    const sheetData = makeTable(project, rundown, customFields);
-    const fileContent = makeCSV(sheetData);
+    const fileContent = makeCSVFromArrayOfArrays(sheetData);

    const blob = createBlob(fileContent, 'text/csv;charset=utf-8;');
    downloadBlob(blob, `${name}.csv`);
@@ -0,0 +1,26 @@
+import axios from 'axios';
+import { OntimeReport } from 'ontime-types';
+
+import { ontimeQueryClient } from '../../common/queryClient';
+
+import { apiEntryUrl, REPORT } from './constants';
+
+export const reportUrl = `${apiEntryUrl}/report`;
+
+/**
+ * HTTP request to fetch all reports
+ */
+export async function fetchReport(): Promise<OntimeReport> {
+  const res = await axios.get(`${reportUrl}/`);
+  return res.data;
+}
+
+export async function deleteReport(id: string) {
+  await axios.delete(`${reportUrl}/${id}`);
+  await ontimeQueryClient.invalidateQueries({ queryKey: REPORT });
+}
+
+export async function deleteAllReport() {
+  await axios.delete(`${reportUrl}/all`);
+  await ontimeQueryClient.invalidateQueries({ queryKey: REPORT });
+}
@@ -1,12 +0,0 @@
-@use "../../../theme/mixins" as *;
-
-.link {
-  @include action-link;
-  font-size: $inner-section-text-size;
-}
-
-.linkIcon {
-  margin-left: $element-inner-spacing;
-  display: inline-block;
-  @include rotate-fourty-five;
-}
@@ -1,26 +0,0 @@
-import { MouseEvent, ReactNode } from 'react';
-import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';
-
-import { openLink } from '../../utils/linkUtils';
-
-import style from './AppLink.module.scss';
-
-interface AppLinkProps {
-  href: string;
-  children: ReactNode;
-}
-
-export default function AppLink(props: AppLinkProps) {
-  const { href, children } = props;
-
-  const handleClick = (event: MouseEvent<HTMLAnchorElement>) => {
-    event.preventDefault();
-    openLink(href);
-  };
-
-  return (
-    <a href='#!' target='_blank' rel='noreferrer' className={style.link} onClick={handleClick}>
-      {children} <IoArrowUp className={style.linkIcon} />
-    </a>
-  );
-}
@@ -0,0 +1,26 @@
+.subtle {
+  aspect-ratio: 1;
+  height: 2rem;
+  height: 2rem;
+  display: grid;
+  place-content: center;
+
+  background: $gray-1050;
+  color: $blue-400;
+  border: 1px solid transparent;
+  border-radius: 3px;
+
+  &:hover:not(:disabled):not(:active) {
+    background: $gray-1000;
+    color: $blue-500;
+  }
+
+  &:active {
+    background: $gray-1100;
+    border-color: $gray-1250;
+  }
+
+  &:disabled {
+    background: $gray-1050;
+  }
+}
@@ -0,0 +1,14 @@
+import { ButtonHTMLAttributes } from 'react';
+
+import { cx } from '../../utils/styleUtils';
+
+import style from './IconButton.module.scss';
+
+export default function IconButton(props: ButtonHTMLAttributes<HTMLButtonElement>) {
+  const { className, children, ...buttonProps } = props;
+  return (
+    <button className={cx([style.subtle, className])} {...buttonProps}>
+      {children}
+    </button>
+  );
+}
@@ -0,0 +1,24 @@
+.textEntry {
+  grid-area: input;
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  color: $label-gray;
+}
+
+.inlineEntry {
+  display: grid;
+  grid-template-areas:
+    'label label'
+    'input btn';
+  grid-template-columns: 1fr auto;
+  column-gap: 0.5rem;
+}
+
+.redirect {
+  grid-area: btn;
+}
+
+.label {
+  color: $label-gray;
+}
@@ -1,64 +1,125 @@
 import { useState } from 'react';
+import { IoArrowForward } from 'react-icons/io5';
 import {
-  Button,
+  IconButton,
  Input,
-  InputGroup,
-  InputLeftAddon,
  Modal,
  ModalBody,
  ModalCloseButton,
  ModalContent,
-  ModalFooter,
  ModalHeader,
  ModalOverlay,
+  Select,
 } from '@chakra-ui/react';

+import { navigatorConstants } from '../../../viewerConfig';
 import { setClientRemote } from '../../hooks/useSocket';
+import useUrlPresets from '../../hooks-query/useUrlPresets';
+import Info from '../info/Info';
+import AppLink from '../link/app-link/AppLink';
+
+import style from './RedirectClientModal.module.scss';

 interface RedirectClientModalProps {
  id: string;
-  name?: string;
-  path?: string;
+  name: string;
+  currentPath: string;
+  origin: string;
  isOpen: boolean;
  onClose: () => void;
 }

 export function RedirectClientModal(props: RedirectClientModalProps) {
-  const { id, isOpen, name = '', path: currentPath = '', onClose } = props;
+  const { id, isOpen, name, currentPath, origin, onClose } = props;
+  const { data } = useUrlPresets();
  const [path, setPath] = useState(currentPath);
+  const [selected, setSelected] = useState('/');

  const { setRedirect } = setClientRemote;

-  const handleRedirect = () => {
-    if (path !== currentPath && path !== '') {
-      setRedirect({ target: id, redirect: path });
+  const handleRedirect = (newPath: string) => {
+    if (newPath === '/' || newPath === currentPath) {
+      return;
    }
+    setRedirect({ target: id, redirect: newPath });
    onClose();
  };

-  const host = window.location.origin;
-  const canSubmit = path !== currentPath && path !== '';
+  const enabledPresets = data.filter((preset) => preset.enabled);

  return (
    <Modal isOpen={isOpen} onClose={onClose} variant='ontime'>
      <ModalOverlay />
-      <ModalContent>
+      <ModalContent maxWidth='max(480px, 35vw)'>
        <ModalHeader>Redirect: {name}</ModalHeader>
        <ModalCloseButton />
        <ModalBody>
-          <InputGroup variant='ontime-filled' size='md'>
-            <InputLeftAddon>{host}</InputLeftAddon>
-            <Input placeholder='minimal?key=0000ffff' value={path} onChange={(event) => setPath(event.target.value)} />
-          </InputGroup>
+          <Info>
+            Remotely redirect the client to a different URL. <br />
+            Either by selecting a URL Preset or entering a custom path.
+            <br />
+            <br />
+            <AppLink search='settings=feature_settings__urlpresets'>Manage URL Presets</AppLink>
+          </Info>
+          <div>
+            <span className={style.label}>Select View or URL Preset</span>
+            <div className={style.textEntry}>
+              <Select
+                size='md'
+                variant='ontime'
+                isDisabled={enabledPresets.length === 0}
+                onChange={(event) => setSelected(event.target.value)}
+              >
+                <option value='/'>Select view or preset</option>
+                {navigatorConstants.map((view) => {
+                  return (
+                    <option key={view.url} value={`/${view.url}`}>
+                      {view.label}
+                    </option>
+                  );
+                })}
+                {enabledPresets.map((preset) => {
+                  return (
+                    <option key={preset.pathAndParams} value={preset.pathAndParams}>
+                      {`Preset: ${preset.alias}`}
+                    </option>
+                  );
+                })}
+              </Select>
+              <IconButton
+                variant='ontime-filled'
+                size='md'
+                aria-label='Redirect to preset'
+                className={style.redirect}
+                icon={<IoArrowForward />}
+                isDisabled={enabledPresets.length === 0 || selected === '/'}
+                onClick={() => handleRedirect(selected)}
+              />
+            </div>
+          </div>
+          <div className={style.inlineEntry}>
+            <span className={style.label}>Enter custom path</span>
+            <label className={style.textEntry}>
+              {origin}
+              <Input
+                variant='ontime-filled'
+                size='md'
+                placeholder='eg. /minimal?key=0000ffff'
+                value={path}
+                onChange={(event) => setPath(event.target.value)}
+              />
+            </label>
+            <IconButton
+              variant='ontime-filled'
+              size='md'
+              aria-label='Redirect'
+              isDisabled={path === currentPath || path === ''}
+              className={style.redirect}
+              icon={<IoArrowForward />}
+              onClick={() => handleRedirect(path)}
+            />
+          </div>
        </ModalBody>
-        <ModalFooter>
-          <Button size='md' variant='ontime-subtle' onClick={onClose}>
-            Cancel
-          </Button>
-          <Button size='md' variant='ontime-filled' onClick={handleRedirect} isDisabled={!canSubmit}>
-            Submit
-          </Button>
-        </ModalFooter>
      </ModalContent>
    </Modal>
  );
@@ -2,8 +2,8 @@
 // https://github.com/lukasbach/chakra-ui-contextmenu/blob/main/src/ContextMenu.tsx

 import { ReactElement } from 'react';
+import { IconType } from 'react-icons';
 import { Menu, MenuButton, MenuGroup, MenuList } from '@chakra-ui/react';
-import { IconType } from '@react-icons/all-files';
 import { create } from 'zustand';

 import { ContextMenuOption } from './ContextMenuOption';
@@ -1,7 +1,7 @@
 import { PropsWithChildren, useState } from 'react';
+import { IoCheckmark } from 'react-icons/io5';
+import { IoCopy } from 'react-icons/io5';
 import { Button, ButtonGroup, IconButton, Tooltip } from '@chakra-ui/react';
-import { IoCheckmark } from '@react-icons/all-files/io5/IoCheckmark';
-import { IoCopy } from '@react-icons/all-files/io5/IoCopy';

 import { tooltipDelayFast } from '../../../ontimeConfig';
 import { Size } from '../../models/Util.type';
@@ -1,6 +1,5 @@
+import { IoChevronDown, IoChevronUp } from 'react-icons/io5';
 import { Tooltip } from '@chakra-ui/react';
-import { IoChevronDown } from '@react-icons/all-files/io5/IoChevronDown';
-import { IoChevronUp } from '@react-icons/all-files/io5/IoChevronUp';

 import { tooltipDelayFast } from '../../../ontimeConfig';
 import { millisToDelayString } from '../../utils/dateConfig';
@@ -26,17 +26,22 @@ class ErrorBoundary extends React.Component {
      error,
      errorInfo: info,
    });
+    this.reportContent = `${error} ${info.componentStack}`;
+
+    const appState = runtimeStore.getState();
+    if (appState.ping < 0) {
+      return;
+    }

    Sentry.withScope((scope) => {
      scope.setExtras({
        error,
-        store: runtimeStore.getState(),
+        store: appState,
        hasSocket: { hasConnected, shouldReconnect, reconnectAttempts },
      });
      const eventId = Sentry.captureException(error);
      this.setState({ eventId, info });
    });
-    this.reportContent = `${error} ${info.componentStack}`;
  }

  render() {
@@ -2,14 +2,19 @@
  display: flex;
  align-items: center;
  gap: $element-spacing;
-  padding: 1rem;
-  margin-bottom: 1rem;

-  background-color: $gray-1100;
-  border-radius: 2px;
-  font-size: $inner-section-text-size;
+  background-color: $gray-1200;
+  border-radius: 3px;
+  font-size: $text-body-size;
+  padding: 1rem;
+
+  .content {
+    color: $gray-200;
+  }

  svg {
+    min-width: 1.5rem;
+    align-self: start;
    font-size: 1.5rem;
    color: $info-blue;
  }
@@ -1,13 +1,21 @@
 import { PropsWithChildren } from 'react';
-import { IoAlertCircle } from '@react-icons/all-files/io5/IoAlertCircle';
+import { IoAlertCircle } from 'react-icons/io5';
+
+import { cx } from '../../utils/styleUtils';

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

-export default function Info({ children }: PropsWithChildren) {
+interface InfoProps {
+  className?: string;
+}
+
+export default function Info(props: PropsWithChildren<InfoProps>) {
+  const { className, children } = props;
+
  return (
-    <div className={style.infoLabel}>
+    <div className={cx([style.infoLabel, className])}>
      <IoAlertCircle />
-      {children}
+      <div>{children}</div>
    </div>
  );
 }
@@ -1,4 +1,4 @@
-import { IoBan } from '@react-icons/all-files/io5/IoBan';
+import { IoBan } from 'react-icons/io5';

 import { cx } from '../../../utils/styleUtils';

@@ -1,11 +1,11 @@
 import { useCallback } from 'react';
 import { useController, UseControllerProps } from 'react-hook-form';
-import { IoEyedrop } from '@react-icons/all-files/io5/IoEyedrop';
+import { IoEyedrop } from 'react-icons/io5';
 import { ViewSettings } from 'ontime-types';

-import PopoverPicker from '../../../../common/components/input/popover-picker/PopoverPicker';
-import { debounce } from '../../../../common/utils/debounce';
+import { debounce } from '../../../utils/debounce';
 import { cx, getAccessibleColour } from '../../../utils/styleUtils';
+import PopoverPicker from '../popover-picker/PopoverPicker';

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

@@ -17,6 +17,7 @@ export default function useReactiveTextInput(
    submitOnCtrlEnter?: boolean;
    onCancelUpdate?: () => void;
    allowSubmitSameValue?: boolean;
+    allowKeyboardNavigation?: boolean;
  },
 ): UseReactiveTextInputReturn {
  const [text, setText] = useState<string>(initialText);
@@ -58,7 +59,14 @@ export default function useReactiveTextInput(
          setText(cleanVal);
        }
      }
-      setTimeout(() => ref.current?.blur()); // Immediate timeout to ensure text is set before bluring
+
+      setTimeout(() => {
+        if (options?.allowKeyboardNavigation) {
+          ref.current?.parentElement?.focus(); // Focus on parent element to continue keyboard navigation
+        } else {
+          ref.current?.blur();
+        }
+      }); // Immediate timeout to ensure text is set before blurring
    },
    [initialText, options, ref, submitCallback],
  );
@@ -70,12 +78,25 @@ export default function useReactiveTextInput(
  const handleEscape = useCallback(() => {
    // No need to update if it hasn't changed
    setText(initialText);
+    // force the text to be the initial value
+    if (ref.current) {
+      ref.current.value = initialText;
+    }
    options?.onCancelUpdate?.();
-    setTimeout(() => ref.current?.blur()); // Immediate timeout to ensure text is set before bluring
+    setTimeout(() => ref.current?.blur()); // Immediate timeout to ensure text is set before blurring
  }, [initialText, options, ref]);

  const keyHandler = useMemo(() => {
-    const hotKeys: HotkeyItem[] = [['Escape', handleEscape, { preventDefault: true }]];
+    const hotKeys: HotkeyItem[] = [
+      [
+        'Escape',
+        (event) => {
+          event.preventDefault();
+          handleEscape();
+        },
+        { preventDefault: true },
+      ],
+    ];

    if (options?.submitOnEnter) {
      hotKeys.push(['Enter', () => handleSubmit(text)]);
@@ -84,7 +105,22 @@ export default function useReactiveTextInput(
    if (options?.submitOnCtrlEnter) {
      hotKeys.push(['mod + Enter', () => handleSubmit(text)]);
    }
-    return getHotkeyHandler(hotKeys);
+
+    const hotKeyHandler = getHotkeyHandler(hotKeys);
+
+    return (event: KeyboardEvent<HTMLElement>) => {
+      // allow moving in input field with arrow keys
+      if (
+        event.key === 'ArrowLeft' ||
+        event.key === 'ArrowRight' ||
+        event.key === 'ArrowUp' ||
+        event.key === 'ArrowDown'
+      ) {
+        event.stopPropagation();
+      }
+
+      hotKeyHandler(event);
+    };
  }, [handleEscape, handleSubmit, options?.submitOnCtrlEnter, options?.submitOnEnter, text]);

  return {
@@ -0,0 +1,11 @@
+.link {
+  color: $label-gray;
+  font-size: $text-body-size;
+  text-decoration: underline;
+  text-underline-offset: 2px;
+  color: $blue-400;
+
+  &:hover {
+    color: $blue-500;
+  }
+}
@@ -0,0 +1,25 @@
+import { type PropsWithChildren } from 'react';
+import { useNavigate } from 'react-router-dom';
+
+import style from './AppLink.module.scss';
+
+interface AppLinkProps {
+  search: string;
+}
+
+/**
+ * Component used to navigate to an editor link inside the same window
+ * Handles the path to respect Ontime Clouds base URL
+ */
+export default function AppLink(props: PropsWithChildren<AppLinkProps>) {
+  const { search, children } = props;
+  const navigate = useNavigate();
+
+  const handleClick = () => navigate({ search });
+
+  return (
+    <button onClick={handleClick} className={style.link}>
+      {children}
+    </button>
+  );
+}
@@ -1,8 +1,8 @@
 import { MouseEvent, ReactNode } from 'react';
-import { IoOpenOutline } from '@react-icons/all-files/io5/IoOpenOutline';
+import { IoOpenOutline } from 'react-icons/io5';

-import { openLink } from '../../utils/linkUtils';
-import { cx } from '../../utils/styleUtils';
+import { openLink } from '../../../utils/linkUtils';
+import { cx } from '../../../utils/styleUtils';

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

@@ -14,7 +14,6 @@ interface ExternalLinkProps {

 export default function ExternalLink(props: ExternalLinkProps) {
  const { href, inline, children } = props;
-  const classes = cx([style.link, inline ? style.inline : null]);

  const handleClick = (event: MouseEvent) => {
    event.preventDefault();
@@ -22,8 +21,14 @@ export default function ExternalLink(props: ExternalLinkProps) {
  };

  return (
-    <a href='#!' target='_blank' rel='noreferrer' className={classes} onClick={handleClick}>
-      {children} <IoOpenOutline />
+    <a
+      href='#!'
+      target='_blank'
+      rel='noreferrer'
+      className={cx([style.link, inline && style.inline])}
+      onClick={handleClick}
+    >
+      {children} <IoOpenOutline style={{ fontSize: '1em' }} />
    </a>
  );
 }
@@ -1,7 +1,7 @@
-import { IoApps } from '@react-icons/all-files/io5/IoApps';
-import { IoSettingsOutline } from '@react-icons/all-files/io5/IoSettingsOutline';
+import { IoApps } from 'react-icons/io5';
+import { IoSettingsOutline } from 'react-icons/io5';

-import { useFadeOutOnInactivity } from '../../../common/hooks/useFadeOutOnInactivity';
+import { useFadeOutOnInactivity } from '../../hooks/useFadeOutOnInactivity';
 import { cx } from '../../utils/styleUtils';

 import style from './NavigationMenu.module.scss';
@@ -1,5 +1,6 @@
 import { memo, PropsWithChildren } from 'react';
 import { createPortal } from 'react-dom';
+import { IoArrowUp, IoContract, IoExpand, IoLockClosedOutline, IoSwapVertical } from 'react-icons/io5';
 import { Link, useLocation } from 'react-router-dom';
 import {
  Drawer,
@@ -11,11 +12,6 @@ import {
  useDisclosure,
 } from '@chakra-ui/react';
 import { useFullscreen } from '@mantine/hooks';
-import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';
-import { IoContract } from '@react-icons/all-files/io5/IoContract';
-import { IoExpand } from '@react-icons/all-files/io5/IoExpand';
-import { IoLockClosedOutline } from '@react-icons/all-files/io5/IoLockClosedOutline';
-import { IoSwapVertical } from '@react-icons/all-files/io5/IoSwapVertical';

 import { isLocalhost } from '../../../externals';
 import { navigatorConstants } from '../../../viewerConfig';
@@ -1,6 +1,6 @@
-import { IoLockClosedOutline } from '@react-icons/all-files/io5/IoLockClosedOutline';
+import { IoLockClosedOutline } from 'react-icons/io5';

-import { useFadeOutOnInactivity } from '../../../common/hooks/useFadeOutOnInactivity';
+import { useFadeOutOnInactivity } from '../../hooks/useFadeOutOnInactivity';
 import { cx } from '../../utils/styleUtils';

 import style from './NavigationMenu.module.scss';
@@ -1,7 +1,5 @@
+import { IoPause, IoPlay, IoStop } from 'react-icons/io5';
 import { Tooltip } from '@chakra-ui/react';
-import { IoPause } from '@react-icons/all-files/io5/IoPause';
-import { IoPlay } from '@react-icons/all-files/io5/IoPlay';
-import { IoStop } from '@react-icons/all-files/io5/IoStop';
 import { Playback } from 'ontime-types';

 import { tooltipDelayFast } from '../../../ontimeConfig';
@@ -9,10 +9,6 @@ $progress-bar-br: 3px;
  border-radius: $progress-bar-br;
  background-color: var(--timer-progress-bg-override, $viewer-card-bg-color);
  overflow: clip;
-
-  &--hidden {
-    display: none;
-  }
 }

 .progress-bar__indicator {
@@ -7,16 +7,15 @@ import './ProgressBar.scss';
 interface ProgressBarProps {
  current: MaybeNumber;
  duration: MaybeNumber;
-  hidden?: boolean;
  className?: string;
 }

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

  return (
-    <div className={`progress-bar__bg ${hidden ? 'progress-bar__bg--hidden' : ''} ${className}`}>
+    <div className={`progress-bar__bg ${className}`}>
      <div className='progress-bar__indicator' style={{ width: `${progress}%` }} />
    </div>
  );
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useState } from 'react';
+import { IoCheckmark } from 'react-icons/io5';
 import { IconButton, PinInput, PinInputField } from '@chakra-ui/react';
-import { IoCheckmark } from '@react-icons/all-files/io5/IoCheckmark';

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

@@ -1,76 +0,0 @@
-@use '../../../theme/viewerDefs' as *;
-
-.schedule {
-  width: 100%;
-  border-spacing: 50px;
-
-  .entry {
-    font-size: clamp(16px, 1.5vw, 24px);
-
-    .entry-colour {
-      background-color: var(--card-background-color-override, $viewer-card-bg-color);
-      height: clamp(8px, 0.75vw, 12px);
-      width: clamp(8px, 0.75vw, 12px);
-      border-radius: 6px;
-      display: inline-block;
-    }
-
-    .entry-times {
-      font-family: $viewer-font-family;
-      color: var(--secondary-color-override, $viewer-secondary-color);
-      font-weight: 300;
-      letter-spacing: 0.05em;
-      display: flex;
-      align-items: center;
-      gap: 8px;
-    }
-
-    .entry-title {
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-
-    .entry-secondary {
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-
-    &:not(:last-child) {
-      padding-bottom: 8px;
-    }
-
-    &--past {
-      color: var(--secondary-color-override, $viewer-secondary-color);
-    }
-
-    &--now {
-      .entry-title {
-        color: var(--accent-color-override, $accent-color);
-        font-weight: 600;
-      }
-    }
-
-    &.skip {
-      text-decoration: line-through;
-    }
-  }
-}
-
-.schedule-nav {
-  display: flex;
-  justify-content: flex-end;
-
-  .schedule-nav__item {
-    background-color: var(--card-background-color-override, $viewer-card-bg-color);
-    width: 12px;
-    height: 12px;
-    border-radius: 6px;
-    margin-left: 8px;
-
-    &--selected {
-      background-color: var(--color-override, $viewer-color);
-    }
-  }
-}
@@ -1,52 +0,0 @@
-import { useSchedule } from './ScheduleContext';
-import ScheduleItem from './ScheduleItem';
-
-import './Schedule.scss';
-
-interface ScheduleProps {
-  isProduction?: boolean;
-  className?: string;
-}
-
-export default function Schedule({ isProduction, className }: ScheduleProps) {
-  const { paginatedEvents, selectedEventId, isBackstage, scheduleType } = useSchedule();
-
-  // TODO: design a nice placeholder for empty schedules
-  if (paginatedEvents?.length < 1) {
-    return null;
-  }
-
-  let selectedState: 'past' | 'now' | 'future' = 'past';
-
-  return (
-    <ul className={`schedule ${className}`}>
-      {paginatedEvents.map((event) => {
-        if (scheduleType === 'past' || scheduleType === 'future') {
-          selectedState = scheduleType;
-        } else {
-          if (event.id === selectedEventId) {
-            selectedState = 'now';
-          } else if (selectedState === 'now') {
-            selectedState = 'future';
-          }
-        }
-
-        const timeStart = isProduction ? event.timeStart + (event?.delay ?? 0) : event.timeStart;
-        const timeEnd = isProduction ? event.timeEnd + (event?.delay ?? 0) : event.timeEnd;
-
-        return (
-          <ScheduleItem
-            key={event.id}
-            selected={selectedState}
-            timeStart={timeStart}
-            timeEnd={timeEnd}
-            title={event.title}
-            colour={isBackstage ? event.colour : ''}
-            backstageEvent={!event.isPublic}
-            skip={event.skip}
-          />
-        );
-      })}
-    </ul>
-  );
-}
@@ -1,102 +0,0 @@
-import { createContext, PropsWithChildren, useContext, useState } from 'react';
-import { useSearchParams } from 'react-router-dom';
-import { OntimeEvent } from 'ontime-types';
-
-import { isStringBoolean } from '../../../features/viewers/common/viewUtils';
-import { useInterval } from '../../hooks/useInterval';
-
-interface ScheduleContextState {
-  events: OntimeEvent[];
-  paginatedEvents: OntimeEvent[];
-  selectedEventId: string | null;
-  scheduleType: 'past' | 'now' | 'future';
-  numPages: number;
-  visiblePage: number;
-  isBackstage: boolean;
-}
-
-const ScheduleContext = createContext<ScheduleContextState | undefined>(undefined);
-
-interface ScheduleProviderProps {
-  events: OntimeEvent[];
-  selectedEventId: string | null;
-  isBackstage?: boolean;
-  time?: number;
-}
-
-const numEventsPerPage = 8;
-
-export const ScheduleProvider = ({
-  children,
-  events,
-  selectedEventId,
-  isBackstage = false,
-  time = 10,
-}: PropsWithChildren<ScheduleProviderProps>) => {
-  const [visiblePage, setVisiblePage] = useState(0);
-  const [searchParams] = useSearchParams();
-
-  // look for overrides from views
-  const hidePast = isStringBoolean(searchParams.get('hidePast'));
-  const stopCycle = isStringBoolean(searchParams.get('stopCycle'));
-  const eventsPerPage = Number(searchParams.get('eventsPerPage') ?? numEventsPerPage);
-
-  let selectedEventIndex = events.findIndex((event) => event.id === selectedEventId);
-
-  const viewEvents = [...events];
-  if (hidePast) {
-    // we want to show the event after the next
-    viewEvents.splice(0, selectedEventIndex + 2);
-    selectedEventIndex = 0;
-  }
-
-  const numPages = Math.ceil(viewEvents.length / eventsPerPage);
-  const eventStart = eventsPerPage * visiblePage;
-  const eventEnd = eventsPerPage * (visiblePage + 1);
-  const paginatedEvents = viewEvents.slice(eventStart, eventEnd);
-
-  const resolveScheduleType = () => {
-    if (selectedEventIndex >= eventStart && selectedEventIndex < eventEnd) {
-      return 'now';
-    }
-    if (selectedEventIndex > eventEnd) {
-      return 'past';
-    }
-    return 'future';
-  };
-  const scheduleType = resolveScheduleType();
-
-  // every SCROLL_TIME go to the next array
-  useInterval(() => {
-    if (stopCycle) {
-      setVisiblePage(0);
-    } else if (events.length > eventsPerPage) {
-      const next = (visiblePage + 1) % numPages;
-      setVisiblePage(next);
-    }
-  }, time * 1000);
-
-  return (
-    <ScheduleContext.Provider
-      value={{
-        events,
-        paginatedEvents,
-        selectedEventId,
-        scheduleType,
-        numPages,
-        visiblePage,
-        isBackstage,
-      }}
-    >
-      {children}
-    </ScheduleContext.Provider>
-  );
-};
-
-export const useSchedule = () => {
-  const context = useContext(ScheduleContext);
-  if (!context) {
-    throw new Error('useSchedule() can only be used inside a ScheduleContext');
-  }
-  return context;
-};
@@ -1,43 +0,0 @@
-import SuperscriptTime from '../../../features/viewers/common/superscript-time/SuperscriptTime';
-import { formatTime } from '../../utils/time';
-
-import './Schedule.scss';
-
-const formatOptions = {
-  format12: 'hh:mm a',
-  format24: 'HH:mm',
-};
-
-interface ScheduleItemProps {
-  selected: 'past' | 'now' | 'future';
-  timeStart: number;
-  timeEnd: number;
-  title: string;
-  backstageEvent: boolean;
-  colour: string;
-  skip: boolean;
-}
-
-export default function ScheduleItem(props: ScheduleItemProps) {
-  const { selected, timeStart, timeEnd, title, backstageEvent, colour, skip } = props;
-
-  const start = formatTime(timeStart, formatOptions);
-  const end = formatTime(timeEnd, formatOptions);
-  const userColour = colour !== '' ? colour : '';
-  const selectStyle = `entry--${selected}`;
-
-  return (
-    <li className={`entry ${selectStyle} ${skip ? 'skip' : ''}`}>
-      <div className='entry-times'>
-        <span className='entry-colour' style={{ backgroundColor: userColour }} />
-        <div style={{ display: 'flex' }}>
-          <SuperscriptTime time={start} />
-          {' → '}
-          <SuperscriptTime time={end} />
-          {backstageEvent ? '*' : ''}
-        </div>
-      </div>
-      <div className='entry-title'>{title}</div>
-    </li>
-  );
-}
@@ -1,23 +0,0 @@
-import { useSchedule } from './ScheduleContext';
-
-import './Schedule.scss';
-
-interface ScheduleNavProps {
-  className?: string;
-}
-
-export default function ScheduleNav({ className }: ScheduleNavProps) {
-  const { numPages, visiblePage } = useSchedule();
-
-  return (
-    <div className={`schedule-nav ${className}`}>
-      {numPages > 1 &&
-        [...Array(numPages).keys()].map((i) => (
-          <div
-            key={i}
-            className={i === visiblePage ? 'schedule-nav__item schedule-nav__item--selected' : 'schedule-nav__item'}
-          />
-        ))}
-    </div>
-  );
-}
@@ -5,7 +5,7 @@

  .empty {
    width: 100%;
-    opacity: 0.6;
+    opacity: 0.8;
  }

  .text {
@@ -1,18 +1,20 @@
 import { CSSProperties } from 'react';

 import EmptyImage from '../../../assets/images/empty.svg?react';
+import { cx } from '../../utils/styleUtils';

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

 interface EmptyProps {
  text?: string;
  style?: CSSProperties;
+  className?: string;
 }

 export default function Empty(props: EmptyProps) {
-  const { text, ...rest } = props;
+  const { text, className, ...rest } = props;
  return (
-    <div className={style.emptyContainer} {...rest}>
+    <div className={cx([style.emptyContainer, className])} {...rest}>
      <EmptyImage className={style.empty} />
      {text && <span className={style.text}>{text}</span>}
    </div>
@@ -1,8 +1,5 @@
@use '../../../theme/viewerDefs' as *;

-$title-primary-size: clamp(1.5rem, 3vw, 3rem);
-$title-secondary-size: clamp(1rem, 2vw, 2.25rem);
-
 .title-card {
  position: relative;
  display: flex;
@@ -10,21 +7,23 @@ $title-secondary-size: clamp(1rem, 2vw, 2.25rem);
 }

 .title-card__title,
-.title-card__secondary {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.title-card__title {
+.title-card__placeholder {
  font-weight: 600;
-  font-size: $title-primary-size;
-  color: var(--color-override, $viewer-color);
+  font-size: $title-font-size;
  line-height: 1.2em;
 }

+.title-card__title {
+  color: var(--color-override, $viewer-color);
+  padding-right: 1em;
+}
+
+.title-card__placeholder {
+  color: var(--label-color-override, $viewer-label-color);
+}
+
 .title-card__secondary {
-  font-size: $title-secondary-size;
+  font-size: $base-font-size;
  color: var(--secondary-color-override, $viewer-secondary-color);
  line-height: 1.2em;
 }
@@ -35,7 +34,6 @@ $title-secondary-size: clamp(1rem, 2vw, 2.25rem);
  top: 0.5rem;
  font-size: $timer-label-size;
  color: var(--secondary-color-override, $viewer-secondary-color);
-  margin-left: auto;
  text-transform: uppercase;

  &--accent {
@@ -1,6 +1,7 @@
 import { ForwardedRef, forwardRef } from 'react';

 import { useTranslation } from '../../../translation/TranslationProvider';
+import { cx } from '../../utils/styleUtils';

 import './TitleCard.scss';

@@ -18,9 +19,9 @@ const TitleCard = forwardRef((props: TitleCardProps, ref: ForwardedRef<HTMLDivEl
  const accent = label === 'now';

  return (
-    <div className={`title-card ${className}`} ref={ref}>
+    <div className={cx(['title-card', className])} ref={ref}>
      <span className='title-card__title'>{title}</span>
-      <span className={accent ? 'title-card__label title-card__label--accent' : 'title-card__label'}>
+      <span className={cx(['title-card__label', accent && 'title-card__label--accent'])}>
        {label && getLocalizedString(`common.${label}`)}
      </span>
      <div className='title-card__secondary'>{secondary}</div>
@@ -0,0 +1,5 @@
+.viewLogo {
+  max-width: 100%;
+  max-height: 75px;
+  display: block;
+}
@@ -1,5 +1,7 @@
 import { projectLogoPath } from '../../api/constants';

+import './ViewLogo.scss';
+
 interface ViewLogoProps {
  name: string;
  className: string;
@@ -7,5 +9,11 @@ interface ViewLogoProps {

 export default function ViewLogo(props: ViewLogoProps) {
  const { name, className } = props;
-  return <img src={`${projectLogoPath}/${name}`} className={className} />;
+
+  // we wrap the image in a div to help maintain the aspect ratio
+  return (
+    <div className={className}>
+      <img alt='' src={`${projectLogoPath}/${name}`} className='viewLogo' />
+    </div>
+  );
 }
@@ -1,4 +1,5 @@
 import { useState } from 'react';
+import { IoChevronDown } from 'react-icons/io5';
 import { useSearchParams } from 'react-router-dom';
 import {
  Button,
@@ -13,7 +14,6 @@ import {
  Select,
  Switch,
 } from '@chakra-ui/react';
-import { IoChevronDown } from '@react-icons/all-files/io5/IoChevronDown';

 import { isStringBoolean } from '../../../features/viewers/common/viewUtils';

@@ -126,9 +126,9 @@ function MultiOption(props: EditFormMultiOptionProps) {
            onChange={(value) => setParamState(Array.isArray(value) ? value : [value])}
          >
            {Object.values(paramField.values).map((option) => {
-              const { value, label } = option;
+              const { value, label, colour } = option;
              return (
-                <MenuItemOption value={value} key={value}>
+                <MenuItemOption value={value} key={value} style={{ borderRight: `8px solid ${colour}` }}>
                  {label}
                </MenuItemOption>
              );
@@ -16,3 +16,7 @@
  overflow-y: scroll;
  padding-right: 0.5rem;
 }
+
+.info {
+  margin-bottom: 1rem;
+}
@@ -12,7 +12,7 @@ import {
  useDisclosure,
 } from '@chakra-ui/react';

-import useViewSettings from '../../../common/hooks-query/useViewSettings';
+import useViewSettings from '../../hooks-query/useViewSettings';
 import Info from '../info/Info';

 import { ViewOption } from './types';
@@ -132,7 +132,9 @@ export default function ViewParamsEditor({ viewOptions }: EditFormDrawerProps) {
        </DrawerHeader>

        <DrawerBody>
-          {viewSettings.overrideStyles && <Info>This view style is being modified by a custom CSS file.</Info>}
+          {viewSettings.overrideStyles && (
+            <Info className={style.info}>This view style is being modified by a custom CSS file.</Info>
+          )}
          <form id='edit-params-form' onSubmit={onParamsFormSubmit} className={style.sectionList}>
            {viewOptions.map((section) => (
              <ViewParamsSection
@@ -1,6 +1,7 @@
+import { IoChevronDown } from 'react-icons/io5';
 import { useLocalStorage } from '@mantine/hooks';
-import { IoChevronDown } from '@react-icons/all-files/io5/IoChevronDown';

+import { baseURI } from '../../../externals';
 import { cx } from '../../utils/styleUtils';

 import ParamInput from './ParamInput';
@@ -17,7 +18,7 @@ interface ViewParamsSectionProps {
 export default function ViewParamsSection(props: ViewParamsSectionProps) {
  const { title, collapsible, options } = props;

-  const [collapsed, setCollapsed] = useLocalStorage({ key: `params-${title}`, defaultValue: false });
+  const [collapsed, setCollapsed] = useLocalStorage({ key: `${baseURI}params-${title}`, defaultValue: false });

  const handleCollapse = () => {
    if (collapsible) {
@@ -0,0 +1,45 @@
+import { CustomFields } from 'ontime-types';
+
+import { makeOptionsFromCustomFields } from '../constants';
+
+describe('makeOptionsFromCustomFields', () => {
+  const testCustomFields: CustomFields = {
+    field1: { label: 'Field 1', colour: 'red', type: 'string' },
+    field2: { label: 'Field 2', colour: 'blue', type: 'string' },
+  };
+
+  it('creates a record of keys for the given custom fields', () => {
+    const result = makeOptionsFromCustomFields(testCustomFields);
+    expect(result).toStrictEqual({
+      'custom-field1': 'Custom: Field 1',
+      'custom-field2': 'Custom: Field 2',
+    });
+  });
+
+  it('appends additional data', () => {
+    const additionalData = {
+      test1: 'test1',
+      test2: 'test2',
+    };
+    const result = makeOptionsFromCustomFields(testCustomFields, additionalData);
+    expect(result).toStrictEqual({
+      'custom-field1': 'Custom: Field 1',
+      'custom-field2': 'Custom: Field 2',
+      test1: 'test1',
+      test2: 'test2',
+    });
+  });
+
+  it('filtersImageTypes', () => {
+    const customFieldsWIthImage: CustomFields = {
+      ...testCustomFields,
+      field3: { label: 'Field 3', colour: 'green', type: 'image' },
+    };
+
+    const result = makeOptionsFromCustomFields(customFieldsWIthImage);
+    expect(result).toStrictEqual({
+      'custom-field1': 'Custom: Field 1',
+      'custom-field2': 'Custom: Field 2',
+    });
+  });
+});
@@ -1,17 +1,34 @@
 import { CustomFields } from 'ontime-types';

-import type { ParamField } from './types';
+import type { MultiselectOptions, ParamField } from './types';

 export const makeOptionsFromCustomFields = (
  customFields: CustomFields,
-  additionalOptions: Record<string, string> = {},
+  additionalOptions: Readonly<Record<string, string>> = {},
+  filterImageType = true,
 ) => {
-  return Object.entries(customFields).reduce((options, [key, value]) => {
+  const options = { ...additionalOptions };
+  for (const [key, value] of Object.entries(customFields)) {
+    if (filterImageType && value.type === 'image') {
+      continue;
+    }
+
    options[`custom-${key}`] = `Custom: ${value.label}`;
-    return options;
-  }, additionalOptions);
+  }
+  return options;
 };

+export function makeCustomFieldSelectOptions(customFields: CustomFields, filterImageType = true): MultiselectOptions {
+  const options: MultiselectOptions = {};
+  for (const [key, value] of Object.entries(customFields)) {
+    if (filterImageType && value.type === 'image') {
+      continue;
+    }
+    options[key] = { value: key, label: value.label, colour: value.colour };
+  }
+  return options;
+}
+
 export const getTimeOption = (timeFormat: string): ParamField => {
  const placeholder = `${timeFormat} (default)`;
  return {
@@ -12,9 +12,11 @@ type OptionsField = {
  defaultValue?: string;
 };

+export type MultiselectOption = { value: string; label: string; colour: string };
+export type MultiselectOptions = Record<string, MultiselectOption>;
 type MultiOptionsField = {
  type: 'multi-option';
-  values: Record<string, { value: string; label: string; colour: string }>;
+  values: MultiselectOptions;
  defaultValue?: string;
 };

@@ -1,5 +1,6 @@
 import { createContext, PropsWithChildren, useCallback, useEffect, useState } from 'react';

+import { baseURI } from '../../externals';
 import useSettings from '../hooks-query/useSettings';

 interface AppContextType {
@@ -26,7 +27,7 @@ export const AppContextProvider = ({ children }: PropsWithChildren) => {

  useEffect(() => {
    if (status === 'pending') return;
-    const previousEditor = sessionStorage.getItem(storageKeys.editor);
+    const previousEditor = sessionStorage.getItem(`${baseURI}${storageKeys.editor}`);

    if (previousEditor && previousEditor === data.editorKey) {
      setEditorAuth(true);
@@ -34,7 +35,7 @@ export const AppContextProvider = ({ children }: PropsWithChildren) => {
      setEditorAuth(data.editorKey == null || data.editorKey === '');
    }

-    const previousOperator = sessionStorage.getItem(storageKeys.operator);
+    const previousOperator = sessionStorage.getItem(`${baseURI}${storageKeys.operator}`);
    if (previousOperator && previousOperator === data.operatorKey) {
      setOperatorAuth(true);
    } else {
@@ -55,14 +56,14 @@ export const AppContextProvider = ({ children }: PropsWithChildren) => {
      if (permission === 'editor') {
        const correct = isValid(pin, data.editorKey);
        if (correct) {
-          sessionStorage.setItem(storageKeys.editor, pin);
+          sessionStorage.setItem(`${baseURI}${storageKeys.editor}`, pin);
        }
        setEditorAuth(correct);
        return correct;
      } else if (permission === 'operator') {
        const correct = isValid(pin, data.operatorKey);
        if (correct) {
-          sessionStorage.setItem(storageKeys.operator, pin);
+          sessionStorage.setItem(`${baseURI}${storageKeys.operator}`, pin);
        }
        setOperatorAuth(correct);
        return correct;
@@ -0,0 +1,20 @@
+import { useQuery } from '@tanstack/react-query';
+import { OntimeReport } from 'ontime-types';
+import { MILLIS_PER_HOUR } from 'ontime-utils';
+
+import { REPORT } from '../api/constants';
+import { fetchReport } from '../api/report';
+
+export default function useReport() {
+  const { data, refetch } = useQuery<OntimeReport>({
+    queryKey: REPORT,
+    queryFn: fetchReport,
+    placeholderData: (previousData, _previousQuery) => previousData,
+    retry: 5,
+    retryDelay: (attempt) => attempt * 2500,
+    networkMode: 'always',
+    staleTime: MILLIS_PER_HOUR,
+  });
+
+  return { data: data ?? {}, refetch };
+}
@@ -1,6 +1,6 @@
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { useQuery } from '@tanstack/react-query';
-import { NormalisedRundown, OntimeRundown, RundownCached } from 'ontime-types';
+import { NormalisedRundown, OntimeRundown, OntimeRundownEntry, RundownCached } from 'ontime-types';

 import { queryRefetchIntervalSlow } from '../../ontimeConfig';
 import { RUNDOWN } from '../api/constants';
@@ -11,6 +11,9 @@ import useProjectData from './useProjectData';
 // revision is -1 so that the remote revision is higher
 const cachedRundownPlaceholder = { order: [] as string[], rundown: {} as NormalisedRundown, revision: -1 };

+/**
+ * Normalised rundown data
+ */
 export default function useRundown() {
  const { data, status, isError, refetch, isFetching } = useQuery<RundownCached>({
    queryKey: RUNDOWN,
@@ -24,6 +27,10 @@ export default function useRundown() {
  return { data: data ?? cachedRundownPlaceholder, status, isError, refetch, isFetching };
 }

+/**
+ * Provides access to a flat rundown
+ * built from the order and rundown fields
+ */
 export function useFlatRundown() {
  const { data, status } = useRundown();
  const { data: projectData } = useProjectData();
@@ -34,7 +41,7 @@ export function useFlatRundown() {

  // update data whenever the revision changes
  useEffect(() => {
-    if (data.revision !== -1 && data.revision !== prevRevision) {
+    if (data.revision !== -1 || data.revision !== prevRevision) {
      const flatRundown = data.order.map((id) => data.rundown[id]);
      setFlatRunDown(flatRundown);
      setPrevRevision(data.revision);
@@ -52,3 +59,15 @@ export function useFlatRundown() {

  return { data: flatRunDown, status };
 }
+
+/**
+ * Provides access to a partial rundown based on a filter callback
+ */
+export function usePartialRundown(cb: (event: OntimeRundownEntry) => boolean) {
+  const { data, status } = useFlatRundown();
+  const filteredData = useMemo(() => {
+    return data.filter(cb);
+  }, [data, cb]);
+
+  return { data: filteredData, status };
+}
@@ -1,5 +1,6 @@
 import { useEffect } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
+import { useShallow } from 'zustand/shallow';

 import { useClientStore } from '../stores/clientStore';
 import { socketSendJson } from '../utils/socket';
@@ -9,10 +10,12 @@ import { useIsOnline } from './useSocket';
 export const useClientPath = () => {
  const navigate = useNavigate();
  const { pathname, search } = useLocation();
-  const { redirect, setRedirect } = useClientStore((store) => ({
-    redirect: store.redirect,
-    setRedirect: store.setRedirect,
-  }));
+  const { redirect, setRedirect } = useClientStore(
+    useShallow((store) => ({
+      redirect: store.redirect,
+      setRedirect: store.setRedirect,
+    })),
+  );
  const isOnline = useIsOnline();

  // notify of client path changes
@@ -55,6 +55,17 @@ export const useEventAction = () => {
    defaultEndAction,
  } = useEditorSettings();

+  const getEventById = useCallback(
+    (eventId: string) => {
+      const cachedRundown = queryClient.getQueryData<RundownCached>(RUNDOWN);
+      if (!cachedRundown?.rundown) {
+        return;
+      }
+      return cachedRundown.rundown[eventId];
+    },
+    [queryClient],
+  );
+
  /**
   * Calls mutation to add new event
   * @private
@@ -615,6 +626,7 @@ export const useEventAction = () => {
    batchUpdateEvents,
    deleteEvent,
    deleteAllEvents,
+    getEventById,
    reorderEvent,
    swapEvents,
    updateEvent,
@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';

-import { throttle } from '../../common/utils/throttle';
+import { throttle } from '../utils/throttle';
+

 export const useFadeOutOnInactivity = () => {
  const [isMouseMoved, setIsMouseMoved] = useState(false);
@@ -1,27 +0,0 @@
-import { useEffect, useRef } from 'react';
-
-/**
- * @description utility hook to around setInterval
- * @param callback
- * @param delay
- */
-export const useInterval = (callback, delay) => {
-  const savedCallback = useRef();
-
-  useEffect(() => {
-    savedCallback.current = callback;
-  }, [callback]);
-
-  useEffect(() => {
-    /**
-     * @description function to be called
-     */
-    function tick() {
-      savedCallback.current();
-    }
-    if (delay !== null) {
-      const id = setInterval(tick, delay);
-      return () => clearInterval(id);
-    }
-  }, [delay]);
-};
@@ -1,75 +1,56 @@
-import { RuntimeStore, SimpleDirection, SimplePlayback, TimerMessage } from 'ontime-types';
+import { OffsetMode, RuntimeStore, SimpleDirection, SimplePlayback, TimerMessage } from 'ontime-types';

 import { useRuntimeStore } from '../stores/runtime';
 import { socketSendJson } from '../utils/socket';

+const createSelector =
+  <T>(selector: (state: RuntimeStore) => T) =>
+  () =>
+    useRuntimeStore(selector);
+
 export const setClientRemote = {
  setIdentify: (payload: { target: string; identify: boolean }) => socketSendJson('client', payload),
  setRedirect: (payload: { target: string; redirect: string }) => socketSendJson('client', payload),
  setClientName: (payload: { target: string; rename: string }) => socketSendJson('client', payload),
 };

-export const useRundownEditor = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    playback: state.timer.playback,
-    selectedEventId: state.eventNow?.id ?? null,
-    nextEventId: state.eventNext?.id ?? null,
-  });
+export const useRundownEditor = createSelector((state: RuntimeStore) => ({
+  playback: state.timer.playback,
+  selectedEventId: state.eventNow?.id ?? null,
+  nextEventId: state.eventNext?.id ?? null,
+}));

-  return useRuntimeStore(featureSelector);
-};
+export const useOperator = createSelector((state: RuntimeStore) => ({
+  playback: state.timer.playback,
+  selectedEventId: state.eventNow?.id ?? null,
+}));

-export const useOperator = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    playback: state.timer.playback,
-    selectedEventId: state.eventNow?.id ?? null,
-  });
+export const useTimerViewControl = createSelector((state: RuntimeStore) => ({
+  blackout: state.message.timer.blackout,
+  blink: state.message.timer.blink,
+  secondarySource: state.message.timer.secondarySource,
+}));

-  return useRuntimeStore(featureSelector);
-};
+export const useTimerMessageInput = createSelector((state: RuntimeStore) => ({
+  text: state.message.timer.text,
+  visible: state.message.timer.visible,
+}));

-export const useTimerViewControl = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    blackout: state.message.timer.blackout,
-    blink: state.message.timer.blink,
-    secondarySource: state.message.timer.secondarySource,
-  });
+export const useExternalMessageInput = createSelector((state: RuntimeStore) => ({
+  text: state.message.external,
+  visible: state.message.timer.secondarySource === 'external',
+}));

-  return useRuntimeStore(featureSelector);
-};
-
-export const useTimerMessageInput = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    text: state.message.timer.text,
-    visible: state.message.timer.visible,
-  });
-
-  return useRuntimeStore(featureSelector);
-};
-
-export const useExternalMessageInput = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    text: state.message.external,
-    visible: state.message.timer.secondarySource === 'external',
-  });
-
-  return useRuntimeStore(featureSelector);
-};
-
-export const useMessagePreview = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    blink: state.message.timer.blink,
-    blackout: state.message.timer.blackout,
-    phase: state.timer.phase,
-    showAuxTimer: state.message.timer.secondarySource === 'aux',
-    showExternalMessage: state.message.timer.secondarySource === 'external' && Boolean(state.message.external),
-    showTimerMessage: state.message.timer.visible && Boolean(state.message.timer.text),
-    timerType: state.eventNow?.timerType ?? null,
-    countToEnd: state.eventNow?.countToEnd ?? false,
-  });
-
-  return useRuntimeStore(featureSelector);
-};
+export const useMessagePreview = createSelector((state: RuntimeStore) => ({
+  blink: state.message.timer.blink,
+  blackout: state.message.timer.blackout,
+  phase: state.timer.phase,
+  showAuxTimer: state.message.timer.secondarySource === 'aux',
+  showExternalMessage: state.message.timer.secondarySource === 'external' && Boolean(state.message.external),
+  showTimerMessage: state.message.timer.visible && Boolean(state.message.timer.text),
+  timerType: state.eventNow?.timerType ?? null,
+  countToEnd: state.eventNow?.countToEnd ?? false,
+}));

 export const setMessage = {
  timerText: (payload: string) => socketSendJson('message', { timer: { text: payload } }),
@@ -81,16 +62,12 @@ export const setMessage = {
    socketSendJson('message', { timer: { secondarySource: payload } }),
 };

-export const usePlaybackControl = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    playback: state.timer.playback,
-    selectedEventIndex: state.runtime.selectedEventIndex,
-    numEvents: state.runtime.numEvents,
-    timerPhase: state.timer.phase,
-  });
-
-  return useRuntimeStore(featureSelector);
-};
+export const usePlaybackControl = createSelector((state: RuntimeStore) => ({
+  playback: state.timer.playback,
+  selectedEventIndex: state.runtime.selectedEventIndex,
+  numEvents: state.runtime.numEvents,
+  timerPhase: state.timer.phase,
+}));

 export const setPlayback = {
  start: () => socketSendJson('start'),
@@ -114,32 +91,20 @@ export const setPlayback = {
  },
 };

-export const useInfoPanel = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    eventNow: state.eventNow,
-    eventNext: state.eventNext,
-    playback: state.timer.playback,
-    selectedEventIndex: state.runtime.selectedEventIndex,
-    numEvents: state.runtime.numEvents,
-  });
+export const useInfoPanel = createSelector((state: RuntimeStore) => ({
+  eventNow: state.eventNow,
+  eventNext: state.eventNext,
+  playback: state.timer.playback,
+  selectedEventIndex: state.runtime.selectedEventIndex,
+  numEvents: state.runtime.numEvents,
+}));

-  return useRuntimeStore(featureSelector);
-};
+export const useAuxTimerTime = createSelector((state: RuntimeStore) => state.auxtimer1.current);

-export const useAuxTimerTime = () => {
-  const featureSelector = (state: RuntimeStore) => state.auxtimer1.current;
-
-  return useRuntimeStore(featureSelector);
-};
-
-export const useAuxTimerControl = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    playback: state.auxtimer1.playback,
-    direction: state.auxtimer1.direction,
-  });
-
-  return useRuntimeStore(featureSelector);
-};
+export const useAuxTimerControl = createSelector((state: RuntimeStore) => ({
+  playback: state.auxtimer1.playback,
+  direction: state.auxtimer1.direction,
+}));

 export const setAuxTimer = {
  start: () => socketSendJson('auxtimer', { '1': SimplePlayback.Start }),
@@ -149,20 +114,13 @@ export const setAuxTimer = {
  setDuration: (time: number) => socketSendJson('auxtimer', { '1': { duration: time } }),
 };

-export const useSelectedEventId = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    selectedEventId: state.eventNow?.id ?? null,
-  });
+export const useSelectedEventId = createSelector((state: RuntimeStore) => ({
+  selectedEventId: state.eventNow?.id ?? null,
+}));

-  return useRuntimeStore(featureSelector);
-};
-
-export const useCurrentBlockId = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    currentBlockId: state.currentBlock.block?.id ?? null,
-  });
-  return useRuntimeStore(featureSelector);
-};
+export const useCurrentBlockId = createSelector((state: RuntimeStore) => ({
+  currentBlockId: state.currentBlock.block?.id ?? null,
+}));

 export const setEventPlayback = {
  loadEvent: (id: string) => socketSendJson('load', { id }),
@@ -171,81 +129,78 @@ export const setEventPlayback = {
  pause: () => socketSendJson('pause'),
 };

-export const useTimer = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    ...state.timer,
-  });
+export const useTimer = createSelector((state: RuntimeStore) => ({
+  ...state.timer,
+}));

-  return useRuntimeStore(featureSelector);
-};
-
-export const useClock = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    clock: state.clock,
-  });
-  return useRuntimeStore(featureSelector);
-};
+export const useClock = createSelector((state: RuntimeStore) => ({
+  clock: state.clock,
+}));

 /** Used by the progress bar components */
-export const useProgressData = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    current: state.timer.current,
-    duration: state.timer.duration,
-    timeWarning: state.eventNow?.timeWarning ?? null,
-    timeDanger: state.eventNow?.timeDanger ?? null,
-  });
-  return useRuntimeStore(featureSelector);
-};
+export const useProgressData = createSelector((state: RuntimeStore) => ({
+  current: state.timer.current,
+  duration: state.timer.duration,
+  timeWarning: state.eventNow?.timeWarning ?? null,
+  timeDanger: state.eventNow?.timeDanger ?? null,
+}));

 export const setClientName = (newName: string) => socketSendJson('set-client-name', newName);

-export const useRuntimeOverview = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    plannedStart: state.runtime.plannedStart,
-    actualStart: state.runtime.actualStart,
-    plannedEnd: state.runtime.plannedEnd,
-    expectedEnd: state.runtime.expectedEnd,
-  });
+export const useRuntimeOverview = createSelector((state: RuntimeStore) => ({
+  plannedStart: state.runtime.plannedStart,
+  actualStart: state.runtime.actualStart,
+  plannedEnd: state.runtime.plannedEnd,
+  expectedEnd: state.runtime.expectedEnd,
+}));

-  return useRuntimeStore(featureSelector);
-};
+export const useRuntimePlaybackOverview = createSelector((state: RuntimeStore) => ({
+  playback: state.timer.playback,
+  clock: state.clock,

-export const useRuntimePlaybackOverview = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    playback: state.timer.playback,
-    clock: state.clock,
+  numEvents: state.runtime.numEvents,
+  selectedEventIndex: state.runtime.selectedEventIndex,
+  offset: state.runtime.offsetMode === OffsetMode.Absolute ? state.runtime.offset : state.runtime.relativeOffset,

-    numEvents: state.runtime.numEvents,
-    selectedEventIndex: state.runtime.selectedEventIndex,
-    offset: state.runtime.offset,
+  currentBlock: state.currentBlock,
+}));

-    currentBlock: state.currentBlock,
-  });
+export const useTimelineStatus = createSelector((state: RuntimeStore) => ({
+  clock: state.clock,
+  offset: state.runtime.offset,
+}));

-  return useRuntimeStore(featureSelector);
-};
+export const useTimeUntilData = createSelector((state: RuntimeStore) => ({
+  clock: state.clock,
+  offset: state.runtime.offsetMode === OffsetMode.Absolute ? state.runtime.offset : state.runtime.relativeOffset,
+  offsetMode: state.runtime.offsetMode,
+  currentDay: state.eventNow?.dayOffset ?? 0, //The day of the currently running event
+  actualStart: state.runtime.actualStart,
+  plannedStart: state.runtime.plannedStart,
+}));

-export const useTimelineStatus = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    clock: state.clock,
-    offset: state.runtime.offset,
-  });
+export const useRuntimeOffset = createSelector((state: RuntimeStore) => ({
+  offset: state.runtime.offset,
+}));

-  return useRuntimeStore(featureSelector);
-};
-
-export const usePing = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    ping: state.ping,
-  });
-
-  return useRuntimeStore(featureSelector);
-};
+export const usePing = createSelector((state: RuntimeStore) => ({
+  ping: state.ping,
+}));

 /** convert ping into a derived value which changes less often */
-export const useIsOnline = () => {
+export const useIsOnline = createSelector((state: RuntimeStore) => ({
+  isOnline: state.ping > 0,
+}));
+
+export const useOffsetMode = createSelector((state: RuntimeStore) => ({
+  offsetMode: state.runtime.offsetMode,
+}));
+
+export const setOffsetMode = (payload: OffsetMode) => socketSendJson('offsetmode', payload);
+
+export const usePlayback = () => {
  const featureSelector = (state: RuntimeStore) => ({
-    isOnline: state.ping > 0,
+    playback: state.timer.playback,
  });

  return useRuntimeStore(featureSelector);
@@ -8,4 +8,5 @@ export const projectDataPlaceholder: ProjectData = {
  backstageUrl: '',
  backstageInfo: '',
  projectLogo: null,
+  custom: [],
 };
@@ -1,12 +1,14 @@
 import { create } from 'zustand';

+import { baseURI } from '../../externals';
+
 export enum AppMode {
  Run = 'run',
  Edit = 'edit',
  Freeze = 'freeze',
 }

-const appModeKey = 'ontime-app-mode';
+const appModeKey = `${baseURI}ontime-app-mode`;

 function getModeFromSession() {
  return sessionStorage.getItem(appModeKey) === AppMode.Run ? AppMode.Run : AppMode.Edit;
@@ -1,6 +1,8 @@
 import { ClientList } from 'ontime-types';
 import { create } from 'zustand';

+import { baseURI } from '../../externals';
+
 interface ClientStore {
  name?: string;
  setName: (newValue: string) => void;
@@ -15,7 +17,7 @@ interface ClientStore {
  setClients: (clients: ClientList) => void;
 }

-const clientNameKey = 'ontime-client-name';
+const clientNameKey = `${baseURI}ontime-client-name`;

 function persistNameInStorage(newValue: string) {
  localStorage.setItem(clientNameKey, newValue);
@@ -1,6 +1,8 @@
+// eslint-disable-next-line simple-import-sort/imports
 import { create } from 'zustand';

 import { booleanFromLocalStorage } from '../utils/localStorage';
+import { baseURI } from '../../externals';

 enum LocalEventKeys {
  Mirror = 'ontime-view-mirror',
@@ -12,11 +14,11 @@ type ViewOptionsStore = {
 };

 export const useViewOptionsStore = create<ViewOptionsStore>()((set) => ({
-  mirror: booleanFromLocalStorage(LocalEventKeys.Mirror, false),
+  mirror: booleanFromLocalStorage(`${baseURI}${LocalEventKeys.Mirror}`, false),
  toggleMirror: (newValue?: boolean) =>
    set((state) => {
      const val = typeof newValue === 'undefined' ? !state.mirror : newValue;
-      localStorage.setItem(LocalEventKeys.Mirror, String(val));
+      localStorage.setItem(`${baseURI}${LocalEventKeys.Mirror}`, String(val));
      return { mirror: val };
    }),
 }));
@@ -2,4 +2,4 @@

 exports[`cx() > ignores falsy values 1`] = `""`;

-exports[`cx() > merges styles 1`] = `"_test_98a1e0 _another_98a1e0"`;
+exports[`cx() > merges styles 1`] = `"_test_d5d33f _another_d5d33f"`;
@@ -0,0 +1,13 @@
+import { makeCSVFromArrayOfArrays } from '../csv';
+
+describe('makeCSVFromArrayOfArrays()', () => {
+  it('joins an array of arrays with commas and newlines', () => {
+    const testdata = [['field'], ['after newline', 'after comma'], ['', 'after empty']];
+    expect(makeCSVFromArrayOfArrays(testdata)).toMatchInlineSnapshot(`
+"field
+after newline,after comma
+,after empty
+"
+`);
+  });
+});
@@ -1,10 +1,10 @@
-import { EndAction, EventCustomFields, OntimeEvent, SupportedEvent, TimerType } from 'ontime-types';
+import { EndAction, EventCustomFields, OntimeEvent, SupportedEvent, TimerType, TimeStrategy } from 'ontime-types';

 import { cloneEvent } from '../eventsManager';

 describe('cloneEvent()', () => {
  it('creates a stem from a given event', () => {
-    const original = {
+    const original: OntimeEvent = {
      id: 'unique',
      type: SupportedEvent.Event,
      title: 'title',
@@ -14,6 +14,9 @@ describe('cloneEvent()', () => {
      duration: 10,
      timeEnd: 10,
      timerType: TimerType.CountDown,
+      timeStrategy: TimeStrategy.LockEnd,
+      linkStart: null,
+      countToEnd: false,
      endAction: EndAction.None,
      isPublic: false,
      skip: false,
@@ -21,29 +24,39 @@ describe('cloneEvent()', () => {
      revision: 10,
      timeWarning: 120000,
      timeDanger: 60000,
+      delay: 0,
+      dayOffset: 0,
+      gap: 0,
      custom: {
        lighting: '3',
      } as EventCustomFields,
-    } as OntimeEvent;
+    };

    const cloned = cloneEvent(original);
    expect(cloned).not.toBe(original);
-    // @ts-expect-error -- safeguarding this
-    expect(cloned?.id).toBe(undefined);
-    expect(cloned.title).toBe(original.title);
-    expect(cloned.note).toBe(original.note);
-    expect(cloned.endAction).toBe(original.endAction);
-    expect(cloned.timerType).toBe(original.timerType);
-    expect(cloned.timeStart).toBe(original.timeStart);
-    expect(cloned.timeEnd).toBe(original.timeEnd);
-    expect(cloned.duration).toBe(original.duration);
-    expect(cloned.isPublic).toBe(original.isPublic);
-    expect(cloned.skip).toBe(original.skip);
-    expect(cloned.colour).toBe(original.colour);
-    expect(cloned.type).toBe(SupportedEvent.Event);
-    expect(cloned.revision).toBe(0);
-    expect(cloned.timeWarning).toBe(original.timeWarning);
-    expect(cloned.timeDanger).toBe(original.timeDanger);
-    expect(cloned.custom).toStrictEqual({});
+    expect(cloned.custom).not.toBe(original.custom);
+
+    expect(cloned).toMatchObject({
+      type: SupportedEvent.Event,
+      title: original.title,
+      note: original.note,
+      timeStart: original.timeStart,
+      duration: original.duration,
+      timeEnd: original.timeEnd,
+      timerType: original.timerType,
+      timeStrategy: original.timeStrategy,
+      countToEnd: original.countToEnd,
+      linkStart: original.linkStart,
+      endAction: original.endAction,
+      isPublic: original.isPublic,
+      skip: original.skip,
+      colour: original.colour,
+      revision: 0,
+      delay: original.delay,
+      dayOffset: original.dayOffset,
+      gap: 0,
+      timeWarning: original.timeWarning,
+      timeDanger: original.timeDanger,
+    });
  });
 });
@@ -1,4 +1,7 @@
-import { formatTime, nowInMillis } from '../time';
+import { OffsetMode } from 'ontime-types';
+import { dayInMs } from 'ontime-utils';
+
+import { calculateTimeUntilStart, formatTime, nowInMillis } from '../time';

 describe('nowInMillis()', () => {
  it('should return the current time in milliseconds', () => {
@@ -38,3 +41,257 @@ describe('formatTime()', () => {
    expect(time).toStrictEqual('-01:00');
  });
 });
+
+describe('calculateTimeUntilStart()', () => {
+  describe('Absolute offset mode', () => {
+    test('ontime', () => {
+      const test = {
+        timeStart: 100,
+        dayOffset: 0,
+        delay: 0,
+        currentDay: 0,
+        totalGap: 0,
+        clock: 90,
+        offset: 0,
+        offsetMode: OffsetMode.Absolute,
+        actualStart: null,
+        plannedStart: null,
+      };
+
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(10);
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(10);
+    });
+
+    test('running behind', () => {
+      const test = {
+        timeStart: 100,
+        dayOffset: 0,
+        delay: 0,
+        currentDay: 0,
+        totalGap: 0,
+        clock: 90,
+        offset: -20,
+        offsetMode: OffsetMode.Absolute,
+        actualStart: null,
+        plannedStart: null,
+      };
+
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(30);
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(30);
+    });
+
+    test('running ahead', () => {
+      const test = {
+        timeStart: 100,
+        dayOffset: 0,
+        delay: 0,
+        currentDay: 0,
+        totalGap: 0,
+        clock: 80,
+        offset: 10,
+        offsetMode: OffsetMode.Absolute,
+        actualStart: null,
+        plannedStart: null,
+      };
+
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(20); // <-- when running ahead the unlinked timer stays put
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(10);
+    });
+
+    test('running behind with enough gaps', () => {
+      const test = {
+        timeStart: 100,
+        dayOffset: 0,
+        delay: 0,
+        currentDay: 0,
+        totalGap: 20,
+        clock: 50,
+        offset: -20,
+        offsetMode: OffsetMode.Absolute,
+        actualStart: null,
+        plannedStart: null,
+      };
+
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(50); // <-- when gap is enough to compensate for the running behind
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(70); // This should not be possible
+    });
+
+    test('running behind with too little gaps', () => {
+      const test = {
+        timeStart: 100,
+        dayOffset: 0,
+        delay: 0,
+        currentDay: 0,
+        totalGap: 10,
+        clock: 50,
+        offset: -20,
+        offsetMode: OffsetMode.Absolute,
+        actualStart: 0,
+        plannedStart: 0,
+      };
+
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(60); // <-- when gap is not enough to compensate for the running behind it absorbs at much as possible
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(70); // This should not be possible
+    });
+  });
+
+  describe('Relative offset mode', () => {
+    test('basic function', () => {
+      const test = {
+        timeStart: 0,
+        dayOffset: 0,
+        delay: 0,
+        currentDay: 0,
+        totalGap: 0,
+        clock: 100,
+        actualStart: 100,
+        plannedStart: 0,
+        offset: 0,
+        offsetMode: OffsetMode.Relative,
+      };
+
+      const timeStartEvent2 = 10;
+      const timeStartEvent3 = 20;
+
+      //event 1 is the currently running event
+
+      //event 2
+      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent2, isLinkedToLoaded: true })).toBe(10);
+      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent2, isLinkedToLoaded: false })).toBe(10);
+
+      //event 3
+      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent3, isLinkedToLoaded: true })).toBe(20);
+      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent3, isLinkedToLoaded: false })).toBe(20);
+
+      // When clock advances by 5ms, time until start should decrease by 5ms
+      test.clock = 105;
+
+      //event 2
+      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent2, isLinkedToLoaded: true })).toBe(5);
+      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent2, isLinkedToLoaded: false })).toBe(5);
+
+      //event 3
+      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent3, isLinkedToLoaded: true })).toBe(15);
+      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent3, isLinkedToLoaded: false })).toBe(15);
+    });
+
+    test('gaps', () => {
+      const test = {
+        timeStart: 20,
+        dayOffset: 0,
+        delay: 0,
+        currentDay: 0,
+        totalGap: 10,
+        clock: 100,
+        actualStart: 100,
+        plannedStart: 0,
+        offset: 0,
+        offsetMode: OffsetMode.Relative,
+      };
+
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(20);
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(20);
+
+      // When clock advances by 5ms, time until start should decrease by 5ms
+      test.clock = 105;
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(15);
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(15);
+    });
+
+    test('added/remove time', () => {
+      const test = {
+        timeStart: 20,
+        dayOffset: 0,
+        delay: 0,
+        currentDay: 0,
+        totalGap: 0,
+        clock: 100,
+        actualStart: 100,
+        plannedStart: 0,
+        offset: 0,
+        offsetMode: OffsetMode.Relative,
+      };
+
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(20);
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(20);
+
+      test.offset = 5; // remove 5 with addtime - we are ahead of time
+
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(15);
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(20); // unlocked evets will stay on schedule
+
+      test.offset = -5; // add 5 with addtime - we are behind
+
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(25);
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(25);
+    });
+
+    test('next day', () => {
+      const test = {
+        delay: 0,
+        currentDay: 0,
+        clock: 100,
+        actualStart: 100,
+        plannedStart: 0,
+        offset: 0,
+        offsetMode: OffsetMode.Relative,
+      };
+
+      // this event will start the current day
+      expect(
+        calculateTimeUntilStart({
+          ...test,
+          timeStart: 10,
+          dayOffset: 0,
+          totalGap: 0,
+          isLinkedToLoaded: false,
+        }),
+      ).toBe(10);
+
+      // this event will start the next day
+      // in absolute mode this would start in dayInMs - 100 since the gap would compensate
+      // but in relative mode with and actual start that is 100 offset it starts in dayInMs
+      expect(
+        calculateTimeUntilStart({
+          ...test,
+          timeStart: 0,
+          dayOffset: 1,
+          totalGap: dayInMs - 20,
+          isLinkedToLoaded: false,
+        }),
+      ).toBe(dayInMs);
+
+      // advancing 100ms
+      test.clock = 200;
+
+      expect(
+        calculateTimeUntilStart({
+          ...test,
+          timeStart: 0,
+          dayOffset: 1,
+          totalGap: dayInMs - 20,
+          isLinkedToLoaded: false,
+        }),
+      ).toBe(dayInMs - 100);
+    });
+  });
+
+  test('overlap with negative total gap', () => {
+    const test = {
+      dayOffset: 0,
+      delay: 0,
+      currentDay: 0,
+      clock: 100,
+      actualStart: 100,
+      plannedStart: 0,
+      offset: 0,
+      offsetMode: OffsetMode.Relative,
+      isLinkedToLoaded: false,
+    };
+
+    // the overlap will be pushed out to the expected available time
+    expect(calculateTimeUntilStart({ ...test, timeStart: 5, totalGap: -5 })).toBe(10);
+
+    test.clock = 105;
+  });
+});
@@ -0,0 +1,10 @@
+import { stringify } from 'csv-stringify/browser/esm/sync';
+
+/**
+ * @description Converts an array of arrays to a CSV file
+ * @param {string[][]} arrayOfArrays
+ * @return {string}
+ */
+export function makeCSVFromArrayOfArrays(arrayOfArrays: string[][]): string {
+  return stringify(arrayOfArrays);
+}
@@ -24,11 +24,11 @@ export const cloneEvent = (event: OntimeEvent): ClonedEvent => {
    skip: event.skip,
    colour: event.colour,
    revision: 0,
-    delay: 0,
-    dayOffset: 0,
+    delay: event.delay, // the events will be collocated, so having the same metadata is a good start
+    dayOffset: event.dayOffset,
    gap: 0,
    timeWarning: event.timeWarning,
    timeDanger: event.timeDanger,
-    custom: {},
+    custom: { ...event.custom },
  };
 };
@@ -0,0 +1,12 @@
+/**
+ * Allows lazy evaluation and caching of a functions result
+ */
+export function lazyEvaluate<T>(fn: () => T): () => T {
+  let result: T | undefined;
+  return function () {
+    if (result === undefined) {
+      result = fn();
+    }
+    return result;
+  };
+}
@@ -6,7 +6,6 @@ import { baseURI, serverURL } from '../../externals';
 * Open an external URLs: specifically for a electron / browser case
 * If electron: ask main process to call a new browser window
 * If browser: open in new tab
- * @param url
 */
 export function openLink(url: string) {
  if (window.process?.type === 'renderer') {
@@ -0,0 +1,8 @@
+import { MaybeString } from 'ontime-types';
+
+export default function safeParseNumber(value: MaybeString, defaultValue: number = 0): number {
+  if (!value) return defaultValue;
+  const number = Number(value);
+  if (isNaN(number)) return defaultValue;
+  return number;
+}
@@ -1,7 +1,7 @@
 import { Log, RundownCached, RuntimeStore } from 'ontime-types';

 import { isProduction, websocketUrl } from '../../externals';
-import { CLIENT_LIST, CUSTOM_FIELDS, RUNDOWN, RUNTIME } from '../api/constants';
+import { CLIENT_LIST, CUSTOM_FIELDS, REPORT, RUNDOWN, RUNTIME } from '../api/constants';
 import { invalidateAllCaches } from '../api/utils';
 import { ontimeQueryClient } from '../queryClient';
 import {
@@ -34,20 +34,26 @@ export const connectSocket = () => {
    hasConnected = true;
    reconnectAttempts = 0;

+    socketSendJson('set-client-patch', {
+      type: 'ontime',
+      origin: window.location.origin,
+      path: window.location.pathname + window.location.search,
+    });
+    setOnlineStatus(true);
+
    if (preferredClientName) {
      socketSendJson('set-client-name', preferredClientName);
    }
-
-    socketSendJson('set-client-type', 'ontime');
-    setOnlineStatus(true);
  };

  websocket.onclose = () => {
    console.warn('WebSocket disconnected');
-    setOnlineStatus(false);

    if (shouldReconnect) {
      reconnectTimeout = setTimeout(() => {
+        if (reconnectAttempts > 2) {
+          setOnlineStatus(false);
+        }
        console.warn('WebSocket: attempting reconnect');
        if (websocket && websocket.readyState === WebSocket.CLOSED) {
          reconnectAttempts += 1;
@@ -78,16 +84,14 @@ export const connectSocket = () => {
          updateDevTools({ ping: offset });
          break;
        }
-        case 'client-id': {
-          if (typeof payload === 'string') {
-            setClientId(payload);
-          }
-          break;
-        }
-
-        case 'client-name': {
-          if (typeof payload === 'string') {
-            setClientName(payload);
+        case 'client': {
+          if (typeof payload === 'object' || payload !== null) {
+            if (payload.clientId && payload.clientName) {
+              setClientId(payload.clientId);
+              if (!preferredClientName) {
+                setClientName(payload.clientName);
+              }
+            }
          }
          break;
        }
@@ -196,19 +200,23 @@ export const connectSocket = () => {
        }
        case 'ontime-refetch': {
          // the refetch message signals that the rundown has changed in the server side
-          const { revision, reload } = payload;
-          const currentRevision = ontimeQueryClient.getQueryData<RundownCached>(RUNDOWN)?.revision ?? -1;
-
+          const { reload, target } = payload;
          if (reload) {
            invalidateAllCaches();
-          } else if (revision > currentRevision) {
-            ontimeQueryClient.invalidateQueries({ queryKey: RUNDOWN });
-            ontimeQueryClient.invalidateQueries({ queryKey: CUSTOM_FIELDS });
+          } else if (target === 'RUNDOWN') {
+            const { revision } = payload;
+            const currentRevision = ontimeQueryClient.getQueryData<RundownCached>(RUNDOWN)?.revision ?? -1;
+            if (revision > currentRevision) {
+              ontimeQueryClient.invalidateQueries({ queryKey: RUNDOWN });
+              ontimeQueryClient.invalidateQueries({ queryKey: CUSTOM_FIELDS });
+            }
+          } else if (target === 'REPORT') {
+            ontimeQueryClient.invalidateQueries({ queryKey: REPORT });
          }
          break;
        }
        case 'ontime-flush': {
-          flushBatchUpdates()
+          flushBatchUpdates();
          break;
        }
      }
@@ -1,8 +1,9 @@
-import { MaybeNumber, Settings, TimeFormat } from 'ontime-types';
-import { formatFromMillis, MILLIS_PER_HOUR, MILLIS_PER_MINUTE, MILLIS_PER_SECOND } from 'ontime-utils';
+import { MaybeNumber, OffsetMode, OntimeEvent, Settings, TimeFormat } from 'ontime-types';
+import { dayInMs, formatFromMillis, MILLIS_PER_HOUR, MILLIS_PER_MINUTE, MILLIS_PER_SECOND } from 'ontime-utils';

 import { FORMAT_12, FORMAT_24 } from '../../viewerConfig';
 import { APP_SETTINGS } from '../api/constants';
+import { useTimeUntilData } from '../hooks/useSocket';
 import { ontimeQueryClient } from '../queryClient';

 /**
@@ -125,3 +126,89 @@ export function formatDuration(duration: number, hideSeconds = true): string {
  }
  return result;
 }
+
+/**
+ *
+ * @param totalGap accumulated gap from the current event
+ * @param isLinkedToLoaded is this event part of a chain linking back to the current loaded event
+ * @returns
+ */
+export function useTimeUntilStart(
+  // typed like this to make it very clear what the data is
+  data: Pick<OntimeEvent, 'timeStart' | 'dayOffset' | 'delay'> & {
+    totalGap: number;
+    isLinkedToLoaded: boolean;
+  },
+): number {
+  const { offset, clock, currentDay, offsetMode, actualStart, plannedStart } = useTimeUntilData();
+  return calculateTimeUntilStart({ ...data, currentDay, clock, offset, offsetMode, actualStart, plannedStart });
+}
+
+/**
+ *
+ * @param currentDay the day offset of the urrently running event
+ * @param totalGap accumulated gap from the current event
+ * @param isLinkedToLoaded is this event part of a chain linking back to the current loaded event
+ * @param clock
+ * @param offset
+ * @returns
+ */
+export function calculateTimeUntilStart(
+  data: Pick<OntimeEvent, 'timeStart' | 'dayOffset' | 'delay'> & {
+    currentDay: number;
+    totalGap: number;
+    isLinkedToLoaded: boolean;
+    clock: number;
+    offset: number;
+    offsetMode: OffsetMode;
+    actualStart: MaybeNumber;
+    plannedStart: MaybeNumber;
+  },
+): number {
+  const {
+    timeStart,
+    dayOffset,
+    currentDay,
+    totalGap,
+    isLinkedToLoaded,
+    clock,
+    offset,
+    delay,
+    offsetMode,
+    actualStart,
+    plannedStart,
+  } = data;
+
+  //How many days from the currently running event to this one
+  const relativeDayOffset = dayOffset - currentDay;
+
+  const delayedStart = Math.max(0, timeStart + delay);
+
+  //The normalised start time of this event relative to the currently running event
+  const normalisedTimeStart = delayedStart + relativeDayOffset * dayInMs;
+
+  let relativeStartOffset = 0;
+
+  if (offsetMode === OffsetMode.Relative) {
+    relativeStartOffset = (actualStart ?? 0) - (plannedStart ?? 0);
+  }
+
+  const scheduledTimeUntil = normalisedTimeStart - clock + relativeStartOffset;
+
+  const offsetTimeUntil = scheduledTimeUntil - offset;
+
+  if (isLinkedToLoaded) {
+    //if we are directly linked back to the loaded event we just follow the offset
+    return offsetTimeUntil;
+  }
+
+  const gapsCanCompensateForOffset = totalGap + offset >= 0;
+  if (gapsCanCompensateForOffset) {
+    // if we are ahead of schedule or the gap can compensate for the amount we are behind then expect to start at the scheduled time
+    return scheduledTimeUntil;
+  }
+
+  // otherwise consume as much of the offset as possible with the gap
+  const offsetTimeUntilBufferedByGaps = offsetTimeUntil - totalGap;
+  return offsetTimeUntilBufferedByGaps;
+}
@@ -19,9 +19,10 @@ export const buyMeACoffeeUrl = 'https://buymeacoffee.com/cpvalente';
 export const appVersion = version;
 export const isProduction = import.meta.env.MODE === 'production';
 export const isDev = !isProduction;
-export const isLocalhost = window.location.hostname === 'localhost' || window.location.hostname === '127.0.0.1';
+export const currentHostName = window.location.hostname;
+export const isLocalhost = currentHostName === 'localhost' || currentHostName === '127.0.0.1';
 export const isDockerImage = Boolean(import.meta.env.VITE_IS_DOCKER);
-export const isOntimeCloud = window.location.hostname.includes('cloud.getontime.no');
+export const isOntimeCloud = currentHostName.includes('cloud.getontime.no');

 // resolve entrypoint URLs

@@ -75,4 +76,4 @@ function resolveBaseURI(): string {
  }

  return base;
-}
+}
@@ -1,6 +1,6 @@
 import { PropsWithChildren } from 'react';
+import { IoClose } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
-import { IoClose } from '@react-icons/all-files/io5/IoClose';

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

@@ -183,7 +183,7 @@ $inner-padding: 1rem;
  color: $muted-gray;

  td {
-    padding-block: 1rem;
+    padding-block: 5rem;
  }

  button {
@@ -207,6 +207,9 @@ $inner-padding: 1rem;
  &.end {
    justify-content: flex-end;
  }
+  &.apart {
+    justify-content: space-between;
+  }
 }

@keyframes animloader {
@@ -1,6 +1,6 @@
 import { HTMLAttributes, PropsWithChildren, ReactNode } from 'react';
+import { IoAdd } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
-import { IoAdd } from '@react-icons/all-files/io5/IoAdd';

 import { cx } from '../../../common/utils/styleUtils';

@@ -67,9 +67,17 @@ export function TableEmpty({ label, handleClick }: { label?: string; handleClick
    <tr className={style.empty}>
      <td colSpan={99}>
        <div>{label ?? 'No data yet'}</div>
-        <Button onClick={handleClick} isDisabled={!handleClick} variant='ontime-filled' rightIcon={<IoAdd />} size='sm'>
-          New
-        </Button>
+        {handleClick && (
+          <Button
+            onClick={handleClick}
+            isDisabled={!handleClick}
+            variant='ontime-filled'
+            rightIcon={<IoAdd />}
+            size='sm'
+          >
+            New
+          </Button>
+        )}
      </td>
    </tr>
  );
@@ -105,8 +113,8 @@ export function BlockQuote({ children }: { children: ReactNode }) {
  return <blockquote className={style.blockquote}>{children}</blockquote>;
 }

-export function Error({ children }: { children: ReactNode }) {
-  return <div className={style.fieldError}>{children}</div>;
+export function Error({ children, className }: { children: ReactNode } & JSX.IntrinsicElements['div']) {
+  return <div className={cx([style.fieldError, className])}>{children}</div>;
 }

 export function Divider() {
@@ -128,7 +136,7 @@ type AllowedInlineTags = 'div' | 'td';
 type InlineProps<C extends AllowedInlineTags> = {
  as?: C;
  relation?: 'inner' | 'component' | 'section';
-  align?: 'start' | 'end';
+  align?: 'start' | 'end' | 'apart';
  className?: string;
 };

@@ -1,4 +1,4 @@
-import ExternalLink from '../../../../common/components/external-link/ExternalLink';
+import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
 import {
  buyMeACoffeeUrl,
  discordUrl,
@@ -1,4 +1,4 @@
-import ExternalLink from '../../../../common/components/external-link/ExternalLink';
+import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
 import useAppVersion from '../../../../common/hooks-query/useAppVersion';
 import { appVersion } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';
@@ -27,7 +27,8 @@
 .titleSection,
 .filterSection,
 .oscSection,
-.httpSection {
+.httpSection,
+.actionSection {
  display: grid;
  grid-gap: 0.5rem;

@@ -40,8 +41,10 @@
 .ruleSection,
 .filterSection,
 .oscSection,
-.httpSection {
-  label, div {
+.httpSection,
+.actionSection {
+  label,
+  div {
    // we use the div as non-interactive placeholder for button cells
    // it needs to match the size of the label element
    font-size: calc(1rem - 3px);
@@ -51,7 +54,6 @@
  }
 }

-
 .titleSection {
  grid-template-columns: 1fr;
 }
@@ -68,6 +70,14 @@
  grid-template-columns: 1fr auto;
 }

+.actionSection {
+  grid-template-columns: auto 1fr 1fr auto;
+
+  .test {
+    grid-column: -1;
+  }
+}
+
 .outputCard {
  border-left: 0.25rem solid $gray-1200;
  padding-left: 0.5rem;
@@ -1,23 +1,22 @@
 import { useEffect, useMemo } from 'react';
 import { Controller, useFieldArray, useForm } from 'react-hook-form';
+import { IoAdd, IoTrash } from 'react-icons/io5';
+import { Button, IconButton, Input, Radio, RadioGroup, Select } from '@chakra-ui/react';
 import {
-  Alert,
-  AlertDescription,
-  AlertIcon,
-  Button,
-  IconButton,
-  Input,
-  Radio,
-  RadioGroup,
-  Select,
-} from '@chakra-ui/react';
-import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
-import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
-import { Automation, AutomationDTO, HTTPOutput, isHTTPOutput, isOSCOutput, OSCOutput } from 'ontime-types';
+  Automation,
+  AutomationDTO,
+  HTTPOutput,
+  isHTTPOutput,
+  isOntimeAction,
+  isOSCOutput,
+  OntimeAction,
+  OSCOutput,
+} from 'ontime-types';

 import { addAutomation, editAutomation, testOutput } from '../../../../common/api/automation';
 import { maybeAxiosError } from '../../../../common/api/utils';
-import ExternalLink from '../../../../common/components/external-link/ExternalLink';
+import Info from '../../../../common/components/info/Info';
+import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
 import Tag from '../../../../common/components/tag/Tag';
 import useAutomationSettings from '../../../../common/hooks-query/useAutomationSettings';
 import useCustomFields from '../../../../common/hooks-query/useCustomFields';
@@ -27,10 +26,11 @@ import * as Panel from '../../panel-utils/PanelUtils';

 import TemplateInput from './template-input/TemplateInput';
 import { isAutomation, makeFieldList } from './automationUtils';
+import OntimeActionForm from './OntimeActionForm';

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

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

 interface AutomationFormProps {
  automation: Automation | AutomationDTO;
@@ -51,6 +51,7 @@ export default function AutomationForm(props: AutomationFormProps) {
    register,
    setError,
    setFocus,
+    setValue,
    formState: { errors, isSubmitting, isDirty, isValid },
  } = useForm<AutomationDTO>({
    mode: 'onChange',
@@ -101,6 +102,11 @@ export default function AutomationForm(props: AutomationFormProps) {
    appendOutput({ type: 'http', url: '' });
  };

+  const handleAddnewOntimeAction = () => {
+    // @ts-expect-error -- we dont want to choose an action
+    appendOutput({ type: 'ontime', action: undefined });
+  };
+
  const handleTestOSCOutput = async (index: number) => {
    try {
      const values = getValues(`outputs.${index}`) as OSCOutput;
@@ -134,6 +140,19 @@ export default function AutomationForm(props: AutomationFormProps) {
    }
  };

+  const handleTestOntimeAction = async (index: number) => {
+    try {
+      const values = getValues(`outputs.${index}`) as OntimeAction;
+      // NOTE: there is no meaningful validation to do here, we let the server deal with the data
+      await testOutput({
+        ...values,
+        type: 'ontime',
+      });
+    } catch (_error) {
+      /** we dont handle errors here */
+    }
+  };
+
  const onSubmit = async (values: AutomationDTO) => {
    if (isAutomation(automation)) {
      await handleEdit(automation.id, { id: automation.id, ...values });
@@ -190,7 +209,7 @@ export default function AutomationForm(props: AutomationFormProps) {
      </div>

      <div className={style.innerSection}>
-        <h3>Filters</h3>
+        <h3>Filters (optional)</h3>
        <div className={style.ruleSection}>
          <label>
            Trigger outputs if
@@ -205,74 +224,80 @@ export default function AutomationForm(props: AutomationFormProps) {
              )}
            />
          </label>
-          {fieldFilters.map((field, index) => (
-            <div key={field.id} className={style.filterSection}>
-              <label>
-                Runtime data source
-                <Select
-                  {...register(`filters.${index}.field`, { required: { value: true, message: 'Required field' } })}
-                  size='sm'
-                  variant='ontime'
-                >
-                  <option selected hidden disabled value=''>
-                    Event field
-                  </option>
-                  {fieldList.map(({ value, label }) => (
-                    <option key={value} value={value}>
-                      {label}
+          {fieldFilters.map((field, index) => {
+            const key = `filters.${index}.field.${field.id}`;
+            return (
+              <div key={key} className={style.filterSection}>
+                <label>
+                  Runtime data source
+                  <Select
+                    {...register(`filters.${index}.field`, { required: { value: true, message: 'Required field' } })}
+                    size='sm'
+                    variant='ontime'
+                  >
+                    <option selected hidden disabled value=''>
+                      Event field
                    </option>
-                  ))}
-                </Select>
-                <Panel.Error>{errors.filters?.[index]?.field?.message}</Panel.Error>
-              </label>
-              <label>
-                Matching condition
-                <Select
-                  {...register(`filters.${index}.operator`, { required: { value: true, message: 'Required field' } })}
-                  size='sm'
-                  variant='ontime'
-                >
-                  <option selected hidden disabled value=''>
-                    Operator
-                  </option>
-                  <option value='equals'>equals</option>
-                  <option value='not_equals'>not equals</option>
-                  <option value='contains'>contains</option>
-                  {/* 
+                    {fieldList.map(({ value, label }, localIndex) => {
+                      const key = `filters.${index}.field.${localIndex}`;
+                      return (
+                        <option key={key} value={value}>
+                          {label}
+                        </option>
+                      );
+                    })}
+                  </Select>
+                  <Panel.Error>{errors.filters?.[index]?.field?.message}</Panel.Error>
+                </label>
+                <label>
+                  Matching condition
+                  <Select
+                    {...register(`filters.${index}.operator`, { required: { value: true, message: 'Required field' } })}
+                    size='sm'
+                    variant='ontime'
+                  >
+                    <option selected hidden disabled value=''>
+                      Operator
+                    </option>
+                    <option value='equals'>equals</option>
+                    <option value='not_equals'>not equals</option>
+                    <option value='contains'>contains</option>
+                    {/* 
                  We dont currently offer a data source where these operators would make sense
                  <option value='greater_than'>greater than</option>
                  <option value='less_than'>less than</option> 
                  */}
-                </Select>
-                <Panel.Error>{errors.filters?.[index]?.operator?.message}</Panel.Error>
-              </label>
-              <label>
-                Value to match
-                <Input
-                  {...register(`filters.${index}.value`)}
-                  variant='ontime-filled'
-                  size='sm'
-                  placeholder='<empty / no value>'
-                  autoComplete='off'
-                />
-              </label>
-              <div>
-                <span>&nbsp;</span>
-                <div>
-                  <IconButton
-                    aria-label='Delete'
-                    icon={<IoTrash />}
-                    variant='ontime-ghosted'
+                  </Select>
+                  <Panel.Error>{errors.filters?.[index]?.operator?.message}</Panel.Error>
+                </label>
+                <label>
+                  Value to match
+                  <Input
+                    {...register(`filters.${index}.value`)}
+                    variant='ontime-filled'
                    size='sm'
-                    color='#FA5656' // $red-500
-                    onClick={() => removeFilter(index)}
-                    isDisabled={false}
-                    isLoading={false}
+                    placeholder='<empty / no value>'
+                    autoComplete='off'
                  />
+                </label>
+                <div>
+                  <span>&nbsp;</span>
+                  <div>
+                    <IconButton
+                      aria-label='Delete'
+                      icon={<IoTrash />}
+                      variant='ontime-ghosted'
+                      size='sm'
+                      color='#FA5656' // $red-500
+                      onClick={() => removeFilter(index)}
+                      isDisabled={false}
+                      isLoading={false}
+                    />
+                  </div>
                </div>
              </div>
-            </div>
-          ))}
+            );
+          })}
          <div>
            <Button
              variant='ontime-subtle'
@@ -291,13 +316,10 @@ export default function AutomationForm(props: AutomationFormProps) {

      <div className={style.innerColumn}>
        <h3>Outputs</h3>
-        <Alert status='info' variant='ontime-on-dark-info'>
-          <AlertIcon />
-          <AlertDescription>
-            Automation outputs can be used to send data from Ontime to external software.
-            <ExternalLink href={integrationsDocsUrl}>See the documentation for templates</ExternalLink>
-          </AlertDescription>
-        </Alert>
+        <Info>
+          Automation outputs can be used to send data from Ontime to external software.
+          <ExternalLink href={integrationsDocsUrl}>See the documentation for templates</ExternalLink>
+        </Info>

        {fieldOutputs.map((output, index) => {
          if (isOSCOutput(output)) {
@@ -357,13 +379,13 @@ export default function AutomationForm(props: AutomationFormProps) {
                    <Panel.Error>{rowErrors?.address?.message}</Panel.Error>
                  </label>
                  <label>
-                    Parameters
+                    Arguments
                    <TemplateInput
                      {...register(`outputs.${index}.args`)}
+                      value={output.args}
                      variant='ontime-filled'
                      size='sm'
                      placeholder='1'
-                      autoComplete='off'
                    />
                    <Panel.Error>{rowErrors?.args?.message}</Panel.Error>
                  </label>
@@ -380,8 +402,6 @@ export default function AutomationForm(props: AutomationFormProps) {
                        size='sm'
                        onClick={() => removeOutput(index)}
                        color='#FA5656' // $red-500
-                        isDisabled={false}
-                        isLoading={false}
                      />
                    </Panel.InlineElements>
                  </div>
@@ -429,8 +449,6 @@ export default function AutomationForm(props: AutomationFormProps) {
                        size='sm'
                        onClick={() => removeOutput(index)}
                        color='#FA5656' // $red-500
-                        isDisabled={false}
-                        isLoading={false}
                      />
                    </Panel.InlineElements>
                  </div>
@@ -438,30 +456,59 @@ export default function AutomationForm(props: AutomationFormProps) {
              </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}
+                >
+                  <span>&nbsp;</span>
+                  <Panel.InlineElements relation='inner'>
+                    <Button size='sm' variant='ontime-ghosted-white' onClick={() => handleTestOntimeAction(index)}>
+                      Test
+                    </Button>
+                    <IconButton
+                      aria-label='Delete'
+                      icon={<IoTrash />}
+                      variant='ontime-ghosted'
+                      size='sm'
+                      onClick={() => removeOutput(index)}
+                      color='#FA5656' // $red-500
+                    />
+                  </Panel.InlineElements>
+                </OntimeActionForm>
+              </div>
+            );
+          }
+
          // there should be no other output types
          return null;
        })}
        <Panel.InlineElements relation='inner'>
-          <Button
-            variant='ontime-subtle'
-            rightIcon={<IoAdd />}
-            size='sm'
-            onClick={handleAddNewOSCOutput}
-            isDisabled={false}
-            isLoading={false}
-          >
+          <Button variant='ontime-subtle' rightIcon={<IoAdd />} size='sm' onClick={handleAddNewOSCOutput}>
            OSC
          </Button>
-          <Button
-            variant='ontime-subtle'
-            rightIcon={<IoAdd />}
-            size='sm'
-            onClick={handleAddNewHTTPOutput}
-            isDisabled={false}
-            isLoading={false}
-          >
+          <Button variant='ontime-subtle' rightIcon={<IoAdd />} size='sm' onClick={handleAddNewHTTPOutput}>
            HTTP
          </Button>
+          <Button variant='ontime-subtle' rightIcon={<IoAdd />} size='sm' onClick={handleAddnewOntimeAction}>
+            Ontime action
+          </Button>
        </Panel.InlineElements>
      </div>

@@ -1,11 +1,13 @@
 import { Controller, useForm } from 'react-hook-form';
-import { Alert, AlertDescription, AlertIcon, Button, Input, Switch } from '@chakra-ui/react';
+import { Button, Input, Switch } from '@chakra-ui/react';

 import { editAutomationSettings } from '../../../../common/api/automation';
 import { maybeAxiosError } from '../../../../common/api/utils';
-import ExternalLink from '../../../../common/components/external-link/ExternalLink';
+import Info from '../../../../common/components/info/Info';
+import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
 import { preventEscape } from '../../../../common/utils/keyEvent';
 import { isOnlyNumbers } from '../../../../common/utils/regex';
+import { isOntimeCloud } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';

 const oscApiDocsUrl = 'https://docs.getontime.no/api/protocols/osc/';
@@ -75,14 +77,13 @@ export default function AutomationSettingsForm(props: AutomationSettingsProps) {
      <Panel.Divider />

      <Panel.Section>
-        <Alert status='info' variant='ontime-on-dark-info'>
-          <AlertIcon />
-          <AlertDescription>
-            Control Ontime and share its data with external systems in your workflow. <br />
-            - Automations allow Ontime to send its data on lifecycle triggers. <br />- OSC Input tells Ontime to listen
-            to messages on the specific port. <ExternalLink href={oscApiDocsUrl}>See the docs</ExternalLink>
-          </AlertDescription>
-        </Alert>
+        <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
@@ -112,7 +113,9 @@ export default function AutomationSettingsForm(props: AutomationSettingsProps) {
        </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='OSC input'
@@ -1,8 +1,6 @@
 import { Fragment, useState } from 'react';
+import { IoAdd, IoPencil, IoTrash } from 'react-icons/io5';
 import { Button, IconButton } from '@chakra-ui/react';
-import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
-import { IoPencil } from '@react-icons/all-files/io5/IoPencil';
-import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
 import { AutomationDTO, NormalisedAutomation } from 'ontime-types';

 import { deleteAutomation } from '../../../../common/api/automation';
@@ -0,0 +1,110 @@
+import { PropsWithChildren, useState } from 'react';
+import { UseFormRegister, UseFormSetValue } from 'react-hook-form';
+import { Input, Select } from '@chakra-ui/react';
+import { AutomationDTO, OntimeAction } from 'ontime-types';
+
+import { cx } from '../../../../common/utils/styleUtils';
+import * as Panel from '../../panel-utils/PanelUtils';
+
+import style from './AutomationForm.module.scss';
+
+interface OntimeActionFormProps {
+  index: number;
+  register: UseFormRegister<AutomationDTO>;
+  rowErrors?: {
+    action?: { message?: string };
+    time?: { message?: string };
+    text?: { message?: string };
+    visible?: { message?: string };
+    secondarySource?: { message?: string };
+  };
+  value: OntimeAction['action'];
+  setValue: UseFormSetValue<AutomationDTO>;
+}
+
+export default function OntimeActionForm(props: PropsWithChildren<OntimeActionFormProps>) {
+  const { index, register, setValue, rowErrors, value, children } = props;
+  const [selectedAction, setSelectedAction] = useState<OntimeAction['action']>(value || 'aux-start');
+
+  const updateSelectedAction = (value: string) => {
+    setSelectedAction(value as OntimeAction['action']);
+    setValue(`outputs.${index}.action`, value as OntimeAction['action']);
+  };
+
+  return (
+    <div className={cx([style.actionSection, selectedAction && style[selectedAction]])}>
+      <input type='hidden' {...register(`outputs.${index}.action`)} value={selectedAction} />
+      <label>
+        Action
+        <Select
+          variant='ontime'
+          size='sm'
+          value={selectedAction}
+          onChange={(event) => updateSelectedAction(event.target.value)}
+        >
+          <option value='aux-start'>Auxiliary timer: start</option>
+          <option value='aux-pause'>Auxiliary timer: pause</option>
+          <option value='aux-stop'>Auxiliary timer: stop</option>
+          <option value='aux-set'>Auxiliary timer: set</option>
+          <option value='message-set'>Timer: timer message</option>
+          <option value='message-secondary'>Timer: timer secondary</option>
+        </Select>
+        <Panel.Error>{rowErrors?.action?.message}</Panel.Error>
+      </label>
+
+      {selectedAction === 'aux-set' && (
+        <label>
+          New time
+          <Input
+            {...register(`outputs.${index}.time`, {
+              required: { value: true, message: 'Required field' },
+            })}
+            variant='ontime-filled'
+            size='sm'
+            placeholder='eg: 10m5s'
+            autoComplete='off'
+          />
+          <Panel.Error>{rowErrors?.time?.message}</Panel.Error>
+        </label>
+      )}
+
+      {selectedAction === 'message-set' && (
+        <>
+          <label>
+            Text (leave empty for no change)
+            <Input
+              {...register(`outputs.${index}.text`)}
+              variant='ontime-filled'
+              size='sm'
+              placeholder='eg: Timer is finished'
+              autoComplete='off'
+            />
+            <Panel.Error>{rowErrors?.text?.message}</Panel.Error>
+          </label>
+          <label>
+            Visibility
+            <Select variant='ontime' size='sm' {...register(`outputs.${index}.visible`)}>
+              <option value=''>Untouched</option>
+              <option value='true'>Show</option>
+              <option value='false'>Hide</option>
+            </Select>
+            <Panel.Error>{rowErrors?.visible?.message}</Panel.Error>
+          </label>
+        </>
+      )}
+
+      {selectedAction === 'message-secondary' && (
+        <label>
+          Timer secondary source
+          <Select variant='ontime' size='sm' {...register(`outputs.${index}.secondarySource`)}>
+            <option value='aux'>Auxiliary timer</option>
+            <option value='external'>External</option>
+            <option value='null'>None</option>
+          </Select>
+          <Panel.Error>{rowErrors?.secondarySource?.message}</Panel.Error>
+        </label>
+      )}
+      <div className={style.test}>{children}</div>
+    </div>
+  );
+}
@@ -1,6 +1,6 @@
 import { Fragment, useMemo, useState } from 'react';
+import { IoAdd } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
-import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
 import { NormalisedAutomation, Trigger } from 'ontime-types';

 import { deleteTrigger } from '../../../../common/api/automation';
@@ -82,7 +82,7 @@ export default function TriggersList(props: TriggersListProps) {
          <tbody>
            {!showForm && triggers.length === 0 && (
              <Panel.TableEmpty
-                label='Create an automation before to attach triggers to'
+                label='Create an automation to attach triggers to'
                handleClick={canAdd ? () => setShowForm(true) : undefined}
              />
            )}
@@ -1,8 +1,6 @@
 import { useState } from 'react';
+import { IoPencil, IoTrash, IoWarningOutline } from 'react-icons/io5';
 import { IconButton } from '@chakra-ui/react';
-import { IoPencil } from '@react-icons/all-files/io5/IoPencil';
-import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
-import { IoWarningOutline } from '@react-icons/all-files/io5/IoWarningOutline';
 import { NormalisedAutomation, TimerLifeCycle } from 'ontime-types';

 import Tag from '../../../../common/components/tag/Tag';
@@ -1,6 +1,6 @@
-import { useMemo, useState } from 'react';
+import { forwardRef, useMemo, useState } from 'react';
 import { type InputProps, Input } from '@chakra-ui/react';
-import { useClickOutside } from '@mantine/hooks';
+import { mergeRefs, useClickOutside } from '@mantine/hooks';

 import useCustomFields from '../../../../../common/hooks-query/useCustomFields';

@@ -10,10 +10,10 @@ import style from './TemplateInput.module.scss';

 interface TemplateInputProps extends InputProps {}

-export default function TemplateInput(props: TemplateInputProps) {
+const TemplateInput = forwardRef(function TemplateInput(props: TemplateInputProps, ref) {
  const { value, onChange, ...rest } = props;
  const { data } = useCustomFields();
-  const ref = useClickOutside(() => setShowSuggestions(false));
+  const localRef = useClickOutside(() => setShowSuggestions(false));

  const autocompleteList = useMemo(() => {
    return makeAutoCompleteList(data);
@@ -31,15 +31,13 @@ export default function TemplateInput(props: TemplateInputProps) {
  const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
    setInputValue(event.target.value);

-    if (event.target.value.endsWith('{{')) {
+    if (event.target.value.endsWith('{')) {
      setShowSuggestions(true);
+      setSuggestions(updateSuggestions(event.target.value));
    } else if (event.target.value === '' || event.target.value.endsWith('}}')) {
      setShowSuggestions(false);
-    }
-
-    if (showSuggestions) {
-      const suggestions = updateSuggestions(event.target.value);
-      setSuggestions(suggestions);
+    } else if (showSuggestions) {
+      setSuggestions(updateSuggestions(event.target.value));
    }

    onChange?.(event);
@@ -54,8 +52,8 @@ export default function TemplateInput(props: TemplateInputProps) {
  };

  return (
-    <div className={style.wrapper} ref={ref}>
-      <Input {...rest} value={inputValue} onChange={handleInputChange} autoComplete='off' autoCorrect='off' />
+    <div className={style.wrapper} ref={mergeRefs(localRef, ref)}>
+      <Input value={inputValue} {...rest} onChange={handleInputChange} autoComplete='off' autoCorrect='off' />
      {showSuggestions && suggestions.length > 0 && (
        <ul className={style.suggestions}>
          {suggestions.map((suggestion) => (
@@ -67,4 +65,6 @@ export default function TemplateInput(props: TemplateInputProps) {
      )}
    </div>
  );
-}
+});
+
+export default TemplateInput;
@@ -6,10 +6,8 @@ describe('matchRemaining()', () => {
    expect(matchRemaining('{{{hum', '{{human}}')).toBe('an}}');
    expect(matchRemaining('send {', '{{human}}')).toBe('{human}}');

-    // we should be able to match the following
-    // however, the current implementation only needs to deal with strings that start with {{
-    // expect(matchRemaining('{', '{{human}}')).toBe('{human}}');
-    // expect(matchRemaining('{{', '{{human}}')).toBe('human}}');
+    expect(matchRemaining('{', '{{human}}')).toBe('{human}}');
+    expect(matchRemaining('{{', '{{human}}')).toBe('human}}');
  });

  it('should return an empty string if there are no matches or if it is complete', () => {
@@ -83,6 +83,16 @@ export function matchRemaining(a: string, b: string) {
    return '';
  }

+  // naive match assuming that a template will start with {{
+  if (a.endsWith('{{') && b.startsWith('{{')) {
+    return b.substring(2);
+  }
+
+  // naive match assuming that a template will start with {
+  if (a.endsWith('{') && b.startsWith('{{')) {
+    return b.substring(1);
+  }
+
  for (let i = 0; i < b.length; i++) {
    const searchString = b.substring(0, i + 1);
    if (a.endsWith(searchString)) {
@@ -1,5 +1,6 @@
 import { useState } from 'react';
 import { Badge, Button, useDisclosure } from '@chakra-ui/react';
+import { Client } from 'ontime-types';

 import { RedirectClientModal } from '../../../../common/components/client-modal/RedirectClientModal';
 import { RenameClientModal } from '../../../../common/components/client-modal/RenameClientModal';
@@ -31,15 +32,16 @@ export default function ClientList() {
  const ontimeClients = Object.entries(clients).filter(([_, { type }]) => type === 'ontime');
  const otherClients = Object.entries(clients).filter(([_, { type }]) => type !== 'ontime');

-  const targetClient = clients[targetId];
+  const targetClient: Client | undefined = clients[targetId];

  return (
    <>
-      {isOpenRedirect && (
+      {isOpenRedirect && targetClient !== undefined && (
        <RedirectClientModal
          id={targetId}
-          name={targetClient?.name}
-          path={targetClient?.path}
+          name={targetClient.name}
+          origin={targetClient.origin}
+          currentPath={targetClient.path}
          isOpen={isOpenRedirect}
          onClose={onCloseRedirect}
        />
@@ -52,7 +54,7 @@ export default function ClientList() {
        <Panel.Table>
          <thead>
            <tr>
-              <td className={style.halfWidth}>Client Name (Connection ID)</td>
+              <td className={style.halfWidth}>Client Name</td>
              <td className={style.fullWidth}>Path</td>
              <td />
            </tr>
@@ -64,9 +66,6 @@ export default function ClientList() {
              return (
                <tr key={key}>
                  <Panel.InlineElements relation='inner' as='td'>
-                    <Badge variant='outline' size='xs'>
-                      {key}
-                    </Badge>
                    {isCurrent && (
                      <Badge variant='outline' colorScheme='yellow' size='xs'>
                        self
@@ -119,7 +118,7 @@ export default function ClientList() {
        <Panel.Table>
          <thead>
            <tr>
-              <td className={style.halfWidthNoWrap}>Client Name (Connection ID)</td>
+              <td className={style.halfWidthNoWrap}>Client Name</td>
              <td className={style.halfWidthNoWrap}>Client type</td>
            </tr>
          </thead>
@@ -129,12 +128,7 @@ export default function ClientList() {

              return (
                <tr key={key}>
-                  <Panel.InlineElements relation='inner' as='td'>
-                    <Badge variant='outline' size='sx'>
-                      {key}
-                    </Badge>
-                    {name}
-                  </Panel.InlineElements>
+                  <td>{name}</td>
                  <td>{type}</td>
                </tr>
              );
--- a/Show More
+++ b/Show More