refactor: create mock data utilities

More rundown metadata (#1429 )
* add dayOffset to OntimeEvent * refactor: isNewLatest * calculate totalDays * refactor: getTimeFromPrevious * add gap as dataset in OntimeEvent * use in ui * format overlap is just a simple text formatting, big test is not needed * add new fields where needed * update apply delay * show nex day eaven if there is no gap * create test * use buildin day offset in timeline * remove todo * consistent naming * make a calculateDayOffset util for rundownCache * refactor: checkIsNextDay to use dayOffset * spelling Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> * remove unneeded test * remove todo * update test db * use data-testid * spelling Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> * update comments * remove null option --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>
2026-08-06 16:03:52 +00:00 · 2025-01-12 09:05:23 +01:00 · 2025-01-09 13:35:11 +01:00 · 2025-01-06 22:58:06 +01:00 · 2025-01-06 22:58:06 +01:00 · 2025-01-06 20:33:39 +01:00
426 changed files with 10774 additions and 6642 deletions
@@ -36,7 +36,7 @@ jobs:
          APPLE_TEAM_ID: ${{ secrets.TEAMID }}
          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
          CSC_LINK: ${{ secrets.CSC_LINK }}
-        run: pnpm dist-mac
+        run: pnpm dist-mac --env-mode=loose
        timeout-minutes: 60
      - name: Release
@@ -28,6 +28,7 @@ test-results
 playwright-report
 /playwright/.cache/
 automated-screenshots
 e2e/tests/fixtures/tmp/*
 # production
 build/
@@ -39,9 +40,7 @@ dist/
 # docker utils
 ontime-db
 ontime-external/
-
+ontime-data/
 # working database
 apps/server/src/preloaded-db/db.json
 # versioning file
 **/ONTIME_VERSION.js
@@ -91,7 +91,7 @@ While it should allow for a generic setup, it might need to be modified to fit y
 From the project root, run the following commands
- __Build docker image from__ by running `docker build -t getontime/ontime`
+- __Build docker image from__ by running `docker build -t getontime/ontime .`
 - __Run docker image from compose__ by running `docker-compose up -d`
 Other useful commands
@@ -23,6 +23,7 @@ COPY --from=builder /app/apps/client/build ./client/
 # Prepare Backend
 COPY --from=builder /app/apps/server/dist/ ./server/
 COPY --from=builder /app/apps/server/src/external/ ./external/
 COPY --from=builder /app/apps/server/src/user/ ./user/
 # Export default ports
 EXPOSE 4001/tcp 8888/udp 9999/udp
@@ -32,4 +33,4 @@ CMD ["node", "server/docker.cjs"]
 # Build and run commands
 # !!! Note that this command needs pre-build versions of the UI and server apps
 # docker buildx build . -t getontime/ontime
-# docker run -p 4001:4001 -p 8888:8888/udp -p 9999:9999/udp -v ./ontime-db:/external/db/ -v ./ontime-styles:/external/styles/ getontime/ontime
+# docker run -p 4001:4001 -p 8888:8888/udp -p 9999:9999/udp -v ./ontime-db:/data/ getontime/ontime
@@ -1,6 +1,6 @@
 {
    "name": "@getontime/cli",
-    "version": "3.6.0",
+    "version": "3.10.3",
    "author": "Carlos Valente",
    "description": "Time keeping for live events",
    "repository": "https://github.com/cpvalente/ontime",
@@ -1,37 +1,28 @@
 <!doctype html>
-<html lang='en'>
+<html lang="en">
-<head>
+  <head>
-  <meta charset='utf-8' />
+    <meta charset="utf-8" />
-  <link rel='icon' href='/favicon.ico' />
+    <base href="/" />
-  <meta name='viewport' content='width=device-width, initial-scale=1' />
+    <link rel="icon" href="/favicon.ico" />
-  <meta name='theme-color' content='#121212' />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <meta name='ontime' content='ontime - event timer manager' />
+    <meta name="theme-color" content="#101010" />
-  <link rel='apple-touch-icon' href='/logo192.png' />
+    <meta name="ontime" content="ontime - time keeping for live events" />
-  <link
+    <link rel="apple-touch-icon" href="/ontime-logo.png" />
-    rel='icon'
+    <link rel="icon" type="image/png" href="/ontime-logo.png" />
-    type='image/png'
+    <link rel="manifest" href="/site.webmanifest" />
-    sizes='32x32'
+    <link rel="manifest" href="/manifest.json" />
-    href='/favicon-32x32.png'
+    <meta name="robots" content="noindex" />
-  />
+    <title>ontime</title>
-  <link
+    <style>
-    rel='icon'
+      body,
-    type='image/png'
+      html {
-    sizes='16x16'
+        background-color: rgba(0, 0, 0, 0) !important;
-    href='/favicon-16x16.png'
+      }
-  />
+    </style>
-  <link rel='manifest' href='/site.webmanifest' />
+  </head>
-  <link rel='manifest' href='/manifest.json' />
+  <body>
-  <title>ontime</title>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
-  <style>
+    <div id="root"></div>
-    body,
+    <script type="module" src="/src/index.tsx"></script>
-    html {
+  </body>
      background-color: rgba(0, 0, 0, 0) !important;
    }
  </style>
 </head>
 <body>
 <noscript>You need to enable JavaScript to run this app.</noscript>
 <div id='root'></div>
 <script type='module' src='/src/index.tsx'></script>
 </body>
 </html>
@@ -1,6 +1,6 @@
 {
  "name": "ontime-ui",
-  "version": "3.6.0",
+  "version": "3.10.3",
  "private": true,
  "type": "module",
  "dependencies": {
@@ -11,12 +11,12 @@
    "@emotion/react": "^11.10.6",
    "@emotion/styled": "^11.10.6",
    "@fontsource/open-sans": "^5.0.28",
-    "@mantine/hooks": "^7.6.2",
+    "@mantine/hooks": "^7.13.3",
    "@react-icons/all-files": "^4.1.0",
-    "@sentry/react": "^8.19.0",
+    "@sentry/react": "^8.43.0",
-    "@tanstack/react-query": "^5.17.9",
+    "@tanstack/react-query": "^5.62.7",
-    "@tanstack/react-query-devtools": "^5.17.9",
+    "@tanstack/react-query-devtools": "^5.62.7",
-    "@tanstack/react-table": "^8.11.3",
+    "@tanstack/react-table": "^8.20.5",
    "autosize": "^6.0.1",
    "axios": "^1.2.0",
    "color": "^4.2.3",
@@ -26,7 +26,7 @@
    "react-colorful": "^5.6.1",
    "react-dom": "^18.3.1",
    "react-fast-compare": "^3.2.2",
-    "react-hook-form": "^7.49.2",
+    "react-hook-form": "^7.53.1",
    "react-qr-code": "^2.0.12",
    "react-router-dom": "^6.3.0",
    "web-vitals": "^3.1.1",
@@ -39,7 +39,7 @@
    "build": "vite build",
    "build:local": "cross-env NODE_ENV=local vite build",
    "build:electron": "cross-env NODE_ENV=local vite build",
-    "build:docker": "vite build",
+    "build:docker": "cross-env VITE_IS_DOCKER=true vite build",
    "build:localdocker": "cross-env NODE_ENV=local vite build",
    "lint": "eslint . --quiet",
    "test": "vitest",
@@ -87,9 +87,9 @@
    "sass": "^1.57.1",
    "typescript": "catalog:",
    "vite": "^5.2.11",
-    "vite-plugin-compression2": "^0.12.0",
+    "vite-plugin-compression2": "^1.3.3",
    "vite-plugin-svgr": "^4.2.0",
    "vite-tsconfig-paths": "^4.3.1",
-    "vitest": "^1.6.0"
+    "vitest": "catalog:"
  }
 }
@@ -4,18 +4,11 @@
  "icons": [
    {
      "src": "favicon.ico",
      "sizes": "64x64 32x32 24x24 16x16",
      "type": "image/x-icon"
    },
    {
-      "src": "logo192.png",
+      "src": "ontime-logo.png",
-      "type": "image/png",
+      "type": "image/png"
      "sizes": "192x192"
    },
    {
      "src": "logo512.png",
      "type": "image/png",
      "sizes": "512x512"
    }
  ],
  "scope": "/",
@@ -1 +1,10 @@
-{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
+{
  "name": "",
  "short_name": "",
  "icons": [
    { "src": "/ontime-logo.png", "sizes": "295x295", "type": "image/png" }
  ],
  "theme_color": "#2B5ABC",
  "background_color": "#101010",
  "display": "standalone"
 }
@@ -11,6 +11,7 @@ import { connectSocket } from './common/utils/socket';
 import theme from './theme/theme';
 import { TranslationProvider } from './translation/TranslationProvider';
 import AppRouter from './AppRouter';
 import { baseURI } from './externals';
 connectSocket();
@@ -19,7 +20,7 @@ function App() {
    <ChakraProvider disableGlobalStyle resetCSS theme={theme}>
      <QueryClientProvider client={ontimeQueryClient}>
        <AppContextProvider>
-          <BrowserRouter>
+          <BrowserRouter basename={baseURI}>
            <div className='App'>
              <ErrorBoundary>
                <TranslationProvider>
@@ -14,11 +14,12 @@ import { useClientPath } from './common/hooks/useClientPath';
 import Log from './features/log/Log';
 import withPreset from './features/PresetWrapper';
 import withData from './features/viewers/ViewWrapper';
 import ViewLoader from './views/ViewLoader';
 import { ONTIME_VERSION } from './ONTIME_VERSION';
 import { sentryDsn, sentryRecommendedIgnore } from './sentry.config';
 const Editor = React.lazy(() => import('./features/editors/ProtectedEditor'));
-const Cuesheet = React.lazy(() => import('./features/cuesheet/ProtectedCuesheet'));
+const Cuesheet = React.lazy(() => import('./views/cuesheet/ProtectedCuesheet'));
 const Operator = React.lazy(() => import('./features/operator/OperatorExport'));
 const TimerView = React.lazy(() => import('./features/viewers/timer/Timer'));
@@ -27,16 +28,18 @@ const ClockView = React.lazy(() => import('./features/viewers/clock/Clock'));
 const Countdown = React.lazy(() => import('./features/viewers/countdown/Countdown'));
 const Backstage = React.lazy(() => import('./features/viewers/backstage/Backstage'));
-const Timeline = React.lazy(() => import('./features/viewers/timeline/TimelinePage'));
+const Timeline = React.lazy(() => import('./views/timeline/TimelinePage'));
 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'));
 const STimer = withPreset(withData(TimerView));
 const SMinimalTimer = withPreset(withData(MinimalTimerView));
 const SClock = withPreset(withData(ClockView));
 const SCountdown = withPreset(withData(Countdown));
 const SBackstage = withPreset(withData(Backstage));
 const SProjectInfo = withPreset(withData(ProjectInfo));
 const SPublic = withPreset(withData(Public));
 const SLowerThird = withPreset(withData(Lower));
 const SStudio = withPreset(withData(StudioClock));
@@ -75,16 +78,80 @@ export default function AppRouter() {
    <React.Suspense fallback={null}>
      <SentryRoutes>
        <Route path='/' element={<Navigate to='/timer' />} />
-        <Route path='/timer' element={<STimer />} />
+        <Route
-        <Route path='/public' element={<SPublic />} />
+          path='/timer'
-        <Route path='/minimal' element={<SMinimalTimer />} />
+          element={
-        <Route path='/clock' element={<SClock />} />
+            <ViewLoader>
-
+              <STimer />
-        <Route path='/countdown' element={<SCountdown />} />
+            </ViewLoader>
-        <Route path='/backstage' element={<SBackstage />} />
+          }
-        <Route path='/studio' element={<SStudio />} />
+        />
        <Route
          path='/public'
          element={
            <ViewLoader>
              <SPublic />
            </ViewLoader>
          }
        />
        <Route
          path='/minimal'
          element={
            <ViewLoader>
              <SMinimalTimer />
            </ViewLoader>
          }
        />
        <Route
          path='/clock'
          element={
            <ViewLoader>
              <SClock />
            </ViewLoader>
          }
        />
        <Route
          path='/countdown'
          element={
            <ViewLoader>
              <SCountdown />
            </ViewLoader>
          }
        />
        <Route
          path='/backstage'
          element={
            <ViewLoader>
              <SBackstage />
            </ViewLoader>
          }
        />
        <Route
          path='/studio'
          element={
            <ViewLoader>
              <SStudio />
            </ViewLoader>
          }
        />
        {/*/!* Lower third cannot have a loading screen *!/*/}
        <Route path='/lower' element={<SLowerThird />} />
-        <Route path='/timeline' element={<STimeline />} />
+        <Route
          path='/timeline'
          element={
            <ViewLoader>
              <STimeline />
            </ViewLoader>
          }
        />
        <Route
          path='/info'
          element={
            <ViewLoader>
              <SProjectInfo />
            </ViewLoader>
          }
        />
        {/*/!* Protected Routes *!/*/}
        <Route path='/editor' element={<Editor />} />
@@ -1,6 +1,9 @@
 import { serverURL } from '../../externals';
 // keys in tanstack store
 export const APP_INFO = ['appinfo'];
 export const APP_SETTINGS = ['appSettings'];
 export const APP_VERSION = ['appVersion'];
 export const CUSTOM_FIELDS = ['customFields'];
 export const HTTP_SETTINGS = ['httpSettings'];
 export const OSC_SETTINGS = ['oscSettings'];
@@ -13,24 +16,14 @@ export const URL_PRESETS = ['urlpresets'];
 export const VIEW_SETTINGS = ['viewSettings'];
 export const CLIENT_LIST = ['clientList'];
-// resolve location
+// API URLs
 const location = window.location;
 const socketProtocol = location.protocol === 'https:' ? 'wss' : 'ws';
 export const isProduction = import.meta.env.MODE === 'production';
 export const isDev = !isProduction;
 export const isLocalhost = location.hostname === 'localhost' || location.hostname === '127.0.0.1';
 // resolve port
 const STATIC_PORT = 4001;
 export const serverPort = isProduction ? location.port : STATIC_PORT;
 export const serverURL = `${location.protocol}//${location.hostname}:${serverPort}`;
 export const websocketUrl = `${socketProtocol}://${location.hostname}:${serverPort}/ws`;
 export const apiEntryUrl = `${serverURL}/data`;
 export const projectDataURL = `${serverURL}/project`;
 export const rundownURL = `${serverURL}/events`;
 export const ontimeURL = `${serverURL}/ontime`;
-export const stylesPath = 'external/styles/override.css';
+export const userAssetsPath = 'user';
-export const overrideStylesURL = `${serverURL}/${stylesPath}`;
+export const cssOverridePath = 'styles/override.css';
 export const overrideStylesURL = `${serverURL}/${userAssetsPath}/${cssOverridePath}`;
 export const projectLogoPath = `${serverURL}/${userAssetsPath}/logo`;
@@ -1,7 +1,7 @@
 import axios, { AxiosResponse } from 'axios';
-import { DatabaseModel, GetInfo, MessageResponse, ProjectData, ProjectFileListResponse } from 'ontime-types';
+import { DatabaseModel, MessageResponse, ProjectData, ProjectFileListResponse, QuickStartData } from 'ontime-types';
-import { makeCSV, makeTable } from '../../features/cuesheet/cuesheetUtils';
+import { makeCSV, makeTable } from '../../views/cuesheet/cuesheet.utils';
 import { apiEntryUrl } from './constants';
 import { createBlob, downloadBlob } from './utils';
@@ -12,7 +12,7 @@ const dbPath = `${apiEntryUrl}/db`;
 * HTTP request to the current DB
 */
 export function getDb(filename: string): Promise<AxiosResponse<DatabaseModel>> {
-  return axios.post(`${dbPath}/download/`, { filename });
+  return axios.post(`${dbPath}/download`, { filename });
 }
 /**
@@ -86,6 +86,14 @@ export async function createProject(
  return res.data;
 }
 /**
 * HTTP request to create a project file
 */
 export async function quickProject(data: QuickStartData): Promise<MessageResponse> {
  const res = await axios.post(`${dbPath}/quick`, data);
  return res.data;
 }
 /**
 * HTTP request to get the list of available project files
 */
@@ -104,6 +112,14 @@ export async function loadProject(filename: string): Promise<MessageResponse> {
  return res.data;
 }
 /**
 * HTTP request to load the demo project file
 */
 export async function loadDemo(): Promise<MessageResponse> {
  const res = await axios.post(`${dbPath}/demo`);
  return res.data;
 }
 /**
 * HTTP request to duplicate a project file
 */
@@ -138,14 +154,6 @@ export async function deleteProject(filename: string): Promise<MessageResponse>
  return res.data;
 }
 /**
 * HTTP request to retrieve application info
 */
 export async function getInfo(): Promise<GetInfo> {
  const res = await axios.get(`${dbPath}/info`);
  return res.data;
 }
 /**
 * Utility function gets project from db
 * @param fileName
@@ -1,5 +1,5 @@
 import axios, { AxiosResponse } from 'axios';
-import { ProjectData } from 'ontime-types';
+import { ProjectData, ProjectLogoResponse } from 'ontime-types';
 import { apiEntryUrl } from './constants';
@@ -19,3 +19,18 @@ export async function getProjectData(): Promise<ProjectData> {
 export async function postProjectData(data: ProjectData): Promise<AxiosResponse<ProjectData>> {
  return axios.post(projectPath, data);
 }
 /**
 * HTTP request to upload a project logo
 */
 export async function uploadProjectLogo(file: File): Promise<AxiosResponse<ProjectLogoResponse>> {
  const formData = new FormData();
  formData.append('image', file);
  const response = await axios.post(`${projectPath}/upload`, formData, {
    headers: {
      'Content-Type': 'multipart/form-data',
    },
  });
  return response;
 }
@@ -1,5 +1,5 @@
 import axios, { AxiosResponse } from 'axios';
-import { MessageResponse, OntimeEvent, OntimeRundownEntry, RundownCached } from 'ontime-types';
+import { MessageResponse, OntimeEvent, OntimeRundownEntry, RundownCached, TransientEventPayload } from 'ontime-types';
 import { apiEntryUrl } from './constants';
@@ -16,7 +16,7 @@ export async function fetchNormalisedRundown(): Promise<RundownCached> {
 /**
 * HTTP request to post new event
 */
-export async function requestPostEvent(data: Partial<OntimeRundownEntry>): Promise<AxiosResponse<OntimeRundownEntry>> {
+export async function requestPostEvent(data: TransientEventPayload): Promise<AxiosResponse<OntimeRundownEntry>> {
  return axios.post(rundownPath, data);
 }
@@ -0,0 +1,14 @@
 import axios from 'axios';
 import { GetInfo } from 'ontime-types';
 import { apiEntryUrl } from './constants';
 const sessionPath = `${apiEntryUrl}/session`;
 /**
 * HTTP request to retrieve application info
 */
 export async function getInfo(): Promise<GetInfo> {
  const res = await axios.get(`${sessionPath}/info`);
  return res.data;
 }
@@ -23,6 +23,8 @@ export function maybeAxiosError(error: unknown) {
      }
    }
    return `${statusText}: ${data}`;
  } else if (error instanceof Error) {
    return error.message;
  } else {
    if (typeof error !== 'string') {
      return JSON.stringify(error);
@@ -8,5 +8,5 @@
 .linkIcon {
  margin-left: $element-inner-spacing;
  display: inline-block;
-  transform: rotate(45deg);
+  @include rotate-fourty-five;
 }
@@ -1,6 +0,0 @@
 .buttonSection {
  display: grid;
  grid-template-columns: 1fr 1fr;
  gap: $element-spacing;
  margin-top: -$element-spacing;
 }
@@ -15,8 +15,6 @@ import {
 import { setClientRemote } from '../../hooks/useSocket';
 import style from './ClientModal.module.scss';
 interface RedirectClientModalProps {
  id: string;
  name?: string;
@@ -54,14 +52,12 @@ export function RedirectClientModal(props: RedirectClientModalProps) {
          </InputGroup>
        </ModalBody>
        <ModalFooter>
-          <div className={style.buttonSection}>
+          <Button size='md' variant='ontime-subtle' onClick={onClose}>
-            <Button size='md' variant='ontime-subtle' onClick={onClose}>
+            Cancel
-              Cancel
+          </Button>
-            </Button>
+          <Button size='md' variant='ontime-filled' onClick={handleRedirect} isDisabled={!canSubmit}>
-            <Button size='md' variant='ontime-filled' onClick={handleRedirect} isDisabled={!canSubmit}>
+            Submit
-              Submit
+          </Button>
            </Button>
          </div>
        </ModalFooter>
      </ModalContent>
    </Modal>
@@ -13,8 +13,6 @@ import {
 import { setClientRemote } from '../../hooks/useSocket';
 import style from './ClientModal.module.scss';
 interface RenameClientModalProps {
  id: string;
  name?: string;
@@ -53,14 +51,12 @@ export function RenameClientModal(props: RenameClientModalProps) {
          />
        </ModalBody>
        <ModalFooter>
-          <div className={style.buttonSection}>
+          <Button size='md' variant='ontime-subtle' onClick={onClose}>
-            <Button size='md' variant='ontime-subtle' onClick={onClose}>
+            Cancel
-              Cancel
+          </Button>
-            </Button>
+          <Button size='md' variant='ontime-filled' onClick={handleRename} isDisabled={!canSubmit}>
-            <Button size='md' variant='ontime-filled' onClick={handleRename} isDisabled={!canSubmit}>
+            Submit
-              Submit
+          </Button>
            </Button>
          </div>
        </ModalFooter>
      </ModalContent>
    </Modal>
@@ -1,5 +1,6 @@
-import { PropsWithChildren } from 'react';
+import { PropsWithChildren, useState } from 'react';
 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';
@@ -7,26 +8,34 @@ import { Size } from '../../models/Util.type';
 import copyToClipboard from '../../utils/copyToClipboard';
 interface CopyTagProps {
  copyValue: string;
  label: string;
  className?: string;
  size?: Size;
  disabled?: boolean;
  onClick?: () => void;
 }
 export default function CopyTag(props: PropsWithChildren<CopyTagProps>) {
-  const { label, className, size = 'xs', disabled, children } = props;
+  const { copyValue, label, size = 'xs', disabled, children, onClick } = props;
  const [copied, setCopied] = useState(false);
-  const handleClick = () => copyToClipboard(children as string);
+  const handleClick = () => {
    copyToClipboard(copyValue);
    setCopied(true);
    // reset copied state
    setTimeout(() => setCopied(false), 1000);
  };
  return (
    <Tooltip label={label} openDelay={tooltipDelayFast}>
-      <ButtonGroup size={size} isAttached className={className}>
+      <ButtonGroup size={size} isAttached>
-        <Button variant='ontime-subtle' tabIndex={-1} isDisabled={disabled}>
+        <Button variant='ontime-subtle' tabIndex={-1} onClick={onClick} isDisabled={disabled}>
          {children}
        </Button>
        <IconButton
          aria-label={label}
-          icon={<IoCopy />}
+          icon={copied ? <IoCheckmark /> : <IoCopy />}
          variant='ontime-filled'
          tabIndex={-1}
          onClick={handleClick}
@@ -9,32 +9,23 @@ import style from './DelayIndicator.module.scss';
 interface DelayIndicatorProps {
  delayValue?: number;
  tooltipPrefix?: string;
 }
 export default function DelayIndicator(props: DelayIndicatorProps) {
-  const { delayValue } = props;
+  const { delayValue, tooltipPrefix } = props;
-  if (typeof delayValue === 'number') {
+  if (typeof delayValue !== 'number' || delayValue === 0) {
-    if (delayValue < 0) {
+    return null;
      return (
        <Tooltip openDelay={tooltipDelayFast} label={millisToDelayString(delayValue)}>
          <span className={style.delaySymbol}>
            <IoChevronDown />
          </span>
        </Tooltip>
      );
    }
    if (delayValue > 0) {
      return (
        <Tooltip openDelay={tooltipDelayFast} label={millisToDelayString(delayValue)}>
          <span className={style.delaySymbol}>
            <IoChevronUp />
          </span>
        </Tooltip>
      );
    }
  }
-  return null;
+  const delayString = tooltipPrefix
    ? `${tooltipPrefix} ${millisToDelayString(delayValue)}`
    : millisToDelayString(delayValue);
  return (
    <Tooltip openDelay={tooltipDelayFast} label={delayString}>
      <span className={style.delaySymbol}>{delayValue < 0 ? <IoChevronDown /> : <IoChevronUp />}</span>
    </Tooltip>
  );
 }
@@ -16,11 +16,11 @@ export default function Swatch(props: SwatchProps) {
  const handleClick = () => {
    onClick?.(color);
  };
-  const classes = cx([style.swatch, isSelected ? style.selected : null, onClick ? style.selectable : null]);
+  const classes = cx([style.swatch, isSelected && style.selected, onClick && style.selectable]);
  if (!color) {
    return (
-      <div className={`${classes} ${style.center}`} onClick={handleClick}>
+      <div className={classes} onClick={handleClick}>
        <IoBan />
      </div>
    );
@@ -0,0 +1,60 @@
 import { useCallback } from 'react';
 import { useController, UseControllerProps } from 'react-hook-form';
 import { IoEyedrop } from '@react-icons/all-files/io5/IoEyedrop';
 import { ViewSettings } from 'ontime-types';
 import PopoverPicker from '../../../../common/components/input/popover-picker/PopoverPicker';
 import { debounce } from '../../../../common/utils/debounce';
 import { cx, getAccessibleColour } from '../../../utils/styleUtils';
 import style from './SwatchSelect.module.scss';
 interface SwatchPickerProps {
  color: string;
  isSelected?: boolean;
  onChange: (name: string) => void;
  alwaysDisplayColor?: boolean;
 }
 export default function SwatchPicker(props: SwatchPickerProps) {
  const { color, onChange, isSelected, alwaysDisplayColor } = props;
  const debouncedOnChange = useCallback(
    debounce((newValue: string) => {
      onChange(newValue);
    }, 500),
    [onChange],
  );
  const displayColor = alwaysDisplayColor || isSelected ? color : '';
  const { color: iconColor } = getAccessibleColour(displayColor);
  return (
    <PopoverPicker color={displayColor} onChange={debouncedOnChange}>
      <div
        className={cx([style.swatch, isSelected && style.selected, style.selectable])}
        style={{ backgroundColor: displayColor }}
      >
        <IoEyedrop color={iconColor} />
      </div>
    </PopoverPicker>
  );
 }
 export function SwatchPickerRHF(props: UseControllerProps<ViewSettings>) {
  const { name, control } = props;
  const {
    field: { onChange, value },
  } = useController({ control, name });
  const displayColor = typeof value === 'string' ? value : '';
  const { color: iconColor } = getAccessibleColour(displayColor);
  return (
    <PopoverPicker color={value as string} onChange={onChange}>
      <div className={cx([style.swatch, style.selectable])} style={{ backgroundColor: displayColor }}>
        <IoEyedrop color={iconColor} />
      </div>
    </PopoverPicker>
  );
 }
@@ -1,15 +1,18 @@
 .list {
  display: flex;
  flex-wrap: wrap;
-  gap: 0.5rem
+  gap: 0.5rem;
 }
 .swatch {
  width: 2rem;
  height: 2rem;
  aspect-ratio: 1;
  border-radius: 99px;
  border: 2px solid $gray-1200;
  color: $ui-white;
  display: grid;
  place-content: center;
  &.selected {
    border: 2px solid $blue-500;
@@ -17,11 +20,9 @@
  &.selectable {
    cursor: pointer;
    &:hover {
      border: 2px solid $blue-300;
    }
  }
 }
 .center {
  display: grid;
  place-content: center;
  color: $ui-white;
 }
@@ -1,6 +1,7 @@
 import { useCallback } from 'react';
 import Swatch from './Swatch';
 import SwatchPicker from './SwatchPicker';
 import style from './SwatchSelect.module.scss';
@@ -43,6 +44,7 @@ export default function SwatchSelect(props: ColourInputProps) {
      {colours.map((colour) => (
        <Swatch key={colour} color={colour} onClick={setColour} isSelected={value === colour} />
      ))}
      <SwatchPicker color={value} onChange={setColour} isSelected={!colours.includes(value)} />
    </div>
  );
 }
@@ -1,16 +1,20 @@
-.swatch {
+.input {
-  width: 24px;
+  color: $gray-200;
-  height: 24px;
+  border: 1px solid transparent;
-  border-radius: 12px;
+  border-radius: 0 0 8px 8px;
-  border: 1px solid white;
+  background-color: $gray-1200;
-  box-shadow: 0 0 0 1px $gray-300;
+  padding: 0 0.5rem;
-  cursor: pointer;
+  font-size: 1rem;
  height: 2rem;
  outline: none;
-  transition-property: box-shadow;
+  &:hover {
-  transition-duration: $transition-time-action;
+    background-color: $gray-1100;
  }
  &:focus {
    background-color: $gray-1000;
    color: $gray-50;
    border: 1px solid $blue-500;
  }
 }
 .swatch:hover {
  box-shadow: 0 0 0 1px $blue-300;
 }
@@ -1,34 +1,22 @@
-import { HexAlphaColorPicker } from 'react-colorful';
+import { PropsWithChildren } from 'react';
-import { useController, UseControllerProps } from 'react-hook-form';
+import { HexAlphaColorPicker, HexColorInput } from 'react-colorful';
 import { Popover, PopoverContent, PopoverTrigger } from '@chakra-ui/react';
 import { ViewSettings } from 'ontime-types';
 import style from './PopoverPicker.module.scss';
 export function PopoverPickerRHF(props: UseControllerProps<ViewSettings>) {
  const { name, control } = props;
  const {
    field: { onChange, value },
  } = useController({ control, name });
  return <PopoverPicker color={value as string} onChange={onChange} />;
 }
 interface PopoverPickerProps {
  color: string;
  onChange: (color: string) => void;
 }
-export default function PopoverPicker(props: PopoverPickerProps) {
+export default function PopoverPicker(props: PropsWithChildren<PopoverPickerProps>) {
-  const { color, onChange } = props;
+  const { color, onChange, children } = props;
  return (
    <Popover>
-      <PopoverTrigger>
+      <PopoverTrigger>{children}</PopoverTrigger>
-        <div className={style.swatch} style={{ backgroundColor: color }} />
+      <PopoverContent className={style.small} style={{ borderRadius: '9px', width: 'auto' }}>
      </PopoverTrigger>
      <PopoverContent style={{ width: 'auto' }}>
        <HexAlphaColorPicker color={color} onChange={onChange} />
        <HexColorInput color={color} onChange={onChange} className={style.input} prefixed />
      </PopoverContent>
    </Popover>
  );
@@ -15,6 +15,8 @@ export default function useReactiveTextInput(
  options?: {
    submitOnEnter?: boolean;
    submitOnCtrlEnter?: boolean;
    onCancelUpdate?: () => void;
    allowSubmitSameValue?: boolean;
  },
 ): UseReactiveTextInputReturn {
  const [text, setText] = useState<string>(initialText);
@@ -47,7 +49,9 @@ export default function useReactiveTextInput(
  const handleSubmit = useCallback(
    (valueToSubmit: string) => {
      // No need to update if it hasn't changed
-      if (valueToSubmit !== initialText) {
+      if (valueToSubmit === initialText && !options?.allowSubmitSameValue) {
        options?.onCancelUpdate?.();
      } else {
        const cleanVal = valueToSubmit.trim();
        submitCallback(cleanVal);
        if (cleanVal !== valueToSubmit) {
@@ -56,7 +60,7 @@ export default function useReactiveTextInput(
      }
      setTimeout(() => ref.current?.blur()); // Immediate timeout to ensure text is set before bluring
    },
-    [initialText, ref, submitCallback],
+    [initialText, options, ref, submitCallback],
  );
  /**
@@ -66,8 +70,9 @@ export default function useReactiveTextInput(
  const handleEscape = useCallback(() => {
    // No need to update if it hasn't changed
    setText(initialText);
    options?.onCancelUpdate?.();
    setTimeout(() => ref.current?.blur()); // Immediate timeout to ensure text is set before bluring
-  }, [initialText, ref]);
+  }, [initialText, options, ref]);
  const keyHandler = useMemo(() => {
    const hotKeys: HotkeyItem[] = [['Escape', handleEscape, { preventDefault: true }]];
@@ -5,6 +5,7 @@ import { millisToString, parseUserTime } from 'ontime-utils';
 import { useEmitLog } from '../../../stores/logger';
 interface TimeInputProps<T extends string> {
  id?: T;
  name: T;
  submitHandler: (field: T, value: string) => void;
  time?: number;
@@ -15,7 +16,7 @@ interface TimeInputProps<T extends string> {
 }
 export default function TimeInput<T extends string>(props: TimeInputProps<T>) {
-  const { name, submitHandler, time = 0, placeholder, disabled, align = 'center', className } = props;
+  const { id, name, submitHandler, time = 0, placeholder, disabled, align = 'center', className } = props;
  const { emitError } = useEmitLog();
  const inputRef = useRef<HTMLInputElement | null>(null);
  const [value, setValue] = useState<string>('');
@@ -54,6 +55,7 @@ export default function TimeInput<T extends string>(props: TimeInputProps<T>) {
      // we dont know the values in the rundown, escalate to handler
      if (newValue.startsWith('p') || newValue.startsWith('+')) {
        submitHandler(name, newValue);
        return true;
      }
      const valueInMillis = parseUserTime(newValue);
@@ -117,6 +119,7 @@ export default function TimeInput<T extends string>(props: TimeInputProps<T>) {
  return (
    <Input
      id={id}
      disabled={disabled}
      size='sm'
      ref={inputRef}
@@ -2,6 +2,8 @@ $input-delayed-border-color: $ontime-delay-text;
 .timeInput {
  border: 1px solid transparent;
  color: $label-gray;
  &.delayed {
    border: 1px solid $input-delayed-border-color;
  }
@@ -1,8 +1,7 @@
 import { useEffect, useState } from 'react';
 import { IoApps } from '@react-icons/all-files/io5/IoApps';
 import { IoSettingsOutline } from '@react-icons/all-files/io5/IoSettingsOutline';
-import { debounce } from '../../utils/debounce';
+import { useFadeOutOnInactivity } from '../../../common/hooks/useFadeOutOnInactivity';
 import style from './NavigationMenu.module.scss';
@@ -13,32 +12,10 @@ interface FloatingNavigationProps {
 export default function FloatingNavigation(props: FloatingNavigationProps) {
  const { toggleMenu, toggleSettings } = props;
-  const [showButton, setShowButton] = useState(false);
+  const isButtonShown = useFadeOutOnInactivity();
  // show on mouse move
  useEffect(() => {
    let fadeOut: NodeJS.Timeout | null = null;
    const setShowMenuTrue = () => {
      setShowButton(true);
      if (fadeOut) {
        clearTimeout(fadeOut);
      }
      fadeOut = setTimeout(() => setShowButton(false), 3000);
    };
    const debouncedShowMenu = debounce(setShowMenuTrue, 1000);
    document.addEventListener('mousemove', debouncedShowMenu);
    return () => {
      document.removeEventListener('mousemove', debouncedShowMenu);
      if (fadeOut) {
        clearTimeout(fadeOut);
      }
    };
  }, []);
  return (
-    <div className={`${style.buttonContainer} ${!showButton ? style.hidden : ''}`}>
+    <div className={`${style.buttonContainer} ${!isButtonShown ? style.hidden : ''}`}>
      <button
        onClick={toggleMenu}
        aria-label='toggle menu'
@@ -38,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;
@@ -72,9 +82,33 @@ $button-size: 3rem;
 .linkIcon {
  margin-left: auto;
-  transform: rotate(45deg);
+  @include rotate-fourty-five;
 }
 .separator {
  border-color: $border-color-ondark;
 }
 .sectionHeader {
  font-size: calc(1rem - 2px);
  margin-left: 1rem;
  color: $gray-700;
 }
 .bottom {
  margin-top: auto;
  margin-bottom: 1rem;
 }
 .interfaces {
  padding: 0.5rem 1rem;
  display: flex;
  flex-wrap: wrap;
  gap: 0.5rem;
 }
 .goIcon {
  @include rotate-fourty-five;
  margin-left: 0.25rem;
  margin-bottom: 0.25rem;
 }
@@ -17,15 +17,18 @@ 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';
 import useClickOutside from '../../hooks/useClickOutside';
-import useElectronEvent from '../../hooks/useElectronEvent';
+import { useElectronEvent } from '../../hooks/useElectronEvent';
 import useInfo from '../../hooks-query/useInfo';
 import { useClientStore } from '../../stores/clientStore';
 import { useViewOptionsStore } from '../../stores/viewOptions';
 import { isKeyEnter } from '../../utils/keyEvent';
-import { handleLinks } from '../../utils/linkUtils';
+import { handleLinks, linkToOtherHost, openLink } from '../../utils/linkUtils';
 import { cx } from '../../utils/styleUtils';
 import { RenameClientModal } from '../client-modal/RenameClientModal';
 import CopyTag from '../copy-tag/CopyTag';
 import style from './NavigationMenu.module.scss';
@@ -42,7 +45,7 @@ function NavigationMenu(props: NavigationMenuProps) {
  const { isOpen: isOpenRename, onOpen: onRenameOpen, onClose: onCloseRename } = useDisclosure();
  const { fullscreen, toggle } = useFullscreen();
-  const { toggleMirror } = useViewOptionsStore();
+  const { mirror, toggleMirror } = useViewOptionsStore();
  const location = useLocation();
  const menuRef = useRef<HTMLDivElement | null>(null);
@@ -54,7 +57,7 @@ function NavigationMenu(props: NavigationMenuProps) {
      <RenameClientModal id={id} name={name} isOpen={isOpenRename} onClose={onCloseRename} />
      <Drawer placement='left' onClose={onClose} isOpen={isOpen} variant='ontime' data-testid='navigation__menu'>
        <DrawerOverlay />
-        <DrawerContent>
+        <DrawerContent maxWidth='22rem'>
          <DrawerHeader>
            <DrawerCloseButton size='lg' />
            Ontime
@@ -62,7 +65,7 @@ function NavigationMenu(props: NavigationMenuProps) {
          <DrawerBody padding={0}>
            <div className={style.buttonsContainer}>
              <div
-                className={style.link}
+                className={cx([style.link, fullscreen && style.current])}
                tabIndex={0}
                role='button'
                onClick={toggle}
@@ -74,7 +77,7 @@ function NavigationMenu(props: NavigationMenuProps) {
                {fullscreen ? <IoContract /> : <IoExpand />}
              </div>
              <div
-                className={style.link}
+                className={cx([style.link, mirror && style.current])}
                tabIndex={0}
                role='button'
                onClick={() => toggleMirror()}
@@ -105,25 +108,22 @@ function NavigationMenu(props: NavigationMenuProps) {
            >
              <IoLockClosedOutline />
              Editor
              <IoArrowUp className={style.linkIcon} />
            </Link>
            <ClientLink to='cuesheet' current={location.pathname === '/cuesheet'}>
              <IoLockClosedOutline />
              Cuesheet
              <IoArrowUp className={style.linkIcon} />
            </ClientLink>
            <ClientLink to='op' current={location.pathname === '/op'}>
              <IoLockClosedOutline />
              Operator
              <IoArrowUp className={style.linkIcon} />
            </ClientLink>
            <hr className={style.separator} />
            {navigatorConstants.map((route) => (
              <ClientLink key={route.url} to={route.url} current={location.pathname === `/${route.url}`}>
                {route.label}
                <IoArrowUp className={style.linkIcon} />
              </ClientLink>
            ))}
            {isLocalhost && <OtherAddresses currentLocation={location.pathname} />}
          </DrawerBody>
        </DrawerContent>
      </Drawer>
@@ -132,6 +132,46 @@ function NavigationMenu(props: NavigationMenuProps) {
  );
 }
 interface OtherAddressesProps {
  currentLocation: string;
 }
 function OtherAddresses(props: OtherAddressesProps) {
  const { currentLocation } = props;
  const { data } = useInfo();
  // there is no point showing this if we only have one interface
  if (data.networkInterfaces.length < 2) {
    return null;
  }
  return (
    <div className={style.bottom}>
      <div className={style.sectionHeader}>Accessible on external networks</div>
      <div className={style.interfaces}>
        {data?.networkInterfaces?.map((nif) => {
          if (nif.name === 'localhost') {
            return null;
          }
          const address = linkToOtherHost(nif.address, currentLocation);
          return (
            <CopyTag
              key={nif.name}
              copyValue={address}
              onClick={() => openLink(address)}
              label='Copy IP or navigate to address'
            >
              {nif.address} <IoArrowUp className={style.goIcon} />
            </CopyTag>
          );
        })}
      </div>
    </div>
  );
 }
 interface ClientLinkProps {
  current: boolean;
  to: string;
@@ -147,6 +187,7 @@ function ClientLink(props: PropsWithChildren<ClientLinkProps>) {
    return (
      <button className={classes} tabIndex={0} onClick={(event) => handleLinks(event, to)}>
        {children}
        <IoArrowUp className={style.linkIcon} />
      </button>
    );
  }
@@ -0,0 +1,15 @@
 import { IoLockClosedOutline } from '@react-icons/all-files/io5/IoLockClosedOutline';
 import { useFadeOutOnInactivity } from '../../../common/hooks/useFadeOutOnInactivity';
 import style from './NavigationMenu.module.scss';
 export default function ViewLockedIcon() {
  const isLockIconShown = useFadeOutOnInactivity();
  return (
    <div className={`${style.buttonContainer} ${!isLockIconShown ? style.hidden : ''}`}>
      <IoLockClosedOutline className={style.lockIcon} />
    </div>
  );
 }
@@ -2,13 +2,18 @@ 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 ViewLockedIcon from './ViewLockedIcon';
 function ViewNavigationMenu() {
  const [searchParams, setSearchParams] = useSearchParams();
  const { isOpen: isMenuOpen, onOpen: onMenuOpen, onClose: onMenuClose } = useDisclosure();
  const isViewLocked = isStringBoolean(searchParams.get('locked'));
  const showEditFormDrawer = useCallback(() => {
    searchParams.set('edit', 'true');
    setSearchParams(searchParams);
@@ -16,6 +21,10 @@ function ViewNavigationMenu() {
  const toggleMenu = () => (isMenuOpen ? onMenuClose() : onMenuOpen());
  if (isViewLocked) {
    return <ViewLockedIcon />;
  }
  return (
    <>
      <FloatingNavigation toggleMenu={toggleMenu} toggleSettings={showEditFormDrawer} />
@@ -1,9 +1,13 @@
 .container {
  width: 100%;
  height: 100%;
  display: flex;
  flex-direction: column;
  align-items: center;
  padding-top: 25vh;
  background: $ui-black;
  color: $ontime-color;
  font-weight: 200;
  font-size: 3rem;
@@ -42,4 +46,4 @@
  to {
    background: rgba($red-500, 0);
  }
-}
+}
@@ -1,5 +1,6 @@
 import { PropsWithChildren, useCallback, useContext } from 'react';
 import { isLocalhost } from '../../../externals';
 import { AppContext } from '../../context/AppContext';
 import PinPage from './PinPage';
@@ -9,7 +10,6 @@ interface ProtectRouteProps {
 }
 export default function ProtectRoute({ permission, children }: PropsWithChildren<ProtectRouteProps>) {
  const isLocal = window.location.hostname === 'localhost' || window.location.hostname === '127.0.0.1';
  const { editorAuth, operatorAuth, validate } = useContext(AppContext);
  const handleValidation = useCallback(
@@ -29,7 +29,7 @@ export default function ProtectRoute({ permission, children }: PropsWithChildren
    return false;
  };
-  if (isLocal || hasRelevantAuth()) {
+  if (isLocalhost || hasRelevantAuth()) {
    // eslint-disable-next-line react/jsx-no-useless-fragment -- trying to make typescript happy
    return <>{children}</>;
  }
@@ -0,0 +1,20 @@
@use '../../../theme/viewerDefs' as *;
 /* share the same style as a page layout */
 .page {
  margin: 0;
  box-sizing: border-box; /* reset */
  overflow: hidden;
  width: 100%; /* restrict the page width to viewport */
  height: 100vh;
  font-family: var(--font-family-override, $viewer-font-family);
  background: var(--background-color-override, $viewer-background-color);
  color: var(--color-override, $viewer-color);
  padding: min(2vh, 16px) clamp(16px, 10vw, 64px);
  display: flex;
  flex-direction: column;
  align-items: center;
  padding-top: 5rem;
 }
@@ -0,0 +1,20 @@
 import { CSSProperties } from 'react';
 import Empty from './Empty';
 import style from './EmptyPage.module.scss';
 interface EmptyPageProps {
  text?: string;
  style?: CSSProperties;
 }
 export default function EmptyPage(props: EmptyPageProps) {
  const { text, ...rest } = props;
  return (
    <div className={style.page}>
      <Empty text={text} {...rest} />
    </div>
  );
 }
@@ -0,0 +1,11 @@
 import { projectLogoPath } from '../../api/constants';
 interface ViewLogoProps {
  name: string;
  className: string;
 }
 export default function ViewLogo(props: ViewLogoProps) {
  const { name, className } = props;
  return <img src={`${projectLogoPath}/${name}`} className={className} />;
 }
@@ -0,0 +1,27 @@
 .inline {
  display: flex;
  align-items: center;
  gap: 1rem;
 }
 // attempt to match with ontimeTextInputs
 .input {
  color: $gray-200;
  border: 1px solid transparent;
  border-radius: 3px;
  background-color: $gray-1200;
  padding: 0 1rem;
  font-size: 1rem;
  height: 2.5rem;
  outline: none;
  &:hover {
    background-color: $gray-1100;
  }
  &:focus {
    background-color: $gray-1000;
    color: $gray-50;
    border: 1px solid $blue-500;
  }
 }
@@ -0,0 +1,30 @@
 import { useState } from 'react';
 import SwatchPicker from '../input/colour-input/SwatchPicker';
 import style from './InlineColourPicker.module.scss';
 interface InlineColourPickerProps {
  name: string;
  value: string;
 }
 const ensureHex = (value: string) => {
  if (!value.startsWith('#')) {
    return `#${value}`;
  }
  return value;
 };
 export default function InlineColourPicker(props: InlineColourPickerProps) {
  const { name, value } = props;
  const [colour, setColour] = useState(() => ensureHex(value));
  return (
    <div className={style.inline}>
      <SwatchPicker color={colour} onChange={setColour} alwaysDisplayColor />
      <span>{colour}</span>
      <input type='hidden' name={name} value={colour} />
    </div>
  );
 }
@@ -13,9 +13,11 @@ import {
  Select,
  Switch,
 } from '@chakra-ui/react';
 import { IoChevronDown } from '@react-icons/all-files/io5/IoChevronDown';
 import { isStringBoolean } from '../../../features/viewers/common/viewUtils';
 import InlineColourPicker from './InlineColourPicker';
 import { ParamField } from './types';
 interface EditFormInputProps {
@@ -23,8 +25,8 @@ interface EditFormInputProps {
 }
 export default function ParamInput(props: EditFormInputProps) {
  const [searchParams] = useSearchParams();
  const { paramField } = props;
  const [searchParams] = useSearchParams();
  const { id, type, defaultValue } = paramField;
  if (type === 'persist') {
@@ -81,6 +83,12 @@ export default function ParamInput(props: EditFormInputProps) {
    );
  }
  if (type === 'colour') {
    const currentvalue = `#${searchParams.get(id) ?? defaultValue}`;
    return <InlineColourPicker name={id} value={currentvalue} />;
  }
  const defaultStringValue = searchParams.get(id) ?? defaultValue;
  const { prefix, placeholder } = paramField;
@@ -101,25 +109,21 @@ function MultiOption(props: EditFormMultiOptionProps) {
  const { paramField } = props;
  const { id, defaultValue } = paramField;
-  const optionFromParams = (searchParams.get(id) ?? '').toLocaleLowerCase();
+  const optionFromParams = searchParams.getAll(id);
-  const defaultOptionValue = optionFromParams || defaultValue?.toLocaleLowerCase() || '';
+  const [paramState, setParamState] = useState<string[]>(optionFromParams || defaultValue || ['']);
  const [paramState, setParamState] = useState<string>(defaultOptionValue);
  return (
    <>
      <input name={id} hidden readOnly value={paramState} />
      <Menu isLazy closeOnSelect={false} variant='ontime-on-dark'>
        <MenuButton as={Button} variant='ontime-subtle-white' position='relative' width='fit-content' fontWeight={400}>
-          {paramField.title}
+          {paramField.title} <IoChevronDown style={{ display: 'inline' }} />
        </MenuButton>
        <MenuList>
          <MenuOptionGroup
            type='checkbox'
-            value={paramState.split('_')}
+            value={paramState}
-            onChange={(value) => {
+            onChange={(value) => setParamState(Array.isArray(value) ? value : [value])}
              setParamState(typeof value === 'object' ? value.filter((v) => v !== '').join('_') : value);
            }}
          >
            {Object.values(paramField.values).map((option) => {
              const { value, label } = option;
@@ -1,6 +1,6 @@
 .drawerFooter {
  display: flex;
-  justify-content: end;
+  justify-content: end;  
  gap: $section-spacing;
  button {
@@ -8,6 +8,23 @@
  }
 }
 .infoLabel {
  display: flex;
  align-items: center;
  gap: $element-spacing;
  padding: 1rem;
  margin-bottom: 1rem;
  background-color: $gray-1100;
  border-radius: 2px;
  font-size: $inner-section-text-size;
  svg {
    font-size: 1.5rem;
    color: $info-blue;
  }
 }
 .label {
  font-size: $inner-section-text-size;
  color: $label-gray;
@@ -11,6 +11,9 @@ import {
  DrawerOverlay,
  useDisclosure,
 } from '@chakra-ui/react';
 import { IoAlertCircle } from '@react-icons/all-files/io5/IoAlertCircle';
 import useViewSettings from '../../../common/hooks-query/useViewSettings';
 import ParamInput from './ParamInput';
 import { isSection, ViewOption } from './types';
@@ -19,6 +22,16 @@ import style from './ViewParamsEditor.module.scss';
 type ViewParamsObj = { [key: string]: string | FormDataEntryValue };
 /**
 * Utility remove the # character from a hex string
 */
 function sanitiseColour(colour: string) {
  if (colour.startsWith('#')) {
    return colour.substring(1);
  }
  return colour;
 }
 /**
 * Makes a new URLSearchParams object from the given params object
 */
@@ -40,10 +53,33 @@ const getURLSearchParamsFromObj = (paramsObj: ViewParamsObj, paramFields: ViewOp
  // compare which values are different from the default values
  Object.entries(paramsObj).forEach(([id, value]) => {
-    if (typeof value === 'string' && value.length && defaultValues[id] !== value) {
+    if (typeof value === 'string' && value.length) {
-      newSearchParams.set(id, value);
+      // we dont know which values contain colours
      // unfortunately this means we run all the strings through the sanitation
      const valueWithoutHash = sanitiseColour(value);
      if (defaultValues[id] !== valueWithoutHash) {
        handleValueString(id, valueWithoutHash);
      }
    }
  });
  /** Utility function contains logic to add a value into the searchParams object */
  function handleValueString(id: string, value: string) {
    const maybeMultipleValues = value.split(',');
    // we need to check if the value contains comma separated list, for the case of the multi-select data
    if (Array.isArray(maybeMultipleValues) && maybeMultipleValues.length > 1) {
      const added = new Set();
      maybeMultipleValues.forEach((v) => {
        if (!added.has(v)) {
          added.add(v);
          newSearchParams.append(id, v);
        }
      });
    } else {
      newSearchParams.set(id, value);
    }
  }
  return newSearchParams;
 };
@@ -54,6 +90,8 @@ interface EditFormDrawerProps {
 // TODO: this is a good candidate for memoisation, but needs the paramFields to be stable
 export default function ViewParamsEditor({ viewOptions }: EditFormDrawerProps) {
  const [searchParams, setSearchParams] = useSearchParams();
  const { data: viewSettings } = useViewSettings();
  const { isOpen, onClose, onOpen } = useDisclosure();
  useEffect(() => {
@@ -82,8 +120,6 @@ export default function ViewParamsEditor({ viewOptions }: EditFormDrawerProps) {
    const newParamsObject = Object.fromEntries(new FormData(formEvent.currentTarget));
    const newSearchParams = getURLSearchParamsFromObj(newParamsObject, viewOptions);
    setSearchParams(newSearchParams);
    onClose();
  };
  return (
@@ -96,6 +132,12 @@ export default function ViewParamsEditor({ viewOptions }: EditFormDrawerProps) {
        </DrawerHeader>
        <DrawerBody>
          {viewSettings.overrideStyles && (
            <div className={style.infoLabel}>
              <IoAlertCircle />
              This view style is being modified by a custom CSS file. <br />
            </div>
          )}
          <form id='edit-params-form' onSubmit={onParamsFormSubmit}>
            {viewOptions.map((option) => {
              if (isSection(option)) {
@@ -23,10 +23,11 @@ type MultiOptionsField = {
 type StringField = { type: 'string'; defaultValue?: string; prefix?: string; placeholder?: string };
 type NumberField = { type: 'number'; defaultValue?: number; prefix?: string; placeholder?: string };
 type BooleanField = { type: 'boolean'; defaultValue: boolean };
 type ColourField = { type: 'colour'; defaultValue: string; placeholder?: string };
 type PersistedField = { type: 'persist'; defaultValue?: string; value: string };
 export type ParamField = BaseField &
-  (StringField | BooleanField | NumberField | OptionsField | MultiOptionsField | PersistedField);
+  (OptionsField | MultiOptionsField | StringField | NumberField | BooleanField | ColourField | PersistedField);
 export type ViewOption = ParamSection | ParamField;
 /**
@@ -0,0 +1,34 @@
 import { useQuery } from '@tanstack/react-query';
 import { dayInMs } from 'ontime-utils';
 import { version } from '../../../../../package.json';
 import { isLocalhost } from '../../externals';
 import { APP_VERSION } from '../api/constants';
 import { getLatestVersion, HasUpdate } from '../api/external';
 const placeholder: HasUpdate & { hasUpdates: boolean } = { url: '', version: '', hasUpdates: false };
 export default function useAppVersion() {
  const {
    data: fetchData,
    status,
    isFetching,
    isError,
    refetch,
  } = useQuery({
    queryKey: APP_VERSION,
    queryFn: getLatestVersion,
    placeholderData: (previousData, _previousQuery) => previousData,
    refetchOnWindowFocus: false,
    refetchOnReconnect: false,
    retry: false,
    staleTime: dayInMs,
    enabled: isLocalhost,
  });
  const hasUpdates = fetchData?.version && !fetchData.version.includes(version);
  const data = fetchData ? { ...fetchData, hasUpdates } : placeholder;
  return { data, placeholder, status, isFetching, isError, refetch };
 }
@@ -3,7 +3,7 @@ import { GetInfo } from 'ontime-types';
 import { queryRefetchIntervalSlow } from '../../ontimeConfig';
 import { APP_INFO } from '../api/constants';
-import { getInfo } from '../api/db';
+import { getInfo } from '../api/session';
 import { ontimePlaceholderInfo } from '../models/Info';
 export default function useInfo() {
@@ -1,3 +1,4 @@
 import { useMemo } from 'react';
 import { useQuery } from '@tanstack/react-query';
 import { ProjectFileListResponse } from 'ontime-types';
@@ -22,3 +23,23 @@ export function useProjectList() {
  });
  return { data: data ?? placeholderProjectList, status, refetch };
 }
 export function useOrderedProjectList() {
  const response = useProjectList();
  const { files, lastLoadedProject } = response.data;
  const reorderedProjectFiles = useMemo(() => {
    if (!files.length) return [];
    const currentlyLoadedIndex = files.findIndex((project) => project.filename === lastLoadedProject);
    if (currentlyLoadedIndex === -1) return files;
    const projectFiles = [...files];
    const current = projectFiles.splice(currentlyLoadedIndex, 1)[0];
    return [current, ...projectFiles];
  }, [files, lastLoadedProject]);
  return { ...response, data: { reorderedProjectFiles, lastLoadedProject: response.data.lastLoadedProject } };
 }
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { useQuery } from '@tanstack/react-query';
 import { NormalisedRundown, OntimeRundown, RundownCached } from 'ontime-types';
@@ -6,6 +6,8 @@ import { queryRefetchIntervalSlow } from '../../ontimeConfig';
 import { RUNDOWN } from '../api/constants';
 import { fetchNormalisedRundown } from '../api/rundown';
 import useProjectData from './useProjectData';
 // revision is -1 so that the remote revision is higher
 const cachedRundownPlaceholder = { order: [] as string[], rundown: {} as NormalisedRundown, revision: -1 };
@@ -24,7 +26,9 @@ export default function useRundown() {
 export function useFlatRundown() {
  const { data, status } = useRundown();
  const { data: projectData } = useProjectData();
  const loadedProject = useRef<string>('');
  const [prevRevision, setPrevRevision] = useState<number>(-1);
  const [flatRunDown, setFlatRunDown] = useState<OntimeRundown>([]);
@@ -37,5 +41,14 @@ export function useFlatRundown() {
    }
  }, [data.order, data.revision, data.rundown, prevRevision]);
  // TODO: should we have a project id field?
  // invalidate current version if project changes
  useEffect(() => {
    if (projectData?.title !== loadedProject.current) {
      setPrevRevision(-1);
      loadedProject.current = projectData?.title ?? '';
    }
  }, [projectData]);
  return { data: flatRunDown, status };
 }
@@ -4,16 +4,23 @@ import { useLocation, useNavigate } from 'react-router-dom';
 import { useClientStore } from '../stores/clientStore';
 import { socketSendJson } from '../utils/socket';
 import { useIsOnline } from './useSocket';
 export const useClientPath = () => {
  const navigate = useNavigate();
  const { pathname, search } = useLocation();
-  const redirect = useClientStore((store) => store.redirect);
+  const { redirect, setRedirect } = useClientStore((store) => ({
-  const setRedirect = useClientStore((store) => store.setRedirect);
+    redirect: store.redirect,
    setRedirect: store.setRedirect,
  }));
  const isOnline = useIsOnline();
  // notify of client path changes
  useEffect(() => {
    if (!isOnline) return;
    socketSendJson('set-client-path', pathname + search);
-  }, [pathname, search]);
+  }, [pathname, search, isOnline]);
  // navigate to new path when received from server
  useEffect(() => {
@@ -26,7 +33,7 @@ export const useClientPath = () => {
    // navigate if there is a path change
    if (redirect !== pathname + search) {
-      navigate(redirect);
+      navigate(redirect, { replace: true });
    }
  }, [navigate, pathname, redirect, search, setRedirect]);
 };
@@ -1,11 +1,42 @@
-export default function useElectronEvent() {
+import { useCallback, useEffect } from 'react';
-  const isElectron = window?.process?.type === 'renderer';
+import { useNavigate } from 'react-router-dom';
-  const sendToElectron = (channel: string, args?: string | Record<string, unknown>) => {
+import { addDialog } from '../stores/dialogStore';
-    if (isElectron) {
+
-      window?.ipcRenderer.send(channel, args);
+const isElectron = window.process?.type === 'renderer';
 const ipcRenderer = isElectron ? window.require('electron').ipcRenderer : null;
 export function useElectronEvent() {
  const sendToElectron = useCallback((channel: string, args?: string | Record<string, unknown>) => {
    if (isElectron && ipcRenderer) {
      ipcRenderer.send(channel, args);
    }
-  };
+  }, []);
  return { isElectron, sendToElectron };
 }
 export function useElectronListener() {
  const navigate = useNavigate();
  const { isElectron } = useElectronEvent();
  // listen to requests to change the editor location
  useEffect(() => {
    if (isElectron) {
      ipcRenderer.on('request-editor-location', (_event: unknown, location: string) => {
        navigate(location, { relative: 'route' });
      });
      ipcRenderer.on('dialog', (_event: unknown, dialog: string) => {
        if (dialog === 'welcome') {
          addDialog('welcome');
        }
      });
    }
    // Clean the listener after the component is dismounted
    return () => {
      ipcRenderer?.removeAllListeners();
    };
  }, [isElectron, navigate]);
 }
@@ -1,17 +1,17 @@
 import { useCallback } from 'react';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { isOntimeEvent, MaybeString, OntimeEvent, OntimeRundownEntry, RundownCached } from 'ontime-types';
 import {
-  dayInMs,
+  isOntimeEvent,
-  getLinkedTimes,
+  OntimeBlock,
-  getPreviousEventNormal,
+  OntimeDelay,
-  MILLIS_PER_SECOND,
+  OntimeEvent,
-  parseUserTime,
+  OntimeRundownEntry,
-  reorderArray,
+  RundownCached,
-  swapEventData,
+  TimeField,
-  validateEndAction,
+  TimeStrategy,
-  validateTimerType,
+  TransientEventPayload,
-} from 'ontime-utils';
+} from 'ontime-types';
 import { dayInMs, MILLIS_PER_SECOND, parseUserTime, reorderArray, swapEventData } from 'ontime-utils';
 import { RUNDOWN } from '../api/constants';
 import {
@@ -29,6 +29,16 @@ import {
 import { logAxiosError } from '../api/utils';
 import { useEditorSettings } from '../stores/editorSettings';
 export type EventOptions = Partial<{
  // options to any new block (event / delay / block)
  after: string;
  before: string;
  // options to blocks of type OntimeEvent
  defaultPublic: boolean;
  linkPrevious: boolean;
  lastEventId: string;
 }>;
 /**
 * @description Set of utilities for events //TODO: should this be called useEntryAction and so on
 */
@@ -37,6 +47,7 @@ export const useEventAction = () => {
  const {
    defaultPublic,
    linkPrevious,
    defaultTimeStrategy,
    defaultDuration,
    defaultWarnTime,
    defaultDangerTime,
@@ -56,31 +67,19 @@ export const useEventAction = () => {
    networkMode: 'always',
  });
  // options to any new block (event / delay / block)
  type BaseOptions = {
    after?: string;
  };
  // options to blocks of type OntimeEvent
  type EventOptions = BaseOptions &
    Partial<{
      defaultPublic: boolean;
      linkPrevious: boolean;
      lastEventId: string;
    }>;
  /**
   * Adds an event to rundown
   */
  const addEvent = useCallback(
-    async (event: Partial<OntimeRundownEntry>, options?: EventOptions) => {
+    async (event: Partial<OntimeEvent | OntimeDelay | OntimeBlock>, options?: EventOptions) => {
-      const newEvent: Partial<OntimeRundownEntry> = { ...event };
+      const newEvent: TransientEventPayload = { ...event };
      // ************* CHECK OPTIONS specific to events
      if (isOntimeEvent(newEvent)) {
        // merge creation time options with event settings
        const applicationOptions = {
          after: options?.after,
          before: options?.before,
          defaultPublic: options?.defaultPublic ?? defaultPublic,
          lastEventId: options?.lastEventId,
          linkPrevious: options?.linkPrevious ?? linkPrevious,
@@ -116,21 +115,30 @@ export const useEventAction = () => {
        }
        if (newEvent.timerType === undefined) {
-          newEvent.timerType = validateTimerType(defaultTimerType);
+          newEvent.timerType = defaultTimerType;
        }
        if (newEvent.endAction === undefined) {
-          newEvent.endAction = validateEndAction(defaultEndAction);
+          newEvent.endAction = defaultEndAction;
        }
        if (newEvent.timeStrategy === undefined) {
          newEvent.timeStrategy = defaultTimeStrategy;
        }
      }
      // handle adding options that concern all event type
      if (options?.after) {
        // @ts-expect-error -- not sure how to type this, <after> is a transient property
        newEvent.after = options.after;
      }
      if (options?.before) {
        // @ts-expect-error -- not sure how to type this, <before> is a transient property
        newEvent.before = options.before;
      }
      try {
-        await _addEventMutation.mutateAsync(newEvent);
+        await _addEventMutation.mutateAsync(newEvent as TransientEventPayload);
      } catch (error) {
        logAxiosError('Failed adding event', error);
      }
@@ -142,6 +150,7 @@ export const useEventAction = () => {
      defaultEndAction,
      defaultPublic,
      defaultTimerType,
      defaultTimeStrategy,
      defaultWarnTime,
      linkPrevious,
      queryClient,
@@ -207,13 +216,75 @@ export const useEventAction = () => {
    [updateEvent],
  );
  type TimeField = 'timeStart' | 'timeEnd' | 'duration';
  /**
   * Updates time of existing event
   * @param eventId {string} - id of the event
   * @param field {TimeField} - field to update
   * @param value {string} - new value string to be parsed
   * @param lockOnUpdate {boolean} - whether we will apply the lock / release on update
   */
  const updateTimer = useCallback(
-    async (eventId: string, field: TimeField, value: string) => {
+    async (eventId: string, field: TimeField, value: string, lockOnUpdate?: boolean) => {
-      const getPreviousEnd = (): number => {
+      // an empty value with no lock has no domain validity
      if (!lockOnUpdate && value === '') {
        return;
      }
      const newEvent: Partial<OntimeEvent> = {
        id: eventId,
      };
      // check if we should lock the field
      if (lockOnUpdate) {
        if (field === 'timeEnd') {
          // an empty value indicates that we should unlock the field
          newEvent.timeStrategy = value === '' ? TimeStrategy.LockDuration : TimeStrategy.LockEnd;
          newEvent.timeEnd = value === '' ? undefined : calculateNewValue();
        } else if (field === 'duration') {
          // an empty value indicates that we should unlock the field
          newEvent.timeStrategy = value === '' ? TimeStrategy.LockEnd : TimeStrategy.LockDuration;
          newEvent.duration = value === '' ? undefined : calculateNewValue();
        } else if (field === 'timeStart') {
          // an empty values means we should link to the previous
          newEvent.linkStart = value === '' ? 'true' : null;
          newEvent.timeStart = value === '' ? undefined : calculateNewValue();
        }
      } else {
        newEvent[field] = calculateNewValue();
      }
      try {
        await _updateEventMutation.mutateAsync(newEvent);
      } catch (error) {
        logAxiosError('Error updating event', error);
      }
      /**
       * Utility function to calculate the new time value
       */
      function calculateNewValue(): number {
        let newValMillis = 0;
        // check for previous keyword
        if (value === 'p' || value === 'prev' || value === 'previous') {
          newValMillis = getPreviousEnd();
          // check for adding time keyword
        } else if (value.startsWith('+') || value.startsWith('p+') || value.startsWith('p +')) {
          // TODO: is this logic solid?
          const remainingString = value.substring(1);
          newValMillis = getPreviousEnd() + parseUserTime(remainingString);
        } else {
          newValMillis = parseUserTime(value);
        }
        // dont allow timer values over 23:59:59
        return Math.min(newValMillis, dayInMs - MILLIS_PER_SECOND);
      }
      /**
       * Utility function to get the previous event end time
       */
      function getPreviousEnd(): number {
        const cachedRundown = queryClient.getQueryData<RundownCached>(RUNDOWN);
        if (!cachedRundown?.order || !cachedRundown?.rundown) {
@@ -233,72 +304,6 @@ export const useEventAction = () => {
          }
        }
        return previousEnd;
      };
      let newValMillis = 0;
      // check for previous keyword
      if (value === 'p' || value === 'prev' || value === 'previous') {
        newValMillis = getPreviousEnd();
        // check for adding time keyword
      } else if (value.startsWith('+') || value.startsWith('p+') || value.startsWith('p +')) {
        // TODO: is this logic solid?
        const remainingString = value.substring(1);
        newValMillis = getPreviousEnd() + parseUserTime(remainingString);
      } else {
        newValMillis = parseUserTime(value);
      }
      // dont allow timer values over 23:59:59
      const cappedMillis = Math.min(newValMillis, dayInMs - MILLIS_PER_SECOND);
      const newEvent = {
        id: eventId,
        [field]: cappedMillis,
      };
      try {
        await _updateEventMutation.mutateAsync(newEvent);
      } catch (error) {
        logAxiosError('Error updating event', error);
      }
    },
    [_updateEventMutation, queryClient],
  );
  /**
   * Toggles link of an event to the previous
   */
  const linkTimer = useCallback(
    async (eventId: string, linkStart: MaybeString) => {
      let newEvent: Partial<OntimeEvent> = { id: eventId };
      if (!linkStart) {
        newEvent.linkStart = null;
      } else {
        const cachedRundown = queryClient.getQueryData<RundownCached>(RUNDOWN);
        if (!cachedRundown) {
          return;
        }
        const currentEvent = cachedRundown.rundown[eventId] as OntimeEvent;
        if (!isOntimeEvent(currentEvent)) {
          return;
        }
        const { previousEvent } = getPreviousEventNormal(cachedRundown.rundown, cachedRundown.order, eventId);
        if (!previousEvent) {
          newEvent.linkStart = null;
        } else {
          newEvent.linkStart = previousEvent.id;
          const timePatch = getLinkedTimes(currentEvent, previousEvent);
          newEvent = { ...newEvent, ...timePatch };
        }
      }
      try {
        await _updateEventMutation.mutateAsync(newEvent);
      } catch (error) {
        logAxiosError('Error updating event', error);
      }
    },
    [_updateEventMutation, queryClient],
@@ -610,7 +615,6 @@ export const useEventAction = () => {
    batchUpdateEvents,
    deleteEvent,
    deleteAllEvents,
    linkTimer,
    reorderEvent,
    swapEvents,
    updateEvent,
@@ -0,0 +1,31 @@
 import { useEffect, useState } from 'react';
 import { throttle } from '../../common/utils/throttle';
 export const useFadeOutOnInactivity = () => {
  const [isMouseMoved, setIsMouseMoved] = useState(false);
  // show on mouse move
  useEffect(() => {
    let fadeOut: NodeJS.Timeout | null = null;
    const setShowMenuTrue = () => {
      setIsMouseMoved(true);
      if (fadeOut) {
        clearTimeout(fadeOut);
      }
      fadeOut = setTimeout(() => setIsMouseMoved(false), 3000);
    };
    const throttledShowMenu = throttle(setShowMenuTrue, 1000);
    document.addEventListener('mousemove', throttledShowMenu);
    return () => {
      document.removeEventListener('mousemove', throttledShowMenu);
      if (fadeOut) {
        clearTimeout(fadeOut);
      }
    };
  }, []);
  return isMouseMoved;
 };
@@ -6,7 +6,7 @@
 import { useMemo, useRef } from 'react';
-import { isDev } from '../api/constants';
+import { isDev } from '../../externals';
 type noop = (this: any, ...args: any[]) => any;
@@ -65,6 +65,7 @@ export const useMessagePreview = () => {
    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);
@@ -148,19 +149,21 @@ export const setAuxTimer = {
  setDuration: (time: number) => socketSendJson('auxtimer', { '1': { duration: time } }),
 };
-export const useCuesheet = () => {
+export const useSelectedEventId = () => {
  const featureSelector = (state: RuntimeStore) => ({
    playback: state.timer.playback,
    currentBlockId: state.currentBlock.block?.id ?? null,
    selectedEventId: state.eventNow?.id ?? null,
    selectedEventIndex: state.runtime.selectedEventIndex,
    numEvents: state.runtime.numEvents,
    titleNow: state.eventNow?.title || '',
  });
  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 }),
  startEvent: (id: string) => socketSendJson('start', { id }),
@@ -230,3 +233,20 @@ export const useTimelineStatus = () => {
  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 = () => {
  const featureSelector = (state: RuntimeStore) => ({
    isOnline: state.ping > 0,
  });
  return useRuntimeStore(featureSelector);
 };
@@ -7,5 +7,5 @@ export const ontimePlaceholderInfo: GetInfo = {
  version: '2.0.0',
  serverPort: 4001,
  osc: oscPlaceholderSettings,
-  cssOverride: '',
+  publicDir: '',
 };
@@ -7,4 +7,5 @@ export const projectDataPlaceholder: ProjectData = {
  publicInfo: '',
  backstageUrl: '',
  backstageInfo: '',
  projectLogo: null,
 };
@@ -15,4 +15,5 @@ export type ViewExtendedTimer = {
  clock: number;
  timerType: TimerType;
  countToEnd: boolean;
 };
@@ -15,4 +15,5 @@ export type OverridableOptions = {
  language?: string;
  showProgressBar?: boolean;
  hideTimerSeconds?: boolean;
  removeLeadingZeros?: boolean;
 };
@@ -0,0 +1,24 @@
 import { MaybeString } from 'ontime-types';
 import { create } from 'zustand';
 interface DialogStore {
  showDialog: MaybeString;
  setDialog: (name: string) => void;
  clearDialog: () => void;
 }
 /**
 * Used to allow the server to show a dialog in the client
 */
 export const useDialogStore = create<DialogStore>((set) => ({
  showDialog: null,
  clearDialog: () => set({ showDialog: null }),
  setDialog: (name) => set({ showDialog: name }),
 }));
 /**
 * Allows setting a dialog to show (outside react)
 */
 export function addDialog(name: string): void {
  useDialogStore.getState().setDialog(name);
 }
@@ -1,5 +1,5 @@
-import { EndAction, TimerType } from 'ontime-types';
+import { EndAction, TimerType, TimeStrategy } from 'ontime-types';
-import { validateEndAction, validateTimerType } from 'ontime-utils';
+import { validateEndAction, validateTimerType, validateTimeStrategy } from 'ontime-utils';
 import { create } from 'zustand';
 import { booleanFromLocalStorage } from '../utils/localStorage';
@@ -7,6 +7,7 @@ import { booleanFromLocalStorage } from '../utils/localStorage';
 type EditorSettingsStore = {
  defaultDuration: string;
  linkPrevious: boolean;
  defaultTimeStrategy: TimeStrategy;
  defaultWarnTime: string;
  defaultDangerTime: string;
  defaultPublic: boolean;
@@ -14,6 +15,7 @@ type EditorSettingsStore = {
  defaultEndAction: EndAction;
  setDefaultDuration: (defaultDuration: string) => void;
  setLinkPrevious: (linkPrevious: boolean) => void;
  setTimeStrategy: (timeStrategy: TimeStrategy) => void;
  setWarnTime: (warnTime: string) => void;
  setDangerTime: (dangerTime: string) => void;
  setDefaultPublic: (defaultPublic: boolean) => void;
@@ -24,6 +26,7 @@ type EditorSettingsStore = {
 export const editorSettingsDefaults = {
  duration: '00:10:00',
  linkPrevious: true,
  timeStrategy: TimeStrategy.LockDuration,
  warnTime: '00:02:00', // 120000 same as backend
  dangerTime: '00:01:00', // 60000 same as backend
  isPublic: true,
@@ -34,6 +37,7 @@ export const editorSettingsDefaults = {
 enum EditorSettingsKeys {
  DefaultDuration = 'ontime-default-duration',
  LinkPrevious = 'ontime-link-previous',
  DefaultTimeStrategy = 'ontime-time-strategy',
  DefaultWarnTime = 'ontime-default-warn-time',
  DefaultDangerTime = 'ontime-default-danger-time',
  DefaultPublic = 'ontime-default-public',
@@ -45,6 +49,10 @@ export const useEditorSettings = create<EditorSettingsStore>((set) => {
  return {
    defaultDuration: localStorage.getItem(EditorSettingsKeys.DefaultDuration) ?? editorSettingsDefaults.duration,
    linkPrevious: booleanFromLocalStorage(EditorSettingsKeys.LinkPrevious, editorSettingsDefaults.linkPrevious),
    defaultTimeStrategy: validateTimeStrategy(
      localStorage.getItem(EditorSettingsKeys.DefaultTimeStrategy),
      editorSettingsDefaults.timeStrategy,
    ),
    defaultWarnTime: localStorage.getItem(EditorSettingsKeys.DefaultWarnTime) ?? editorSettingsDefaults.warnTime,
    defaultDangerTime: localStorage.getItem(EditorSettingsKeys.DefaultDangerTime) ?? editorSettingsDefaults.dangerTime,
    defaultPublic: booleanFromLocalStorage(EditorSettingsKeys.DefaultPublic, editorSettingsDefaults.isPublic),
@@ -68,6 +76,12 @@ export const useEditorSettings = create<EditorSettingsStore>((set) => {
        localStorage.setItem(EditorSettingsKeys.LinkPrevious, String(linkPrevious));
        return { linkPrevious };
      }),
    setTimeStrategy: (defaultTimeStrategy) =>
      set(() => {
        localStorage.setItem(EditorSettingsKeys.DefaultTimeStrategy, String(defaultTimeStrategy));
        return { defaultTimeStrategy };
      }),
    setWarnTime: (defaultWarnTime) =>
      set(() => {
        localStorage.setItem(EditorSettingsKeys.DefaultWarnTime, String(defaultWarnTime));
@@ -1,58 +1,7 @@
 import isEqual from 'react-fast-compare';
-import { Playback, RuntimeStore, SimpleDirection, SimplePlayback, TimerPhase } from 'ontime-types';
+import { RuntimeStore, runtimeStorePlaceholder } from 'ontime-types';
 import { createWithEqualityFn, useStoreWithEqualityFn } from 'zustand/traditional';
 export const runtimeStorePlaceholder: RuntimeStore = {
  clock: 0,
  timer: {
    addedTime: 0,
    current: null,
    duration: null,
    elapsed: null,
    expectedFinish: null,
    finishedAt: null,
    phase: TimerPhase.None,
    playback: Playback.Stop,
    secondaryTimer: null,
    startedAt: null,
  },
  onAir: false,
  message: {
    timer: {
      text: '',
      visible: false,
      blink: false,
      blackout: false,
      secondarySource: null,
    },
    external: '',
  },
  runtime: {
    selectedEventIndex: null,
    numEvents: 0,
    offset: 0,
    plannedStart: 0,
    plannedEnd: 0,
    actualStart: null,
    expectedEnd: null,
  },
  currentBlock: {
    block: null,
    startedAt: null,
  },
  eventNow: null,
  eventNext: null,
  publicEventNow: null,
  publicEventNext: null,
  auxtimer1: {
    current: 0,
    direction: SimpleDirection.CountUp,
    duration: 0,
    playback: SimplePlayback.Stop,
  },
  frozen: false,
 };
 const deepCompare = <T>(a: T, b: T) => isEqual(a, b);
 export const runtimeStore = createWithEqualityFn<RuntimeStore>(
@@ -67,11 +16,17 @@ export const useRuntimeStore = <T>(selector: (state: RuntimeStore) => T) =>
 /**
 * Allows patching a property of the runtime store
 * @param key
 * @param value
 */
-export function patchRuntime<K extends keyof RuntimeStore>(key: K, value: RuntimeStore[K]): void {
+export function patchRuntimeProperty<K extends keyof RuntimeStore>(key: K, value: RuntimeStore[K]) {
  const state = runtimeStore.getState();
  state[key] = value;
  runtimeStore.setState({ ...state });
 }
 /**
 * Allows patching the entire runtime store
 */
 export function patchRuntime(patch: Partial<RuntimeStore>) {
  const state = runtimeStore.getState();
  runtimeStore.setState({ ...state, ...patch });
 }
@@ -3,8 +3,8 @@ import { formatFromMillis, MILLIS_PER_HOUR, MILLIS_PER_MINUTE } from 'ontime-uti
 /**
 * Parses a value in millis to a string which encodes a delay
- * @param millis 
+ * @param millis
- * @param format 
+ * @param format
 */
 export function millisToDelayString(millis: MaybeNumber, format: 'compact' | 'expanded' = 'compact'): string {
  if (millis == null || millis === 0) {
@@ -1,12 +1,12 @@
-export function debounce(callback: () => void, wait: number) {
+export function debounce<T extends any[]>(callback: (...args: T) => void, wait: number) {
  let timeout: NodeJS.Timeout | null;
-  return () => {
+  return (...args: T) => {
    if (timeout) {
-      return;
+      clearTimeout(timeout);
    }
    timeout = setTimeout(() => {
      timeout = null;
-      callback();
+      callback(...args);
    }, wait);
  };
 }
@@ -7,7 +7,7 @@ import { OntimeEvent, SupportedEvent } from 'ontime-types';
 * @return {OntimeEvent} clean event
 */
 type ClonedEvent = Omit<OntimeEvent, 'id' | 'cue'>;
-export const cloneEvent = (event: OntimeEvent, after?: string): ClonedEvent => {
+export const cloneEvent = (event: OntimeEvent): ClonedEvent => {
  return {
    type: SupportedEvent.Event,
    title: event.title,
@@ -17,13 +17,16 @@ export const cloneEvent = (event: OntimeEvent, after?: string): ClonedEvent => {
    timeEnd: event.timeEnd,
    timerType: event.timerType,
    timeStrategy: event.timeStrategy,
    countToEnd: event.countToEnd,
    linkStart: event.linkStart,
    endAction: event.endAction,
    isPublic: event.isPublic,
    skip: event.skip,
    colour: event.colour,
    after,
    revision: 0,
    delay: 0,
    dayOffset: 0,
    gap: 0,
    timeWarning: event.timeWarning,
    timeDanger: event.timeDanger,
    custom: {},
@@ -7,3 +7,11 @@ export function isKeyEnter<T>(event: KeyboardEvent<T>): boolean {
 export function isKeyEscape<T>(event: KeyboardEvent<T>): boolean {
  return event.key === 'Escape';
 }
 export function preventEscape<T>(event: KeyboardEvent<T>, callback?: () => void): void {
  if (isKeyEscape(event)) {
    event.preventDefault();
    event.stopPropagation();
    callback?.();
  }
 }
@@ -1,30 +0,0 @@
 /**
 * Returns hostname
 * @type {string}
 */
 export const host = window?.location?.host;
 /**
 * 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) {
  if (window.process?.type === 'renderer') {
    window.ipcRenderer.send('send-to-link', url);
  } else {
    window.open(url);
  }
 }
 /**
 * Handles opening external links
 * @param event
 * @param location
 */
 export function handleLinks(event, location) {
  // we handle the link manually
  event.preventDefault();
  openLink(`http://${host}/${location}`);
 }
@@ -0,0 +1,40 @@
 import type { MouseEvent } from 'react';
 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') {
    window.ipcRenderer.send('send-to-link', url);
  } else {
    window.open(url);
  }
 }
 /**
 * Handles opening external links
 * @param event
 * @param location
 */
 export function handleLinks(event: MouseEvent, location: string) {
  // we handle the link manually
  event.preventDefault();
  const destination = new URL(serverURL);
  destination.pathname = baseURI ? `${baseURI}/${location}` : location;
  openLink(destination.toString());
 }
 export function linkToOtherHost(host: string, path?: string) {
  const destination = new URL(serverURL);
  destination.hostname = host;
  if (path) {
    destination.pathname = baseURI ? `${baseURI}/${path}` : path;
  }
  return destination.toString();
 }
@@ -1,6 +1,8 @@
 import { Log, RundownCached, RuntimeStore } from 'ontime-types';
-import { CLIENT_LIST, CUSTOM_FIELDS, isProduction, RUNDOWN, RUNTIME, websocketUrl } from '../api/constants';
+import { isProduction, websocketUrl } from '../../externals';
 import { CLIENT_LIST, CUSTOM_FIELDS, RUNDOWN, RUNTIME } from '../api/constants';
 import { invalidateAllCaches } from '../api/utils';
 import { ontimeQueryClient } from '../queryClient';
 import {
  getClientId,
@@ -10,8 +12,9 @@ import {
  setClientRedirect,
  setClients,
 } from '../stores/clientStore';
 import { addDialog } from '../stores/dialogStore';
 import { addLog } from '../stores/logger';
-import { patchRuntime, runtimeStore } from '../stores/runtime';
+import { patchRuntime, patchRuntimeProperty } from '../stores/runtime';
 export let websocket: WebSocket | null = null;
 let reconnectTimeout: NodeJS.Timeout | null = null;
@@ -36,12 +39,13 @@ export const connectSocket = () => {
    }
    socketSendJson('set-client-type', 'ontime');
-
+    setOnlineStatus(true);
    socketSendJson('set-client-path', location.pathname + location.search);
  };
  websocket.onclose = () => {
    console.warn('WebSocket disconnected');
    setOnlineStatus(false);
    if (shouldReconnect) {
      reconnectTimeout = setTimeout(() => {
        console.warn('WebSocket: attempting reconnect');
@@ -68,6 +72,12 @@ export const connectSocket = () => {
      }
      switch (type) {
        case 'pong': {
          const offset = (new Date().getTime() - new Date(payload).getTime()) * 0.5;
          patchRuntimeProperty('ping', offset);
          updateDevTools({ ping: offset });
          break;
        }
        case 'client-id': {
          if (typeof payload === 'string') {
            setClientId(payload);
@@ -110,78 +120,88 @@ export const connectSocket = () => {
          break;
        }
        case 'dialog': {
          if (payload.dialog === 'welcome') {
            addDialog('welcome');
          }
          break;
        }
        case 'ontime-log': {
          addLog(payload as Log);
          break;
        }
        case 'ontime': {
-          runtimeStore.setState(payload as RuntimeStore);
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars -- removing the key from the payload
-          if (!isProduction) {
+          const { ping, ...serverPayload } = payload as Partial<RuntimeStore>;
-            ontimeQueryClient.setQueryData(RUNTIME, data.payload);
+
-          }
+          patchRuntime(serverPayload);
          updateDevTools(serverPayload);
          break;
        }
        case 'ontime-clock': {
-          patchRuntime('clock', payload);
+          patchRuntimeProperty('clock', payload);
          updateDevTools({ clock: payload });
          break;
        }
        case 'ontime-timer': {
-          patchRuntime('timer', payload);
+          patchRuntimeProperty('timer', payload);
          updateDevTools({ timer: payload });
          break;
        }
        case 'ontime-onAir': {
-          patchRuntime('onAir', payload);
+          patchRuntimeProperty('onAir', payload);
          updateDevTools({ onAir: payload });
          break;
        }
        case 'ontime-message': {
-          patchRuntime('message', payload);
+          patchRuntimeProperty('message', payload);
          updateDevTools({ message: payload });
          break;
        }
        case 'ontime-runtime': {
-          patchRuntime('runtime', payload);
+          patchRuntimeProperty('runtime', payload);
          updateDevTools({ runtime: payload });
          break;
        }
        case 'ontime-eventNow': {
-          patchRuntime('eventNow', payload);
+          patchRuntimeProperty('eventNow', payload);
          updateDevTools({ eventNow: payload });
          break;
        }
        case 'ontime-currentBlock': {
-          patchRuntime('currentBlock', payload);
+          patchRuntimeProperty('currentBlock', payload);
          updateDevTools({ currentBlock: payload });
          break;
        }
        case 'ontime-publicEventNow': {
-          patchRuntime('publicEventNow', payload);
+          patchRuntimeProperty('publicEventNow', payload);
          updateDevTools({ publicEventNow: payload });
          break;
        }
        case 'ontime-eventNext': {
-          patchRuntime('eventNext', payload);
+          patchRuntimeProperty('eventNext', payload);
          updateDevTools({ eventNext: payload });
          break;
        }
        case 'ontime-publicEventNext': {
-          patchRuntime('publicEventNext', payload);
+          patchRuntimeProperty('publicEventNext', payload);
          updateDevTools({ publicEventNext: payload });
          break;
        }
        case 'ontime-auxtimer1': {
-          patchRuntime('auxtimer1', payload);
+          patchRuntimeProperty('auxtimer1', payload);
          updateDevTools({ auxtimer1: payload });
          break;
        }
        case 'ontime-refetch': {
          // the refetch message signals that the rundown has changed in the server side
-          const { revision } = payload;
+          const { revision, reload } = payload;
          const currentRevision = ontimeQueryClient.getQueryData<RundownCached>(RUNDOWN)?.revision ?? -1;
-          if (revision > currentRevision) {
+          if (reload) {
            invalidateAllCaches();
          } else if (revision > currentRevision) {
            ontimeQueryClient.invalidateQueries({ queryKey: RUNDOWN });
            ontimeQueryClient.invalidateQueries({ queryKey: CUSTOM_FIELDS });
          }
@@ -222,3 +242,15 @@ function updateDevTools(newData: Partial<RuntimeStore>) {
    }));
  }
 }
 /**
 * Allows setting the status of the client
 * We leverage the ping as an indication of the client's online status
 * @example ping < 0 - client is offline
 * @example ping > 0 -> client is online
 */
 function setOnlineStatus(status: boolean) {
  const derivedPing = status ? 1 : -1;
  patchRuntimeProperty('ping', derivedPing);
  updateDevTools({ ping: derivedPing });
 }
@@ -0,0 +1,12 @@
 export function throttle<T extends any[]>(callback: (...args: T) => void, wait: number) {
  let timeout: NodeJS.Timeout | null;
  return (...args: T) => {
    if (timeout) {
      return;
    }
    timeout = setTimeout(() => {
      timeout = null;
      callback(...args);
    }, wait);
  };
 }
@@ -34,7 +34,7 @@ export function validateProjectFile(file: File) {
  // Limit file size of a project file to around 1MB
  if (file.size > 1_000_000) {
-    throw new Error('File size limit (10MB) exceeded');
+    throw new Error('File size limit (1MB) exceeded');
  }
 }
@@ -45,3 +45,19 @@ export function isExcelFile(file: File | null) {
 export function isOntimeFile(file: File | null) {
  return file?.name.endsWith('.json');
 }
 /**
 * Collection of rules for pre-validating a project file
 * @param file
 */
 export function validateLogo(file: File) {
  // Check if file is empty
  if (file.size === 0) {
    throw new Error('File is empty');
  }
  // Limit file size of a project file to around 1MB
  if (file.size > 1_000_000) {
    throw new Error('File size limit (1MB) exceeded');
  }
 }
@@ -6,6 +6,9 @@ declare module '*.scss' {
 type ListenerType = (event: 'string', args: unknown[]) => void;
 declare global {
  /**
   * Register the electron properties
   */
  interface Window {
    ipcRenderer: {
      send: (channel: string, args?: string | object) => void;
@@ -17,6 +20,24 @@ declare global {
  }
 }
 /**
 * We pass a custom property to the table meta to allow field update
 */
 declare module '@tanstack/react-table' {
  // eslint-disable-next-line @typescript-eslint/no-unused-vars
  interface TableMeta<TData extends RowData> {
    handleUpdate: (rowIndex: number, accessor: string, payload: string, isCustom: boolean) => void;
    handleUpdateTimer: (eventId: string, field: TimeField, payload: string) => void;
    options: {
      showDelayedTimes: boolean;
      hideTableSeconds: boolean;
    };
  }
 }
 /**
 * Allow passing CSS Properties
 */
 declare module 'react' {
  interface CSSProperties {
    [key: `--${string}`]: string | number;
@@ -1,5 +1,75 @@
 /**
 * This file contains a list of constants that may need to be resolved at runtime
 */
 import { version } from '../../../package.json';
 export const githubUrl = 'https://www.github.com/cpvalente/ontime';
 export const apiRepoLatest = 'https://api.github.com/repos/cpvalente/ontime/releases/latest';
 export const websiteUrl = 'https://www.getontime.no';
 export const discordUrl = 'https://discord.com/invite/eje3CSUEXm';
 export const documentationUrl = 'https://docs.getontime.no';
 export const customFieldsDocsUrl = 'https://docs.getontime.no/features/custom-fields/';
 // resolve environment
 export const appVersion = version;
 export const isProduction = import.meta.env.MODE === 'production';
 export const isDev = !isProduction;
 export const isLocalhost = window.location.hostname === 'localhost' || window.location.hostname === '127.0.0.1';
 export const isDockerImage = Boolean(import.meta.env.VITE_IS_DOCKER);
 export const isOntimeCloud = window.location.hostname.includes('cloud.getontime.no');
 // resolve entrypoint URLs
 /**
 * Resolve base
 * @example '' for electron
 * @example '/client-hash' for cloud
 */
 export const baseURI = resolveBaseURI();
 export const serverURL = resolveUrl('http', '');
 export const websocketUrl = resolveUrl('ws', 'ws');
 function resolveUrl(protocol: 'http' | 'ws', path: string) {
  const url = new URL(window.location.origin);
  // generate ws url
  if (protocol === 'ws') {
    // ensure we remain in a secure context
    const isSecure = window.location.protocol === 'https:';
    url.protocol = isSecure ? 'wss' : 'ws';
  }
  // make path name relative to the base URI
  url.pathname = baseURI ? `${baseURI}/${path}` : path;
  // in development mode, we use the React port for UI, but need the requests to target the server
  if (isDev) {
    // this is used as a fallback port for development
    url.port = '4001';
  }
  const result = url.toString();
  // prevent trailing slash
  return result.endsWith('/') ? result.slice(0, -1) : result;
 }
 /**
 * Resolves a base URI for a client that is not at the root segment
 * ie: https://cloud.getontime.com/client-hash/timer
 * This is necessary for ontime cloud and should otherwise not affect the client
 */
 function resolveBaseURI(): string {
  // in ontime cloud, the base tag is set by the server
  const baseHref = document.querySelector('base')?.getAttribute('href');
  const base = baseHref ?? '';
  // prevent a trailing slash from either an empty base or a base with a trailing slash
  if (base.endsWith('/')) {
    return base.slice(0, -1);
  }
  return base;
 }
@@ -18,7 +18,7 @@ import useAppSettingsNavigation from './useAppSettingsNavigation';
 import style from './AppSettings.module.scss';
 export default function AppSettings() {
-  const { close, panel, location } = useAppSettingsNavigation();
+  const { close, panel, location, setLocation } = useAppSettingsNavigation();
  useKeyDown(close, 'Escape');
  return (
@@ -26,7 +26,7 @@ export default function AppSettings() {
      <ErrorBoundary>
        <PanelList selectedPanel={panel} location={location} />
        <PanelContent onClose={close}>
-          {panel === 'project' && <ProjectPanel location={location} />}
+          {panel === 'project' && <ProjectPanel location={location} setLocation={setLocation} />}
          {panel === 'general' && <GeneralPanel location={location} />}
          {panel === 'feature_settings' && <FeatureSettingsPanel location={location} />}
          {panel === 'sources' && <SourcesPanel />}
@@ -40,12 +40,16 @@ ul {
    background-color: $gray-1100;
  }
-  &.unsaved::before {
+  &.highlight {
-    content: '';
+    color: $red-400;
-    width: 6px;
+
-    height: 6px;
+    &::before {
-    border-radius: 3px;
+      content: '';
-    background-color: $blue-400;
+      width: 0.5em;
      height: 0.5em;
      border-radius: 99px;
      background-color: $red-400;
    }
  }
  &.split {
@@ -1,66 +1,90 @@
 import { Fragment } from 'react';
 import { Tooltip } from '@chakra-ui/react';
 import { isKeyEnter } from '../../../common/utils/keyEvent';
 import { cx } from '../../../common/utils/styleUtils';
-import { PanelBaseProps, settingPanels, useSettingsStore } from '../settingsStore';
+import { tooltipDelayFast } from '../../../ontimeConfig';
 import { SettingsOption, SettingsOptionId, useAppSettingsMenu } from '../useAppSettingsMenu';
 import useAppSettingsNavigation from '../useAppSettingsNavigation';
 import style from './PanelList.module.scss';
 export interface PanelBaseProps {
  location?: string;
 }
 interface PanelListProps extends PanelBaseProps {
  selectedPanel: string;
 }
 export default function PanelList({ selectedPanel, location }: PanelListProps) {
-  const { setLocation } = useAppSettingsNavigation();
+  const { options } = useAppSettingsMenu();
  const { hasUnsavedChanges } = useSettingsStore();
  return (
    <ul className={style.tabs}>
-      {settingPanels.map((panel) => {
+      {options.map((panel) => {
-        const unsaved = hasUnsavedChanges(panel.id);
+        const isSelected = selectedPanel === panel.id;
-
+        if (panel.highlight) {
-        const classes = cx([
+          return (
-          style.primary,
+            <Tooltip key={panel.id} label={panel.highlight} openDelay={tooltipDelayFast} shouldWrapChildren>
-          selectedPanel === panel.id ? style.active : null,
+              <PanelListItem panel={panel} location={location} isSelected={isSelected} />
-          panel.split ? style.split : null,
+            </Tooltip>
-          unsaved ? style.unsaved : null,
+          );
-        ]);
+        }
-
+        return <PanelListItem key={panel.id} panel={panel} location={location} isSelected={isSelected} />;
        return (
          <Fragment key={panel.id}>
            <li
              key={panel.id}
              onClick={() => setLocation(panel.id)}
              onKeyDown={(event) => {
                isKeyEnter(event) && setLocation(panel.id);
              }}
              className={classes}
              tabIndex={0}
              role='button'
            >
              {panel.label}
            </li>
            {panel.secondary?.map((secondary) => {
              const id = secondary.id.split('__')[1];
              const secondaryClasses = cx([style.secondary, location === id ? style.active : null]);
              return (
                <li
                  key={secondary.id}
                  onClick={() => setLocation(secondary.id)}
                  onKeyDown={(event) => {
                    isKeyEnter(event) && setLocation(secondary.id);
                  }}
                  className={secondaryClasses}
                  role='button'
                >
                  {secondary.label}
                </li>
              );
            })}
          </Fragment>
        );
      })}
    </ul>
  );
 }
 interface PanelListItemProps {
  panel: SettingsOption;
  isSelected: boolean;
  location?: string;
 }
 function PanelListItem(props: PanelListItemProps) {
  const { panel, isSelected, location } = props;
  const { setLocation } = useAppSettingsNavigation();
  const classes = cx([
    style.primary,
    isSelected && style.active,
    panel.split && style.split,
    panel.highlight && style.highlight,
  ]);
  return (
    <Fragment key={panel.id}>
      <li
        key={panel.id}
        onClick={() => setLocation(panel.id as SettingsOptionId)}
        onKeyDown={(event) => {
          isKeyEnter(event) && setLocation(panel.id as SettingsOptionId);
        }}
        className={classes}
        tabIndex={0}
        role='button'
      >
        {panel.label}
      </li>
      {panel.secondary?.map((secondary) => {
        const id = secondary.id.split('__')[1];
        const secondaryClasses = cx([style.secondary, isSelected && location === id ? style.active : null]);
        return (
          <li
            key={secondary.id}
            onClick={() => setLocation(secondary.id as SettingsOptionId)}
            onKeyDown={(event) => {
              isKeyEnter(event) && setLocation(secondary.id as SettingsOptionId);
            }}
            className={secondaryClasses}
            role='button'
          >
            {secondary.label}
          </li>
        );
      })}
    </Fragment>
  );
 }
@@ -26,15 +26,24 @@ $inner-padding: 1rem;
  color: $gray-300;
 }
-.section {
+.section, .indent {
  position: relative;
  margin-top: 2rem;
  font-size: calc(1rem - 1px);
  max-width: 800px;
  display: flex;
  flex-direction: column;
  gap: 1rem;
  color: $ui-white;
 }
 .section {
  position: relative;
  margin-top: 2rem;
  max-width: 800px;
 }
 .indent {
  padding: 1rem;
  background-color: $gray-1350;
 }
 .paragraph {
@@ -49,6 +58,18 @@ $inner-padding: 1rem;
  border-radius: 3px;
 }
 .highlight {
  font-size: calc(1rem - 2px);
  color: $orange-500;
  padding-inline: 0.25rem;
 }
 .blockquote {
  padding-left: 0.5rem;
  border-left: 2px solid $gray-100;
  background-color: $white-3;
 }
 .error {
  font-size: $inner-section-text-size;
  display: block;
@@ -72,7 +93,6 @@ $inner-padding: 1rem;
    position: sticky;
    top: 0;
    z-index: 3;
    box-shadow: 0 1px $white-10;
    background-color: $gray-1350;
  }
@@ -151,6 +171,40 @@ $inner-padding: 1rem;
  animation: animloader 1s ease-in infinite;
 }
 .empty {
  background-color: $black-10;
  text-align: center;
  color: $muted-gray;
  td {
    padding: 2rem;
  }
  button {
    margin-top: 1rem;
  }
 }
 .inlineSiblings {
  display: flex;
  align-items: center;
  gap: 1rem;
 }
 .empty {
  background-color: $black-10;
  text-align: center;
  color: $muted-gray;
  td {    
    padding: 2rem;
  }
  button {
    margin-top: 1rem;
  }
 }
@keyframes animloader {
  0% {
    transform: scale(0);
@@ -1,8 +1,10 @@
 import { HTMLAttributes, ReactNode } from 'react';
 import { Button } from '@chakra-ui/react';
 import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
 import { cx } from '../../../common/utils/styleUtils';
-import style from './Panel.module.scss';
+import style from './PanelUtils.module.scss';
 export function Header({ children }: { children: ReactNode }) {
  return <h2 className={style.header}>{children}</h2>;
@@ -22,10 +24,19 @@ type SectionProps<C extends AllowedTags> = {
  children: ReactNode;
 } & JSX.IntrinsicElements[C];
-export function Section<C extends AllowedTags = 'div'>({ as, children, ...props }: SectionProps<C>) {
+export function Section<C extends AllowedTags = 'div'>({ as, className, children, ...props }: SectionProps<C>) {
  const Element = as ?? 'div';
  return (
-    <Element className={style.section} {...(props as HTMLAttributes<HTMLElement>)}>
+    <Element className={cx([style.section, className])} {...(props as HTMLAttributes<HTMLElement>)}>
      {children}
    </Element>
  );
 }
 export function Indent<C extends AllowedTags = 'div'>({ as, className, children, ...props }: SectionProps<C>) {
  const Element = as ?? 'div';
  return (
    <Element className={cx([style.indent, className])} {...(props as HTMLAttributes<HTMLElement>)}>
      {children}
    </Element>
  );
@@ -35,9 +46,9 @@ export function Paragraph({ children }: { children: ReactNode }) {
  return <p className={style.paragraph}>{children}</p>;
 }
-export function Card({ children, ...props }: { children: ReactNode } & JSX.IntrinsicElements['div']) {
+export function Card({ children, className, ...props }: { children: ReactNode } & JSX.IntrinsicElements['div']) {
  return (
-    <div className={style.card} {...props}>
+    <div className={cx([style.card, className])} {...props}>
      {children}
    </div>
  );
@@ -52,8 +63,21 @@ export function Table({ className, children }: { className?: string; children: R
  );
 }
-export function ListGroup({ children }: { children: ReactNode }) {
+export function TableEmpty({ handleClick }: { handleClick: () => void }) {
-  return <ul className={style.listGroup}>{children}</ul>;
+  return (
    <tr className={style.empty}>
      <td colSpan={99}>
        <div>No data yet</div>
        <Button onClick={handleClick} variant='ontime-subtle' rightIcon={<IoAdd />} size='sm'>
          New
        </Button>
      </td>
    </tr>
  );
 }
 export function ListGroup({ className, children }: { className?: string; children: ReactNode }) {
  return <ul className={cx([style.listGroup, className])}>{children}</ul>;
 }
 export function ListItem({ children }: { children: ReactNode }) {
@@ -74,6 +98,14 @@ export function Description({ children }: { children: ReactNode }) {
  return <div className={style.fieldDescription}>{children}</div>;
 }
 export function Highlight({ children }: { children: ReactNode }) {
  return <code className={style.highlight}>{children}</code>;
 }
 export function BlockQuote({ children }: { children: ReactNode }) {
  return <blockquote className={style.blockquote}>{children}</blockquote>;
 }
 export function Error({ children }: { children: ReactNode }) {
  return <div className={style.fieldError}>{children}</div>;
 }
@@ -1,9 +1,8 @@
 import { version } from '../../../../../package.json';
 import ExternalLink from '../../../../common/components/external-link/ExternalLink';
-import { documentationUrl, githubUrl, websiteUrl } from '../../../../externals';
+import { discordUrl, documentationUrl, githubUrl, websiteUrl } from '../../../../externals';
-import * as Panel from '../PanelUtils';
+import * as Panel from '../../panel-utils/PanelUtils';
-import CheckUpdatesButton from './CheckUpdatesButton';
+import AppVersion from './AppVersion';
 export default function AboutPanel() {
  return (
@@ -20,11 +19,11 @@ export default function AboutPanel() {
        <Panel.SubHeader>Links</Panel.SubHeader>
        <ExternalLink href={documentationUrl}>Read the docs</ExternalLink>
        <ExternalLink href={githubUrl}>Follow the project on GitHub</ExternalLink>
        <ExternalLink href={discordUrl}>Discord server</ExternalLink>
      </Panel.Section>
      <Panel.Section>
        <Panel.SubHeader>Current version</Panel.SubHeader>
-        <Panel.Paragraph>{`You are currently using Ontime ${version}`}</Panel.Paragraph>
+        <AppVersion />
        <CheckUpdatesButton version={version} />
      </Panel.Section>
    </>
  );
@@ -0,0 +1,31 @@
 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';
 export default function AppVersion() {
  const { data, isError } = useAppVersion();
  if (isError) {
    return (
      <Panel.Paragraph>
        {`You are currently using Ontime version ${appVersion}`}
        <Panel.Error>{`Could not fetch version information: ${isError}`}</Panel.Error>
      </Panel.Paragraph>
    );
  }
  if (data.hasUpdates) {
    return (
      <>
        <Panel.Paragraph>{`You are currently using Ontime version ${appVersion}.`}</Panel.Paragraph>
        <Panel.Paragraph>
          {`A new version ${data.version} is available.`}
          <ExternalLink href={data.url}> Please visit the release page to download</ExternalLink>
        </Panel.Paragraph>
      </>
    );
  }
  return <Panel.Paragraph>{`You are currently using the latest version of Ontime: ${appVersion}`}</Panel.Paragraph>;
 }
@@ -1,80 +0,0 @@
 import { useState } from 'react';
 import { Button } from '@chakra-ui/react';
 import { getLatestVersion, HasUpdate } from '../../../../common/api/external';
 import ExternalLink from '../../../../common/components/external-link/ExternalLink';
 import style from '../Panel.module.scss';
 type CheckFail = {
  error: string;
 };
 type CheckIsLatest = {
  latest: true;
 };
 type CheckRemote = CheckFail | CheckIsLatest | HasUpdate;
 interface CheckUpdatesButtonProps {
  version: string;
 }
 export default function CheckUpdatesButton(props: CheckUpdatesButtonProps) {
  const { version } = props;
  const [updateMessage, setUpdateMessage] = useState<CheckRemote | null>(null);
  const [isFetching, setIsFetching] = useState(false);
  /**
   * Handles version comparison and returns component with message
   */
  const versionCheck = async () => {
    setIsFetching(true);
    try {
      const latest = await getLatestVersion();
      if (!latest.version.includes(version)) {
        // new version, pass data to component
        setUpdateMessage(latest);
      } else {
        setUpdateMessage({ latest: true });
      }
    } catch {
      setUpdateMessage({ error: 'Error reaching server' });
    } finally {
      setIsFetching(false);
    }
  };
  const disableButton = Boolean(updateMessage && 'version' in updateMessage);
  return (
    <>
      <Button
        onClick={versionCheck}
        variant='ontime-filled'
        isLoading={isFetching}
        isDisabled={disableButton}
        size='sm'
        maxWidth='max-content'
      >
        Check for updates
      </Button>
      <ResolveUpdateMessage updateMessage={updateMessage} />
    </>
  );
 }
 function ResolveUpdateMessage(props: { updateMessage: CheckRemote | null }) {
  const { updateMessage } = props;
  if (updateMessage && 'error' in updateMessage) {
    return <span className={style.error}>{updateMessage.error}</span>;
  }
  if (updateMessage && 'url' in updateMessage) {
    return <ExternalLink href={updateMessage?.url}>{`New version available: ${updateMessage.version}`}</ExternalLink>;
  }
  return null;
 }
@@ -1,4 +1,4 @@
-import * as Panel from '../PanelUtils';
+import * as Panel from '../../panel-utils/PanelUtils';
 import ClientList from './ClientList';
@@ -5,7 +5,7 @@ import { RedirectClientModal } from '../../../../common/components/client-modal/
 import { RenameClientModal } from '../../../../common/components/client-modal/RenameClientModal';
 import { setClientRemote } from '../../../../common/hooks/useSocket';
 import { useClientStore } from '../../../../common/stores/clientStore';
-import * as Panel from '../PanelUtils';
+import * as Panel from '../../panel-utils/PanelUtils';
 import style from './ClientControlPanel.module.scss';
@@ -74,7 +74,7 @@ export default function ClientList() {
                    )}
                    {name}
                  </td>
-                  {isCurrent ? <td /> : <td className={style.pathList}>{path}</td>}
+                  <td className={style.pathList}>{path}</td>
                  <td className={style.actionButtons}>
                    <Button
                      size='xs'
@@ -1,3 +1,7 @@
 .halfWidth {
  width: 50%;
 }
 .fullWidth {
  width: 100%;
 }
@@ -37,3 +41,9 @@
 .flex {
  display: flex;
 }
 .twoCols {
  display: grid;
  grid-template-columns: 1fr 1fr;
  gap: 1rem;
 }
@@ -1,6 +1,6 @@
 import useScrollIntoView from '../../../../common/hooks/useScrollIntoView';
-import { PanelBaseProps } from '../../settingsStore';
+import type { PanelBaseProps } from '../../panel-list/PanelList';
-import * as Panel from '../PanelUtils';
+import * as Panel from '../../panel-utils/PanelUtils';
 import CustomFields from './custom-fields/CustomFields';
 import UrlPresetsForm from './UrlPresetsForm';
@@ -13,7 +13,7 @@ import ExternalLink from '../../../../common/components/external-link/ExternalLi
 import useUrlPresets from '../../../../common/hooks-query/useUrlPresets';
 import { handleLinks } from '../../../../common/utils/linkUtils';
 import { validateUrlPresetPath } from '../../../../common/utils/urlPresets';
-import * as Panel from '../PanelUtils';
+import * as Panel from '../../panel-utils/PanelUtils';
 import style from './FeatureSettings.module.scss';
@@ -33,7 +33,7 @@ export default function UrlPresetsForm() {
    setError,
    formState: { isSubmitting, isDirty, isValid, errors },
  } = useForm<FormData>({
-    mode: 'onBlur',
+    mode: 'onChange',
    defaultValues: { data },
    values: { data },
    resetOptions: {
@@ -78,7 +78,7 @@ export default function UrlPresetsForm() {
  const addNew = () => {
    prepend({
-      enabled: false,
+      enabled: true,
      alias: '',
      pathAndParams: '',
    });
@@ -105,12 +105,25 @@ export default function UrlPresetsForm() {
        <Alert status='info' variant='ontime-on-dark-info'>
          <AlertIcon />
          <AlertDescription>
-            URL Presets
+            URL presets are user defined aliases to Ontime URLs
            <br />
            <br />
-            Custom presets allow providing a short name for any ontime URL. <br />
+            <b>Preset Name</b> <br />
-            - Providing dynamic URLs for automation or unattended screens <br />- Simplifying complex URLs
+            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>
@@ -130,15 +143,20 @@ export default function UrlPresetsForm() {
            <thead>
              <tr>
                <th className={style.fit}>Active</th>
-                <th className={style.aliasConstrain}>Preset</th>
+                <th className={style.aliasConstrain}>Preset name</th>
-                <th className={style.fullWidth}>URL</th>
+                <th className={style.fullWidth}>URL segment</th>
                <th />
              </tr>
            </thead>
            <tbody>
              {fields.length === 0 && <Panel.TableEmpty handleClick={addNew} />}
              {fields.map((preset, index) => {
                const maybeAliasError = errors.data?.[index]?.alias?.message;
                const maybeUrlError = errors.data?.[index]?.pathAndParams?.message;
                // only saved and enabled URLs can be tested
                const canTest =
                  preset.alias && preset.enabled && preset.pathAndParams && !maybeAliasError && !maybeUrlError;
                return (
                  <tr key={preset.id}>
                    <td className={style.fit}>
@@ -177,6 +195,7 @@ export default function UrlPresetsForm() {
                    <td className={style.flex}>
                      <TooltipActionBtn
                        size='sm'
                        isDisabled={!canTest}
                        clickHandler={(event) => handleLinks(event, preset.alias)}
                        tooltip='Test preset'
                        aria-label='Test preset'
@@ -4,6 +4,7 @@ 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 CustomFieldForm from './CustomFieldForm';
@@ -36,6 +37,7 @@ export default function CustomFieldEntry(props: CustomFieldEntryProps) {
            onSubmit={handleEdit}
            initialColour={colour}
            initialLabel={label}
            initialKey={field}
          />
        </td>
      </tr>
@@ -47,7 +49,12 @@ export default function CustomFieldEntry(props: CustomFieldEntryProps) {
      <td>
        <Swatch color={colour} />
      </td>
-      <td className={style.fullWidth}>{label}</td>
+      <td className={style.halfWidth}>{label}</td>
      <td className={style.fullWidth}>
        <CopyTag label='Copy key to use in integrations' copyValue={field}>
          {field}
        </CopyTag>
      </td>
      <td className={style.actions}>
        <IconButton
          size='sm'
@@ -2,11 +2,12 @@ import { useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { Button, Input } from '@chakra-ui/react';
 import { CustomField } from 'ontime-types';
-import { isAlphanumeric } from 'ontime-utils';
+import { customFieldLabelToKey, isAlphanumericWithSpace } from 'ontime-utils';
 import { maybeAxiosError } from '../../../../../common/api/utils';
 import SwatchSelect from '../../../../../common/components/input/colour-input/SwatchSelect';
-import * as Panel from '../../PanelUtils';
+import useCustomFields from '../../../../../common/hooks-query/useCustomFields';
 import * as Panel from '../../../panel-utils/PanelUtils';
 import style from '../FeatureSettings.module.scss';
@@ -15,10 +16,13 @@ interface CustomFieldsFormProps {
  onCancel: () => void;
  initialColour?: string;
  initialLabel?: string;
  initialKey?: string;
 }
 export default function CustomFieldForm(props: CustomFieldsFormProps) {
-  const { onSubmit, onCancel, initialColour, initialLabel } = props;
+  const { onSubmit, onCancel, initialColour, initialLabel, initialKey } = props;
  const { data } = useCustomFields();
  // we use this to force an update
  const [_, setColour] = useState(initialColour || '');
@@ -31,7 +35,7 @@ export default function CustomFieldForm(props: CustomFieldsFormProps) {
    getValues,
    formState: { errors, isSubmitting, isValid, isDirty },
  } = useForm({
-    defaultValues: { label: initialLabel || '', colour: initialColour || '' },
+    defaultValues: { label: initialLabel || '', colour: initialColour || '', key: initialKey || '' },
    resetOptions: {
      keepDirtyValues: true,
    },
@@ -63,31 +67,45 @@ export default function CustomFieldForm(props: CustomFieldsFormProps) {
  const colour = getValues('colour');
  const canSubmit = isDirty && isValid;
  // if initial values are given, we can assume we are in edit mode
  const isEditMode = initialKey !== undefined;
  return (
    <form onSubmit={handleSubmit(setupSubmit)} className={style.fieldForm}>
-      <div className={style.column}>
+      <div className={style.twoCols}>
-        <Panel.Description>Label (only alphanumeric characters are allowed)</Panel.Description>
+        <div>
-        {errors.label && <Panel.Error>{errors.label.message}</Panel.Error>}
+          <Panel.Description>Label (only alphanumeric characters are allowed)</Panel.Description>
-        <Input
+          {errors.label && <Panel.Error>{errors.label.message}</Panel.Error>}
-          {...register('label', {
+          <Input
-            required: { value: true, message: 'Required field' },
+            {...register('label', {
-            validate: (value) => {
+              required: { value: true, message: 'Required field' },
-              if (value.trim().length === 0) return 'Required field';
+              onChange: () => setValue('key', customFieldLabelToKey(getValues('label')) ?? 'N/A'),
-              if (!isAlphanumeric(value)) return 'Only alphanumeric characters are allowed';
+              validate: (value) => {
-              return true;
+                if (value.trim().length === 0) return 'Required field';
-            },
+                if (!isAlphanumericWithSpace(value)) return 'Only alphanumeric characters and space are allowed';
-          })}
+                if (!isEditMode) {
-          size='sm'
+                  if (isEditMode && Object.keys(data).includes(value)) return 'Custom fields must be unique';
-          variant='ontime-filled'
+                }
-          autoComplete='off'
+                return true;
-        />
+              },
            })}
            size='sm'
            variant='ontime-filled'
            autoComplete='off'
          />
        </div>
        <div>
          <Panel.Description>Key (use in Integrations and API)</Panel.Description>
          <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>}
      <div className={style.buttonRow}>
        <Button size='sm' variant='ontime-ghosted' onClick={onCancel}>
--- a/Show More
+++ b/Show More
`@@ -1,4 +1,4 @@`
	`import * as Panel from '../PanelUtils';`	`import * as Panel from '../../panel-utils/PanelUtils';`

	`import ClientList from './ClientList';`	`import ClientList from './ClientList';`