refactor: remove unnecessary abstractions

refactor: simplify logic
refactor: clearer relationship on rundown elements
2026-07-26 10:38:55 +00:00 · 2025-03-29 21:23:47 +01:00 · 2025-03-28 22:04:57 +01:00 · 2025-03-28 19:55:20 +01:00 · 2025-03-28 19:55:20 +01:00 · 2025-03-28 19:55:20 +01:00
321 changed files with 8689 additions and 13911 deletions
@@ -14,12 +14,12 @@ jobs:
      - name: Use Node.js
        uses: actions/setup-node@v4
        with:
-          node-version: 22
+          node-version: 20

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 # Set environment variables
 # Environment Variable to signal that we are running production
@@ -1,6 +1,6 @@
 {
    "name": "@getontime/cli",
-    "version": "3.15.2",
+    "version": "3.14.3",
    "author": "Carlos Valente",
    "description": "Time keeping for live events",
    "repository": "https://github.com/cpvalente/ontime",
@@ -1,29 +1,28 @@
 {
  "name": "ontime-ui",
-  "version": "3.15.2",
+  "version": "3.14.3",
  "private": true,
  "type": "module",
  "dependencies": {
    "@chakra-ui/react": "^2.7.0",
-    "@dnd-kit/core": "^6.3.1",
-    "@dnd-kit/sortable": "^10.0.0",
+    "@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.17.2",
+    "@mantine/hooks": "^7.13.3",
    "@sentry/react": "^8.43.0",
    "@table-nav/react": "^0.0.7",
    "@tanstack/react-query": "^5.62.7",
    "@tanstack/react-query-devtools": "^5.62.7",
-    "@tanstack/react-table": "^8.21.3",
+    "@tanstack/react-table": "^8.20.5",
    "autosize": "^6.0.1",
-    "axios": "^1.9.0",
+    "axios": "^1.2.0",
    "color": "^4.2.3",
    "csv-stringify": "^6.4.5",
    "framer-motion": "^10.10.0",
-    "prismjs": "^1.29.0",
    "react": "^18.3.1",
    "react-colorful": "^5.6.1",
    "react-dom": "^18.3.1",
@@ -32,7 +31,6 @@
    "react-icons": "5.4.0",
    "react-qr-code": "^2.0.12",
    "react-router-dom": "^6.3.0",
-    "react-simple-code-editor": "^0.14.1",
    "web-vitals": "^3.1.1",
    "zustand": "^5.0.3"
  },
@@ -67,12 +65,11 @@
    "@sentry/vite-plugin": "^2.16.1",
    "@tanstack/eslint-plugin-query": "^5.8.4",
    "@types/color": "^3.0.3",
-    "@types/prismjs": "^1.26.5",
    "@types/react": "^18.0.26",
    "@types/react-dom": "^18.0.10",
    "@typescript-eslint/eslint-plugin": "catalog:",
    "@typescript-eslint/parser": "catalog:",
-    "@vitejs/plugin-react": "4.5.1",
+    "@vitejs/plugin-react": "^4.2.1",
    "eslint": "catalog:",
    "eslint-config-prettier": "catalog:",
    "eslint-plugin-jest": "^28.6.0",
@@ -86,10 +83,10 @@
    "prettier": "catalog:",
    "sass": "^1.57.1",
    "typescript": "catalog:",
-    "vite": "6.3.1",
-    "vite-plugin-compression2": "1.4.0",
-    "vite-plugin-svgr": "4.3.0",
-    "vite-tsconfig-paths": "5.1.4",
+    "vite": "^5.2.11",
+    "vite-plugin-compression2": "^1.3.3",
+    "vite-plugin-svgr": "^4.2.0",
+    "vite-tsconfig-paths": "^4.3.1",
    "vitest": "catalog:"
  }
 }
@@ -25,10 +25,11 @@ const Operator = React.lazy(() => import('./features/operator/OperatorExport'));
 const TimerView = React.lazy(() => import('./views/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('./views/countdown/Countdown'));
+const Countdown = React.lazy(() => import('./features/viewers/countdown/Countdown'));

 const Backstage = React.lazy(() => import('./views/backstage/Backstage'));
 const Timeline = React.lazy(() => import('./views/timeline/TimelinePage'));
+const Public = React.lazy(() => import('./views/public/Public'));
 const Lower = React.lazy(() => import('./features/viewers/lower-thirds/LowerThird'));
 const StudioClock = React.lazy(() => import('./features/viewers/studio/StudioClock'));
 const ProjectInfo = React.lazy(() => import('./views/project-info/ProjectInfo'));
@@ -39,6 +40,7 @@ const SClock = withPreset(withData(ClockView));
 const SCountdown = withPreset(withData(Countdown));
 const SBackstage = withPreset(withData(Backstage));
 const SProjectInfo = withPreset(withData(ProjectInfo));
+const SPublic = withPreset(withData(Public));
 const SLowerThird = withPreset(withData(Lower));
 const SStudio = withPreset(withData(StudioClock));
 const STimeline = withPreset(withData(Timeline));
@@ -86,6 +88,14 @@ export default function AppRouter() {
            </ViewLoader>
          }
        />
+        <Route
+          path='/public'
+          element={
+            <ViewLoader>
+              <SPublic />
+            </ViewLoader>
+          }
+        />
        <Route
          path='/minimal'
          element={
@@ -1,30 +0,0 @@
-import axios from 'axios';
-
-import { apiEntryUrl } from './constants';
-
-const assetsPath = `${apiEntryUrl}/assets`;
-
-/**
- * HTTP request to get css contents
- */
-export async function getCSSContents(): Promise<string> {
-  const res = await axios.get(`${assetsPath}/css`);
-  return res.data;
-}
-
-/**
- * HTTP request to post css contents
- */
-export async function postCSSContents(css: string): Promise<void> {
-  await axios.post(`${assetsPath}/css`, {
-    css,
-  });
-}
-
-/**
- * HTTP request to restore default css
- */
-export async function restoreCSSContents(): Promise<string> {
-  const res = await axios.post(`${assetsPath}/css/restore`);
-  return res.data;
-}
@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { CustomField, CustomFieldKey, CustomFields } from 'ontime-types';
+import { CustomField, CustomFieldLabel, CustomFields } from 'ontime-types';

 import { apiEntryUrl } from './constants';

@@ -24,15 +24,15 @@ export async function postCustomField(newField: CustomField): Promise<CustomFiel
 /**
 * Edits single custom field
 */
-export async function editCustomField(key: CustomFieldKey, newField: CustomField): Promise<CustomFields> {
-  const res = await axios.put(`${customFieldsPath}/${key}`, { ...newField });
+export async function editCustomField(label: CustomFieldLabel, newField: CustomField): Promise<CustomFields> {
+  const res = await axios.put(`${customFieldsPath}/${label}`, { ...newField });
  return res.data;
 }

 /**
 * Deletes single custom field
 */
-export async function deleteCustomField(key: CustomFieldKey): Promise<CustomFields> {
-  const res = await axios.delete(`${customFieldsPath}/${key}`);
+export async function deleteCustomField(label: CustomFieldLabel): Promise<CustomFields> {
+  const res = await axios.delete(`${customFieldsPath}/${label}`);
  return res.data;
 }
@@ -11,7 +11,7 @@ export type HasUpdate = {
 * HTTP request to get the latest version and url from github
 */
 export async function getLatestVersion(): Promise<HasUpdate> {
-  const res = await axios.get(apiRepoLatest);
+  const res = await axios.get(`${apiRepoLatest}`);
  return {
    url: res.data.html_url as string,
    version: res.data.tag_name as string,
@@ -11,7 +11,7 @@ export const reportUrl = `${apiEntryUrl}/report`;
 * HTTP request to fetch all reports
 */
 export async function fetchReport(): Promise<OntimeReport> {
-  const res = await axios.get(reportUrl);
+  const res = await axios.get(`${reportUrl}/`);
  return res.data;
 }

@@ -1,6 +1,5 @@
 import axios, { AxiosResponse } from 'axios';
 import {
-  EntryId,
  MessageResponse,
  OntimeEntry,
  OntimeEvent,
@@ -17,7 +16,7 @@ const rundownPath = `${apiEntryUrl}/rundown`;
 * HTTP request to fetch a list of existing rundowns
 */
 export async function fetchProjectRundownList(): Promise<ProjectRundownsList> {
-  const res = await axios.get(rundownPath);
+  const res = await axios.get(`${rundownPath}/`);
  return res.data;
 }

@@ -30,16 +29,16 @@ export async function fetchCurrentRundown(): Promise<Rundown> {
 }

 /**
- * HTTP request to post new entry
+ * HTTP request to post new event
 */
-export async function postAddEntry(data: TransientEventPayload): Promise<AxiosResponse<OntimeEntry>> {
+export async function requestPostEvent(data: TransientEventPayload): Promise<AxiosResponse<OntimeEntry>> {
  return axios.post(rundownPath, data);
 }

 /**
- * HTTP request to edit an entry
+ * HTTP request to put new event
 */
-export async function putEditEntry(data: Partial<OntimeEntry>): Promise<AxiosResponse<OntimeEntry>> {
+export async function requestPutEvent(data: Partial<OntimeEntry>): Promise<AxiosResponse<OntimeEntry>> {
  return axios.put(rundownPath, data);
 }

@@ -49,22 +48,22 @@ type BatchEditEntry = {
 };

 /**
- * HTTP request to edit multiple events
+ * HTTP request to put multiple events
 */
-export async function putBatchEditEvents(data: BatchEditEntry): Promise<AxiosResponse<Rundown>> {
+export async function requestBatchPutEvents(data: BatchEditEntry): Promise<AxiosResponse<MessageResponse>> {
  return axios.put(`${rundownPath}/batch`, data);
 }

 export type ReorderEntry = {
-  entryId: EntryId;
-  destinationId: EntryId;
-  order: 'before' | 'after' | 'insert';
+  eventId: string;
+  from: number;
+  to: number;
 };

 /**
- * HTTP request to reorder an entry
+ * HTTP request to reorder events
 */
-export async function patchReorderEntry(data: ReorderEntry): Promise<AxiosResponse<Rundown>> {
+export async function requestReorderEvent(data: ReorderEntry): Promise<AxiosResponse<OntimeEntry>> {
  return axios.patch(`${rundownPath}/reorder`, data);
 }

@@ -83,36 +82,15 @@ export async function requestEventSwap(data: SwapEntry): Promise<AxiosResponse<M
 /**
 * HTTP request to request application of delay
 */
-export async function requestApplyDelay(delayId: EntryId): Promise<AxiosResponse<Rundown>> {
-  return axios.patch(`${rundownPath}/applydelay/${delayId}`);
+export async function requestApplyDelay(eventId: string): Promise<AxiosResponse<MessageResponse>> {
+  return axios.patch(`${rundownPath}/applydelay/${eventId}`);
 }

 /**
- * HTTP request for cloning an entry
+ * HTTP request to delete given event
 */
-export async function postCloneEntry(entryId: EntryId): Promise<AxiosResponse<Rundown>> {
-  return axios.post(`${rundownPath}/clone/${entryId}`);
-}
-
-/**
- * HTTP request for dissolving of a block
- */
-export async function requestUngroup(blockId: EntryId): Promise<AxiosResponse<Rundown>> {
-  return axios.post(`${rundownPath}/ungroup/${blockId}`);
-}
-
-/**
- * HTTP request for grouping a list of entries into a block
- */
-export async function requestGroupEntries(entryIds: EntryId[]): Promise<AxiosResponse<Rundown>> {
-  return axios.post(`${rundownPath}/group`, { ids: entryIds });
-}
-
-/**
- * HTTP request to delete entries
- */
-export async function deleteEntries(entryIds: EntryId[]): Promise<AxiosResponse<MessageResponse>> {
-  return axios.delete(rundownPath, { data: { ids: entryIds } });
+export async function requestDelete(eventIds: string[]): Promise<AxiosResponse<MessageResponse>> {
+  return axios.delete(rundownPath, { data: { ids: eventIds } });
 }

 /**
@@ -7,7 +7,7 @@ import { addLog } from '../stores/logger';
 import { nowInMillis } from '../utils/time';

 /**
- * Utility unwrap a potential axios error
+ * Utility unrwap a potential axios error
 * @param error
 * @returns
 */
@@ -34,7 +34,7 @@ export function maybeAxiosError(error: unknown) {
 }

 /**
- * Utility unwraps a potential axios error and sends to logger
+ * Utility unrwaps a potential axios error and sends to logger
 * @param prepend
 * @param error
 */
@@ -1,61 +0,0 @@
-@use '../../../theme/viewerDefs' as *;
-
-.baseButton {
-  display: flex;
-  align-items: center;
-  gap: 0.5em;
-
-  width: fit-content;
-  padding-inline: 1em;
-
-  border: 1px solid transparent;
-  border-radius: 3px;
-
-  cursor: pointer;
-
-  &:disabled {
-    opacity: 0.4;
-    cursor: not-allowed;
-  }
-}
-
-.subtle {
-  background: $gray-1050;
-  color: $blue-400;
-
-  &:hover:not(:disabled):not(:active) {
-    background: $gray-1000;
-    color: $blue-500;
-  }
-
-  &:active:not(:disabled) {
-    background: $gray-1100;
-    border-color: $gray-1250;
-  }
-}
-
-.primary {
-  background: $blue-700;
-  color: $ui-white;
-
-  &:hover:not(:disabled):not(:active) {
-    background: $blue-600;
-  }
-
-  &:active:not(:disabled) {
-    background: $blue-800;
-    border-color: $blue-900;
-  }
-
-  &:disabled {
-    opacity: $viewer-opacity-disabled;
-  }
-}
-
-.medium {
-  height: 2rem;
-}
-
-.large {
-  height: 3.5rem;
-}
@@ -1,20 +0,0 @@
-import { ButtonHTMLAttributes } from 'react';
-
-import { cx } from '../../utils/styleUtils';
-
-import style from './Button.module.scss';
-
-interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
-  variant?: 'subtle' | 'primary';
-  size?: 'medium' | 'large';
-}
-
-export default function Button(props: ButtonProps) {
-  const { className, children, variant = 'subtle', size = 'medium', ...buttonProps } = props;
-
-  return (
-    <button className={cx([style.baseButton, style[variant], style[size], className])} type='button' {...buttonProps}>
-      {children}
-    </button>
-  );
-}
@@ -1,28 +1,21 @@
-@use '../../../theme/viewerDefs' as *;
-
-.baseIconButton {
+.subtle {
  aspect-ratio: 1;
  height: 2rem;
-  width: 2rem;
+  height: 2rem;
  display: grid;
  place-content: center;

-  border: 1px solid transparent;
-  border-radius: 3px;
-
-  cursor: pointer;
-}
-
-.subtle {
  background: $gray-1050;
  color: $blue-400;
+  border: 1px solid transparent;
+  border-radius: 3px;

  &:hover:not(:disabled):not(:active) {
    background: $gray-1000;
    color: $blue-500;
  }

-  &:active:not(:disabled){
+  &:active {
    background: $gray-1100;
    border-color: $gray-1250;
  }
@@ -31,37 +24,3 @@
    background: $gray-1050;
  }
 }
-
-.subtle-white {
-  background: $gray-1050;
-  color: $ui-white;
-
-  &:hover:not(:disabled):not(:active) {
-    background: $gray-1000;
-    color: $ui-white;
-  }
-
-  &:active:not(:disabled) {
-    background: $gray-1100;
-    border-color: $gray-1250;
-  }
-
-  &:disabled {
-    background: $gray-1050;
-  }
-}
-
-.destructive {
-  background: $red-700;
-  color: $ui-white;
-
-  &:hover:not(:disabled):not(:active) {
-    background: $red-600;
-    color: $ui-white;
-  }
-
-  &:active:not(:disabled) {
-    background: $red-800;
-    border-color: $red-900;
-  }
-}
@@ -4,15 +4,10 @@ import { cx } from '../../utils/styleUtils';

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

-interface IconButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
-  variant?: 'subtle' | 'subtle-white' | 'destructive';
-}
-
-export default function IconButton(props: IconButtonProps) {
-  const { className, children, variant = 'subtle', ...buttonProps } = props;
-
+export default function IconButton(props: ButtonHTMLAttributes<HTMLButtonElement>) {
+  const { className, children, ...buttonProps } = props;
  return (
-    <button className={cx([style.baseIconButton, style[variant], className])} type='button' {...buttonProps}>
+    <button className={cx([style.subtle, className])} {...buttonProps}>
      {children}
    </button>
  );
@@ -4,13 +4,12 @@ import { IoCopy } from 'react-icons/io5';
 import { Button, ButtonGroup, IconButton, Tooltip } from '@chakra-ui/react';

 import { tooltipDelayFast } from '../../../ontimeConfig';
-import { Size } from '../../models/Util.type';
 import copyToClipboard from '../../utils/copyToClipboard';

 interface CopyTagProps {
  copyValue: string;
  label: string;
-  size?: Size;
+  size?: 'xs' | 'sm' | 'md' | 'lg';
  disabled?: boolean;
  onClick?: () => void;
 }
@@ -2,7 +2,7 @@ import { KeyboardEvent, useEffect, useRef, useState } from 'react';
 import { Input, Radio, RadioGroup } from '@chakra-ui/react';
 import { millisToString, parseUserTime } from 'ontime-utils';

-import { useEntryActions } from '../../../hooks/useEntryAction';
+import { useEventAction } from '../../../hooks/useEventAction';

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

@@ -13,7 +13,7 @@ interface DelayInputProps {

 export default function DelayInput(props: DelayInputProps) {
  const { eventId, duration } = props;
-  const { updateEntry } = useEntryActions();
+  const { updateEvent } = useEventAction();

  const [value, setValue] = useState<string>('');
  const inputRef = useRef<HTMLInputElement | null>(null);
@@ -54,7 +54,7 @@ export default function DelayInput(props: DelayInputProps) {
  };

  const submitChange = (value: number) => {
-    updateEntry({
+    updateEvent({
      id: eventId,
      duration: value,
    });
@@ -3,9 +3,8 @@
  font-size: $text-body-size;
  text-decoration: underline;
  text-underline-offset: 2px;
-  color: $blue-400;

  &:hover {
-    color: $blue-500;
+    color: $blue-400;
  }
 }
@@ -3,7 +3,6 @@ import { IoSettingsOutline } from 'react-icons/io5';

 import { useFadeOutOnInactivity } from '../../hooks/useFadeOutOnInactivity';
 import { cx } from '../../utils/styleUtils';
-import IconButton from '../buttons/IconButton';

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

@@ -18,24 +17,22 @@ export default function FloatingNavigation(props: FloatingNavigationProps) {

  return (
    <div className={cx([style.fadeable, style.buttonContainer, !isButtonShown && style.hidden])}>
-      <IconButton
-        variant='subtle-white'
-        className={style.navButton}
+      <button
        onClick={toggleMenu}
        aria-label='toggle menu'
+        className={style.navButton}
        data-testid='navigation__toggle-menu'
      >
        <IoApps />
-      </IconButton>
-      <IconButton
-        variant='subtle-white'
-        className={style.navButton}
+      </button>
+      <button
+        className={style.button}
        onClick={toggleSettings}
        aria-label='toggle settings'
        data-testid='navigation__toggle-settings'
      >
        <IoSettingsOutline />
-      </IconButton>
+      </button>
    </div>
  );
 }
@@ -3,6 +3,8 @@
 $menu-hover-bg: $gray-1350;
 $menu-focus-bg: $gray-1300;

+$icon-color: $ui-white;
+$button-bg: $gray-1050;
 $button-size: 3rem;

 .fadeable {
@@ -13,7 +15,6 @@ $button-size: 3rem;

  &.hidden {
    opacity: 0;
-    pointer-events: none;
  }
 }

@@ -40,10 +41,20 @@ $button-size: 3rem;
  z-index: 12;
 }

-.navButton {
+.button {
  font-size: 1.5rem;
+  color: $icon-color;
+  background-color: $button-bg;
+  width: $button-size;
  height: $button-size;
-  width: $button-size;;
+  display: grid;
+  place-content: center;
+  border-radius: 3px;
+}
+
+.navButton {
+  @extend .button;
+  z-index: 3;
 }

 .link {
@@ -4,10 +4,10 @@ import type { MultiselectOptions, ParamField } from './types';

 export const makeOptionsFromCustomFields = (
  customFields: CustomFields,
-  additionalOptions: Readonly<Record<string, string>> = {},
+  additionalOptions: Record<string, string> = {},
  filterImageType = true,
 ) => {
-  const options = { ...additionalOptions };
+  const options = structuredClone(additionalOptions);
  for (const [key, value] of Object.entries(customFields)) {
    if (filterImageType && value.type === 'image') {
      continue;
@@ -13,7 +13,6 @@ const cachedRundownPlaceholder: Rundown = {
  id: 'default',
  title: '',
  order: [],
-  flatOrder: [],
  entries: {},
  revision: -1,
 };
@@ -49,11 +48,11 @@ export function useFlatRundown() {
  // update data whenever the revision changes
  useEffect(() => {
    if (data.revision !== -1 && data.revision !== prevRevision) {
-      const flatRundown = data.flatOrder.map((id) => data.entries[id]);
+      const flatRundown = data.order.map((id) => data.entries[id]);
      setFlatRundown(flatRundown);
      setPrevRevision(data.revision);
    }
-  }, [data.entries, data.flatOrder, data.revision, prevRevision]);
+  }, [data.entries, data.order, data.revision, prevRevision]);

  // TODO: should we have a project id field?
  // invalidate current version if project changes
@@ -1,11 +1,10 @@
 import { useCallback } from 'react';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import {
-  EntryId,
-  isOntimeBlock,
  isOntimeEvent,
  MaybeString,
  OntimeBlock,
+  OntimeDelay,
  OntimeEntry,
  OntimeEvent,
  Rundown,
@@ -13,23 +12,19 @@ import {
  TimeStrategy,
  TransientEventPayload,
 } from 'ontime-types';
-import { dayInMs, generateId, MILLIS_PER_SECOND, parseUserTime, swapEventData } from 'ontime-utils';
+import { dayInMs, MILLIS_PER_SECOND, parseUserTime, reorderArray, swapEventData } from 'ontime-utils';

-import { moveDown, moveUp } from '../../features/rundown/rundown.utils';
 import { RUNDOWN } from '../api/constants';
 import {
-  deleteEntries,
-  patchReorderEntry,
-  postAddEntry,
-  postCloneEntry,
-  putBatchEditEvents,
-  putEditEntry,
  ReorderEntry,
  requestApplyDelay,
+  requestBatchPutEvents,
+  requestDelete,
  requestDeleteAll,
  requestEventSwap,
-  requestGroupEntries,
-  requestUngroup,
+  requestPostEvent,
+  requestPutEvent,
+  requestReorderEvent,
  SwapEntry,
 } from '../api/rundown';
 import { logAxiosError } from '../api/utils';
@@ -46,9 +41,9 @@ export type EventOptions = Partial<{
 }>;

 /**
- * Gather utilities for actions on entries
+ * @description Set of utilities for events //TODO: should this be called useEntryAction and so on
 */
-export const useEntryActions = () => {
+export const useEventAction = () => {
  const queryClient = useQueryClient();
  const {
    defaultPublic,
@@ -61,8 +56,8 @@ export const useEntryActions = () => {
    defaultEndAction,
  } = useEditorSettings();

-  const getEntryById = useCallback(
-    (eventId: string): OntimeEntry | undefined => {
+  const getEventById = useCallback(
+    (eventId: string) => {
      const cachedRundown = queryClient.getQueryData<Rundown>(RUNDOWN);
      if (!cachedRundown?.entries) {
        return;
@@ -73,24 +68,26 @@ export const useEntryActions = () => {
  );

  /**
-   * Calls mutation to add new entry
+   * Calls mutation to add new event
   * @private
   */
-  const _addEntryMutation = useMutation({
-    // TODO(v4): optimistic create entry
-    mutationFn: postAddEntry,
-    onSettled: () => queryClient.invalidateQueries({ queryKey: RUNDOWN }),
+  const _addEventMutation = useMutation({
+    mutationFn: requestPostEvent,
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: RUNDOWN });
+    },
+    networkMode: 'always',
  });

  /**
-   * Adds an entry to rundown
+   * Adds an event to rundown
   */
-  const addEntry = useCallback(
-    async (entry: Partial<OntimeEntry>, options?: EventOptions) => {
-      const newEntry: TransientEventPayload = { ...entry, id: generateId() };
+  const addEvent = useCallback(
+    async (event: Partial<OntimeEvent | OntimeDelay | OntimeBlock>, options?: EventOptions) => {
+      const newEvent: TransientEventPayload = { ...event };

      // ************* CHECK OPTIONS specific to events
-      if (isOntimeEvent(newEntry)) {
+      if (isOntimeEvent(newEvent)) {
        // merge creation time options with event settings
        const applicationOptions = {
          after: options?.after,
@@ -100,60 +97,65 @@ export const useEntryActions = () => {
          linkPrevious: options?.linkPrevious ?? linkPrevious,
        };

-        if (applicationOptions?.lastEventId) {
+        if (applicationOptions.linkPrevious && applicationOptions?.lastEventId) {
+          newEvent.linkStart = applicationOptions.lastEventId;
+        } else if (applicationOptions?.lastEventId) {
          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- we know this is a value
          const rundownData = queryClient.getQueryData<Rundown>(RUNDOWN)!;
          const previousEvent = rundownData.entries[applicationOptions.lastEventId];
          if (isOntimeEvent(previousEvent)) {
-            newEntry.timeStart = previousEvent.timeEnd;
+            newEvent.timeStart = previousEvent.timeEnd;
          }
        }

        // Override event with options from editor settings
-        newEntry.linkStart = applicationOptions.linkPrevious;
-        newEntry.isPublic = applicationOptions.defaultPublic;
-
-        if (newEntry.duration === undefined && newEntry.timeEnd === undefined) {
-          newEntry.duration = parseUserTime(defaultDuration);
+        if (applicationOptions.defaultPublic) {
+          newEvent.isPublic = true;
        }

-        if (newEntry.timeDanger === undefined) {
-          newEntry.timeDanger = parseUserTime(defaultDangerTime);
+        if (newEvent.duration === undefined && newEvent.timeEnd === undefined) {
+          newEvent.duration = parseUserTime(defaultDuration);
        }

-        if (newEntry.timeWarning === undefined) {
-          newEntry.timeWarning = parseUserTime(defaultWarnTime);
+        if (newEvent.timeDanger === undefined) {
+          newEvent.timeDanger = parseUserTime(defaultDangerTime);
        }

-        if (newEntry.timerType === undefined) {
-          newEntry.timerType = defaultTimerType;
+        if (newEvent.timeWarning === undefined) {
+          newEvent.timeWarning = parseUserTime(defaultWarnTime);
        }

-        if (newEntry.endAction === undefined) {
-          newEntry.endAction = defaultEndAction;
+        if (newEvent.timerType === undefined) {
+          newEvent.timerType = defaultTimerType;
        }

-        if (newEntry.timeStrategy === undefined) {
-          newEntry.timeStrategy = defaultTimeStrategy;
+        if (newEvent.endAction === undefined) {
+          newEvent.endAction = defaultEndAction;
+        }
+
+        if (newEvent.timeStrategy === undefined) {
+          newEvent.timeStrategy = defaultTimeStrategy;
        }
      }

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

      try {
-        await _addEntryMutation.mutateAsync(newEntry);
+        await _addEventMutation.mutateAsync(newEvent as TransientEventPayload);
      } catch (error) {
        logAxiosError('Failed adding event', error);
      }
    },
    [
-      _addEntryMutation,
+      _addEventMutation,
      defaultDangerTime,
      defaultDuration,
      defaultEndAction,
@@ -167,34 +169,11 @@ export const useEntryActions = () => {
  );

  /**
-   * Calls mutation to clone a selection
+   * Calls mutation to update existing event
   * @private
   */
-  const _cloneMutation = useMutation({
-    mutationFn: postCloneEntry,
-    onSettled: () => queryClient.invalidateQueries({ queryKey: RUNDOWN }),
-  });
-
-  /**
-   * Clone a selection
-   */
-  const clone = useCallback(
-    async (entryId: EntryId) => {
-      try {
-        await _cloneMutation.mutateAsync(entryId);
-      } catch (error) {
-        logAxiosError('Error cloning entry', error);
-      }
-    },
-    [_cloneMutation],
-  );
-
-  /**
-   * Calls mutation to update existing entry
-   * @private
-   */
-  const _updateEntryMutation = useMutation({
-    mutationFn: putEditEntry,
+  const _updateEventMutation = useMutation({
+    mutationFn: requestPutEvent,
    // we optimistically update here
    onMutate: async (newEvent) => {
      // cancel ongoing queries
@@ -213,7 +192,6 @@ export const useEntryActions = () => {
          id: previousData.id,
          title: previousData.title,
          order: previousData.order,
-          flatOrder: previousData.flatOrder,
          entries: newRundown,
          revision: -1,
        });
@@ -231,38 +209,39 @@ export const useEntryActions = () => {
    onSettled: async () => {
      await queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
+    networkMode: 'always',
  });

  /**
-   * Updates existing entry
+   * Updates existing event
   */
-  const updateEntry = useCallback(
+  const updateEvent = useCallback(
    async (event: Partial<OntimeEntry>) => {
      try {
-        await _updateEntryMutation.mutateAsync(event);
+        await _updateEventMutation.mutateAsync(event);
      } catch (error) {
        logAxiosError('Error updating event', error);
      }
    },
-    [_updateEntryMutation],
+    [_updateEventMutation],
  );

  const updateCustomField = useCallback(
-    async (entryId: EntryId, field: string, value: string) => {
-      updateEntry({ id: entryId, custom: { [field]: value } });
+    async (eventId: string, field: string, value: string) => {
+      updateEvent({ id: eventId, custom: { [field]: value } });
    },
-    [updateEntry],
+    [updateEvent],
  );

  /**
   * Updates time of existing event
-   * @param eventId {EntryId} - id of the 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: EntryId, field: TimeField, value: string, lockOnUpdate?: boolean) => {
+    async (eventId: string, field: TimeField, value: string, lockOnUpdate?: boolean) => {
      // an empty value with no lock has no domain validity
      if (!lockOnUpdate && value === '') {
        return;
@@ -284,7 +263,7 @@ export const useEntryActions = () => {
          newEvent.duration = value === '' ? undefined : calculateNewValue();
        } else if (field === 'timeStart') {
          // an empty values means we should link to the previous
-          newEvent.linkStart = value === '';
+          newEvent.linkStart = value === '' ? 'true' : null;
          newEvent.timeStart = value === '' ? undefined : calculateNewValue();
        }
      } else {
@@ -292,7 +271,7 @@ export const useEntryActions = () => {
      }

      try {
-        await _updateEntryMutation.mutateAsync(newEvent);
+        await _updateEventMutation.mutateAsync(newEvent);
      } catch (error) {
        logAxiosError('Error updating event', error);
      }
@@ -344,7 +323,7 @@ export const useEntryActions = () => {
        return previousEnd;
      }
    },
-    [_updateEntryMutation, queryClient],
+    [_updateEventMutation, queryClient],
  );

  /**
@@ -352,7 +331,7 @@ export const useEntryActions = () => {
   * @private
   */
  const _batchUpdateEventsMutation = useMutation({
-    mutationFn: putBatchEditEvents,
+    mutationFn: requestBatchPutEvents,
    onMutate: async ({ ids, data }) => {
      // cancel ongoing queries
      await queryClient.cancelQueries({ queryKey: RUNDOWN });
@@ -380,31 +359,20 @@ export const useEntryActions = () => {
          id: previousRundown.id,
          title: previousRundown.title,
          order: previousRundown.order,
-          flatOrder: previousRundown.flatOrder,
          entries: newRundown,
          revision: -1,
        });
      }
-
      // Return a context with the previous rundown
      return { previousRundown };
    },
-    onSuccess: (response) => {
-      if (!response.data) return;
-
-      const { id, title, order, flatOrder, entries, revision } = response.data;
-      queryClient.setQueryData<Rundown>(RUNDOWN, {
-        id,
-        title,
-        order,
-        flatOrder,
-        entries,
-        revision,
-      });
+    onSettled: async () => {
+      await queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
    onError: (_error, _newEvent, context) => {
      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousRundown);
    },
+    networkMode: 'always',
  });

  const batchUpdateEvents = useCallback(
@@ -419,13 +387,13 @@ export const useEntryActions = () => {
  );

  /**
-   * Calls mutation to delete an entry
+   * Calls mutation to delete an event
   * @private
   */
-  const _deleteEntryMutation = useMutation({
-    mutationFn: deleteEntries,
+  const _deleteEventMutation = useMutation({
+    mutationFn: requestDelete,
    // we optimistically update here
-    onMutate: async (entryIds: EntryId[]) => {
+    onMutate: async (eventIds: string[]) => {
      // cancel ongoing queries
      await queryClient.cancelQueries({ queryKey: RUNDOWN });

@@ -434,14 +402,17 @@ export const useEntryActions = () => {

      if (previousData) {
        // optimistically update object
-        const { entries, order, flatOrder } = optimisticDeleteEntries(entryIds, previousData);
+        const newOrder = previousData.order.filter((id) => !eventIds.includes(id));
+        const newRundown = { ...previousData.entries };
+        for (const eventId of eventIds) {
+          delete newRundown[eventId];
+        }

        queryClient.setQueryData<Rundown>(RUNDOWN, {
          id: previousData.id,
          title: previousData.title,
-          order,
-          flatOrder,
-          entries,
+          order: newOrder,
+          entries: newRundown,
          revision: -1,
        });
      }
@@ -451,7 +422,7 @@ export const useEntryActions = () => {
    },

    // Mutation fails, rollback undoes optimist update
-    onError: (_error, _entryIds, context) => {
+    onError: (_error, _eventId, context) => {
      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousData);
    },
    // Mutation finished, failed or successful
@@ -459,27 +430,28 @@ export const useEntryActions = () => {
    onSettled: () => {
      queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
+    networkMode: 'always',
  });

  /**
-   * Deletes an event entry from the rundown
+   * Deletes an event form the list
   */
-  const deleteEntry = useCallback(
-    async (entryIds: EntryId[]) => {
+  const deleteEvent = useCallback(
+    async (eventIds: string[]) => {
      try {
-        await _deleteEntryMutation.mutateAsync(entryIds);
+        await _deleteEventMutation.mutateAsync(eventIds);
      } catch (error) {
        logAxiosError('Error deleting event', error);
      }
    },
-    [_deleteEntryMutation],
+    [_deleteEventMutation],
  );

  /**
   * Calls mutation to delete all events
   * @private
   */
-  const _deleteAllEntriesMutation = useMutation({
+  const _deleteAllEventsMutation = useMutation({
    mutationFn: requestDeleteAll,
    // we optimistically update here
    onMutate: async () => {
@@ -493,9 +465,8 @@ export const useEntryActions = () => {
      queryClient.setQueryData<Rundown>(RUNDOWN, {
        id: previousData?.id ?? 'default',
        title: previousData?.title ?? '',
-        order: [],
-        flatOrder: [],
        entries: {},
+        order: [],
        revision: -1,
      });

@@ -503,8 +474,8 @@ export const useEntryActions = () => {
      return { previousData };
    },

-    // Mutation fails, rollback optimist update
-    onError: (_error, _, context) => {
+    // Mutation fails, rollback undos optimist update
+    onError: (_error, _eventId, context) => {
      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousData);
    },
    // Mutation finished, failed or successful
@@ -512,18 +483,19 @@ export const useEntryActions = () => {
    onSettled: () => {
      queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
+    networkMode: 'always',
  });

  /**
-   * Deletes all entries in the rundown
+   * Deletes all events from list
   */
-  const deleteAllEntries = useCallback(async () => {
+  const deleteAllEvents = useCallback(async () => {
    try {
-      await _deleteAllEntriesMutation.mutateAsync();
+      await _deleteAllEventsMutation.mutateAsync();
    } catch (error) {
      logAxiosError('Error deleting events', error);
    }
-  }, [_deleteAllEntriesMutation]);
+  }, [_deleteAllEventsMutation]);

  /**
   * Calls mutation to apply a delay
@@ -531,30 +503,18 @@ export const useEntryActions = () => {
   */
  const _applyDelayMutation = useMutation({
    mutationFn: requestApplyDelay,
-    onSuccess: (response) => {
-      if (!response.data) return;
-
-      const { id, title, order, flatOrder, entries, revision } = response.data;
-      queryClient.setQueryData<Rundown>(RUNDOWN, {
-        id,
-        title,
-        order,
-        flatOrder,
-        entries,
-        revision,
-      });
-    },
    // Mutation finished, failed or successful
    onSettled: () => {
      queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
+    networkMode: 'always',
  });

  /**
-   * Applies a given delay
+   * Applies a given delay block
   */
  const applyDelay = useCallback(
-    async (delayEventId: EntryId) => {
+    async (delayEventId: string) => {
      try {
        await _applyDelayMutation.mutateAsync(delayEventId);
      } catch (error) {
@@ -565,133 +525,66 @@ export const useEntryActions = () => {
  );

  /**
-   * Calls mutation to dissolve a block
+   * Calls mutation to reorder an event
   * @private
   */
-  const _ungroupMutation = useMutation({
-    mutationFn: requestUngroup,
-    onSuccess: (response) => {
-      if (!response.data) return;
+  const _reorderEventMutation = useMutation({
+    mutationFn: requestReorderEvent,
+    // we optimistically update here
+    onMutate: async (data) => {
+      // cancel ongoing queries
+      await queryClient.cancelQueries({ queryKey: RUNDOWN });

-      const { id, title, order, flatOrder, entries, revision } = response.data;
-      queryClient.setQueryData<Rundown>(RUNDOWN, {
-        id,
-        title,
-        order,
-        flatOrder,
-        entries,
-        revision,
-      });
-    },
-    onSettled: () => queryClient.invalidateQueries({ queryKey: RUNDOWN }),
-  });
+      // Snapshot the previous value
+      const previousData = queryClient.getQueryData<Rundown>(RUNDOWN);

-  /**
-   * Deletes a block and moves its events to the top level
-   */
-  const ungroup = useCallback(
-    async (blockId: EntryId) => {
-      try {
-        await _ungroupMutation.mutateAsync(blockId);
-      } catch (error) {
-        logAxiosError('Error dissolving block', error);
+      if (previousData) {
+        // optimistically update object
+        const newOrder = reorderArray(previousData.order, data.from, data.to);
+        queryClient.setQueryData<Rundown>(RUNDOWN, {
+          id: previousData.id,
+          title: previousData.title,
+          order: newOrder,
+          entries: previousData.entries,
+          revision: -1,
+        });
      }
+
+      // Return a context with the previous and new events
+      return { previousData };
    },
-    [_ungroupMutation],
-  );

-  /**
-   * Calls mutation to create a block with a selection
-   * @private
-   */
-  const _groupEntriesMutation = useMutation({
-    mutationFn: requestGroupEntries,
-    onSuccess: (response) => {
-      if (!response.data) return;
-
-      const { id, title, order, flatOrder, entries, revision } = response.data;
-      queryClient.setQueryData<Rundown>(RUNDOWN, {
-        id,
-        title,
-        order,
-        flatOrder,
-        entries,
-        revision,
-      });
+    // Mutation fails, rollback undoes optimist update
+    onError: (_error, _eventId, context) => {
+      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousData);
    },
-    onSettled: () => queryClient.invalidateQueries({ queryKey: RUNDOWN }),
-  });
-
-  /**
-   * Create a block with a selection
-   */
-  const groupEntries = useCallback(
-    async (entryIds: EntryId[]) => {
-      try {
-        await _groupEntriesMutation.mutateAsync(entryIds);
-      } catch (error) {
-        logAxiosError('Error grouping entries', error);
-      }
-    },
-    [_groupEntriesMutation],
-  );
-
-  /**
-   * Calls mutation to reorder an entry
-   * @private
-   */
-  const _reorderEntryMutation = useMutation({
-    mutationFn: patchReorderEntry,
    // Mutation finished, failed or successful
    // Fetch anyway, just to be sure
    onSettled: () => {
      queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
+    networkMode: 'always',
  });

  /**
-   * Reorders a given entry
+   * Reorders a given event
   */
-  const reorderEntry = useCallback(
-    async (entryId: EntryId, destinationId: EntryId, order: 'before' | 'after' | 'insert') => {
+  const reorderEvent = useCallback(
+    async (eventId: string, from: number, to: number) => {
      try {
        const reorderObject: ReorderEntry = {
-          entryId,
-          destinationId,
-          order,
+          eventId,
+          from,
+          to,
        };
-        await _reorderEntryMutation.mutateAsync(reorderObject);
+        await _reorderEventMutation.mutateAsync(reorderObject);
      } catch (error) {
        logAxiosError('Error re-ordering event', error);
      }
    },
-    [_reorderEntryMutation],
+    [_reorderEventMutation],
  );

-  const move = useCallback(async (entryId: EntryId, direction: 'up' | 'down') => {
-    const cachedRundown = queryClient.getQueryData<Rundown>(RUNDOWN);
-    if (!cachedRundown?.order) {
-      return;
-    }
-    const { destinationId, order } =
-      direction === 'up'
-        ? moveUp(entryId, cachedRundown.order, cachedRundown.entries)
-        : moveDown(entryId, cachedRundown.order, cachedRundown.entries);
-
-    if (destinationId) {
-      try {
-        const reorderObject: ReorderEntry = {
-          entryId,
-          destinationId,
-          order: order as 'before' | 'after' | 'insert',
-        };
-        await _reorderEntryMutation.mutateAsync(reorderObject);
-      } catch (error) {
-        logAxiosError('Error re-ordering event', error);
-      }
-    }
-  }, []);
-
  /**
   * Calls mutation to swap events
   * @private
@@ -723,7 +616,6 @@ export const useEntryActions = () => {
          id: previousData.id,
          title: previousData.title,
          order: previousData.order,
-          flatOrder: previousData.flatOrder,
          entries: newRundown,
          revision: -1,
        });
@@ -742,6 +634,7 @@ export const useEntryActions = () => {
    onSettled: () => {
      queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
+    networkMode: 'always',
  });

  /**
@@ -759,48 +652,16 @@ export const useEntryActions = () => {
  );

  return {
-    addEntry,
+    addEvent,
    applyDelay,
    batchUpdateEvents,
-    clone,
-    deleteEntry,
-    deleteAllEntries,
-    ungroup,
-    getEntryById,
-    groupEntries,
-    move,
-    reorderEntry,
+    deleteEvent,
+    deleteAllEvents,
+    getEventById,
+    reorderEvent,
    swapEvents,
-    updateEntry,
+    updateEvent,
    updateTimer,
    updateCustomField,
  };
 };
-
-/**
- * Utility to optimistically delete entries from client cache
- */
-function optimisticDeleteEntries(entryIds: EntryId[], rundown: Rundown) {
-  const entries = { ...rundown.entries };
-  let order = [...rundown.order];
-  let flatOrder = [...rundown.flatOrder];
-
-  for (let i = 0; i < entryIds.length; i++) {
-    const entry = entries[entryIds[i]];
-    deleteEntry(entry);
-  }
-
-  function deleteEntry(entry: OntimeEntry) {
-    if (isOntimeBlock(entry) || !entry.parent) {
-      order = order.filter((id) => id !== entry.id);
-    } else {
-      const parent = entries[entry.parent] as OntimeBlock;
-      parent.events = parent.events.filter((event) => event !== entry.id);
-    }
-
-    delete entries[entry.id];
-    flatOrder = flatOrder.filter((id) => id !== entry.id);
-  }
-
-  return { entries, order, flatOrder };
-}
@@ -2,38 +2,31 @@ import { useEffect, useState } from 'react';

 import { throttle } from '../utils/throttle';

-const inactiveTime = 3000; // 3 seconds

-/**
- * Provides whether there has been mouse movement in the page in the last <inactiveTime>
- */
-export const useFadeOutOnInactivity = (initialState = false) => {
-  const [isUserActive, setIsUserActive] = useState(initialState);
+export const useFadeOutOnInactivity = () => {
+  const [isMouseMoved, setIsMouseMoved] = useState(false);

  // show on mouse move
  useEffect(() => {
    let fadeOut: NodeJS.Timeout | null = null;
    const setShowMenuTrue = () => {
-      setIsUserActive(true);
+      setIsMouseMoved(true);
      if (fadeOut) {
        clearTimeout(fadeOut);
      }
-      fadeOut = setTimeout(() => setIsUserActive(false), inactiveTime);
+      fadeOut = setTimeout(() => setIsMouseMoved(false), 3000);
    };

    const throttledShowMenu = throttle(setShowMenuTrue, 1000);

    document.addEventListener('mousemove', throttledShowMenu);
-    document.addEventListener('keydown', throttledShowMenu);
-
    return () => {
      document.removeEventListener('mousemove', throttledShowMenu);
-      document.removeEventListener('keydown', throttledShowMenu);
      if (fadeOut) {
        clearTimeout(fadeOut);
      }
    };
  }, []);

-  return isUserActive;
+  return isMouseMoved;
 };
@@ -1,4 +1,4 @@
-import { OffsetMode, RuntimeStore, SimpleDirection, SimplePlayback, TimerMessage } from 'ontime-types';
+import { RuntimeStore, SimpleDirection, SimplePlayback, TimerMessage } from 'ontime-types';

 import { useRuntimeStore } from '../stores/runtime';
 import { socketSendJson } from '../utils/socket';
@@ -150,7 +150,7 @@ export const useRuntimePlaybackOverview = createSelector((state: RuntimeStore) =

  numEvents: state.runtime.numEvents,
  selectedEventIndex: state.runtime.selectedEventIndex,
-  offset: state.runtime.offsetMode === OffsetMode.Absolute ? state.runtime.offset : state.runtime.relativeOffset,
+  offset: state.runtime.offset,

  currentBlock: state.currentBlock,
 }));
@@ -162,15 +162,8 @@ export const useTimelineStatus = createSelector((state: RuntimeStore) => ({

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

 export const useRuntimeOffset = createSelector((state: RuntimeStore) => ({
@@ -186,12 +179,6 @@ export const useIsOnline = createSelector((state: RuntimeStore) => ({
  isOnline: state.ping > 0,
 }));

-export const useOffsetMode = createSelector((state: RuntimeStore) => ({
-  offsetMode: state.runtime.offsetMode,
-}));
-
-export const setOffsetMode = (payload: OffsetMode) => socketSendJson('offsetmode', payload);
-
 export const usePlayback = () => {
  const featureSelector = (state: RuntimeStore) => ({
    playback: state.timer.playback,
@@ -2,7 +2,7 @@ import { GetInfo } from 'ontime-types';

 export const ontimePlaceholderInfo: GetInfo = {
  networkInterfaces: [],
-  version: '4.0.0',
+  version: '2.0.0',
  serverPort: 4001,
  publicDir: '',
 };
@@ -1,7 +1,8 @@
 import { Settings } from 'ontime-types';

 export const ontimePlaceholderSettings: Settings = {
-  version: '4.0.0',
+  app: 'ontime',
+  version: '2.0.0',
  serverPort: 4001,
  editorKey: null,
  operatorKey: null,
@@ -8,5 +8,4 @@ export const projectDataPlaceholder: ProjectData = {
  backstageUrl: '',
  backstageInfo: '',
  projectLogo: null,
-  custom: [],
 };
@@ -1 +0,0 @@
-export type Size = 'xs' | 'sm' | 'md' | 'lg';
@@ -1,20 +1,9 @@
 import { QueryClient } from '@tanstack/react-query';

-import { isOntimeCloud } from '../externals';
-
 export const ontimeQueryClient = new QueryClient({
  defaultOptions: {
    queries: {
      gcTime: 1000 * 60 * 10, // 10 min
    },
-    mutations: {
-      /**
-       * React Query detects whether the client is online
-       * However, web access is not required for the clients when deployed locally
-       * - use 'always' for clients that may be online
-       * - use 'online' for clients that are connected to the cloud
-       */
-      networkMode: isOntimeCloud ? 'online' : 'always',
-    },
  },
 });
@@ -14,6 +14,18 @@ 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
 */
@@ -2,4 +2,4 @@

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

-exports[`cx() > merges styles 1`] = `"_test_d5d33f _another_d5d33f"`;
+exports[`cx() > merges styles 1`] = `"_test_98a1e0 _another_98a1e0"`;
@@ -22,7 +22,6 @@ describe('aggregateRundowns()', () => {
        title: '',
        revision: 0,
        order: ['1', '2'],
-        flatOrder: ['1', '2'],
        entries: {
          '1': { id: '1' } as OntimeEntry,
          '2': { id: '2' } as OntimeEntry,
@@ -33,7 +32,6 @@ describe('aggregateRundowns()', () => {
        title: '',
        revision: 0,
        order: ['3', '4'],
-        flatOrder: ['3', '4'],
        entries: {
          '3': { id: '3' } as OntimeEntry,
          '4': { id: '4' } as OntimeEntry,
@@ -1,12 +1,12 @@
-import { EndAction, EntryCustomFields, OntimeEvent, SupportedEntry, TimerType, TimeStrategy } from 'ontime-types';
+import { EndAction, EntryCustomFields, OntimeEvent, SupportedEvent, TimerType, TimeStrategy } from 'ontime-types';

-import { cloneEvent } from '../clone';
+import { cloneEvent } from '../eventsManager';

 describe('cloneEvent()', () => {
  it('creates a stem from a given event', () => {
    const original: OntimeEvent = {
      id: 'unique',
-      type: SupportedEntry.Event,
+      type: SupportedEvent.Event,
      title: 'title',
      cue: 'cue',
      note: 'note',
@@ -15,8 +15,7 @@ describe('cloneEvent()', () => {
      timeEnd: 10,
      timerType: TimerType.CountDown,
      timeStrategy: TimeStrategy.LockEnd,
-      parent: 'test',
-      linkStart: false,
+      linkStart: null,
      countToEnd: false,
      endAction: EndAction.None,
      isPublic: false,
@@ -28,7 +27,6 @@ describe('cloneEvent()', () => {
      delay: 0,
      dayOffset: 0,
      gap: 0,
-      triggers: [],
      custom: {
        lighting: '3',
      } as EntryCustomFields,
@@ -37,10 +35,9 @@ describe('cloneEvent()', () => {
    const cloned = cloneEvent(original);
    expect(cloned).not.toBe(original);
    expect(cloned.custom).not.toBe(original.custom);
-    expect(cloned.triggers).not.toBe(original.triggers);

    expect(cloned).toMatchObject({
-      type: SupportedEntry.Event,
+      type: SupportedEvent.Event,
      title: original.title,
      note: original.note,
      timeStart: original.timeStart,
@@ -48,7 +45,6 @@ describe('cloneEvent()', () => {
      timeEnd: original.timeEnd,
      timerType: original.timerType,
      timeStrategy: original.timeStrategy,
-      parent: 'test',
      countToEnd: original.countToEnd,
      linkStart: original.linkStart,
      endAction: original.endAction,
@@ -61,8 +57,6 @@ describe('cloneEvent()', () => {
      gap: 0,
      timeWarning: original.timeWarning,
      timeDanger: original.timeDanger,
-      triggers: original.triggers,
-      custom: original.custom,
    });
  });
 });
@@ -1,6 +1,3 @@
-import { OffsetMode } from 'ontime-types';
-import { dayInMs } from 'ontime-utils';
-
 import { calculateTimeUntilStart, formatTime, nowInMillis } from '../time';

 describe('nowInMillis()', () => {
@@ -43,255 +40,82 @@ describe('formatTime()', () => {
 });

 describe('calculateTimeUntilStart()', () => {
-  describe('Absolute offset mode', () => {
-    test('ontime', () => {
-      const test = {
-        timeStart: 100,
-        dayOffset: 0,
-        delay: 0,
-        currentDay: 0,
-        totalGap: 0,
-        clock: 90,
-        offset: 0,
-        offsetMode: OffsetMode.Absolute,
-        actualStart: null,
-        plannedStart: null,
-      };
-
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(10);
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(10);
-    });
-
-    test('running behind', () => {
-      const test = {
-        timeStart: 100,
-        dayOffset: 0,
-        delay: 0,
-        currentDay: 0,
-        totalGap: 0,
-        clock: 90,
-        offset: -20,
-        offsetMode: OffsetMode.Absolute,
-        actualStart: null,
-        plannedStart: null,
-      };
-
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(30);
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(30);
-    });
-
-    test('running ahead', () => {
-      const test = {
-        timeStart: 100,
-        dayOffset: 0,
-        delay: 0,
-        currentDay: 0,
-        totalGap: 0,
-        clock: 80,
-        offset: 10,
-        offsetMode: OffsetMode.Absolute,
-        actualStart: null,
-        plannedStart: null,
-      };
-
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(20); // <-- when running ahead the unlinked timer stays put
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(10);
-    });
-
-    test('running behind with enough gaps', () => {
-      const test = {
-        timeStart: 100,
-        dayOffset: 0,
-        delay: 0,
-        currentDay: 0,
-        totalGap: 20,
-        clock: 50,
-        offset: -20,
-        offsetMode: OffsetMode.Absolute,
-        actualStart: null,
-        plannedStart: null,
-      };
-
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(50); // <-- when gap is enough to compensate for the running behind
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(70); // This should not be possible
-    });
-
-    test('running behind with too little gaps', () => {
-      const test = {
-        timeStart: 100,
-        dayOffset: 0,
-        delay: 0,
-        currentDay: 0,
-        totalGap: 10,
-        clock: 50,
-        offset: -20,
-        offsetMode: OffsetMode.Absolute,
-        actualStart: 0,
-        plannedStart: 0,
-      };
-
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(60); // <-- when gap is not enough to compensate for the running behind it absorbs at much as possible
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(70); // This should not be possible
-    });
-  });
-
-  describe('Relative offset mode', () => {
-    test('basic function', () => {
-      const test = {
-        timeStart: 0,
-        dayOffset: 0,
-        delay: 0,
-        currentDay: 0,
-        totalGap: 0,
-        clock: 100,
-        actualStart: 100,
-        plannedStart: 0,
-        offset: 0,
-        offsetMode: OffsetMode.Relative,
-      };
-
-      const timeStartEvent2 = 10;
-      const timeStartEvent3 = 20;
-
-      //event 1 is the currently running event
-
-      //event 2
-      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent2, isLinkedToLoaded: true })).toBe(10);
-      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent2, isLinkedToLoaded: false })).toBe(10);
-
-      //event 3
-      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent3, isLinkedToLoaded: true })).toBe(20);
-      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent3, isLinkedToLoaded: false })).toBe(20);
-
-      // When clock advances by 5ms, time until start should decrease by 5ms
-      test.clock = 105;
-
-      //event 2
-      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent2, isLinkedToLoaded: true })).toBe(5);
-      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent2, isLinkedToLoaded: false })).toBe(5);
-
-      //event 3
-      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent3, isLinkedToLoaded: true })).toBe(15);
-      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent3, isLinkedToLoaded: false })).toBe(15);
-    });
-
-    test('gaps', () => {
-      const test = {
-        timeStart: 20,
-        dayOffset: 0,
-        delay: 0,
-        currentDay: 0,
-        totalGap: 10,
-        clock: 100,
-        actualStart: 100,
-        plannedStart: 0,
-        offset: 0,
-        offsetMode: OffsetMode.Relative,
-      };
-
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(20);
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(20);
-
-      // When clock advances by 5ms, time until start should decrease by 5ms
-      test.clock = 105;
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(15);
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(15);
-    });
-
-    test('added/remove time', () => {
-      const test = {
-        timeStart: 20,
-        dayOffset: 0,
-        delay: 0,
-        currentDay: 0,
-        totalGap: 0,
-        clock: 100,
-        actualStart: 100,
-        plannedStart: 0,
-        offset: 0,
-        offsetMode: OffsetMode.Relative,
-      };
-
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(20);
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(20);
-
-      test.offset = 5; // remove 5 with addtime - we are ahead of time
-
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(15);
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(20); // unlocked evets will stay on schedule
-
-      test.offset = -5; // add 5 with addtime - we are behind
-
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(25);
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(25);
-    });
-
-    test('next day', () => {
-      const test = {
-        delay: 0,
-        currentDay: 0,
-        clock: 100,
-        actualStart: 100,
-        plannedStart: 0,
-        offset: 0,
-        offsetMode: OffsetMode.Relative,
-      };
-
-      // this event will start the current day
-      expect(
-        calculateTimeUntilStart({
-          ...test,
-          timeStart: 10,
-          dayOffset: 0,
-          totalGap: 0,
-          isLinkedToLoaded: false,
-        }),
-      ).toBe(10);
-
-      // this event will start the next day
-      // in absolute mode this would start in dayInMs - 100 since the gap would compensate
-      // but in relative mode with and actual start that is 100 offset it starts in dayInMs
-      expect(
-        calculateTimeUntilStart({
-          ...test,
-          timeStart: 0,
-          dayOffset: 1,
-          totalGap: dayInMs - 20,
-          isLinkedToLoaded: false,
-        }),
-      ).toBe(dayInMs);
-
-      // advancing 100ms
-      test.clock = 200;
-
-      expect(
-        calculateTimeUntilStart({
-          ...test,
-          timeStart: 0,
-          dayOffset: 1,
-          totalGap: dayInMs - 20,
-          isLinkedToLoaded: false,
-        }),
-      ).toBe(dayInMs - 100);
-    });
-  });
-
-  test('overlap with negative total gap', () => {
+  test('ontime', () => {
    const test = {
+      timeStart: 100,
      dayOffset: 0,
      delay: 0,
      currentDay: 0,
-      clock: 100,
-      actualStart: 100,
-      plannedStart: 0,
+      totalGap: 0,
+      clock: 90,
      offset: 0,
-      offsetMode: OffsetMode.Relative,
-      isLinkedToLoaded: false,
    };

-    // the overlap will be pushed out to the expected available time
-    expect(calculateTimeUntilStart({ ...test, timeStart: 5, totalGap: -5 })).toBe(10);
-
-    test.clock = 105;
+    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(10);
+    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(10);
  });
+
+  test('running behind', () => {
+    const test = {
+      timeStart: 100,
+      dayOffset: 0,
+      delay: 0,
+      currentDay: 0,
+      totalGap: 0,
+      clock: 90,
+      offset: -20,
+    };
+
+    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(30);
+    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(30);
+  });
+
+  test('running ahead', () => {
+    const test = {
+      timeStart: 100,
+      dayOffset: 0,
+      delay: 0,
+      currentDay: 0,
+      totalGap: 0,
+      clock: 80,
+      offset: 10,
+    };
+
+    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(20); // <-- when running ahead the unlinked timer stays put
+    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(10);
+  });
+
+  test('running behind with enough gaps', () => {
+    const test = {
+      timeStart: 100,
+      dayOffset: 0,
+      delay: 0,
+      currentDay: 0,
+      totalGap: 20,
+      clock: 50,
+      offset: -20,
+    };
+
+    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(50);
+    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(70); // This should not be possible
+  });
+
+  test('running behind with to little gaps', () => {
+    const test = {
+      timeStart: 100,
+      dayOffset: 0,
+      delay: 0,
+      currentDay: 0,
+      totalGap: 10,
+      clock: 50,
+      offset: -20,
+    };
+
+    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(60);
+    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(70); // This should not be possible
+  });
+
+  //TODO: more indepth testing,
+  // including day offset handling
+  // and more?
 });
@@ -1,4 +1,4 @@
-import { OntimeEvent, SupportedEntry } from 'ontime-types';
+import { OntimeEvent, SupportedEvent } from 'ontime-types';

 /**
 * @description Creates a safe duplicate of an event
@@ -9,7 +9,7 @@ import { OntimeEvent, SupportedEntry } from 'ontime-types';
 type ClonedEvent = Omit<OntimeEvent, 'id' | 'cue'>;
 export const cloneEvent = (event: OntimeEvent): ClonedEvent => {
  return {
-    type: SupportedEntry.Event,
+    type: SupportedEvent.Event,
    title: event.title,
    note: event.note,
    timeStart: event.timeStart,
@@ -23,14 +23,13 @@ export const cloneEvent = (event: OntimeEvent): ClonedEvent => {
    isPublic: event.isPublic,
    skip: event.skip,
    colour: event.colour,
-    parent: event.parent,
+    currentBlock: event.currentBlock,
    revision: 0,
    delay: event.delay, // the events will be collocated, so having the same metadata is a good start
    dayOffset: event.dayOffset,
    gap: 0,
    timeWarning: event.timeWarning,
    timeDanger: event.timeDanger,
-    triggers: structuredClone(event.triggers),
-    custom: structuredClone(event.custom),
+    custom: { ...event.custom },
  };
 };
@@ -1,8 +0,0 @@
-import { MaybeString } from 'ontime-types';
-
-export default function safeParseNumber(value: MaybeString, defaultValue: number = 0): number {
-  if (!value) return defaultValue;
-  const number = Number(value);
-  if (isNaN(number)) return defaultValue;
-  return number;
-}
@@ -14,7 +14,7 @@ import {
 } from '../stores/clientStore';
 import { addDialog } from '../stores/dialogStore';
 import { addLog } from '../stores/logger';
-import { patchRuntime, patchRuntimeProperty } from '../stores/runtime';
+import { addToBatchUpdates, flushBatchUpdates, patchRuntime, patchRuntimeProperty } from '../stores/runtime';

 let websocket: WebSocket | null = null;
 let reconnectTimeout: NodeJS.Timeout | null = null;
@@ -47,12 +47,10 @@ export const connectSocket = () => {

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

    // we decide to allows reconnect
    reconnectTimeout = setTimeout(() => {
-      if (reconnectAttempts > 2) {
-        setOnlineStatus(false);
-      }
      console.warn('WebSocket: attempting reconnect');
      if (websocket && websocket.readyState === WebSocket.CLOSED) {
        reconnectAttempts += 1;
@@ -141,10 +139,59 @@ export const connectSocket = () => {
          updateDevTools(serverPayload);
          break;
        }
-        case 'ontime-patch': {
-          const patch = payload as Partial<RuntimeStore>;
-          patchRuntime(patch);
-          updateDevTools(patch);
+        case 'ontime-clock': {
+          addToBatchUpdates('clock', payload);
+          updateDevTools({ clock: payload });
+          break;
+        }
+        case 'ontime-timer': {
+          addToBatchUpdates('timer', payload);
+          updateDevTools({ timer: payload });
+          break;
+        }
+        case 'ontime-onAir': {
+          addToBatchUpdates('onAir', payload);
+          updateDevTools({ onAir: payload });
+          break;
+        }
+        case 'ontime-message': {
+          addToBatchUpdates('message', payload);
+          updateDevTools({ message: payload });
+          break;
+        }
+        case 'ontime-runtime': {
+          addToBatchUpdates('runtime', payload);
+          updateDevTools({ runtime: payload });
+          break;
+        }
+        case 'ontime-eventNow': {
+          addToBatchUpdates('eventNow', payload);
+          updateDevTools({ eventNow: payload });
+          break;
+        }
+        case 'ontime-currentBlock': {
+          addToBatchUpdates('currentBlock', payload);
+          updateDevTools({ currentBlock: payload });
+          break;
+        }
+        case 'ontime-publicEventNow': {
+          addToBatchUpdates('publicEventNow', payload);
+          updateDevTools({ publicEventNow: payload });
+          break;
+        }
+        case 'ontime-eventNext': {
+          addToBatchUpdates('eventNext', payload);
+          updateDevTools({ eventNext: payload });
+          break;
+        }
+        case 'ontime-publicEventNext': {
+          addToBatchUpdates('publicEventNext', payload);
+          updateDevTools({ publicEventNext: payload });
+          break;
+        }
+        case 'ontime-auxtimer1': {
+          addToBatchUpdates('auxtimer1', payload);
+          updateDevTools({ auxtimer1: payload });
          break;
        }
        case 'ontime-refetch': {
@@ -164,8 +211,8 @@ export const connectSocket = () => {
          }
          break;
        }
-        default: {
-          console.log('unknown WS message', type);
+        case 'ontime-flush': {
+          flushBatchUpdates();
          break;
        }
      }
@@ -1,4 +1,4 @@
-import { MaybeNumber, OffsetMode, OntimeEvent, Settings, TimeFormat } from 'ontime-types';
+import { MaybeNumber, OntimeEvent, Settings, TimeFormat } from 'ontime-types';
 import { dayInMs, formatFromMillis, MILLIS_PER_HOUR, MILLIS_PER_MINUTE, MILLIS_PER_SECOND } from 'ontime-utils';

 import { FORMAT_12, FORMAT_24 } from '../../viewerConfig';
@@ -119,7 +119,7 @@ export function formatDuration(duration: number, hideSeconds = true): string {
  }

  if (!hideSeconds) {
-    const seconds = Math.ceil((duration % MILLIS_PER_MINUTE) / MILLIS_PER_SECOND);
+    const seconds = Math.floor((duration % MILLIS_PER_MINUTE) / MILLIS_PER_SECOND);
    if (seconds > 0) {
      result += `${seconds}s`;
    }
@@ -140,8 +140,8 @@ export function useTimeUntilStart(
    isLinkedToLoaded: boolean;
  },
 ): number {
-  const { offset, clock, currentDay, offsetMode, actualStart, plannedStart } = useTimeUntilData();
-  return calculateTimeUntilStart({ ...data, currentDay, clock, offset, offsetMode, actualStart, plannedStart });
+  const { offset, clock, currentDay } = useTimeUntilData();
+  return calculateTimeUntilStart({ ...data, currentDay, clock, offset });
 }

 /**
@@ -160,24 +160,9 @@ export function calculateTimeUntilStart(
    isLinkedToLoaded: boolean;
    clock: number;
    offset: number;
-    offsetMode: OffsetMode;
-    actualStart: MaybeNumber;
-    plannedStart: MaybeNumber;
  },
 ): number {
-  const {
-    timeStart,
-    dayOffset,
-    currentDay,
-    totalGap,
-    isLinkedToLoaded,
-    clock,
-    offset,
-    delay,
-    offsetMode,
-    actualStart,
-    plannedStart,
-  } = data;
+  const { timeStart, dayOffset, currentDay, totalGap, isLinkedToLoaded, clock, offset, delay } = data;

  //How many days from the currently running event to this one
  const relativeDayOffset = dayOffset - currentDay;
@@ -187,23 +172,20 @@ export function calculateTimeUntilStart(
  //The normalised start time of this event relative to the currently running event
  const normalisedTimeStart = delayedStart + relativeDayOffset * dayInMs;

-  let relativeStartOffset = 0;
-
-  if (offsetMode === OffsetMode.Relative) {
-    relativeStartOffset = (actualStart ?? 0) - (plannedStart ?? 0);
-  }
-
-  const scheduledTimeUntil = normalisedTimeStart - clock + relativeStartOffset;
-
-  const offsetTimeUntil = scheduledTimeUntil - offset;
+  const offsetTimestart = normalisedTimeStart - offset;
+  const offsetTimeUntil = offsetTimestart - clock;

  if (isLinkedToLoaded) {
    //if we are directly linked back to the loaded event we just follow the offset
    return offsetTimeUntil;
  }

-  const gapsCanCompensateForOffset = totalGap + offset >= 0;
-  if (gapsCanCompensateForOffset) {
+  const scheduledTimeUntil = normalisedTimeStart - clock;
+
+  const isAheadOfSchedule = offset >= 0;
+  const gapsCanCompensadeForOffset = totalGap + offset >= 0;
+
+  if (isAheadOfSchedule || gapsCanCompensadeForOffset) {
    // if we are ahead of schedule or the gap can compensate for the amount we are behind then expect to start at the scheduled time
    return scheduledTimeUntil;
  }
@@ -49,7 +49,10 @@ function resolveUrl(protocol: 'http' | 'ws', path: string) {
  url.pathname = baseURI ? `${baseURI}/${path}` : path;

  // in development mode, we use the React port for UI, but need the requests to target the server
-  // this is done with a proxy in the vite config to avoid CORS issues in the dev environment
+  if (isDev) {
+    // this is used as a fallback port for development
+    url.port = '4001';
+  }

  const result = url.toString();

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

@keyframes animloader {
@@ -113,8 +113,8 @@ export function BlockQuote({ children }: { children: ReactNode }) {
  return <blockquote className={style.blockquote}>{children}</blockquote>;
 }

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

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

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { IoPencil, IoTrash } from 'react-icons/io5';
 import { IconButton } from '@chakra-ui/react';
-import { CustomField, CustomFieldKey } from 'ontime-types';
+import { CustomField, CustomFieldLabel } from 'ontime-types';

 import CopyTag from '../../../../../common/components/copy-tag/CopyTag';
 import Swatch from '../../../../../common/components/input/colour-input/Swatch';
@@ -17,8 +17,8 @@ interface CustomFieldEntryProps {
  label: string;
  fieldKey: string;
  type: 'string' | 'image';
-  onEdit: (key: CustomFieldKey, patch: CustomField) => Promise<void>;
-  onDelete: (key: CustomFieldKey) => Promise<void>;
+  onEdit: (label: CustomFieldLabel, patch: CustomField) => Promise<void>;
+  onDelete: (label: CustomFieldLabel) => Promise<void>;
 }

 export default function CustomFieldEntry(props: CustomFieldEntryProps) {
@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { IoAdd } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
-import { CustomField, CustomFieldKey } from 'ontime-types';
+import { CustomField, CustomFieldLabel } from 'ontime-types';

 import { deleteCustomField, editCustomField, postCustomField } from '../../../../../common/api/customFields';
 import Info from '../../../../../common/components/info/Info';
@@ -31,14 +31,14 @@ export default function CustomFields() {
    setIsAdding(false);
  };

-  const handleEditField = async (key: CustomFieldKey, customField: CustomField) => {
-    await editCustomField(key, customField);
+  const handleEditField = async (label: CustomFieldLabel, customField: CustomField) => {
+    await editCustomField(label, customField);
    refetch();
  };

-  const handleDelete = async (key: CustomFieldKey) => {
+  const handleDelete = async (label: string) => {
    try {
-      await deleteCustomField(key);
+      await deleteCustomField(label);
      refetch();
    } catch (_error) {
      /** we do not handle errors here */
@@ -1,4 +0,0 @@
-.wrapper {
-  max-height: 500px;
-  overflow-y: auto;
-}
@@ -1,72 +0,0 @@
-import { forwardRef, memo, useEffect, useImperativeHandle, useState } from 'react';
-import Editor from 'react-simple-code-editor';
-import Prism from 'prismjs/components/prism-core';
-
-import 'prismjs/components/prism-css';
-import 'prismjs/themes/prism-tomorrow.min.css';
-import style from './StyleEditor.module.scss';
-
-interface CodeEditorProps {
-  language: string;
-  initialValue: string;
-  isDirty: boolean;
-  setIsDirty: (value: boolean) => void;
-}
-
-const CodeEditor = forwardRef((props: CodeEditorProps, cssRef) => {
-  const { language, initialValue, isDirty, setIsDirty } = props;
-
-  const [code, setCode] = useState(initialValue);
-
-  const highlight = (code: string) => {
-    const grammar = Prism.languages[language];
-    return grammar ? Prism.highlight(code, grammar, language) : code;
-  };
-
-  const handleChange = (newCode: string) => {
-    setCode(newCode);
-  };
-
-  useImperativeHandle(cssRef, () => {
-    return {
-      getCss: () => code,
-    };
-  });
-
-  // add contents to editor on mount and any change in initialValue
-  useEffect(() => {
-    setCode(initialValue);
-  }, [initialValue]);
-
-  // handle dirty state on change
-  useEffect(() => {
-    if (initialValue.trim() !== code.trim() && !isDirty && code.length !== 0) {
-      setIsDirty(true);
-    }
-
-    if (initialValue.trim() === code.trim() && isDirty) {
-      setIsDirty(false);
-    }
-  }, [initialValue, code, isDirty, setIsDirty]);
-
-  return (
-    <div className={style.wrapper}>
-      <Editor
-        value={code}
-        padding={15}
-        onValueChange={handleChange}
-        highlight={highlight}
-        style={{
-          fontFamily: 'monospace',
-          fontSize: 12,
-          minHeight: 500,
-          background: '#2d2d2d', // Background of tomorrow theme
-        }}
-      />
-    </div>
-  );
-});
-
-CodeEditor.displayName = 'StyleEditor';
-
-export default memo(CodeEditor);
@@ -1,12 +0,0 @@
-.editorActions {
-  width: 100%;
-}
-
-.right {
-  align-self: end;
-  text-align: right
-}
-
-.column {
-  flex-direction: column;
-}
@@ -1,129 +0,0 @@
-import { lazy, useEffect, useRef, useState } from 'react';
-import {
-  Button,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-} from '@chakra-ui/react';
-
-import { getCSSContents, postCSSContents, restoreCSSContents } from '../../../../common/api/assets';
-import Info from '../../../../common/components/info/Info';
-import * as Panel from '../../panel-utils/PanelUtils';
-
-import style from './StyleEditorModal.module.scss';
-
-const CodeEditor = lazy(() => import('./StyleEditor'));
-
-interface CodeEditorModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-}
-
-interface CSSRef {
-  getCss: () => string;
-}
-
-export default function CodeEditorModal(props: CodeEditorModalProps) {
-  const { isOpen, onClose } = props;
-
-  const [css, setCSS] = useState('');
-  const [isDirty, setIsDirty] = useState(false);
-  const [saveLoading, setSaveLoading] = useState(false);
-  const [resetLoading, setResetLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-
-  const cssRef = useRef<CSSRef>(null);
-
-  const handleRestore = async () => {
-    try {
-      setResetLoading(true);
-      const defaultCss = await restoreCSSContents();
-      setCSS(defaultCss);
-    } catch (_error) {
-      /** no error handling for now */
-    } finally {
-      setResetLoading(false);
-    }
-  };
-
-  const handleSave = async () => {
-    try {
-      setSaveLoading(true);
-      if (cssRef.current) {
-        await postCSSContents(cssRef.current.getCss());
-        setCSS(cssRef.current.getCss());
-        setIsDirty(false);
-      }
-    } catch (_error) {
-      /** no error handling for now */
-    } finally {
-      setSaveLoading(false);
-    }
-  };
-
-  const clear = () => setCSS('');
-
-  useEffect(() => {
-    async function fetchServerCSS() {
-      // check for isOpen to fetch recent css
-      if (isOpen) {
-        try {
-          const css = await getCSSContents();
-          setCSS(css);
-        } catch (_error) {
-          setError('Failed to load CSS from server');
-          /** no error handling for now */
-        }
-      }
-    }
-    fetchServerCSS();
-  }, [isOpen]);
-
-  return (
-    <Modal isOpen={isOpen} onClose={onClose} variant='ontime' isCentered>
-      <ModalOverlay />
-      <ModalContent maxWidth='max(800px, 40vw)'>
-        <ModalHeader>Edit CSS override</ModalHeader>
-        <ModalCloseButton />
-        <ModalBody>
-          <CodeEditor ref={cssRef} initialValue={css} language='css' isDirty={isDirty} setIsDirty={setIsDirty} />
-        </ModalBody>
-
-        <ModalFooter className={style.column}>
-          <Info>Invalid CSS will be refused by the browser</Info>
-          {error && <Panel.Error className={style.right}>{`Error: ${error}`}</Panel.Error>}
-          <Panel.InlineElements align='apart' className={style.editorActions}>
-            <Button
-              variant='ontime-ghosted'
-              onClick={handleRestore}
-              isDisabled={saveLoading || resetLoading}
-              isLoading={resetLoading}
-            >
-              Reset to example
-            </Button>
-            <Panel.InlineElements>
-              <Button variant='ontime-ghosted' onClick={clear}>
-                Clear
-              </Button>
-              <Button variant='ontime-subtle' onClick={onClose}>
-                Cancel
-              </Button>
-              <Button
-                variant='ontime-filled'
-                onClick={handleSave}
-                isDisabled={saveLoading || resetLoading || !isDirty}
-                isLoading={saveLoading}
-              >
-                Save changes
-              </Button>
-            </Panel.InlineElements>
-          </Panel.InlineElements>
-        </ModalFooter>
-      </ModalContent>
-    </Modal>
-  );
-}
@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 import { Controller, useForm } from 'react-hook-form';
-import { Button, Input, Switch, useDisclosure } from '@chakra-ui/react';
+import { Button, Input, Switch } from '@chakra-ui/react';
 import { ViewSettings } from 'ontime-types';

 import { maybeAxiosError } from '../../../../common/api/utils';
@@ -14,14 +14,11 @@ import { preventEscape } from '../../../../common/utils/keyEvent';
 import { isOntimeCloud } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';

-import CodeEditorModal from './StyleEditorModal';
-
 const cssOverrideDocsUrl = 'https://docs.getontime.no/features/custom-styling/';

 export default function ViewSettingsForm() {
  const { data, status, refetch } = useViewSettings();
  const { data: info, status: infoStatus } = useInfo();
-  const { isOpen: isCodeEditorOpen, onOpen: onCodeEditorOpen, onClose: onCodeEditorClose } = useDisclosure();

  const {
    control,
@@ -106,7 +103,6 @@ export default function ViewSettingsForm() {
        <Panel.Section>
          <Panel.Loader isLoading={isLoading} />
          <Panel.ListGroup>
-            <CodeEditorModal isOpen={isCodeEditorOpen} onClose={onCodeEditorClose} />
            <Panel.ListItem>
              <Panel.Field
                title='Override CSS styles'
@@ -119,15 +115,6 @@ export default function ViewSettingsForm() {
                  <Switch variant='ontime' size='lg' isChecked={value} onChange={onChange} ref={ref} />
                )}
              />
-              <Button
-                onClick={onCodeEditorOpen}
-                variant='ontime-subtle'
-                size='sm'
-                isDisabled={isSubmitting}
-                width='fit-content'
-              >
-                Edit CSS override
-              </Button>
            </Panel.ListItem>
          </Panel.ListGroup>
          <Panel.ListGroup>
@@ -1,5 +0,0 @@
-declare module 'prismjs/components/prism-core' {
-  export * from 'prismjs';
-}
-
-declare module 'prismjs/components/prism-css';
@@ -1,6 +1,5 @@
 import { useEffect, useState } from 'react';
-import { useFieldArray, useForm } from 'react-hook-form';
-import { IoTrash } from 'react-icons/io5';
+import { useForm } from 'react-hook-form';
 import { Button, Input, Textarea } from '@chakra-ui/react';
 import { useQueryClient } from '@tanstack/react-query';

@@ -24,7 +23,6 @@ type ProjectCreateFormValues = {
  publicUrl?: string;
  backstageInfo?: string;
  backstageUrl?: string;
-  custom?: { title: string; value: string }[];
 };

 export default function ProjectCreateForm(props: ProjectCreateFromProps) {
@@ -36,7 +34,6 @@ export default function ProjectCreateForm(props: ProjectCreateFromProps) {
  const {
    handleSubmit,
    register,
-    control,
    formState: { isSubmitting, isValid },
    setFocus,
  } = useForm<ProjectCreateFormValues>({
@@ -47,11 +44,6 @@ export default function ProjectCreateForm(props: ProjectCreateFromProps) {
    },
  });

-  const { fields, append, remove } = useFieldArray({
-    control,
-    name: 'custom',
-  });
-
  // set focus to first field
  useEffect(() => {
    setFocus('title');
@@ -67,7 +59,6 @@ export default function ProjectCreateForm(props: ProjectCreateFromProps) {
        ...values,
        filename,
      });
-
      await queryClient.invalidateQueries({ queryKey: PROJECT_LIST });
      onClose();
    } catch (error) {
@@ -75,10 +66,6 @@ export default function ProjectCreateForm(props: ProjectCreateFromProps) {
    }
  };

-  const handleAddCustom = () => {
-    append({ title: '', value: '' });
-  };
-
  return (
    <Panel.Section
      as='form'
@@ -164,42 +151,6 @@ export default function ProjectCreateForm(props: ProjectCreateFromProps) {
            {...register('backstageUrl')}
          />
        </label>
-        <Panel.Section>
-          <Panel.ListItem>
-            <Panel.Field title='Custom data' description='Add custom data for your project' />
-            <Button variant='ontime-subtle' onClick={handleAddCustom}>
-              +
-            </Button>
-          </Panel.ListItem>
-          {fields.map((field, idx) => (
-            <div key={field.id} className={style.customDataItem}>
-              <Panel.Paragraph>{idx + 1}.</Panel.Paragraph>
-              <label>
-                Title
-                <Input
-                  variant='ontime-filled'
-                  size='sm'
-                  placeholder={field.title}
-                  autoComplete='off'
-                  {...register(`custom.${idx}.title` as const)}
-                />
-              </label>
-              <label>
-                Value
-                <Input
-                  variant='ontime-filled'
-                  size='sm'
-                  placeholder={field.value}
-                  autoComplete='off'
-                  {...register(`custom.${idx}.value` as const)}
-                />
-              </label>
-              <Button variant='ontime-ghosted' onClick={() => remove(idx)}>
-                <IoTrash />
-              </Button>
-            </div>
-          ))}
-        </Panel.Section>
      </Panel.Section>
    </Panel.Section>
  );
@@ -1,6 +1,6 @@
 import { ChangeEvent, useEffect, useRef } from 'react';
-import { useFieldArray, useForm } from 'react-hook-form';
-import { IoAdd, IoDownloadOutline, IoTrash } from 'react-icons/io5';
+import { useForm } from 'react-hook-form';
+import { IoDownloadOutline, IoTrash } from 'react-icons/io5';
 import { Button, Input, Textarea } from '@chakra-ui/react';
 import { type ProjectData } from 'ontime-types';

@@ -25,7 +25,6 @@ export default function ProjectData() {
    formState: { isSubmitting, isValid, isDirty, errors },
    setError,
    watch,
-    control,
    setValue,
  } = useForm({
    defaultValues: data,
@@ -33,12 +32,6 @@ export default function ProjectData() {
    resetOptions: {
      keepDirtyValues: true,
    },
-    mode: 'onChange',
-  });
-
-  const { fields, append, remove } = useFieldArray({
-    control,
-    name: 'custom',
  });

  // reset form values if data changes
@@ -84,10 +77,6 @@ export default function ProjectData() {
    });
  };

-  const handleAddCustom = () => {
-    append({ title: '', value: '' });
-  };
-
  const onSubmit = async (formData: ProjectData) => {
    try {
      await postProjectData(formData);
@@ -242,69 +231,6 @@ export default function ProjectData() {
              {...register('backstageUrl')}
            />
          </label>
-          <Panel.Section style={{ marginTop: 0 }}>
-            <Panel.ListItem>
-              <Panel.Field title='Custom data' description='' />
-              <Button leftIcon={<IoAdd />} size='sm' variant='ontime-subtle' onClick={handleAddCustom}>
-                Add
-              </Button>
-            </Panel.ListItem>
-            {fields.length > 0 &&
-              fields.map((field, idx) => {
-                const rowErrors = errors.custom?.[idx] as
-                  | {
-                      title?: { message?: string };
-                      value?: { message?: string };
-                    }
-                  | undefined;
-                return (
-                  <div key={field.id} className={style.customDataItem}>
-                    <div>
-                      <div className={style.titleRow}>
-                        <label>
-                          Title
-                          <Input
-                            variant='ontime-filled'
-                            size='sm'
-                            defaultValue={field.title}
-                            placeholder='Title of your custom data'
-                            autoComplete='off'
-                            {...register(`custom.${idx}.title`, {
-                              required: { value: true, message: 'Field cannot be empty' },
-                            })}
-                          />
-                        </label>
-                        <Button
-                          size='sm'
-                          variant='ontime-subtle'
-                          color='#FA5656' // $red-500
-                          onClick={() => remove(idx)}
-                          leftIcon={<IoTrash />}
-                        >
-                          Delete Entry
-                        </Button>
-                      </div>
-                      {rowErrors?.title?.message && <Panel.Error>{rowErrors.title.message}</Panel.Error>}
-                    </div>
-                    <label>
-                      Value
-                      <Textarea
-                        variant='ontime-filled'
-                        resize='none'
-                        size='sm'
-                        defaultValue={field.value}
-                        autoComplete='off'
-                        placeholder='Text of your custom data'
-                        {...register(`custom.${idx}.value`, {
-                          required: { value: true, message: 'Field cannot be empty' },
-                        })}
-                      />
-                      {rowErrors?.value?.message && <Panel.Error>{rowErrors.value.message}</Panel.Error>}
-                    </label>
-                  </div>
-                );
-              })}
-          </Panel.Section>
        </Panel.Section>
      </Panel.Card>
    </Panel.Section>
@@ -57,18 +57,3 @@
    height: auto;
  }
 }
-
-.customDataItem {
-  display: contents;
-  width: 100%;
-
-  .titleRow{
-    display: flex;
-    gap: 1rem;
-    align-items: end;
-
-    label {
-      flex: 1;
-    }
-  }
-}
@@ -103,7 +103,6 @@ export default function SourcesPanel() {
  };

  const handleSubmitImportPreview = async (importMap: ImportMap) => {
-    setError(''); // to clear previous error
    if (importFlow === 'excel') {
      try {
        const previewData = await importRundownPreviewExcel(importMap);
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import { useFieldArray, useForm } from 'react-hook-form';
 import { IoAdd, IoTrash } from 'react-icons/io5';
 import { Button, IconButton, Input, Select, Tooltip } from '@chakra-ui/react';
@@ -28,7 +28,6 @@ export default function ImportMapForm(props: ImportMapFormProps) {
    control,
    handleSubmit,
    register,
-    setValue,
    formState: { errors, isValid },
  } = useForm<NamedImportMap>({
    mode: 'onChange',
@@ -46,14 +45,6 @@ export default function ImportMapForm(props: ImportMapFormProps) {

  const [loading, setLoading] = useState<'' | 'export' | 'import'>('');

-  // Set first sheet as default worksheet when 'event schedule' sheet is not there
-  useEffect(() => {
-    if (!worksheetNames || worksheetNames.length === 0) return;
-    if (!worksheetNames.includes(namedImportMap.Worksheet)) {
-      setValue('Worksheet', worksheetNames[0], { shouldValidate: true, shouldDirty: true });
-    }
-  }, [worksheetNames, setValue, namedImportMap.Worksheet]);
-
  const handleExport = async (values: NamedImportMap) => {
    setLoading('export');
    const importMap = convertToImportMap(values);
@@ -1,7 +1,9 @@
-import { PropsWithChildren, useEffect, useRef, useState } from 'react';
+import { useEffect, useRef } from 'react';
+import { IoEye, IoEyeOffOutline } from 'react-icons/io5';
 import { Input } from '@chakra-ui/react';

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

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

@@ -10,53 +12,50 @@ interface InputRowProps {
  placeholder: string;
  text: string;
  visible: boolean;
+  actionHandler: () => void;
  changeHandler: (newValue: string) => void;
 }

-export default function InputRow(props: PropsWithChildren<InputRowProps>) {
-  const { label, placeholder, text, visible, changeHandler, children } = props;
+export default function InputRow(props: InputRowProps) {
+  const { label, placeholder, text, visible, actionHandler, changeHandler } = props;

-  const [value, setValue] = useState(text);
  const inputRef = useRef<HTMLInputElement>(null);
  const cursorPositionRef = useRef(0);

  // sync cursor position with text
  useEffect(() => {
-    if (inputRef.current && inputRef.current !== document.activeElement) {
+    if (inputRef.current) {
      inputRef.current.selectionStart = cursorPositionRef.current;
      inputRef.current.selectionEnd = cursorPositionRef.current;
    }
  }, [text]);

-  // synchronise external text
-  useEffect(() => {
-    if (inputRef.current !== document.activeElement) {
-      setValue(text);
-    }
-  }, [text]);
-
  const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
    cursorPositionRef.current = event.target.selectionStart ?? 0;
-    setValue(event.target.value);
    changeHandler(event.target.value);
  };

  return (
    <div className={style.inputRow}>
-      <label className={cx([style.label, visible ?? style.active])} htmlFor={label}>
-        {label}
-      </label>
+      <label className={`${style.label} ${visible ? style.active : ''}`}>{label}</label>
      <div className={style.inputItems}>
        <Input
-          id={label}
          ref={inputRef}
          size='sm'
          variant='ontime-filled'
-          value={value}
+          value={text}
          onChange={handleInputChange}
          placeholder={placeholder}
        />
-        {children}
+        <TooltipActionBtn
+          clickHandler={actionHandler}
+          tooltip={visible ? 'Make invisible' : 'Make visible'}
+          aria-label={`Toggle ${label}`}
+          openDelay={tooltipDelayMid}
+          icon={visible ? <IoEye size='18px' /> : <IoEyeOffOutline size='18px' />}
+          variant={visible ? 'ontime-filled' : 'ontime-subtle'}
+          size='sm'
+        />
      </div>
    </div>
  );
@@ -1,8 +1,4 @@
-import { IoEye, IoEyeOffOutline } from 'react-icons/io5';
-
-import TooltipActionBtn from '../../../common/components/buttons/TooltipActionBtn';
 import { setMessage, useExternalMessageInput, useTimerMessageInput } from '../../../common/hooks/useSocket';
-import { tooltipDelayMid } from '../../../ontimeConfig';

 import InputRow from './InputRow';
 import TimerControlsPreview from './TimerViewControl';
@@ -27,17 +23,8 @@ function TimerMessageInput() {
      text={text}
      visible={visible}
      changeHandler={(newValue) => setMessage.timerText(newValue)}
-    >
-      <TooltipActionBtn
-        clickHandler={() => setMessage.timerVisible(!visible)}
-        tooltip={visible ? 'Make invisible' : 'Make visible'}
-        aria-label='Toggle timer message visibility'
-        openDelay={tooltipDelayMid}
-        icon={visible ? <IoEye size='18px' /> : <IoEyeOffOutline size='18px' />}
-        variant={visible ? 'ontime-filled' : 'ontime-subtle'}
-        size='sm'
-      />
-    </InputRow>
+      actionHandler={() => setMessage.timerVisible(!visible)}
+    />
  );
 }

@@ -59,16 +46,7 @@ function ExternalInput() {
      text={text}
      visible={visible}
      changeHandler={(newValue) => setMessage.externalText(newValue)}
-    >
-      <TooltipActionBtn
-        clickHandler={toggleExternal}
-        tooltip={visible ? 'Make invisible' : 'Make visible'}
-        aria-label='Toggle external message visibility'
-        openDelay={tooltipDelayMid}
-        icon={visible ? <IoEye size='18px' /> : <IoEyeOffOutline size='18px' />}
-        variant={visible ? 'ontime-filled' : 'ontime-subtle'}
-        size='sm'
-      />
-    </InputRow>
+      actionHandler={toggleExternal}
+    />
  );
 }
@@ -2,7 +2,7 @@ import { IoAdd, IoRemove } from 'react-icons/io5';
 import { Tooltip } from '@chakra-ui/react';
 import { useLocalStorage } from '@mantine/hooks';
 import { Playback } from 'ontime-types';
-import { MILLIS_PER_HOUR, parseUserTime } from 'ontime-utils';
+import { MILLIS_PER_HOUR, MILLIS_PER_SECOND, parseUserTime } from 'ontime-utils';

 import TimeInput from '../../../../common/components/input/time-input/TimeInput';
 import { setPlayback } from '../../../../common/hooks/useSocket';
@@ -17,29 +17,29 @@ interface AddTimeProps {

 export default function AddTime(props: AddTimeProps) {
  const { playback } = props;
-  const [timeInMs, setTime] = useLocalStorage({ key: 'add-time', defaultValue: 300_000 }); // 5 minutes
+  const [time, setTime] = useLocalStorage({ key: 'add-time', defaultValue: 300_000 }); // 5 minutes

  const handleTimeChange = (_field: string, value: string) => {
-    const newTimeInMs = parseUserTime(value);
+    const newTime = parseUserTime(value);
    // cap add time to 1 hour
-    setTime(Math.min(newTimeInMs, MILLIS_PER_HOUR));
+    setTime(Math.min(newTime, MILLIS_PER_HOUR));
  };

  const handleAddTime = (direction: 'add' | 'remove') => {
-    // API expects input in milliseconds
+    // API expects input in seconds
    if (direction === 'add') {
-      setPlayback.addTime(timeInMs);
+      setPlayback.addTime(time / MILLIS_PER_SECOND);
    } else {
-      setPlayback.addTime(-1 * timeInMs);
+      setPlayback.addTime((-1 * time) / MILLIS_PER_SECOND);
    }
  };

  const canAddTime = playback === Playback.Play || playback === Playback.Pause;
-  const doDisableButtons = !canAddTime || timeInMs === 0;
+  const doDisableButtons = !canAddTime || time === 0;

  return (
    <div className={style.addTime}>
-      <TimeInput name='addtime' submitHandler={handleTimeChange} time={timeInMs} placeholder='Add time' />
+      <TimeInput name='addtime' submitHandler={handleTimeChange} time={time} placeholder='Add time' />
      <div className={style.addButtons}>
        <Tooltip label='Remove time' openDelay={tooltipDelayMid} shouldWrapChildren>
          <TapButton onClick={() => handleAddTime('remove')} disabled={doDisableButtons} className={style.tallButtons}>
@@ -59,20 +59,15 @@ export function AuxTimer() {
 }

 function AuxTimerInput() {
-  const newTimeInMs = useAuxTimerTime();
+  const time = useAuxTimerTime();
  const { setDuration } = setAuxTimer;

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

  return (
-    <TimeInput<'auxTimer'>
-      submitHandler={handleTimeUpdate}
-      name='auxTimer'
-      time={newTimeInMs}
-      placeholder='Aux Timer 1'
-    />
+    <TimeInput<'auxTimer'> submitHandler={handleTimeUpdate} name='auxTimer' time={time} placeholder='Aux Timer 1' />
  );
 }
@@ -10,6 +10,7 @@ import AppSettings from '../app-settings/AppSettings';
 import useAppSettingsNavigation from '../app-settings/useAppSettingsNavigation';
 import { EditorOverview } from '../overview/Overview';

+import Finder from './finder/Finder';
 import WelcomePlacement from './welcome/WelcomePlacement';

 import styles from './Editor.module.scss';
@@ -21,6 +22,7 @@ const MessageControl = lazy(() => import('../control/message/MessageControlExpor
 export default function Editor() {
  const { isOpen: isSettingsOpen, setLocation, close } = useAppSettingsNavigation();
  const { isOpen: isMenuOpen, onOpen, onClose } = useDisclosure();
+  const { isOpen: isFinderOpen, onToggle: onFinderToggle, onClose: onFinderClose } = useDisclosure();

  useWindowTitle('Editor');

@@ -44,11 +46,16 @@ export default function Editor() {
    }
  }, [close, isSettingsOpen, setLocation]);

-  useHotkeys([['mod + ,', toggleSettings]]);
+  useHotkeys([
+    ['mod + ,', toggleSettings],
+    ['mod + f', onFinderToggle],
+    ['Escape', onFinderClose],
+  ]);

  return (
    <div className={styles.mainContainer} data-testid='event-editor'>
      <WelcomePlacement />
+      <Finder isOpen={isFinderOpen} onClose={onFinderClose} />
      <NavigationMenu isOpen={isMenuOpen} onClose={onClose} />
      <EditorOverview>
        <IconButton
@@ -1,7 +1,7 @@
 import { KeyboardEvent, useState } from 'react';
 import { Input, Modal, ModalBody, ModalContent, ModalFooter, ModalOverlay } from '@chakra-ui/react';
 import { useDebouncedCallback } from '@mantine/hooks';
-import { SupportedEntry } from 'ontime-types';
+import { SupportedEvent } from 'ontime-types';

 import { useEventSelection } from '../../rundown/useEventSelection';

@@ -67,9 +67,9 @@ export default function Finder(props: FinderProps) {
            {results.length > 0 &&
              results.map((entry, index) => {
                const isSelected = selected === index;
-                const displayIndex = entry.type === SupportedEntry.Event ? entry.eventIndex : '-';
-                const displayCue = entry.type === SupportedEntry.Event ? entry.cue : '';
-                const colour = entry.type === SupportedEntry.Event ? entry.colour : '';
+                const displayIndex = entry.type === SupportedEvent.Event ? entry.eventIndex : '-';
+                const displayCue = entry.type === SupportedEvent.Event ? entry.cue : '';
+                const colour = entry.type === SupportedEvent.Event ? entry.colour : '';

                return (
                  <li
@@ -1,19 +1,19 @@
 import { ChangeEvent, useEffect, useRef, useState } from 'react';
-import { isOntimeBlock, isOntimeEvent, MaybeString, SupportedEntry } from 'ontime-types';
+import { isOntimeBlock, isOntimeEvent, MaybeString, SupportedEvent } from 'ontime-types';

 import { useFlatRundown } from '../../../common/hooks-query/useRundown';

 const maxResults = 12;

 type FilterableBlock = {
-  type: SupportedEntry.Block;
+  type: SupportedEvent.Block;
  id: string;
  index: number;
  title: string;
 };

 type FilterableEvent = {
-  type: SupportedEntry.Event;
+  type: SupportedEvent.Event;
  id: string;
  index: number;
  eventIndex: number;
@@ -59,7 +59,7 @@ export default function useFinder() {
      if (isOntimeEvent(event)) {
        if (eventIndex === searchIndex) {
          results.push({
-            type: SupportedEntry.Event,
+            type: SupportedEvent.Event,
            id: event.id,
            index: i,
            eventIndex,
@@ -93,7 +93,7 @@ export default function useFinder() {
        if (event.cue.toLowerCase().includes(searchString)) {
          remaining--;
          results.push({
-            type: SupportedEntry.Event,
+            type: SupportedEvent.Event,
            id: event.id,
            index: i,
            eventIndex,
@@ -126,7 +126,7 @@ export default function useFinder() {
        if (event.title.toLowerCase().includes(searchString)) {
          remaining--;
          results.push({
-            type: SupportedEntry.Event,
+            type: SupportedEvent.Event,
            id: event.id,
            index: i,
            eventIndex,
@@ -141,7 +141,7 @@ export default function useFinder() {
        if (event.title.toLowerCase().includes(searchString)) {
          remaining--;
          results.push({
-            type: SupportedEntry.Block,
+            type: SupportedEvent.Block,
            id: event.id,
            index: i,
            title: event.title,
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { useSearchParams } from 'react-router-dom';
-import { isOntimeEvent, OntimeEvent, SupportedEntry } from 'ontime-types';
+import { isOntimeEvent, OntimeEvent, SupportedEvent } from 'ontime-types';
 import { getFirstEventNormal, getLastEventNormal } from 'ontime-utils';

 import EmptyPage from '../../common/components/state/EmptyPage';
@@ -197,7 +197,7 @@ export default function Operator() {
            );
          }

-          if (entry.type === SupportedEntry.Block) {
+          if (entry.type === SupportedEvent.Block) {
            return <OperatorBlock key={entry.id} title={entry.title} />;
          }
          return null;
@@ -2,7 +2,7 @@ import { useRef, useState } from 'react';
 import { Button, Textarea } from '@chakra-ui/react';
 import { OntimeEvent } from 'ontime-types';

-import { useEntryActions } from '../../../common/hooks/useEntryAction';
+import { useEventAction } from '../../../common/hooks/useEventAction';
 import type { EditEvent } from '../Operator';

 import style from './EditModal.module.scss';
@@ -15,7 +15,7 @@ interface EditModalProps {
 export default function EditModal(props: EditModalProps) {
  const { event, onClose } = props;

-  const { updateEntry } = useEntryActions();
+  const { updateEvent } = useEventAction();
  const [loading, setLoading] = useState(false);
  const inputRef = useRef<HTMLTextAreaElement[]>(new Array<HTMLTextAreaElement>());

@@ -36,7 +36,7 @@ export default function EditModal(props: EditModalProps) {
    });

    if (patchObject.custom) {
-      await updateEntry(patchObject);
+      await updateEvent(patchObject);
    }

    setLoading(false);
@@ -118,8 +118,7 @@
    padding-inline: 0.25rem;
    background-color: $gray-1250;
    color: $ui-white;
-    // allow multi-line text but trim before
-    white-space: pre-line;
+    white-space: pre;
  }
 }

@@ -78,7 +78,7 @@ function OperatorEvent(props: OperatorEventProps) {
      <span className={style.mainField}>{main}</span>
      <span className={style.schedule}>
        <ClockTime value={timeStart} preferredFormat12='h:mm' preferredFormat24='HH:mm' />
-        →
+        -
        <ClockTime value={timeEnd} preferredFormat12='h:mm' preferredFormat24='HH:mm' />
      </span>

@@ -36,8 +36,8 @@ export const getOperatorOptions = (customFields: CustomFields, timeFormat: strin
        },
        {
          id: 'subscribe',
-          title: 'Highlight Fields',
-          description: 'Choose custom fields to highlight',
+          title: 'Highlight Field',
+          description: 'Choose a custom field to highlight',
          type: 'multi-option',
          values: customFieldSelect,
        },
@@ -45,10 +45,6 @@
  @include ellipsis-overflow;
 }

-.offset {
-  color: $muted-gray;
-}
-
 .ahead {
  color: $playback-ahead;
 }
@@ -1,5 +1,4 @@
 import { memo, PropsWithChildren, ReactNode, useMemo } from 'react';
-import { Playback } from 'ontime-types';
 import { millisToString } from 'ontime-utils';

 import ErrorBoundary from '../../common/components/error-boundary/ErrorBoundary';
@@ -164,14 +163,14 @@ function ProgressOverview() {
 }

 function RuntimeOverview() {
-  const { clock, offset, playback } = useRuntimePlaybackOverview();
+  const { clock, offset } = useRuntimePlaybackOverview();

  const offsetText = getOffsetText(offset);
-  const offsetClasses = cx([style.offset, playback !== Playback.Stop && (offset < 0 ? style.behind : style.ahead)]);
+  const offsetClasses = offset === null ? undefined : offset <= 0 ? style.behind : style.ahead;

  return (
    <>
-      <TimeColumn label='Offset' value={offsetText} className={offsetClasses} testId='offset' />
+      <TimeColumn label='Offset' value={offsetText} className={offsetClasses} />
      <TimeColumn label='Time now' value={formatedTime(clock)} />
    </>
  );
@@ -10,16 +10,13 @@ interface TimeLayoutProps {
  muted?: boolean;
  daySpan?: number;
  className?: string;
-  testId?: string;
 }

-export function TimeColumn({ label, value, muted, className, testId }: TimeLayoutProps) {
+export function TimeColumn({ label, value, muted, className }: TimeLayoutProps) {
  return (
    <div className={style.column}>
      <span className={style.label}>{label}</span>
-      <span className={cx([style.clock, muted && style.muted, className])} data-testid={testId}>
-        {value}
-      </span>
+      <span className={cx([style.clock, muted && style.muted, className])}>{value}</span>
    </div>
  );
 }
@@ -1,11 +0,0 @@
-.empty {
-  padding-block: 1.5rem;
-  text-align: center;
-}
-
-.inline {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 2rem;
-}
@@ -23,6 +23,15 @@
  align-self: center;
 }

+.alignCenter {
+  text-align: center;
+  flex-direction: column;
+
+  .spaceTop {
+    margin-top: 1.5rem;
+  }
+}
+
 .spacer {
  min-height: 50vh;
 }
@@ -31,7 +40,6 @@
  display: flex;
  gap: 0.5rem;
  align-items: center;
-  background-color: color-mix(in srgb, var(--user-bg, transparent) 10%, transparent 90%);
 }

 .entryIndex {
@@ -1,48 +1,38 @@
 import { Fragment, lazy, useCallback, useEffect, useRef, useState } from 'react';
-import {
-  closestCenter,
-  DndContext,
-  DragEndEvent,
-  DragOverEvent,
-  DragStartEvent,
-  PointerSensor,
-  useSensor,
-  useSensors,
-} from '@dnd-kit/core';
+import { closestCenter, DndContext, DragEndEvent, PointerSensor, useSensor, useSensors } from '@dnd-kit/core';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
-import { useHotkeys, useSessionStorage } from '@mantine/hooks';
+import { useHotkeys } from '@mantine/hooks';
 import {
  type EntryId,
  type MaybeString,
+  type PlayableEvent,
  type Rundown,
  isOntimeBlock,
  isOntimeEvent,
-  OntimeBlock,
-  OntimeEntry,
+  isPlayableEvent,
  Playback,
-  SupportedEntry,
+  SupportedEvent,
 } from 'ontime-types';
 import {
+  checkIsNextDay,
  getFirstNormal,
  getLastNormal,
  getNextBlockNormal,
  getNextNormal,
  getPreviousBlockNormal,
  getPreviousNormal,
+  isNewLatest,
  reorderArray,
 } from 'ontime-utils';

-import { type EventOptions, useEntryActions } from '../../common/hooks/useEntryAction';
+import { type EventOptions, useEventAction } from '../../common/hooks/useEventAction';
 import useFollowComponent from '../../common/hooks/useFollowComponent';
 import { useRundownEditor } from '../../common/hooks/useSocket';
 import { AppMode, useAppMode } from '../../common/stores/appModeStore';
 import { useEntryCopy } from '../../common/stores/entryCopyStore';
-import { cloneEvent } from '../../common/utils/clone';
+import { cloneEvent } from '../../common/utils/eventsManager';

-import BlockBlock from './block-block/BlockBlock';
-import BlockEnd from './block-block/BlockEnd';
 import QuickAddBlock from './quick-add-block/QuickAddBlock';
-import { makeRundownMetadata, makeSortableList, moveDown, moveUp } from './rundown.utils';
 import RundownEmpty from './RundownEmpty';
 import { useEventSelection } from './useEventSelection';

@@ -55,17 +45,11 @@ interface RundownProps {
 }

 export default function Rundown({ data }: RundownProps) {
-  const { order, entries, id } = data;
-  // we create a copy of the rundown with a data structured aligned with what dnd-kit needs
-  const featureData = useRundownEditor();
-  const [sortableData, setSortableData] = useState<EntryId[]>(() => makeSortableList(order, entries));
-  const [collapsedGroups, setCollapsedGroups] = useSessionStorage<EntryId[]>({
-    // we ensure that this is unique to the rundown
-    key: `rundown.${id}-editor-collapsed-groups`,
-    defaultValue: [],
-  });
+  const { order, entries } = data;
+  const [statefulEntries, setStatefulEntries] = useState<EntryId[]>(order);

-  const { addEntry, reorderEntry, deleteEntry } = useEntryActions();
+  const featureData = useRundownEditor();
+  const { addEvent, reorderEvent, deleteEvent } = useEventAction();

  const { entryCopyId, setEntryCopyId } = useEntryCopy();

@@ -78,18 +62,18 @@ export default function Rundown({ data }: RundownProps) {
  useFollowComponent({ followRef: cursorRef, scrollRef, doFollow: appMode === AppMode.Run });

  // DND KIT
-  const sensors = useSensors(useSensor(PointerSensor, { activationConstraint: { distance: 10 } }));
+  const sensors = useSensors(useSensor(PointerSensor));

  const deleteAtCursor = useCallback(
    (cursor: string | null) => {
      if (!cursor) return;
      const { entry, index } = getPreviousNormal(entries, order, cursor);
-      deleteEntry([cursor]);
+      deleteEvent([cursor]);
      if (entry && index !== null) {
        setSelectedEvents({ id: entry.id, selectMode: 'click', index });
      }
    },
-    [entries, order, deleteEntry, setSelectedEvents],
+    [entries, order, deleteEvent, setSelectedEvents],
  );

  const insertCopyAtId = useCallback(
@@ -100,17 +84,17 @@ export default function Rundown({ data }: RundownProps) {
        return;
      }
      const cloneEntry = entries[copyId];
-      if (cloneEntry?.type === SupportedEntry.Event) {
+      if (cloneEntry?.type === SupportedEvent.Event) {
        //if we don't have a cursor add the new event on top
        const newEvent = cloneEvent(cloneEntry);
-        addEntry(newEvent, { after: adjustedCursor ?? undefined });
+        addEvent(newEvent, { after: adjustedCursor ?? undefined });
      }
    },
-    [addEntry, order, entries],
+    [addEvent, order, entries],
  );

  const insertAtId = useCallback(
-    (patch: Partial<OntimeEntry> & { type: SupportedEntry }, id: MaybeString, above = false) => {
+    (type: SupportedEvent, id: MaybeString, above = false) => {
      const options: EventOptions =
        id === null
          ? {}
@@ -119,12 +103,19 @@ export default function Rundown({ data }: RundownProps) {
              before: above ? id : undefined,
            };

-      if (!above && id) {
-        options.lastEventId = id;
+      if (type === SupportedEvent.Event) {
+        const newEvent = {
+          type: SupportedEvent.Event,
+        };
+        if (!above && id) {
+          options.lastEventId = id;
+        }
+        addEvent(newEvent, options);
+      } else {
+        addEvent({ type }, options);
      }
-      addEntry(patch, options);
    },
-    [addEntry],
+    [addEvent],
  );

  const selectBlock = useCallback(
@@ -188,26 +179,19 @@ export default function Rundown({ data }: RundownProps) {
  );

  const moveEntry = useCallback(
-    (cursor: EntryId | null, direction: 'up' | 'down') => {
-      if (sortableData.length < 2 || cursor == null) {
+    (cursor: string | null, direction: 'up' | 'down') => {
+      if (order.length < 2 || cursor == null) {
        return;
      }
+      const { index } =
+        direction === 'up' ? getPreviousNormal(entries, order, cursor) : getNextNormal(entries, order, cursor);

-      const { destinationId, order, isBlock } =
-        direction === 'up' ? moveUp(cursor, sortableData, entries) : moveDown(cursor, sortableData, entries);
-
-      if (!destinationId) {
-        return;
+      if (index !== null) {
+        const offsetIndex = direction === 'up' ? index + 1 : index - 1;
+        reorderEvent(cursor, offsetIndex, index);
      }
-
-      // if we are moving into a block, we need to make sure it is expanded
-      if (isBlock) {
-        handleCollapseGroup(false, destinationId);
-      }
-
-      reorderEntry(cursor, destinationId, order as 'before' | 'after' | 'insert');
    },
-    [sortableData, reorderEntry],
+    [order, reorderEvent, entries],
  );

  // shortcuts
@@ -225,14 +209,14 @@ export default function Rundown({ data }: RundownProps) {

    ['mod + Backspace', () => deleteAtCursor(cursor), { preventDefault: true }],

-    ['alt + E', () => insertAtId({ type: SupportedEntry.Event }, cursor), { preventDefault: true }],
-    ['alt + shift + E', () => insertAtId({ type: SupportedEntry.Event }, cursor, true), { preventDefault: true }],
+    ['alt + E', () => insertAtId(SupportedEvent.Event, cursor), { preventDefault: true }],
+    ['alt + shift + E', () => insertAtId(SupportedEvent.Event, cursor, true), { preventDefault: true }],

-    ['alt + B', () => insertAtId({ type: SupportedEntry.Block }, cursor), { preventDefault: true }],
-    ['alt + shift + B', () => insertAtId({ type: SupportedEntry.Block }, cursor, true), { preventDefault: true }],
+    ['alt + B', () => insertAtId(SupportedEvent.Block, cursor), { preventDefault: true }],
+    ['alt + shift + B', () => insertAtId(SupportedEvent.Block, cursor, true), { preventDefault: true }],

-    ['alt + D', () => insertAtId({ type: SupportedEntry.Delay }, cursor), { preventDefault: true }],
-    ['alt + shift + D', () => insertAtId({ type: SupportedEntry.Delay }, cursor, true), { preventDefault: true }],
+    ['alt + D', () => insertAtId(SupportedEvent.Delay, cursor), { preventDefault: true }],
+    ['alt + shift + D', () => insertAtId(SupportedEvent.Delay, cursor, true), { preventDefault: true }],

    ['mod + C', () => setEntryCopyId(cursor)],
    ['mod + V', () => insertCopyAtId(cursor, entryCopyId)],
@@ -244,11 +228,11 @@ export default function Rundown({ data }: RundownProps) {
  // we copy the state from the store here
  // to workaround async updates on the drag mutations
  useEffect(() => {
-    setSortableData(makeSortableList(order, entries));
-  }, [order, entries]);
+    setStatefulEntries(order);
+  }, [order]);

-  // in run mode, we follow selection
  useEffect(() => {
+    // in run mode, we follow selection
    if (appMode !== AppMode.Run || !featureData?.selectedEventId) {
      return;
    }
@@ -256,235 +240,115 @@ export default function Rundown({ data }: RundownProps) {
    setSelectedEvents({ id: featureData.selectedEventId, selectMode: 'click', index });
  }, [appMode, featureData.selectedEventId, order, setSelectedEvents]);

-  /**
-   * Checks whether a block is collapsed
-   */
-  const getIsCollapsed = useCallback(
-    (blockId: EntryId): boolean => {
-      return Boolean(collapsedGroups.find((id) => id === blockId));
-    },
-    [collapsedGroups],
-  );
-
-  /**
-   * Handles logic for collapsing groups
-   */
-  const handleCollapseGroup = useCallback(
-    (collapsed: boolean, groupId: EntryId) => {
-      setCollapsedGroups((prev) => {
-        const isCollapsed = getIsCollapsed(groupId);
-        if (collapsed && !isCollapsed) {
-          const newSet = new Set(prev).add(groupId);
-          return [...newSet];
-        }
-        if (!collapsed && isCollapsed) {
-          return [...prev].filter((id) => id !== groupId);
-        }
-        return prev;
-      });
-    },
-    [getIsCollapsed, setCollapsedGroups],
-  );
-
  /**
   * On drag end, we reorder the events
   */
  const handleOnDragEnd = (event: DragEndEvent) => {
    const { active, over } = event;

-    if (!over?.id || active.id === over.id) {
-      return;
-    }
+    if (over?.id) {
+      if (active.id !== over?.id) {
+        const fromIndex = active.data.current?.sortable.index;
+        const toIndex = over.data.current?.sortable.index;

-    const fromIndex = active.data.current?.sortable.index;
-    const toIndex = over.data.current?.sortable.index;
-
-    // we keep a copy of the state as a hack to handle inconsistencies between dnd-kit and async store updates
-    setSortableData((currentEntries) => {
-      return reorderArray(currentEntries, fromIndex, toIndex);
-    });
-
-    let destinationId = over.id as EntryId;
-    let order: 'before' | 'after' | 'insert' = fromIndex < toIndex ? 'after' : 'before';
-
-    /**
-     * We need to specially handle the end blocks
-     * Dragging before and end block will add the entry to the end of the block
-     * Dragging after an end block will add the event after the block itself
-     */
-    if (destinationId.startsWith('end-')) {
-      destinationId = destinationId.replace('end-', '');
-      // if we are moving before the end, we use the insert operation
-      order = 'insert';
-    }
-
-    reorderEntry(active.id as EntryId, destinationId, order);
-  };
-
-  /**
-   * When we drag a block, we force collapse it
-   * This avoids strange scenarios like dropping a block inside itself
-   */
-  const collapseDraggedBlocks = (event: DragStartEvent) => {
-    const isBlock = event.active.data.current?.type === 'block';
-    if (isBlock) {
-      handleCollapseGroup(true, event.active.id as EntryId);
+        // we keep a copy of the state as a hack to handle inconsistencies between dnd-kit and async store updates
+        setStatefulEntries((currentEntries) => {
+          return reorderArray(currentEntries, fromIndex, toIndex);
+        });
+        reorderEvent(String(active.id), fromIndex, toIndex);
+      }
    }
  };

-  /**
-   * When we drag over a block, we expand it if it is collapsed
-   */
-  const expandOverBlock = (event: DragOverEvent) => {
-    // if we are dragging a block, the drop operation is invalid so we dont expand
-    if (event.active.data.current?.type === 'block') {
-      return;
-    }
-    if (event.over?.data.current?.type !== 'block') {
-      return;
-    }
-    const blockId = event.over?.id as EntryId;
-    const isCollapsed = getIsCollapsed(blockId);
-    if (isCollapsed) {
-      handleCollapseGroup(false, blockId);
-    }
-  };
-
-  if (sortableData.length < 1) {
-    return <RundownEmpty handleAddNew={(type: SupportedEntry) => addEntry({ type })} />;
+  if (statefulEntries.length < 1) {
+    return <RundownEmpty handleAddNew={() => insertAtId(SupportedEvent.Event, cursor)} />;
  }

-  // 1. gather presentation options
-  const isEditMode = appMode === AppMode.Edit;
+  // last event is used to calculate relative timings
+  let lastEvent: PlayableEvent | null = null; // used by indicators
+  let thisEvent: PlayableEvent | null = null;
+  // previous entry is used to infer position in the rundown for new events
+  let previousEntryId: MaybeString = null;
+  let thisId: MaybeString = null;

-  // 2. initialise rundown metadata
-  const { metadata, process } = makeRundownMetadata(featureData?.selectedEventId);
-  // keep a single reference to the metadata which we override for every entry
-  let rundownMetadata = metadata;
+  let eventIndex = 0;
+  // all events before the current selected are in the past
+  let isPast = Boolean(featureData?.selectedEventId);
+  let isNextDay = false;
+  let totalGap = 0;
+  const isEditMode = appMode === AppMode.Edit;
+  let isLinkedToLoaded = true; //check if the event can link all the way back to the currently playing event

  return (
    <div className={style.rundownContainer} ref={scrollRef} data-testid='rundown'>
-      <DndContext
-        onDragEnd={handleOnDragEnd}
-        onDragStart={collapseDraggedBlocks}
-        onDragOver={expandOverBlock}
-        sensors={sensors}
-        collisionDetection={closestCenter}
-      >
-        <SortableContext items={sortableData} strategy={verticalListSortingStrategy}>
+      <DndContext onDragEnd={handleOnDragEnd} sensors={sensors} collisionDetection={closestCenter}>
+        <SortableContext items={statefulEntries} strategy={verticalListSortingStrategy}>
          <div className={style.list}>
-            {sortableData.map((entryId, index) => {
-              const isFirst = index === 0;
-              const isLast = index === sortableData.length - 1;
-
-              // the entry might be a pseudo block-end which does not generate metadata and should not be processed
-              if (entryId.startsWith('end-')) {
-                const parentId = entryId.split('end-')[1];
-                const isBlockCollapsed = getIsCollapsed(parentId);
-
-                if (isBlockCollapsed && isEditMode && isLast) {
-                  return <QuickAddBlock key={entryId} previousEventId={parentId} parentBlock={null} />;
-                } else if (isBlockCollapsed) {
-                  return null;
-                } else {
-                  const parentColour = (entries[parentId] as OntimeBlock | undefined)?.colour;
-                  // if the previous element is selected, it will have its own QuickAddBlock
-                  // we use thisId instead of previousEntryId because the block end does not process
-                  // and it does not cause the reassignment of the iteration id to the previous entry
-                  const showPrependingQuickAdd = isEditMode && cursor !== rundownMetadata.thisId;
-                  return (
-                    <Fragment key={entryId}>
-                      {showPrependingQuickAdd && (
-                        <QuickAddBlock
-                          previousEventId={rundownMetadata.thisId}
-                          parentBlock={parentId}
-                          backgroundColor={parentColour}
-                        />
-                      )}
-                      <BlockEnd key={entryId} id={entryId} colour={parentColour} />
-                      {isEditMode && isLast && <QuickAddBlock previousEventId={parentId} parentBlock={null} />}
-                    </Fragment>
-                  );
-                }
-              }
-
-              // we iterate through a stateful copy of order to make the dnd operations smoother
+            {statefulEntries.map((entryId, index) => {
+              // we iterate through a stateful copy of order to make the operations smoother
              // this means that this can be out of sync with order until the useEffect runs
              // instead of writing all the logic guards, we simply short circuit rendering here
              const entry = entries[entryId];
-              if (!entry) return null;
-              rundownMetadata = process(entry);
-
-              // if the entry has a parent, and it is collapsed, render nothing
-              if (
-                entry.type !== SupportedEntry.Block &&
-                rundownMetadata.groupId !== null &&
-                getIsCollapsed(rundownMetadata.groupId)
-              ) {
+              if (!entry) {
                return null;
              }
+              if (index === 0) {
+                eventIndex = 0;
+              }
+              isNextDay = false;
+              previousEntryId = thisId;
+              thisId = entryId;
+              if (isOntimeEvent(entry)) {
+                // event indexes are 1 based in frontend
+                eventIndex++;
+                lastEvent = thisEvent;

+                if (isPlayableEvent(entry)) {
+                  isNextDay = checkIsNextDay(entry, lastEvent);
+                  if (!isPast) {
+                    totalGap += entry.gap;
+                    isLinkedToLoaded = isLinkedToLoaded && entry.linkStart !== null;
+                  }
+                  if (isNewLatest(entry, lastEvent)) {
+                    // populate previous entry
+                    thisEvent = entry;
+                  }
+                }
+              }
+              const isFirst = index === 0;
+              const isLast = index === order.length - 1;
+              const isLoaded = featureData?.selectedEventId === entry.id;
              const isNext = featureData?.nextEventId === entry.id;
              const hasCursor = entry.id === cursor;
-
-              /**
-               * Outside a block, the value will be undefined
-               * If the colour is empty string ''
-               * ie: we are inside a block, but there is no defined colour
-               * we default to $gray-1050 #303030
-               */
-              const blockColour = rundownMetadata.groupColour === '' ? '#303030' : rundownMetadata.groupColour;
+              if (isLoaded) {
+                isPast = false;
+              }

              return (
                <Fragment key={entry.id}>
-                  {isEditMode && (hasCursor || isFirst) && (
-                    <QuickAddBlock
-                      previousEventId={rundownMetadata.previousEntryId}
-                      parentBlock={isFirst ? null : rundownMetadata.groupId}
-                      backgroundColor={isFirst ? undefined : blockColour}
-                    />
-                  )}
-                  {isOntimeBlock(entry) ? (
-                    <BlockBlock
-                      data={entry}
-                      hasCursor={hasCursor}
-                      collapsed={getIsCollapsed(entry.id)}
-                      onCollapse={handleCollapseGroup}
-                    />
-                  ) : (
-                    <div
-                      className={style.entryWrapper}
-                      data-testid={`entry-${rundownMetadata.eventIndex}`}
-                      style={blockColour ? { '--user-bg': blockColour } : {}}
-                    >
-                      {isOntimeEvent(entry) && <div className={style.entryIndex}>{rundownMetadata.eventIndex}</div>}
-                      <div className={style.entry} key={entry.id} ref={hasCursor ? cursorRef : undefined}>
-                        <RundownEntry
-                          type={entry.type}
-                          isPast={rundownMetadata.isPast}
-                          eventIndex={rundownMetadata.eventIndex}
-                          data={entry}
-                          loaded={rundownMetadata.isLoaded}
-                          hasCursor={hasCursor}
-                          isNext={isNext}
-                          previousEntryId={rundownMetadata.previousEntryId}
-                          previousEventId={rundownMetadata.previousEvent?.id}
-                          playback={rundownMetadata.isLoaded ? featureData.playback : undefined}
-                          isRolling={featureData.playback === Playback.Roll}
-                          isNextDay={rundownMetadata.isNextDay}
-                          totalGap={rundownMetadata.totalGap}
-                          isLinkedToLoaded={rundownMetadata.isLinkedToLoaded}
-                        />
-                      </div>
+                  {isEditMode && (hasCursor || isFirst) && <QuickAddBlock previousEventId={previousEntryId} />}
+                  <div className={style.entryWrapper} data-testid={`entry-${eventIndex}`}>
+                    {isOntimeEvent(entry) && <div className={style.entryIndex}>{eventIndex}</div>}
+                    <div className={style.entry} key={entry.id} ref={hasCursor ? cursorRef : undefined}>
+                      <RundownEntry
+                        type={entry.type}
+                        isPast={isPast}
+                        eventIndex={eventIndex}
+                        data={entry}
+                        loaded={isLoaded}
+                        hasCursor={hasCursor}
+                        isNext={isNext}
+                        previousEntryId={previousEntryId}
+                        previousEventId={lastEvent?.id}
+                        playback={isLoaded ? featureData.playback : undefined}
+                        isRolling={featureData.playback === Playback.Roll}
+                        isNextDay={isNextDay}
+                        totalGap={totalGap}
+                        isLinkedToLoaded={isLinkedToLoaded}
+                      />
                    </div>
-                  )}
-                  {isEditMode && (hasCursor || isLast) && (
-                    <QuickAddBlock
-                      previousEventId={entry.id}
-                      parentBlock={rundownMetadata.groupId}
-                      backgroundColor={blockColour}
-                    />
-                  )}
+                  </div>
+                  {isEditMode && (hasCursor || isLast) && <QuickAddBlock previousEventId={entry.id} />}
                </Fragment>
              );
            })}
@@ -1,30 +1,23 @@
 import { IoAdd } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
-import { SupportedEntry } from 'ontime-types';

 import Empty from '../../common/components/state/Empty';

-import style from './Empty.module.scss';
+import style from './Rundown.module.scss';

 interface RundownEmptyProps {
-  handleAddNew: (type: SupportedEntry) => void;
+  handleAddNew: () => void;
 }

 export default function RundownEmpty(props: RundownEmptyProps) {
  const { handleAddNew } = props;

  return (
-    <div className={style.empty}>
-      <Empty style={{ marginTop: '5vh', marginBottom: '3rem' }} />
-      <div className={style.inline}>
-        <Button onClick={() => handleAddNew(SupportedEntry.Event)} variant='ontime-filled' leftIcon={<IoAdd />}>
-          Create Event
-        </Button>
-
-        <Button onClick={() => handleAddNew(SupportedEntry.Block)} variant='ontime-filled' leftIcon={<IoAdd />}>
-          Create Block
-        </Button>
-      </div>
+    <div className={style.alignCenter}>
+      <Empty style={{ marginTop: '7vh' }} />
+      <Button onClick={handleAddNew} variant='ontime-filled' className={style.spaceTop} leftIcon={<IoAdd />}>
+        Create Event
+      </Button>
    </div>
  );
 }
@@ -1,38 +1,41 @@
 import { useCallback } from 'react';
 import {
+  isOntimeBlock,
  isOntimeDelay,
  isOntimeEvent,
  MaybeString,
  OntimeEntry,
  OntimeEvent,
  Playback,
-  SupportedEntry,
+  SupportedEvent,
 } from 'ontime-types';

-import { useEntryActions } from '../../common/hooks/useEntryAction';
+import { useEventAction } from '../../common/hooks/useEventAction';
 import useMemoisedFn from '../../common/hooks/useMemoisedFn';
 import { useEmitLog } from '../../common/stores/logger';
-import { cloneEvent } from '../../common/utils/clone';
+import { cloneEvent } from '../../common/utils/eventsManager';

+import BlockBlock from './block-block/BlockBlock';
 import DelayBlock from './delay-block/DelayBlock';
 import EventBlock from './event-block/EventBlock';
 import { useEventSelection } from './useEventSelection';

 export type EventItemActions =
+  | 'set-cursor'
  | 'event'
  | 'event-before'
  | 'delay'
  | 'delay-before'
  | 'block'
  | 'block-before'
-  | 'swap'
  | 'delete'
  | 'clone'
-  | 'group'
-  | 'update';
+  | 'update'
+  | 'swap'
+  | 'clear-report';

 interface RundownEntryProps {
-  type: SupportedEntry;
+  type: SupportedEvent;
  isPast: boolean;
  data: OntimeEntry;
  loaded: boolean;
@@ -65,7 +68,7 @@ export default function RundownEntry(props: RundownEntryProps) {
    isLinkedToLoaded,
  } = props;
  const { emitError } = useEmitLog();
-  const { addEntry, updateEntry, batchUpdateEvents, deleteEntry, groupEntries, swapEvents } = useEntryActions();
+  const { addEvent, updateEvent, batchUpdateEvents, deleteEvent, swapEvents } = useEventAction();
  const { selectedEvents, unselect, clearSelectedEvents } = useEventSelection();

  const removeOpenEvent = useCallback(() => {
@@ -85,31 +88,31 @@ export default function RundownEntry(props: RundownEntryProps) {
  const actionHandler = useMemoisedFn((action: EventItemActions, payload?: number | FieldValue) => {
    switch (action) {
      case 'event': {
-        const newEvent = { type: SupportedEntry.Event };
+        const newEvent = { type: SupportedEvent.Event };
        const options = {
          after: data.id,
          lastEventId: previousEventId,
        };
-        return addEntry(newEvent, options);
+        return addEvent(newEvent, options);
      }
      case 'event-before': {
-        const newEvent = { type: SupportedEntry.Event };
+        const newEvent = { type: SupportedEvent.Event };
        const options = {
          after: previousEntryId,
        };
-        return addEntry(newEvent, options);
+        return addEvent(newEvent, options);
      }
      case 'delay': {
-        return addEntry({ type: SupportedEntry.Delay }, { after: data.id });
+        return addEvent({ type: SupportedEvent.Delay }, { after: data.id });
      }
      case 'delay-before': {
-        return addEntry({ type: SupportedEntry.Delay }, { after: previousEntryId });
+        return addEvent({ type: SupportedEvent.Delay }, { after: previousEntryId });
      }
      case 'block': {
-        return addEntry({ type: SupportedEntry.Block }, { after: data.id });
+        return addEvent({ type: SupportedEvent.Block }, { after: data.id });
      }
      case 'block-before': {
-        return addEntry({ type: SupportedEntry.Block }, { after: previousEntryId });
+        return addEvent({ type: SupportedEvent.Block }, { after: previousEntryId });
      }
      case 'swap': {
        const { value } = payload as FieldValue;
@@ -118,21 +121,14 @@ export default function RundownEntry(props: RundownEntryProps) {
      case 'delete': {
        if (selectedEvents.size > 1) {
          clearMultiSelection();
-          return deleteEntry(Array.from(selectedEvents));
+          return deleteEvent(Array.from(selectedEvents));
        }
        removeOpenEvent();
-        return deleteEntry([data.id]);
+        return deleteEvent([data.id]);
      }
      case 'clone': {
        const newEvent = cloneEvent(data as OntimeEvent);
-        addEntry(newEvent, { after: data.id });
-        break;
-      }
-      case 'group': {
-        if (selectedEvents.size > 1) {
-          clearMultiSelection();
-          return groupEntries(Array.from(selectedEvents));
-        }
+        addEvent(newEvent, { after: data.id });
        break;
      }
      case 'update': {
@@ -153,7 +149,7 @@ export default function RundownEntry(props: RundownEntryProps) {
        if (field in data) {
          // @ts-expect-error -- not sure how to type this
          newData[field] = value;
-          return updateEntry(newData);
+          return updateEvent(newData);
        }

        return emitError(`Unknown field: ${field}`);
@@ -185,7 +181,6 @@ export default function RundownEntry(props: RundownEntryProps) {
        isPast={isPast}
        isNext={isNext}
        skip={data.skip}
-        parent={data.parent}
        loaded={loaded}
        hasCursor={hasCursor}
        playback={playback}
@@ -198,6 +193,14 @@ export default function RundownEntry(props: RundownEntryProps) {
        actionHandler={actionHandler}
      />
    );
+  } else if (isOntimeBlock(data)) {
+    return (
+      <BlockBlock data={data} hasCursor={hasCursor}>
+        {data.events.map((eventId) => {
+          return <div key={eventId}>{eventId}</div>;
+        })}
+      </BlockBlock>
+    );
  } else if (isOntimeDelay(data)) {
    return <DelayBlock data={data} hasCursor={hasCursor} />;
  }
@@ -8,14 +8,11 @@ import { cx } from '../../common/utils/styleUtils';
 import { Corner } from '../editors/editor-utils/EditorUtils';

 import RundownEventEditor from './event-editor/RundownEventEditor';
-import FinderPlacement from './placements/FinderPlacement';
 import RundownWrapper from './RundownWrapper';

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

-export default memo(RundownExport);
-
-function RundownExport() {
+const RundownExport = () => {
  const isExtracted = window.location.pathname.includes('/rundown');
  const appMode = useAppMode((state) => state.mode);
  const hideSideBar = isExtracted && appMode === 'run';
@@ -24,7 +21,6 @@ function RundownExport() {

  return (
    <div className={classes} data-testid='panel-rundown'>
-      <FinderPlacement />
      <div className={style.rundown}>
        <div className={style.list}>
          <ErrorBoundary>
@@ -44,4 +40,6 @@ function RundownExport() {
      </div>
    </div>
  );
-}
+};
+
+export default memo(RundownExport);
@@ -1,399 +0,0 @@
-import { EntryId, OntimeBlock, OntimeDelay, OntimeEvent, RundownEntries, SupportedEntry } from 'ontime-types';
-
-import { makeRundownMetadata, makeSortableList, moveDown, moveUp } from '../rundown.utils';
-
-describe('makeRundownMetadata()', () => {
-  it('processes nested rundown data', () => {
-    const selectedEventId = '12';
-    const demoEvents = {
-      '1': {
-        id: '1',
-        type: SupportedEntry.Event,
-        parent: null,
-        timeStart: 0,
-        timeEnd: 1,
-        duration: 1,
-        dayOffset: 0,
-        gap: 0,
-        skip: false,
-        linkStart: false,
-      } as OntimeEvent,
-      block: {
-        id: 'block',
-        type: SupportedEntry.Block,
-        events: ['11', 'delay', '12', '13'],
-        colour: 'red',
-      } as OntimeBlock,
-      '11': {
-        id: '11',
-        type: SupportedEntry.Event,
-        parent: 'block',
-        timeStart: 10,
-        timeEnd: 11,
-        duration: 1,
-        dayOffset: 0,
-        gap: 10,
-        skip: false,
-        linkStart: false,
-      } as OntimeEvent,
-      delay: {
-        id: 'delay',
-        type: SupportedEntry.Delay,
-        parent: 'block',
-        duration: 0,
-      } as OntimeDelay,
-      '12': {
-        id: '12',
-        type: SupportedEntry.Event,
-        parent: 'block',
-        timeStart: 11,
-        timeEnd: 12,
-        duration: 1,
-        dayOffset: 0,
-        gap: 0,
-        skip: false,
-        linkStart: true,
-      } as OntimeEvent,
-      '13': {
-        id: '13',
-        type: SupportedEntry.Event,
-        parent: 'block',
-        timeStart: 12,
-        timeEnd: 13,
-        duration: 1,
-        dayOffset: 0,
-        gap: 0,
-        skip: false,
-        linkStart: true,
-      } as OntimeEvent,
-      '2': {
-        id: '2',
-        type: SupportedEntry.Event,
-        parent: null,
-        timeStart: 20,
-        timeEnd: 21,
-        duration: 1,
-        dayOffset: 0,
-        gap: 7,
-        skip: false,
-        linkStart: false,
-      } as OntimeEvent,
-    };
-
-    const { metadata, process } = makeRundownMetadata(selectedEventId);
-
-    expect(metadata).toStrictEqual({
-      previousEvent: null,
-      latestEvent: null,
-      previousEntryId: null,
-      thisId: null,
-      eventIndex: 0,
-      isPast: true,
-      isNextDay: false,
-      totalGap: 0,
-      isLinkedToLoaded: false,
-      isLoaded: false,
-      groupId: null,
-      groupColour: undefined,
-    });
-
-    expect(process(demoEvents['1'])).toStrictEqual({
-      previousEvent: null,
-      latestEvent: demoEvents['1'],
-      previousEntryId: null,
-      thisId: demoEvents['1'].id,
-      eventIndex: 1, // UI indexes are 1 based
-      isPast: true,
-      isNextDay: false,
-      totalGap: 0,
-      isLinkedToLoaded: false,
-      isLoaded: false,
-      groupId: null,
-      groupColour: undefined,
-    });
-
-    expect(process(demoEvents['block'])).toMatchObject({
-      previousEvent: demoEvents['1'],
-      latestEvent: demoEvents['1'],
-      previousEntryId: demoEvents['1'].id,
-      thisId: demoEvents['block'].id,
-      eventIndex: 1,
-      isPast: true,
-      isNextDay: false,
-      totalGap: 0,
-      isLinkedToLoaded: false,
-      isLoaded: false,
-      groupId: 'block',
-      groupColour: 'red',
-    });
-
-    expect(process(demoEvents['11'])).toMatchObject({
-      previousEvent: demoEvents['1'],
-      latestEvent: demoEvents['11'],
-      previousEntryId: demoEvents['block'].id,
-      thisId: demoEvents['11'].id,
-      eventIndex: 2,
-      isPast: true,
-      isNextDay: false,
-      totalGap: 10,
-      isLinkedToLoaded: false,
-      isLoaded: false,
-      groupId: 'block',
-      groupColour: 'red',
-    });
-
-    expect(process(demoEvents['delay'])).toMatchObject({
-      previousEvent: demoEvents['11'],
-      latestEvent: demoEvents['11'],
-      previousEntryId: demoEvents['11'].id,
-      thisId: demoEvents['delay'].id,
-      eventIndex: 2,
-      isPast: true,
-      isNextDay: false,
-      totalGap: 10,
-      isLinkedToLoaded: false,
-      isLoaded: false,
-      groupId: 'block',
-      groupColour: 'red',
-    });
-
-    expect(process(demoEvents['12'])).toMatchObject({
-      previousEvent: demoEvents['11'],
-      latestEvent: demoEvents['12'],
-      previousEntryId: demoEvents['delay'].id,
-      thisId: demoEvents['12'].id,
-      eventIndex: 3,
-      isPast: false,
-      isNextDay: false,
-      totalGap: 10,
-      isLinkedToLoaded: false,
-      isLoaded: true,
-      groupId: 'block',
-      groupColour: 'red',
-    });
-
-    expect(process(demoEvents['13'])).toMatchObject({
-      previousEvent: demoEvents['12'],
-      latestEvent: demoEvents['13'],
-      previousEntryId: demoEvents['12'].id,
-      thisId: demoEvents['13'].id,
-      eventIndex: 4,
-      isPast: false,
-      isNextDay: false,
-      totalGap: 10,
-      isLinkedToLoaded: true,
-      isLoaded: false,
-      groupId: 'block',
-      groupColour: 'red',
-    });
-
-    expect(process(demoEvents['2'])).toMatchObject({
-      previousEvent: demoEvents['13'],
-      latestEvent: demoEvents['2'],
-      previousEntryId: demoEvents['13'].id,
-      thisId: demoEvents['2'].id,
-      eventIndex: 5,
-      isPast: false,
-      isNextDay: false,
-      totalGap: 17,
-      isLinkedToLoaded: false,
-      isLoaded: false,
-      groupId: null,
-      groupColour: undefined,
-    });
-  });
-
-  it('populates previousEntries in blocks', () => {
-    const rundownStartsWithBlock = {
-      block: {
-        id: 'block',
-        type: SupportedEntry.Block,
-        colour: 'red',
-        events: ['1', '2'],
-      } as OntimeBlock,
-      '1': {
-        id: '1',
-        type: SupportedEntry.Event,
-        parent: 'block',
-        timeStart: 1,
-        timeEnd: 2,
-        duration: 1,
-        dayOffset: 0,
-        gap: 0,
-        skip: false,
-        linkStart: false,
-      } as OntimeEvent,
-      '2': {
-        id: '2',
-        type: SupportedEntry.Event,
-        parent: 'block',
-        timeStart: 2,
-        timeEnd: 3,
-        duration: 1,
-        dayOffset: 0,
-        gap: 0,
-        skip: false,
-        linkStart: false,
-      } as OntimeEvent,
-    };
-    const { process } = makeRundownMetadata(null);
-
-    expect(process(rundownStartsWithBlock.block)).toStrictEqual({
-      previousEvent: null,
-      latestEvent: null,
-      previousEntryId: null,
-      thisId: rundownStartsWithBlock.block.id,
-      eventIndex: 0,
-      isPast: false,
-      isNextDay: false,
-      totalGap: 0,
-      isLinkedToLoaded: false,
-      isLoaded: false,
-      groupId: rundownStartsWithBlock.block.id,
-      groupColour: 'red',
-    });
-
-    expect(process(rundownStartsWithBlock['1'])).toStrictEqual({
-      previousEvent: null,
-      latestEvent: rundownStartsWithBlock['1'],
-      previousEntryId: rundownStartsWithBlock.block.id,
-      thisId: rundownStartsWithBlock['1'].id,
-      eventIndex: 1,
-      isPast: false,
-      isNextDay: false,
-      totalGap: 0,
-      isLinkedToLoaded: false,
-      isLoaded: false,
-      groupId: rundownStartsWithBlock.block.id,
-      groupColour: 'red',
-    });
-    expect(process(rundownStartsWithBlock['2'])).toStrictEqual({
-      previousEvent: rundownStartsWithBlock['1'],
-      latestEvent: rundownStartsWithBlock['2'],
-      previousEntryId: rundownStartsWithBlock['1'].id,
-      thisId: rundownStartsWithBlock['2'].id,
-      eventIndex: 2,
-      isPast: false,
-      isNextDay: false,
-      totalGap: 0,
-      isLinkedToLoaded: false,
-      isLoaded: false,
-      groupId: rundownStartsWithBlock.block.id,
-      groupColour: 'red',
-    });
-  });
-});
-
-describe('makeSortableList()', () => {
-  it('generates a list with block ends', () => {
-    const order = ['block-1', '2', 'block-3', 'block-4'];
-    const entries: RundownEntries = {
-      'block-1': { type: SupportedEntry.Block, id: 'block-1', events: ['11'] } as OntimeBlock,
-      '11': { type: SupportedEntry.Event, id: '11', parent: 'block-1' } as OntimeEvent,
-      '2': { type: SupportedEntry.Event, id: '2', parent: null } as OntimeEvent,
-      'block-3': { type: SupportedEntry.Block, id: 'block-3', events: ['31'] } as OntimeBlock,
-      '31': { type: SupportedEntry.Event, id: '31', parent: 'block-3' } as OntimeEvent,
-      'block-4': { type: SupportedEntry.Block, id: 'block-4', events: [] as string[] } as OntimeBlock,
-    };
-
-    const sortableList = makeSortableList(order, entries);
-    expect(sortableList).toStrictEqual([
-      'block-1',
-      '11',
-      'end-block-1',
-      '2',
-      'block-3',
-      '31',
-      'end-block-3',
-      'block-4',
-      'end-block-4',
-    ]);
-  });
-
-  it('closes dangling blocks', () => {
-    const order = ['block'];
-    const entries: RundownEntries = {
-      block: { type: SupportedEntry.Block, id: 'block-1', events: ['11', '12'] } as OntimeBlock,
-      '11': { type: SupportedEntry.Event, id: '11', parent: 'block-1' } as OntimeEvent,
-      '12': { type: SupportedEntry.Event, id: '12', parent: 'block-1' } as OntimeEvent,
-    };
-
-    const sortableList = makeSortableList(order, entries);
-    expect(sortableList).toStrictEqual(['block-1', '11', '12', 'end-block-1']);
-  });
-
-  it('handles a list with a with just blocks', () => {
-    const order = ['block-1', 'block-2'];
-    const entries: RundownEntries = {
-      'block-1': { type: SupportedEntry.Block, id: 'block-1', events: [] as string[] } as OntimeBlock,
-      'block-2': { type: SupportedEntry.Block, id: 'block-2', events: [] as string[] } as OntimeBlock,
-    };
-
-    const sortableList = makeSortableList(order, entries);
-    expect(sortableList).toStrictEqual(['block-1', 'end-block-1', 'block-2', 'end-block-2']);
-  });
-});
-
-describe('moveUp()', () => {
-  const sortableData = ['event1', 'event2', 'block1', 'event11', 'end-block1', 'block2', 'end-block2', 'event3'];
-  const entries = {
-    event1: { type: 'event', id: 'event1', parent: null } as OntimeEvent,
-    event2: { type: 'event', id: 'event2', parent: null }as OntimeEvent,
-    block1: { type: 'block', id: 'block1', events: ['event3'] } as OntimeBlock,
-    event11: { type: 'event', id: 'event11', parent: 'block1' } as OntimeEvent,
-    block2: { type: 'block', id: 'block2', events: [] as EntryId[] } as OntimeBlock,
-    event3: { type: 'event', id: 'event3', parent: null } as OntimeEvent,
-  };
-
-  it('moves an event up in the list', () => {
-    const result = moveUp('event2', sortableData, entries);
-    expect(result).toStrictEqual({ destinationId: 'event1', order: 'before', isBlock: false });
-  })
-
-  it.todo('disallows nesting blocks', () => {
-    const result = moveUp('block2', sortableData, entries);
-    expect(result).toStrictEqual({ destinationId: 'block1', order: 'before', isBlock: false });
-  })
-
-  it('moves an event into a block', () => {
-    const result = moveUp('event3', sortableData, entries);
-    expect(result).toStrictEqual({ destinationId: 'block2', order: 'insert', isBlock: true });
-  })
-
-  it('moving up from top is noop', () => {
-    const result = moveUp('event1', sortableData, entries);
-    expect(result).toMatchObject({ destinationId: null });
-  })
-});
-
-describe('moveDown()', () => {
-  const sortableData = ['event1', 'event2', 'block1', 'event11', 'end-block1', 'block2', 'end-block2', 'event3'];
-  const entries = {
-    event1: { type: 'event', id: 'event1', parent: null } as OntimeEvent,
-    event2: { type: 'event', id: 'event2', parent: null }as OntimeEvent,
-    block1: { type: 'block', id: 'block1', events: ['event11'] } as OntimeBlock,
-    event11: { type: 'event', id: 'event11', parent: 'block1' } as OntimeEvent,
-    block2: { type: 'block', id: 'block2', events: [] as EntryId[] } as OntimeBlock,
-    event3: { type: 'event', id: 'event3', parent: null } as OntimeEvent,
-  };
-
-  it('moves an event down in the list', () => {
-    const result = moveDown('event1', sortableData, entries);
-    expect(result).toStrictEqual({ destinationId: 'event2', order: 'after', isBlock: false });
-  })
-
-  it.todo('disallows nesting blocks', () => {
-    const result = moveDown('block1', sortableData, entries);
-    expect(result).toStrictEqual({ destinationId: 'block2', order: 'before', isBlock: false });
-  })
-
-  it('moves an event into a block', () => {
-    const result = moveDown('event2', sortableData, entries);
-    expect(result).toStrictEqual({ destinationId: 'event11', order: 'before', isBlock: true });
-  })
-
-  it('moving down from bottom is noop', () => {
-    const result = moveDown('event3', sortableData, entries);
-    expect(result).toMatchObject({ destinationId: null });
-  })
-});
@@ -1,7 +1,7 @@
@use '../../theme/ontimeColours' as *;
@use '../../theme/ontimeStyles' as *;

-$block-width: 32rem;
+$block-width: 33rem;

 $block-gap: 0.25rem;
 $block-element-spacing: 0.25rem;
@@ -20,6 +20,7 @@ $block-cursor-color: $orange-400;
  box-sizing: content-box;
  border: 1px solid $white-7;
  border-radius: $block-border-radius;
+  margin-block: 0.25rem;
  position: relative;
  color: $block-text-color;

@@ -32,11 +33,9 @@ $block-cursor-color: $orange-400;
  opacity: 0.3;
  cursor: grab;
  transition: opacity 0.3s;
-
  &:hover {
    opacity: 1;
  }
-
  &:focus {
    box-shadow: none;
    outline: none;
@@ -2,73 +2,21 @@

 .block {
  @include block-styling;
-  overflow: hidden;

+  background-color: $block-bg2;
+
+  min-width: 34rem;
  display: grid;
-  grid-template-columns: 2rem 1fr;
-  grid-template-areas: 'binder header';
+  grid-template-columns: 2rem 1fr auto;
  align-items: center;
-  // TODO(style fix): groups have an extra bottom margin which interrupt colour
-  margin-block: 0.25rem;
+  height: $secondary-block-height;
+  gap: 0.5rem;

  &.hasCursor {
    outline: 1px solid $block-cursor-color;
  }
-
-  &.expanded {
-    border-radius: $block-border-radius $block-border-radius 0 0;
-  }
-
-  .binder {
-    grid-area: binder;
-    height: 100%;
-    background-color: var(--block-color, $gray-1050);
-    color: $section-white;
-    font-size: 1rem;
-    display: grid;
-    justify-content: center;
-    padding-top: 0.25rem;
-  }
-
-  .header {
-    grid-area: header;
-    padding-inline: 0.5rem;
-    background-color: $block-bg2;
-    display: flex;
-    flex-direction: column;
-    gap: 0.5rem;
-  }
-
-  .titleRow {
-    display: flex;
-    align-items: center;
-    gap: 0.5rem;
-  }
-
-  .metaRow {
-    display: flex;
-    gap: 3rem;
-    margin-bottom: 0.25rem;
-  }
-
-  .metaEntry {
-    width: 4.5em;
-
-    :first-child {
-      font-size: calc(1rem - 3px);
-      color: $label-gray;
-    }
-  }
 }

 .drag {
  @include drag-style;
-
-  &.isDragging {
-    cursor: grabbing;
-  }
-
-  &.notAllowed {
-    cursor: not-allowed;
-  }
 }
@@ -1,57 +1,23 @@
-import { useRef } from 'react';
-import {
-  IoChevronDown,
-  IoChevronUp,
-  IoDuplicateOutline,
-  IoFolderOpenOutline,
-  IoReorderTwo,
-  IoTrash,
-} from 'react-icons/io5';
-import { IconButton } from '@chakra-ui/react';
+import { PropsWithChildren, useRef } from 'react';
+import { IoReorderTwo } from 'react-icons/io5';
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
-import { EntryId, OntimeBlock } from 'ontime-types';
+import { OntimeBlock } from 'ontime-types';

-import { useContextMenu } from '../../../common/hooks/useContextMenu';
-import { useEntryActions } from '../../../common/hooks/useEntryAction';
-import { cx, getAccessibleColour } from '../../../common/utils/styleUtils';
-import { formatDuration, formatTime } from '../../../common/utils/time';
+import { cx } from '../../../common/utils/styleUtils';
 import EditableBlockTitle from '../common/EditableBlockTitle';
-import { canDrop } from '../rundown.utils';

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

 interface BlockBlockProps {
  data: OntimeBlock;
  hasCursor: boolean;
-  collapsed: boolean;
-  onCollapse: (collapsed: boolean, groupId: EntryId) => void;
 }

-export default function BlockBlock(props: BlockBlockProps) {
-  const { data, hasCursor, collapsed, onCollapse } = props;
-  const handleRef = useRef<null | HTMLSpanElement>(null);
-  const { clone, ungroup, deleteEntry } = useEntryActions();
+export default function BlockBlock(props: PropsWithChildren<BlockBlockProps>) {
+  const { data, hasCursor, children } = props;

-  const [onContextMenu] = useContextMenu<HTMLDivElement>([
-    {
-      label: 'Clone Block',
-      icon: IoDuplicateOutline,
-      onClick: () => clone(data.id),
-    },
-    {
-      label: 'Ungroup',
-      icon: IoFolderOpenOutline,
-      onClick: () => ungroup(data.id),
-      isDisabled: data.events.length === 0,
-    },
-    {
-      label: 'Delete Block',
-      icon: IoTrash,
-      onClick: () => deleteEntry([data.id]),
-      withDivider: true,
-    },
-  ]);
+  const handleRef = useRef<null | HTMLSpanElement>(null);

  const {
    attributes: dragAttributes,
@@ -59,79 +25,26 @@ export default function BlockBlock(props: BlockBlockProps) {
    setNodeRef,
    transform,
    transition,
-    isDragging,
-    isOver,
-    over,
  } = useSortable({
    id: data.id,
-    data: {
-      type: 'block',
-    },
    animateLayoutChanges: () => false,
  });

-  const binderColours = data.colour && getAccessibleColour(data.colour);
-  const isValidDrop = over?.id && canDrop(over.data.current?.type, over.data.current?.parent);
-
  const dragStyle = {
-    zIndex: isDragging ? 2 : 'inherit',
    transform: CSS.Translate.toString(transform),
    transition,
-    cursor: isOver ? (isValidDrop ? 'grabbing' : 'no-drop') : 'default',
  };

+  const blockClasses = cx([style.block, hasCursor ? style.hasCursor : null]);
+
  return (
-    <div
-      className={cx([style.block, hasCursor && style.hasCursor, !collapsed && style.expanded])}
-      ref={setNodeRef}
-      onContextMenu={onContextMenu}
-      style={{
-        ...(binderColours ? { '--user-bg': binderColours.backgroundColor } : {}),
-        ...dragStyle,
-      }}
-    >
-      <div className={style.binder} style={{ ...binderColours }} tabIndex={-1}>
-        <span
-          className={cx([style.drag, isDragging && style.isDragging, isDragging && !isValidDrop && style.notAllowed])}
-          ref={handleRef}
-          {...dragAttributes}
-          {...dragListeners}
-        >
-          <IoReorderTwo />
-        </span>
-      </div>
-      <div className={style.header}>
-        <div className={style.titleRow}>
-          <EditableBlockTitle title={data.title} eventId={data.id} placeholder='Block title' />
-          <IconButton
-            aria-label='Collapse'
-            onClick={() => onCollapse(!collapsed, data.id)}
-            color='#e2e2e2' // $gray-200
-            variant='ontime-ghosted'
-            size='sm'
-          >
-            {collapsed ? <IoChevronUp /> : <IoChevronDown />}
-          </IconButton>
-        </div>
-        <div className={style.metaRow}>
-          <div className={style.metaEntry}>
-            <div>Start</div>
-            <div>{formatTime(data.startTime)}</div>
-          </div>
-          <div className={style.metaEntry}>
-            <div>End</div>
-            <div>{formatTime(data.endTime)}</div>
-          </div>
-          <div className={style.metaEntry}>
-            <div>Duration</div>
-            <div>{formatDuration(data.duration)}</div>
-          </div>
-          <div className={style.metaEntry}>
-            <div>Events</div>
-            <div>{data.events.length}</div>
-          </div>
-        </div>
-      </div>
+    <div className={blockClasses} ref={setNodeRef} style={dragStyle}>
+      <span className={style.drag} ref={handleRef} {...dragAttributes} {...dragListeners}>
+        <IoReorderTwo />
+      </span>
+      <EditableBlockTitle title={data.title} eventId={data.id} placeholder='Block title' />
+      <button>+++</button>
+      <div>{children}</div>
    </div>
  );
 }
@@ -1,10 +0,0 @@
-@use '../blockMixins' as *;
-
-.blockEnd {
-  cursor: default;
-  height: 0.5rem;
-  background-color: var(--user-bg, $gray-1050);
-
-  border-radius: 0 0 $block-border-radius $block-border-radius;
-  margin-bottom: 0.25rem;
-}
@@ -1,42 +0,0 @@
-import { useSortable } from '@dnd-kit/sortable';
-import { CSS } from '@dnd-kit/utilities';
-
-import style from './BlockEnd.module.scss';
-
-interface BlockEndProps {
-  id: string;
-  colour?: string;
-}
-
-export default function BlockEnd(props: BlockEndProps) {
-  const { id, colour } = props;
-  const {
-    attributes: dragAttributes,
-    listeners: dragListeners,
-    setNodeRef,
-    transform,
-    transition,
-  } = useSortable({
-    id,
-    animateLayoutChanges: () => false,
-    disabled: true, // we do not want to drag end blocks
-  });
-
-  const dragStyle = {
-    transform: CSS.Transform.toString(transform),
-    transition,
-  };
-
-  return (
-    <div
-      className={style.blockEnd}
-      ref={setNodeRef}
-      {...dragAttributes}
-      {...dragListeners}
-      style={{
-        ...dragStyle,
-        ...(colour ? { '--user-bg': colour } : {}),
-      }}
-    />
-  );
-}
@@ -2,7 +2,7 @@ import { useCallback, useRef } from 'react';
 import { Input } from '@chakra-ui/react';

 import useReactiveTextInput from '../../../common/components/input/text-input/useReactiveTextInput';
-import { useEntryActions } from '../../../common/hooks/useEntryAction';
+import { useEventAction } from '../../../common/hooks/useEventAction';
 import { cx } from '../../../common/utils/styleUtils';

 import style from './TitleEditor.module.scss';
@@ -16,7 +16,7 @@ interface TitleEditorProps {

 export default function EditableBlockTitle(props: TitleEditorProps) {
  const { title, eventId, placeholder, className } = props;
-  const { updateEntry } = useEntryActions();
+  const { updateEvent } = useEventAction();
  const ref = useRef<HTMLInputElement | null>(null);
  const submitCallback = useCallback(
    (text: string) => {
@@ -25,9 +25,9 @@ export default function EditableBlockTitle(props: TitleEditorProps) {
      }

      const cleanVal = text.trim();
-      updateEntry({ id: eventId, title: cleanVal });
+      updateEvent({ id: eventId, title: cleanVal });
    },
-    [title, updateEntry, eventId],
+    [title, updateEvent, eventId],
  );

  const { value, onChange, onBlur, onKeyDown } = useReactiveTextInput(title, submitCallback, ref, {
@@ -3,7 +3,6 @@
 .delay {
  @include block-styling;

-  margin-block: 0.25rem;
  background-color: $block-bg2;
  padding-right: 0.5rem;

@@ -6,7 +6,7 @@ import { CSS } from '@dnd-kit/utilities';
 import { OntimeDelay } from 'ontime-types';

 import DelayInput from '../../../common/components/input/delay-input/DelayInput';
-import { useEntryActions } from '../../../common/hooks/useEntryAction';
+import { useEventAction } from '../../../common/hooks/useEventAction';
 import { cx } from '../../../common/utils/styleUtils';

 import style from './DelayBlock.module.scss';
@@ -18,26 +18,21 @@ interface DelayBlockProps {

 export default function DelayBlock(props: DelayBlockProps) {
  const { data, hasCursor } = props;
-  const { applyDelay, deleteEntry } = useEntryActions();
+  const { applyDelay, deleteEvent } = useEventAction();
  const handleRef = useRef<null | HTMLSpanElement>(null);

  const {
    attributes: dragAttributes,
    listeners: dragListeners,
    setNodeRef,
-    isDragging,
    transform,
    transition,
  } = useSortable({
    id: data.id,
-    data: {
-      type: 'delay',
-    },
    animateLayoutChanges: () => false,
  });

  const dragStyle = {
-    zIndex: isDragging ? 2 : 'inherit',
    transform: CSS.Translate.toString(transform),
    transition,
  };
@@ -53,7 +48,7 @@ export default function DelayBlock(props: DelayBlockProps) {
  };

  const cancelDelayHandler = () => {
-    deleteEntry([data.id]);
+    deleteEvent([data.id]);
  };

  const blockClasses = cx([style.delay, hasCursor ? style.hasCursor : null]);
@@ -5,7 +5,6 @@ $skip-opacity: 0.2;
 .eventBlock {
  @include block-styling;
  background-color: $block-bg;
-  margin-block: 0.25rem;

  display: grid;
  grid-template-areas:
@@ -2,7 +2,6 @@ import { MouseEvent, useEffect, useLayoutEffect, useRef, useState } from 'react'
 import {
  IoAdd,
  IoDuplicateOutline,
-  IoFolder,
  IoLink,
  IoPeople,
  IoPeopleOutline,
@@ -13,7 +12,7 @@ import {
 } from 'react-icons/io5';
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
-import { EndAction, EntryId, OntimeEvent, Playback, TimerType, TimeStrategy } from 'ontime-types';
+import { EndAction, MaybeString, OntimeEvent, Playback, TimerType, TimeStrategy } from 'ontime-types';

 import { useContextMenu } from '../../../common/hooks/useContextMenu';
 import { cx, getAccessibleColour } from '../../../common/utils/styleUtils';
@@ -27,13 +26,13 @@ import RundownIndicators from './RundownIndicators';
 import style from './EventBlock.module.scss';

 interface EventBlockProps {
-  eventId: EntryId;
+  eventId: string;
  cue: string;
  timeStart: number;
  timeEnd: number;
  duration: number;
  timeStrategy: TimeStrategy;
-  linkStart: boolean;
+  linkStart: MaybeString;
  countToEnd: boolean;
  eventIndex: number;
  isPublic: boolean;
@@ -46,7 +45,6 @@ interface EventBlockProps {
  isPast: boolean;
  isNext: boolean;
  skip: boolean;
-  parent: EntryId | null;
  loaded: boolean;
  hasCursor: boolean;
  playback?: Playback;
@@ -88,7 +86,6 @@ export default function EventBlock(props: EventBlockProps) {
    isPast,
    isNext,
    skip = false,
-    parent,
    loaded,
    hasCursor,
    playback,
@@ -145,7 +142,6 @@ export default function EventBlock(props: EventBlockProps) {
                value: false,
              }),
          },
-          { withDivider: true, label: 'Group', icon: IoFolder, onClick: () => actionHandler('group') },
          { withDivider: true, label: 'Delete', icon: IoTrash, onClick: () => actionHandler('delete') },
        ]
      : [
@@ -155,7 +151,7 @@ export default function EventBlock(props: EventBlockProps) {
            onClick: () =>
              actionHandler('update', {
                field: 'linkStart',
-                value: linkStart,
+                value: linkStart ? null : 'true',
              }),
          },
          {
@@ -197,10 +193,6 @@ export default function EventBlock(props: EventBlockProps) {
    transition,
  } = useSortable({
    id: eventId,
-    data: {
-      type: 'event',
-      parent,
-    },
    animateLayoutChanges: () => false,
  });

@@ -11,7 +11,7 @@ import {
  IoTime,
 } from 'react-icons/io5';
 import { Tooltip } from '@chakra-ui/react';
-import { EndAction, Playback, TimerType, TimeStrategy } from 'ontime-types';
+import { EndAction, MaybeString, Playback, TimerType, TimeStrategy } from 'ontime-types';

 import { cx } from '../../../common/utils/styleUtils';
 import { tooltipDelayMid } from '../../../ontimeConfig';
@@ -30,7 +30,7 @@ interface EventBlockInnerProps {
  timeEnd: number;
  duration: number;
  timeStrategy: TimeStrategy;
-  linkStart: boolean;
+  linkStart: MaybeString;
  countToEnd: boolean;
  eventIndex: number;
  isPublic: boolean;
@@ -2,7 +2,7 @@ import { memo, MouseEvent } from 'react';
 import { IoPause, IoPlay, IoReload, IoRemoveCircle, IoRemoveCircleOutline } from 'react-icons/io5';

 import TooltipActionBtn from '../../../../common/components/buttons/TooltipActionBtn';
-import { useEntryActions } from '../../../../common/hooks/useEntryAction';
+import { useEventAction } from '../../../../common/hooks/useEventAction';
 import { setEventPlayback } from '../../../../common/hooks/useSocket';
 import { tooltipDelayMid } from '../../../../ontimeConfig';

@@ -34,11 +34,11 @@ interface EventBlockPlaybackProps {

 const EventBlockPlayback = (props: EventBlockPlaybackProps) => {
  const { eventId, skip, isPlaying, isPaused, loaded, disablePlayback } = props;
-  const { updateEntry } = useEntryActions();
+  const { updateEvent } = useEventAction();

  const toggleSkip = (event: MouseEvent) => {
    event.stopPropagation();
-    updateEntry({ id: eventId, skip: !skip });
+    updateEvent({ id: eventId, skip: !skip });
  };

  const actionHandler = (event: MouseEvent) => {
@@ -1,21 +1,22 @@
-import { useCallback } from 'react';
-import { OntimeEvent } from 'ontime-types';
+import { CSSProperties, useCallback } from 'react';
+import { CustomFieldLabel, OntimeEvent } from 'ontime-types';

 import AppLink from '../../../common/components/link/app-link/AppLink';
-import { useEntryActions } from '../../../common/hooks/useEntryAction';
+import { useEventAction } from '../../../common/hooks/useEventAction';
 import useCustomFields from '../../../common/hooks-query/useCustomFields';
+import { getAccessibleColour } from '../../../common/utils/styleUtils';
 import * as Editor from '../../editors/editor-utils/EditorUtils';

-import EventCustom from './composite/EventEditorCustom';
+import EventEditorImage from './composite/EventEditorImage';
 import EventEditorTimes from './composite/EventEditorTimes';
 import EventEditorTitles from './composite/EventEditorTitles';
-import EventEditorTriggers from './composite/EventEditorTriggers';
+import EventTextArea from './composite/EventTextArea';
+import EventTextInput from './composite/EventTextInput';
 import EventEditorEmpty from './EventEditorEmpty';

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

-// any of the titles + custom field labels
-export type EditorUpdateFields = 'cue' | 'title' | 'note' | 'colour' | string;
+export type EditorUpdateFields = 'cue' | 'title' | 'note' | 'colour' | CustomFieldLabel;

 interface EventEditorProps {
  event: OntimeEvent;
@@ -24,7 +25,7 @@ interface EventEditorProps {
 export default function EventEditor(props: EventEditorProps) {
  const { event } = props;
  const { data: customFields } = useCustomFields();
-  const { updateEntry } = useEntryActions();
+  const { updateEvent } = useEventAction();

  const isEditor = window.location.pathname.includes('editor');

@@ -32,12 +33,12 @@ export default function EventEditor(props: EventEditorProps) {
    (field: EditorUpdateFields, value: string) => {
      if (field.startsWith('custom-')) {
        const fieldLabel = field.split('custom-')[1];
-        updateEntry({ id: event?.id, custom: { [fieldLabel]: value } });
+        updateEvent({ id: event?.id, custom: { [fieldLabel]: value } });
      } else {
-        updateEntry({ id: event?.id, [field]: value });
+        updateEvent({ id: event?.id, [field]: value });
      }
    },
-    [event?.id, updateEntry],
+    [event?.id, updateEvent],
  );

  if (!event) {
@@ -74,16 +75,52 @@ export default function EventEditor(props: EventEditorProps) {
      <div className={style.column}>
        <Editor.Title>
          Custom Fields
-          {isEditor && <AppLink search='settings=feature_settings__custom'>Manage Custom Fields</AppLink>}
+          {isEditor && <AppLink search='settings=feature_settings__custom'>Manage</AppLink>}
        </Editor.Title>
-        <EventCustom fields={customFields} handleSubmit={handleSubmit} event={event} />
-      </div>
-      <div className={style.column}>
-        <Editor.Title>
-          Automations
-          {isEditor && <AppLink search='settings=automation__automations'>Manage Automations</AppLink>}
-        </Editor.Title>
-        <EventEditorTriggers triggers={event.triggers} eventId={event.id} />
+
+        {Object.keys(customFields).map((fieldKey) => {
+          const key = `${event.id}-${fieldKey}`;
+          const fieldName = `custom-${fieldKey}`;
+          const initialValue = event.custom[fieldKey] ?? '';
+          const { backgroundColor, color } = getAccessibleColour(customFields[fieldKey].colour);
+          const labelText = customFields[fieldKey].label;
+
+          if (customFields[fieldKey].type === 'string') {
+            return (
+              <EventTextArea
+                key={key}
+                field={fieldName}
+                label={labelText}
+                initialValue={initialValue}
+                submitHandler={handleSubmit}
+                className={style.decorated}
+                style={{ '--decorator-bg': backgroundColor, '--decorator-color': color } as CSSProperties}
+              />
+            );
+          }
+
+          if (customFields[fieldKey].type === 'image') {
+            return (
+              <div key={key} className={style.customImage}>
+                <EventTextInput
+                  key={key}
+                  field={fieldName}
+                  label={labelText}
+                  initialValue={initialValue}
+                  placeholder='Paste image URL'
+                  submitHandler={handleSubmit}
+                  className={style.decorated}
+                  maxLength={255}
+                  style={{ '--decorator-bg': backgroundColor, '--decorator-color': color } as CSSProperties}
+                />
+                <EventEditorImage src={initialValue} />
+              </div>
+            );
+          }
+
+          // we should have exhausted all types by now
+          return null;
+        })}
      </div>
    </div>
  );
@@ -22,7 +22,7 @@ export default function RundownEventEditor() {
      return;
    }

-    const selectedEventId = Array.from(selectedEvents).at(0);
+    const selectedEventId = data.order.find((entryId) => selectedEvents.has(entryId));
    if (!selectedEventId) {
      setEvent(null);
      return;
@@ -1,68 +0,0 @@
-import { CSSProperties, Fragment } from 'react';
-import { CustomFields, OntimeEvent } from 'ontime-types';
-
-import { getAccessibleColour } from '../../../../common/utils/styleUtils';
-import { EditorUpdateFields } from '../EventEditor';
-
-import EventEditorImage from './EventEditorImage';
-import EventTextArea from './EventTextArea';
-import EventTextInput from './EventTextInput';
-
-import style from '../EventEditor.module.scss';
-
-interface EventEditorCustomProps {
-  fields: CustomFields;
-  event: OntimeEvent;
-  handleSubmit: (field: EditorUpdateFields, value: string) => void;
-}
-
-export default function EventEditorCustom(props: EventEditorCustomProps) {
-  const { fields: customFields, handleSubmit, event } = props;
-  return (
-    <Fragment>
-      {Object.keys(customFields).map((fieldKey) => {
-        const key = `${event.id}-${fieldKey}`;
-        const fieldName = `custom-${fieldKey}`;
-        const initialValue = event.custom[fieldKey] ?? '';
-        const { backgroundColor, color } = getAccessibleColour(customFields[fieldKey].colour);
-        const labelText = customFields[fieldKey].label;
-
-        if (customFields[fieldKey].type === 'string') {
-          return (
-            <EventTextArea
-              key={key}
-              field={fieldName}
-              label={labelText}
-              initialValue={initialValue}
-              submitHandler={handleSubmit}
-              className={style.decorated}
-              style={{ '--decorator-bg': backgroundColor, '--decorator-color': color } as CSSProperties}
-            />
-          );
-        }
-
-        if (customFields[fieldKey].type === 'image') {
-          return (
-            <div key={key} className={style.customImage}>
-              <EventTextInput
-                key={key}
-                field={fieldName}
-                label={labelText}
-                initialValue={initialValue}
-                placeholder='Paste image URL'
-                submitHandler={handleSubmit}
-                className={style.decorated}
-                maxLength={255}
-                style={{ '--decorator-bg': backgroundColor, '--decorator-color': color } as CSSProperties}
-              />
-              <EventEditorImage src={initialValue} />
-            </div>
-          );
-        }
-
-        // we should have exhausted all types by now
-        return null;
-      })}
-    </Fragment>
-  );
-}
@@ -1,11 +1,11 @@
 import { memo } from 'react';
 import { IoInformationCircle } from 'react-icons/io5';
 import { Select, Switch, Tooltip } from '@chakra-ui/react';
-import { EndAction, TimerType, TimeStrategy } from 'ontime-types';
+import { EndAction, MaybeString, TimerType, TimeStrategy } from 'ontime-types';
 import { millisToString, parseUserTime } from 'ontime-utils';

 import TimeInput from '../../../../common/components/input/time-input/TimeInput';
-import { useEntryActions } from '../../../../common/hooks/useEntryAction';
+import { useEventAction } from '../../../../common/hooks/useEventAction';
 import { millisToDelayString } from '../../../../common/utils/dateConfig';
 import * as Editor from '../../../editors/editor-utils/EditorUtils';
 import TimeInputFlow from '../../time-input-flow/TimeInputFlow';
@@ -18,7 +18,7 @@ interface EventEditorTimesProps {
  timeEnd: number;
  duration: number;
  timeStrategy: TimeStrategy;
-  linkStart: boolean;
+  linkStart: MaybeString;
  countToEnd: boolean;
  delay: number;
  isPublic: boolean;
@@ -46,27 +46,27 @@ function EventEditorTimes(props: EventEditorTimesProps) {
    timeWarning,
    timeDanger,
  } = props;
-  const { updateEntry } = useEntryActions();
+  const { updateEvent } = useEventAction();

  const handleSubmit = (field: HandledActions, value: string | boolean) => {
    if (field === 'isPublic') {
-      updateEntry({ id: eventId, isPublic: !(value as boolean) });
+      updateEvent({ id: eventId, isPublic: !(value as boolean) });
      return;
    }

    if (field === 'countToEnd') {
-      updateEntry({ id: eventId, countToEnd: !(value as boolean) });
+      updateEvent({ id: eventId, countToEnd: !(value as boolean) });
      return;
    }

    if (field === 'timeWarning' || field === 'timeDanger') {
      const newTime = parseUserTime(value as string);
-      updateEntry({ id: eventId, [field]: newTime });
+      updateEvent({ id: eventId, [field]: newTime });
      return;
    }

    if (field === 'timerType' || field === 'endAction') {
-      updateEntry({ id: eventId, [field]: value });
+      updateEvent({ id: eventId, [field]: value });
      return;
    }
  };
@@ -1,30 +0,0 @@
-.triggerForm {
-  padding-block: 0.5rem;
-  display: grid;
-  grid-template-columns: 1fr 1fr auto auto;
-  gap: 0.5rem;
-  align-items: center;
-}
-
-.trigger {
-  padding: 0.25rem 0.5rem;
-  display: grid;
-  grid-template-columns: 1fr 1fr auto;
-  align-items: center;
-
-  &:nth-child(even) {
-    background-color: $white-1;
-  }
-
-  & > span {
-    width: fit-content;
-  }
-}
-
-.errorLabel {
-  color: $red-500;
-}
-
-.success {
-  color: $green-500;
-}
@@ -1,172 +0,0 @@
-import { Fragment, useCallback, useState } from 'react';
-import { IoAlertCircle, IoCheckmarkCircle, IoTrash } from 'react-icons/io5';
-import { Button, IconButton, Select, Tooltip } from '@chakra-ui/react';
-import { TimerLifeCycle, timerLifecycleValues, Trigger } from 'ontime-types';
-import { generateId } from 'ontime-utils';
-
-import Tag from '../../../../common/components/tag/Tag';
-import { useEntryActions } from '../../../../common/hooks/useEntryAction';
-import useAutomationSettings from '../../../../common/hooks-query/useAutomationSettings';
-
-import { eventTriggerOptions } from './eventTrigger.constants';
-
-import style from './EventEditorTriggers.module.scss';
-
-interface EventEditorTriggersProps {
-  eventId: string;
-  triggers: Trigger[];
-}
-
-export default function EventEditorTriggers(props: EventEditorTriggersProps) {
-  const { triggers, eventId } = props;
-  const showTriggers = triggers.length > 0;
-
-  return (
-    <>
-      {showTriggers && <ExistingEventTriggers triggers={triggers} eventId={eventId} />}
-      <EventTriggerForm triggers={triggers} eventId={eventId} />
-    </>
-  );
-}
-
-interface EventTriggerFormProps {
-  eventId: string;
-  triggers?: Trigger[];
-}
-
-function EventTriggerForm(props: EventTriggerFormProps) {
-  const { eventId, triggers } = props;
-  const { data: automationSettings } = useAutomationSettings();
-  const { updateEntry } = useEntryActions();
-  const [automationId, setAutomationId] = useState<string | undefined>(undefined);
-  const [cycleValue, setCycleValue] = useState(TimerLifeCycle.onStart);
-
-  const handleSubmit = (triggerLifeCycle: TimerLifeCycle, automationId: string) => {
-    const newTriggers = triggers ?? new Array<Trigger>();
-    const id = generateId();
-    newTriggers.push({ id, title: '', trigger: triggerLifeCycle, automationId });
-    updateEntry({ id: eventId, triggers: newTriggers });
-  };
-
-  const getValidationError = (cycle: TimerLifeCycle, automationId?: string): string | undefined => {
-    if (automationId === undefined) {
-      return 'Select an automation';
-    }
-    if (!Object.keys(automationSettings.automations).includes(automationId)) {
-      return 'This automation does not exist';
-    }
-    if (triggers === undefined) {
-      return;
-    }
-    return Object.values(triggers).some((t) => t.automationId === automationId && t.trigger === cycle)
-      ? 'Automation can only be used once'
-      : undefined;
-  };
-
-  const validationError = getValidationError(cycleValue, automationId);
-
-  return (
-    <div className={style.triggerForm}>
-      <Select
-        size='sm'
-        variant='ontime'
-        value={cycleValue}
-        onChange={(e) => setCycleValue(e.target.value as TimerLifeCycle)}
-      >
-        <option disabled>Lifecycle Trigger</option>
-        {eventTriggerOptions.map((cycle) => (
-          <option key={cycle} value={cycle}>
-            {cycle}
-          </option>
-        ))}
-      </Select>
-      <Select
-        size='sm'
-        variant='ontime'
-        value={automationId}
-        defaultValue='«invalid»'
-        onChange={(e) => setAutomationId(e.target.value)}
-      >
-        <option disabled value='«invalid»'>
-          Automation
-        </option>
-        {Object.values(automationSettings.automations).map(({ id, title }) => (
-          <option key={id} value={id}>
-            {title}
-          </option>
-        ))}
-      </Select>
-      <Button
-        variant='ontime-subtle'
-        size='sm'
-        isDisabled={validationError !== undefined}
-        onClick={() => automationId && handleSubmit(cycleValue, automationId)}
-      >
-        Add
-      </Button>
-      {validationError !== undefined ? (
-        <Tooltip label={validationError} shouldWrapChildren>
-          <IoAlertCircle className={style.errorLabel} />
-        </Tooltip>
-      ) : (
-        <IoCheckmarkCircle className={style.success} />
-      )}
-    </div>
-  );
-}
-
-interface ExistingEventTriggersProps {
-  eventId: string;
-  triggers: Trigger[];
-}
-
-function ExistingEventTriggers(props: ExistingEventTriggersProps) {
-  const { eventId, triggers } = props;
-  const { updateEntry } = useEntryActions();
-  const { data: automationSettings } = useAutomationSettings();
-
-  const handleDelete = useCallback(
-    (triggerId: string) => {
-      const newTriggers = triggers.filter((trigger) => trigger.id !== triggerId);
-      updateEntry({ id: eventId, triggers: newTriggers });
-    },
-    [eventId, triggers, updateEntry],
-  );
-
-  const filteredTriggers: Record<string, Trigger[]> = {};
-
-  // sort triggers out into groups by the Lifecycle they are on
-  timerLifecycleValues.forEach((triggerType) => {
-    const thisTriggerType = triggers.filter((trigger) => trigger.trigger === triggerType);
-    if (thisTriggerType.length) {
-      Object.assign(filteredTriggers, { [triggerType]: thisTriggerType });
-    }
-  });
-
-  return (
-    <div>
-      {Object.entries(filteredTriggers).map(([triggerLifeCycle, triggerGroup]) => (
-        <Fragment key={triggerLifeCycle}>
-          {triggerGroup.map((trigger) => {
-            const { id, automationId } = trigger;
-            const automationTitle = automationSettings.automations[automationId]?.title ?? '<MISSING AUTOMATION>';
-            return (
-              <div key={id} className={style.trigger}>
-                <Tag>{triggerLifeCycle}</Tag>
-                <Tag>{automationTitle}</Tag>
-                <IconButton
-                  size='sm'
-                  variant='ontime-ghosted'
-                  color='#FA5656' // $red-500
-                  icon={<IoTrash />}
-                  aria-label='Delete entry'
-                  onClick={() => handleDelete(id)}
-                />
-              </div>
-            );
-          })}
-        </Fragment>
-      ))}
-    </div>
-  );
-}
@@ -1,10 +0,0 @@
-import { TimerLifeCycle } from 'ontime-types';
-
-export const eventTriggerOptions: TimerLifeCycle[] = [
-  TimerLifeCycle.onLoad,
-  TimerLifeCycle.onStart,
-  TimerLifeCycle.onPause,
-  TimerLifeCycle.onFinish,
-  TimerLifeCycle.onWarning,
-  TimerLifeCycle.onDanger,
-];
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Carlos Valente	ffde3739d1	refactor: remove unnecessary abstractions	2025-03-29 21:23:47 +01:00
Carlos Valente	9db8d996e9	refactor: simplify logic	2025-03-28 22:04:57 +01:00
Carlos Valente	59c7360ea2	refactor: clearer relationship on rundown elements	2025-03-28 19:55:20 +01:00
Carlos Valente	f8bf867576	refactor: use strict typing	2025-03-28 19:55:20 +01:00
Carlos Valente	dda165bfd7	refactor: remove stop as a possible end action	2025-03-28 19:55:20 +01:00
Carlos Valente	dbf8eeb7fb	refactor: restructure model to contain an object of rundowns	2025-03-28 19:55:20 +01:00
Carlos Valente	433e9f6a4f	chore: remove IDE files	2025-03-28 19:54:25 +01:00
Carlos Valente	7958d49153	refactor: remove unused and legacy code - remove legacy migrations - remove unused server code - remove unused UI code	2025-03-28 19:54:25 +01:00
				`@@ -1 +0,0 @@`
				`export type Size = 'xs' \| 'sm' \| 'md' \| 'lg';`