fix: ignore 0 duration events

fix: issue with roll evaluating multiple days
2026-09-09 16:19:47 +00:00 · 2024-09-04 20:29:43 +02:00 · 2024-09-04 20:29:38 +02:00
259 changed files with 2778 additions and 5093 deletions
@@ -40,6 +40,9 @@ dist/
 ontime-db
 ontime-external/

+# working database
+apps/server/src/preloaded-db/db.json
+
 # versioning file
 **/ONTIME_VERSION.js

@@ -23,7 +23,6 @@ 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
@@ -33,4 +32,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:/data/ 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
@@ -14,10 +14,8 @@
 - Download AppImage for <a href="https://github.com/cpvalente/ontime/releases/latest/download/ontime-linux.AppImage">Linux</a>
 - Get from <a href="https://hub.docker.com/r/getontime/ontime">Docker hub</a>

-## Need help?
-We do our best to have most topics covered by the documentation. However, if your question is not covered, you are welcome to [fill in a bug report in an issue](https://github.com/cpvalente/ontime/issues), [ask a question in GitHub discussions](https://github.com/cpvalente/ontime/discussions) or hop in the [discord server](https://discord.com/invite/eje3CSUEXm) for a chat.
-
 ## Using Ontime?
+
 Let us know!
 Ontime improves from the collaboration with its users. We would like to understand how you use Ontime and appreciate your feedback.

@@ -37,16 +35,6 @@ Ontime is made by entertainment and broadcast engineers and used by
 - Theatres and opera houses
 - Houses of worship

-## Main features
- [x] **Multiplatform**: Available for Windows / MacOS, Linux. You can also self host with the docker image
- [x] **In any device**: Ontime is available in the local network to any device with a browser, eg: tablets, mobile phones, laptops, signage, media servers...
- [x] **Made for teams**: Ontime caters to different roles in your production team: directors, operators, backstage and front of house signage...
- [x] **Delay workflows**: Manage and communicate runtime delays in real-time to your team
- [x] **Automatable**: Ontime can be fully or partially controlled by an operator, or run standalone with the system clock
- [x] **Focus on integrations**: Use one of the APIs provided (OSC, HTTP, Websocket) or the available [Companion module](https://bitfocus.io/connections/getontime-ontime) to integrate into your workflow (vMix, disguise, Qlab, OBS)
-
-... and a lot more ...
-
 ### For live environments

 Ontime is designed for use in live environments. \
@@ -95,7 +83,6 @@ IP.ADDRESS:4001/clock      > Simple clock view
 IP.ADDRESS:4001/backstage  > Stage Manager / Backstage view
 IP.ADDRESS:4001/countdown  > Countdown to anything
 IP.ADDRESS:4001/studio     > Studio Clock
-IP.ADDRESS:4001/timeline   > Timeline
 ```

 ```
@@ -113,13 +100,26 @@ IP.ADDRESS:4001/cuesheet  > realtime cuesheets for collaboration
 IP.ADDRESS:4001/operator  > automated views for operators
 ```

-More information is available [in our docs](https://docs.getontime.no)
+More documentation is available [in our docs](https://docs.getontime.no)
+
+## Main features
+
+- [x] Distribute data over network and render it in the browser
+- [x] Collaborative
+- [x] Extendable
+- [x] Send messages to different screen types
+- [x] Differentiate between backstage and public data
+- [x] Workflow for managing delays
+- [x] Rich protocol integrations for Control and Feedback
+- [x] For servers: use docker to run Ontime in in a server, configure from a browser anywhere
+- [x] Multi-platform (available on Windows, MacOS and Linux)
+- [x] Companion integration [follow link](https://bitfocus.io/connections/getontime-ontime)

 ## Roadmap

 ### Continued development

-Ontime is under active development. We continue adding and improving features in collaboration with users.
+Ontime is under active development. We continue adding and tweaking features in collaboration with users.

 Have an idea? Reach out via [email](mail@getontime.no)
 or [open an issue](https://github.com/cpvalente/ontime/issues/new)
@@ -161,9 +161,8 @@ If you are a developer and would like to contribute with code, please open an is
 Information about the project setup can be found in the [development documentation](./DEVELOPMENT.md)

 ## Links
- [Ontime website](https://getontime.no) 
- [Documentation](https://docs.getontime.no)
- [Ontime discord server](https://discord.com/invite/eje3CSUEXm)
+
+See the [Ontime website](https://getontime.no) here and the link to the [documentation](https://docs.getontime.no)

 ## License

@@ -1,6 +1,6 @@
 {
    "name": "@getontime/cli",
-    "version": "3.7.1",
+    "version": "3.5.0",
    "author": "Carlos Valente",
    "description": "Time keeping for live events",
    "repository": "https://github.com/cpvalente/ontime",
@@ -1,6 +1,6 @@
 {
  "name": "ontime-ui",
-  "version": "3.7.1",
+  "version": "3.5.0",
  "private": true,
  "type": "module",
  "dependencies": {
@@ -11,7 +11,7 @@
    "@emotion/react": "^11.10.6",
    "@emotion/styled": "^11.10.6",
    "@fontsource/open-sans": "^5.0.28",
-    "@mantine/hooks": "^7.13.3",
+    "@mantine/hooks": "^7.6.2",
    "@react-icons/all-files": "^4.1.0",
    "@sentry/react": "^8.19.0",
    "@tanstack/react-query": "^5.17.9",
@@ -26,7 +26,7 @@
    "react-colorful": "^5.6.1",
    "react-dom": "^18.3.1",
    "react-fast-compare": "^3.2.2",
-    "react-hook-form": "^7.53.1",
+    "react-hook-form": "^7.49.2",
    "react-qr-code": "^2.0.12",
    "react-router-dom": "^6.3.0",
    "web-vitals": "^3.1.1",
@@ -14,7 +14,6 @@ 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';

@@ -28,7 +27,7 @@ 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('./views/timeline/TimelinePage'));
+const Timeline = React.lazy(() => import('./features/viewers/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'));
@@ -76,72 +75,16 @@ export default function AppRouter() {
    <React.Suspense fallback={null}>
      <SentryRoutes>
        <Route path='/' element={<Navigate to='/timer' />} />
-        <Route
-          path='/timer'
-          element={
-            <ViewLoader>
-              <STimer />
-            </ViewLoader>
-          }
-        />
-        <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='/timer' element={<STimer />} />
+        <Route path='/public' element={<SPublic />} />
+        <Route path='/minimal' element={<SMinimalTimer />} />
+        <Route path='/clock' element={<SClock />} />
+
+        <Route path='/countdown' element={<SCountdown />} />
+        <Route path='/backstage' element={<SBackstage />} />
+        <Route path='/studio' element={<SStudio />} />
        <Route path='/lower' element={<SLowerThird />} />
-        <Route
-          path='/timeline'
-          element={
-            <ViewLoader>
-              <STimeline />
-            </ViewLoader>
-          }
-        />
+        <Route path='/timeline' element={<STimeline />} />

        {/*/!* Protected Routes *!/*/}
        <Route path='/editor' element={<Editor />} />
@@ -1,7 +1,6 @@
 // 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'];
@@ -19,7 +18,6 @@ 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;
@@ -33,6 +31,5 @@ export const projectDataURL = `${serverURL}/project`;
 export const rundownURL = `${serverURL}/events`;
 export const ontimeURL = `${serverURL}/ontime`;

-export const userAssetsPath = 'user';
-export const cssOverridePath = 'styles/override.css';
-export const overrideStylesURL = `${serverURL}/${userAssetsPath}/${cssOverridePath}`;
+export const stylesPath = 'external/styles/override.css';
+export const overrideStylesURL = `${serverURL}/${stylesPath}`;
@@ -1,5 +1,5 @@
 import axios, { AxiosResponse } from 'axios';
-import { DatabaseModel, MessageResponse, ProjectData, ProjectFileListResponse, QuickStartData } from 'ontime-types';
+import { DatabaseModel, GetInfo, MessageResponse, ProjectData, ProjectFileListResponse } from 'ontime-types';

 import { makeCSV, makeTable } from '../../features/cuesheet/cuesheetUtils';

@@ -86,14 +86,6 @@ 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
 */
@@ -146,6 +138,14 @@ 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,14 +0,0 @@
-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,8 +23,6 @@ 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;
-  @include rotate-fourty-five;
+  transform: rotate(45deg);
 }
@@ -0,0 +1,6 @@
+.buttonSection {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: $element-spacing;
+  margin-top: -$element-spacing;
+}
@@ -15,6 +15,8 @@ import {

 import { setClientRemote } from '../../hooks/useSocket';

+import style from './ClientModal.module.scss';
+
 interface RedirectClientModalProps {
  id: string;
  name?: string;
@@ -52,12 +54,14 @@ export function RedirectClientModal(props: RedirectClientModalProps) {
          </InputGroup>
        </ModalBody>
        <ModalFooter>
-          <Button size='md' variant='ontime-subtle' onClick={onClose}>
-            Cancel
-          </Button>
-          <Button size='md' variant='ontime-filled' onClick={handleRedirect} isDisabled={!canSubmit}>
-            Submit
-          </Button>
+          <div className={style.buttonSection}>
+            <Button size='md' variant='ontime-subtle' onClick={onClose}>
+              Cancel
+            </Button>
+            <Button size='md' variant='ontime-filled' onClick={handleRedirect} isDisabled={!canSubmit}>
+              Submit
+            </Button>
+          </div>
        </ModalFooter>
      </ModalContent>
    </Modal>
@@ -13,6 +13,8 @@ import {

 import { setClientRemote } from '../../hooks/useSocket';

+import style from './ClientModal.module.scss';
+
 interface RenameClientModalProps {
  id: string;
  name?: string;
@@ -51,12 +53,14 @@ export function RenameClientModal(props: RenameClientModalProps) {
          />
        </ModalBody>
        <ModalFooter>
-          <Button size='md' variant='ontime-subtle' onClick={onClose}>
-            Cancel
-          </Button>
-          <Button size='md' variant='ontime-filled' onClick={handleRename} isDisabled={!canSubmit}>
-            Submit
-          </Button>
+          <div className={style.buttonSection}>
+            <Button size='md' variant='ontime-subtle' onClick={onClose}>
+              Cancel
+            </Button>
+            <Button size='md' variant='ontime-filled' onClick={handleRename} isDisabled={!canSubmit}>
+              Submit
+            </Button>
+          </div>
        </ModalFooter>
      </ModalContent>
    </Modal>
@@ -1,6 +1,5 @@
-import { PropsWithChildren, useState } from 'react';
+import { PropsWithChildren } 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';
@@ -8,34 +7,26 @@ 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 { copyValue, label, size = 'xs', disabled, children, onClick } = props;
-  const [copied, setCopied] = useState(false);
+  const { label, className, size = 'xs', disabled, children } = props;

-  const handleClick = () => {
-    copyToClipboard(copyValue);
-    setCopied(true);
-
-    // reset copied state
-    setTimeout(() => setCopied(false), 1000);
-  };
+  const handleClick = () => copyToClipboard(children as string);

  return (
    <Tooltip label={label} openDelay={tooltipDelayFast}>
-      <ButtonGroup size={size} isAttached>
-        <Button variant='ontime-subtle' tabIndex={-1} onClick={onClick} isDisabled={disabled}>
+      <ButtonGroup size={size} isAttached className={className}>
+        <Button variant='ontime-subtle' tabIndex={-1} isDisabled={disabled}>
          {children}
        </Button>
        <IconButton
          aria-label={label}
-          icon={copied ? <IoCheckmark /> : <IoCopy />}
+          icon={<IoCopy />}
          variant='ontime-filled'
          tabIndex={-1}
          onClick={handleClick}
@@ -1,63 +0,0 @@
-/**
- * Copied from
- * https://github.com/namhong2001/react-textfit/blob/master/index.tsx
- */
-
-import { HTMLAttributes, PropsWithChildren, useCallback, useEffect, useRef } from 'react';
-
-import { bsearch } from './fitText.utils';
-
-interface FitTextProps extends HTMLAttributes<HTMLDivElement> {
-  mode?: 'single' | 'multi';
-  min?: number; // inclusive
-  max?: number; // inclusive
-}
-
-export function FitText(props: PropsWithChildren<FitTextProps>) {
-  const { children, mode = 'multi', min = 16, max = 256, ...elementProps } = props;
-  const ref = useRef<HTMLDivElement>(null);
-
-  const isOverflown = useCallback(() => {
-    const el = ref.current;
-    if (!el) return false;
-    return el.scrollHeight > el.clientHeight || el.scrollWidth > el.clientWidth;
-  }, []);
-
-  const setFontSize = useCallback(() => {
-    const el = ref.current;
-    if (!el) return;
-
-    const originVisibility = el.style.visibility;
-
-    el.style.visibility = 'hidden';
-    const fontSize = bsearch(min, max + 1, (mid) => {
-      el.style.fontSize = `${mid}px`;
-      return !isOverflown();
-    });
-    el.style.fontSize = `${fontSize}px`;
-    el.style.visibility = originVisibility;
-  }, [isOverflown, min, max]);
-
-  useEffect(() => {
-    const el = ref.current;
-    if (!el) return;
-
-    setFontSize();
-    const observer = new ResizeObserver(setFontSize);
-    observer.observe(el);
-
-    return () => observer.disconnect();
-  }, [children, mode, setFontSize]);
-
-  return (
-    <div
-      ref={ref}
-      style={{
-        whiteSpace: mode === 'single' ? 'nowrap' : 'normal',
-      }}
-      {...elementProps}
-    >
-      {children}
-    </div>
-  );
-}
@@ -1,18 +0,0 @@
-/**
- * @param low inclusive, must be true on predicate function
- * @param high exclusive,
- * @param predicate predicate function
- */
-export const bsearch = (low: number, high: number, predicate: (mid: number) => boolean): number => {
-  while (low < high) {
-    const mid = Math.floor((low + high) / 2);
-    if (mid === low) break;
-
-    if (predicate(mid)) {
-      low = mid;
-    } else {
-      high = mid;
-    }
-  }
-  return low;
-};
@@ -47,8 +47,6 @@ $button-size: 3rem;
  @include action-link;
  padding: 0.75rem 1.5rem;
  gap: 0.5rem;
-  width: 100%;
-  cursor: pointer;

  &:hover {
    background-color: $menu-hover-bg;
@@ -72,33 +70,9 @@ $button-size: 3rem;

 .linkIcon {
  margin-left: auto;
-  @include rotate-fourty-five;
+  transform: rotate(45deg);
 }

 .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;
-}
@@ -1,6 +1,6 @@
-import { memo, PropsWithChildren, useRef } from 'react';
+import { memo, useRef } from 'react';
 import { createPortal } from 'react-dom';
-import { Link, useLocation } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 import {
  Drawer,
  DrawerBody,
@@ -18,17 +18,11 @@ import { IoLockClosedOutline } from '@react-icons/all-files/io5/IoLockClosedOutl
 import { IoSwapVertical } from '@react-icons/all-files/io5/IoSwapVertical';

 import { navigatorConstants } from '../../../viewerConfig';
-import { isLocalhost, serverPort } from '../../api/constants';
 import useClickOutside from '../../hooks/useClickOutside';
-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, 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';

@@ -46,7 +40,6 @@ function NavigationMenu(props: NavigationMenuProps) {
  const { isOpen: isOpenRename, onOpen: onRenameOpen, onClose: onCloseRename } = useDisclosure();
  const { fullscreen, toggle } = useFullscreen();
  const { toggleMirror } = useViewOptionsStore();
-  const location = useLocation();

  const menuRef = useRef<HTMLDivElement | null>(null);

@@ -57,7 +50,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 maxWidth='22rem'>
+        <DrawerContent>
          <DrawerHeader>
            <DrawerCloseButton size='lg' />
            Ontime
@@ -103,27 +96,39 @@ function NavigationMenu(props: NavigationMenuProps) {
            <hr className={style.separator} />
            <Link
              to='/editor'
+              className={`${style.link} ${location.pathname === '/editor' ? style.current : ''}`}
              tabIndex={0}
-              className={`${style.link} ${location.pathname === '/editor' && style.current}`}
            >
              <IoLockClosedOutline />
              Editor
+              <IoArrowUp className={style.linkIcon} />
            </Link>
-            <ClientLink to='cuesheet' current={location.pathname === '/cuesheet'}>
+            <Link
+              to='/cuesheet'
+              className={`${style.link} ${location.pathname === '/cuesheet' ? style.current : ''}`}
+              tabIndex={0}
+            >
              <IoLockClosedOutline />
              Cuesheet
-            </ClientLink>
-            <ClientLink to='op' current={location.pathname === '/op'}>
+              <IoArrowUp className={style.linkIcon} />
+            </Link>
+            <Link to='/op' className={`${style.link} ${location.pathname === '/op' ? style.current : ''}`} tabIndex={0}>
              <IoLockClosedOutline />
              Operator
-            </ClientLink>
+              <IoArrowUp className={style.linkIcon} />
+            </Link>
            <hr className={style.separator} />
            {navigatorConstants.map((route) => (
-              <ClientLink key={route.url} to={route.url} current={location.pathname === `/${route.url}`}>
+              <Link
+                key={route.url}
+                to={route.url}
+                className={`${style.link} ${route.url === location.pathname ? style.current : undefined}`}
+                tabIndex={0}
+              >
                {route.label}
-              </ClientLink>
+                <IoArrowUp className={style.linkIcon} />
+              </Link>
            ))}
-            {isLocalhost && <OtherAddresses currentLocation={location.pathname} />}
          </DrawerBody>
        </DrawerContent>
      </Drawer>
@@ -132,70 +137,4 @@ 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 = `http://${nif.address}:${serverPort}${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;
-}
-
-function ClientLink(props: PropsWithChildren<ClientLinkProps>) {
-  const { current, to, children } = props;
-  const { isElectron } = useElectronEvent();
-
-  const classes = cx([style.link, current && style.current]);
-
-  if (isElectron) {
-    return (
-      <button className={classes} tabIndex={0} onClick={(event) => handleLinks(event, to)}>
-        {children}
-        <IoArrowUp className={style.linkIcon} />
-      </button>
-    );
-  }
-
-  return (
-    <Link to={`/${to}`} className={classes} tabIndex={0}>
-      {children}
-    </Link>
-  );
-}
-
 export default memo(NavigationMenu);
@@ -1,6 +1,5 @@
 import { PropsWithChildren, useCallback, useContext } from 'react';

-import { isLocalhost } from '../../api/constants';
 import { AppContext } from '../../context/AppContext';

 import PinPage from './PinPage';
@@ -10,6 +9,7 @@ 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 (isLocalhost || hasRelevantAuth()) {
+  if (isLocal || hasRelevantAuth()) {
    // eslint-disable-next-line react/jsx-no-useless-fragment -- trying to make typescript happy
    return <>{children}</>;
  }
@@ -1,27 +0,0 @@
-.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;
-  }
-}
@@ -1,33 +0,0 @@
-import { useState } from 'react';
-
-import PopoverPicker from '../input/popover-picker/PopoverPicker';
-
-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));
-
-  const debouncedChange = (value: string) => {
-    setColour(value);
-  };
-
-  return (
-    <div className={style.inline}>
-      <PopoverPicker color={colour} onChange={debouncedChange} />
-      <input type='hidden' name={name} value={colour} />
-    </div>
-  );
-}
@@ -13,11 +13,9 @@ 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 {
@@ -25,8 +23,8 @@ interface EditFormInputProps {
 }

 export default function ParamInput(props: EditFormInputProps) {
-  const { paramField } = props;
  const [searchParams] = useSearchParams();
+  const { paramField } = props;
  const { id, type, defaultValue } = paramField;

  if (type === 'persist') {
@@ -83,12 +81,6 @@ 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;

@@ -109,21 +101,25 @@ function MultiOption(props: EditFormMultiOptionProps) {
  const { paramField } = props;
  const { id, defaultValue } = paramField;

-  const optionFromParams = searchParams.getAll(id);
-  const [paramState, setParamState] = useState<string[]>(optionFromParams || defaultValue || ['']);
+  const optionFromParams = (searchParams.get(id) ?? '').toLocaleLowerCase();
+  const defaultOptionValue = optionFromParams || defaultValue?.toLocaleLowerCase() || '';
+
+  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} <IoChevronDown style={{ display: 'inline' }} />
+          {paramField.title}
        </MenuButton>
        <MenuList>
          <MenuOptionGroup
            type='checkbox'
-            value={paramState}
-            onChange={(value) => setParamState(Array.isArray(value) ? value : [value])}
+            value={paramState.split('_')}
+            onChange={(value) => {
+              setParamState(typeof value === 'object' ? value.filter((v) => v !== '').join('_') : value);
+            }}
          >
            {Object.values(paramField.values).map((option) => {
              const { value, label } = option;
@@ -19,16 +19,6 @@ 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
 */
@@ -50,33 +40,10 @@ 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) {
-      // 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, value);
-      }
-    }
-  });
-
-  /** 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 {
+    if (typeof value === 'string' && value.length && defaultValues[id] !== value) {
      newSearchParams.set(id, value);
    }
-  }
+  });
  return newSearchParams;
 };

@@ -23,11 +23,10 @@ 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 &
-  (OptionsField | MultiOptionsField | StringField | NumberField | BooleanField | ColourField | PersistedField);
+  (StringField | BooleanField | NumberField | OptionsField | MultiOptionsField | PersistedField);
 export type ViewOption = ParamSection | ParamField;

 /**
@@ -1,33 +0,0 @@
-import { useQuery } from '@tanstack/react-query';
-import { dayInMs } from 'ontime-utils';
-
-import { version } from '../../../../../package.json';
-import { APP_VERSION, isLocalhost } 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/session';
+import { getInfo } from '../api/db';
 import { ontimePlaceholderInfo } from '../models/Info';

 export default function useInfo() {
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useQuery } from '@tanstack/react-query';
 import { NormalisedRundown, OntimeRundown, RundownCached } from 'ontime-types';

@@ -6,8 +6,6 @@ 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 };

@@ -26,9 +24,7 @@ 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>([]);

@@ -41,14 +37,5 @@ 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 };
 }
@@ -1,34 +1,11 @@
-import { useCallback, useEffect } from 'react';
-import { useNavigate } from 'react-router-dom';
+export default function useElectronEvent() {
+  const isElectron = window?.process?.type === 'renderer';

-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);
+  const sendToElectron = (channel: string, args?: string | Record<string, unknown>) => {
+    if (isElectron) {
+      window?.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' });
-      });
-    }
-
-    // Clean the listener after the component is dismounted
-    return () => {
-      ipcRenderer?.removeAllListeners();
-    };
-  }, [isElectron, navigate]);
-}
@@ -1,7 +1,15 @@
 import { useCallback } from 'react';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { isOntimeEvent, OntimeEvent, OntimeRundownEntry, RundownCached } from 'ontime-types';
-import { dayInMs, MILLIS_PER_SECOND, parseUserTime, reorderArray, swapEventData } from 'ontime-utils';
+import { isOntimeEvent, MaybeString, OntimeEvent, OntimeRundownEntry, RundownCached } from 'ontime-types';
+import {
+  dayInMs,
+  getLinkedTimes,
+  getPreviousEventNormal,
+  MILLIS_PER_SECOND,
+  parseUserTime,
+  reorderArray,
+  swapEventData,
+} from 'ontime-utils';

 import { RUNDOWN } from '../api/constants';
 import {
@@ -24,16 +32,7 @@ import { useEditorSettings } from '../stores/editorSettings';
 */
 export const useEventAction = () => {
  const queryClient = useQueryClient();
-  const {
-    defaultPublic,
-    linkPrevious,
-    defaultTimeStrategy,
-    defaultDuration,
-    defaultWarnTime,
-    defaultDangerTime,
-    defaultTimerType,
-    defaultEndAction,
-  } = useEditorSettings();
+  const { defaultPublic, linkPrevious, defaultDuration, defaultWarnTime, defaultDangerTime } = useEditorSettings();

  /**
   * Calls mutation to add new event
@@ -47,17 +46,17 @@ 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;
+      defaultWarnTime: number;
+      defaultDangerTime: number;
    }>;

  /**
@@ -69,12 +68,13 @@ export const useEventAction = () => {

      // ************* CHECK OPTIONS specific to events
      if (isOntimeEvent(newEvent)) {
-        // merge creation time options with event settings
        const applicationOptions = {
          after: options?.after,
          defaultPublic: options?.defaultPublic ?? defaultPublic,
          lastEventId: options?.lastEventId,
          linkPrevious: options?.linkPrevious ?? linkPrevious,
+          defaultWarnTime,
+          defaultDangerTime,
        };

        if (applicationOptions.linkPrevious && applicationOptions?.lastEventId) {
@@ -89,7 +89,6 @@ export const useEventAction = () => {
          }
        }

-        // Override event with options from editor settings
        if (applicationOptions.defaultPublic) {
          newEvent.isPublic = true;
        }
@@ -105,18 +104,6 @@ export const useEventAction = () => {
        if (newEvent.timeWarning === undefined) {
          newEvent.timeWarning = parseUserTime(defaultWarnTime);
        }
-
-        if (newEvent.timerType === undefined) {
-          newEvent.timerType = defaultTimerType;
-        }
-
-        if (newEvent.endAction === undefined) {
-          newEvent.endAction = defaultEndAction;
-        }
-
-        if (newEvent.timeStrategy === undefined) {
-          newEvent.timeStrategy = defaultTimeStrategy;
-        }
      }

      // handle adding options that concern all event type
@@ -130,18 +117,7 @@ export const useEventAction = () => {
        logAxiosError('Failed adding event', error);
      }
    },
-    [
-      _addEventMutation,
-      defaultDangerTime,
-      defaultDuration,
-      defaultEndAction,
-      defaultPublic,
-      defaultTimerType,
-      defaultTimeStrategy,
-      defaultWarnTime,
-      linkPrevious,
-      queryClient,
-    ],
+    [_addEventMutation, defaultDangerTime, defaultDuration, defaultPublic, defaultWarnTime, linkPrevious, queryClient],
  );

  /**
@@ -262,6 +238,44 @@ export const useEventAction = () => {
    [_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],
+  );
+
  /**
   * Calls mutation to edit multiple events
   * @private
@@ -568,6 +582,7 @@ export const useEventAction = () => {
    batchUpdateEvents,
    deleteEvent,
    deleteAllEvents,
+    linkTimer,
    reorderEvent,
    swapEvents,
    updateEvent,
@@ -0,0 +1,159 @@
+import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
+
+export type TLogLevel = 'debug' | 'info' | 'warn' | 'error' | 'none';
+
+export type TOptions = {
+  logLevel?: TLogLevel;
+  maxFontSize?: number;
+  minFontSize?: number;
+  onFinish?: (fontSize: number) => void;
+  onStart?: () => void;
+  resolution?: number;
+};
+
+const LOG_LEVEL: Record<TLogLevel, number> = {
+  debug: 10,
+  info: 20,
+  warn: 30,
+  error: 40,
+  none: 100,
+};
+
+const useFitText = ({
+  logLevel: logLevelOption = 'info',
+  maxFontSize = 100,
+  minFontSize = 20,
+  onFinish,
+  onStart,
+  resolution = 5,
+}: TOptions = {}) => {
+  const logLevel = LOG_LEVEL[logLevelOption];
+
+  const initState = useCallback(() => {
+    return {
+      calcKey: 0,
+      fontSize: maxFontSize,
+      fontSizePrev: minFontSize,
+      fontSizeMax: maxFontSize,
+      fontSizeMin: minFontSize,
+    };
+  }, [maxFontSize, minFontSize]);
+
+  const ref = useRef<HTMLDivElement>(null);
+  const innerHtmlPrevRef = useRef<string | null>();
+  const isCalculatingRef = useRef(false);
+  const [state, setState] = useState(initState);
+  const { calcKey, fontSize, fontSizeMax, fontSizeMin, fontSizePrev } = state;
+
+  // Monitor div size changes and recalculate on resize
+  let animationFrameId: number | null = null;
+  const [ro] = useState(
+    () =>
+      new ResizeObserver(() => {
+        animationFrameId = window.requestAnimationFrame(() => {
+          if (isCalculatingRef.current) {
+            return;
+          }
+          onStart && onStart();
+          isCalculatingRef.current = true;
+          // `calcKey` is used in the dependencies array of
+          // `useIsoLayoutEffect` below. It is incremented so that the font size
+          // will be recalculated even if the previous state didn't change (e.g.
+          // when the text fit initially).
+          setState({
+            ...initState(),
+            calcKey: calcKey + 1,
+          });
+        });
+      }),
+  );
+
+  useEffect(() => {
+    if (ref.current) {
+      ro.observe(ref.current);
+    }
+    return () => {
+      animationFrameId && window.cancelAnimationFrame(animationFrameId);
+      ro.disconnect();
+    };
+  }, [animationFrameId, ro]);
+
+  // Recalculate when the div contents change
+  const innerHtml = ref.current && ref.current.innerHTML;
+  useEffect(() => {
+    if (calcKey === 0 || isCalculatingRef.current) {
+      return;
+    }
+    if (innerHtml !== innerHtmlPrevRef.current) {
+      onStart && onStart();
+      setState({
+        ...initState(),
+        calcKey: calcKey + 1,
+      });
+    }
+    innerHtmlPrevRef.current = innerHtml;
+  }, [calcKey, initState, innerHtml, onStart]);
+
+  // Check overflow and resize font
+  useLayoutEffect(() => {
+    // Don't start calculating font size until the `resizeKey` is incremented
+    // above in the `ResizeObserver` callback. This avoids an extra resize
+    // on initialization.
+    if (calcKey === 0) {
+      return;
+    }
+
+    const isWithinResolution = Math.abs(fontSize - fontSizePrev) <= resolution;
+    const isOverflow =
+      !!ref.current &&
+      (ref.current.scrollHeight > ref.current.offsetHeight || ref.current.scrollWidth > ref.current.offsetWidth);
+    const isFailed = isOverflow && fontSize === fontSizePrev;
+    const isAsc = fontSize > fontSizePrev;
+
+    // Return if the font size has been adjusted "enough" (change within `resolution`)
+    // reduce font size by one increment if it's overflowing.
+    if (isWithinResolution) {
+      if (isFailed) {
+        isCalculatingRef.current = false;
+        if (logLevel <= LOG_LEVEL.info) {
+          console.info(`[use-fit-text] reached \`minFontSize = ${minFontSize}\` without fitting text`);
+        }
+      } else if (isOverflow) {
+        setState({
+          fontSize: isAsc ? fontSizePrev : fontSizeMin,
+          fontSizeMax,
+          fontSizeMin,
+          fontSizePrev,
+          calcKey,
+        });
+      } else {
+        isCalculatingRef.current = false;
+        onFinish && onFinish(fontSize);
+      }
+      return;
+    }
+
+    // Binary search to adjust font size
+    let delta: number;
+    let newMax = fontSizeMax;
+    let newMin = fontSizeMin;
+    if (isOverflow) {
+      delta = isAsc ? fontSizePrev - fontSize : fontSizeMin - fontSize;
+      newMax = Math.min(fontSizeMax, fontSize);
+    } else {
+      delta = isAsc ? fontSizeMax - fontSize : fontSizePrev - fontSize;
+      newMin = Math.max(fontSizeMin, fontSize);
+    }
+    setState({
+      calcKey,
+      fontSize: fontSize + delta / 2,
+      fontSizeMax: newMax,
+      fontSizeMin: newMin,
+      fontSizePrev: fontSize,
+    });
+  }, [calcKey, fontSize, fontSizeMax, fontSizeMin, fontSizePrev, onFinish, ref, resolution]);
+
+  return { fontSize: `${fontSize}%`, ref };
+};
+
+export default useFitText;
@@ -1,4 +1,4 @@
-import { RuntimeStore, SimpleDirection, SimplePlayback, TimerMessage } from 'ontime-types';
+import { RuntimeStore, SimpleDirection, SimplePlayback } from 'ontime-types';

 import { useRuntimeStore } from '../stores/runtime';
 import { socketSendJson } from '../utils/socket';
@@ -28,43 +28,11 @@ export const useOperator = () => {
  return useRuntimeStore(featureSelector);
 };

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

  return useRuntimeStore(featureSelector);
@@ -73,11 +41,8 @@ export const useMessagePreview = () => {
 export const setMessage = {
  timerText: (payload: string) => socketSendJson('message', { timer: { text: payload } }),
  timerVisible: (payload: boolean) => socketSendJson('message', { timer: { visible: payload } }),
-  externalText: (payload: string) => socketSendJson('message', { external: payload }),
  timerBlink: (payload: boolean) => socketSendJson('message', { timer: { blink: payload } }),
  timerBlackout: (payload: boolean) => socketSendJson('message', { timer: { blackout: payload } }),
-  timerSecondary: (payload: TimerMessage['secondarySource']) =>
-    socketSendJson('message', { timer: { secondarySource: payload } }),
 };

 export const usePlaybackControl = () => {
@@ -222,6 +187,15 @@ export const useRuntimePlaybackOverview = () => {
  return useRuntimeStore(featureSelector);
 };

+export const useTimelineOverview = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    plannedStart: state.runtime.plannedStart,
+    plannedEnd: state.runtime.plannedEnd,
+  });
+
+  return useRuntimeStore(featureSelector);
+};
+
 export const useTimelineStatus = () => {
  const featureSelector = (state: RuntimeStore) => ({
    clock: state.clock,
@@ -7,5 +7,5 @@ export const ontimePlaceholderInfo: GetInfo = {
  version: '2.0.0',
  serverPort: 4001,
  osc: oscPlaceholderSettings,
-  publicDir: '',
+  cssOverride: '',
 };
@@ -15,5 +15,4 @@ export type OverridableOptions = {
  language?: string;
  showProgressBar?: boolean;
  hideTimerSeconds?: boolean;
-  removeLeadingZeros?: boolean;
 };
@@ -1,5 +1,3 @@
-import { EndAction, TimerType, TimeStrategy } from 'ontime-types';
-import { validateEndAction, validateTimerType, validateTimeStrategy } from 'ontime-utils';
 import { create } from 'zustand';

 import { booleanFromLocalStorage } from '../utils/localStorage';
@@ -7,63 +5,39 @@ import { booleanFromLocalStorage } from '../utils/localStorage';
 type EditorSettingsStore = {
  defaultDuration: string;
  linkPrevious: boolean;
-  defaultTimeStrategy: TimeStrategy;
  defaultWarnTime: string;
  defaultDangerTime: string;
  defaultPublic: boolean;
-  defaultTimerType: TimerType;
-  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;
-  setDefaultTimerType: (defaultTimerType: TimerType) => void;
-  setDefaultEndAction: (defaultEndAction: EndAction) => void;
 };

 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,
-  timerType: TimerType.CountDown,
-  endAction: EndAction.None,
 };

 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',
-  DefaultTimerType = 'ontime-default-timer-type',
-  DefaultEndAction = 'ontime-default-end-action',
 }

 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),
-    defaultTimerType: validateTimerType(
-      localStorage.getItem(EditorSettingsKeys.DefaultTimerType),
-      editorSettingsDefaults.timerType,
-    ),
-    defaultEndAction: validateEndAction(
-      localStorage.getItem(EditorSettingsKeys.DefaultEndAction),
-      editorSettingsDefaults.endAction,
-    ),

    setDefaultDuration: (defaultDuration) =>
      set(() => {
@@ -76,12 +50,6 @@ 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));
@@ -97,15 +65,5 @@ export const useEditorSettings = create<EditorSettingsStore>((set) => {
        localStorage.setItem(EditorSettingsKeys.DefaultPublic, String(defaultPublic));
        return { defaultPublic };
      }),
-    setDefaultTimerType: (defaultTimerType) =>
-      set(() => {
-        localStorage.setItem(EditorSettingsKeys.DefaultTimerType, String(defaultTimerType));
-        return { defaultTimerType };
-      }),
-    setDefaultEndAction: (defaultEndAction) =>
-      set(() => {
-        localStorage.setItem(EditorSettingsKeys.DefaultEndAction, String(defaultEndAction));
-        return { defaultEndAction };
-      }),
  };
 });
@@ -1,7 +1,60 @@
 import isEqual from 'react-fast-compare';
-import { RuntimeStore, runtimeStorePlaceholder } from 'ontime-types';
+import { Playback, RuntimeStore, SimpleDirection, SimplePlayback, TimerPhase } 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,
+    },
+    external: {
+      text: '',
+      visible: false,
+    },
+  },
+  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>(
@@ -1,7 +1,6 @@
 import { Log, RundownCached, RuntimeStore } from 'ontime-types';

 import { CLIENT_LIST, CUSTOM_FIELDS, isProduction, RUNDOWN, RUNTIME, websocketUrl } from '../api/constants';
-import { invalidateAllCaches } from '../api/utils';
 import { ontimeQueryClient } from '../queryClient';
 import {
  getClientId,
@@ -179,12 +178,10 @@ export const connectSocket = () => {
        }
        case 'ontime-refetch': {
          // the refetch message signals that the rundown has changed in the server side
-          const { revision, reload } = payload;
+          const { revision } = payload;
          const currentRevision = ontimeQueryClient.getQueryData<RundownCached>(RUNDOWN)?.revision ?? -1;

-          if (reload) {
-            invalidateAllCaches();
-          } else if (revision > currentRevision) {
+          if (revision > currentRevision) {
            ontimeQueryClient.invalidateQueries({ queryKey: RUNDOWN });
            ontimeQueryClient.invalidateQueries({ queryKey: CUSTOM_FIELDS });
          }
@@ -3,4 +3,3 @@ export const apiRepoLatest = 'https://api.github.com/repos/cpvalente/ontime/rele
 export const websiteUrl = 'https://www.getontime.no';

 export const documentationUrl = 'https://docs.getontime.no';
-export const customFieldsDocsUrl = 'https://docs.getontime.no/features/custom-fields/';
@@ -18,7 +18,7 @@ import useAppSettingsNavigation from './useAppSettingsNavigation';
 import style from './AppSettings.module.scss';

 export default function AppSettings() {
-  const { close, panel, location, setLocation } = useAppSettingsNavigation();
+  const { close, panel, location } = 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} setLocation={setLocation} />}
+          {panel === 'project' && <ProjectPanel location={location} />}
          {panel === 'general' && <GeneralPanel location={location} />}
          {panel === 'feature_settings' && <FeatureSettingsPanel location={location} />}
          {panel === 'sources' && <SourcesPanel />}
@@ -40,16 +40,12 @@ ul {
    background-color: $gray-1100;
  }

-  &.highlight {
-    color: $red-400;
-
-    &::before {
-      content: '';
-      width: 0.5em;
-      height: 0.5em;
-      border-radius: 99px;
-      background-color: $red-400;
-    }
+  &.unsaved::before {
+    content: '';
+    width: 6px;
+    height: 6px;
+    border-radius: 3px;
+    background-color: $blue-400;
  }

  &.split {
@@ -1,90 +1,66 @@
 import { Fragment } from 'react';
-import { Tooltip } from '@chakra-ui/react';

 import { isKeyEnter } from '../../../common/utils/keyEvent';
 import { cx } from '../../../common/utils/styleUtils';
-import { tooltipDelayFast } from '../../../ontimeConfig';
-import { SettingsOption, SettingsOptionId, useAppSettingsMenu } from '../useAppSettingsMenu';
+import { PanelBaseProps, settingPanels, useSettingsStore } from '../settingsStore';
 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 { options } = useAppSettingsMenu();
+  const { setLocation } = useAppSettingsNavigation();
+  const { hasUnsavedChanges } = useSettingsStore();

  return (
    <ul className={style.tabs}>
-      {options.map((panel) => {
-        const isSelected = selectedPanel === panel.id;
-        if (panel.highlight) {
-          return (
-            <Tooltip key={panel.id} label={panel.highlight} openDelay={tooltipDelayFast} shouldWrapChildren>
-              <PanelListItem panel={panel} location={location} isSelected={isSelected} />
-            </Tooltip>
-          );
-        }
-        return <PanelListItem key={panel.id} panel={panel} location={location} isSelected={isSelected} />;
+      {settingPanels.map((panel) => {
+        const unsaved = hasUnsavedChanges(panel.id);
+
+        const classes = cx([
+          style.primary,
+          selectedPanel === panel.id ? style.active : null,
+          panel.split ? style.split : null,
+          unsaved ? style.unsaved : null,
+        ]);
+
+        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, 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>
-  );
-}
@@ -49,18 +49,6 @@ $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;
@@ -2,7 +2,7 @@ import { HTMLAttributes, ReactNode } from 'react';

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

-import style from './PanelUtils.module.scss';
+import style from './Panel.module.scss';

 export function Header({ children }: { children: ReactNode }) {
  return <h2 className={style.header}>{children}</h2>;
@@ -74,14 +74,6 @@ 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,8 +1,9 @@
+import { version } from '../../../../../package.json';
 import ExternalLink from '../../../../common/components/external-link/ExternalLink';
 import { documentationUrl, githubUrl, websiteUrl } from '../../../../externals';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

-import AppVersion from './AppVersion';
+import CheckUpdatesButton from './CheckUpdatesButton';

 export default function AboutPanel() {
  return (
@@ -22,7 +23,8 @@ export default function AboutPanel() {
      </Panel.Section>
      <Panel.Section>
        <Panel.SubHeader>Current version</Panel.SubHeader>
-        <AppVersion />
+        <Panel.Paragraph>{`You are currently using Ontime ${version}`}</Panel.Paragraph>
+        <CheckUpdatesButton version={version} />
      </Panel.Section>
    </>
  );
@@ -1,31 +0,0 @@
-import { version } from '../../../../../package.json';
-import ExternalLink from '../../../../common/components/external-link/ExternalLink';
-import useAppVersion from '../../../../common/hooks-query/useAppVersion';
-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 ${version}`}
-        <Panel.Error>{`Could not fetch version information: ${isError}`}</Panel.Error>
-      </Panel.Paragraph>
-    );
-  }
-
-  if (data.hasUpdates) {
-    return (
-      <>
-        <Panel.Paragraph>{`You are currently using Ontime version ${version}.`}</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: ${version}`}</Panel.Paragraph>;
-}
@@ -0,0 +1,80 @@
+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 '../../panel-utils/PanelUtils';
+import * as Panel from '../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 '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

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

@@ -1,7 +1,3 @@
-.halfWidth {
-  width: 50%;
-}
-
 .fullWidth {
  width: 100%;
 }
@@ -41,9 +37,3 @@
 .flex {
  display: flex;
 }
-
-.twoCols {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 1rem;
-}
@@ -1,6 +1,6 @@
 import useScrollIntoView from '../../../../common/hooks/useScrollIntoView';
-import type { PanelBaseProps } from '../../panel-list/PanelList';
-import * as Panel from '../../panel-utils/PanelUtils';
+import { PanelBaseProps } from '../../settingsStore';
+import * as Panel from '../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 '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

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

@@ -33,7 +33,7 @@ export default function UrlPresetsForm() {
    setError,
    formState: { isSubmitting, isDirty, isValid, errors },
  } = useForm<FormData>({
-    mode: 'onChange',
+    mode: 'onBlur',
    defaultValues: { data },
    values: { data },
    resetOptions: {
@@ -78,7 +78,7 @@ export default function UrlPresetsForm() {

  const addNew = () => {
    prepend({
-      enabled: true,
+      enabled: false,
      alias: '',
      pathAndParams: '',
    });
@@ -105,25 +105,12 @@ export default function UrlPresetsForm() {
        <Alert status='info' variant='ontime-on-dark-info'>
          <AlertIcon />
          <AlertDescription>
-            URL presets are user defined aliases to Ontime URLs
+            URL Presets
            <br />
            <br />
-            <b>Preset Name</b> <br />
-            The alias for the URL. This will be the URL you will be calling. eg: <br />
-            <Panel.BlockQuote>
-              Preset name <Panel.Highlight>cam3</Panel.Highlight> called as{' '}
-              <Panel.Highlight>http://localhost:4001/cam3</Panel.Highlight>
-            </Panel.BlockQuote>
+            Custom presets allow providing a short name for any ontime URL. <br />
+            - Providing dynamic URLs for automation or unattended screens <br />- Simplifying complex URLs
            <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>
@@ -143,8 +130,8 @@ export default function UrlPresetsForm() {
            <thead>
              <tr>
                <th className={style.fit}>Active</th>
-                <th className={style.aliasConstrain}>Preset name</th>
-                <th className={style.fullWidth}>URL segment</th>
+                <th className={style.aliasConstrain}>Preset</th>
+                <th className={style.fullWidth}>URL</th>
                <th />
              </tr>
            </thead>
@@ -4,7 +4,6 @@ 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';
@@ -37,7 +36,6 @@ export default function CustomFieldEntry(props: CustomFieldEntryProps) {
            onSubmit={handleEdit}
            initialColour={colour}
            initialLabel={label}
-            initialKey={field}
          />
        </td>
      </tr>
@@ -49,12 +47,7 @@ export default function CustomFieldEntry(props: CustomFieldEntryProps) {
      <td>
        <Swatch color={colour} />
      </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.fullWidth}>{label}</td>
      <td className={style.actions}>
        <IconButton
          size='sm'
@@ -2,12 +2,11 @@ import { useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { Button, Input } from '@chakra-ui/react';
 import { CustomField } from 'ontime-types';
-import { customFieldLabelToKey, isAlphanumericWithSpace } from 'ontime-utils';
+import { isAlphanumeric } from 'ontime-utils';

 import { maybeAxiosError } from '../../../../../common/api/utils';
 import SwatchSelect from '../../../../../common/components/input/colour-input/SwatchSelect';
-import useCustomFields from '../../../../../common/hooks-query/useCustomFields';
-import * as Panel from '../../../panel-utils/PanelUtils';
+import * as Panel from '../../PanelUtils';

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

@@ -16,13 +15,10 @@ interface CustomFieldsFormProps {
  onCancel: () => void;
  initialColour?: string;
  initialLabel?: string;
-  initialKey?: string;
 }

 export default function CustomFieldForm(props: CustomFieldsFormProps) {
-  const { onSubmit, onCancel, initialColour, initialLabel, initialKey } = props;
-  const { data } = useCustomFields();
-
+  const { onSubmit, onCancel, initialColour, initialLabel } = props;
  // we use this to force an update
  const [_, setColour] = useState(initialColour || '');

@@ -35,7 +31,7 @@ export default function CustomFieldForm(props: CustomFieldsFormProps) {
    getValues,
    formState: { errors, isSubmitting, isValid, isDirty },
  } = useForm({
-    defaultValues: { label: initialLabel || '', colour: initialColour || '', key: initialKey || '' },
+    defaultValues: { label: initialLabel || '', colour: initialColour || '' },
    resetOptions: {
      keepDirtyValues: true,
    },
@@ -67,45 +63,31 @@ 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.twoCols}>
-        <div>
-          <Panel.Description>Label (only alphanumeric characters are allowed)</Panel.Description>
-          {errors.label && <Panel.Error>{errors.label.message}</Panel.Error>}
-          <Input
-            {...register('label', {
-              required: { value: true, message: 'Required field' },
-              onChange: () => setValue('key', customFieldLabelToKey(getValues('label')) ?? 'N/A'),
-              validate: (value) => {
-                if (value.trim().length === 0) return 'Required field';
-                if (!isAlphanumericWithSpace(value)) return 'Only alphanumeric characters and space are allowed';
-                if (!isEditMode) {
-                  if (isEditMode && Object.keys(data).includes(value)) return 'Custom fields must be unique';
-                }
-                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 className={style.column}>
+        <Panel.Description>Label (only alphanumeric characters are allowed)</Panel.Description>
+        {errors.label && <Panel.Error>{errors.label.message}</Panel.Error>}
+        <Input
+          {...register('label', {
+            required: { value: true, message: 'Required field' },
+            validate: (value) => {
+              if (value.trim().length === 0) return 'Required field';
+              if (!isAlphanumeric(value)) return 'Only alphanumeric characters are allowed';
+              return true;
+            },
+          })}
+          size='sm'
+          variant='ontime-filled'
+          autoComplete='off'
+        />
      </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}>
@@ -6,12 +6,13 @@ import { CustomField, CustomFieldLabel } from 'ontime-types';
 import { deleteCustomField, editCustomField, postCustomField } from '../../../../../common/api/customFields';
 import ExternalLink from '../../../../../common/components/external-link/ExternalLink';
 import useCustomFields from '../../../../../common/hooks-query/useCustomFields';
-import { customFieldsDocsUrl } from '../../../../../externals';
-import * as Panel from '../../../panel-utils/PanelUtils';
+import * as Panel from '../../PanelUtils';

 import CustomFieldEntry from './CustomFieldEntry';
 import CustomFieldForm from './CustomFieldForm';

+const customFieldsDocsUrl = 'https://docs.getontime.no/features/custom-fields/';
+
 export default function CustomFields() {
  const { data, refetch } = useCustomFields();
  const [isAdding, setIsAdding] = useState(false);
@@ -58,14 +59,9 @@ export default function CustomFields() {
          <Alert status='info' variant='ontime-on-dark-info'>
            <AlertIcon />
            <AlertDescription>
-              Custom fields allow for additional information to be added to an event.
+              Custom fields allow for additional information to be added to an event (eg. light, sound, camera). <br />
              <br />
-              <br />
-              This data is not used by Ontime, but provides place for cueing or department specific information (eg.
-              light, sound, camera).
-              <br />
-              <br />
-              Custom fields can be used width the Integrations feature using the generated key.
+              This data is not used by Ontime.
              <ExternalLink href={customFieldsDocsUrl}>See the docs</ExternalLink>
            </AlertDescription>
          </Alert>
@@ -77,7 +73,6 @@ export default function CustomFields() {
              <tr>
                <th>Colour</th>
                <th>Name</th>
-                <th>Key (used in Integrations)</th>
                <th />
              </tr>
            </thead>
@@ -1,7 +1,7 @@
 import useScrollIntoView from '../../../../common/hooks/useScrollIntoView';
-import type { PanelBaseProps } from '../../panel-list/PanelList';
-import * as Panel from '../../panel-utils/PanelUtils';
+import { PanelBaseProps } from '../../settingsStore';
 import EditorSettingsForm from '../interface-panel/EditorSettingsForm';
+import * as Panel from '../PanelUtils';

 import GeneralPanelForm from './GeneralPanelForm';
 import ViewSettingsForm from './ViewSettingsForm';
@@ -7,7 +7,7 @@ import { postSettings } from '../../../../common/api/settings';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import useSettings from '../../../../common/hooks-query/useSettings';
 import { isOnlyNumbers } from '../../../../common/utils/regex';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import GeneralPinInput from './GeneralPinInput';

@@ -154,7 +154,7 @@ export default function GeneralPanelForm() {
                <option value='pt'>Portuguese</option>
                <option value='es'>Spanish</option>
                <option value='sv'>Swedish</option>
-                <option value='pl'>Polish</option>
+		<option value='pl'>Polish</option>
              </Select>
            </Panel.ListItem>
          </Panel.ListGroup>
@@ -9,7 +9,7 @@ import ExternalLink from '../../../../common/components/external-link/ExternalLi
 import { PopoverPickerRHF } from '../../../../common/components/input/popover-picker/PopoverPicker';
 import useInfo from '../../../../common/hooks-query/useInfo';
 import useViewSettings from '../../../../common/hooks-query/useViewSettings';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

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

@@ -84,8 +84,8 @@ export default function ViewSettingsForm() {
        <Alert status='info' variant='ontime-on-dark-info'>
          <AlertIcon />
          <AlertDescription>
-            You can the Ontime views or customise its styles by modifying the provided CSS file. <br />
-            The CSS file is in the user directory at {`${info.publicDir}/user/styles/override.css`}
+            You can override the styles of the viewers with a custom CSS file. <br />
+            {info?.cssOverride && `In your installation the file is at ${info?.cssOverride}`}
            <br />
            <br />
            <ExternalLink href={cssOverrideDocsUrl}>See the docs</ExternalLink>
@@ -126,7 +126,7 @@ export default function ViewSettingsForm() {
            <Panel.ListItem>
              <Panel.Field
                title='Freeze timer on end'
-                description='When a timer hits 00:00:00, it freezes instead of going negative. It invalidates the End Message.'
+                description='Timer in views will stop from going negative and instead stop at 00:00:00'
              />
              <Controller
                control={control}
@@ -139,7 +139,7 @@ export default function ViewSettingsForm() {
            <Panel.ListItem>
              <Panel.Field
                title='End message'
-                description='Message for negative timers; applies only if the timer isn`t frozen on End. If no message is provided, it continues into negative time'
+                description='Message to show on negative timers if not frozen. If not provided, timer will continue'
              />
              <Input
                size='sm'
@@ -147,7 +147,7 @@ export default function ViewSettingsForm() {
                variant='ontime-filled'
                maxLength={150}
                width='275px'
-                placeholder='Shown when timer reaches end'
+                placeholder='Message shown when timer reaches end'
                {...register('endMessage')}
              />
            </Panel.ListItem>
@@ -9,7 +9,7 @@ import { maybeAxiosError } from '../../../../common/api/utils';
 import { useHttpSettings, usePostHttpSettings } from '../../../../common/hooks-query/useHttpSettings';
 import { isKeyEscape } from '../../../../common/utils/keyEvent';
 import { startsWithHttp } from '../../../../common/utils/regex';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import { cycles } from './integrationUtils';

@@ -27,7 +27,7 @@ export default function HttpIntegrations() {
    setError,
    formState: { errors, isSubmitting, isDirty, isValid },
  } = useForm<HttpSettings>({
-    mode: 'onChange',
+    mode: 'onBlur',
    defaultValues: data,
    values: data,
    resetOptions: {
@@ -60,7 +60,7 @@ export default function HttpIntegrations() {
      id: generateId(),
      cycle: 'onLoad',
      message: '',
-      enabled: true,
+      enabled: false,
    });
  };

@@ -2,8 +2,8 @@ import { Alert, AlertDescription, AlertIcon } from '@chakra-ui/react';

 import ExternalLink from '../../../../common/components/external-link/ExternalLink';
 import useScrollIntoView from '../../../../common/hooks/useScrollIntoView';
-import type { PanelBaseProps } from '../../panel-list/PanelList';
-import * as Panel from '../../panel-utils/PanelUtils';
+import { PanelBaseProps } from '../../settingsStore';
+import * as Panel from '../PanelUtils';

 import HttpIntegrations from './HttpIntegrations';
 import OscIntegrations from './OscIntegrations';
@@ -10,7 +10,7 @@ import { maybeAxiosError } from '../../../../common/api/utils';
 import useOscSettings, { useOscSettingsMutation } from '../../../../common/hooks-query/useOscSettings';
 import { isKeyEscape } from '../../../../common/utils/keyEvent';
 import { isASCII, isASCIIorEmpty, isIPAddress, isOnlyNumbers, startsWithSlash } from '../../../../common/utils/regex';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import { cycles } from './integrationUtils';

@@ -28,7 +28,7 @@ export default function OscIntegrations() {
    setError,
    formState: { errors, isSubmitting, isDirty, isValid },
  } = useForm<OSCSettings>({
-    mode: 'onChange',
+    mode: 'onBlur',
    defaultValues: data,
    values: data,
    resetOptions: {
@@ -75,7 +75,7 @@ export default function OscIntegrations() {
      cycle: 'onLoad',
      address: '',
      payload: '',
-      enabled: true,
+      enabled: false,
    });
  };

@@ -1,34 +1,23 @@
 import { Select, Switch } from '@chakra-ui/react';
-import { EndAction, TimerType, TimeStrategy } from 'ontime-types';
+import { EndAction, TimerType } from 'ontime-types';
 import { parseUserTime } from 'ontime-utils';

 import TimeInput from '../../../../common/components/input/time-input/TimeInput';
 import { editorSettingsDefaults, useEditorSettings } from '../../../../common/stores/editorSettings';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 export default function EditorSettingsForm() {
-  const {
-    defaultDuration,
-    linkPrevious,
-    defaultTimeStrategy,
-    defaultWarnTime,
-    defaultDangerTime,
-    defaultPublic,
-    defaultTimerType,
-    defaultEndAction,
-    setDefaultDuration,
-    setLinkPrevious,
-    setTimeStrategy,
-    setWarnTime,
-    setDangerTime,
-    setDefaultPublic,
-    setDefaultTimerType,
-    setDefaultEndAction,
-  } = useEditorSettings((state) => state);
+  const eventSettings = useEditorSettings((state) => state);

-  const durationInMs = parseUserTime(defaultDuration);
-  const warnTimeInMs = parseUserTime(defaultWarnTime);
-  const dangerTimeInMs = parseUserTime(defaultDangerTime);
+  const setDefaultDuration = eventSettings.setDefaultDuration;
+  const setLinkPrevious = eventSettings.setLinkPrevious;
+  const setWarnTime = eventSettings.setWarnTime;
+  const setDangerTime = eventSettings.setDangerTime;
+  const setDefaultPublic = eventSettings.setDefaultPublic;
+
+  const durationInMs = parseUserTime(eventSettings.defaultDuration);
+  const warnTimeInMs = parseUserTime(eventSettings.defaultWarnTime);
+  const dangerTimeInMs = parseUserTime(eventSettings.defaultDangerTime);

  return (
    <Panel.Section>
@@ -37,36 +26,6 @@ export default function EditorSettingsForm() {
        <Panel.Divider />
        <Panel.Section>
          <Panel.Title>Rundown defaults for new events</Panel.Title>
-          <Panel.ListGroup>
-            <Panel.ListItem>
-              <Panel.Field
-                title='Link previous'
-                description='Whether the start time of new events should be linked to the previous event end time'
-              />
-              <Switch
-                variant='ontime'
-                size='lg'
-                defaultChecked={linkPrevious}
-                onChange={(event) => setLinkPrevious(event.target.checked)}
-              />
-            </Panel.ListItem>
-            <Panel.ListItem>
-              <Panel.Field
-                title='Timer strategy'
-                description='Which time should be maintained when event schedule is recalculated'
-              />
-              <Select
-                variant='ontime'
-                size='sm'
-                width='auto'
-                value={defaultTimeStrategy}
-                onChange={(event) => setTimeStrategy(event.target.value as TimeStrategy)}
-              >
-                <option value={TimeStrategy.LockDuration}>Duration</option>
-                <option value={TimeStrategy.LockEnd}>End Time</option>
-              </Select>
-            </Panel.ListItem>
-          </Panel.ListGroup>
          <Panel.ListGroup>
            <Panel.ListItem>
              <Panel.Field title='Default duration' description='Default duration for new events' />
@@ -78,30 +37,29 @@ export default function EditorSettingsForm() {
              />
            </Panel.ListItem>
            <Panel.ListItem>
-              <Panel.Field title='Timer type' description='Default type of timer for new events' />
-              <Select
+              <Panel.Field
+                title='Link previous'
+                description='Whether the start time of new events should be linked to the previous event end time'
+              />
+              <Switch
                variant='ontime'
-                size='sm'
-                width='auto'
-                value={defaultTimerType}
-                onChange={(event) => setDefaultTimerType(event.target.value as TimerType)}
-              >
+                size='lg'
+                defaultChecked={eventSettings.linkPrevious}
+                onChange={(event) => setLinkPrevious(event.target.checked)}
+              />
+            </Panel.ListItem>
+            <Panel.ListItem>
+              <Panel.Field title='Timer type' description='Default type of timer for new events' />
+              <Select variant='ontime' size='sm' width='auto' isDisabled>
                <option value={TimerType.CountDown}>Count down</option>
                <option value={TimerType.CountUp}>Count up</option>
                <option value={TimerType.TimeToEnd}>Time to end</option>
                <option value={TimerType.Clock}>Clock</option>
-                <option value={TimerType.None}>None</option>
              </Select>
            </Panel.ListItem>
            <Panel.ListItem>
              <Panel.Field title='End Action' description='Default end action for new events' />
-              <Select
-                variant='ontime'
-                size='sm'
-                width='auto'
-                value={defaultEndAction}
-                onChange={(event) => setDefaultEndAction(event.target.value as EndAction)}
-              >
+              <Select variant='ontime' size='sm' width='auto' isDisabled>
                <option value={EndAction.None}>None</option>
                <option value={EndAction.Stop}>Stop</option>
                <option value={EndAction.LoadNext}>Load next</option>
@@ -135,7 +93,7 @@ export default function EditorSettingsForm() {
              <Switch
                variant='ontime'
                size='lg'
-                defaultChecked={defaultPublic}
+                defaultChecked={eventSettings.defaultPublic}
                onChange={(event) => setDefaultPublic(event.target.checked)}
              />
            </Panel.ListItem>
@@ -1,6 +1,6 @@
 import { Alert, AlertDescription, AlertIcon } from '@chakra-ui/react';

-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import EditorSettingsForm from './EditorSettingsForm';

@@ -4,9 +4,3 @@
  gap: $section-spacing;
  row-gap: $element-inner-spacing;
 }
-
-.goIcon {
-  @include rotate-fourty-five;
-  margin-left: 0.25rem;
-  margin-bottom: 0.25rem;
-}
@@ -1,33 +1,19 @@
-import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';
-
 import { serverPort } from '../../../../common/api/constants';
-import CopyTag from '../../../../common/components/copy-tag/CopyTag';
+import AppLink from '../../../../common/components/app-link/AppLink';
 import useInfo from '../../../../common/hooks-query/useInfo';
-import { openLink } from '../../../../common/utils/linkUtils';

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

 export default function InfoNif() {
  const { data } = useInfo();

-  const handleClick = (address: string) => openLink(address);
-
  return (
    <div className={style.interfaces}>
-      {data?.networkInterfaces?.map((nif) => {
-        const address = `http://${nif.address}:${serverPort}`;
-
-        return (
-          <CopyTag
-            key={nif.name}
-            copyValue={address}
-            onClick={() => handleClick(address)}
-            label='Copy IP or navigate to address'
-          >
-            {`${nif.name} - ${nif.address}`} <IoArrowUp className={style.goIcon} />
-          </CopyTag>
-        );
-      })}
+      {data?.networkInterfaces?.map((nif) => (
+        <AppLink key={nif.address} href={`http://${nif.address}:${serverPort}`}>
+          {`${nif.name} - ${nif.address}`}
+        </AppLink>
+      ))}
    </div>
  );
 }
@@ -4,7 +4,7 @@ import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';

 import { handleLinks } from '../../../../common/utils/linkUtils';
 import Log from '../../../log/Log';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

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

@@ -1,7 +1,7 @@
 import useScrollIntoView from '../../../../common/hooks/useScrollIntoView';
-import type { PanelBaseProps } from '../../panel-list/PanelList';
-import * as Panel from '../../panel-utils/PanelUtils';
+import { PanelBaseProps } from '../../settingsStore';
 import ClientControlPanel from '../client-control-panel/ClientControlPanel';
+import * as Panel from '../PanelUtils';

 import InfoNif from './NetworkInterfaces';
 import LogExport from './NetworkLogExport';
@@ -1,12 +1,11 @@
 import { ChangeEvent, useRef, useState } from 'react';
-import { useSearchParams } from 'react-router-dom';
 import { Button, Input } from '@chakra-ui/react';
 import { IoAdd } from '@react-icons/all-files/io5/IoAdd';

 import { uploadProjectFile } from '../../../../common/api/db';
 import { invalidateAllCaches, maybeAxiosError } from '../../../../common/api/utils';
 import { validateProjectFile } from '../../../../common/utils/uploadUtils';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import ProjectCreateForm from './ProjectCreateForm';
 import ProjectList from './ProjectList';
@@ -14,17 +13,14 @@ import ProjectList from './ProjectList';
 import style from './ProjectPanel.module.scss';

 export default function ManageProjects() {
-  const [searchParams, setSearchParams] = useSearchParams();
+  const [isCreatingProject, setIsCreatingProject] = useState(false);
  const [error, setError] = useState('');
  const [loading, setLoading] = useState<'import' | null>(null);

  const fileInputRef = useRef<HTMLInputElement>(null);

-  const isCreatingProject = searchParams.get('new') === 'true';
-
  const handleToggleCreate = () => {
-    searchParams.set('new', isCreatingProject ? 'false' : 'true');
-    setSearchParams(searchParams);
+    setIsCreatingProject((prev) => !prev);
  };

  const handleSelectFile = () => {
@@ -53,8 +49,7 @@ export default function ManageProjects() {
  };

  const handleCloseForm = () => {
-    searchParams.delete('new');
-    setSearchParams(searchParams);
+    setIsCreatingProject(false);
  };

  return (
@@ -6,7 +6,7 @@ import { useQueryClient } from '@tanstack/react-query';
 import { PROJECT_LIST } from '../../../../common/api/constants';
 import { createProject } from '../../../../common/api/db';
 import { maybeAxiosError } from '../../../../common/api/utils';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

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

@@ -78,7 +78,7 @@ export default function ProjectCreateForm(props: ProjectCreateFromProps) {
        </div>
      </Panel.Title>
      {error && <Panel.Error>{error}</Panel.Error>}
-      <Panel.Section className={style.innerColumn}>
+      <div className={style.innerColumn}>
        <label>
          Project title
          <Input
@@ -145,7 +145,7 @@ export default function ProjectCreateForm(props: ProjectCreateFromProps) {
            {...register('backstageUrl')}
          />
        </label>
-      </Panel.Section>
+      </div>
    </Panel.Section>
  );
 }
@@ -6,7 +6,7 @@ import { type ProjectData } from 'ontime-types';
 import { postProjectData } from '../../../../common/api/project';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import useProjectData from '../../../../common/hooks-query/useProjectData';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

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

@@ -81,7 +81,7 @@ export default function ProjectData() {
              variant='ontime-filled'
              size='sm'
              maxLength={50}
-              placeholder='Project title is shown in production views'
+              placeholder='Your project name'
              autoComplete='off'
              {...register('title')}
            />
@@ -1,7 +1,7 @@
 import { useMemo, useState } from 'react';

 import { useProjectList } from '../../../../common/hooks-query/useProjectList';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import ProjectListItem, { EditMode } from './ProjectListItem';

@@ -12,7 +12,7 @@ import {
 } from '../../../../common/api/db';
 import { invalidateAllCaches, maybeAxiosError } from '../../../../common/api/utils';
 import { cx } from '../../../../common/utils/styleUtils';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import ProjectForm, { ProjectFormValues } from './ProjectForm';
 import ProjectMergeForm from './ProjectMergeForm';
@@ -6,8 +6,7 @@ import { useQueryClient } from '@tanstack/react-query';
 import { PROJECT_DATA } from '../../../../common/api/constants';
 import { getDb, patchData } from '../../../../common/api/db';
 import { maybeAxiosError } from '../../../../common/api/utils';
-import { cx } from '../../../../common/utils/styleUtils';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import { makeProjectPatch } from './project.utils';

@@ -93,7 +92,7 @@ export default function ProjectMergeForm(props: ProjectMergeFromProps) {
        </div>
      </Panel.Title>
      {error && <Panel.Error>{error}</Panel.Error>}
-      <Panel.Section className={cx([style.innerColumn, style.inlineLabels])}>
+      <div className={style.innerColumn}>
        <Panel.Description>
          Select partial data from {`"${fileName}"`} to merge into the current project.
          <br /> This process is irreversible.
@@ -122,7 +121,7 @@ export default function ProjectMergeForm(props: ProjectMergeFromProps) {
          <Switch variant='ontime' {...register('http')} />
          HTTP Integration
        </label>
-      </Panel.Section>
+      </div>
    </Panel.Section>
  );
 }
@@ -53,11 +53,9 @@
  display: flex;
  flex-direction: column;
  gap: 1em;
-}

-.inlineLabels {
  label {
    display: flex;
-    gap: 1rem;
+    gap: 1em;
  }
 }
@@ -1,28 +1,17 @@
 import useScrollIntoView from '../../../../common/hooks/useScrollIntoView';
-import type { PanelBaseProps } from '../../panel-list/PanelList';
-import * as Panel from '../../panel-utils/PanelUtils';
-import QuickStart from '../../quick-start/QuickStart';
-import type { SettingsOptionId } from '../../useAppSettingsMenu';
+import { PanelBaseProps } from '../../settingsStore';
+import * as Panel from '../PanelUtils';

 import ManageProjects from './ManageProjects';
 import ProjectData from './ProjectData';

-interface ProjectPanelProps extends PanelBaseProps {
-  setLocation: (location: SettingsOptionId) => void;
-}
-
-export default function ProjectPanel({ location, setLocation }: ProjectPanelProps) {
+export default function ProjectPanel({ location }: PanelBaseProps) {
  const projectRef = useScrollIntoView<HTMLDivElement>('data', location);
  const manageRef = useScrollIntoView<HTMLDivElement>('manage', location);

-  const handleQuickClose = () => {
-    setLocation('project');
-  };
-
  return (
    <>
      <Panel.Header>Project</Panel.Header>
-      <QuickStart isOpen={location === 'create'} onClose={handleQuickClose} />
      <div ref={projectRef}>
        <ProjectData />
      </div>
@@ -10,9 +10,8 @@ import {
  useDisclosure,
 } from '@chakra-ui/react';

-import { isLocalhost } from '../../../../common/api/constants';
-import { useElectronEvent } from '../../../../common/hooks/useElectronEvent';
-import * as Panel from '../../panel-utils/PanelUtils';
+import useElectronEvent from '../../../../common/hooks/useElectronEvent';
+import * as Panel from '../PanelUtils';

 export default function ShutdownPanel() {
  const { isElectron, sendToElectron } = useElectronEvent();
@@ -32,10 +31,9 @@ export default function ShutdownPanel() {
          This will shutdown the Ontime server. <br />
          The runtime state will be lost, but your project is kept for next time.
        </Panel.Paragraph>
-        <Button colorScheme='red' onClick={onOpen} maxWidth='350px' isDisabled={!(isElectron || isLocalhost)}>
+        <Button colorScheme='red' onClick={onOpen} maxWidth='350px' isDisabled={!isElectron}>
          Shutdown ontime
        </Button>
-        <Panel.Description>Note: Ontime can only be shutdown from the machine it is running in.</Panel.Description>
        <AlertDialog variant='ontime' isOpen={isOpen} leastDestructiveRef={cancelRef} onClose={onClose}>
          <AlertDialogOverlay>
            <AlertDialogContent>
@@ -7,7 +7,7 @@ import { getWorksheetNames } from '../../../../common/api/sheets';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import CopyTag from '../../../../common/components/copy-tag/CopyTag';
 import { openLink } from '../../../../common/utils/linkUtils';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import useGoogleSheet from './useGoogleSheet';
 import { useSheetStore } from './useSheetStore';
@@ -193,7 +193,7 @@ export default function GSheetSetup(props: GSheetSetupProps) {
        <Panel.ListGroup>
          <div className={style.buttonRow}>
            {isAuthenticating && <Spinner />}
-            <CopyTag copyValue={authKey ?? ''} label='Google Auth Key' disabled={!canAuthenticate} size='sm'>
+            <CopyTag label='Google Auth Key' disabled={!canAuthenticate} size='sm'>
              {authKey ? authKey : 'Upload files to generate Auth Key'}
            </CopyTag>
            <Button
@@ -2,7 +2,7 @@ import { useState } from 'react';
 import { Button } from '@chakra-ui/react';
 import { CustomFields, OntimeRundown } from 'ontime-types';

-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import PreviewSpreadsheet from './preview/PreviewRundown';
 import useGoogleSheet from './useGoogleSheet';
@@ -12,7 +12,7 @@ import {
 import { getWorksheetNames } from '../../../../common/api/sheets';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import { validateExcelImport } from '../../../../common/utils/uploadUtils';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import ImportMapForm from './import-map/ImportMapForm';
 import GSheetInfo from './GSheetInfo';
@@ -70,17 +70,6 @@ export default function SourcesPanel() {
    fileInputRef.current?.click();
  };

-  const resetFlow = () => {
-    // we purposely omit clearing the authentication status
-    setImportFlow('none');
-    setRundown(null);
-    setHasFile('none');
-    setWorksheets(null);
-    setCustomFields(null);
-    setError('');
-    setSheetId(null);
-  };
-
  const openGSheetFlow = async () => {
    const result = await verifyAuth();
    if (result) {
@@ -100,7 +89,7 @@ export default function SourcesPanel() {
  };

  const cancelGSheetFlow = () => {
-    resetFlow();
+    setImportFlow('none');
  };

  const handleSubmitImportPreview = async (importMap: ImportMap) => {
@@ -121,7 +110,9 @@ export default function SourcesPanel() {
  };

  const cancelImportMap = async () => {
-    resetFlow();
+    setImportFlow('none');
+    setHasFile('none');
+    setWorksheets(null);
    if (authenticationStatus === 'authenticated') {
      const result = await verifyAuth();
      if (result) {
@@ -136,7 +127,6 @@ export default function SourcesPanel() {
    setHasFile('none');
    setWorksheets(null);
    setCustomFields(null);
-    setError('');
  };

  const handleSubmitExport = async (importMap: ImportMap) => {
@@ -144,6 +134,15 @@ export default function SourcesPanel() {
    await exportRundown(sheetId, importMap);
  };

+  const resetFlow = () => {
+    setImportFlow('none');
+    setRundown(null);
+    setHasFile('none');
+    setWorksheets(null);
+    setCustomFields(null);
+    setError('');
+  };
+
  const isExcelFlow = importFlow === 'excel';
  const isGSheetFlow = importFlow === 'gsheet';
  const isAuthenticated = authenticationStatus === 'authenticated';
@@ -3,9 +3,10 @@ import { useFieldArray, useForm } from 'react-hook-form';
 import { Button, IconButton, Input, Select, Tooltip } from '@chakra-ui/react';
 import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
 import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
-import { ImportMap, isAlphanumericWithSpace } from 'ontime-utils';
+import { ImportMap } from 'ontime-utils';

-import * as Panel from '../../../panel-utils/PanelUtils';
+import { isAlphanumeric } from '../../../../../common/utils/regex';
+import * as Panel from '../../PanelUtils';
 import useGoogleSheet from '../useGoogleSheet';
 import { useSheetStore } from '../useSheetStore';

@@ -31,7 +32,7 @@ export default function ImportMapForm(props: ImportMapFormProps) {
    register,
    formState: { errors, isValid },
  } = useForm<NamedImportMap>({
-    mode: 'onChange',
+    mode: 'onBlur',
    defaultValues: namedImportMap,
    values: namedImportMap,
  });
@@ -121,7 +122,7 @@ export default function ImportMapForm(props: ImportMapFormProps) {
        <thead>
          <tr>
            <th>Ontime field</th>
-            <th>Column name in spreadsheet</th>
+            <th>From spreadsheet name</th>
            <th className={style.singleActionCell} />
          </tr>
        </thead>
@@ -189,10 +190,9 @@ export default function ImportMapForm(props: ImportMapFormProps) {
                    defaultValue={ontimeName}
                    placeholder='Name of the field as shown in Ontime'
                    {...register(`custom.${index}.ontimeName`, {
-                      validate: (value) => {
-                        if (!isAlphanumericWithSpace(value))
-                          return 'Only alphanumeric characters and space are allowed';
-                        return true;
+                      pattern: {
+                        value: isAlphanumeric,
+                        message: 'Custom field name must be alphanumeric',
                      },
                    })}
                  />
@@ -5,7 +5,7 @@ import { millisToString } from 'ontime-utils';

 import Tag from '../../../../../common/components/tag/Tag';
 import { getAccessibleColour } from '../../../../../common/utils/styleUtils';
-import * as Panel from '../../../panel-utils/PanelUtils';
+import * as Panel from '../../PanelUtils';

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

@@ -24,8 +24,7 @@ export default function PreviewRundown(props: PreviewRundownProps) {
  // we only count Ontime Events which are 1 based in client
  let eventIndex = 0;

-  const fieldKeys = Object.keys(customFields);
-  const fieldLabels = fieldKeys.map((key) => customFields[key].label);
+  const fieldHeaders = Object.keys(customFields);

  return (
    <Panel.Table>
@@ -45,8 +44,8 @@ export default function PreviewRundown(props: PreviewRundownProps) {
          <th>Colour</th>
          <th>Timer Type</th>
          <th>End Action</th>
-          {fieldLabels.map((label) => (
-            <th key={label}>{label}</th>
+          {fieldHeaders.map((field) => (
+            <th key={field}>{field}</th>
          ))}
        </tr>
      </thead>
@@ -103,7 +102,7 @@ export default function PreviewRundown(props: PreviewRundownProps) {
                  <Tag>{event.endAction}</Tag>
                </td>
                {isOntimeEvent(event) &&
-                  fieldKeys.map((field) => {
+                  fieldHeaders.map((field) => {
                    let value = '';
                    if (field in event.custom) {
                      value = event.custom[field];
@@ -1,8 +0,0 @@
-.scrollContainer {
-  max-height: 70vh;
-  overflow: auto;
-
-  display: flex;
-  flex-direction: column;
-  gap: 1rem;
-}
@@ -1,186 +0,0 @@
-import { Controller, useForm } from 'react-hook-form';
-import {
-  Button,
-  Input,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-  Select,
-  Switch,
-} from '@chakra-ui/react';
-import { QuickStartData } from 'ontime-types';
-import { parseUserTime } from 'ontime-utils';
-
-import { quickProject } from '../../../common/api/db';
-import { invalidateAllCaches, maybeAxiosError } from '../../../common/api/utils';
-import TimeInput from '../../../common/components/input/time-input/TimeInput';
-import { editorSettingsDefaults, useEditorSettings } from '../../../common/stores/editorSettings';
-import * as Panel from '../panel-utils/PanelUtils';
-
-import { quickStartDefaults } from './quickStart.utils';
-
-import style from './QuickStart.module.scss';
-
-interface QuickStartProps {
-  isOpen: boolean;
-  onClose: () => void;
-}
-
-export default function QuickStart(props: QuickStartProps) {
-  const { isOpen, onClose } = props;
-  const { defaultWarnTime, defaultDangerTime, setDangerTime, setWarnTime } = useEditorSettings();
-
-  const {
-    control,
-    handleSubmit,
-    register,
-    formState: { errors, isSubmitting, isValid },
-    setError,
-  } = useForm<QuickStartData>({
-    defaultValues: quickStartDefaults,
-    values: quickStartDefaults,
-    resetOptions: {
-      keepDirtyValues: true,
-    },
-  });
-
-  const onSubmit = async (formData: QuickStartData) => {
-    try {
-      if (formData.project.title === '') {
-        formData.project.title = 'untitled';
-      }
-      await quickProject(formData);
-      await invalidateAllCaches();
-      onClose();
-    } catch (error) {
-      setError('root', { message: maybeAxiosError(error) });
-    }
-  };
-
-  const warnTimeInMs = parseUserTime(defaultWarnTime);
-  const dangerTimeInMs = parseUserTime(defaultDangerTime);
-
-  return (
-    <Modal isOpen={isOpen} onClose={onClose} closeOnOverlayClick={false} variant='ontime'>
-      <ModalOverlay />
-      <ModalCloseButton />
-      <ModalContent maxWidth='max(640px, 40vw)'>
-        <form onSubmit={handleSubmit(onSubmit)} id='quick-start'>
-          <ModalHeader>Create new project...</ModalHeader>
-          <ModalBody className={style.scrollContainer}>
-            <ModalCloseButton />
-            <Panel.ListGroup>
-              <Panel.ListItem>
-                <Panel.Field title='Project title' description='Shown as the title in some views' />
-                <Input
-                  variant='ontime-filled'
-                  size='sm'
-                  maxLength={150}
-                  placeholder='Project title'
-                  autoComplete='off'
-                  width='20rem'
-                  {...register('project.title')}
-                />
-              </Panel.ListItem>
-              <Panel.ListItem>
-                <Panel.Field
-                  title='Time format'
-                  description='Default time format to show in views 12 /24 hours'
-                  error={errors.settings?.timeFormat?.message}
-                />
-                <Select variant='ontime' size='sm' width='auto' isDisabled={false} {...register('settings.timeFormat')}>
-                  <option value='12'>12 hours 11:00:10 PM</option>
-                  <option value='24'>24 hours 23:00:10</option>
-                </Select>
-              </Panel.ListItem>
-              <Panel.ListItem>
-                <Panel.Field
-                  title='Views language'
-                  description='Language to be displayed in views'
-                  error={errors.settings?.language?.message}
-                />
-                <Select variant='ontime' size='sm' width='auto' isDisabled={false} {...register('settings.language')}>
-                  <option value='en'>English</option>
-                  <option value='fr'>French</option>
-                  <option value='de'>German</option>
-                  <option value='hu'>Hungarian</option>
-                  <option value='it'>Italian</option>
-                  <option value='no'>Norwegian</option>
-                  <option value='pt'>Portuguese</option>
-                  <option value='es'>Spanish</option>
-                  <option value='sv'>Swedish</option>
-                  <option value='pl'>Polish</option>
-                </Select>
-              </Panel.ListItem>
-            </Panel.ListGroup>
-
-            <Panel.ListGroup>
-              <Panel.ListItem>
-                <Panel.Field title='Warning time' description='Default threshold for warning time in an event' />
-                <TimeInput<'warnTime'>
-                  name='warnTime'
-                  submitHandler={(_field, value) => setWarnTime(value)}
-                  time={warnTimeInMs}
-                  placeholder={editorSettingsDefaults.warnTime}
-                />
-              </Panel.ListItem>
-              <Panel.ListItem>
-                <Panel.Field title='Danger time' description='Default threshold for danger time in an event' />
-                <TimeInput<'dangerTime'>
-                  name='dangerTime'
-                  submitHandler={(_field, value) => setDangerTime(value)}
-                  time={dangerTimeInMs}
-                  placeholder={editorSettingsDefaults.dangerTime}
-                />
-              </Panel.ListItem>
-            </Panel.ListGroup>
-
-            <Panel.ListGroup>
-              <Panel.ListItem>
-                <Panel.Field
-                  title='Freeze timer on end'
-                  description='When a timer hits 00:00:00, it freezes instead of going negative. It invalidates the End Message.'
-                />
-                <Controller
-                  control={control}
-                  name='viewSettings.freezeEnd'
-                  render={({ field: { onChange, value, ref } }) => (
-                    <Switch variant='ontime' size='lg' isChecked={value} onChange={onChange} ref={ref} />
-                  )}
-                />
-              </Panel.ListItem>
-              <Panel.ListItem>
-                <Panel.Field
-                  title='End message'
-                  description='Message for negative timers; applies only if the timer isn`t frozen on End. If no message is provided, it continues into negative time'
-                />
-                <Input
-                  size='sm'
-                  autoComplete='off'
-                  variant='ontime-filled'
-                  maxLength={150}
-                  width='20rem'
-                  placeholder='Shown when timer reaches end'
-                  {...register('viewSettings.endMessage')}
-                />
-              </Panel.ListItem>
-            </Panel.ListGroup>
-          </ModalBody>
-          <ModalFooter>
-            {errors?.root && <Panel.Error>{errors.root.message}</Panel.Error>}
-            <Button variant='ontime-ghosted' size='md' onClick={onClose} isDisabled={false}>
-              Cancel
-            </Button>
-            <Button variant='ontime-filled' size='md' type='submit' isDisabled={!isValid} isLoading={isSubmitting}>
-              Create project
-            </Button>
-          </ModalFooter>
-        </form>
-      </ModalContent>
-    </Modal>
-  );
-}
@@ -1,15 +0,0 @@
-import type { QuickStartData } from 'ontime-types';
-
-export const quickStartDefaults: QuickStartData = {
-  project: {
-    title: '',
-  },
-  settings: {
-    timeFormat: '24',
-    language: 'en',
-  },
-  viewSettings: {
-    freezeEnd: false,
-    endMessage: '',
-  },
-};
@@ -1,21 +1,17 @@
-import { useMemo } from 'react';
-
-import useAppVersion from '../../common/hooks-query/useAppVersion';
+import { create } from 'zustand';

 export type SettingsOption = {
  id: string;
  label: string;
  secondary?: Readonly<SettingsOption[]>;
  split?: boolean;
-  highlight?: string;
 };

-const staticOptions = [
+export const settingPanels: Readonly<SettingsOption[]> = [
  {
    id: 'project',
    label: 'Project',
    secondary: [
-      { id: 'project__create', label: 'Create...' },
      { id: 'project__data', label: 'Project data' },
      { id: 'project__manage', label: 'Manage projects' },
    ],
@@ -81,19 +77,30 @@ const staticOptions = [
  },
 ] as const;

-export type SettingsOptionId = (typeof staticOptions)[number]['id'];
+export type SettingsOptionId = (typeof settingPanels)[number]['id'];

-export function useAppSettingsMenu() {
-  const { data } = useAppVersion();
-
-  const options: Readonly<SettingsOption[]> = useMemo(
-    () =>
-      staticOptions.map((option) => ({
-        ...option,
-        highlight: option.id === 'about' && data.hasUpdates ? 'New version available' : undefined,
-      })),
-    [data],
-  );
-
-  return { options };
+export interface PanelBaseProps {
+  location?: string;
 }
+
+type SettingsStore = {
+  unsavedChanges: Set<SettingsOptionId>;
+  hasUnsavedChanges: (panelId: SettingsOptionId) => boolean;
+  addUnsavedChanges: (panelId: SettingsOptionId) => void;
+  removeUnsavedChanges: (panelId: SettingsOptionId) => void;
+};
+
+export const useSettingsStore = create<SettingsStore>((set, get) => ({
+  unsavedChanges: new Set(),
+  hasUnsavedChanges: (panelId: SettingsOptionId) => get().unsavedChanges.has(panelId),
+  addUnsavedChanges: (panelId: SettingsOptionId) =>
+    set((state) => {
+      state.unsavedChanges.add(panelId);
+      return { unsavedChanges: new Set(state.unsavedChanges) };
+    }),
+  removeUnsavedChanges: (panelId: SettingsOptionId) =>
+    set((state) => {
+      state.unsavedChanges.delete(panelId);
+      return { unsavedChanges: new Set(state.unsavedChanges) };
+    }),
+}));
@@ -1,7 +1,7 @@
 import { useCallback, useMemo } from 'react';
 import { useSearchParams } from 'react-router-dom';

-import { SettingsOptionId } from './useAppSettingsMenu';
+import { SettingsOptionId } from './settingsStore';

 const settingsKey = 'settings';

@@ -1,9 +1,10 @@
 import { useEffect, useRef } from 'react';
-import { Input } from '@chakra-ui/react';
+import { IconButton, Input } from '@chakra-ui/react';
 import { IoEye } from '@react-icons/all-files/io5/IoEye';
 import { IoEyeOffOutline } from '@react-icons/all-files/io5/IoEyeOffOutline';

 import TooltipActionBtn from '../../../common/components/buttons/TooltipActionBtn';
+import { cx } from '../../../common/utils/styleUtils';
 import { tooltipDelayMid } from '../../../ontimeConfig';

 import style from './InputRow.module.scss';
@@ -12,13 +13,15 @@ interface InputRowProps {
  label: string;
  placeholder: string;
  text: string;
-  visible: boolean;
-  actionHandler: () => void;
+  visible?: boolean;
+  readonly?: boolean;
+  actionHandler: (action: string, payload: object) => void;
  changeHandler: (newValue: string) => void;
+  className?: string;
 }

 export default function InputRow(props: InputRowProps) {
-  const { label, placeholder, text, visible, actionHandler, changeHandler } = props;
+  const { label, placeholder, text, visible, actionHandler, changeHandler, className, readonly } = props;

  const inputRef = useRef<HTMLInputElement>(null);
  const cursorPositionRef = useRef(0);
@@ -36,27 +39,41 @@ export default function InputRow(props: InputRowProps) {
    changeHandler(event.target.value);
  };

+  const classes = cx([style.inputRow, className]);
+
  return (
-    <div className={style.inputRow}>
+    <div className={classes}>
      <label className={`${style.label} ${visible ? style.active : ''}`}>{label}</label>
      <div className={style.inputItems}>
        <Input
          ref={inputRef}
          size='sm'
          variant='ontime-filled'
+          readOnly={readonly}
+          disabled={readonly}
          value={text}
          onChange={handleInputChange}
          placeholder={placeholder}
        />
-        <TooltipActionBtn
-          clickHandler={actionHandler}
-          tooltip={visible ? 'Make invisible' : 'Make visible'}
-          aria-label={`Toggle ${label}`}
-          openDelay={tooltipDelayMid}
-          icon={visible ? <IoEye size='18px' /> : <IoEyeOffOutline size='18px' />}
-          variant={visible ? 'ontime-filled' : 'ontime-subtle'}
-          size='sm'
-        />
+        {readonly ? (
+          <IconButton
+            size='sm'
+            isDisabled
+            icon={visible ? <IoEye size='18px' /> : <IoEyeOffOutline size='18px' />}
+            aria-label={`Toggle ${label}`}
+            variant={visible ? 'ontime-filled' : 'ontime-subtle'}
+          />
+        ) : (
+          <TooltipActionBtn
+            clickHandler={() => actionHandler('update', { field: 'isPublic', value: !visible })}
+            tooltip={visible ? 'Make invisible' : 'Make visible'}
+            aria-label={`Toggle ${label}`}
+            openDelay={tooltipDelayMid}
+            icon={visible ? <IoEye size='18px' /> : <IoEyeOffOutline size='18px' />}
+            variant={visible ? 'ontime-filled' : 'ontime-subtle'}
+            size='sm'
+          />
+        )}
      </div>
    </div>
  );
@@ -1,3 +1,23 @@
+.messageContainer {
+  display: flex;
+  flex-direction: column;
+  gap: $section-spacing;
+}
+
+.buttonSection {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: $element-spacing;
+  margin-top: -0.5rem;
+}
+
+.singleAction {
+  display: flex;
+  flex-direction: column;
+  gap: $element-spacing;
+  margin-top: $element-inner-spacing;
+}
+
 .label {
  font-size: $inner-section-text-size;
  color: $label-gray;
@@ -6,73 +26,3 @@
    color: $action-text-color;
  }
 }
-
-.previewContainer {
-  display: grid;
-  gap: $element-spacing;
-  grid-template-columns: 2fr 1fr;
-}
-
-.preview {
-  background-color: $ui-black;
-  display: grid;
-  place-content: center;
-  text-align: center;
-  position: relative;
-}
-
-.options {
-  display: flex;
-  flex-direction: column;
-  gap: $element-spacing;
-}
-
-.eventStatus {
-  position: absolute;
-  left: 0;
-  margin: 0.5rem 0.25rem;
-  display: flex;
-  flex-direction: column;
-  gap: 0.25rem;
-}
-
-.mainContent {
-  font-size: 1rem;
-  font-weight: 600;
-  color: var(--override-colour, $ui-white);
-
-  &[data-phase='pending'] {
-    color: $ontime-roll;
-  }
-  &[data-phase='overtime'] {
-    color: $playback-negative;
-  }
-  &[data-phase='none'] {
-    opacity: $opacity-disabled;
-  }
-}
-
-.secondaryContent {
-  border-top: 1px solid $white-7;
-}
-
-.blackout {
-  display: none;
-}
-
-.timerIndicators {
-  display: flex;
-  flex-direction: column;
-}
-
-.statusIcon {
-  color: $gray-1000;
-
-  &[data-active='true'] {
-    color: $active-indicator;
-  }
-}
-
-.divider {
-  border-top: 1px solid $gray-1000;
-}
@@ -1,52 +1,64 @@
-import { setMessage, useExternalMessageInput, useTimerMessageInput } from '../../../common/hooks/useSocket';
+import { Button } from '@chakra-ui/react';
+import { IoEye } from '@react-icons/all-files/io5/IoEye';
+import { IoEyeOffOutline } from '@react-icons/all-files/io5/IoEyeOffOutline';
+import { IoSunny } from '@react-icons/all-files/io5/IoSunny';
+import { IoSunnyOutline } from '@react-icons/all-files/io5/IoSunnyOutline';
+
+import { setMessage, useMessageControl } from '../../../common/hooks/useSocket';
+import { enDash } from '../../../common/utils/styleUtils';

 import InputRow from './InputRow';
-import TimerControlsPreview from './TimerViewControl';
+
+import style from './MessageControl.module.scss';
+
+const noop = () => undefined;

 export default function MessageControl() {
-  return (
-    <>
-      <TimerControlsPreview />
-      <TimerMessageInput />
-      <ExternalInput />
-    </>
-  );
-}
-
-function TimerMessageInput() {
-  const { text, visible } = useTimerMessageInput();
+  const message = useMessageControl();
+  const blink = message.timer.blink;
+  const blackout = message.timer.blackout;

  return (
-    <InputRow
-      label='Timer Message'
-      placeholder='Message shown fullscreen in stage timer'
-      text={text}
-      visible={visible}
-      changeHandler={(newValue) => setMessage.timerText(newValue)}
-      actionHandler={() => setMessage.timerVisible(!visible)}
-    />
-  );
-}
-
-function ExternalInput() {
-  const { text, visible } = useExternalMessageInput();
-
-  const toggleExternal = () => {
-    if (visible) {
-      setMessage.timerSecondary(null);
-    } else {
-      setMessage.timerSecondary('external');
-    }
-  };
-
-  return (
-    <InputRow
-      label='External Message'
-      placeholder='Message shown as secondary text in stage timer'
-      text={text}
-      visible={visible}
-      changeHandler={(newValue) => setMessage.externalText(newValue)}
-      actionHandler={toggleExternal}
-    />
+    <div className={style.messageContainer}>
+      <InputRow
+        label='Timer'
+        placeholder='Message shown in stage timer'
+        text={message.timer.text}
+        visible={message.timer.visible}
+        changeHandler={(newValue) => setMessage.timerText(newValue)}
+        actionHandler={() => setMessage.timerVisible(!message.timer.visible)}
+      />
+      <div className={style.buttonSection}>
+        <Button
+          size='sm'
+          className={`${blink ? style.blink : ''}`}
+          variant={blink ? 'ontime-filled' : 'ontime-subtle'}
+          leftIcon={blink ? <IoSunny size='1rem' /> : <IoSunnyOutline size='1rem' />}
+          onClick={() => setMessage.timerBlink(!blink)}
+          data-testid='toggle timer blink'
+        >
+          Blink
+        </Button>
+        <Button
+          size='sm'
+          className={style.blackoutButton}
+          variant={blackout ? 'ontime-filled' : 'ontime-subtle'}
+          leftIcon={blackout ? <IoEye size='1rem' /> : <IoEyeOffOutline size='1rem' />}
+          onClick={() => setMessage.timerBlackout(!blackout)}
+          data-testid='toggle timer blackout'
+        >
+          Blackout screen
+        </Button>
+      </div>
+      <InputRow
+        label='External Message (read only)'
+        placeholder={enDash}
+        readonly
+        text={message.external.text}
+        visible={message.external.visible}
+        changeHandler={noop}
+        actionHandler={noop}
+      />
+    </div>
  );
 }
@@ -1,22 +1,18 @@
 import { memo } from 'react';
+import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';

 import ErrorBoundary from '../../../common/components/error-boundary/ErrorBoundary';
 import { handleLinks } from '../../../common/utils/linkUtils';
-import { cx } from '../../../common/utils/styleUtils';
-import { Corner } from '../../editors/editor-utils/EditorUtils';

 import MessageControl from './MessageControl';

 import style from '../../editors/Editor.module.scss';

 const MessageControlExport = () => {
-  const isExtracted = window.location.pathname.includes('/messagecontrol');
-  const classes = cx([style.content, style.contentColumnLayout]);
-
  return (
    <div className={style.messages} data-testid='panel-messages-control'>
-      {!isExtracted && <Corner onClick={(event) => handleLinks(event, 'messagecontrol')} />}
-      <div className={classes}>
+      <IoArrowUp className={style.corner} onClick={(event) => handleLinks(event, 'messagecontrol')} />
+      <div className={style.content}>
        <ErrorBoundary>
          <MessageControl />
        </ErrorBoundary>
@@ -1,86 +0,0 @@
-import { Tooltip } from '@chakra-ui/react';
-import { IoArrowDown } from '@react-icons/all-files/io5/IoArrowDown';
-import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';
-import { IoBan } from '@react-icons/all-files/io5/IoBan';
-import { IoFlag } from '@react-icons/all-files/io5/IoFlag';
-import { IoTime } from '@react-icons/all-files/io5/IoTime';
-import { TimerPhase, TimerType } from 'ontime-types';
-
-import { useMessagePreview } from '../../../common/hooks/useSocket';
-import useViewSettings from '../../../common/hooks-query/useViewSettings';
-import { handleLinks } from '../../../common/utils/linkUtils';
-import { cx, timerPlaceholder } from '../../../common/utils/styleUtils';
-import { tooltipDelayMid } from '../../../ontimeConfig';
-import { Corner } from '../../editors/editor-utils/EditorUtils';
-
-import style from './MessageControl.module.scss';
-
-export default function TimerPreview() {
-  const { blink, blackout, phase, showAuxTimer, showExternalMessage, showTimerMessage, timerType } =
-    useMessagePreview();
-  const { data } = useViewSettings();
-
-  const contentClasses = cx([style.previewContent, blink && style.blink, blackout && style.blackout]);
-
-  const main = (() => {
-    if (showTimerMessage) return 'Message';
-    if (phase === TimerPhase.Pending) return 'Standby to start';
-    if (phase === TimerPhase.Overtime && data.endMessage) return 'Custom end message';
-    if (timerType === TimerType.TimeToEnd) return 'Time to end';
-    if (timerType === TimerType.Clock) return 'Clock';
-    if (timerType === TimerType.None) return timerPlaceholder;
-    return 'Timer';
-  })();
-
-  const secondary = (() => {
-    // message is a fullscreen overlay
-    if (showTimerMessage) return null;
-
-    // we need to check aux first since it takes priority
-    if (showAuxTimer) return 'Aux Timer';
-    if (showExternalMessage) return 'External message';
-    return null;
-  })();
-
-  const overrideColour = (() => {
-    // override fallback colours from starter project
-    if (phase === TimerPhase.Warning) return data.warningColor ?? '#FFAB33';
-    if (phase === TimerPhase.Danger) return data.dangerColor ?? '#ED3333';
-    return data.normalColor ?? '#FFFC';
-  })();
-
-  const showColourOverride = main == 'Timer';
-
-  return (
-    <div className={style.preview}>
-      <Corner onClick={(event) => handleLinks(event, 'timer')} />
-      <div className={contentClasses}>
-        <div
-          className={style.mainContent}
-          data-phase={showColourOverride && phase}
-          style={showColourOverride ? { '--override-colour': overrideColour } : {}}
-        >
-          {main}
-        </div>
-        {secondary !== null && <div className={style.secondaryContent}>{secondary}</div>}
-      </div>
-      <div className={style.eventStatus}>
-        <Tooltip label='Time type: Count down' openDelay={tooltipDelayMid} shouldWrapChildren>
-          <IoArrowDown className={style.statusIcon} data-active={timerType === TimerType.CountDown} />
-        </Tooltip>
-        <Tooltip label='Time type: Count up' openDelay={tooltipDelayMid} shouldWrapChildren>
-          <IoArrowUp className={style.statusIcon} data-active={timerType === TimerType.CountUp} />
-        </Tooltip>
-        <Tooltip label='Time type: Clock' openDelay={tooltipDelayMid} shouldWrapChildren>
-          <IoTime className={style.statusIcon} data-active={timerType === TimerType.Clock} />
-        </Tooltip>
-        <Tooltip label='Time type: Time to end' openDelay={tooltipDelayMid} shouldWrapChildren>
-          <IoFlag className={style.statusIcon} data-active={timerType === TimerType.TimeToEnd} />
-        </Tooltip>
-        <Tooltip label='Time type: None' openDelay={tooltipDelayMid} shouldWrapChildren>
-          <IoBan className={style.statusIcon} data-active={timerType === TimerType.None} />
-        </Tooltip>
-      </div>
-    </div>
-  );
-}
@@ -1,62 +0,0 @@
-import { Button } from '@chakra-ui/react';
-
-import { setMessage, useTimerViewControl } from '../../../common/hooks/useSocket';
-
-import TimerPreview from './TimerPreview';
-
-import style from './MessageControl.module.scss';
-
-export default function TimerControlsPreview() {
-  const { blackout, blink, secondarySource } = useTimerViewControl();
-
-  const toggleSecondary = (newValue: 'aux' | 'external' | null) => {
-    if (secondarySource === newValue) {
-      setMessage.timerSecondary(null);
-    } else {
-      setMessage.timerSecondary(newValue);
-    }
-  };
-
-  return (
-    <div className={style.previewContainer}>
-      <TimerPreview />
-
-      <div className={style.options}>
-        <Button
-          size='sm'
-          variant={secondarySource === 'aux' ? 'ontime-filled' : 'ontime-subtle'}
-          onClick={() => toggleSecondary('aux')}
-        >
-          Show Aux timer
-        </Button>
-        <Button
-          size='sm'
-          variant={secondarySource === 'external' ? 'ontime-filled' : 'ontime-subtle'}
-          onClick={() => toggleSecondary('external')}
-        >
-          Show external
-        </Button>
-
-        <hr className={style.divider} />
-
-        <Button
-          size='sm'
-          variant={blink ? 'ontime-filled' : 'ontime-subtle'}
-          onClick={() => setMessage.timerBlink(!blink)}
-          data-testid='toggle timer blink'
-        >
-          Blink
-        </Button>
-        <Button
-          size='sm'
-          className={style.blackoutButton}
-          variant={blackout ? 'ontime-filled' : 'ontime-subtle'}
-          onClick={() => setMessage.timerBlackout(!blackout)}
-          data-testid='toggle timer blackout'
-        >
-          Blackout screen
-        </Button>
-      </div>
-    </div>
-  );
-}
@@ -1,18 +1,17 @@
 import { memo } from 'react';
+import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';

 import ErrorBoundary from '../../../common/components/error-boundary/ErrorBoundary';
 import { handleLinks } from '../../../common/utils/linkUtils';
-import { Corner } from '../../editors/editor-utils/EditorUtils';

 import PlaybackControl from './PlaybackControl';

 import style from '../../editors/Editor.module.scss';

 const TimerControlExport = () => {
-  const isExtracted = window.location.pathname.includes('/timercontrol');
  return (
    <div className={style.playback} data-testid='panel-timer-control'>
-      {!isExtracted && <Corner onClick={(event) => handleLinks(event, 'timercontrol')} />}
+      <IoArrowUp className={style.corner} onClick={(event) => handleLinks(event, 'timercontrol')} />
      <div className={style.content}>
        <ErrorBoundary>
          <PlaybackControl />
@@ -68,7 +68,7 @@ function AuxTimerInput() {

  const handleTimeUpdate = (_field: string, value: string) => {
    const newTime = parseUserTime(value);
-    setDuration(newTime / 1000); // frontend api is seconds based
+    setDuration(newTime / 1000); //frontend api is seconds based;
  };

  return (
@@ -6,7 +6,8 @@
  max-width: 18.75rem;
  min-width: 5em;

-  color: $timer-color;
+  font-family: var(--font-family-override, $viewer-font-family);
+  color: var(--timer-color-override, $timer-color);
  line-height: 0.9em;
  text-align: center;
  letter-spacing: 0.1em;
@@ -50,15 +50,9 @@ $table-header-font-size: calc(1rem - 3px);

  font-size: $table-header-font-size;
  color: $gray-700;
-}

-th {
-  background-color: $gray-1300;
-
-  &:hover {
-    .resizer {
-      width: 0.5rem;
-    }
+  th {
+      background-color: $gray-1300;
  }
 }

@@ -132,19 +126,30 @@ th {

 .resizer {
  cursor: col-resize;
-  opacity: $opacity-disabled;
+  opacity: 0;
  display: inline-block;
-  width: 0;
+  width: 3px;
  height: 100%;
  position: absolute;
  right: 0;
  top: 0;
+  transform: translateX(50%);
  background-color: $action-blue;

  user-select: none;
  touch-action: none;

+  transition-duration: $transition-time-action;
+  transition-property: width, background-color;
+
  &:hover {
+    opacity: $opacity-disabled;
+    width: 6px;
+  }
+
+  &.isResizing {
    opacity: 1;
+    width: 6px;
+    background-color: $action-blue;
  }
 }
@@ -140,7 +140,7 @@ export default function Cuesheet({ data, columns, handleUpdate, selectedId, curr

                let rowBgColour: string | undefined;
                if (isSelected) {
-                  rowBgColour = '#D20300'; // $red-700
+                  rowBgColour = 'var(--cuesheet-running-bg-override, #D20300)'; // $red-700
                } else if (row.original.colour) {
                  try {
                    // the colour is user defined and might be invalid
@@ -4,6 +4,8 @@ import { CSS } from '@dnd-kit/utilities';
 import { Header } from '@tanstack/react-table';
 import { OntimeRundownEntry } from 'ontime-types';

+import { cx } from '../../../common/utils/styleUtils';
+
 import styles from '../Cuesheet.module.scss';

 interface SortableCellProps {
@@ -27,6 +29,8 @@ export function SortableCell({ header, style, children }: SortableCellProps) {
    transition,
  };

+  const resizerClasses = cx([styles.resizer, header.column.getIsResizing() ? styles.isResizing : null]);
+
  return (
    <th ref={setNodeRef} style={dragStyle} colSpan={colSpan}>
      <div {...attributes} {...listeners}>
@@ -37,7 +41,7 @@ export function SortableCell({ header, style, children }: SortableCellProps) {
          onMouseDown: header.getResizeHandler(),
          onTouchStart: header.getResizeHandler(),
        }}
-        className={styles.resizer}
+        className={resizerClasses}
      />
    </th>
  );
@@ -29,12 +29,10 @@ function CuesheetTableSettings(props: CuesheetTableSettingsProps) {
    showPrevious,
    togglePreviousVisibility,
    showDelayBlock,
-    hideSeconds,
    showDelayedTimes,
    toggleIndexColumn,
    toggleDelayedTimes,
    toggleDelayVisibility,
-    toggleSecondsVisibility,
  } = useCuesheetSettings();

  return (
@@ -82,10 +80,6 @@ function CuesheetTableSettings(props: CuesheetTableSettingsProps) {
            <Switch variant='ontime' size='sm' isChecked={showDelayBlock} onChange={() => toggleDelayVisibility()} />
            Show delay blocks
          </label>
-          <label className={style.option}>
-            <Switch variant='ontime' size='sm' isChecked={hideSeconds} onChange={() => toggleSecondsVisibility()} />
-            Hide seconds
-          </label>
        </div>
      </div>
      <div className={style.rightPanel}>
@@ -2,6 +2,7 @@ import { useCallback } from 'react';
 import { IoCheckmark } from '@react-icons/all-files/io5/IoCheckmark';
 import { CellContext, ColumnDef } from '@tanstack/react-table';
 import { CustomFields, isOntimeEvent, OntimeEvent, OntimeRundownEntry } from 'ontime-types';
+import { millisToString } from 'ontime-utils';

 import DelayIndicator from '../../common/components/delay-indicator/DelayIndicator';
 import RunningTime from '../viewers/common/running-time/RunningTime';
@@ -18,28 +19,20 @@ function makePublic(row: CellContext<OntimeRundownEntry, unknown>) {

 function MakeTimer({ getValue, row: { original } }: CellContext<OntimeRundownEntry, unknown>) {
  const showDelayedTimes = useCuesheetSettings((state) => state.showDelayedTimes);
-  const hideSeconds = useCuesheetSettings((state) => state.hideSeconds);
  const cellValue = (getValue() as number | null) ?? 0;
  const delayValue = (original as OntimeEvent)?.delay ?? 0;

  return (
    <span className={style.time}>
      <DelayIndicator delayValue={delayValue} />
-      <RunningTime value={cellValue} hideSeconds={hideSeconds} />
+      <RunningTime value={cellValue} />
      {delayValue !== 0 && showDelayedTimes && (
-        <RunningTime className={style.delayedTime} value={cellValue + delayValue} hideSeconds={hideSeconds} />
+        <RunningTime className={style.delayedTime} value={cellValue + delayValue} />
      )}
    </span>
  );
 }

-function MakeDuration({ getValue }: CellContext<OntimeRundownEntry, unknown>) {
-  const hideSeconds = useCuesheetSettings((state) => state.hideSeconds);
-  const cellValue = (getValue() as number | null) ?? 0;
-
-  return <RunningTime value={cellValue} hideSeconds={hideSeconds} />;
-}
-
 function MakeCustomField({ row, column, table }: CellContext<OntimeRundownEntry, unknown>) {
  const update = useCallback(
    (newValue: string) => {
@@ -104,7 +97,7 @@ export function makeCuesheetColumns(customFields: CustomFields): ColumnDef<Ontim
      accessorKey: 'duration',
      id: 'duration',
      header: 'Duration',
-      cell: MakeDuration,
+      cell: (row) => millisToString(row.getValue() as number | null),
      size: 75,
    },
    {
@@ -9,7 +9,6 @@ interface CuesheetSettings {
  showPrevious: boolean;
  showDelayBlock: boolean;
  showDelayedTimes: boolean;
-  hideSeconds: boolean;

  toggleSettings: (newValue?: boolean) => void;
  toggleFollow: (newValue?: boolean) => void;
@@ -17,7 +16,6 @@ interface CuesheetSettings {
  toggleIndexColumn: (newValue?: boolean) => void;
  toggleDelayVisibility: (newValue?: boolean) => void;
  toggleDelayedTimes: (newValue?: boolean) => void;
-  toggleSecondsVisibility: (newValue?: boolean) => void;
 }

 function toggle(oldValue: boolean, value?: boolean) {
@@ -33,7 +31,6 @@ enum CuesheetKeys {
  PreviousVisibility = 'ontime-cuesheet-show-previous',
  ColumnIndex = 'ontime-cuesheet-show-index-column',
  DelayedTimes = 'ontime-cuesheet-show-delayed',
-  Seconds = 'ontime-cuesheet-hide-sceconds',
 }

 export const useCuesheetSettings = create<CuesheetSettings>()((set) => ({
@@ -43,7 +40,6 @@ export const useCuesheetSettings = create<CuesheetSettings>()((set) => ({
  showPrevious: booleanFromLocalStorage(CuesheetKeys.PreviousVisibility, true),
  showDelayBlock: booleanFromLocalStorage(CuesheetKeys.DelayVisibility, true),
  showDelayedTimes: booleanFromLocalStorage(CuesheetKeys.DelayedTimes, false),
-  hideSeconds: booleanFromLocalStorage(CuesheetKeys.Seconds, false),

  toggleSettings: (newValue?: boolean) => set((state) => ({ showSettings: toggle(state.showSettings, newValue) })),
  toggleFollow: (newValue?: boolean) =>
@@ -76,10 +72,4 @@ export const useCuesheetSettings = create<CuesheetSettings>()((set) => ({
      localStorage.setItem(CuesheetKeys.DelayedTimes, String(showDelayedTimes));
      return { showDelayedTimes };
    }),
-  toggleSecondsVisibility: (newValue?: boolean) =>
-    set((state) => {
-      const hideSeconds = toggle(state.hideSeconds, newValue);
-      localStorage.setItem(CuesheetKeys.Seconds, String(hideSeconds));
-      return { hideSeconds };
-    }),
 }));
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Carlos Valente	281b1649fe	fix: ignore 0 duration events	2024-09-04 20:29:43 +02:00
Carlos Valente	652fe25fd1	fix: issue with roll evaluating multiple days	2024-09-04 20:29:38 +02:00