feat: parse timeToEnd from excel

refactor: extract time-to-end
2026-08-05 07:28:01 +00:00 · 2024-12-16 13:38:49 +01:00 · 2024-12-16 13:38:46 +01:00
351 changed files with 6992 additions and 10518 deletions
@@ -36,7 +36,7 @@ jobs:
          APPLE_TEAM_ID: ${{ secrets.TEAMID }}
          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
          CSC_LINK: ${{ secrets.CSC_LINK }}
-        run: pnpm dist-mac --env-mode=loose
+        run: pnpm dist-mac
        timeout-minutes: 60

      - name: Release
@@ -28,7 +28,6 @@ test-results
 playwright-report
 /playwright/.cache/
 automated-screenshots
-e2e/tests/fixtures/tmp/*

 # production
 build/
@@ -24,7 +24,6 @@ COPY --from=builder /app/apps/client/build ./client/
 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/
-COPY --from=builder /app/apps/server/src/html/ ./html/

 # Export default ports
 EXPOSE 4001/tcp 8888/udp 9999/udp
@@ -2,7 +2,6 @@
 ![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/cpvalente/ontime/total)
 ![Docker Pulls](https://img.shields.io/docker/pulls/getontime/ontime)
 ![NPM Downloads](https://img.shields.io/npm/dy/%40getontime%2Fcli)
-![Homebrew Cask Version](https://img.shields.io/homebrew/cask/v/ontime)
 [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/cpvalente)
 [![](https://img.shields.io/static/v1?label=Buy%20me%20a%20coffee&message=%E2%9D%A4&logo=buymeacoffee&color=%23fe8e86)](https://www.buymeacoffee.com/cpvalente)

@@ -13,11 +12,7 @@
 - Download for <a href="https://github.com/cpvalente/ontime/releases/latest/download/ontime-macOS-arm64.dmg">MacOS Arm</a>
 - Download for <a href="https://github.com/cpvalente/ontime/releases/latest/download/ontime-macOS-x64.dmg">MacOS Intel</a>
 - Download AppImage for <a href="https://github.com/cpvalente/ontime/releases/latest/download/ontime-linux.AppImage">Linux</a>
-
-... or
 - Get from <a href="https://hub.docker.com/r/getontime/ontime">Docker hub</a>
- Install from <a href="https://www.npmjs.com/package/ontime">NPM</a>
- Install from <a href="https://formulae.brew.sh/cask/ontime">Homebrew</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.
@@ -1,6 +1,6 @@
 {
    "name": "@getontime/cli",
-    "version": "3.11.0-beta.1",
+    "version": "3.9.5",
    "author": "Carlos Valente",
    "description": "Time keeping for live events",
    "repository": "https://github.com/cpvalente/ontime",
@@ -15,6 +15,7 @@
  ],
  "plugins": [
    "react",
+    "testing-library",
    "simple-import-sort",
    "@tanstack/query"
  ],
@@ -11,7 +11,6 @@
    <link rel="icon" type="image/png" href="/ontime-logo.png" />
    <link rel="manifest" href="/site.webmanifest" />
    <link rel="manifest" href="/manifest.json" />
-    <meta name="robots" content="noindex" />
    <title>ontime</title>
    <style>
      body,
@@ -1,6 +1,6 @@
 {
  "name": "ontime-ui",
-  "version": "3.11.0-beta.1",
+  "version": "3.9.5",
  "private": true,
  "type": "module",
  "dependencies": {
@@ -8,16 +8,15 @@
    "@dnd-kit/core": "^6.1.0",
    "@dnd-kit/sortable": "^8.0.0",
    "@dnd-kit/utilities": "^3.2.2",
-    "@emotion/is-prop-valid": "^1.3.1",
    "@emotion/react": "^11.10.6",
    "@emotion/styled": "^11.10.6",
    "@fontsource/open-sans": "^5.0.28",
    "@mantine/hooks": "^7.13.3",
    "@react-icons/all-files": "^4.1.0",
-    "@sentry/react": "^8.43.0",
-    "@tanstack/react-query": "^5.62.7",
-    "@tanstack/react-query-devtools": "^5.62.7",
-    "@tanstack/react-table": "^8.20.5",
+    "@sentry/react": "^8.19.0",
+    "@tanstack/react-query": "^5.17.9",
+    "@tanstack/react-query-devtools": "^5.17.9",
+    "@tanstack/react-table": "^8.11.3",
    "autosize": "^6.0.1",
    "axios": "^1.2.0",
    "color": "^4.2.3",
@@ -63,9 +62,13 @@
  "devDependencies": {
    "@sentry/vite-plugin": "^2.16.1",
    "@tanstack/eslint-plugin-query": "^5.8.4",
+    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/react": "^13.1.1",
+    "@testing-library/user-event": "^14.1.1",
    "@types/color": "^3.0.3",
    "@types/react": "^18.0.26",
    "@types/react-dom": "^18.0.10",
+    "@types/testing-library__jest-dom": "^5.14.5",
    "@typescript-eslint/eslint-plugin": "catalog:",
    "@typescript-eslint/parser": "catalog:",
    "@vitejs/plugin-react": "^4.2.1",
@@ -76,7 +79,8 @@
    "eslint-plugin-react": "^7.32.0",
    "eslint-plugin-react-hooks": "^4.6.0",
    "eslint-plugin-simple-import-sort": "^8.0.0",
-    "happy-dom": "^16.7.2",
+    "eslint-plugin-testing-library": "^5.9.1",
+    "jsdom": "^21.1.0",
    "ontime-types": "workspace:*",
    "ontime-utils": "workspace:*",
    "prettier": "catalog:",
@@ -1,10 +1 @@
-{
-  "name": "",
-  "short_name": "",
-  "icons": [
-    { "src": "/ontime-logo.png", "sizes": "295x295", "type": "image/png" }
-  ],
-  "theme_color": "#2B5ABC",
-  "background_color": "#101010",
-  "display": "standalone"
-}
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
@@ -22,7 +22,7 @@ const Editor = React.lazy(() => import('./features/editors/ProtectedEditor'));
 const Cuesheet = React.lazy(() => import('./views/cuesheet/ProtectedCuesheet'));
 const Operator = React.lazy(() => import('./features/operator/OperatorExport'));

-const TimerView = React.lazy(() => import('./views/timer/Timer'));
+const TimerView = React.lazy(() => import('./features/viewers/timer/Timer'));
 const MinimalTimerView = React.lazy(() => import('./features/viewers/minimal-timer/MinimalTimer'));
 const ClockView = React.lazy(() => import('./features/viewers/clock/Clock'));
 const Countdown = React.lazy(() => import('./features/viewers/countdown/Countdown'));
@@ -1,85 +0,0 @@
-import axios from 'axios';
-import type {
-  Automation,
-  AutomationDTO,
-  AutomationOutput,
-  AutomationSettings,
-  Trigger,
-  TriggerDTO,
-} from 'ontime-types';
-
-import { apiEntryUrl } from './constants';
-
-const automationsPath = `${apiEntryUrl}/automations`;
-
-/**
- * HTTP request to get the automations settings
- */
-export async function getAutomationSettings(): Promise<AutomationSettings> {
-  const res = await axios.get(automationsPath);
-  return res.data;
-}
-
-/**
- * HTTP request to edit the automations settings
- */
-export async function editAutomationSettings(
-  automationSettings: Partial<AutomationSettings>,
-): Promise<AutomationSettings> {
-  const res = await axios.post(automationsPath, automationSettings);
-  return res.data;
-}
-
-/**
- * HTTP request to create a new automation trigger
- */
-export async function addTrigger(trigger: TriggerDTO): Promise<Trigger> {
-  const res = await axios.post(`${automationsPath}/trigger`, trigger);
-  return res.data;
-}
-
-/**
- * HTTP request to update an automation trigger
- */
-export async function editTrigger(id: string, trigger: Trigger): Promise<Trigger> {
-  const res = await axios.put(`${automationsPath}/trigger/${id}`, trigger);
-  return res.data;
-}
-
-/**
- * HTTP request to delete an automation trigger
- */
-export function deleteTrigger(id: string): Promise<void> {
-  return axios.delete(`${automationsPath}/trigger/${id}`);
-}
-
-/**
- * HTTP request to create a new automation
- */
-export async function addAutomation(automation: AutomationDTO): Promise<Automation> {
-  const res = await axios.post(`${automationsPath}/automation`, automation);
-  return res.data;
-}
-
-/**
- * HTTP request to update a automation
- */
-export async function editAutomation(id: string, automation: Automation): Promise<Automation> {
-  const res = await axios.put(`${automationsPath}/automation/${id}`, automation);
-  return res.data;
-}
-
-/**
- * HTTP request to delete a automation
- */
-export function deleteAutomation(id: string): Promise<void> {
-  return axios.delete(`${automationsPath}/automation/${id}`);
-}
-
-/**
- * HTTP request to test automation output
- * The return is irrelevant as we care for the resolution of the promise
- */
-export function testOutput(output: AutomationOutput): Promise<void> {
-  return axios.post(`${automationsPath}/test`, output);
-}
@@ -4,8 +4,9 @@ import { serverURL } from '../../externals';
 export const APP_INFO = ['appinfo'];
 export const APP_SETTINGS = ['appSettings'];
 export const APP_VERSION = ['appVersion'];
-export const AUTOMATION = ['automation'];
 export const CUSTOM_FIELDS = ['customFields'];
+export const HTTP_SETTINGS = ['httpSettings'];
+export const OSC_SETTINGS = ['oscSettings'];
 export const PROJECT_DATA = ['project'];
 export const PROJECT_LIST = ['projectList'];
 export const RUNDOWN = ['rundown'];
@@ -12,7 +12,7 @@ const dbPath = `${apiEntryUrl}/db`;
 * HTTP request to the current DB
 */
 export function getDb(filename: string): Promise<AxiosResponse<DatabaseModel>> {
-  return axios.post(`${dbPath}/download`, { filename });
+  return axios.post(`${dbPath}/download/`, { filename });
 }

 /**
@@ -0,0 +1,21 @@
+import axios, { AxiosResponse } from 'axios';
+import { HttpSettings } from 'ontime-types';
+
+import { apiEntryUrl } from './constants';
+
+const httpPath = `${apiEntryUrl}/http`;
+
+/**
+ * HTTP request to retrieve http settings
+ */
+export async function getHTTP(): Promise<HttpSettings> {
+  const res = await axios.get(httpPath);
+  return res.data;
+}
+
+/**
+ * HTTP request to mutate http settings
+ */
+export async function postHTTP(data: HttpSettings): Promise<AxiosResponse<HttpSettings>> {
+  return axios.post(httpPath, data);
+}
@@ -0,0 +1,21 @@
+import axios, { AxiosResponse } from 'axios';
+import { OSCSettings } from 'ontime-types';
+
+import { apiEntryUrl } from './constants';
+
+const oscPath = `${apiEntryUrl}/osc`;
+
+/**
+ * HTTP request to retrieve osc settings
+ */
+export async function getOSC(): Promise<OSCSettings> {
+  const res = await axios.get(oscPath);
+  return res.data;
+}
+
+/**
+ * HTTP request to mutate osc settings
+ */
+export async function postOSC(data: OSCSettings): Promise<AxiosResponse<OSCSettings>> {
+  return axios.post(oscPath, data);
+}
@@ -1,5 +1,5 @@
 import axios, { AxiosResponse } from 'axios';
-import { MessageResponse, OntimeEvent, OntimeRundownEntry, RundownCached, TransientEventPayload } from 'ontime-types';
+import { MessageResponse, OntimeEvent, OntimeRundownEntry, RundownCached } from 'ontime-types';

 import { apiEntryUrl } from './constants';

@@ -16,7 +16,7 @@ export async function fetchNormalisedRundown(): Promise<RundownCached> {
 /**
 * HTTP request to post new event
 */
-export async function requestPostEvent(data: TransientEventPayload): Promise<AxiosResponse<OntimeRundownEntry>> {
+export async function requestPostEvent(data: Partial<OntimeRundownEntry>): Promise<AxiosResponse<OntimeRundownEntry>> {
  return axios.post(rundownPath, data);
 }

@@ -12,16 +12,3 @@ export async function getInfo(): Promise<GetInfo> {
  const res = await axios.get(`${sessionPath}/info`);
  return res.data;
 }
-
-/**
- * HTTP request to get a pre-authenticated URL
- */
-export async function generateUrl(
-  baseUrl: string,
-  path: string,
-  lock: boolean,
-  authenticate: boolean,
-): Promise<string> {
-  const res = await axios.post(`${sessionPath}/url`, { baseUrl, path, lock, authenticate });
-  return res.data.url;
-}
@@ -19,10 +19,3 @@ export async function getSettings(): Promise<Settings> {
 export async function postSettings(data: Settings): Promise<AxiosResponse<Settings>> {
  return axios.post(settingsPath, data);
 }
-
-/**
- * Allows setting the welcome modal dialog state from the clients
- */
-export async function postShowWelcomeDialog(show: boolean) {
-  axios.post(`${settingsPath}/welcomedialog`, { show });
-}
@@ -9,23 +9,32 @@ import style from './DelayIndicator.module.scss';

 interface DelayIndicatorProps {
  delayValue?: number;
-  tooltipPrefix?: string;
 }

 export default function DelayIndicator(props: DelayIndicatorProps) {
-  const { delayValue, tooltipPrefix } = props;
+  const { delayValue } = props;

-  if (typeof delayValue !== 'number' || delayValue === 0) {
-    return null;
+  if (typeof delayValue === 'number') {
+    if (delayValue < 0) {
+      return (
+        <Tooltip openDelay={tooltipDelayFast} label={millisToDelayString(delayValue)}>
+          <span className={style.delaySymbol}>
+            <IoChevronDown />
+          </span>
+        </Tooltip>
+      );
+    }
+
+    if (delayValue > 0) {
+      return (
+        <Tooltip openDelay={tooltipDelayFast} label={millisToDelayString(delayValue)}>
+          <span className={style.delaySymbol}>
+            <IoChevronUp />
+          </span>
+        </Tooltip>
+      );
+    }
  }

-  const delayString = tooltipPrefix
-    ? `${tooltipPrefix} ${millisToDelayString(delayValue)}`
-    : millisToDelayString(delayValue);
-
-  return (
-    <Tooltip openDelay={tooltipDelayFast} label={delayString}>
-      <span className={style.delaySymbol}>{delayValue < 0 ? <IoChevronDown /> : <IoChevronUp />}</span>
-    </Tooltip>
-  );
+  return null;
 }
@@ -1,16 +0,0 @@
-.infoLabel {
-  display: flex;
-  align-items: center;
-  gap: $element-spacing;
-  padding: 1rem;
-  margin-bottom: 1rem;
-
-  background-color: $gray-1100;
-  border-radius: 2px;
-  font-size: $inner-section-text-size;
-
-  svg {
-    font-size: 1.5rem;
-    color: $info-blue;
-  }
-}
@@ -1,13 +0,0 @@
-import { PropsWithChildren } from 'react';
-import { IoAlertCircle } from '@react-icons/all-files/io5/IoAlertCircle';
-
-import style from './Info.module.scss';
-
-export default function Info({ children }: PropsWithChildren) {
-  return (
-    <div className={style.infoLabel}>
-      <IoAlertCircle />
-      {children}
-    </div>
-  );
-}
@@ -16,11 +16,11 @@ export default function Swatch(props: SwatchProps) {
  const handleClick = () => {
    onClick?.(color);
  };
-  const classes = cx([style.swatch, isSelected && style.selected, onClick && style.selectable]);
+  const classes = cx([style.swatch, isSelected ? style.selected : null, onClick ? style.selectable : null]);

  if (!color) {
    return (
-      <div className={classes} onClick={handleClick}>
+      <div className={`${classes} ${style.center}`} onClick={handleClick}>
        <IoBan />
      </div>
    );
@@ -1,60 +0,0 @@
-import { useCallback } from 'react';
-import { useController, UseControllerProps } from 'react-hook-form';
-import { IoEyedrop } from '@react-icons/all-files/io5/IoEyedrop';
-import { ViewSettings } from 'ontime-types';
-
-import PopoverPicker from '../../../../common/components/input/popover-picker/PopoverPicker';
-import { debounce } from '../../../../common/utils/debounce';
-import { cx, getAccessibleColour } from '../../../utils/styleUtils';
-
-import style from './SwatchSelect.module.scss';
-
-interface SwatchPickerProps {
-  color: string;
-  isSelected?: boolean;
-  onChange: (name: string) => void;
-  alwaysDisplayColor?: boolean;
-}
-
-export default function SwatchPicker(props: SwatchPickerProps) {
-  const { color, onChange, isSelected, alwaysDisplayColor } = props;
-
-  const debouncedOnChange = useCallback(
-    debounce((newValue: string) => {
-      onChange(newValue);
-    }, 500),
-    [onChange],
-  );
-
-  const displayColor = alwaysDisplayColor || isSelected ? color : '';
-  const { color: iconColor } = getAccessibleColour(displayColor);
-
-  return (
-    <PopoverPicker color={displayColor} onChange={debouncedOnChange}>
-      <div
-        className={cx([style.swatch, isSelected && style.selected, style.selectable])}
-        style={{ backgroundColor: displayColor }}
-      >
-        <IoEyedrop color={iconColor} />
-      </div>
-    </PopoverPicker>
-  );
-}
-
-export function SwatchPickerRHF(props: UseControllerProps<ViewSettings>) {
-  const { name, control } = props;
-  const {
-    field: { onChange, value },
-  } = useController({ control, name });
-
-  const displayColor = typeof value === 'string' ? value : '';
-  const { color: iconColor } = getAccessibleColour(displayColor);
-
-  return (
-    <PopoverPicker color={value as string} onChange={onChange}>
-      <div className={cx([style.swatch, style.selectable])} style={{ backgroundColor: displayColor }}>
-        <IoEyedrop color={iconColor} />
-      </div>
-    </PopoverPicker>
-  );
-}
@@ -1,18 +1,15 @@
 .list {
  display: flex;
  flex-wrap: wrap;
-  gap: 0.5rem;
+  gap: 0.5rem
 }

 .swatch {
  width: 2rem;
  height: 2rem;
+  aspect-ratio: 1;
  border-radius: 99px;
  border: 2px solid $gray-1200;
-  color: $ui-white;
-
-  display: grid;
-  place-content: center;

  &.selected {
    border: 2px solid $blue-500;
@@ -20,9 +17,11 @@

  &.selectable {
    cursor: pointer;
-
-    &:hover {
-      border: 2px solid $blue-300;
-    }
  }
 }
+
+.center {
+  display: grid;
+  place-content: center;
+  color: $ui-white;
+}
@@ -1,7 +1,6 @@
 import { useCallback } from 'react';

 import Swatch from './Swatch';
-import SwatchPicker from './SwatchPicker';

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

@@ -44,7 +43,6 @@ export default function SwatchSelect(props: ColourInputProps) {
      {colours.map((colour) => (
        <Swatch key={colour} color={colour} onClick={setColour} isSelected={value === colour} />
      ))}
-      <SwatchPicker color={value} onChange={setColour} isSelected={!colours.includes(value)} />
    </div>
  );
 }
@@ -1,20 +1,16 @@
-.input {
-  color: $gray-200;
-  border: 1px solid transparent;
-  border-radius: 0 0 8px 8px;
-  background-color: $gray-1200;
-  padding: 0 0.5rem;
-  font-size: 1rem;
-  height: 2rem;
-  outline: none;
+.swatch {
+  width: 24px;
+  height: 24px;
+  border-radius: 12px;
+  border: 1px solid white;
+  box-shadow: 0 0 0 1px $gray-300;
+  cursor: pointer;

-  &:hover {
-    background-color: $gray-1100;
-  }
-
-  &:focus {
-    background-color: $gray-1000;
-    color: $gray-50;
-    border: 1px solid $blue-500;
-  }
+  transition-property: box-shadow;
+  transition-duration: $transition-time-action;
 }
+
+.swatch:hover {
+  box-shadow: 0 0 0 1px $blue-300;
+}
+
@@ -1,22 +1,34 @@
-import { PropsWithChildren } from 'react';
-import { HexAlphaColorPicker, HexColorInput } from 'react-colorful';
+import { HexAlphaColorPicker } from 'react-colorful';
+import { useController, UseControllerProps } from 'react-hook-form';
 import { Popover, PopoverContent, PopoverTrigger } from '@chakra-ui/react';
+import { ViewSettings } from 'ontime-types';

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

+export function PopoverPickerRHF(props: UseControllerProps<ViewSettings>) {
+  const { name, control } = props;
+  const {
+    field: { onChange, value },
+  } = useController({ control, name });
+
+  return <PopoverPicker color={value as string} onChange={onChange} />;
+}
+
 interface PopoverPickerProps {
  color: string;
  onChange: (color: string) => void;
 }

-export default function PopoverPicker(props: PropsWithChildren<PopoverPickerProps>) {
-  const { color, onChange, children } = props;
+export default function PopoverPicker(props: PopoverPickerProps) {
+  const { color, onChange } = props;
+
  return (
    <Popover>
-      <PopoverTrigger>{children}</PopoverTrigger>
-      <PopoverContent className={style.small} style={{ borderRadius: '9px', width: 'auto' }}>
+      <PopoverTrigger>
+        <div className={style.swatch} style={{ backgroundColor: color }} />
+      </PopoverTrigger>
+      <PopoverContent style={{ width: 'auto' }}>
        <HexAlphaColorPicker color={color} onChange={onChange} />
-        <HexColorInput color={color} onChange={onChange} className={style.input} prefixed />
      </PopoverContent>
    </Popover>
  );
@@ -15,8 +15,6 @@ export default function useReactiveTextInput(
  options?: {
    submitOnEnter?: boolean;
    submitOnCtrlEnter?: boolean;
-    onCancelUpdate?: () => void;
-    allowSubmitSameValue?: boolean;
  },
 ): UseReactiveTextInputReturn {
  const [text, setText] = useState<string>(initialText);
@@ -49,9 +47,7 @@ export default function useReactiveTextInput(
  const handleSubmit = useCallback(
    (valueToSubmit: string) => {
      // No need to update if it hasn't changed
-      if (valueToSubmit === initialText && !options?.allowSubmitSameValue) {
-        options?.onCancelUpdate?.();
-      } else {
+      if (valueToSubmit !== initialText) {
        const cleanVal = valueToSubmit.trim();
        submitCallback(cleanVal);
        if (cleanVal !== valueToSubmit) {
@@ -60,7 +56,7 @@ export default function useReactiveTextInput(
      }
      setTimeout(() => ref.current?.blur()); // Immediate timeout to ensure text is set before bluring
    },
-    [initialText, options, ref, submitCallback],
+    [initialText, ref, submitCallback],
  );

  /**
@@ -70,9 +66,8 @@ export default function useReactiveTextInput(
  const handleEscape = useCallback(() => {
    // No need to update if it hasn't changed
    setText(initialText);
-    options?.onCancelUpdate?.();
    setTimeout(() => ref.current?.blur()); // Immediate timeout to ensure text is set before bluring
-  }, [initialText, options, ref]);
+  }, [initialText, ref]);

  const keyHandler = useMemo(() => {
    const hotKeys: HotkeyItem[] = [['Escape', handleEscape, { preventDefault: true }]];
@@ -55,7 +55,6 @@ export default function TimeInput<T extends string>(props: TimeInputProps<T>) {
      // we dont know the values in the rundown, escalate to handler
      if (newValue.startsWith('p') || newValue.startsWith('+')) {
        submitHandler(name, newValue);
-        return true;
      }

      const valueInMillis = parseUserTime(newValue);
@@ -2,8 +2,6 @@ $input-delayed-border-color: $ontime-delay-text;

 .timeInput {
  border: 1px solid transparent;
-  color: $label-gray;
-
  &.delayed {
    border: 1px solid $input-delayed-border-color;
  }
@@ -1,6 +1,6 @@
@use '../../../theme/viewerDefs' as *;

-$progress-bar-size: 1.5rem;
+$progress-bar-size: 12px;
 $progress-bar-br: 3px;

 .multiprogress-bar {
@@ -53,6 +53,3 @@ $progress-bar-br: 3px;
 .multiprogress-bar__bg-danger {
  flex-shrink: 0;
 }
-.multiprogress-bar__bg-danger--overtime {
-  background: var(--timer-overtime-color-override, $timer-finished-color);
-}
@@ -1,7 +1,6 @@
 import { MaybeNumber } from 'ontime-types';

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

 import './MultiPartProgressBar.scss';

@@ -14,7 +13,6 @@ interface MultiPartProgressBar {
  danger?: MaybeNumber;
  dangerColor: string;
  hidden?: boolean;
-  hideOvertime?: boolean;
  ignoreCssOverride?: boolean;
  className?: string;
 }
@@ -29,7 +27,6 @@ export default function MultiPartProgressBar(props: MultiPartProgressBar) {
    danger,
    dangerColor,
    hidden,
-    hideOvertime,
    ignoreCssOverride,
    className = '',
  } = props;
@@ -37,17 +34,12 @@ export default function MultiPartProgressBar(props: MultiPartProgressBar) {
  const percentRemaining = 100 - getProgress(now, complete);
  const dangerWidth = danger ? 100 - getProgress(danger, complete) : 0;
  const warningWidth = warning ? 100 - dangerWidth - getProgress(warning, complete) : 0;
-  const isOvertime = now !== null && now < 0;
-  const showOvertime = isOvertime && !hideOvertime;

  return (
    <div
-      className={cx([
-        'multiprogress-bar',
-        hidden && 'multiprogress-bar--hidden',
-        ignoreCssOverride && 'multiprogress-bar--ignore-css-override',
-        className,
-      ])}
+      className={`multiprogress-bar ${hidden ? 'multiprogress-bar--hidden' : ''} ${
+        ignoreCssOverride ? 'multiprogress-bar--ignore-css-override' : ''
+      } ${className}`}
    >
      {now !== null && (
        <>
@@ -58,8 +50,8 @@ export default function MultiPartProgressBar(props: MultiPartProgressBar) {
              style={{ width: `${warningWidth}%`, backgroundColor: warningColor }}
            />
            <div
-              className={cx(['multiprogress-bar__bg-danger', showOvertime && 'multiprogress-bar__bg-danger--overtime'])}
-              style={{ width: `${dangerWidth}%`, backgroundColor: showOvertime ? undefined : dangerColor }}
+              className='multiprogress-bar__bg-danger'
+              style={{ width: `${dangerWidth}%`, backgroundColor: dangerColor }}
            />
          </div>
          <div className='multiprogress-bar__indicator'>
@@ -1,4 +1,4 @@
-import { memo, PropsWithChildren } from 'react';
+import { memo, PropsWithChildren, useRef } from 'react';
 import { createPortal } from 'react-dom';
 import { Link, useLocation } from 'react-router-dom';
 import {
@@ -19,6 +19,7 @@ import { IoSwapVertical } from '@react-icons/all-files/io5/IoSwapVertical';

 import { isLocalhost } from '../../../externals';
 import { navigatorConstants } from '../../../viewerConfig';
+import useClickOutside from '../../hooks/useClickOutside';
 import { useElectronEvent } from '../../hooks/useElectronEvent';
 import useInfo from '../../hooks-query/useInfo';
 import { useClientStore } from '../../stores/clientStore';
@@ -47,8 +48,12 @@ function NavigationMenu(props: NavigationMenuProps) {
  const { mirror, toggleMirror } = useViewOptionsStore();
  const location = useLocation();

+  const menuRef = useRef<HTMLDivElement | null>(null);
+
+  useClickOutside(menuRef, () => onClose);
+
  return createPortal(
-    <div id='navigation-menu-portal'>
+    <div id='navigation-menu-portal' ref={menuRef}>
      <RenameClientModal id={id} name={name} isOpen={isOpenRename} onClose={onCloseRename} />
      <Drawer placement='left' onClose={onClose} isOpen={isOpen} variant='ontime' data-testid='navigation__menu'>
        <DrawerOverlay />
@@ -1,13 +1,9 @@
 .container {
-  width: 100%;
-  height: 100%;
-
  display: flex;
  flex-direction: column;
  align-items: center;
  padding-top: 25vh;

-  background: $ui-black;
  color: $ontime-color;
  font-weight: 200;
  font-size: 3rem;
@@ -46,4 +42,4 @@
  to {
    background: rgba($red-500, 0);
  }
-}
+}
@@ -1,12 +1,10 @@
@use '../../../theme/viewerDefs' as *;

-$title-primary-size: clamp(1.5rem, 3vw, 3rem);
-$title-secondary-size: clamp(1rem, 2vw, 2.25rem);
-
 .title-card {
  position: relative;
  display: flex;
  flex-direction: column;
+  gap: 0.25rem;
 }

 .title-card__title,
@@ -18,13 +16,13 @@ $title-secondary-size: clamp(1rem, 2vw, 2.25rem);

 .title-card__title {
  font-weight: 600;
-  font-size: $title-primary-size;
+  font-size: clamp(1.5rem, 3vw, 3rem);
  color: var(--color-override, $viewer-color);
  line-height: 1.2em;
 }

 .title-card__secondary {
-  font-size: $title-secondary-size;
+  font-size: clamp(1rem, 2vw, 2.25rem);
  color: var(--secondary-color-override, $viewer-secondary-color);
  line-height: 1.2em;
 }
@@ -33,7 +31,7 @@ $title-secondary-size: clamp(1rem, 2vw, 2.25rem);
  position: absolute;
  right: 1rem;
  top: 0.5rem;
-  font-size: $timer-label-size;
+  font-size: clamp(1rem, 1.5vw, 1.5rem);
  color: var(--secondary-color-override, $viewer-secondary-color);
  margin-left: auto;
  text-transform: uppercase;
@@ -5,7 +5,7 @@ import { useTranslation } from '../../../translation/TranslationProvider';
 import './TitleCard.scss';

 interface TitleCardProps {
-  title?: string;
+  title: string;
  label?: 'now' | 'next';
  secondary?: string;
  className?: string;
@@ -1,6 +1,6 @@
 import { useState } from 'react';

-import SwatchPicker from '../input/colour-input/SwatchPicker';
+import PopoverPicker from '../input/popover-picker/PopoverPicker';

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

@@ -20,10 +20,13 @@ 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}>
-      <SwatchPicker color={colour} onChange={setColour} alwaysDisplayColor />
-      <span>{colour}</span>
+      <PopoverPicker color={colour} onChange={debouncedChange} />
      <input type='hidden' name={name} value={colour} />
    </div>
  );
@@ -8,11 +8,39 @@
  }
 }

-.sectionList {
+.label {
+  font-size: $inner-section-text-size;
+  color: $label-gray;
  display: flex;
  flex-direction: column;
-  min-height: 100%;
-  gap: 2rem;
-  overflow-y: scroll;
-  padding-right: 0.5rem;
+  gap: 0.25rem;
+}
+
+.section {
+  color: $ui-white;
+  font-size: 1rem;
+
+  &:not(:first-child) {
+    margin-top: 2rem;
+  }
+}
+
+.fieldSet {
+  display: flex;
+  padding: $section-spacing 0;
+  flex-direction: column;
+  gap: $element-spacing;
+  margin-left: 0.5rem;
+}
+
+.title {
+  font-size: $inner-section-text-size;
+  display: block;
+  width: 100%;
+}
+
+.description {
+  font-size: $inner-section-text-size;
+  display: block;
+  color: $modal-note-color;
 }
@@ -12,11 +12,8 @@ import {
  useDisclosure,
 } from '@chakra-ui/react';

-import useViewSettings from '../../../common/hooks-query/useViewSettings';
-import Info from '../info/Info';
-
-import { ViewOption } from './types';
-import ViewParamsSection from './ViewParamsSection';
+import ParamInput from './ParamInput';
+import { isSection, ViewOption } from './types';

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

@@ -40,15 +37,15 @@ const getURLSearchParamsFromObj = (paramsObj: ViewParamsObj, paramFields: ViewOp

  // Convert paramFields to an object that contains default values
  const defaultValues: Record<string, string> = {};
-  paramFields.forEach((section) => {
-    section.options.forEach((option) => {
+  paramFields.forEach((option) => {
+    if (!isSection(option)) {
      defaultValues[option.id] = String(option.defaultValue);
+    }

-      // extract persisted values
-      if ('type' in option && option.type === 'persist') {
-        newSearchParams.set(option.id, option.value);
-      }
-    });
+    // extract persisted values
+    if ('type' in option && option.type === 'persist') {
+      newSearchParams.set(option.id, option.value);
+    }
  });

  // compare which values are different from the default values
@@ -90,8 +87,6 @@ interface EditFormDrawerProps {
 // TODO: this is a good candidate for memoisation, but needs the paramFields to be stable
 export default function ViewParamsEditor({ viewOptions }: EditFormDrawerProps) {
  const [searchParams, setSearchParams] = useSearchParams();
-  const { data: viewSettings } = useViewSettings();
-
  const { isOpen, onClose, onOpen } = useDisclosure();

  useEffect(() => {
@@ -132,16 +127,30 @@ export default function ViewParamsEditor({ viewOptions }: EditFormDrawerProps) {
        </DrawerHeader>

        <DrawerBody>
-          {viewSettings.overrideStyles && <Info>This view style is being modified by a custom CSS file.</Info>}
-          <form id='edit-params-form' onSubmit={onParamsFormSubmit} className={style.sectionList}>
-            {viewOptions.map((section) => (
-              <ViewParamsSection
-                key={section.title}
-                title={section.title}
-                collapsible={section.collapsible}
-                options={section.options}
-              />
-            ))}
+          <form id='edit-params-form' onSubmit={onParamsFormSubmit}>
+            {viewOptions.map((option) => {
+              if (isSection(option)) {
+                return (
+                  <div key={option.section} className={style.section}>
+                    {option.section}
+                  </div>
+                );
+              }
+
+              if (option.type === 'persist') {
+                return null;
+              }
+
+              return (
+                <div key={option.title} className={style.fieldSet}>
+                  <label className={style.label}>
+                    <span className={style.title}>{option.title}</span>
+                    <span className={style.description}>{option.description}</span>
+                    <ParamInput key={option.title} paramField={option} />
+                  </label>
+                </div>
+              );
+            })}
          </form>
        </DrawerBody>

@@ -1,50 +0,0 @@
-.section {
-  color: $ui-white;
-  font-size: 1rem;
-}
-
-.sectionHeader {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  height: 2rem;
-
-  &.collapsible {
-    cursor: pointer;
-
-    &:hover {
-      border-bottom: 1px solid $white-10;
-    }
-  }
-}
-
-.label {
-  margin-top: $section-spacing;
-  font-size: $inner-section-text-size;
-  color: $label-gray;
-  display: flex;
-  flex-direction: column;
-  gap: 0.25rem;
-}
-
-.title {
-  font-size: $inner-section-text-size;
-  display: block;
-  width: 100%;
-}
-
-.description {
-  font-size: $inner-section-text-size;
-  display: block;
-  color: $modal-note-color;
-}
-
-.closed {
-  transition: rotate $transition-time-feedback;
-  rotate: 0deg;
-}
-
-.open {
-  transition: rotate $transition-time-feedback;
-  rotate: 180deg;
-}
@@ -1,54 +0,0 @@
-import { useLocalStorage } from '@mantine/hooks';
-import { IoChevronDown } from '@react-icons/all-files/io5/IoChevronDown';
-
-import { cx } from '../../utils/styleUtils';
-
-import ParamInput from './ParamInput';
-import { type ParamField } from './types';
-
-import style from './ViewParamsSection.module.scss';
-
-interface ViewParamsSectionProps {
-  title: string;
-  collapsible?: boolean;
-  options: ParamField[];
-}
-
-export default function ViewParamsSection(props: ViewParamsSectionProps) {
-  const { title, collapsible, options } = props;
-
-  const [collapsed, setCollapsed] = useLocalStorage({ key: `params-${title}`, defaultValue: false });
-
-  const handleCollapse = () => {
-    if (collapsible) {
-      setCollapsed((prev) => !prev);
-    }
-  };
-
-  return (
-    <section className={style.section}>
-      <div className={cx([style.sectionHeader, collapsible && style.collapsible])} onClick={handleCollapse}>
-        {title}
-        {collapsible && <IoChevronDown className={cx([collapsed ? style.closed : style.open])} />}
-      </div>
-
-      {!collapsed && (
-        <>
-          {options.map((option) => {
-            if (option.type === 'persist') {
-              return null;
-            }
-
-            return (
-              <label key={option.title} className={style.label}>
-                <span className={style.title}>{option.title}</span>
-                <span className={style.description}>{option.description}</span>
-                <ParamInput paramField={option} />
-              </label>
-            );
-          })}
-        </>
-      )}
-    </section>
-  );
-}
@@ -38,14 +38,3 @@ export const showLeadingZeros: ParamField = {
  type: 'boolean',
  defaultValue: false,
 };
-
-export enum OptionTitle {
-  ClockOptions = 'Clock Options',
-  TimerOptions = 'Timer Options',
-  DataSources = 'Data sources',
-  ElementVisibility = 'Element visibility',
-  BehaviourOptions = 'View behaviour',
-  StyleOverride = 'View style override',
-  Animation = 'View animation',
-  Schedule = 'Schedule options',
-}
@@ -1,4 +1,6 @@
-import { OptionTitle } from './constants';
+type ParamSection = {
+  section: string;
+};

 type BaseField = {
  id: string;
@@ -26,9 +28,11 @@ type PersistedField = { type: 'persist'; defaultValue?: string; value: string };

 export type ParamField = BaseField &
  (OptionsField | MultiOptionsField | StringField | NumberField | BooleanField | ColourField | PersistedField);
+export type ViewOption = ParamSection | ParamField;

-export type ViewOption = {
-  title: OptionTitle;
-  options: ParamField[];
-  collapsible?: boolean;
-};
+/**
+ * Type assertion utility checks whether an entry is a section separator
+ */
+export function isSection(entry: ViewOption): entry is ParamSection {
+  return 'section' in entry;
+}
@@ -1,34 +0,0 @@
-import { useMutation, useQuery } from '@tanstack/react-query';
-
-import { queryRefetchIntervalSlow } from '../../ontimeConfig';
-import { editAutomationSettings, getAutomationSettings } from '../api/automation';
-import { AUTOMATION } from '../api/constants';
-import { logAxiosError } from '../api/utils';
-import { automationPlaceholderSettings } from '../models/AutomationSettings';
-import { ontimeQueryClient } from '../queryClient';
-
-export default function useAutomationSettings() {
-  const { data, status, isFetching, isError, refetch } = useQuery({
-    queryKey: AUTOMATION,
-    queryFn: getAutomationSettings,
-    placeholderData: (previousData, _previousQuery) => previousData,
-    retry: 5,
-    retryDelay: (attempt: number) => attempt * 2500,
-    refetchInterval: queryRefetchIntervalSlow,
-    networkMode: 'always',
-  });
-
-  return { data: data ?? automationPlaceholderSettings, status, isFetching, isError, refetch };
-}
-
-export function useAutomationSettingsMutation() {
-  const { isPending, mutateAsync } = useMutation({
-    mutationFn: editAutomationSettings,
-    onError: (error) => logAxiosError('Error saving Automation settings', error),
-    onSuccess: (data) => {
-      ontimeQueryClient.setQueryData(AUTOMATION, data);
-    },
-    onSettled: () => ontimeQueryClient.invalidateQueries({ queryKey: AUTOMATION }),
-  });
-  return { isPending, mutateAsync };
-}
@@ -0,0 +1,34 @@
+import { useMutation, useQuery } from '@tanstack/react-query';
+
+import { queryRefetchIntervalSlow } from '../../ontimeConfig';
+import { HTTP_SETTINGS } from '../api/constants';
+import { getHTTP, postHTTP } from '../api/http';
+import { logAxiosError } from '../api/utils';
+import { httpPlaceholder } from '../models/Http';
+import { ontimeQueryClient } from '../queryClient';
+
+export function useHttpSettings() {
+  const { data, status, isFetching, isError, refetch } = useQuery({
+    queryKey: HTTP_SETTINGS,
+    queryFn: getHTTP,
+    placeholderData: (previousData, _previousQuery) => previousData,
+    retry: 5,
+    retryDelay: (attempt: number) => attempt * 2500,
+    refetchInterval: queryRefetchIntervalSlow,
+    networkMode: 'always',
+  });
+
+  return { data: data ?? httpPlaceholder, status, isFetching, isError, refetch };
+}
+
+export function usePostHttpSettings() {
+  const { isPending, mutateAsync } = useMutation({
+    mutationFn: postHTTP,
+    onError: (error) => logAxiosError('Error saving HTTP settings', error),
+    onSuccess: (res) => {
+      ontimeQueryClient.setQueryData(HTTP_SETTINGS, res.data);
+    },
+    onSettled: () => ontimeQueryClient.invalidateQueries({ queryKey: HTTP_SETTINGS }),
+  });
+  return { isPending, mutateAsync };
+}
@@ -0,0 +1,34 @@
+import { useMutation, useQuery } from '@tanstack/react-query';
+
+import { queryRefetchIntervalSlow } from '../../ontimeConfig';
+import { OSC_SETTINGS } from '../api/constants';
+import { getOSC, postOSC } from '../api/osc';
+import { logAxiosError } from '../api/utils';
+import { oscPlaceholderSettings } from '../models/OscSettings';
+import { ontimeQueryClient } from '../queryClient';
+
+export default function useOscSettings() {
+  const { data, status, isFetching, isError, refetch } = useQuery({
+    queryKey: OSC_SETTINGS,
+    queryFn: getOSC,
+    placeholderData: (previousData, _previousQuery) => previousData,
+    retry: 5,
+    retryDelay: (attempt: number) => attempt * 2500,
+    refetchInterval: queryRefetchIntervalSlow,
+    networkMode: 'always',
+  });
+
+  return { data: data ?? oscPlaceholderSettings, status, isFetching, isError, refetch };
+}
+
+export function useOscSettingsMutation() {
+  const { isPending, mutateAsync } = useMutation({
+    mutationFn: postOSC,
+    onError: (error) => logAxiosError('Error saving OSC settings', error),
+    onSuccess: (res) => {
+      ontimeQueryClient.setQueryData(OSC_SETTINGS, res.data);
+    },
+    onSettled: () => ontimeQueryClient.invalidateQueries({ queryKey: OSC_SETTINGS }),
+  });
+  return { isPending, mutateAsync };
+}
@@ -0,0 +1,46 @@
+import { act, renderHook } from '@testing-library/react';
+
+import useClickOutside from '../useClickOutside';
+
+describe('useClickOutside', () => {
+  let target: HTMLElement;
+  let anotherElement: HTMLElement;
+
+  beforeAll(() => {
+    target = global.document.createElement('div');
+    global.document.body.appendChild(target);
+
+    anotherElement = global.document.createElement('div');
+    global.document.body.appendChild(anotherElement);
+  });
+
+  it('should trigger clicking outside', () => {
+    const ref = { current: target };
+    const callback = vi.fn();
+    renderHook(() => useClickOutside(ref, callback));
+
+    act(() => {
+      global.document.dispatchEvent(new Event('click'));
+    });
+
+    expect(callback).toHaveBeenCalled();
+
+    act(() => {
+      anotherElement.click();
+    });
+
+    expect(callback).toHaveBeenCalledTimes(2);
+  });
+
+  it('should not trigger clicking inside', () => {
+    const ref = { current: target };
+    const callback = vi.fn();
+    renderHook(() => useClickOutside(ref, callback));
+
+    act(() => {
+      target.click();
+    });
+
+    expect(callback).not.toHaveBeenCalled();
+  });
+});
@@ -0,0 +1,25 @@
+import { RefObject, useEffect } from 'react';
+
+type ClickOutsideEventHandler = (event: MouseEvent) => void;
+
+export default function useClickOutside<T extends HTMLElement = HTMLElement>(
+  ref: RefObject<T>,
+  callback: ClickOutsideEventHandler,
+) {
+  useEffect(() => {
+    function handleClick(event: MouseEvent) {
+      const element = ref?.current;
+
+      // Do nothing if clicking ref's element or descendent element
+      if (!element || element.contains(event.target as Node)) {
+        return;
+      }
+      callback(event);
+    }
+
+    document.addEventListener('click', handleClick);
+    return () => {
+      document.removeEventListener('click', handleClick);
+    };
+  }, [ref, callback]);
+}
@@ -1,16 +1,6 @@
 import { useCallback } from 'react';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import {
-  isOntimeEvent,
-  OntimeBlock,
-  OntimeDelay,
-  OntimeEvent,
-  OntimeRundownEntry,
-  RundownCached,
-  TimeField,
-  TimeStrategy,
-  TransientEventPayload,
-} from 'ontime-types';
+import { isOntimeEvent, OntimeEvent, OntimeRundownEntry, RundownCached } from 'ontime-types';
 import { dayInMs, MILLIS_PER_SECOND, parseUserTime, reorderArray, swapEventData } from 'ontime-utils';

 import { RUNDOWN } from '../api/constants';
@@ -29,16 +19,6 @@ import {
 import { logAxiosError } from '../api/utils';
 import { useEditorSettings } from '../stores/editorSettings';

-export type EventOptions = Partial<{
-  // options to any new block (event / delay / block)
-  after: string;
-  before: string;
-  // options to blocks of type OntimeEvent
-  defaultPublic: boolean;
-  linkPrevious: boolean;
-  lastEventId: string;
-}>;
-
 /**
 * @description Set of utilities for events //TODO: should this be called useEntryAction and so on
 */
@@ -67,19 +47,31 @@ export const useEventAction = () => {
    networkMode: 'always',
  });

+  // options to any new block (event / delay / block)
+  type BaseOptions = {
+    after?: string;
+  };
+
+  // options to blocks of type OntimeEvent
+  type EventOptions = BaseOptions &
+    Partial<{
+      defaultPublic: boolean;
+      linkPrevious: boolean;
+      lastEventId: string;
+    }>;
+
  /**
   * Adds an event to rundown
   */
  const addEvent = useCallback(
-    async (event: Partial<OntimeEvent | OntimeDelay | OntimeBlock>, options?: EventOptions) => {
-      const newEvent: TransientEventPayload = { ...event };
+    async (event: Partial<OntimeRundownEntry>, options?: EventOptions) => {
+      const newEvent: Partial<OntimeRundownEntry> = { ...event };

      // ************* CHECK OPTIONS specific to events
      if (isOntimeEvent(newEvent)) {
        // merge creation time options with event settings
        const applicationOptions = {
          after: options?.after,
-          before: options?.before,
          defaultPublic: options?.defaultPublic ?? defaultPublic,
          lastEventId: options?.lastEventId,
          linkPrevious: options?.linkPrevious ?? linkPrevious,
@@ -129,16 +121,11 @@ export const useEventAction = () => {

      // handle adding options that concern all event type
      if (options?.after) {
-        // @ts-expect-error -- not sure how to type this, <after> is a transient property
        newEvent.after = options.after;
      }
-      if (options?.before) {
-        // @ts-expect-error -- not sure how to type this, <before> is a transient property
-        newEvent.before = options.before;
-      }

      try {
-        await _addEventMutation.mutateAsync(newEvent as TransientEventPayload);
+        await _addEventMutation.mutateAsync(newEvent);
      } catch (error) {
        logAxiosError('Failed adding event', error);
      }
@@ -216,75 +203,13 @@ export const useEventAction = () => {
    [updateEvent],
  );

+  type TimeField = 'timeStart' | 'timeEnd' | 'duration';
  /**
   * Updates time of existing event
-   * @param eventId {string} - id of the event
-   * @param field {TimeField} - field to update
-   * @param value {string} - new value string to be parsed
-   * @param lockOnUpdate {boolean} - whether we will apply the lock / release on update
   */
  const updateTimer = useCallback(
-    async (eventId: string, field: TimeField, value: string, lockOnUpdate?: boolean) => {
-      // an empty value with no lock has no domain validity
-      if (!lockOnUpdate && value === '') {
-        return;
-      }
-
-      const newEvent: Partial<OntimeEvent> = {
-        id: eventId,
-      };
-
-      // check if we should lock the field
-      if (lockOnUpdate) {
-        if (field === 'timeEnd') {
-          // an empty value indicates that we should unlock the field
-          newEvent.timeStrategy = value === '' ? TimeStrategy.LockDuration : TimeStrategy.LockEnd;
-          newEvent.timeEnd = value === '' ? undefined : calculateNewValue();
-        } else if (field === 'duration') {
-          // an empty value indicates that we should unlock the field
-          newEvent.timeStrategy = value === '' ? TimeStrategy.LockEnd : TimeStrategy.LockDuration;
-          newEvent.duration = value === '' ? undefined : calculateNewValue();
-        } else if (field === 'timeStart') {
-          // an empty values means we should link to the previous
-          newEvent.linkStart = value === '' ? 'true' : null;
-          newEvent.timeStart = value === '' ? undefined : calculateNewValue();
-        }
-      } else {
-        newEvent[field] = calculateNewValue();
-      }
-
-      try {
-        await _updateEventMutation.mutateAsync(newEvent);
-      } catch (error) {
-        logAxiosError('Error updating event', error);
-      }
-
-      /**
-       * Utility function to calculate the new time value
-       */
-      function calculateNewValue(): number {
-        let newValMillis = 0;
-
-        // check for previous keyword
-        if (value === 'p' || value === 'prev' || value === 'previous') {
-          newValMillis = getPreviousEnd();
-
-          // check for adding time keyword
-        } else if (value.startsWith('+') || value.startsWith('p+') || value.startsWith('p +')) {
-          // TODO: is this logic solid?
-          const remainingString = value.substring(1);
-          newValMillis = getPreviousEnd() + parseUserTime(remainingString);
-        } else {
-          newValMillis = parseUserTime(value);
-        }
-        // dont allow timer values over 23:59:59
-        return Math.min(newValMillis, dayInMs - MILLIS_PER_SECOND);
-      }
-
-      /**
-       * Utility function to get the previous event end time
-       */
-      function getPreviousEnd(): number {
+    async (eventId: string, field: TimeField, value: string) => {
+      const getPreviousEnd = (): number => {
        const cachedRundown = queryClient.getQueryData<RundownCached>(RUNDOWN);

        if (!cachedRundown?.order || !cachedRundown?.rundown) {
@@ -304,6 +229,34 @@ export const useEventAction = () => {
          }
        }
        return previousEnd;
+      };
+
+      let newValMillis = 0;
+
+      // check for previous keyword
+      if (value === 'p' || value === 'prev' || value === 'previous') {
+        newValMillis = getPreviousEnd();
+
+        // check for adding time keyword
+      } else if (value.startsWith('+') || value.startsWith('p+') || value.startsWith('p +')) {
+        // TODO: is this logic solid?
+        const remainingString = value.substring(1);
+        newValMillis = getPreviousEnd() + parseUserTime(remainingString);
+      } else {
+        newValMillis = parseUserTime(value);
+      }
+
+      // dont allow timer values over 23:59:59
+      const cappedMillis = Math.min(newValMillis, dayInMs - MILLIS_PER_SECOND);
+
+      const newEvent = {
+        id: eventId,
+        [field]: cappedMillis,
+      };
+      try {
+        await _updateEventMutation.mutateAsync(newEvent);
+      } catch (error) {
+        logAxiosError('Error updating event', error);
      }
    },
    [_updateEventMutation, queryClient],
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';

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

 export const useFadeOutOnInactivity = () => {
  const [isMouseMoved, setIsMouseMoved] = useState(false);
@@ -16,11 +16,11 @@ export const useFadeOutOnInactivity = () => {
      fadeOut = setTimeout(() => setIsMouseMoved(false), 3000);
    };

-    const throttledShowMenu = throttle(setShowMenuTrue, 1000);
+    const debouncedShowMenu = debounce(setShowMenuTrue, 1000);

-    document.addEventListener('mousemove', throttledShowMenu);
+    document.addEventListener('mousemove', debouncedShowMenu);
    return () => {
-      document.removeEventListener('mousemove', throttledShowMenu);
+      document.removeEventListener('mousemove', debouncedShowMenu);
      if (fadeOut) {
        clearTimeout(fadeOut);
      }
@@ -65,7 +65,7 @@ export const useMessagePreview = () => {
    showExternalMessage: state.message.timer.secondarySource === 'external' && Boolean(state.message.external),
    showTimerMessage: state.message.timer.visible && Boolean(state.message.timer.text),
    timerType: state.eventNow?.timerType ?? null,
-    countToEnd: state.eventNow?.countToEnd ?? false,
+    isTimeToEnd: state.eventNow?.isTimeToEnd ?? false,
  });

  return useRuntimeStore(featureSelector);
@@ -149,18 +149,16 @@ export const setAuxTimer = {
  setDuration: (time: number) => socketSendJson('auxtimer', { '1': { duration: time } }),
 };

-export const useSelectedEventId = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    selectedEventId: state.eventNow?.id ?? null,
-  });
-
-  return useRuntimeStore(featureSelector);
-};
-
-export const useCurrentBlockId = () => {
+export const useCuesheet = () => {
  const featureSelector = (state: RuntimeStore) => ({
+    playback: state.timer.playback,
    currentBlockId: state.currentBlock.block?.id ?? null,
+    selectedEventId: state.eventNow?.id ?? null,
+    selectedEventIndex: state.runtime.selectedEventIndex,
+    numEvents: state.runtime.numEvents,
+    titleNow: state.eventNow?.title || '',
  });
+
  return useRuntimeStore(featureSelector);
 };

@@ -1,9 +0,0 @@
-import { AutomationSettings } from 'ontime-types';
-
-export const automationPlaceholderSettings: AutomationSettings = {
-  enabledAutomations: false,
-  enabledOscIn: false,
-  oscPortIn: 8888,
-  triggers: [],
-  automations: {},
-};
@@ -0,0 +1,6 @@
+import { HttpSettings } from 'ontime-types';
+
+export const httpPlaceholder: HttpSettings = {
+  enabledOut: false,
+  subscriptions: [],
+};
@@ -1,8 +1,11 @@
 import { GetInfo } from 'ontime-types';

+import { oscPlaceholderSettings } from './OscSettings';
+
 export const ontimePlaceholderInfo: GetInfo = {
  networkInterfaces: [],
  version: '2.0.0',
  serverPort: 4001,
+  osc: oscPlaceholderSettings,
  publicDir: '',
 };
@@ -0,0 +1,10 @@
+import { OSCSettings } from 'ontime-types';
+
+export const oscPlaceholderSettings: OSCSettings = {
+  portIn: 8888,
+  portOut: 9999,
+  targetIP: '127.0.0.1',
+  enabledIn: false,
+  enabledOut: false,
+  subscriptions: [],
+};
@@ -15,5 +15,5 @@ export type ViewExtendedTimer = {

  clock: number;
  timerType: TimerType;
-  countToEnd: boolean;
+  isTimeToEnd: boolean;
 };
@@ -14,18 +14,6 @@ export const runtimeStore = createWithEqualityFn<RuntimeStore>(
 export const useRuntimeStore = <T>(selector: (state: RuntimeStore) => T) =>
  useStoreWithEqualityFn(runtimeStore, selector, deepCompare);

-let batchStore: Partial<RuntimeStore> = {};
-
-export function addToBatchUpdates<K extends keyof RuntimeStore>(key: K, value: RuntimeStore[K]) {
-  batchStore[key] = value;
-}
-
-export function flushBatchUpdates() {
-  const state = runtimeStore.getState();
-  runtimeStore.setState({ ...state, ...batchStore });
-  batchStore = {};
-}
-
 /**
 * Allows patching a property of the runtime store
 */
@@ -1,17 +0,0 @@
-import { linkToOtherHost } from '../linkUtils';
-
-describe('linkToOTherHost', () => {
-  it('should handle electron links', () => {
-    const serverUrl = 'http://localhost:4001';
-    const baseUri = '';
-    const destination = linkToOtherHost('192.168.10.166', 'path', serverUrl, baseUri);
-    expect(destination).toBe('http://192.168.10.166:4001/path');
-  });
-
-  it('should handle ontime cloud links', () => {
-    const serverUrl = 'https://cloud.getontime.no/user-hash';
-    const baseUri = 'user-hash';
-    const destination = linkToOtherHost('cloud.getontime.no', 'path', serverUrl, baseUri);
-    expect(destination).toBe('https://cloud.getontime.no/user-hash/path');
-  });
-});
@@ -26,8 +26,8 @@ describe('simple tests for regex', () => {
  });

  test('startsWithHttp', () => {
-    const right = ['https://test', 'http://test'];
-    const wrong = ['testing', '123.0.1'];
+    const right = ['http://test'];
+    const wrong = ['https://test', 'testing', '123.0.1'];

    right.forEach((t) => {
      expect(startsWithHttp.test(t)).toBe(true);
@@ -3,8 +3,8 @@ import { formatFromMillis, MILLIS_PER_HOUR, MILLIS_PER_MINUTE } from 'ontime-uti

 /**
 * Parses a value in millis to a string which encodes a delay
- * @param millis
- * @param format
+ * @param millis 
+ * @param format 
 */
 export function millisToDelayString(millis: MaybeNumber, format: 'compact' | 'expanded' = 'compact'): string {
  if (millis == null || millis === 0) {
@@ -1,12 +1,12 @@
-export function debounce<T extends any[]>(callback: (...args: T) => void, wait: number) {
+export function debounce(callback: () => void, wait: number) {
  let timeout: NodeJS.Timeout | null;
-  return (...args: T) => {
+  return () => {
    if (timeout) {
-      clearTimeout(timeout);
+      return;
    }
    timeout = setTimeout(() => {
      timeout = null;
-      callback(...args);
+      callback();
    }, wait);
  };
 }
@@ -7,7 +7,7 @@ import { OntimeEvent, SupportedEvent } from 'ontime-types';
 * @return {OntimeEvent} clean event
 */
 type ClonedEvent = Omit<OntimeEvent, 'id' | 'cue'>;
-export const cloneEvent = (event: OntimeEvent): ClonedEvent => {
+export const cloneEvent = (event: OntimeEvent, after?: string): ClonedEvent => {
  return {
    type: SupportedEvent.Event,
    title: event.title,
@@ -17,16 +17,14 @@ export const cloneEvent = (event: OntimeEvent): ClonedEvent => {
    timeEnd: event.timeEnd,
    timerType: event.timerType,
    timeStrategy: event.timeStrategy,
-    countToEnd: event.countToEnd,
+    isTimeToEnd: event.isTimeToEnd,
    linkStart: event.linkStart,
    endAction: event.endAction,
    isPublic: event.isPublic,
    skip: event.skip,
    colour: event.colour,
+    after,
    revision: 0,
-    delay: 0,
-    dayOffset: 0,
-    gap: 0,
    timeWarning: event.timeWarning,
    timeDanger: event.timeDanger,
    custom: {},
@@ -7,11 +7,3 @@ export function isKeyEnter<T>(event: KeyboardEvent<T>): boolean {
 export function isKeyEscape<T>(event: KeyboardEvent<T>): boolean {
  return event.key === 'Escape';
 }
-
-export function preventEscape<T>(event: KeyboardEvent<T>, callback?: () => void): void {
-  if (isKeyEscape(event)) {
-    event.preventDefault();
-    event.stopPropagation();
-    callback?.();
-  }
-}
@@ -18,32 +18,23 @@ export function openLink(url: string) {

 /**
 * Handles opening external links
- * serverUrl and baseURI are used for testing
+ * @param event
+ * @param location
 */
-export function handleLinks(
-  event: MouseEvent,
-  location: string,
-  externalServerUrl: string = serverURL,
-  externalBaseURI: string = baseURI,
-) {
+export function handleLinks(event: MouseEvent, location: string) {
  // we handle the link manually
  event.preventDefault();

-  const destination = new URL(externalServerUrl);
-  destination.pathname = externalBaseURI ? `${externalBaseURI}/${location}` : location;
+  const destination = new URL(serverURL);
+  destination.pathname = baseURI ? `${baseURI}/${location}` : location;
  openLink(destination.toString());
 }

-export function linkToOtherHost(
-  host: string,
-  path?: string,
-  externalServerUrl: string = serverURL,
-  externalBaseURI: string = baseURI,
-) {
-  const destination = new URL(externalServerUrl);
+export function linkToOtherHost(host: string, path?: string) {
+  const destination = new URL(serverURL);
  destination.hostname = host;
  if (path) {
-    destination.pathname = externalBaseURI ? `${externalBaseURI}/${path}` : path;
+    destination.pathname = baseURI ? `${baseURI}/${path}` : path;
  }
  return destination.toString();
 }
@@ -5,7 +5,7 @@

 export const isOnlyNumbers = /^\d+$/;
 export const isIPAddress = /^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4}$/;
-export const startsWithHttp = /^https?:\/\//;
+export const startsWithHttp = /^http:\/\//;
 export const startsWithSlash = /^\//;
 export const isAlphanumeric = /^[a-z0-9]+$/i;
 export const isASCII = /^[ -~]+$/; //https://catonmat.net/my-favorite-regex
@@ -14,7 +14,7 @@ import {
 } from '../stores/clientStore';
 import { addDialog } from '../stores/dialogStore';
 import { addLog } from '../stores/logger';
-import { addToBatchUpdates, flushBatchUpdates, patchRuntime, patchRuntimeProperty } from '../stores/runtime';
+import { patchRuntime, patchRuntimeProperty } from '../stores/runtime';

 export let websocket: WebSocket | null = null;
 let reconnectTimeout: NodeJS.Timeout | null = null;
@@ -140,57 +140,57 @@ export const connectSocket = () => {
          break;
        }
        case 'ontime-clock': {
-          addToBatchUpdates('clock', payload);
+          patchRuntimeProperty('clock', payload);
          updateDevTools({ clock: payload });
          break;
        }
        case 'ontime-timer': {
-          addToBatchUpdates('timer', payload);
+          patchRuntimeProperty('timer', payload);
          updateDevTools({ timer: payload });
          break;
        }
        case 'ontime-onAir': {
-          addToBatchUpdates('onAir', payload);
+          patchRuntimeProperty('onAir', payload);
          updateDevTools({ onAir: payload });
          break;
        }
        case 'ontime-message': {
-          addToBatchUpdates('message', payload);
+          patchRuntimeProperty('message', payload);
          updateDevTools({ message: payload });
          break;
        }
        case 'ontime-runtime': {
-          addToBatchUpdates('runtime', payload);
+          patchRuntimeProperty('runtime', payload);
          updateDevTools({ runtime: payload });
          break;
        }
        case 'ontime-eventNow': {
-          addToBatchUpdates('eventNow', payload);
+          patchRuntimeProperty('eventNow', payload);
          updateDevTools({ eventNow: payload });
          break;
        }
        case 'ontime-currentBlock': {
-          addToBatchUpdates('currentBlock', payload);
+          patchRuntimeProperty('currentBlock', payload);
          updateDevTools({ currentBlock: payload });
          break;
        }
        case 'ontime-publicEventNow': {
-          addToBatchUpdates('publicEventNow', payload);
+          patchRuntimeProperty('publicEventNow', payload);
          updateDevTools({ publicEventNow: payload });
          break;
        }
        case 'ontime-eventNext': {
-          addToBatchUpdates('eventNext', payload);
+          patchRuntimeProperty('eventNext', payload);
          updateDevTools({ eventNext: payload });
          break;
        }
        case 'ontime-publicEventNext': {
-          addToBatchUpdates('publicEventNext', payload);
+          patchRuntimeProperty('publicEventNext', payload);
          updateDevTools({ publicEventNext: payload });
          break;
        }
        case 'ontime-auxtimer1': {
-          addToBatchUpdates('auxtimer1', payload);
+          patchRuntimeProperty('auxtimer1', payload);
          updateDevTools({ auxtimer1: payload });
          break;
        }
@@ -207,10 +207,6 @@ export const connectSocket = () => {
          }
          break;
        }
-        case 'ontime-flush': {
-          flushBatchUpdates()
-          break;
-        }
      }
    } catch (_) {
      // ignore unhandled
@@ -1,12 +0,0 @@
-export function throttle<T extends any[]>(callback: (...args: T) => void, wait: number) {
-  let timeout: NodeJS.Timeout | null;
-  return (...args: T) => {
-    if (timeout) {
-      return;
-    }
-    timeout = setTimeout(() => {
-      timeout = null;
-      callback(...args);
-    }, wait);
-  };
-}
@@ -28,13 +28,6 @@ export const validateUrlPresetPath = (preset: string): { message: string; isVali
  return { isValid: true, message: 'ok' };
 };

-/**
- * Utility removes trailing slash from a string
- */
-function removeTrailingSlash(text: string): string {
-  return text.replace(/\/$/, '');
-}
-
 /**
 * Gets the URL to send a preset to
 * @param location
@@ -45,7 +38,7 @@ export const getRouteFromPreset = (location: Location, data: URLPreset[], search
  const currentURL = location.pathname.substring(1);

  // we need to check if the whole url here is an alias, so we can redirect
-  const foundPreset = data.find((preset) => preset.alias === removeTrailingSlash(currentURL) && preset.enabled);
+  const foundPreset = data.filter((d) => d.alias === currentURL && d.enabled)[0];
  if (foundPreset) {
    return generateUrlFromPreset(foundPreset);
  }
@@ -6,9 +6,6 @@ declare module '*.scss' {
 type ListenerType = (event: 'string', args: unknown[]) => void;

 declare global {
-  /**
-   * Register the electron properties
-   */
  interface Window {
    ipcRenderer: {
      send: (channel: string, args?: string | object) => void;
@@ -20,24 +17,6 @@ declare global {
  }
 }

-/**
- * We pass a custom property to the table meta to allow field update
- */
-declare module '@tanstack/react-table' {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  interface TableMeta<TData extends RowData> {
-    handleUpdate: (rowIndex: number, accessor: string, payload: string, isCustom: boolean) => void;
-    handleUpdateTimer: (eventId: string, field: TimeField, payload: string) => void;
-    options: {
-      showDelayedTimes: boolean;
-      hideTableSeconds: boolean;
-    };
-  }
-}
-
-/**
- * Allow passing CSS Properties
- */
 declare module 'react' {
  interface CSSProperties {
    [key: `--${string}`]: string | number;
@@ -12,9 +12,6 @@ export const discordUrl = 'https://discord.com/invite/eje3CSUEXm';
 export const documentationUrl = 'https://docs.getontime.no';
 export const customFieldsDocsUrl = 'https://docs.getontime.no/features/custom-fields/';

-export const githubSponsorUrl = 'https://github.com/sponsors/cpvalente';
-export const buyMeACoffeeUrl = 'https://buymeacoffee.com/cpvalente';
-
 // resolve environment
 export const appVersion = version;
 export const isProduction = import.meta.env.MODE === 'production';
@@ -75,4 +72,4 @@ function resolveBaseURI(): string {
  }

  return base;
-}
+}
@@ -3,9 +3,10 @@ import { ErrorBoundary } from '@sentry/react';
 import { useKeyDown } from '../../common/hooks/useKeyDown';

 import AboutPanel from './panel/about-panel/AboutPanel';
-import AutomationPanel from './panel/automations-panel/AutomationPanel';
+import ClientControlPanel from './panel/client-control-panel/ClientControlPanel';
 import FeatureSettingsPanel from './panel/feature-settings-panel/FeatureSettingsPanel';
 import GeneralPanel from './panel/general-panel/GeneralPanel';
+import IntegrationsPanel from './panel/integrations-panel/IntegrationsPanel';
 import NetworkLogPanel from './panel/network-panel/NetworkLogPanel';
 import ProjectPanel from './panel/project-panel/ProjectPanel';
 import ShutdownPanel from './panel/shutdown-panel/ShutdownPanel';
@@ -29,9 +30,10 @@ export default function AppSettings() {
          {panel === 'general' && <GeneralPanel location={location} />}
          {panel === 'feature_settings' && <FeatureSettingsPanel location={location} />}
          {panel === 'sources' && <SourcesPanel />}
-          {panel === 'automation' && <AutomationPanel location={location} />}
-          {panel === 'network' && <NetworkLogPanel location={location} />}
+          {panel === 'integrations' && <IntegrationsPanel location={location} />}
+          {panel === 'client_control' && <ClientControlPanel />}
          {panel === 'about' && <AboutPanel />}
+          {panel === 'network' && <NetworkLogPanel location={location} />}
          {panel === 'shutdown' && <ShutdownPanel />}
        </PanelContent>
      </ErrorBoundary>
@@ -10,6 +10,7 @@
  flex-direction: column;
  height: 100%;
  width: 100%;
+
  position: relative;
 }

@@ -17,5 +18,4 @@
  margin: 1rem;
  overflow-y: auto;
  flex-grow: 1;
-  padding-bottom: 300px;
 }
@@ -70,7 +70,7 @@ function PanelListItem(props: PanelListItemProps) {
      </li>
      {panel.secondary?.map((secondary) => {
        const id = secondary.id.split('__')[1];
-        const secondaryClasses = cx([style.secondary, isSelected && location === id ? style.active : null]);
+        const secondaryClasses = cx([style.secondary, location === id ? style.active : null]);
        return (
          <li
            key={secondary.id}
@@ -26,26 +26,17 @@ $inner-padding: 1rem;
  color: $gray-300;
 }

-.section,
-.indent {
+.section {
+  position: relative;
+  margin-top: 2rem;
  font-size: calc(1rem - 1px);
+  max-width: 800px;
  display: flex;
  flex-direction: column;
  gap: 1rem;
  color: $ui-white;
 }

-.section {
-  position: relative;
-  margin-top: 2rem;
-  max-width: 800px;
-}
-
-.indent {
-  padding: 1rem;
-  background-color: $gray-1350;
-}
-
 .paragraph {
  padding: 0.5rem 0;
 }
@@ -93,6 +84,7 @@ $inner-padding: 1rem;
    position: sticky;
    top: 0;
    z-index: 3;
+    box-shadow: 0 1px $white-10;
    background-color: $gray-1350;
  }

@@ -111,12 +103,6 @@ $inner-padding: 1rem;
  tr:nth-child(even) {
    background-color: $white-1;
  }
-
-  // allow highlighting table elements
-  tr[data-warn='true'],
-  td[data-warn='true'] {
-    background-color: $orange-1300;
-  }
 }

 .listGroup {
@@ -177,38 +163,6 @@ $inner-padding: 1rem;
  animation: animloader 1s ease-in infinite;
 }

-.empty {
-  background-color: $black-10;
-  text-align: center;
-  color: $muted-gray;
-
-  td {
-    padding-block: 1rem;
-  }
-
-  button {
-    margin-top: 1rem;
-  }
-}
-
-.inlineElements {
-  display: flex;
-  align-items: center;
-
-  &.inner {
-    gap: 0.5rem;
-  }
-  &.component {
-    gap: 1rem;
-  }
-  &.start {
-    justify-content: flex-start;
-  }
-  &.end {
-    justify-content: flex-end;
-  }
-}
-
@keyframes animloader {
  0% {
    transform: scale(0);
@@ -1,6 +1,4 @@
-import { HTMLAttributes, PropsWithChildren, ReactNode } from 'react';
-import { Button } from '@chakra-ui/react';
-import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
+import { HTMLAttributes, ReactNode } from 'react';

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

@@ -24,19 +22,10 @@ type SectionProps<C extends AllowedTags> = {
  children: ReactNode;
 } & JSX.IntrinsicElements[C];

-export function Section<C extends AllowedTags = 'div'>({ as, className, children, ...props }: SectionProps<C>) {
+export function Section<C extends AllowedTags = 'div'>({ as, children, ...props }: SectionProps<C>) {
  const Element = as ?? 'div';
  return (
-    <Element className={cx([style.section, className])} {...(props as HTMLAttributes<HTMLElement>)}>
-      {children}
-    </Element>
-  );
-}
-
-export function Indent<C extends AllowedTags = 'div'>({ as, className, children, ...props }: SectionProps<C>) {
-  const Element = as ?? 'div';
-  return (
-    <Element className={cx([style.indent, className])} {...(props as HTMLAttributes<HTMLElement>)}>
+    <Element className={style.section} {...(props as HTMLAttributes<HTMLElement>)}>
      {children}
    </Element>
  );
@@ -55,28 +44,16 @@ export function Card({ children, className, ...props }: { children: ReactNode }
 }

 export function Table({ className, children }: { className?: string; children: ReactNode }) {
+  const classes = cx([style.table, className]);
  return (
    <div className={style.pad}>
-      <table className={cx([style.table, className])}>{children}</table>
+      <table className={classes}>{children}</table>
    </div>
  );
 }

-export function TableEmpty({ label, handleClick }: { label?: string; handleClick?: () => void }) {
-  return (
-    <tr className={style.empty}>
-      <td colSpan={99}>
-        <div>{label ?? 'No data yet'}</div>
-        <Button onClick={handleClick} isDisabled={!handleClick} variant='ontime-filled' rightIcon={<IoAdd />} size='sm'>
-          New
-        </Button>
-      </td>
-    </tr>
-  );
-}
-
-export function ListGroup({ className, children }: { className?: string; children: ReactNode }) {
-  return <ul className={cx([style.listGroup, className])}>{children}</ul>;
+export function ListGroup({ children }: { children: ReactNode }) {
+  return <ul className={style.listGroup}>{children}</ul>;
 }

 export function ListItem({ children }: { children: ReactNode }) {
@@ -123,22 +100,3 @@ export function Loader({ isLoading }: { isLoading: boolean }) {
    </div>
  );
 }
-
-type AllowedInlineTags = 'div' | 'td';
-type InlineProps<C extends AllowedInlineTags> = {
-  as?: C;
-  relation?: 'inner' | 'component' | 'section';
-  align?: 'start' | 'end';
-  className?: string;
-};
-
-export function InlineElements<C extends AllowedInlineTags = 'div'>({
-  children,
-  as,
-  relation = 'component',
-  align = 'start',
-  className,
-}: PropsWithChildren<InlineProps<C>>) {
-  const Element = as ?? 'div';
-  return <Element className={cx([style.inlineElements, style[relation], style[align], className])}>{children}</Element>;
-}
@@ -1,12 +1,5 @@
 import ExternalLink from '../../../../common/components/external-link/ExternalLink';
-import {
-  buyMeACoffeeUrl,
-  discordUrl,
-  documentationUrl,
-  githubSponsorUrl,
-  githubUrl,
-  websiteUrl,
-} from '../../../../externals';
+import { discordUrl, documentationUrl, githubUrl, websiteUrl } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';

 import AppVersion from './AppVersion';
@@ -16,29 +9,22 @@ export default function AboutPanel() {
    <>
      <Panel.Header>About Ontime</Panel.Header>
      <Panel.Section>
-        <Panel.Card>
-          <Panel.SubHeader>Ontime</Panel.SubHeader>
-          <Panel.Paragraph>
-            Free, open-source software for managing rundowns and event timers
-            <ExternalLink href={websiteUrl}>www.getontime.no</ExternalLink>
-          </Panel.Paragraph>
-          <Panel.Paragraph>
-            Considering sponsoring our work
-            <ExternalLink href={githubSponsorUrl}>GitHub Sponsors</ExternalLink>
-            <ExternalLink href={buyMeACoffeeUrl}>Buy Me a Coffee</ExternalLink>
-          </Panel.Paragraph>
-          <Panel.Paragraph>
-            And trying out our cloud service
-            <ExternalLink href={websiteUrl}>www.getontime.no</ExternalLink>
-          </Panel.Paragraph>
-        </Panel.Card>
-        <Panel.SubHeader>Current version</Panel.SubHeader>
-        <AppVersion />
+        <Panel.SubHeader>Ontime</Panel.SubHeader>
+        <Panel.Paragraph>
+          Free, open-source software for managing rundowns and event timers
+          <ExternalLink href={websiteUrl}>www.getontime.no</ExternalLink>
+        </Panel.Paragraph>
+      </Panel.Section>
+      <Panel.Section>
        <Panel.SubHeader>Links</Panel.SubHeader>
        <ExternalLink href={documentationUrl}>Read the docs</ExternalLink>
        <ExternalLink href={githubUrl}>Follow the project on GitHub</ExternalLink>
        <ExternalLink href={discordUrl}>Discord server</ExternalLink>
      </Panel.Section>
+      <Panel.Section>
+        <Panel.SubHeader>Current version</Panel.SubHeader>
+        <AppVersion />
+      </Panel.Section>
    </>
  );
 }
@@ -1,74 +0,0 @@
-.outerColumn {
-  gap: 2rem;
-  margin-bottom: 2rem;
-
-  h3 {
-    font-size: 1rem;
-  }
-}
-
-.innerColumn {
-  display: flex;
-  flex-direction: column;
-  gap: 0.5rem;
-}
-
-.matchRadio {
-  display: flex;
-  gap: 1rem;
-}
-
-.ruleSection {
-  display: flex;
-  flex-direction: column;
-  gap: 1rem;
-}
-
-.titleSection,
-.filterSection,
-.oscSection,
-.httpSection {
-  display: grid;
-  grid-gap: 0.5rem;
-
-  button {
-    align-self: flex-end;
-  }
-}
-
-.titleSection,
-.ruleSection,
-.filterSection,
-.oscSection,
-.httpSection {
-  label, div {
-    // we use the div as non-interactive placeholder for button cells
-    // it needs to match the size of the label element
-    font-size: calc(1rem - 3px);
-  }
-  label {
-    color: $label-gray;
-  }
-}
-
-
-.titleSection {
-  grid-template-columns: 1fr;
-}
-
-.filterSection {
-  grid-template-columns: 2fr 1fr 2fr auto;
-}
-
-.oscSection {
-  grid-template-columns: 9rem 5rem 3fr 4fr auto;
-}
-
-.httpSection {
-  grid-template-columns: 1fr auto;
-}
-
-.outputCard {
-  border-left: 0.25rem solid $gray-1200;
-  padding-left: 0.5rem;
-}
@@ -1,478 +0,0 @@
-import { useEffect, useMemo } from 'react';
-import { Controller, useFieldArray, useForm } from 'react-hook-form';
-import {
-  Alert,
-  AlertDescription,
-  AlertIcon,
-  Button,
-  IconButton,
-  Input,
-  Radio,
-  RadioGroup,
-  Select,
-} from '@chakra-ui/react';
-import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
-import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
-import { Automation, AutomationDTO, HTTPOutput, isHTTPOutput, isOSCOutput, OSCOutput } from 'ontime-types';
-
-import { addAutomation, editAutomation, testOutput } from '../../../../common/api/automation';
-import { maybeAxiosError } from '../../../../common/api/utils';
-import ExternalLink from '../../../../common/components/external-link/ExternalLink';
-import Tag from '../../../../common/components/tag/Tag';
-import useAutomationSettings from '../../../../common/hooks-query/useAutomationSettings';
-import useCustomFields from '../../../../common/hooks-query/useCustomFields';
-import { preventEscape } from '../../../../common/utils/keyEvent';
-import { startsWithHttp } from '../../../../common/utils/regex';
-import * as Panel from '../../panel-utils/PanelUtils';
-
-import { isAutomation, makeFieldList } from './automationUtils';
-
-import style from './AutomationForm.module.scss';
-
-const integrationsDocsUrl = 'https://docs.getontime.no/api/integrations/#using-variables-in-integrations';
-
-interface AutomationFormProps {
-  automation: Automation | AutomationDTO;
-  onClose: () => void;
-}
-
-export default function AutomationForm(props: AutomationFormProps) {
-  const { automation, onClose } = props;
-  const isEdit = isAutomation(automation);
-  const { data } = useCustomFields();
-  const { refetch } = useAutomationSettings();
-  const fieldList = useMemo(() => makeFieldList(data), [data]);
-
-  const {
-    control,
-    handleSubmit,
-    getValues,
-    register,
-    setError,
-    setFocus,
-    formState: { errors, isSubmitting, isDirty, isValid },
-  } = useForm<AutomationDTO>({
-    mode: 'onChange',
-    defaultValues: {
-      title: automation?.title ?? '',
-      filterRule: automation?.filterRule ?? 'all',
-      filters: automation?.filters ?? [],
-      outputs: automation?.outputs ?? [],
-    },
-    resetOptions: {
-      keepDirtyValues: true,
-    },
-  });
-
-  const {
-    fields: fieldFilters,
-    append: appendFilter,
-    remove: removeFilter,
-  } = useFieldArray({
-    name: 'filters',
-    control,
-  });
-
-  const {
-    fields: fieldOutputs,
-    append: appendOutput,
-    remove: removeOutput,
-  } = useFieldArray({
-    name: 'outputs',
-    control,
-  });
-
-  // give initial focus to the title field
-  useEffect(() => {
-    setFocus('title');
-  }, [setFocus]);
-
-  const handleAddNewFilter = () => {
-    appendFilter({ field: '', operator: 'equals', value: '' });
-  };
-
-  const handleAddNewOSCOutput = () => {
-    // @ts-expect-error -- we dont want to pass a port to the new object
-    appendOutput({ type: 'osc', targetIP: '', targetPort: undefined, address: '', args: '' });
-  };
-
-  const handleAddNewHTTPOutput = () => {
-    appendOutput({ type: 'http', url: '' });
-  };
-
-  const handleTestOSCOutput = async (index: number) => {
-    try {
-      const values = getValues(`outputs.${index}`) as OSCOutput;
-      if (!values.targetIP || !values.targetPort || !values.address) {
-        return;
-      }
-      await testOutput({
-        type: 'osc',
-        targetIP: values.targetIP,
-        targetPort: values.targetPort,
-        address: values.address,
-        args: values.args,
-      });
-    } catch (_error) {
-      /** we dont handle errors here, users should use the network tab */
-    }
-  };
-
-  const handleTestHTTPOutput = async (index: number) => {
-    try {
-      const values = getValues(`outputs.${index}`) as HTTPOutput;
-      if (!values.url) {
-        return;
-      }
-      await testOutput({
-        type: 'http',
-        url: values.url,
-      });
-    } catch (_error) {
-      /** we dont handle errors here, users should use the network tab */
-    }
-  };
-
-  const onSubmit = async (values: AutomationDTO) => {
-    if (isAutomation(automation)) {
-      await handleEdit(automation.id, { id: automation.id, ...values });
-    } else {
-      await handleCreate(values);
-    }
-    refetch();
-
-    async function handleEdit(id: string, values: Automation) {
-      try {
-        await editAutomation(id, values);
-        onClose();
-      } catch (error) {
-        setError('root', { message: maybeAxiosError(error) });
-      }
-    }
-
-    async function handleCreate(values: AutomationDTO) {
-      try {
-        await addAutomation(values);
-        onClose();
-      } catch (error) {
-        setError('root', { message: maybeAxiosError(error) });
-      }
-    }
-  };
-
-  const canSubmit = !isSubmitting && isDirty && isValid;
-
-  return (
-    <Panel.Indent
-      as='form'
-      name='automation-form'
-      onSubmit={handleSubmit(onSubmit)}
-      className={style.outerColumn}
-      onKeyDown={(event) => preventEscape(event, onClose)}
-    >
-      <Panel.SubHeader>{isEdit ? 'Edit automation' : 'Create automation'}</Panel.SubHeader>
-      <div className={style.innerSection}>
-        <h3>Automation options</h3>
-        <div className={style.titleSection}>
-          <label>
-            Title
-            <Input
-              {...register('title', { required: { value: true, message: 'Required field' } })}
-              variant='ontime-filled'
-              size='sm'
-              placeholder='Load preset'
-              autoComplete='off'
-            />
-          </label>
-          <Panel.Error>{errors.title?.message}</Panel.Error>
-        </div>
-      </div>
-
-      <div className={style.innerSection}>
-        <h3>Filters</h3>
-        <div className={style.ruleSection}>
-          <label>
-            Trigger outputs if
-            <Controller
-              name='filterRule'
-              control={control}
-              render={({ field }) => (
-                <RadioGroup {...field} size='sm' className={style.matchRadio} variant='ontime'>
-                  <Radio value='all'>All filters pass</Radio>
-                  <Radio value='any'>Any filter passes</Radio>
-                </RadioGroup>
-              )}
-            />
-          </label>
-          {fieldFilters.map((field, index) => (
-            <div key={field.id} className={style.filterSection}>
-              <label>
-                Runtime data source
-                <Select
-                  {...register(`filters.${index}.field`, { required: { value: true, message: 'Required field' } })}
-                  size='sm'
-                  variant='ontime'
-                >
-                  <option selected hidden disabled value=''>
-                    Event field
-                  </option>
-                  {fieldList.map(({ value, label }) => (
-                    <option key={value} value={value}>
-                      {label}
-                    </option>
-                  ))}
-                </Select>
-                <Panel.Error>{errors.filters?.[index]?.field?.message}</Panel.Error>
-              </label>
-              <label>
-                Matching condition
-                <Select
-                  {...register(`filters.${index}.operator`, { required: { value: true, message: 'Required field' } })}
-                  size='sm'
-                  variant='ontime'
-                >
-                  <option selected hidden disabled value=''>
-                    Operator
-                  </option>
-                  <option value='equals'>equals</option>
-                  <option value='not_equals'>not equals</option>
-                  <option value='contains'>contains</option>
-                  {/* 
-                  We dont currently offer a data source where these operators would make sense
-                  <option value='greater_than'>greater than</option>
-                  <option value='less_than'>less than</option> 
-                  */}
-                </Select>
-                <Panel.Error>{errors.filters?.[index]?.operator?.message}</Panel.Error>
-              </label>
-              <label>
-                Value to match
-                <Input
-                  {...register(`filters.${index}.value`)}
-                  variant='ontime-filled'
-                  size='sm'
-                  placeholder='<no value>'
-                  autoComplete='off'
-                />
-              </label>
-              <div>
-                <span>&nbsp;</span>
-                <div>
-                  <IconButton
-                    aria-label='Delete'
-                    icon={<IoTrash />}
-                    variant='ontime-ghosted'
-                    size='sm'
-                    color='#FA5656' // $red-500
-                    onClick={() => removeFilter(index)}
-                    isDisabled={false}
-                    isLoading={false}
-                  />
-                </div>
-              </div>
-            </div>
-          ))}
-          <div>
-            <Button
-              variant='ontime-subtle'
-              size='sm'
-              type='submit'
-              rightIcon={<IoAdd />}
-              onClick={handleAddNewFilter}
-              isDisabled={false}
-              isLoading={false}
-            >
-              Add filter
-            </Button>
-          </div>
-        </div>
-      </div>
-
-      <div className={style.innerColumn}>
-        <h3>Outputs</h3>
-        <Alert status='info' variant='ontime-on-dark-info'>
-          <AlertIcon />
-          <AlertDescription>
-            Automation outputs can be used to send data from Ontime to external software.
-            <ExternalLink href={integrationsDocsUrl}>See the documentation for templates</ExternalLink>
-          </AlertDescription>
-        </Alert>
-
-        {fieldOutputs.map((output, index) => {
-          if (isOSCOutput(output)) {
-            const rowErrors = errors.outputs?.[index] as
-              | {
-                  targetIP?: { message?: string };
-                  targetPort?: { message?: string };
-                  address?: { message?: string };
-                  args?: { message?: string };
-                }
-              | undefined;
-
-            return (
-              <div key={output.id} className={style.outputCard}>
-                <Tag>OSC</Tag>
-                <div className={style.oscSection}>
-                  <label>
-                    Target IP
-                    <Input
-                      {...register(`outputs.${index}.targetIP`, {
-                        required: { value: true, message: 'Required field' },
-                      })}
-                      variant='ontime-filled'
-                      size='sm'
-                      placeholder='127.0.0.1'
-                      autoComplete='off'
-                    />
-                    <Panel.Error>{rowErrors?.targetIP?.message}</Panel.Error>
-                  </label>
-                  <label>
-                    Target Port
-                    <Input
-                      {...register(`outputs.${index}.targetPort`, {
-                        required: { value: true, message: 'Required field' },
-                        setValueAs: (value) => (value === '' ? 0 : Number(value)),
-                        max: { value: 65535, message: 'Port must be within range 1024 - 65535' },
-                        min: { value: 1024, message: 'Port must be within range 1024 - 65535' },
-                      })}
-                      variant='ontime-filled'
-                      size='sm'
-                      type='number'
-                      maxLength={5}
-                      placeholder='8000'
-                      autoComplete='off'
-                    />
-                    <Panel.Error>{rowErrors?.targetPort?.message}</Panel.Error>
-                  </label>
-                  <label>
-                    Address
-                    <Input
-                      {...register(`outputs.${index}.address`)}
-                      variant='ontime-filled'
-                      size='sm'
-                      placeholder='/cue/start'
-                      autoComplete='off'
-                    />
-                    <Panel.Error>{rowErrors?.address?.message}</Panel.Error>
-                  </label>
-                  <label>
-                    Parameters
-                    <Input
-                      {...register(`outputs.${index}.args`)}
-                      variant='ontime-filled'
-                      size='sm'
-                      placeholder='1'
-                      autoComplete='off'
-                    />
-                    <Panel.Error>{rowErrors?.args?.message}</Panel.Error>
-                  </label>
-                  <div>
-                    <span>&nbsp;</span>
-                    <Panel.InlineElements relation='inner'>
-                      <Button size='sm' variant='ontime-ghosted-white' onClick={() => handleTestOSCOutput(index)}>
-                        Test
-                      </Button>
-                      <IconButton
-                        aria-label='Delete'
-                        icon={<IoTrash />}
-                        variant='ontime-ghosted'
-                        size='sm'
-                        onClick={() => removeOutput(index)}
-                        color='#FA5656' // $red-500
-                        isDisabled={false}
-                        isLoading={false}
-                      />
-                    </Panel.InlineElements>
-                  </div>
-                </div>
-              </div>
-            );
-          }
-          if (isHTTPOutput(output)) {
-            const rowErrors = errors.outputs?.[index] as
-              | {
-                  url?: { message?: string };
-                }
-              | undefined;
-            return (
-              <div key={output.id} className={style.outputCard}>
-                <Tag>HTTP</Tag>
-                <div className={style.httpSection}>
-                  <label>
-                    Target URL
-                    <Input
-                      {...register(`outputs.${index}.url`, {
-                        required: { value: true, message: 'Required field' },
-                        pattern: {
-                          value: startsWithHttp,
-                          message: 'HTTP messages should target http:// or https://',
-                        },
-                      })}
-                      variant='ontime-filled'
-                      size='sm'
-                      placeholder='http://127.0.0.1/start/1'
-                      autoComplete='off'
-                    />
-                    <Panel.Error>{rowErrors?.url?.message}</Panel.Error>
-                  </label>
-                  <div>
-                    <span>&nbsp;</span>
-                    <Panel.InlineElements relation='inner'>
-                      <Button size='sm' variant='ontime-ghosted-white' onClick={() => handleTestHTTPOutput(index)}>
-                        Test
-                      </Button>
-                      <IconButton
-                        aria-label='Delete'
-                        icon={<IoTrash />}
-                        variant='ontime-ghosted'
-                        size='sm'
-                        onClick={() => removeOutput(index)}
-                        color='#FA5656' // $red-500
-                        isDisabled={false}
-                        isLoading={false}
-                      />
-                    </Panel.InlineElements>
-                  </div>
-                </div>
-              </div>
-            );
-          }
-          // there should be no other output types
-          return null;
-        })}
-        <Panel.InlineElements relation='inner'>
-          <Button
-            variant='ontime-subtle'
-            rightIcon={<IoAdd />}
-            size='sm'
-            onClick={handleAddNewOSCOutput}
-            isDisabled={false}
-            isLoading={false}
-          >
-            OSC
-          </Button>
-          <Button
-            variant='ontime-subtle'
-            rightIcon={<IoAdd />}
-            size='sm'
-            onClick={handleAddNewHTTPOutput}
-            isDisabled={false}
-            isLoading={false}
-          >
-            HTTP
-          </Button>
-        </Panel.InlineElements>
-      </div>
-
-      <Panel.InlineElements align='end'>
-        {errors?.root && <Panel.Error>{errors.root.message}</Panel.Error>}
-        <Button variant='ontime-subtle' size='sm' onClick={onClose}>
-          Cancel
-        </Button>
-        <Button variant='ontime-filled' size='sm' type='submit' isDisabled={!canSubmit} isLoading={isSubmitting}>
-          Save
-        </Button>
-      </Panel.InlineElements>
-    </Panel.Indent>
-  );
-}
@@ -1,39 +0,0 @@
-import useScrollIntoView from '../../../../common/hooks/useScrollIntoView';
-import useAutomationSettings from '../../../../common/hooks-query/useAutomationSettings';
-import type { PanelBaseProps } from '../../panel-list/PanelList';
-import * as Panel from '../../panel-utils/PanelUtils';
-
-import AutomationSettingsForm from './AutomationSettingsForm';
-import AutomationsList from './AutomationsList';
-import TriggersList from './TriggersList';
-
-export default function AutomationPanel({ location }: PanelBaseProps) {
-  const { data, status } = useAutomationSettings();
-  const settingsRef = useScrollIntoView<HTMLDivElement>('settings', location);
-  const triggersRef = useScrollIntoView<HTMLDivElement>('triggers', location);
-  const automationsRef = useScrollIntoView<HTMLDivElement>('automations', location);
-
-  const isLoading = status === 'pending';
-
-  return (
-    <>
-      <Panel.Header>Automation</Panel.Header>
-      <Panel.Section>
-        <Panel.Loader isLoading={isLoading} />
-        <div ref={settingsRef}>
-          <AutomationSettingsForm
-            enabledAutomations={data.enabledAutomations}
-            enabledOscIn={data.enabledOscIn}
-            oscPortIn={data.oscPortIn}
-          />
-        </div>
-        <div ref={triggersRef}>
-          <TriggersList triggers={data.triggers} automations={data.automations} />
-        </div>
-        <div ref={automationsRef}>
-          <AutomationsList automations={data.automations} />
-        </div>
-      </Panel.Section>
-    </>
-  );
-}
@@ -1,161 +0,0 @@
-import { Controller, useForm } from 'react-hook-form';
-import { Alert, AlertDescription, AlertIcon, Button, Input, Switch } from '@chakra-ui/react';
-
-import { editAutomationSettings } from '../../../../common/api/automation';
-import { maybeAxiosError } from '../../../../common/api/utils';
-import ExternalLink from '../../../../common/components/external-link/ExternalLink';
-import { preventEscape } from '../../../../common/utils/keyEvent';
-import { isOnlyNumbers } from '../../../../common/utils/regex';
-import * as Panel from '../../panel-utils/PanelUtils';
-
-const oscApiDocsUrl = 'https://docs.getontime.no/api/protocols/osc/';
-
-interface AutomationSettingsProps {
-  enabledAutomations: boolean;
-  enabledOscIn: boolean;
-  oscPortIn: number;
-}
-
-export default function AutomationSettingsForm(props: AutomationSettingsProps) {
-  const { enabledAutomations, enabledOscIn, oscPortIn } = props;
-
-  const {
-    control,
-    handleSubmit,
-    reset,
-    register,
-    setError,
-    formState: { errors, isSubmitting, isDirty, isValid },
-  } = useForm<AutomationSettingsProps>({
-    mode: 'onChange',
-    defaultValues: { enabledAutomations, enabledOscIn, oscPortIn },
-    values: { enabledAutomations, enabledOscIn, oscPortIn },
-    resetOptions: {
-      keepDirtyValues: true,
-    },
-  });
-
-  const onSubmit = async (formData: AutomationSettingsProps) => {
-    try {
-      await editAutomationSettings(formData);
-    } catch (error) {
-      const message = maybeAxiosError(error);
-      setError('root', { message });
-    }
-  };
-
-  const onReset = () => {
-    reset({ enabledAutomations, enabledOscIn, oscPortIn });
-  };
-
-  const canSubmit = !isSubmitting && isDirty && isValid;
-
-  return (
-    <Panel.Card>
-      <Panel.SubHeader>
-        Automation settings
-        <Panel.InlineElements>
-          <Button variant='ontime-ghosted' size='sm' onClick={onReset} isDisabled={!canSubmit}>
-            Revert to saved
-          </Button>
-          <Button
-            variant='ontime-filled'
-            size='sm'
-            type='submit'
-            form='automation-settings-form'
-            isDisabled={!canSubmit}
-            isLoading={isSubmitting}
-          >
-            Save
-          </Button>
-        </Panel.InlineElements>
-      </Panel.SubHeader>
-      {errors?.root && <Panel.Error>{errors.root.message}</Panel.Error>}
-
-      <Panel.Divider />
-
-      <Panel.Section>
-        <Alert status='info' variant='ontime-on-dark-info'>
-          <AlertIcon />
-          <AlertDescription>
-            Control Ontime and share its data with external systems in your workflow. <br />
-            - Automations allow Ontime to send its data on lifecycle triggers. <br />- OSC Input tells Ontime to listen
-            to messages on the specific port. <ExternalLink href={oscApiDocsUrl}>See the docs</ExternalLink>
-          </AlertDescription>
-        </Alert>
-      </Panel.Section>
-
-      <Panel.Section
-        as='form'
-        id='automation-settings-form'
-        onSubmit={handleSubmit(onSubmit)}
-        onKeyDown={(event) => preventEscape(event, onReset)}
-      >
-        <Panel.Loader isLoading={false} />
-
-        <Panel.Title>Automation</Panel.Title>
-        <Panel.ListGroup>
-          <Panel.ListItem>
-            <Panel.Field
-              title='Enable automations'
-              description='Allow Ontime to send messages on lifecycle triggers'
-              error={errors.enabledAutomations?.message}
-            />
-            <Controller
-              control={control}
-              name='enabledAutomations'
-              render={({ field: { onChange, value, ref } }) => (
-                <Switch variant='ontime' size='lg' isChecked={value} onChange={onChange} ref={ref} />
-              )}
-            />
-          </Panel.ListItem>
-        </Panel.ListGroup>
-
-        <Panel.Title>OSC Input</Panel.Title>
-        <Panel.ListGroup>
-          <Panel.ListItem>
-            <Panel.Field
-              title='OSC input'
-              description='Allow control of Ontime through OSC'
-              error={errors.enabledOscIn?.message}
-            />
-            <Controller
-              control={control}
-              name='enabledOscIn'
-              render={({ field: { onChange, value, ref } }) => (
-                <Switch variant='ontime' size='lg' isChecked={value} onChange={onChange} ref={ref} />
-              )}
-            />
-          </Panel.ListItem>
-          <Panel.ListItem>
-            <Panel.Field
-              title='Listen on port'
-              description='Port for incoming OSC. Default: 8888'
-              error={errors.oscPortIn?.message}
-            />
-            <Input
-              id='oscPortIn'
-              placeholder='8888'
-              width='5rem'
-              maxLength={5}
-              size='sm'
-              textAlign='right'
-              variant='ontime-filled'
-              type='number'
-              autoComplete='off'
-              {...register('oscPortIn', {
-                required: { value: true, message: 'Required field' },
-                max: { value: 65535, message: 'Port must be within range 1024 - 65535' },
-                min: { value: 1024, message: 'Port must be within range 1024 - 65535' },
-                pattern: {
-                  value: isOnlyNumbers,
-                  message: 'Value should be numeric',
-                },
-              })}
-            />
-          </Panel.ListItem>
-        </Panel.ListGroup>
-      </Panel.Section>
-    </Panel.Card>
-  );
-}
@@ -1,130 +0,0 @@
-import { Fragment, useState } from 'react';
-import { Button, IconButton } from '@chakra-ui/react';
-import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
-import { IoPencil } from '@react-icons/all-files/io5/IoPencil';
-import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
-import { AutomationDTO, NormalisedAutomation } from 'ontime-types';
-
-import { deleteAutomation } from '../../../../common/api/automation';
-import { maybeAxiosError } from '../../../../common/api/utils';
-import Tag from '../../../../common/components/tag/Tag';
-import useAutomationSettings from '../../../../common/hooks-query/useAutomationSettings';
-import * as Panel from '../../panel-utils/PanelUtils';
-
-import AutomationForm from './AutomationForm';
-
-const automationPlaceholder: AutomationDTO = {
-  title: '',
-  filterRule: 'all',
-  filters: [],
-  outputs: [],
-};
-
-interface AutomationsListProps {
-  automations: NormalisedAutomation;
-}
-
-export default function AutomationsList(props: AutomationsListProps) {
-  const { automations } = props;
-  const { refetch } = useAutomationSettings();
-  const [automationFormData, setAutomationFormData] = useState<AutomationDTO | null>(null);
-  const [deleteError, setDeleteError] = useState<string | null>(null);
-
-  const handleDelete = async (id: string) => {
-    try {
-      setDeleteError(null);
-      await deleteAutomation(id);
-    } catch (error) {
-      setDeleteError(maybeAxiosError(error));
-    } finally {
-      refetch();
-    }
-  };
-
-  const arrayAutomations = Object.keys(automations);
-
-  return (
-    <Panel.Card>
-      <Panel.SubHeader>
-        Manage automations
-        <Button
-          variant='ontime-subtle'
-          rightIcon={<IoAdd />}
-          size='sm'
-          type='submit'
-          isDisabled={Boolean(automationFormData)}
-          onClick={() => setAutomationFormData(automationPlaceholder)}
-        >
-          New
-        </Button>
-      </Panel.SubHeader>
-
-      <Panel.Divider />
-
-      {automationFormData !== null && (
-        <AutomationForm automation={automationFormData} onClose={() => setAutomationFormData(null)} />
-      )}
-
-      <Panel.Table>
-        <thead>
-          <tr>
-            <th style={{ width: '45%' }}>Title</th>
-            <th style={{ width: '15%' }}>Trigger rule</th>
-            <th style={{ width: '15%' }}>Filters</th>
-            <th style={{ width: '15%' }}>Outputs</th>
-            <th />
-          </tr>
-        </thead>
-        <tbody>
-          {arrayAutomations.length === 0 && (
-            <Panel.TableEmpty
-              handleClick={!automationFormData ? () => setAutomationFormData(automationPlaceholder) : undefined}
-            />
-          )}
-          {arrayAutomations.map((automationId) => {
-            if (!Object.hasOwn(automations, automationId)) {
-              return null;
-            }
-            return (
-              <Fragment key={automationId}>
-                <tr>
-                  <td>{automations[automationId].title}</td>
-                  <td>
-                    <Tag>{automations[automationId].filterRule}</Tag>
-                  </td>
-                  <td>{automations[automationId].filters.length}</td>
-                  <td>{automations[automationId].outputs.length}</td>
-                  <Panel.InlineElements align='end' relation='inner' as='td'>
-                    <IconButton
-                      size='sm'
-                      variant='ontime-ghosted'
-                      color='#e2e2e2' // $gray-200
-                      icon={<IoPencil />}
-                      aria-label='Edit entry'
-                      onClick={() => setAutomationFormData(automations[automationId])}
-                    />
-                    <IconButton
-                      size='sm'
-                      variant='ontime-ghosted'
-                      color='#FA5656' // $red-500
-                      icon={<IoTrash />}
-                      aria-label='Delete entry'
-                      onClick={() => handleDelete(automationId)}
-                    />
-                  </Panel.InlineElements>
-                </tr>
-                {deleteError && (
-                  <tr>
-                    <td colSpan={5}>
-                      <Panel.Error>{deleteError}</Panel.Error>
-                    </td>
-                  </tr>
-                )}
-              </Fragment>
-            );
-          })}
-        </tbody>
-      </Panel.Table>
-    </Panel.Card>
-  );
-}
@@ -1,139 +0,0 @@
-import { useEffect } from 'react';
-import { useForm } from 'react-hook-form';
-import { Button, Input, Select } from '@chakra-ui/react';
-import { NormalisedAutomation, TimerLifeCycle, TriggerDTO } from 'ontime-types';
-
-import { addTrigger, editTrigger } from '../../../../common/api/automation';
-import { maybeAxiosError } from '../../../../common/api/utils';
-import { preventEscape } from '../../../../common/utils/keyEvent';
-import * as Panel from '../../panel-utils/PanelUtils';
-
-import { cycles } from './automationUtils';
-
-interface TriggerFormProps {
-  automations: NormalisedAutomation;
-  initialId?: string;
-  initialTitle?: string;
-  initialAutomationId?: string;
-  initialTrigger?: TimerLifeCycle;
-  onCancel: () => void;
-  postSubmit: () => void;
-}
-
-export default function TriggerForm(props: TriggerFormProps) {
-  const { automations, initialId, initialTitle, initialAutomationId, initialTrigger, onCancel, postSubmit } = props;
-  const {
-    handleSubmit,
-    register,
-    setFocus,
-    setError,
-    formState: { errors, isSubmitting, isValid, isDirty },
-  } = useForm<TriggerDTO>({
-    defaultValues: {
-      title: initialTitle,
-      trigger: initialTrigger,
-      automationId: initialAutomationId,
-    },
-    resetOptions: {
-      keepDirtyValues: true,
-    },
-  });
-
-  // give initial focus to the title field
-  useEffect(() => {
-    setFocus('title');
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- focus on mount
-  }, []);
-
-  const onSubmit = async (values: TriggerDTO) => {
-    // if we were passed an ID we are editing a Trigger
-    if (initialId) {
-      try {
-        await editTrigger(initialId, { id: initialId, ...values });
-        postSubmit();
-      } catch (error) {
-        setError('root', { message: `Failed to save changes to trigger ${maybeAxiosError(error)}` });
-      }
-      return;
-    }
-
-    // otherwise we are creating a new automation
-    try {
-      await addTrigger(values);
-      postSubmit();
-    } catch (error) {
-      setError('root', { message: `Failed to save trigger ${maybeAxiosError(error)}` });
-    }
-  };
-
-  const automationSelect = Object.keys(automations).map((automation) => {
-    return {
-      value: automation,
-      label: automations[automation].title,
-    };
-  });
-
-  const canSubmit = isDirty && isValid;
-
-  return (
-    <Panel.Indent
-      as='form'
-      name='trigger-form'
-      onSubmit={handleSubmit(onSubmit)}
-      onKeyDown={(event) => preventEscape(event, onCancel)}
-    >
-      <Panel.SubHeader>{initialId ? 'Edit trigger' : 'Create trigger'}</Panel.SubHeader>
-      <label>
-        Title
-        <Input
-          {...register('title', { required: { value: true, message: 'Required field' } })}
-          size='sm'
-          variant='ontime-filled'
-          autoComplete='off'
-          defaultValue={initialTitle}
-        />
-        <Panel.Error>{errors.title?.message}</Panel.Error>
-      </label>
-      <label>
-        Lifecycle trigger
-        <Select
-          size='sm'
-          variant='ontime'
-          defaultValue={initialTrigger}
-          {...register('trigger', { required: { value: true, message: 'Required field' } })}
-        >
-          {cycles.map((cycle) => (
-            <option key={cycle.id} value={cycle.value}>
-              {cycle.label}
-            </option>
-          ))}
-        </Select>
-        <Panel.Error>{errors.trigger?.message}</Panel.Error>
-      </label>
-      <label>
-        Automation title
-        <Select
-          size='sm'
-          variant='ontime'
-          defaultValue={initialAutomationId}
-          {...register('automationId', { required: { value: true, message: 'Required field' } })}
-        >
-          {automationSelect.map((automation) => (
-            <option key={automation.value} value={automation.value}>
-              {automation.label}
-            </option>
-          ))}
-        </Select>
-        <Panel.Error>{errors.automationId?.message}</Panel.Error>
-      </label>
-      <Panel.InlineElements align='end'>
-        <Button size='sm' variant='ontime-subtle' isDisabled={isSubmitting} onClick={onCancel}>
-          Cancel
-        </Button>
-        <Button type='submit' size='sm' variant='ontime-filled' isDisabled={!canSubmit} isLoading={isSubmitting}>
-          Save
-        </Button>
-      </Panel.InlineElements>
-    </Panel.Indent>
-  );
-}
@@ -1,117 +0,0 @@
-import { Fragment, useMemo, useState } from 'react';
-import { Button } from '@chakra-ui/react';
-import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
-import { NormalisedAutomation, Trigger } from 'ontime-types';
-
-import { deleteTrigger } from '../../../../common/api/automation';
-import { maybeAxiosError } from '../../../../common/api/utils';
-import useAutomationSettings from '../../../../common/hooks-query/useAutomationSettings';
-import * as Panel from '../../panel-utils/PanelUtils';
-
-import { checkDuplicates } from './automationUtils';
-import AutomationForm from './TriggerForm';
-import TriggersListItem from './TriggersListItem';
-
-interface TriggersListProps {
-  triggers: Trigger[];
-  automations: NormalisedAutomation;
-}
-
-export default function TriggersList(props: TriggersListProps) {
-  const { triggers, automations } = props;
-  const [showForm, setShowForm] = useState(false);
-  const { refetch } = useAutomationSettings();
-  const [deleteError, setDeleteError] = useState<string | null>(null);
-
-  const handleDelete = async (id: string) => {
-    try {
-      await deleteTrigger(id);
-    } catch (error) {
-      setDeleteError(maybeAxiosError(error));
-    } finally {
-      refetch();
-    }
-  };
-
-  const postSubmit = () => {
-    setShowForm(false);
-    refetch();
-  };
-
-  const duplicates = useMemo(() => checkDuplicates(triggers), [triggers]);
-
-  // there is no point letting user creating a trigger if there are no automations
-  const canAdd = Object.keys(automations).length > 0;
-
-  return (
-    <Panel.Card>
-      <Panel.SubHeader>
-        Manage triggers
-        <Button
-          variant='ontime-subtle'
-          rightIcon={<IoAdd />}
-          size='sm'
-          type='submit'
-          form='trigger-form'
-          isDisabled={!canAdd}
-          isLoading={false}
-          onClick={() => setShowForm(true)}
-        >
-          New
-        </Button>
-      </Panel.SubHeader>
-      <Panel.Divider />
-      <Panel.Section>
-        {duplicates && (
-          <Panel.Error>
-            You have created multiple links between the same trigger and automation which can performance issues.
-          </Panel.Error>
-        )}
-        {showForm && (
-          <AutomationForm automations={automations} onCancel={() => setShowForm(false)} postSubmit={postSubmit} />
-        )}
-        <Panel.Table>
-          <thead>
-            <tr>
-              <th style={{ width: '35%' }}>Title</th>
-              <th style={{ width: '25%' }}>Lifecycle trigger</th>
-              <th style={{ width: '25%' }}>Automation</th>
-              <th />
-            </tr>
-          </thead>
-          <tbody>
-            {!showForm && triggers.length === 0 && (
-              <Panel.TableEmpty
-                label='Create an automation before to attach triggers to'
-                handleClick={canAdd ? () => setShowForm(true) : undefined}
-              />
-            )}
-            {triggers.map((trigger, index) => {
-              return (
-                <Fragment key={trigger.id}>
-                  <TriggersListItem
-                    automations={automations}
-                    id={trigger.id}
-                    title={trigger.title}
-                    trigger={trigger.trigger}
-                    automationId={trigger.automationId}
-                    duplicate={duplicates?.includes(index)}
-                    handleDelete={() => handleDelete(trigger.id)}
-                    postSubmit={postSubmit}
-                  />
-                  {deleteError && (
-                    <tr>
-                      <td colSpan={5}>
-                        <Panel.Error>{deleteError}</Panel.Error>
-                      </td>
-                    </tr>
-                  )}
-                </Fragment>
-              );
-            })}
-          </tbody>
-        </Panel.Table>
-      </Panel.Section>
-    </Panel.Card>
-  );
-}
@@ -1,86 +0,0 @@
-import { useState } from 'react';
-import { IconButton } from '@chakra-ui/react';
-import { IoPencil } from '@react-icons/all-files/io5/IoPencil';
-import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
-import { IoWarningOutline } from '@react-icons/all-files/io5/IoWarningOutline';
-import { NormalisedAutomation, TimerLifeCycle } from 'ontime-types';
-
-import Tag from '../../../../common/components/tag/Tag';
-import * as Panel from '../../panel-utils/PanelUtils';
-
-import { cycles } from './automationUtils';
-import AutomationForm from './TriggerForm';
-
-interface TriggersListItemProps {
-  automations: NormalisedAutomation;
-  id: string;
-  title: string;
-  trigger: TimerLifeCycle;
-  automationId: string;
-  duplicate?: boolean;
-  handleDelete: () => void;
-  postSubmit: () => void;
-}
-
-export default function TriggersListItem(props: TriggersListItemProps) {
-  const { automations, id, title, trigger, automationId, duplicate, handleDelete, postSubmit } = props;
-  const [isEditing, setIsEditing] = useState(false);
-
-  if (isEditing) {
-    return (
-      <tr>
-        <td colSpan={99}>
-          <AutomationForm
-            automations={automations}
-            initialId={id}
-            initialTitle={title}
-            initialTrigger={trigger}
-            initialAutomationId={automationId}
-            onCancel={() => setIsEditing(false)}
-            postSubmit={() => {
-              setIsEditing(false);
-              postSubmit();
-            }}
-          />
-        </td>
-      </tr>
-    );
-  }
-
-  return (
-    <tr data-warn={duplicate}>
-      <Panel.InlineElements as='td' relation='inner'>
-        {duplicate && (
-          <IoWarningOutline
-            color='#FFBC56' // $orange-500
-          />
-        )}
-        {title}
-      </Panel.InlineElements>
-      <td>
-        <Tag>{cycles.find((cycle) => cycle.value === trigger)?.label}</Tag>
-      </td>
-      <td>
-        <Tag>{automations?.[automationId]?.title}</Tag>
-      </td>
-      <Panel.InlineElements align='end' relation='inner' as='td'>
-        <IconButton
-          size='sm'
-          variant='ontime-ghosted'
-          color='#e2e2e2' // $gray-200
-          icon={<IoPencil />}
-          aria-label='Edit entry'
-          onClick={() => setIsEditing(true)}
-        />
-        <IconButton
-          size='sm'
-          variant='ontime-ghosted'
-          color='#FA5656' // $red-500
-          icon={<IoTrash />}
-          aria-label='Delete entry'
-          onClick={handleDelete}
-        />
-      </Panel.InlineElements>
-    </tr>
-  );
-}
@@ -1,24 +0,0 @@
-import { TimerLifeCycle, Trigger } from 'ontime-types';
-
-import { checkDuplicates } from '../automationUtils';
-
-describe('checkDuplicates', () => {
-  it('should return undefined if there are no duplicates', () => {
-    const triggers: Trigger[] = [
-      { id: '1', title: 'First', trigger: TimerLifeCycle.onClock, automationId: '1' },
-      { id: '2', title: 'Second', trigger: TimerLifeCycle.onDanger, automationId: '2' },
-      { id: '3', title: 'Third', trigger: TimerLifeCycle.onLoad, automationId: '3' },
-    ];
-    expect(checkDuplicates(triggers)).toBeUndefined();
-  });
-
-  it('should return list of titles of duplicates', () => {
-    const triggers: Trigger[] = [
-      { id: '1', title: 'First', trigger: TimerLifeCycle.onClock, automationId: '1' },
-      { id: '2', title: 'Second', trigger: TimerLifeCycle.onDanger, automationId: '2' },
-      { id: '3', title: 'Third', trigger: TimerLifeCycle.onClock, automationId: '1' },
-      { id: '3', title: 'Third', trigger: TimerLifeCycle.onPause, automationId: '1' },
-    ];
-    expect(checkDuplicates(triggers)).toStrictEqual([2]);
-  });
-});
@@ -1,74 +0,0 @@
-import { Automation, AutomationDTO, CustomFields, TimerLifeCycle, Trigger } from 'ontime-types';
-
-type CycleLabel = {
-  id: number;
-  label: string;
-  value: keyof typeof TimerLifeCycle;
-};
-
-export const cycles: CycleLabel[] = [
-  { id: 1, label: 'On Load', value: 'onLoad' },
-  { id: 2, label: 'On Start', value: 'onStart' },
-  { id: 3, label: 'On Pause', value: 'onPause' },
-  { id: 4, label: 'On Stop', value: 'onStop' },
-  { id: 5, label: 'Every second', value: 'onClock' },
-  { id: 6, label: 'On Timer Update', value: 'onUpdate' },
-  { id: 7, label: 'On Finish', value: 'onFinish' },
-  { id: 8, label: 'On Warning', value: 'onWarning' },
-  { id: 9, label: 'On Danger', value: 'onDanger' },
-];
-
-/**
- * We use this guard to find out if the form is receiving an existing automation or creating a DTO
- * We do this by checking whether an ID has been generated
- */
-export function isAutomation(automation: AutomationDTO | Automation): automation is Automation {
-  return Object.hasOwn(automation, 'id');
-}
-
-const staticSelectProperties = [
-  { value: 'eventNow.id', label: 'ID' },
-  { value: 'eventNow.title', label: 'Title' },
-  { value: 'eventNow.cue', label: 'Cue' },
-  { value: 'eventNow.countToEnd', label: 'Count to end' },
-  { value: 'eventNow.isPublic', label: 'Is public' },
-  { value: 'eventNow.note', label: 'Note' },
-  { value: 'eventNow.colour', label: 'Colour' },
-];
-
-type SelectableField = {
-  value: string; // string encodes path in runtime state object
-  label: string;
-};
-
-export function makeFieldList(customFields: CustomFields): SelectableField[] {
-  return [
-    ...staticSelectProperties,
-    ...Object.entries(customFields).map(([key, { label }]) => ({
-      value: `eventNow.custom.${key}`,
-      label: `Custom: ${label}`,
-    })),
-  ];
-}
-
-/**
- * We warn the user if they have created multiple links between the same automation and a trigger
- */
-export function checkDuplicates(triggers: Trigger[]) {
-  const triggersMap: Record<string, string[]> = {};
-  const duplicates = [];
-
-  for (let i = 0; i < triggers.length; i++) {
-    const trigger = triggers[i];
-    if (!Object.hasOwn(triggersMap, trigger.trigger)) {
-      triggersMap[trigger.trigger] = [];
-    }
-
-    if (triggersMap[trigger.trigger].includes(trigger.automationId)) {
-      duplicates.push(i);
-    } else {
-      triggersMap[trigger.trigger].push(trigger.automationId);
-    }
-  }
-  return duplicates.length > 0 ? duplicates : undefined;
-}
@@ -2,11 +2,23 @@
  width: 100%;
 }

-.halfWidth {
-  width: 50%;
+.actionButtons {
+  display: flex;
+  gap: $element-spacing;
 }

-.halfWidthNoWrap {
+.halfWidth {
  width: 50%;
  white-space: nowrap;
 }
+
+.pathList {
+  width: 100%;
+}
+
+.badgeList {
+  width: 100%;
+  * {
+    margin-right: $element-spacing;
+  }
+}
@@ -52,7 +52,7 @@ export default function ClientList() {
        <Panel.Table>
          <thead>
            <tr>
-              <td className={style.halfWidth}>Client Name (Connection ID)</td>
+              <td className={style.fullWidth}>Client Name (Connection ID)</td>
              <td className={style.fullWidth}>Path</td>
              <td />
            </tr>
@@ -63,7 +63,7 @@ export default function ClientList() {
              const isCurrent = id === key;
              return (
                <tr key={key}>
-                  <Panel.InlineElements relation='inner' as='td'>
+                  <td className={style.badgeList}>
                    <Badge variant='outline' size='xs'>
                      {key}
                    </Badge>
@@ -73,9 +73,9 @@ export default function ClientList() {
                      </Badge>
                    )}
                    {name}
-                  </Panel.InlineElements>
-                  <td>{path}</td>
-                  <Panel.InlineElements relation='inner'>
+                  </td>
+                  {isCurrent ? <td /> : <td className={style.pathList}>{path}</td>}
+                  <td className={style.actionButtons}>
                    <Button
                      size='xs'
                      className={`${identify ? style.blink : ''}`}
@@ -106,7 +106,7 @@ export default function ClientList() {
                    >
                      Redirect
                    </Button>
-                  </Panel.InlineElements>
+                  </td>
                </tr>
              );
            })}
@@ -119,8 +119,8 @@ export default function ClientList() {
        <Panel.Table>
          <thead>
            <tr>
-              <td className={style.halfWidthNoWrap}>Client Name (Connection ID)</td>
-              <td className={style.halfWidthNoWrap}>Client type</td>
+              <td className={style.halfWidth}>Client Name (Connection ID)</td>
+              <td className={style.halfWidth}>Client type</td>
            </tr>
          </thead>
          <tbody>
@@ -129,12 +129,12 @@ export default function ClientList() {

              return (
                <tr key={key}>
-                  <Panel.InlineElements relation='inner' as='td'>
+                  <td className={style.badgeList}>
                    <Badge variant='outline' size='sx'>
                      {key}
                    </Badge>
                    {name}
-                  </Panel.InlineElements>
+                  </td>
                  <td>{type}</td>
                </tr>
              );
@@ -6,6 +6,16 @@
  width: 100%;
 }

+.actions {
+  display: flex;
+  gap: 0.5px;
+}
+
+.actionButtons {
+  display: flex;
+  gap: 1em;
+}
+
 .fieldForm {
  padding: 1rem;
  background-color: $gray-1350;
@@ -14,6 +24,12 @@
  gap: 1rem;
 }

+.buttonRow {
+  display: flex;
+  justify-content: flex-end;
+  gap: 1rem;
+}
+
 .fit {
  width: fit-content;
 }
@@ -22,6 +38,10 @@
  min-width: 12em;
 }

+.flex {
+  display: flex;
+}
+
 .twoCols {
  display: grid;
  grid-template-columns: 1fr 1fr;
@@ -11,7 +11,6 @@ import { maybeAxiosError } from '../../../../common/api/utils';
 import TooltipActionBtn from '../../../../common/components/buttons/TooltipActionBtn';
 import ExternalLink from '../../../../common/components/external-link/ExternalLink';
 import useUrlPresets from '../../../../common/hooks-query/useUrlPresets';
-import { preventEscape } from '../../../../common/utils/keyEvent';
 import { handleLinks } from '../../../../common/utils/linkUtils';
 import { validateUrlPresetPath } from '../../../../common/utils/urlPresets';
 import * as Panel from '../../panel-utils/PanelUtils';
@@ -89,23 +88,18 @@ export default function UrlPresetsForm() {
  const canSubmit = !isSubmitting && isDirty && isValid;

  return (
-    <Panel.Section
-      as='form'
-      onSubmit={handleSubmit(onSubmit)}
-      onKeyDown={(event) => preventEscape(event, onReset)}
-      data-testid='url-preset-form'
-    >
+    <Panel.Section as='form' onSubmit={handleSubmit(onSubmit)} data-testid='url-preset-form'>
      <Panel.Card>
        <Panel.SubHeader>
          URL presets
-          <Panel.InlineElements>
+          <div className={style.actionButtons}>
            <Button variant='ontime-ghosted' size='sm' onClick={onReset} isDisabled={!canSubmit}>
              Revert to saved
            </Button>
            <Button variant='ontime-filled' size='sm' type='submit' isDisabled={!canSubmit} isLoading={isSubmitting}>
              Save
            </Button>
-          </Panel.InlineElements>
+          </div>
        </Panel.SubHeader>
        <Panel.Divider />
        <Alert status='info' variant='ontime-on-dark-info'>
@@ -155,14 +149,9 @@ export default function UrlPresetsForm() {
              </tr>
            </thead>
            <tbody>
-              {fields.length === 0 && <Panel.TableEmpty handleClick={addNew} />}
              {fields.map((preset, index) => {
                const maybeAliasError = errors.data?.[index]?.alias?.message;
                const maybeUrlError = errors.data?.[index]?.pathAndParams?.message;
-                // only saved and enabled URLs can be tested
-                const canTest =
-                  preset.alias && preset.enabled && preset.pathAndParams && !maybeAliasError && !maybeUrlError;
-
                return (
                  <tr key={preset.id}>
                    <td className={style.fit}>
@@ -198,10 +187,9 @@ export default function UrlPresetsForm() {
                      />
                      <Panel.Error>{maybeUrlError}</Panel.Error>
                    </td>
-                    <Panel.InlineElements relation='inner' as='td'>
+                    <td className={style.flex}>
                      <TooltipActionBtn
                        size='sm'
-                        isDisabled={!canTest}
                        clickHandler={(event) => handleLinks(event, preset.alias)}
                        tooltip='Test preset'
                        aria-label='Test preset'
@@ -219,7 +207,7 @@ export default function UrlPresetsForm() {
                        aria-label='Delete entry'
                        data-testid={`field__delete_${index}`}
                      />
-                    </Panel.InlineElements>
+                    </td>
                  </tr>
                );
              })}
@@ -6,7 +6,6 @@ import { CustomField, CustomFieldLabel } from 'ontime-types';

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

 import CustomFieldForm from './CustomFieldForm';

@@ -56,7 +55,7 @@ export default function CustomFieldEntry(props: CustomFieldEntryProps) {
          {field}
        </CopyTag>
      </td>
-      <Panel.InlineElements relation='inner' as='td'>
+      <td className={style.actions}>
        <IconButton
          size='sm'
          variant='ontime-ghosted'
@@ -73,7 +72,7 @@ export default function CustomFieldEntry(props: CustomFieldEntryProps) {
          aria-label='Delete entry'
          onClick={() => onDelete(field)}
        />
-      </Panel.InlineElements>
+      </td>
    </tr>
  );
 }
@@ -7,7 +7,6 @@ import { customFieldLabelToKey, isAlphanumericWithSpace } 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 { preventEscape } from '../../../../../common/utils/keyEvent';
 import * as Panel from '../../../panel-utils/PanelUtils';

 import style from '../FeatureSettings.module.scss';
@@ -72,11 +71,7 @@ export default function CustomFieldForm(props: CustomFieldsFormProps) {
  const isEditMode = initialKey !== undefined;

  return (
-    <form
-      onSubmit={handleSubmit(setupSubmit)}
-      className={style.fieldForm}
-      onKeyDown={(event) => preventEscape(event, onCancel)}
-    >
+    <form onSubmit={handleSubmit(setupSubmit)} className={style.fieldForm}>
      <div className={style.twoCols}>
        <div>
          <Panel.Description>Label (only alphanumeric characters are allowed)</Panel.Description>
@@ -112,14 +107,14 @@ export default function CustomFieldForm(props: CustomFieldsFormProps) {
      </div>

      {errors.root && <Panel.Error>{errors.root.message}</Panel.Error>}
-      <Panel.InlineElements relation='inner' align='end'>
+      <div className={style.buttonRow}>
        <Button size='sm' variant='ontime-ghosted' onClick={onCancel}>
          Cancel
        </Button>
        <Button size='sm' type='submit' variant='ontime-filled' isDisabled={!canSubmit} isLoading={isSubmitting}>
          Save
        </Button>
-      </Panel.InlineElements>
+      </div>
    </form>
  );
 }
@@ -0,0 +1,4 @@
+.actionButtons {
+  display: flex;
+  gap: 1em;
+}
@@ -6,12 +6,13 @@ import { Settings } from 'ontime-types';
 import { postSettings } from '../../../../common/api/settings';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import useSettings from '../../../../common/hooks-query/useSettings';
-import { preventEscape } from '../../../../common/utils/keyEvent';
 import { isOnlyNumbers } from '../../../../common/utils/regex';
 import * as Panel from '../../panel-utils/PanelUtils';

 import GeneralPinInput from './GeneralPinInput';

+import style from './GeneralPanel.module.scss';
+
 export type GeneralPanelFormValues = {
  filename: string;
 };
@@ -61,16 +62,11 @@ export default function GeneralPanelForm() {
  const isLoading = status === 'pending';

  return (
-    <Panel.Section
-      as='form'
-      onSubmit={handleSubmit(onSubmit)}
-      onKeyDown={(event) => preventEscape(event, onReset)}
-      id='app-settings'
-    >
+    <Panel.Section as='form' onSubmit={handleSubmit(onSubmit)} id='app-settings'>
      <Panel.Card>
        <Panel.SubHeader>
          General settings
-          <Panel.InlineElements>
+          <div className={style.actionButtons}>
            <Button isDisabled={!isDirty || isSubmitting} variant='ontime-ghosted' size='sm' onClick={onReset}>
              Revert to saved
            </Button>
@@ -84,7 +80,7 @@ export default function GeneralPanelForm() {
            >
              Save
            </Button>
-          </Panel.InlineElements>
+          </div>
        </Panel.SubHeader>
        {submitError && <Panel.Error>{submitError}</Panel.Error>}
        <Panel.Divider />
@@ -6,12 +6,13 @@ import { ViewSettings } from 'ontime-types';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import { postViewSettings } from '../../../../common/api/viewSettings';
 import ExternalLink from '../../../../common/components/external-link/ExternalLink';
-import { SwatchPickerRHF } from '../../../../common/components/input/colour-input/SwatchPicker';
+import { PopoverPickerRHF } from '../../../../common/components/input/popover-picker/PopoverPicker';
 import useInfo from '../../../../common/hooks-query/useInfo';
 import useViewSettings from '../../../../common/hooks-query/useViewSettings';
-import { preventEscape } from '../../../../common/utils/keyEvent';
 import * as Panel from '../../panel-utils/PanelUtils';

+import style from './GeneralPanel.module.scss';
+
 const cssOverrideDocsUrl = 'https://docs.getontime.no/features/custom-styling/';

 export default function ViewSettingsForm() {
@@ -66,23 +67,18 @@ export default function ViewSettingsForm() {
  const isLoading = status === 'pending' || infoStatus === 'pending';

  return (
-    <Panel.Section
-      as='form'
-      onSubmit={handleSubmit(onSubmit)}
-      onKeyDown={(event) => preventEscape(event, onReset)}
-      id='view-settings'
-    >
+    <Panel.Section as='form' onSubmit={handleSubmit(onSubmit)} id='view-settings'>
      <Panel.Card>
        <Panel.SubHeader>
          View settings
-          <Panel.InlineElements>
+          <div className={style.actionButtons}>
            <Button isDisabled={!isDirty} variant='ontime-ghosted' size='sm' onClick={onReset}>
              Revert to saved
            </Button>
            <Button type='submit' isLoading={isSubmitting} isDisabled={!isDirty} variant='ontime-filled' size='sm'>
              Save
            </Button>
-          </Panel.InlineElements>
+          </div>
        </Panel.SubHeader>
        <Panel.Divider />
        <Alert status='info' variant='ontime-on-dark-info'>
@@ -115,15 +111,15 @@ export default function ViewSettingsForm() {
          <Panel.ListGroup>
            <Panel.ListItem>
              <Panel.Field title='Timer colour' description='Default colour of a running timer' />
-              <SwatchPickerRHF name='normalColor' control={control} />
+              <PopoverPickerRHF name='normalColor' control={control} />
            </Panel.ListItem>
            <Panel.ListItem>
              <Panel.Field title='Warning colour' description='Colour of a running timer in warning mode' />
-              <SwatchPickerRHF name='warningColor' control={control} />
+              <PopoverPickerRHF name='warningColor' control={control} />
            </Panel.ListItem>
            <Panel.ListItem>
              <Panel.Field title='Danger colour' description='Colour of a running timer in danger mode' />
-              <SwatchPickerRHF name='dangerColor' control={control} />
+              <PopoverPickerRHF name='dangerColor' control={control} />
            </Panel.ListItem>
          </Panel.ListGroup>
          <Panel.ListGroup>
@@ -0,0 +1,189 @@
+import { Controller, useFieldArray, useForm } from 'react-hook-form';
+import { Button, IconButton, Input, Select, Switch } from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
+import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
+import { HttpSettings } from 'ontime-types';
+import { generateId } from 'ontime-utils';
+
+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 { cycles } from './integrationUtils';
+
+import style from './IntegrationsPanel.module.css';
+
+export default function HttpIntegrations() {
+  const { data, status } = useHttpSettings();
+  const { mutateAsync } = usePostHttpSettings();
+
+  const {
+    control,
+    handleSubmit,
+    reset,
+    register,
+    setError,
+    formState: { errors, isSubmitting, isDirty, isValid },
+  } = useForm<HttpSettings>({
+    mode: 'onChange',
+    defaultValues: data,
+    values: data,
+    resetOptions: {
+      keepDirtyValues: true,
+    },
+  });
+
+  const { fields, prepend, remove } = useFieldArray({
+    name: 'subscriptions',
+    control,
+  });
+
+  const onSubmit = async (values: HttpSettings) => {
+    try {
+      await mutateAsync(values);
+    } catch (error) {
+      setError('root', { message: maybeAxiosError(error) });
+    }
+  };
+
+  const preventEscape = (event: React.KeyboardEvent) => {
+    if (isKeyEscape(event)) {
+      event.preventDefault();
+      event.stopPropagation();
+    }
+  };
+
+  const handleAddNewSubscription = () => {
+    prepend({
+      id: generateId(),
+      cycle: 'onLoad',
+      message: '',
+      enabled: true,
+    });
+  };
+
+  const handleDeleteSubscription = (index: number) => {
+    remove(index);
+  };
+
+  const canSubmit = !isSubmitting && isDirty && isValid;
+  const isLoading = status === 'pending';
+
+  return (
+    <Panel.Section>
+      <Panel.Card>
+        <Panel.SubHeader>
+          HTTP settings
+          <div className={style.flex}>
+            <Button variant='ontime-ghosted' size='sm' onClick={() => reset()} isDisabled={!canSubmit}>
+              Revert to saved
+            </Button>
+            <Button
+              variant='ontime-filled'
+              size='sm'
+              type='submit'
+              form='http-form'
+              isDisabled={!canSubmit}
+              isLoading={isSubmitting}
+            >
+              Save
+            </Button>
+          </div>
+        </Panel.SubHeader>
+        <Panel.Divider />
+        <Panel.Section as='form' id='http-form' onSubmit={handleSubmit(onSubmit)} onKeyDown={preventEscape}>
+          <Panel.Loader isLoading={isLoading} />
+          {errors?.root && <Panel.Error>{errors.root.message}</Panel.Error>}
+          <Panel.ListGroup>
+            <Panel.ListItem>
+              <Panel.Field title='HTTP Output' description='Provide feedback from Ontime through HTTP' />
+              <Controller
+                control={control}
+                name='enabledOut'
+                render={({ field: { onChange, value, ref } }) => (
+                  <Switch variant='ontime' size='lg' isChecked={value} onChange={onChange} ref={ref} />
+                )}
+              />
+            </Panel.ListItem>
+          </Panel.ListGroup>
+
+          <Panel.Divider />
+
+          <Panel.Title>
+            HTTP Integration
+            <Button variant='ontime-subtle' size='sm' rightIcon={<IoAdd />} onClick={handleAddNewSubscription}>
+              New
+            </Button>
+          </Panel.Title>
+          {fields.length > 0 && (
+            <Panel.Table>
+              <thead>
+                <tr>
+                  <th>Enabled</th>
+                  <th>Cycle</th>
+                  <th className={style.fullWidth}>Message</th>
+                  <th />
+                </tr>
+              </thead>
+              <tbody>
+                {fields.map((integration, index) => {
+                  // @ts-expect-error -- not sure why it is not finding the type, it is ok
+                  const maybeError = errors.subscriptions?.[index]?.message?.message;
+                  return (
+                    <tr key={integration.id}>
+                      <td>
+                        <Switch variant='ontime' {...register(`subscriptions.${index}.enabled`)} />
+                      </td>
+                      <td className={style.autoWidth}>
+                        <Select
+                          size='sm'
+                          variant='ontime'
+                          className={style.fitContents}
+                          {...register(`subscriptions.${index}.cycle`)}
+                        >
+                          {cycles.map((cycle) => (
+                            <option key={cycle.id} value={cycle.value}>
+                              {cycle.label}
+                            </option>
+                          ))}
+                        </Select>
+                      </td>
+                      <td className={style.fullWidth}>
+                        <Input
+                          size='sm'
+                          variant='ontime-filled'
+                          autoComplete='off'
+                          placeholder='http://third-party/vt1/{{timer.current}}'
+                          {...register(`subscriptions.${index}.message`, {
+                            required: { value: true, message: 'Required field' },
+                            pattern: {
+                              value: startsWithHttp,
+                              message: 'HTTP messages should start with http://',
+                            },
+                          })}
+                        />
+                        {maybeError && <Panel.Error>{maybeError}</Panel.Error>}
+                      </td>
+                      <td>
+                        <IconButton
+                          size='sm'
+                          variant='ontime-ghosted'
+                          color='#FA5656' // $red-500
+                          icon={<IoTrash />}
+                          aria-label='Delete entry'
+                          onClick={() => handleDeleteSubscription(index)}
+                        />
+                      </td>
+                    </tr>
+                  );
+                })}
+              </tbody>
+            </Panel.Table>
+          )}
+        </Panel.Section>
+      </Panel.Card>
+    </Panel.Section>
+  );
+}
@@ -0,0 +1,16 @@
+.fullWidth {
+  width: 100%;
+}
+
+.halfWidth {
+  width: 50%;
+}
+
+.fitContents.fitContents {
+  width: max-content; /* override chakra */
+}
+
+.flex {
+  display: flex;
+  gap: 1rem;
+}
@@ -0,0 +1,42 @@
+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 HttpIntegrations from './HttpIntegrations';
+import OscIntegrations from './OscIntegrations';
+
+const integrationDocsUrl = 'https://docs.getontime.no/api/integrations/';
+
+export default function IntegrationsPanel({ location }: PanelBaseProps) {
+  const oscRef = useScrollIntoView<HTMLDivElement>('osc', location);
+  const httpRef = useScrollIntoView<HTMLDivElement>('http', location);
+
+  return (
+    <>
+      <Panel.Header>Integration settings</Panel.Header>
+      <Panel.Section>
+        <Alert status='info' variant='ontime-on-dark-info'>
+          <AlertIcon />
+          <AlertDescription>
+            Integrations allow Ontime to receive commands or send its data to other systems in your workflow. <br />
+            <br />
+            Currently supported protocols are OSC (Open Sound Control), HTTP and Websockets. <br />
+            WebSockets are used for Ontime and cannot be configured independently. <br />
+            <ExternalLink href={integrationDocsUrl}>See the docs</ExternalLink>
+          </AlertDescription>
+        </Alert>
+      </Panel.Section>
+      <Panel.Section>
+        <div ref={oscRef}>
+          <OscIntegrations />
+        </div>
+        <div ref={httpRef}>
+          <HttpIntegrations />
+        </div>
+      </Panel.Section>
+    </>
+  );
+}
@@ -0,0 +1,317 @@
+import { useEffect } from 'react';
+import { Controller, useFieldArray, useForm } from 'react-hook-form';
+import { Button, IconButton, Input, Select, Switch } from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
+import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
+import { OSCSettings } from 'ontime-types';
+import { generateId } from 'ontime-utils';
+
+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 { isOntimeCloud } from '../../../../externals';
+import * as Panel from '../../panel-utils/PanelUtils';
+
+import { cycles } from './integrationUtils';
+
+import style from './IntegrationsPanel.module.css';
+
+export default function OscIntegrations() {
+  const { data, status } = useOscSettings();
+  const { mutateAsync } = useOscSettingsMutation();
+
+  const {
+    control,
+    handleSubmit,
+    reset,
+    register,
+    setError,
+    formState: { errors, isSubmitting, isDirty, isValid },
+  } = useForm<OSCSettings>({
+    mode: 'onChange',
+    defaultValues: data,
+    values: data,
+    resetOptions: {
+      keepDirtyValues: true,
+    },
+  });
+
+  const { fields, prepend, remove } = useFieldArray({
+    name: 'subscriptions',
+    control,
+  });
+
+  // update form if we get new data from server
+  useEffect(() => {
+    if (data) {
+      reset(data);
+    }
+  }, [data, reset]);
+
+  const onSubmit = async (values: OSCSettings) => {
+    if (values.portIn === values.portOut) {
+      setError('portIn', { message: 'OSC IN and OUT Ports cant be the same' });
+      return;
+    }
+
+    const parsedValues = { ...values, portIn: Number(values.portIn), portOut: Number(values.portOut) };
+    try {
+      await mutateAsync(parsedValues);
+    } catch (error) {
+      setError('root', { message: maybeAxiosError(error) });
+    }
+  };
+
+  const preventEscape = (event: React.KeyboardEvent) => {
+    if (isKeyEscape(event)) {
+      event.preventDefault();
+      event.stopPropagation();
+    }
+  };
+
+  const handleAddNewSubscription = () => {
+    prepend({
+      id: generateId(),
+      cycle: 'onLoad',
+      address: '',
+      payload: '',
+      enabled: true,
+    });
+  };
+
+  const handleDeleteSubscription = (index: number) => {
+    remove(index);
+  };
+
+  const canSubmit = !isSubmitting && isDirty && isValid;
+  const isLoading = status === 'pending';
+
+  return (
+    <Panel.Card>
+      <Panel.SubHeader>
+        OSC settings
+        <div className={style.flex}>
+          <Button variant='ontime-ghosted' size='sm' onClick={() => reset()} isDisabled={!canSubmit}>
+            Revert to saved
+          </Button>
+          <Button
+            variant='ontime-filled'
+            size='sm'
+            type='submit'
+            form='osc-form'
+            isDisabled={!canSubmit}
+            isLoading={isSubmitting}
+          >
+            Save
+          </Button>
+        </div>
+      </Panel.SubHeader>
+      {isOntimeCloud && (
+        <Panel.Highlight>For security reasons OSC integrations are not available in the cloud service.</Panel.Highlight>
+      )}
+
+      <Panel.Divider />
+
+      <Panel.Section as='form' id='osc-form' onSubmit={handleSubmit(onSubmit)} onKeyDown={preventEscape}>
+        <Panel.Loader isLoading={isLoading} />
+        <Panel.Title>General OSC settings</Panel.Title>
+        {errors?.root && <Panel.Error>{errors.root.message}</Panel.Error>}
+        <Panel.ListGroup>
+          <Panel.ListItem>
+            <Panel.Field title='OSC input' description='Allow control of Ontime through OSC' />
+            <Controller
+              control={control}
+              name='enabledIn'
+              render={({ field: { onChange, value, ref } }) => (
+                <Switch variant='ontime' size='lg' isChecked={value} onChange={onChange} ref={ref} />
+              )}
+            />
+          </Panel.ListItem>
+          <Panel.ListItem>
+            <Panel.Field
+              title='Listen on port'
+              description='Port for incoming OSC. Default: 8888'
+              error={errors.portIn?.message}
+            />
+            <Input
+              id='portIn'
+              placeholder='8888'
+              width='5rem'
+              maxLength={5}
+              size='sm'
+              textAlign='right'
+              variant='ontime-filled'
+              type='number'
+              autoComplete='off'
+              {...register('portIn', {
+                required: { value: true, message: 'Required field' },
+                max: { value: 65535, message: 'Port must be within range 1024 - 65535' },
+                min: { value: 1024, message: 'Port must be within range 1024 - 65535' },
+                pattern: {
+                  value: isOnlyNumbers,
+                  message: 'Value should be numeric',
+                },
+              })}
+            />
+          </Panel.ListItem>
+        </Panel.ListGroup>
+        <Panel.ListGroup>
+          <Panel.ListItem>
+            <Panel.Field title='OSC output' description='Provide feedback from Ontime with OSC' />
+            <Controller
+              control={control}
+              name='enabledOut'
+              render={({ field: { onChange, value, ref } }) => (
+                <Switch variant='ontime' size='lg' isChecked={value} onChange={onChange} ref={ref} />
+              )}
+            />
+          </Panel.ListItem>
+          <Panel.ListItem>
+            <Panel.Field
+              title='OSC target IP'
+              description='IP address Ontime will send OSC messages to'
+              error={errors.targetIP?.message}
+            />
+            <Input
+              id='targetIP'
+              placeholder='127.0.0.1'
+              width='9rem'
+              size='sm'
+              textAlign='right'
+              variant='ontime-filled'
+              autoComplete='off'
+              {...register('targetIP', {
+                required: { value: true, message: 'Required field' },
+                pattern: {
+                  value: isIPAddress,
+                  message: 'Invalid IP address',
+                },
+              })}
+            />
+          </Panel.ListItem>
+          <Panel.ListItem>
+            <Panel.Field
+              title='OSC target port'
+              description='Port number Ontime will send OSC messages to'
+              error={errors.portOut?.message}
+            />
+            <Input
+              id='portOut'
+              placeholder='8888'
+              width='75px'
+              size='sm'
+              textAlign='right'
+              variant='ontime-filled'
+              autoComplete='off'
+              {...register('portOut', {
+                required: { value: true, message: 'Required field' },
+                max: { value: 65535, message: 'Port must be within range 1024 - 65535' },
+                min: { value: 1024, message: 'Port must be within range 1024 - 65535' },
+                pattern: {
+                  value: isOnlyNumbers,
+                  message: 'Value should be numeric',
+                },
+              })}
+            />
+          </Panel.ListItem>
+        </Panel.ListGroup>
+
+        <Panel.Divider />
+
+        <Panel.Title>
+          OSC integrations
+          <Button variant='ontime-subtle' size='sm' rightIcon={<IoAdd />} onClick={handleAddNewSubscription}>
+            Add
+          </Button>
+        </Panel.Title>
+
+        {fields.length > 0 && (
+          <Panel.Table>
+            <thead>
+              <tr>
+                <th>Enabled</th>
+                <th>Cycle</th>
+                <th className={style.halfWidth}>Address</th>
+                <th className={style.halfWidth}>Arguments</th>
+                <th />
+              </tr>
+            </thead>
+            <tbody>
+              {fields.map((field, index) => {
+                const maybeAddressError = errors.subscriptions?.[index]?.address?.message;
+                const maybePayloadError = errors.subscriptions?.[index]?.payload?.message;
+                return (
+                  <tr key={field.id}>
+                    <td>
+                      <Switch variant='ontime' {...register(`subscriptions.${index}.enabled`)} />
+                    </td>
+                    <td className={style.autoWidth}>
+                      <Select
+                        size='sm'
+                        variant='ontime'
+                        className={style.fitContents}
+                        {...register(`subscriptions.${index}.cycle`)}
+                      >
+                        {cycles.map((cycle) => (
+                          <option key={cycle.id} value={cycle.value}>
+                            {cycle.label}
+                          </option>
+                        ))}
+                      </Select>
+                    </td>
+                    <td className={style.halfWidth}>
+                      <Input
+                        key={field.id}
+                        size='sm'
+                        variant='ontime-filled'
+                        autoComplete='off'
+                        placeholder='/from-ontime/'
+                        {...register(`subscriptions.${index}.address`, {
+                          required: { value: true, message: 'Required field' },
+                          validate: {
+                            oscStartsWithSlash: (value) =>
+                              startsWithSlash.test(value) || 'OSC address should start with a forward slash',
+                            oscStringIsAscii: (value) =>
+                              isASCII.test(value) || 'OSC address only allow ASCII characters',
+                          },
+                        })}
+                      />
+                      {maybeAddressError && <Panel.Error>{maybeAddressError}</Panel.Error>}
+                    </td>
+                    <td className={style.halfWidth}>
+                      <Input
+                        key={field.id}
+                        size='sm'
+                        variant='ontime-filled'
+                        autoComplete='off'
+                        placeholder='{{timer.current}}'
+                        {...register(`subscriptions.${index}.payload`, {
+                          validate: {
+                            oscStringIsAscii: (value) =>
+                              isASCIIorEmpty.test(value) || 'OSC arguments only allow ASCII characters',
+                          },
+                        })}
+                      />
+                      {maybePayloadError && <Panel.Error>{maybePayloadError}</Panel.Error>}
+                    </td>
+                    <td>
+                      <IconButton
+                        size='sm'
+                        variant='ontime-ghosted'
+                        color='#FA5656' // $red-500
+                        icon={<IoTrash />}
+                        aria-label='Delete entry'
+                        onClick={() => handleDeleteSubscription(index)}
+                      />
+                    </td>
+                  </tr>
+                );
+              })}
+            </tbody>
+          </Panel.Table>
+        )}
+      </Panel.Section>
+    </Panel.Card>
+  );
+}
@@ -0,0 +1,19 @@
+import { TimerLifeCycle } from 'ontime-types';
+
+type CycleLabel = {
+  id: number;
+  label: string;
+  value: keyof typeof TimerLifeCycle;
+};
+
+export const cycles: CycleLabel[] = [
+  { id: 1, label: 'On Load', value: 'onLoad' },
+  { id: 2, label: 'On Start', value: 'onStart' },
+  { id: 3, label: 'On Pause', value: 'onPause' },
+  { id: 4, label: 'On Stop', value: 'onStop' },
+  { id: 5, label: 'Every second', value: 'onClock' },
+  { id: 5, label: 'On Timer Update', value: 'onUpdate' },
+  { id: 6, label: 'On Finish', value: 'onFinish' },
+  { id: 7, label: 'On Warning', value: 'onWarning' },
+  { id: 8, label: 'On Danger', value: 'onDanger' },
+];
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Carlos Valente	9813643c96	feat: parse timeToEnd from excel	2024-12-16 13:38:49 +01:00
Carlos Valente	b88c2a6bd8	refactor: extract time-to-end	2024-12-16 13:38:46 +01:00