refactor: target chrome 89

2026-07-26 10:38:55 +00:00 · 2025-01-28 17:22:38 +01:00
290 changed files with 4197 additions and 5891 deletions
@@ -1,6 +1,6 @@
 {
    "name": "@getontime/cli",
-    "version": "3.14.3",
+    "version": "3.11.0-beta.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.14.3",
+  "version": "3.11.0-beta.1",
  "private": true,
  "type": "module",
  "dependencies": {
@@ -13,8 +13,8 @@
    "@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",
@@ -28,11 +28,10 @@
    "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",
    "web-vitals": "^3.1.1",
-    "zustand": "^5.0.3"
+    "zustand": "^4.5.2"
  },
  "scripts": {
    "addversion": "node -p \"'export const ONTIME_VERSION = ' + JSON.stringify(require('../../package.json').version) + ';'\" > src/ONTIME_VERSION.js",
@@ -69,6 +68,7 @@
    "@types/react-dom": "^18.0.10",
    "@typescript-eslint/eslint-plugin": "catalog:",
    "@typescript-eslint/parser": "catalog:",
+    "@vitejs/plugin-legacy": "^6.0.0",
    "@vitejs/plugin-react": "^4.2.1",
    "eslint": "catalog:",
    "eslint-config-prettier": "catalog:",
@@ -82,6 +82,7 @@
    "ontime-utils": "workspace:*",
    "prettier": "catalog:",
    "sass": "^1.57.1",
+    "terser": "^5.37.0",
    "typescript": "catalog:",
    "vite": "^5.2.11",
    "vite-plugin-compression2": "^1.3.3",
@@ -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('./views/backstage/Backstage'));
+const Backstage = React.lazy(() => import('./features/viewers/backstage/Backstage'));
 const Timeline = React.lazy(() => import('./views/timeline/TimelinePage'));
-const Public = React.lazy(() => import('./views/public/Public'));
+const Public = React.lazy(() => import('./features/viewers/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'));
@@ -44,8 +44,6 @@ const SPublic = withPreset(withData(Public));
 const SLowerThird = withPreset(withData(Lower));
 const SStudio = withPreset(withData(StudioClock));
 const STimeline = withPreset(withData(Timeline));
-const PCuesheet = withPreset(Cuesheet);
-const POperator = withPreset(Operator);

 const EditorFeatureWrapper = React.lazy(() => import('./features/EditorFeatureWrapper'));
 const RundownPanel = React.lazy(() => import('./features/rundown/RundownExport'));
@@ -157,15 +155,8 @@ export default function AppRouter() {

        {/*/!* Protected Routes *!/*/}
        <Route path='/editor' element={<Editor />} />
-        <Route path='/cuesheet' element={<PCuesheet />} />
-        <Route
-          path='/op'
-          element={
-            <ViewLoader>
-              <POperator />
-            </ViewLoader>
-          }
-        />
+        <Route path='/cuesheet' element={<Cuesheet />} />
+        <Route path='/op' element={<Operator />} />

        {/*/!* Protected Routes - Elements *!/*/}
        <Route
@@ -14,7 +14,6 @@ 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,8 +1,7 @@
 import axios, { AxiosResponse } from 'axios';
 import { DatabaseModel, MessageResponse, ProjectData, ProjectFileListResponse, QuickStartData } from 'ontime-types';

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

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

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

    const blob = createBlob(fileContent, 'text/csv;charset=utf-8;');
    downloadBlob(blob, `${name}.csv`);
@@ -1,26 +0,0 @@
-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 });
-}
@@ -0,0 +1,12 @@
+@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;
+}
@@ -0,0 +1,26 @@
+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>
+  );
+}
@@ -1,26 +0,0 @@
-.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;
-  }
-}
@@ -1,14 +0,0 @@
-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>
-  );
-}
@@ -1,24 +0,0 @@
-.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,125 +1,64 @@
 import { useState } from 'react';
-import { IoArrowForward } from 'react-icons/io5';
 import {
-  IconButton,
+  Button,
  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;
-  currentPath: string;
-  origin: string;
+  name?: string;
+  path?: string;
  isOpen: boolean;
  onClose: () => void;
 }

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

  const { setRedirect } = setClientRemote;

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

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

  return (
    <Modal isOpen={isOpen} onClose={onClose} variant='ontime'>
      <ModalOverlay />
-      <ModalContent maxWidth='max(480px, 35vw)'>
+      <ModalContent>
        <ModalHeader>Redirect: {name}</ModalHeader>
        <ModalCloseButton />
        <ModalBody>
-          <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>
+          <InputGroup variant='ontime-filled' size='md'>
+            <InputLeftAddon>{host}</InputLeftAddon>
+            <Input placeholder='minimal?key=0000ffff' value={path} onChange={(event) => setPath(event.target.value)} />
+          </InputGroup>
        </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,5 +1,6 @@
-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,22 +26,17 @@ 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: appState,
+        store: runtimeStore.getState(),
        hasSocket: { hasConnected, shouldReconnect, reconnectAttempts },
      });
      const eventId = Sentry.captureException(error);
      this.setState({ eventId, info });
    });
+    this.reportContent = `${error} ${info.componentStack}`;
  }

  render() {
@@ -1,8 +1,8 @@
 import { MouseEvent, ReactNode } from 'react';
-import { IoOpenOutline } from 'react-icons/io5';
+import { IoOpenOutline } from '@react-icons/all-files/io5/IoOpenOutline';

-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,6 +14,7 @@ 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();
@@ -21,14 +22,8 @@ export default function ExternalLink(props: ExternalLinkProps) {
  };

  return (
-    <a
-      href='#!'
-      target='_blank'
-      rel='noreferrer'
-      className={cx([style.link, inline && style.inline])}
-      onClick={handleClick}
-    >
-      {children} <IoOpenOutline style={{ fontSize: '1em' }} />
+    <a href='#!' target='_blank' rel='noreferrer' className={classes} onClick={handleClick}>
+      {children} <IoOpenOutline />
    </a>
  );
 }
@@ -2,19 +2,14 @@
  display: flex;
  align-items: center;
  gap: $element-spacing;
-
-  background-color: $gray-1200;
-  border-radius: 3px;
-  font-size: $text-body-size;
  padding: 1rem;
+  margin-bottom: 1rem;

-  .content {
-    color: $gray-200;
-  }
+  background-color: $gray-1100;
+  border-radius: 2px;
+  font-size: $inner-section-text-size;

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

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

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

 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/io5';
+import { IoEyedrop } from '@react-icons/all-files/io5/IoEyedrop';
 import { ViewSettings } from 'ontime-types';

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

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

@@ -17,7 +17,6 @@ export default function useReactiveTextInput(
    submitOnCtrlEnter?: boolean;
    onCancelUpdate?: () => void;
    allowSubmitSameValue?: boolean;
-    allowKeyboardNavigation?: boolean;
  },
 ): UseReactiveTextInputReturn {
  const [text, setText] = useState<string>(initialText);
@@ -59,14 +58,7 @@ export default function useReactiveTextInput(
          setText(cleanVal);
        }
      }
-
-      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
+      setTimeout(() => ref.current?.blur()); // Immediate timeout to ensure text is set before bluring
    },
    [initialText, options, ref, submitCallback],
  );
@@ -78,25 +70,12 @@ 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 blurring
+    setTimeout(() => ref.current?.blur()); // Immediate timeout to ensure text is set before bluring
  }, [initialText, options, ref]);

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

    if (options?.submitOnEnter) {
      hotKeys.push(['Enter', () => handleSubmit(text)]);
@@ -105,22 +84,7 @@ export default function useReactiveTextInput(
    if (options?.submitOnCtrlEnter) {
      hotKeys.push(['mod + Enter', () => handleSubmit(text)]);
    }
-
-    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);
-    };
+    return getHotkeyHandler(hotKeys);
  }, [handleEscape, handleSubmit, options?.submitOnCtrlEnter, options?.submitOnEnter, text]);

  return {
@@ -1,10 +0,0 @@
-.link {
-  color: $label-gray;
-  font-size: $text-body-size;
-  text-decoration: underline;
-  text-underline-offset: 2px;
-
-  &:hover {
-    color: $blue-400;
-  }
-}
@@ -1,25 +0,0 @@
-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,7 @@
-import { IoApps } from 'react-icons/io5';
-import { IoSettingsOutline } from 'react-icons/io5';
+import { IoApps } from '@react-icons/all-files/io5/IoApps';
+import { IoSettingsOutline } from '@react-icons/all-files/io5/IoSettingsOutline';

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

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

@@ -16,7 +15,7 @@ export default function FloatingNavigation(props: FloatingNavigationProps) {
  const isButtonShown = useFadeOutOnInactivity();

  return (
-    <div className={cx([style.fadeable, style.buttonContainer, !isButtonShown && style.hidden])}>
+    <div className={`${style.buttonContainer} ${!isButtonShown ? style.hidden : ''}`}>
      <button
        onClick={toggleMenu}
        aria-label='toggle menu'
@@ -7,38 +7,24 @@ $icon-color: $ui-white;
 $button-bg: $gray-1050;
 $button-size: 3rem;

-.fadeable {
-  opacity: 1;
-
-  transition-property: opacity;
-  transition-duration: 0.3s;
-
-  &.hidden {
-    opacity: 0;
-  }
-}
-
-.lockIcon {
-  font-size: 1.5rem;
-  color: $active-indicator;
-  padding: 0.5em;
-
-  position: fixed;
-  left: 0;
-  top: 0;
-  z-index: 12;
-}
-
 .buttonContainer {
  display: flex;
  flex-direction: column;
  row-gap: 1rem;
  padding: 0.5em;

+  transition-property: opacity;
+  transition-duration: 0.3s;
+
+  opacity: 1;
  position: fixed;
  left: 0;
  top: 0;
  z-index: 12;
+
+  &.hidden {
+    opacity: 0;
+  }
 }

 .button {
@@ -52,6 +38,16 @@ $button-size: 3rem;
  border-radius: 3px;
 }

+.lockIcon {
+  font-size: 1.5rem;
+  display: grid;
+  place-content: center;
+  border-radius: 3px;
+  background-color: transparent;
+  color: $active-indicator;
+  cursor: default;
+}
+
 .navButton {
  @extend .button;
  z-index: 3;
@@ -1,6 +1,5 @@
 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,
@@ -12,6 +11,11 @@ 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,7 +1,6 @@
-import { IoLockClosedOutline } from 'react-icons/io5';
+import { IoLockClosedOutline } from '@react-icons/all-files/io5/IoLockClosedOutline';

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

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

@@ -9,8 +8,8 @@ export default function ViewLockedIcon() {
  const isLockIconShown = useFadeOutOnInactivity();

  return (
-    <div className={cx([style.fadeable, style.lockIcon, !isLockIconShown && style.hidden])}>
-      <IoLockClosedOutline />
+    <div className={`${style.buttonContainer} ${!isLockIconShown ? style.hidden : ''}`}>
+      <IoLockClosedOutline className={style.lockIcon} />
    </div>
  );
 }
@@ -1,20 +1,23 @@
-import { memo } from 'react';
+import { memo, useCallback } from 'react';
+import { useSearchParams } from 'react-router-dom';
 import { useDisclosure } from '@chakra-ui/react';

+import { isStringBoolean } from '../../../features/viewers/common/viewUtils';
+
 import FloatingNavigation from './FloatingNavigation';
 import NavigationMenu from './NavigationMenu';
-import useViewEditor from './useViewEditor';
 import ViewLockedIcon from './ViewLockedIcon';

-interface ViewNavigationMenuProps {
-  isLockable?: boolean;
-}
-
-function ViewNavigationMenu(props: ViewNavigationMenuProps) {
-  const { isLockable } = props;
-
+function ViewNavigationMenu() {
+  const [searchParams, setSearchParams] = useSearchParams();
  const { isOpen: isMenuOpen, onOpen: onMenuOpen, onClose: onMenuClose } = useDisclosure();
-  const { showEditFormDrawer, isViewLocked } = useViewEditor({ isLockable });
+
+  const isViewLocked = isStringBoolean(searchParams.get('locked'));
+
+  const showEditFormDrawer = useCallback(() => {
+    searchParams.set('edit', 'true');
+    setSearchParams(searchParams);
+  }, [searchParams, setSearchParams]);

  const toggleMenu = () => (isMenuOpen ? onMenuClose() : onMenuOpen());

@@ -1,26 +0,0 @@
-import { useCallback, useMemo } from 'react';
-import { useSearchParams } from 'react-router-dom';
-
-import { isStringBoolean } from '../../../features/viewers/common/viewUtils';
-
-interface EditorVisibilityOptions {
-  isLockable?: boolean;
-}
-
-export default function useViewEditor({ isLockable }: EditorVisibilityOptions) {
-  const [searchParams, setSearchParams] = useSearchParams();
-
-  const showEditFormDrawer = useCallback(() => {
-    searchParams.set('edit', 'true');
-    setSearchParams(searchParams);
-  }, [searchParams, setSearchParams]);
-
-  const isViewLocked = useMemo(() => {
-    if (!isLockable) {
-      return false;
-    }
-    return isStringBoolean(searchParams.get('locked'));
-  }, [isLockable, searchParams]);
-
-  return { showEditFormDrawer, isViewLocked };
-}
@@ -1,5 +1,7 @@
-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,6 +9,10 @@ $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,15 +7,16 @@ import './ProgressBar.scss';
 interface ProgressBarProps {
  current: MaybeNumber;
  duration: MaybeNumber;
+  hidden?: boolean;
  className?: string;
 }

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

  return (
-    <div className={`progress-bar__bg ${className}`}>
+    <div className={`progress-bar__bg ${hidden ? 'progress-bar__bg--hidden' : ''} ${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';

@@ -0,0 +1,76 @@
+@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);
+    }
+  }
+}
@@ -0,0 +1,52 @@
+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>
+  );
+}
@@ -0,0 +1,102 @@
+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;
+};
@@ -0,0 +1,43 @@
+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>
+  );
+}
@@ -0,0 +1,23 @@
+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.8;
+    opacity: 0.6;
  }

  .text {
@@ -1,20 +1,18 @@
 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, className, ...rest } = props;
+  const { text, ...rest } = props;
  return (
-    <div className={cx([style.emptyContainer, className])} {...rest}>
+    <div className={style.emptyContainer} {...rest}>
      <EmptyImage className={style.empty} />
      {text && <span className={style.text}>{text}</span>}
    </div>
@@ -1,5 +1,8 @@
@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;
@@ -7,23 +10,21 @@
 }

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

 .title-card__title {
+  font-weight: 600;
+  font-size: $title-primary-size;
  color: var(--color-override, $viewer-color);
-  padding-right: 1em;
-}
-
-.title-card__placeholder {
-  color: var(--label-color-override, $viewer-label-color);
+  line-height: 1.2em;
 }

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

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

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

 import './TitleCard.scss';

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

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

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

 export default function ViewLogo(props: ViewLogoProps) {
  const { name, className } = props;
-
-  // 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>
-  );
+  return <img src={`${projectLogoPath}/${name}`} className={className} />;
 }
@@ -1,5 +1,4 @@
 import { useState } from 'react';
-import { IoChevronDown } from 'react-icons/io5';
 import { useSearchParams } from 'react-router-dom';
 import {
  Button,
@@ -14,6 +13,7 @@ import {
  Select,
  Switch,
 } from '@chakra-ui/react';
+import { IoChevronDown } from '@react-icons/all-files/io5/IoChevronDown';

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

@@ -119,16 +119,16 @@ function MultiOption(props: EditFormMultiOptionProps) {
        <MenuButton as={Button} variant='ontime-subtle-white' position='relative' width='fit-content' fontWeight={400}>
          {paramField.title} <IoChevronDown style={{ display: 'inline' }} />
        </MenuButton>
-        <MenuList overflow='auto' maxHeight='200px'>
+        <MenuList>
          <MenuOptionGroup
            type='checkbox'
            value={paramState}
            onChange={(value) => setParamState(Array.isArray(value) ? value : [value])}
          >
            {Object.values(paramField.values).map((option) => {
-              const { value, label, colour } = option;
+              const { value, label } = option;
              return (
-                <MenuItemOption value={value} key={value} style={{ borderRight: `8px solid ${colour}` }}>
+                <MenuItemOption value={value} key={value}>
                  {label}
                </MenuItemOption>
              );
@@ -16,7 +16,3 @@
  overflow-y: scroll;
  padding-right: 0.5rem;
 }
-
-.info {
-  margin-bottom: 1rem;
-}
@@ -12,7 +12,7 @@ import {
  useDisclosure,
 } from '@chakra-ui/react';

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

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

        <DrawerBody>
-          {viewSettings.overrideStyles && (
-            <Info className={style.info}>This view style is being modified by a custom CSS file.</Info>
-          )}
+          {viewSettings.overrideStyles && <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,5 +1,5 @@
-import { IoChevronDown } from 'react-icons/io5';
 import { useLocalStorage } from '@mantine/hooks';
+import { IoChevronDown } from '@react-icons/all-files/io5/IoChevronDown';

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

@@ -1,45 +0,0 @@
-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,34 +1,17 @@
 import { CustomFields } from 'ontime-types';

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

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

-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,11 +12,9 @@ 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: MultiselectOptions;
+  values: Record<string, { value: string; label: string; colour: string }>;
  defaultValue?: string;
 };

@@ -1,20 +0,0 @@
-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, useMemo, useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { useQuery } from '@tanstack/react-query';
-import { NormalisedRundown, OntimeRundown, OntimeRundownEntry, RundownCached } from 'ontime-types';
+import { NormalisedRundown, OntimeRundown, RundownCached } from 'ontime-types';

 import { queryRefetchIntervalSlow } from '../../ontimeConfig';
 import { RUNDOWN } from '../api/constants';
@@ -11,9 +11,6 @@ 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,
@@ -27,10 +24,6 @@ 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();
@@ -59,15 +52,3 @@ 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,6 +1,5 @@
 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';
@@ -10,12 +9,10 @@ import { useIsOnline } from './useSocket';
 export const useClientPath = () => {
  const navigate = useNavigate();
  const { pathname, search } = useLocation();
-  const { redirect, setRedirect } = useClientStore(
-    useShallow((store) => ({
-      redirect: store.redirect,
-      setRedirect: store.setRedirect,
-    })),
-  );
+  const { redirect, setRedirect } = useClientStore((store) => ({
+    redirect: store.redirect,
+    setRedirect: store.setRedirect,
+  }));
  const isOnline = useIsOnline();

  // notify of client path changes
@@ -55,17 +55,6 @@ 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
@@ -626,7 +615,6 @@ export const useEventAction = () => {
    batchUpdateEvents,
    deleteEvent,
    deleteAllEvents,
-    getEventById,
    reorderEvent,
    swapEvents,
    updateEvent,
@@ -1,7 +1,6 @@
 import { useEffect, useState } from 'react';

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

 export const useFadeOutOnInactivity = () => {
  const [isMouseMoved, setIsMouseMoved] = useState(false);
@@ -0,0 +1,27 @@
+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]);
+};
@@ -3,54 +3,73 @@ import { RuntimeStore, SimpleDirection, SimplePlayback, TimerMessage } from 'ont
 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 = createSelector((state: RuntimeStore) => ({
-  playback: state.timer.playback,
-  selectedEventId: state.eventNow?.id ?? null,
-  nextEventId: state.eventNext?.id ?? null,
-}));
+export const useRundownEditor = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    playback: state.timer.playback,
+    selectedEventId: state.eventNow?.id ?? null,
+    nextEventId: state.eventNext?.id ?? null,
+  });

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

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

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

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

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

-export const usePlaybackControl = createSelector((state: RuntimeStore) => ({
-  playback: state.timer.playback,
-  selectedEventIndex: state.runtime.selectedEventIndex,
-  numEvents: state.runtime.numEvents,
-  timerPhase: state.timer.phase,
-}));
+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 setPlayback = {
  start: () => socketSendJson('start'),
@@ -91,20 +114,32 @@ export const setPlayback = {
  },
 };

-export const useInfoPanel = createSelector((state: RuntimeStore) => ({
-  eventNow: state.eventNow,
-  eventNext: state.eventNext,
-  playback: state.timer.playback,
-  selectedEventIndex: state.runtime.selectedEventIndex,
-  numEvents: state.runtime.numEvents,
-}));
+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 useAuxTimerTime = createSelector((state: RuntimeStore) => state.auxtimer1.current);
+  return useRuntimeStore(featureSelector);
+};

-export const useAuxTimerControl = createSelector((state: RuntimeStore) => ({
-  playback: state.auxtimer1.playback,
-  direction: state.auxtimer1.direction,
-}));
+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 setAuxTimer = {
  start: () => socketSendJson('auxtimer', { '1': SimplePlayback.Start }),
@@ -114,13 +149,20 @@ export const setAuxTimer = {
  setDuration: (time: number) => socketSendJson('auxtimer', { '1': { duration: time } }),
 };

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

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

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

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

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

 /** Used by the progress bar components */
-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 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 setClientName = (newName: string) => socketSendJson('set-client-name', newName);

-export const useRuntimeOverview = createSelector((state: RuntimeStore) => ({
-  plannedStart: state.runtime.plannedStart,
-  actualStart: state.runtime.actualStart,
-  plannedEnd: state.runtime.plannedEnd,
-  expectedEnd: state.runtime.expectedEnd,
-}));
+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 useRuntimePlaybackOverview = createSelector((state: RuntimeStore) => ({
-  playback: state.timer.playback,
-  clock: state.clock,
+  return useRuntimeStore(featureSelector);
+};

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

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

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

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

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

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

 /** convert ping into a derived value which changes less often */
-export const useIsOnline = createSelector((state: RuntimeStore) => ({
-  isOnline: state.ping > 0,
-}));
+export const useIsOnline = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    isOnline: state.ping > 0,
+  });
+
+  return useRuntimeStore(featureSelector);
+};

 export const usePlayback = () => {
  const featureSelector = (state: RuntimeStore) => ({
@@ -1,13 +0,0 @@
-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, TimeStrategy } from 'ontime-types';
+import { EndAction, EventCustomFields, OntimeEvent, SupportedEvent, TimerType } from 'ontime-types';

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

 describe('cloneEvent()', () => {
  it('creates a stem from a given event', () => {
-    const original: OntimeEvent = {
+    const original = {
      id: 'unique',
      type: SupportedEvent.Event,
      title: 'title',
@@ -14,9 +14,6 @@ describe('cloneEvent()', () => {
      duration: 10,
      timeEnd: 10,
      timerType: TimerType.CountDown,
-      timeStrategy: TimeStrategy.LockEnd,
-      linkStart: null,
-      countToEnd: false,
      endAction: EndAction.None,
      isPublic: false,
      skip: false,
@@ -24,39 +21,29 @@ 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);
-    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,
-    });
+    // @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({});
  });
 });
@@ -1,4 +1,4 @@
-import { calculateTimeUntilStart, formatTime, nowInMillis } from '../time';
+import { formatTime, nowInMillis } from '../time';

 describe('nowInMillis()', () => {
  it('should return the current time in milliseconds', () => {
@@ -38,84 +38,3 @@ describe('formatTime()', () => {
    expect(time).toStrictEqual('-01:00');
  });
 });
-
-describe('calculateTimeUntilStart()', () => {
-  test('ontime', () => {
-    const test = {
-      timeStart: 100,
-      dayOffset: 0,
-      delay: 0,
-      currentDay: 0,
-      totalGap: 0,
-      clock: 90,
-      offset: 0,
-    };
-
-    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,
-    };
-
-    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,
-    };
-
-    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,
-    };
-
-    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(50);
-    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(70); // This should not be possible
-  });
-
-  test('running behind with to little gaps', () => {
-    const test = {
-      timeStart: 100,
-      dayOffset: 0,
-      delay: 0,
-      currentDay: 0,
-      totalGap: 10,
-      clock: 50,
-      offset: -20,
-    };
-
-    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(60);
-    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(70); // This should not be possible
-  });
-
-  //TODO: more indepth testing,
-  // including day offset handling
-  // and more?
-});
@@ -0,0 +1,103 @@
+import { resolvePath } from 'react-router-dom';
+
+import { generateUrlFromPreset, getRouteFromPreset, validateUrlPresetPath } from '../urlPresets';
+
+describe('A preset fails if incorrect', () => {
+  const testsToFail = [
+    // no empty
+    '',
+    // no https, http or www
+    'https://www.test.com',
+    'http://www.test.com',
+    'www.test.com',
+    // no hostname
+    'localhost/test',
+    '127.0.0.1/test',
+    '0.0.0.0/test',
+    // no editor
+    'editor',
+    'editor?test',
+  ];
+
+  testsToFail.forEach((t) =>
+    it(`${t}`, () => {
+      expect(validateUrlPresetPath(t).isValid).toBeFalsy();
+    }),
+  );
+});
+describe('generateUrlFromPreset and getRouteFromPreset function', () => {
+  test('generate the expected url from an alias', () => {
+    const testData = [
+      {
+        enabled: true,
+        alias: 'demopage',
+        pathAndParams: '/timer?user=guest',
+      },
+    ];
+
+    const expected = [
+      {
+        url: '/timer?user=guest&alias=demopage',
+      },
+    ];
+
+    expect(generateUrlFromPreset(testData[0])).toStrictEqual(expected[0].url);
+  });
+  test('generate the url to redirect to when the current URL is just the alias', () => {
+    const presets = [
+      {
+        enabled: true,
+        alias: 'demopage',
+        pathAndParams: '/timer?user=guest',
+      },
+    ];
+    // let current location be the alias
+    const location = resolvePath(presets[0].alias);
+
+    const expected = [
+      {
+        url: '/timer?user=guest&alias=demopage',
+      },
+    ];
+
+    expect(getRouteFromPreset(location, presets, null)).toStrictEqual(expected[0].url);
+  });
+  test('generate the url to redirect to when the current URL the same url but with a change of params', () => {
+    const presets = [
+      {
+        enabled: true,
+        alias: 'demopage',
+        pathAndParams: '/timer?user=guest',
+      },
+    ];
+    // let current location be the actual url with alias attached to it
+    const location = resolvePath(presets[0].pathAndParams);
+    const urlSearchParams = new URLSearchParams(location.search);
+    urlSearchParams.append('alias', presets[0].alias); //
+
+    // update current alias with extra param
+    presets[0].pathAndParams += '&eventId=674';
+    const expected = [
+      {
+        url: '/timer?user=guest&eventId=674&alias=demopage',
+      },
+    ];
+
+    expect(getRouteFromPreset(location, presets, urlSearchParams)).toStrictEqual(expected[0].url);
+  });
+  test('generate no url to redirect to when the current URL the same url', () => {
+    const presets = [
+      {
+        enabled: true,
+        alias: 'demopage',
+        pathAndParams: '/timer?user=guest',
+      },
+    ];
+    // let current location be the actual url with alias attached to it
+    const location = resolvePath(presets[0].pathAndParams);
+    const urlSearchParams = new URLSearchParams(location.search);
+    urlSearchParams.append('alias', presets[0].alias); //
+
+    expect(getRouteFromPreset(location, presets, urlSearchParams)).toBeNull();
+  });
+});
@@ -1,107 +0,0 @@
-import { resolvePath } from 'react-router-dom';
-
-import { arePathsEquivalent, generatePathFromPreset, getRouteFromPreset, validateUrlPresetPath } from '../urlPresets';
-
-describe('validateUrlPresetPaths()', () => {
-  test.each([
-    // no empty
-    '',
-    // no https, http or www
-    'https://www.test.com',
-    'http://www.test.com',
-    'www.test.com',
-    // no hostname
-    'localhost/test',
-    '127.0.0.1/test',
-    '0.0.0.0/test',
-    // no editor
-    'editor',
-    'editor?test',
-  ])('flags known edge cases: %s', (t) => {
-    expect(validateUrlPresetPath(t).isValid).toBeFalsy();
-  });
-});
-
-describe('getRouteFromPreset()', () => {
-  const presets = [
-    {
-      enabled: true,
-      alias: 'demopage',
-      pathAndParams: '/timer?user=guest',
-    },
-  ];
-
-  it('checks if the current location matches an enabled preset', () => {
-    // we make the current location be the alias
-    const location = resolvePath('demopage');
-    expect(getRouteFromPreset(location, presets)).toStrictEqual('timer?user=guest&alias=demopage');
-  });
-
-  it('returns null if the current location is the exact match of an unwrapped alias', () => {
-    // we make the current location be the alias
-    const location = resolvePath('/timer?user=guest&alias=demopage');
-    expect(getRouteFromPreset(location, presets)).toEqual(null);
-  });
-
-  it('returns a new destination if the current location is an out-of-date unwrapped alias', () => {
-    // we make the current location be the alias
-    const location = resolvePath('/timer?user=admin&alias=demopage');
-    expect(getRouteFromPreset(location, presets)).toEqual('timer?user=guest&alias=demopage');
-  });
-
-  it('checks if the current location contains an unwrapped preset', () => {
-    // we make the current location be the alias
-    const location = resolvePath('/timer?user=guest&alias=demopage');
-    expect(getRouteFromPreset(location, presets)).toEqual(null);
-  });
-
-  it('ignores a location that has no presets', () => {
-    // we make the current location be the alias
-    const location = resolvePath('/unknown');
-    expect(getRouteFromPreset(location, presets)).toEqual(null);
-  });
-
-  describe('handle url sharing edge cases', () => {
-    it('finds the correct preset when the url contains extra arguments', () => {
-      const location = resolvePath('/demopage?locked=true&token=123');
-      expect(getRouteFromPreset(location, presets)?.startsWith('timer?user=guest&alias=demopage')).toBeTruthy()
-    })
-
-    it('appends the feature params to the alias', () => {
-      const location = resolvePath('/demopage?locked=true&token=123');
-      expect(getRouteFromPreset(location, presets)).toBe('timer?user=guest&alias=demopage&locked=true&token=123')
-    })
-  });
-});
-
-describe('generatePathFromPreset()', () => {
-  test.each([
-    ['timer?user=guest', 'demopage', 'timer?user=guest&alias=demopage'],
-    ['timer?user=admin', 'demopage', 'timer?user=admin&alias=demopage'],
-  ])('generates a path from a preset: %s', (path, alias, expected) => {
-    expect(generatePathFromPreset(path, alias, null, null)).toEqual(expected);
-  });
-
-  test('appends the feature params to the alias', () => {
-    expect(generatePathFromPreset('timer?user=guest', 'demopage', 'true', '123')).toBe('timer?user=guest&alias=demopage&locked=true&token=123');
-  });
-});
-
-describe('arePathsEquivalent()', () => {
-  it("checks whether the paths match",  () => {
-    expect(arePathsEquivalent('demopage', 'timer')).toBeFalsy();
-    expect(arePathsEquivalent('timer', 'timer')).toBeTruthy();
-    expect(arePathsEquivalent('timer?user=guest', 'timer?user=guest')).toBeTruthy();
-  })
-
-  it("checks whether the params match",  () => {
-    expect(arePathsEquivalent('timer?test=a', 'timer?test=b')).toBeFalsy();
-    expect(arePathsEquivalent('timer?test=a', 'timer?test=a')).toBeTruthy();
-  })
-
-  it("considers edge cases for the url sharing feature",  () => {
-    expect(arePathsEquivalent('timer?test=a&locked=true=token=123', 'timer?test=b')).toBeFalsy();
-    expect(arePathsEquivalent('timer?test=a&locked=true=token=123', 'timer?test=a')).toBeTruthy();
-  })
-});
-
@@ -1,10 +0,0 @@
-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: event.delay, // the events will be collocated, so having the same metadata is a good start
-    dayOffset: event.dayOffset,
+    delay: 0,
+    dayOffset: 0,
    gap: 0,
    timeWarning: event.timeWarning,
    timeDanger: event.timeDanger,
-    custom: { ...event.custom },
+    custom: {},
  };
 };
@@ -1,12 +0,0 @@
-/**
- * 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,6 +6,7 @@ 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') {
@@ -1,7 +1,7 @@
 import { Log, RundownCached, RuntimeStore } from 'ontime-types';

 import { isProduction, websocketUrl } from '../../externals';
-import { CLIENT_LIST, CUSTOM_FIELDS, REPORT, RUNDOWN, RUNTIME } from '../api/constants';
+import { CLIENT_LIST, CUSTOM_FIELDS, RUNDOWN, RUNTIME } from '../api/constants';
 import { invalidateAllCaches } from '../api/utils';
 import { ontimeQueryClient } from '../queryClient';
 import {
@@ -34,16 +34,12 @@ 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 = () => {
@@ -82,14 +78,16 @@ export const connectSocket = () => {
          updateDevTools({ ping: offset });
          break;
        }
-        case 'client': {
-          if (typeof payload === 'object' || payload !== null) {
-            if (payload.clientId && payload.clientName) {
-              setClientId(payload.clientId);
-              if (!preferredClientName) {
-                setClientName(payload.clientName);
-              }
-            }
+        case 'client-id': {
+          if (typeof payload === 'string') {
+            setClientId(payload);
+          }
+          break;
+        }
+
+        case 'client-name': {
+          if (typeof payload === 'string') {
+            setClientName(payload);
          }
          break;
        }
@@ -198,23 +196,19 @@ export const connectSocket = () => {
        }
        case 'ontime-refetch': {
          // the refetch message signals that the rundown has changed in the server side
-          const { reload, target } = payload;
+          const { revision, reload } = payload;
+          const currentRevision = ontimeQueryClient.getQueryData<RundownCached>(RUNDOWN)?.revision ?? -1;
+
          if (reload) {
            invalidateAllCaches();
-          } 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 });
+          } else if (revision > currentRevision) {
+            ontimeQueryClient.invalidateQueries({ queryKey: RUNDOWN });
+            ontimeQueryClient.invalidateQueries({ queryKey: CUSTOM_FIELDS });
          }
          break;
        }
        case 'ontime-flush': {
-          flushBatchUpdates();
+          flushBatchUpdates()
          break;
        }
      }
@@ -1,9 +1,8 @@
-import { MaybeNumber, OntimeEvent, Settings, TimeFormat } from 'ontime-types';
-import { dayInMs, formatFromMillis, MILLIS_PER_HOUR, MILLIS_PER_MINUTE, MILLIS_PER_SECOND } from 'ontime-utils';
+import { MaybeNumber, Settings, TimeFormat } from 'ontime-types';
+import { 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';

 /**
@@ -126,71 +125,3 @@ 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 } = useTimeUntilData();
-  return calculateTimeUntilStart({ ...data, currentDay, clock, offset });
-}
-
-/**
- *
- * @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;
-  },
-): number {
-  const { timeStart, dayOffset, currentDay, totalGap, isLinkedToLoaded, clock, offset, delay } = 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;
-
-  const offsetTimestart = normalisedTimeStart - offset;
-  const offsetTimeUntil = offsetTimestart - clock;
-
-  if (isLinkedToLoaded) {
-    //if we are directly linked back to the loaded event we just follow the offset
-    return offsetTimeUntil;
-  }
-
-  const scheduledTimeUntil = normalisedTimeStart - clock;
-
-  const isAheadOfSchedule = offset >= 0;
-  const gapsCanCompensadeForOffset = totalGap + offset >= 0;
-
-  if (isAheadOfSchedule || gapsCanCompensadeForOffset) {
-    // 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;
-}
@@ -1,11 +1,13 @@
-import { Path, resolvePath } from 'react-router-dom';
+import isEqual from 'react-fast-compare';
+import { Location, resolvePath } from 'react-router-dom';
 import { URLPreset } from 'ontime-types';

 /**
 * Validates a preset against defined parameters
- * Used in the context of form validation
+ * @param {string} preset
+ * @returns {{message: string, isValid: boolean}}
 */
-export function validateUrlPresetPath(preset: string): { message: string; isValid: boolean } {
+export const validateUrlPresetPath = (preset: string): { message: string; isValid: boolean } => {
  if (preset === '' || preset == null) {
    return { isValid: false, message: 'Path cannot be empty' };
  }
@@ -24,7 +26,7 @@ export function validateUrlPresetPath(preset: string): { message: string; isVali
  }

  return { isValid: true, message: 'ok' };
-}
+};

 /**
 * Utility removes trailing slash from a string
@@ -34,93 +36,48 @@ function removeTrailingSlash(text: string): string {
 }

 /**
- * Checks whether the current location corresponds to a preset and returns the new path if necessary
+ * Gets the URL to send a preset to
+ * @param location
+ * @param data
+ * @param searchParams
 */
-export function getRouteFromPreset(location: Path, urlPresets: URLPreset[]): string | null {
-  // current url is the pathname without the leading slash
+export const getRouteFromPreset = (location: Location, data: URLPreset[], searchParams: URLSearchParams) => {
  const currentURL = location.pathname.substring(1);
-  const searchParams = new URLSearchParams(location.search);

-  // check if we have token or locked in the search params
-  const locked = searchParams.get('locked');
-  const token = searchParams.get('token');
-
-  // we need to check if the whole url is an alias
-  const foundPreset = urlPresets.find((preset) => preset.alias === removeTrailingSlash(currentURL) && preset.enabled);
+  // we need to check if the whole url here is an alias, so we can redirect
+  const foundPreset = data.find((preset) => preset.alias === removeTrailingSlash(currentURL) && preset.enabled);
  if (foundPreset) {
-    // if so, we can redirect to the preset path
-    return generatePathFromPreset(foundPreset.pathAndParams, foundPreset.alias, locked, token);
+    return generateUrlFromPreset(foundPreset);
  }

-  // if the current url is not an alias, we check if the alias is in the search parameters
  const presetOnPage = searchParams.get('alias');
-  if (!presetOnPage) {
-    return null;
-  }
-
-  const currentPath = `${location.pathname}${location.search}`.substring(1);
-
-  for (const preset of urlPresets) {
-    // if the page has a known enabled alias, we check if we need to redirect
-    if (preset.alias === presetOnPage && preset.enabled) {
-      const newPath = generatePathFromPreset(preset.pathAndParams, preset.alias, locked, token);
-      if (!arePathsEquivalent(currentPath, newPath)) {
-        // if current path is out of date
-        // return new path so we can redirect
-        return newPath;
+  for (const d of data) {
+    if (presetOnPage) {
+      // if the alias fits the preset on this page, but the URL is different, we redirect user to the new URL
+      // if we have the same alias and its enabled and its not empty
+      if (d.alias !== '' && d.enabled && d.alias === presetOnPage) {
+        const newPath = resolvePath(d.pathAndParams);
+        const urlParams = new URLSearchParams(newPath.search);
+        urlParams.set('alias', d.alias);
+        // we confirm either the url parameters does not match or the url path doesnt
+        if (!isEqual(urlParams, searchParams) || newPath.pathname !== location.pathname) {
+          // we then redirect to the alias route, since the view listening to this alias has an outdated URL
+          return `${newPath.pathname}?${urlParams}`;
+        }
      }
    }
  }
  return null;
-}
+};

 /**
- * Handles generating a path and search parameters from a preset
+ * Generate URL from an preset
+ * @param presetData
 */
-export function generatePathFromPreset(pathAndParams: string, alias: string, locked: string | null, token: string | null ): string {
-  const path = resolvePath(pathAndParams);
-  const searchParams = new URLSearchParams(path.search);
+export const generateUrlFromPreset = (presetData: URLPreset) => {
+  const newPresetPath = resolvePath(presetData.pathAndParams);
+  const urlParams = new URLSearchParams(newPresetPath.search);
+  urlParams.set('alias', presetData.alias);

-  // save the alias so we have a reference to it being a preset and can update if necessary
-  searchParams.set('alias', alias);
-
-  // maintain params from the URL search feature
-  if (locked) {
-    searchParams.set('locked', locked);
-  }
-
-  if (token) {
-    searchParams.set('token', token);
-  }
-
-  // return path concatenated without the leading slash
-  return `${path.pathname}?${searchParams}`.substring(1);
-}
-
-/**
- * Utility checks if two paths are equivalent
- * Considers the edge cases for url sharing where a path may contain extra arguments from the alias
- * - token
- * - locked
- */
-export function arePathsEquivalent(currentPath: string, newPath: string): boolean {
-  const currentUrl = new URL(currentPath, document.location.origin);
-  const newUrl = new URL(newPath, document.location.origin);
-  
-  // check path
-  if (currentUrl.pathname !== newUrl.pathname) {
-    return false
-  }
-
-  // check search params
-  // if the params match, we dont need further checks
-  if (currentUrl.searchParams.toString() === newUrl.searchParams.toString()) {
-    return true
-  }
-
-  // if there is no match, we check the edge cases for the url sharing feature
-  currentUrl.searchParams.delete('token');
-  currentUrl.searchParams.delete('locked');
-
-  return currentUrl.searchParams.toString() === newUrl.searchParams.toString();
-}
+  return `${newPresetPath.pathname}?${urlParams}`;
+};
@@ -19,10 +19,9 @@ 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 currentHostName = window.location.hostname;
-export const isLocalhost = currentHostName === 'localhost' || currentHostName === '127.0.0.1';
+export const isLocalhost = window.location.hostname === 'localhost' || window.location.hostname === '127.0.0.1';
 export const isDockerImage = Boolean(import.meta.env.VITE_IS_DOCKER);
-export const isOntimeCloud = currentHostName.includes('cloud.getontime.no');
+export const isOntimeCloud = window.location.hostname.includes('cloud.getontime.no');

 // resolve entrypoint URLs

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

  return base;
-}
+}
@@ -1,6 +1,6 @@
 /* eslint-disable react/display-name */
 import { ComponentType, useEffect } from 'react';
-import { useLocation, useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate, useSearchParams } from 'react-router-dom';

 import useUrlPresets from '../common/hooks-query/useUrlPresets';
 import { getRouteFromPreset } from '../common/utils/urlPresets';
@@ -8,19 +8,19 @@ import { getRouteFromPreset } from '../common/utils/urlPresets';
 const withPreset = <P extends object>(Component: ComponentType<P>) => {
  return (props: Partial<P>) => {
    const { data } = useUrlPresets();
+    const [searchParams] = useSearchParams();
    const navigate = useNavigate();
    const location = useLocation();

    // navigate if is alias route
    useEffect(() => {
      if (!data) return;
-      const destination = getRouteFromPreset(location, data);
-
-      // navigate to this destination if its not null
-      if (destination) {
-        navigate(destination);
+      const url = getRouteFromPreset(location, data, searchParams);
+      // navigate to this route if its not empty
+      if (url) {
+        navigate(url);
      }
-    }, [data, navigate, location]);
+    }, [data, searchParams, navigate, location]);

    return <Component {...(props as P)} />;
  };
@@ -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';

@@ -38,7 +38,7 @@ $inner-padding: 1rem;
 .section {
  position: relative;
  margin-top: 2rem;
-  max-width: 850px;
+  max-width: 800px;
 }

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

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

  button {
@@ -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,17 +67,9 @@ export function TableEmpty({ label, handleClick }: { label?: string; handleClick
    <tr className={style.empty}>
      <td colSpan={99}>
        <div>{label ?? 'No data yet'}</div>
-        {handleClick && (
-          <Button
-            onClick={handleClick}
-            isDisabled={!handleClick}
-            variant='ontime-filled'
-            rightIcon={<IoAdd />}
-            size='sm'
-          >
-            New
-          </Button>
-        )}
+        <Button onClick={handleClick} isDisabled={!handleClick} variant='ontime-filled' rightIcon={<IoAdd />} size='sm'>
+          New
+        </Button>
      </td>
    </tr>
  );
@@ -1,4 +1,4 @@
-import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
+import ExternalLink from '../../../../common/components/external-link/ExternalLink';
 import {
  buyMeACoffeeUrl,
  discordUrl,
@@ -1,4 +1,4 @@
-import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
+import ExternalLink from '../../../../common/components/external-link/ExternalLink';
 import useAppVersion from '../../../../common/hooks-query/useAppVersion';
 import { appVersion } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';
@@ -27,8 +27,7 @@
 .titleSection,
 .filterSection,
 .oscSection,
-.httpSection,
-.actionSection {
+.httpSection {
  display: grid;
  grid-gap: 0.5rem;

@@ -41,10 +40,8 @@
 .ruleSection,
 .filterSection,
 .oscSection,
-.httpSection,
-.actionSection {
-  label,
-  div {
+.httpSection {
+  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);
@@ -54,6 +51,7 @@
  }
 }

+
 .titleSection {
  grid-template-columns: 1fr;
 }
@@ -70,14 +68,6 @@
  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,22 +1,23 @@
 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 {
-  Automation,
-  AutomationDTO,
-  HTTPOutput,
-  isHTTPOutput,
-  isOntimeAction,
-  isOSCOutput,
-  OntimeAction,
-  OSCOutput,
-} from 'ontime-types';
+  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';

 import { addAutomation, editAutomation, testOutput } from '../../../../common/api/automation';
 import { maybeAxiosError } from '../../../../common/api/utils';
-import Info from '../../../../common/components/info/Info';
-import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
+import ExternalLink from '../../../../common/components/external-link/ExternalLink';
 import Tag from '../../../../common/components/tag/Tag';
 import useAutomationSettings from '../../../../common/hooks-query/useAutomationSettings';
 import useCustomFields from '../../../../common/hooks-query/useCustomFields';
@@ -24,13 +25,11 @@ import { preventEscape } from '../../../../common/utils/keyEvent';
 import { startsWithHttp } from '../../../../common/utils/regex';
 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/automation/#using-variables-in-automation';
+const integrationsDocsUrl = 'https://docs.getontime.no/api/integrations/#using-variables-in-integrations';

 interface AutomationFormProps {
  automation: Automation | AutomationDTO;
@@ -51,7 +50,6 @@ export default function AutomationForm(props: AutomationFormProps) {
    register,
    setError,
    setFocus,
-    setValue,
    formState: { errors, isSubmitting, isDirty, isValid },
  } = useForm<AutomationDTO>({
    mode: 'onChange',
@@ -102,11 +100,6 @@ 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;
@@ -140,19 +133,6 @@ 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 });
@@ -209,7 +189,7 @@ export default function AutomationForm(props: AutomationFormProps) {
      </div>

      <div className={style.innerSection}>
-        <h3>Filters (optional)</h3>
+        <h3>Filters</h3>
        <div className={style.ruleSection}>
          <label>
            Trigger outputs if
@@ -224,80 +204,74 @@ export default function AutomationForm(props: AutomationFormProps) {
              )}
            />
          </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
+          {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}
                    </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>
-                    {/* 
+                  ))}
+                </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>
+                </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='<no value>'
+                  autoComplete='off'
+                />
+              </label>
+              <div>
+                <span>&nbsp;</span>
                <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>
+                  <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>
            <Button
              variant='ontime-subtle'
@@ -316,10 +290,13 @@ export default function AutomationForm(props: AutomationFormProps) {

      <div className={style.innerColumn}>
        <h3>Outputs</h3>
-        <Info>
-          Automation outputs can be used to send data from Ontime to external software.
-          <ExternalLink href={integrationsDocsUrl}>See the documentation for templates</ExternalLink>
-        </Info>
+        <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>

        {fieldOutputs.map((output, index) => {
          if (isOSCOutput(output)) {
@@ -379,13 +356,13 @@ export default function AutomationForm(props: AutomationFormProps) {
                    <Panel.Error>{rowErrors?.address?.message}</Panel.Error>
                  </label>
                  <label>
-                    Arguments
-                    <TemplateInput
+                    Parameters
+                    <Input
                      {...register(`outputs.${index}.args`)}
-                      value={output.args}
                      variant='ontime-filled'
                      size='sm'
                      placeholder='1'
+                      autoComplete='off'
                    />
                    <Panel.Error>{rowErrors?.args?.message}</Panel.Error>
                  </label>
@@ -402,6 +379,8 @@ export default function AutomationForm(props: AutomationFormProps) {
                        size='sm'
                        onClick={() => removeOutput(index)}
                        color='#FA5656' // $red-500
+                        isDisabled={false}
+                        isLoading={false}
                      />
                    </Panel.InlineElements>
                  </div>
@@ -449,6 +428,8 @@ export default function AutomationForm(props: AutomationFormProps) {
                        size='sm'
                        onClick={() => removeOutput(index)}
                        color='#FA5656' // $red-500
+                        isDisabled={false}
+                        isLoading={false}
                      />
                    </Panel.InlineElements>
                  </div>
@@ -456,59 +437,30 @@ 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}>
+          <Button
+            variant='ontime-subtle'
+            rightIcon={<IoAdd />}
+            size='sm'
+            onClick={handleAddNewOSCOutput}
+            isDisabled={false}
+            isLoading={false}
+          >
            OSC
          </Button>
-          <Button variant='ontime-subtle' rightIcon={<IoAdd />} size='sm' onClick={handleAddNewHTTPOutput}>
+          <Button
+            variant='ontime-subtle'
+            rightIcon={<IoAdd />}
+            size='sm'
+            onClick={handleAddNewHTTPOutput}
+            isDisabled={false}
+            isLoading={false}
+          >
            HTTP
          </Button>
-          <Button variant='ontime-subtle' rightIcon={<IoAdd />} size='sm' onClick={handleAddnewOntimeAction}>
-            Ontime action
-          </Button>
        </Panel.InlineElements>
      </div>

@@ -27,12 +27,12 @@ export default function AutomationPanel({ location }: PanelBaseProps) {
            oscPortIn={data.oscPortIn}
          />
        </div>
-        <div ref={automationsRef}>
-          <AutomationsList automations={data.automations} />
-        </div>
        <div ref={triggersRef}>
          <TriggersList triggers={data.triggers} automations={data.automations} />
        </div>
+        <div ref={automationsRef}>
+          <AutomationsList automations={data.automations} />
+        </div>
      </Panel.Section>
    </>
  );
@@ -1,13 +1,11 @@
 import { Controller, useForm } from 'react-hook-form';
-import { Button, Input, Switch } from '@chakra-ui/react';
+import { Alert, AlertDescription, AlertIcon, Button, Input, Switch } from '@chakra-ui/react';

 import { editAutomationSettings } from '../../../../common/api/automation';
 import { maybeAxiosError } from '../../../../common/api/utils';
-import Info from '../../../../common/components/info/Info';
-import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
+import ExternalLink from '../../../../common/components/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/';
@@ -77,13 +75,14 @@ export default function AutomationSettingsForm(props: AutomationSettingsProps) {
      <Panel.Divider />

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

      <Panel.Section
@@ -113,9 +112,7 @@ 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,6 +1,8 @@
 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';
@@ -1,110 +0,0 @@
-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 to attach triggers to'
+                label='Create an automation before to attach triggers to'
                handleClick={canAdd ? () => setShowForm(true) : undefined}
              />
            )}
@@ -1,6 +1,8 @@
 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';
@@ -36,12 +36,6 @@ const staticSelectProperties = [
  { value: 'eventNow.colour', label: 'Colour' },
 ];

-const staticNextSelectProperties = [
-  { value: 'eventNow.id', label: 'Next ID' },
-  { value: 'eventNow.title', label: 'Next Title' },
-  { value: 'eventNow.cue', label: 'Next Cue' },
-];
-
 type SelectableField = {
  value: string; // string encodes path in runtime state object
  label: string;
@@ -54,11 +48,6 @@ export function makeFieldList(customFields: CustomFields): SelectableField[] {
      value: `eventNow.custom.${key}`,
      label: `Custom: ${label}`,
    })),
-    ...staticNextSelectProperties,
-    ...Object.entries(customFields).map(([key, { label }]) => ({
-      value: `eventNext.custom.${key}`,
-      label: `Next custom: ${label}`,
-    })),
  ];
 }

@@ -1,29 +0,0 @@
-.wrapper {
-  position: relative;
-}
-
-.suggestions {
-  background: $gray-1250;
-  color: $ui-white;
-
-  position: absolute;
-  top: 100%;
-  left: 0;
-  width: 100%;
-  margin: 0;
-  z-index: 5;
-  padding-block: 0.25rem;
-
-  max-height: 200px;
-  overflow-y: auto;
-  color: $label-gray;
-
-  li {
-    padding: 0.25rem;
-  }
-
-  li:hover {
-    color: $ui-white;
-    background: $blue-700;
-  }
-}
@@ -1,70 +0,0 @@
-import { forwardRef, useMemo, useState } from 'react';
-import { type InputProps, Input } from '@chakra-ui/react';
-import { mergeRefs, useClickOutside } from '@mantine/hooks';
-
-import useCustomFields from '../../../../../common/hooks-query/useCustomFields';
-
-import { makeAutoCompleteList, matchRemaining, selectFromLastTemplate } from './templateInput.utils';
-
-import style from './TemplateInput.module.scss';
-
-interface TemplateInputProps extends InputProps {}
-
-const TemplateInput = forwardRef(function TemplateInput(props: TemplateInputProps, ref) {
-  const { value, onChange, ...rest } = props;
-  const { data } = useCustomFields();
-  const localRef = useClickOutside(() => setShowSuggestions(false));
-
-  const autocompleteList = useMemo(() => {
-    return makeAutoCompleteList(data);
-  }, [data]);
-
-  const [inputValue, setInputValue] = useState(value || '');
-  const [suggestions, setSuggestions] = useState<string[]>([]);
-  const [showSuggestions, setShowSuggestions] = useState(false);
-
-  const updateSuggestions = (value: string) => {
-    const template = selectFromLastTemplate(value);
-    return autocompleteList.filter((suggestion) => suggestion.startsWith(template));
-  };
-
-  const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    setInputValue(event.target.value);
-
-    if (event.target.value.endsWith('{')) {
-      setShowSuggestions(true);
-      setSuggestions(updateSuggestions(event.target.value));
-    } else if (event.target.value === '' || event.target.value.endsWith('}}')) {
-      setShowSuggestions(false);
-    } else if (showSuggestions) {
-      setSuggestions(updateSuggestions(event.target.value));
-    }
-
-    onChange?.(event);
-  };
-
-  const handleSuggestion = (value: string) => {
-    setInputValue((prev) => {
-      const remaining = matchRemaining(prev as string, value);
-      return prev + remaining;
-    });
-    setShowSuggestions(false);
-  };
-
-  return (
-    <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) => (
-            <li key={suggestion} onClick={() => handleSuggestion(suggestion)}>
-              {suggestion}
-            </li>
-          ))}
-        </ul>
-      )}
-    </div>
-  );
-});
-
-export default TemplateInput;
@@ -1,17 +0,0 @@
-import { matchRemaining } from '../templateInput.utils';
-
-describe('matchRemaining()', () => {
-  it('should return a partial string needed for autocomplete', () => {
-    expect(matchRemaining('te', 'test')).toBe('st');
-    expect(matchRemaining('{{{hum', '{{human}}')).toBe('an}}');
-    expect(matchRemaining('send {', '{{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', () => {
-    expect(matchRemaining('test', 'another')).toBe('');
-    expect(matchRemaining('test', 'test')).toBe('');
-  });
-});
@@ -1,115 +0,0 @@
-import { CustomFields } from 'ontime-types';
-
-const humanConstants = [
-  '{{human.clock}}',
-  '{{human.duration}}',
-  '{{human.expectedEnd}}',
-  '{{human.runningTimer}}',
-  '{{human.elapsedTime}}',
-  '{{human.startedAt}}',
-];
-
-const staticAutocompleteOptions = [
-  '{{clock}}',
-  '{{timer.addedTime}}',
-  '{{timer.current}}',
-  '{{timer.duration}}',
-  '{{timer.elapsed}}',
-  '{{timer.expectedFinish}}',
-  '{{timer.finishedAt}}',
-  '{{timer.secondaryTimer}}',
-  '{{timer.startedAt}}',
-  '{{runtime.selectedEventIndex}}',
-  '{{runtime.numEvents}}',
-  '{{runtime.offset}}',
-  '{{runtime.plannedStart}}',
-  '{{runtime.plannedEnd}}',
-  '{{runtime.actualStart}}',
-  '{{runtime.expectedEnd}}',
-  '{{currentBlock.block}}',
-  '{{currentBlock.startedAt}}',
-];
-
-const eventStaticPropertiesNow = [
-  '{{eventNow.id}}',
-  '{{eventNow.cue}}',
-  '{{eventNow.title}}',
-  '{{eventNow.note}}',
-  '{{eventNow.timeStart}}',
-  '{{eventNow.timeEnd}}',
-  '{{eventNow.duration}}',
-  '{{eventNow.isPublic}}',
-  '{{eventNow.colour}}',
-  '{{eventNow.delay}}',
-];
-
-const eventStaticPropertiesNext = [
-  '{{eventNext.id}}',
-  '{{eventNext.cue}}',
-  '{{eventNext.title}}',
-  '{{eventNext.note}}',
-  '{{eventNext.timeStart}}',
-  '{{eventNext.timeEnd}}',
-  '{{eventNext.duration}}',
-  '{{eventNext.isPublic}}',
-  '{{eventNext.colour}}',
-  '{{eventNext.delay}}',
-];
-
-/**
- * Creates a it of possible autocomplete suggestions
- * Based on RuntimeState
- * Appends the human readable variants to it
- * It is manually kept in sync with the automation parseTemplate functions
- */
-export function makeAutoCompleteList(customFields: CustomFields): string[] {
-  return [
-    ...humanConstants,
-    ...staticAutocompleteOptions,
-    ...eventStaticPropertiesNow,
-    ...Object.entries(customFields).map(([key]) => `{{eventNow.custom.${key}}}`),
-    ...eventStaticPropertiesNext,
-    ...Object.entries(customFields).map(([key]) => `{{eventNext.custom.${key}}}`),
-  ];
-}
-
-/**
- * Returns the partial string b needed to autocomplete string a
- * @example matchRemaining('te', 'test') -> 'st'
- * @example matchRemaining('{{', '{{human}}') -> 'man}}'
- */
-export function matchRemaining(a: string, b: string) {
-  if (a === b) {
-    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)) {
-      return b.substring(i + 1);
-    }
-  }
-
-  return '';
-}
-
-/**
- * Selects the last starting template in a string
- */
-export function selectFromLastTemplate(text: string) {
-  const lastBraceIndex = text.lastIndexOf('{{');
-  if (lastBraceIndex !== -1) {
-    return text.slice(lastBraceIndex);
-  }
-  return '';
-}
@@ -1,6 +1,5 @@
 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';
@@ -32,16 +31,15 @@ export default function ClientList() {
  const ontimeClients = Object.entries(clients).filter(([_, { type }]) => type === 'ontime');
  const otherClients = Object.entries(clients).filter(([_, { type }]) => type !== 'ontime');

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

  return (
    <>
-      {isOpenRedirect && targetClient !== undefined && (
+      {isOpenRedirect && (
        <RedirectClientModal
          id={targetId}
-          name={targetClient.name}
-          origin={targetClient.origin}
-          currentPath={targetClient.path}
+          name={targetClient?.name}
+          path={targetClient?.path}
          isOpen={isOpenRedirect}
          onClose={onCloseRedirect}
        />
@@ -54,7 +52,7 @@ export default function ClientList() {
        <Panel.Table>
          <thead>
            <tr>
-              <td className={style.halfWidth}>Client Name</td>
+              <td className={style.halfWidth}>Client Name (Connection ID)</td>
              <td className={style.fullWidth}>Path</td>
              <td />
            </tr>
@@ -66,6 +64,9 @@ 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
@@ -118,7 +119,7 @@ export default function ClientList() {
        <Panel.Table>
          <thead>
            <tr>
-              <td className={style.halfWidthNoWrap}>Client Name</td>
+              <td className={style.halfWidthNoWrap}>Client Name (Connection ID)</td>
              <td className={style.halfWidthNoWrap}>Client type</td>
            </tr>
          </thead>
@@ -128,7 +129,12 @@ export default function ClientList() {

              return (
                <tr key={key}>
-                  <td>{name}</td>
+                  <Panel.InlineElements relation='inner' as='td'>
+                    <Badge variant='outline' size='sx'>
+                      {key}
+                    </Badge>
+                    {name}
+                  </Panel.InlineElements>
                  <td>{type}</td>
                </tr>
              );
@@ -3,13 +3,11 @@ import type { PanelBaseProps } from '../../panel-list/PanelList';
 import * as Panel from '../../panel-utils/PanelUtils';

 import CustomFields from './custom-fields/CustomFields';
-import ReportSettings from './ReportSettings';
 import UrlPresetsForm from './UrlPresetsForm';

 export default function FeatureSettingsPanel({ location }: PanelBaseProps) {
  const customFieldsRef = useScrollIntoView<HTMLDivElement>('custom', location);
  const urlPresetsRef = useScrollIntoView<HTMLDivElement>('urlpresets', location);
-  const reportRef = useScrollIntoView<HTMLDivElement>('report', location);

  return (
    <>
@@ -21,10 +19,6 @@ export default function FeatureSettingsPanel({ location }: PanelBaseProps) {
      <div ref={urlPresetsRef}>
        <UrlPresetsForm />
      </div>
-
-      <div ref={reportRef}>
-        <ReportSettings />
-      </div>
    </>
  );
 }
@@ -1,7 +0,0 @@
-th.over {
-  color: $ontime-delay-text;
-}
-
-th.under {
-  color: $playback-ahead;
-}
@@ -1,113 +0,0 @@
-import { useMemo } from 'react';
-import { IoTrashBin } from 'react-icons/io5';
-import { Button } from '@chakra-ui/react';
-
-import { deleteAllReport } from '../../../../common/api/report';
-import { createBlob, downloadBlob } from '../../../../common/api/utils';
-import useReport from '../../../../common/hooks-query/useReport';
-import useRundown from '../../../../common/hooks-query/useRundown';
-import { cx } from '../../../../common/utils/styleUtils';
-import { formatTime } from '../../../../common/utils/time';
-import * as Panel from '../../panel-utils/PanelUtils';
-
-import { CombinedReport, getCombinedReport, makeReportCSV } from './reportSettings.utils';
-
-import style from './ReportSettings.module.scss';
-
-export default function ReportSettings() {
-  const { data: reportData } = useReport();
-  const { data } = useRundown();
-
-  const clearReport = async () => await deleteAllReport();
-  const downloadCSV = (combinedReport: CombinedReport[]) => {
-    if (!combinedReport) {
-      return;
-    }
-    const csv = makeReportCSV(combinedReport);
-    const blob = createBlob(csv, 'text/csv;charset=utf-8;');
-    downloadBlob(blob, 'ontime-report.csv');
-  };
-
-  const combinedReport = useMemo(() => {
-    return getCombinedReport(reportData, data.rundown, data.order);
-  }, [reportData, data.rundown, data.order]);
-
-  return (
-    <Panel.Section>
-      <Panel.Card>
-        <Panel.SubHeader>Report</Panel.SubHeader>
-        <Panel.Divider />
-        <Panel.Section>
-          <Panel.Title>
-            Manage report
-            <Panel.InlineElements>
-              <Button
-                variant='ontime-subtle'
-                leftIcon={<IoTrashBin />}
-                size='sm'
-                onClick={() => downloadCSV(combinedReport)}
-                isDisabled={combinedReport.length === 0}
-              >
-                Export CSV
-              </Button>
-              <Button
-                variant='ontime-subtle'
-                leftIcon={<IoTrashBin />}
-                size='sm'
-                color='#FA5656'
-                onClick={clearReport}
-                isDisabled={combinedReport.length === 0}
-              >
-                Clear All
-              </Button>
-            </Panel.InlineElements>
-          </Panel.Title>
-        </Panel.Section>
-        <Panel.Section>
-          <Panel.Table>
-            <thead>
-              <tr>
-                <th>#</th>
-                <th>Cue</th>
-                <th>Title</th>
-                <th>Scheduled Start</th>
-                <th>Actual Start</th>
-                <th>Scheduled End</th>
-                <th>Actual End</th>
-              </tr>
-            </thead>
-            <tbody>
-              {combinedReport.length === 0 && (
-                <Panel.TableEmpty label='Reports are generated when running through the show.' />
-              )}
-
-              {combinedReport.map((entry) => {
-                const start = (() => {
-                  if (entry.actualStart === null) return null;
-                  if (entry.actualStart <= entry.scheduledStart) return 'under';
-                  return 'over';
-                })();
-                const end = (() => {
-                  if (entry.actualEnd === null) return null;
-                  if (entry.actualEnd <= entry.scheduledEnd) return 'under';
-                  return 'over';
-                })();
-                return (
-                  <tr key={entry.index}>
-                    <th>{entry.index + 1}</th>
-                    <th>{entry.cue}</th>
-                    <th>{entry.title}</th>
-                    <th className={cx([start && style[start]])}>{formatTime(entry.scheduledStart)}</th>
-                    <th className={cx([start && style[start]])}>{formatTime(entry.actualStart)}</th>
-                    <th className={cx([end && style[end]])}>{formatTime(entry.scheduledEnd)}</th>
-                    <th className={cx([end && style[end]])}>{formatTime(entry.actualEnd)}</th>
-                  </tr>
-                );
-              })}
-            </tbody>
-          </Panel.Table>
-        </Panel.Section>
-      </Panel.Card>
-    </Panel.Section>
-  );
-}
@@ -1,14 +1,15 @@
 import { useEffect } from 'react';
 import { useFieldArray, useForm } from 'react-hook-form';
-import { IoAdd, IoOpenOutline, IoTrash } from 'react-icons/io5';
-import { Button, IconButton, Input, Switch } from '@chakra-ui/react';
+import { Alert, AlertDescription, AlertIcon, Button, IconButton, Input, Switch } from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
+import { IoOpenOutline } from '@react-icons/all-files/io5/IoOpenOutline';
+import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
 import { URLPreset } from 'ontime-types';

 import { postUrlPresets } from '../../../../common/api/urlPresets';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import TooltipActionBtn from '../../../../common/components/buttons/TooltipActionBtn';
-import Info from '../../../../common/components/info/Info';
-import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
+import ExternalLink from '../../../../common/components/external-link/ExternalLink';
 import useUrlPresets from '../../../../common/hooks-query/useUrlPresets';
 import { preventEscape } from '../../../../common/utils/keyEvent';
 import { handleLinks } from '../../../../common/utils/linkUtils';
@@ -107,29 +108,32 @@ export default function UrlPresetsForm() {
          </Panel.InlineElements>
        </Panel.SubHeader>
        <Panel.Divider />
-        <Info>
-          URL presets are user defined aliases to Ontime URLs
-          <br />
-          <br />
-          <b>Preset Name</b> <br />
-          The alias for the URL. This will be the URL you will be calling. eg: <br />
-          <Panel.BlockQuote>
-            Preset name <Panel.Highlight>cam3</Panel.Highlight> called as{' '}
-            <Panel.Highlight>http://localhost:4001/cam3</Panel.Highlight>
-          </Panel.BlockQuote>
-          <br />
-          <b>URL Segment</b> <br />
-          The corresponding alias path and configuration parameters. eg: <br />
-          <Panel.BlockQuote>
-            URL segment <Panel.Highlight>backstage?hidePast=true&stopCycle=true</Panel.Highlight> corresponds to
-            complete URL
-            <Panel.Highlight>http://localhost:4001/backstage?hidePast=true&stopCycle=true</Panel.Highlight>
-          </Panel.BlockQuote>
-          <br />
-          You will need to save the changes before the presets are functional.
-          <br />
-          <ExternalLink href={urlPresetsDocs}>See the docs</ExternalLink>
-        </Info>
+        <Alert status='info' variant='ontime-on-dark-info'>
+          <AlertIcon />
+          <AlertDescription>
+            URL presets are user defined aliases to Ontime URLs
+            <br />
+            <br />
+            <b>Preset Name</b> <br />
+            The alias for the URL. This will be the URL you will be calling. eg: <br />
+            <Panel.BlockQuote>
+              Preset name <Panel.Highlight>cam3</Panel.Highlight> called as{' '}
+              <Panel.Highlight>http://localhost:4001/cam3</Panel.Highlight>
+            </Panel.BlockQuote>
+            <br />
+            <b>URL Segment</b> <br />
+            The corresponding alias path and configuration parameters. eg: <br />
+            <Panel.BlockQuote>
+              URL segment <Panel.Highlight>backstage?hidePast=true&stopCycle=true</Panel.Highlight> corresponds to
+              complete URL
+              <Panel.Highlight>http://localhost:4001/backstage?hidePast=true&stopCycle=true</Panel.Highlight>
+            </Panel.BlockQuote>
+            <br />
+            You will need to save the changes before the presets are functional.
+            <br />
+            <ExternalLink href={urlPresetsDocs}>See the docs</ExternalLink>
+          </AlertDescription>
+        </Alert>
        <Panel.Section>
          <Panel.Loader isLoading={isLoading} />
          <Panel.Title>
@@ -1,11 +1,11 @@
 import { useState } from 'react';
-import { IoPencil, IoTrash } 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 { CustomField, CustomFieldLabel } from 'ontime-types';

 import CopyTag from '../../../../../common/components/copy-tag/CopyTag';
 import Swatch from '../../../../../common/components/input/colour-input/Swatch';
-import Tag from '../../../../../common/components/tag/Tag';
 import * as Panel from '../../../panel-utils/PanelUtils';

 import CustomFieldForm from './CustomFieldForm';
@@ -13,20 +13,19 @@ import CustomFieldForm from './CustomFieldForm';
 import style from '../FeatureSettings.module.scss';

 interface CustomFieldEntryProps {
+  field: string;
  colour: string;
  label: string;
-  fieldKey: string;
-  type: 'string' | 'image';
  onEdit: (label: CustomFieldLabel, patch: CustomField) => Promise<void>;
  onDelete: (label: CustomFieldLabel) => Promise<void>;
 }

 export default function CustomFieldEntry(props: CustomFieldEntryProps) {
-  const { colour, label, fieldKey, type, onEdit, onDelete } = props;
+  const { colour, label, onEdit, onDelete, field } = props;
  const [isEditing, setIsEditing] = useState(false);

  const handleEdit = async (patch: CustomField) => {
-    await onEdit(fieldKey, patch);
+    await onEdit(field, patch);
    setIsEditing(false);
  };

@@ -39,7 +38,7 @@ export default function CustomFieldEntry(props: CustomFieldEntryProps) {
            onSubmit={handleEdit}
            initialColour={colour}
            initialLabel={label}
-            initialKey={fieldKey}
+            initialKey={field}
          />
        </td>
      </tr>
@@ -51,13 +50,10 @@ export default function CustomFieldEntry(props: CustomFieldEntryProps) {
      <td>
        <Swatch color={colour} />
      </td>
-      <td>
-        <Tag>{type}</Tag>
-      </td>
      <td className={style.halfWidth}>{label}</td>
      <td className={style.fullWidth}>
-        <CopyTag label='Copy key to use in integrations' copyValue={fieldKey}>
-          {fieldKey}
+        <CopyTag label='Copy key to use in integrations' copyValue={field}>
+          {field}
        </CopyTag>
      </td>
      <Panel.InlineElements relation='inner' as='td'>
@@ -75,7 +71,7 @@ export default function CustomFieldEntry(props: CustomFieldEntryProps) {
          color='#FA5656' // $red-500
          icon={<IoTrash />}
          aria-label='Delete entry'
-          onClick={() => onDelete(fieldKey)}
+          onClick={() => onDelete(field)}
        />
      </Panel.InlineElements>
    </tr>
@@ -1,11 +1,10 @@
 import { useEffect, useState } from 'react';
-import { Controller, useForm } from 'react-hook-form';
-import { Button, Input, Radio, RadioGroup } from '@chakra-ui/react';
+import { useForm } from 'react-hook-form';
+import { Button, Input } from '@chakra-ui/react';
 import { CustomField } from 'ontime-types';
 import { customFieldLabelToKey, isAlphanumericWithSpace } from 'ontime-utils';

 import { maybeAxiosError } from '../../../../../common/api/utils';
-import Info from '../../../../../common/components/info/Info';
 import SwatchSelect from '../../../../../common/components/input/colour-input/SwatchSelect';
 import useCustomFields from '../../../../../common/hooks-query/useCustomFields';
 import { preventEscape } from '../../../../../common/utils/keyEvent';
@@ -21,8 +20,6 @@ interface CustomFieldsFormProps {
  initialKey?: string;
 }

-type CustomFieldFormData = CustomField & { key: string };
-
 export default function CustomFieldForm(props: CustomFieldsFormProps) {
  const { onSubmit, onCancel, initialColour, initialLabel, initialKey } = props;
  const { data } = useCustomFields();
@@ -31,7 +28,6 @@ export default function CustomFieldForm(props: CustomFieldsFormProps) {
  const [_, setColour] = useState(initialColour || '');

  const {
-    control,
    handleSubmit,
    register,
    setFocus,
@@ -39,17 +35,17 @@ export default function CustomFieldForm(props: CustomFieldsFormProps) {
    setValue,
    getValues,
    formState: { errors, isSubmitting, isValid, isDirty },
-  } = useForm<CustomFieldFormData>({
-    defaultValues: { type: 'string', label: initialLabel || '', colour: initialColour || '' },
+  } = useForm({
+    defaultValues: { label: initialLabel || '', colour: initialColour || '', key: initialKey || '' },
    resetOptions: {
      keepDirtyValues: true,
    },
  });

-  const setupSubmit = async (values: CustomFieldFormData) => {
-    const { type, label, colour } = values;
+  const setupSubmit = async (values: { label: string; colour: string }) => {
+    const { label, colour } = values;
    const newField: CustomField = {
-      type,
+      type: 'string', // type is not user definable yet
      colour,
      label,
    };
@@ -81,26 +77,6 @@ export default function CustomFieldForm(props: CustomFieldsFormProps) {
      className={style.fieldForm}
      onKeyDown={(event) => preventEscape(event, onCancel)}
    >
-      <Info>
-        Please note that images can quickly deteriorate your app&apos;s performance.
-        <br />
-        Prefer using small, and compressed images.
-      </Info>
-      <div>
-        <Panel.Description>Type</Panel.Description>
-        <Controller
-          name='type'
-          control={control}
-          render={({ field }) => (
-            <RadioGroup {...field} size='sm' isDisabled={isEditMode} variant='ontime'>
-              <Panel.InlineElements relation='component'>
-                <Radio value='string'>Text</Radio>
-                <Radio value='image'>Image</Radio>
-              </Panel.InlineElements>
-            </RadioGroup>
-          )}
-        />
-      </div>
      <div className={style.twoCols}>
        <div>
          <Panel.Description>Label (only alphanumeric characters are allowed)</Panel.Description>
@@ -129,10 +105,12 @@ export default function CustomFieldForm(props: CustomFieldsFormProps) {
          <Input {...register('key')} disabled size='sm' variant='ontime-filled' autoComplete='off' />
        </div>
      </div>
+
      <div>
        <Panel.Description>Colour</Panel.Description>
        <SwatchSelect name='colour' value={colour} handleChange={(_field, value) => handleSelectColour(value)} />
      </div>
+
      {errors.root && <Panel.Error>{errors.root.message}</Panel.Error>}
      <Panel.InlineElements relation='inner' align='end'>
        <Button size='sm' variant='ontime-ghosted' onClick={onCancel}>
@@ -1,11 +1,10 @@
 import { useState } from 'react';
-import { IoAdd } from 'react-icons/io5';
-import { Button } from '@chakra-ui/react';
+import { Alert, AlertDescription, AlertIcon, Button } from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
 import { CustomField, CustomFieldLabel } from 'ontime-types';

 import { deleteCustomField, editCustomField, postCustomField } from '../../../../../common/api/customFields';
-import Info from '../../../../../common/components/info/Info';
-import ExternalLink from '../../../../../common/components/link/external-link/ExternalLink';
+import ExternalLink from '../../../../../common/components/external-link/ExternalLink';
 import useCustomFields from '../../../../../common/hooks-query/useCustomFields';
 import { customFieldsDocsUrl } from '../../../../../externals';
 import * as Panel from '../../../panel-utils/PanelUtils';
@@ -56,17 +55,20 @@ export default function CustomFields() {
        </Panel.SubHeader>
        <Panel.Divider />
        <Panel.Section>
-          <Info>
-            Custom fields allow for additional information to be added to an event.
-            <br />
-            <br />
-            This data is not used by Ontime, but provides place for cueing or department specific information (eg.
-            light, sound, camera).
-            <br />
-            <br />
-            Custom fields can be used width the Integrations feature using the generated key.
-            <ExternalLink href={customFieldsDocsUrl}>See the docs</ExternalLink>
-          </Info>
+          <Alert status='info' variant='ontime-on-dark-info'>
+            <AlertIcon />
+            <AlertDescription>
+              Custom fields allow for additional information to be added to an event.
+              <br />
+              <br />
+              This data is not used by Ontime, but provides place for cueing or department specific information (eg.
+              light, sound, camera).
+              <br />
+              <br />
+              Custom fields can be used width the Integrations feature using the generated key.
+              <ExternalLink href={customFieldsDocsUrl}>See the docs</ExternalLink>
+            </AlertDescription>
+          </Alert>
        </Panel.Section>
        <Panel.Section>
          {isAdding && <CustomFieldForm onSubmit={handleCreate} onCancel={handleCancel} />}
@@ -74,21 +76,19 @@ export default function CustomFields() {
            <thead>
              <tr>
                <th>Colour</th>
-                <th>Type</th>
                <th>Name</th>
                <th>Key (used in Integrations)</th>
                <th />
              </tr>
            </thead>
            <tbody>
-              {Object.entries(data).map(([key, { colour, label, type }]) => {
+              {Object.entries(data).map(([key, { colour, label }]) => {
                return (
                  <CustomFieldEntry
                    key={key}
-                    fieldKey={key}
+                    field={key}
                    colour={colour}
                    label={label}
-                    type={type}
                    onEdit={handleEditField}
                    onDelete={handleDelete}
                  />
--- a/Show More
+++ b/Show More