From bf8ed8d017b63426665111562123b1db4a6b9da8 Mon Sep 17 00:00:00 2001
From: Carlos Valente <carlosvalente@pm.me>
Date: Tue, 24 Jun 2025 07:20:53 +0200
Subject: [PATCH] feat: implement multiple aux timers

---
 .../editor-utils/EditorUtils.module.scss      |  12 +-
 .../components/editor-utils/EditorUtils.tsx   |   8 +-
 .../common/components/input/input/Input.tsx   |  20 ++-
 .../input/time-input/TimeInput.module.scss    |   7 +-
 .../components/input/time-input/TimeInput.tsx |  22 +--
 .../components/select/Select.module.scss      | 128 +++++++++++++++
 .../src/common/components/select/Select.tsx   |  53 +++++++
 apps/client/src/common/hooks/useSocket.ts     |  51 ++++--
 .../automations-panel/OntimeActionForm.tsx    |  18 ++-
 .../message/MessageControl.module.scss        |   7 +-
 .../control/message/MessageControl.tsx        |  35 ++--
 .../features/control/message/TimerPreview.tsx |  23 +--
 .../control/message/TimerViewControl.tsx      |  94 +++++++----
 .../playback/PlaybackControl.module.scss      |   5 +
 .../control/playback/PlaybackControl.tsx      |   6 +-
 .../playback/aux-timer/AuxTimer.module.scss   |  16 +-
 .../control/playback/aux-timer/AuxTimer.tsx   |  99 +++++++-----
 apps/client/src/views/studio/Studio.tsx       |  13 +-
 apps/client/src/views/studio/StudioTimers.tsx |  48 +++---
 apps/client/src/views/timer/Timer.tsx         |  31 ++--
 apps/client/src/views/timer/timer.utils.ts    |   6 +-
 .../__tests__/automation.validation.test.ts   |   4 +-
 .../automation/automation.validation.ts       |  12 +-
 .../automation/clients/ontime.client.ts       |  38 +++--
 .../api-integration/integration.controller.ts |  69 ++++----
 apps/server/src/app.ts                        |  12 ++
 .../aux-timer-service/AuxTimerService.ts      | 150 +++++++++++++-----
 .../services/message-service/message.utils.ts |   2 +-
 e2e/tests/features/208-auxtimer.spec.ts       |  27 ++--
 .../src/definitions/core/Automation.type.ts   |  13 +-
 .../runtime/MessageControl.type.ts            |   2 +-
 .../src/definitions/runtime/RuntimeStore.ts   |  12 ++
 .../definitions/runtime/RuntimeStore.type.ts  |   2 +
 33 files changed, 748 insertions(+), 297 deletions(-)
 create mode 100644 apps/client/src/common/components/select/Select.module.scss
 create mode 100644 apps/client/src/common/components/select/Select.tsx

diff --git a/apps/client/src/common/components/editor-utils/EditorUtils.module.scss b/apps/client/src/common/components/editor-utils/EditorUtils.module.scss
index 8438b2065..0a68e8dd1 100644
--- a/apps/client/src/common/components/editor-utils/EditorUtils.module.scss
+++ b/apps/client/src/common/components/editor-utils/EditorUtils.module.scss
@@ -42,7 +42,15 @@
 }
 
 .separator {
-  width: 1px;
-  height: 0.75em;
   background-color: $border-color-ondark;
+
+  &.horizontal {
+    width: 100%;
+    height: 1px;
+  }
+
+  &.vertical {
+    width: 1px;
+    height: 0.75em;  
+  }
 }
diff --git a/apps/client/src/common/components/editor-utils/EditorUtils.tsx b/apps/client/src/common/components/editor-utils/EditorUtils.tsx
index 6370ac32a..09c686fea 100644
--- a/apps/client/src/common/components/editor-utils/EditorUtils.tsx
+++ b/apps/client/src/common/components/editor-utils/EditorUtils.tsx
@@ -28,6 +28,10 @@ export function Label({ children, className, ...elementProps }: LabelHTMLAttribu
   );
 }
 
-export function Separator({ className, ...elementProps }: HTMLAttributes<HTMLDivElement>) {
-  return <div className={cx([style.separator, className])} {...elementProps} />;
+interface SeparatorProps extends HTMLAttributes<HTMLDivElement> {
+  orientation?: 'horizontal' | 'vertical';
+}
+
+export function Separator({ className, orientation = 'vertical', ...elementProps }: SeparatorProps) {
+  return <div className={cx([style.separator, style[orientation], className])} {...elementProps} />;
 }
diff --git a/apps/client/src/common/components/input/input/Input.tsx b/apps/client/src/common/components/input/input/Input.tsx
index 4cf4224dd..c3f9e1524 100644
--- a/apps/client/src/common/components/input/input/Input.tsx
+++ b/apps/client/src/common/components/input/input/Input.tsx
@@ -1,4 +1,4 @@
-import { InputHTMLAttributes } from 'react';
+import { forwardRef, InputHTMLAttributes } from 'react';
 
 import { cx } from '../../../utils/styleUtils';
 
@@ -9,6 +9,18 @@ interface InputProps extends InputHTMLAttributes<HTMLInputElement> {
   height?: 'medium' | 'large';
 }
 
-export default function Input({ className, variant = 'subtle', height = 'medium', ...inputProps }: InputProps) {
-  return <input type='text' className={cx([style.input, style[variant], style[height], className])} {...inputProps} />;
-}
+const Input = forwardRef<HTMLInputElement, InputProps>(function Input(
+  { className, variant = 'subtle', height = 'medium', ...inputProps },
+  ref,
+) {
+  return (
+    <input
+      ref={ref}
+      type='text'
+      className={cx([style.input, style[variant], style[height], className])}
+      {...inputProps}
+    />
+  );
+});
+
+export default Input;
diff --git a/apps/client/src/common/components/input/time-input/TimeInput.module.scss b/apps/client/src/common/components/input/time-input/TimeInput.module.scss
index 1a30b2cd6..2d4cae896 100644
--- a/apps/client/src/common/components/input/time-input/TimeInput.module.scss
+++ b/apps/client/src/common/components/input/time-input/TimeInput.module.scss
@@ -1,4 +1,7 @@
 .timeInput {
-    letter-spacing: 1px;
-    width: 6.5em;
+  width: 100%;
+  max-width: 7.5em;
+  letter-spacing: 1px;
+  font-size: 1rem;
+  font-variant-numeric: tabular-nums;
 }
diff --git a/apps/client/src/common/components/input/time-input/TimeInput.tsx b/apps/client/src/common/components/input/time-input/TimeInput.tsx
index 034550edd..1dcd16d5b 100644
--- a/apps/client/src/common/components/input/time-input/TimeInput.tsx
+++ b/apps/client/src/common/components/input/time-input/TimeInput.tsx
@@ -1,15 +1,18 @@
 import { FocusEvent, KeyboardEvent, useCallback, useEffect, useRef, useState } from 'react';
-import { Input } from '@chakra-ui/react';
 import { millisToString, parseUserTime } from 'ontime-utils';
 
 import { useEmitLog } from '../../../stores/logger';
+import { cx } from '../../../utils/styleUtils';
+import Input from '../input/Input';
+
+import style from './TimeInput.module.scss';
 
 interface TimeInputProps<T extends string> {
   id?: T;
   name: T;
   submitHandler: (field: T, value: string) => void;
   time?: number;
-  placeholder: string;
+  placeholder?: string;
   disabled?: boolean;
   align?: 'left' | 'center';
   className?: string;
@@ -27,6 +30,9 @@ export default function TimeInput<T extends string>(props: TimeInputProps<T>) {
    */
   const resetValue = useCallback(() => {
     try {
+      if (typeof time !== 'number' || isNaN(time)) {
+        throw new Error(`Invalid time value: ${time}`);
+      }
       setValue(millisToString(time));
     } catch (error) {
       setValue(millisToString(0));
@@ -121,24 +127,20 @@ export default function TimeInput<T extends string>(props: TimeInputProps<T>) {
     <Input
       id={id}
       disabled={disabled}
-      size='sm'
       ref={inputRef}
       data-testid={`time-input-${name}`}
-      className={className}
-      fontSize='1rem'
-      type='text'
+      className={cx([style.timeInput, className])}
       placeholder={placeholder}
-      variant='ontime-filled'
       onFocus={handleFocus}
       onChange={(event) => setValue(event.target.value)}
       onBlur={onBlurHandler}
       onKeyDown={onKeyDownHandler}
       value={value}
       maxLength={8}
-      maxWidth='7.5em'
-      letterSpacing='1px'
       autoComplete='off'
-      textAlign={align}
+      style={{
+        textAlign: align,
+      }}
     />
   );
 }
diff --git a/apps/client/src/common/components/select/Select.module.scss b/apps/client/src/common/components/select/Select.module.scss
new file mode 100644
index 000000000..597191ba8
--- /dev/null
+++ b/apps/client/src/common/components/select/Select.module.scss
@@ -0,0 +1,128 @@
+.select {
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 0.5rem;
+  height: 2rem;
+
+  background-color: $gray-1200;
+  font-size: 1rem;
+  font-weight: 400;
+  color: $gray-200;
+  border-radius: $component-border-radius-md;
+  border: 1px solid transparent;
+
+  padding-inline: 0.5rem;
+  font-size: calc(1rem - 2px);
+  white-space: nowrap;
+
+  &:hover:not(:disabled) {
+    background-color: $gray-1100;
+  }
+
+  &:active {
+    background-color: $gray-1000;
+  }
+
+  &[data-popup-open] {
+    background-color: $gray-1000;
+  }
+
+  &:disabled {
+    opacity: 0.4;
+    cursor: not-allowed;
+  }
+}
+
+.selectIcon {
+  color: $gray-200;
+}
+
+.popup {
+  font-size: calc(1rem - 2px);
+  background-color: $gray-1200;
+  box-sizing: border-box;
+  padding: 2px;
+  border-radius: $component-border-radius-md;
+  color: $ui-white;
+  overflow-y: auto;
+  max-height: 20rem;
+  border: 1px solid $gray-1000;
+
+  &[data-side='start'] {
+    transition: 50%;
+    transform: 100%;
+    opacity: 1;
+  }
+}
+
+.item {
+  box-sizing: border-box;
+  outline: 0;
+  line-height: 1rem;
+  padding: 0.25rem 0.5rem;
+
+  min-width: var(--anchor-width);
+  display: grid;
+  gap: 0.25rem;
+  align-items: center;
+  grid-template-columns: 0.75rem 1fr;
+  scroll-margin-block: 1rem;
+
+  &[data-highlighted] {
+    z-index: 0;
+    position: relative;
+    background-color: $blue-700;
+  }
+}
+
+.itemIndicator {
+  grid-column-start: 1;
+}
+
+.itemIndicatorIcon {
+  display: block;
+  width: 0.75rem;
+  height: 0.75rem;
+}
+
+.itemLabel {
+  grid-column-start: 2;
+}
+
+.scrollArrow {
+  width: 100%;
+  background: canvas;
+  z-index: 1;
+  text-align: center;
+  cursor: default;
+  border-radius: 0.375rem;
+  height: 1rem;
+  font-size: 0.75rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  &::before {
+    content: '';
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    left: 0;
+  }
+
+  &[data-direction='up'] {
+    &::before {
+      top: -100%;
+    }
+  }
+
+  &[data-direction='down'] {
+    bottom: 0;
+
+    &::before {
+      bottom: -100%;
+    }
+  }
+}
diff --git a/apps/client/src/common/components/select/Select.tsx b/apps/client/src/common/components/select/Select.tsx
new file mode 100644
index 000000000..b9baa8290
--- /dev/null
+++ b/apps/client/src/common/components/select/Select.tsx
@@ -0,0 +1,53 @@
+import { IoCheckmark } from 'react-icons/io5';
+import { LuChevronsUpDown } from 'react-icons/lu';
+import { Select as BaseSelect } from '@base-ui-components/react/select';
+
+import styles from './Select.module.scss';
+
+interface SelectProps<T extends string | null = string> {
+  defaultValue?: T;
+  options: {
+    value: NonNullable<T>;
+    label: string;
+  }[];
+  placeholder?: string;
+  value?: T;
+  onChange?: (value: NonNullable<T>) => void;
+}
+
+export default function Select<T extends string | null = string>({
+  defaultValue,
+  options,
+  placeholder,
+  value,
+  onChange,
+}: SelectProps<T>) {
+  return (
+    <BaseSelect.Root defaultValue={defaultValue} onValueChange={onChange} value={value}>
+      <BaseSelect.Trigger className={styles.select}>
+        <BaseSelect.Value placeholder={placeholder} />
+        <BaseSelect.Icon className={styles.selectIcon}>
+          <LuChevronsUpDown />
+        </BaseSelect.Icon>
+      </BaseSelect.Trigger>
+      <BaseSelect.Portal>
+        <BaseSelect.Positioner side='bottom' align='start'>
+          <BaseSelect.ScrollUpArrow className={styles.scrollArrow} />
+          <BaseSelect.Popup className={styles.popup}>
+            {options.map((option) => {
+              return (
+                <BaseSelect.Item key={option.value} className={styles.item} value={option.value}>
+                  <BaseSelect.ItemIndicator className={styles.itemIndicator}>
+                    <IoCheckmark className={styles.itemIndicatorIcon} />
+                  </BaseSelect.ItemIndicator>
+                  <BaseSelect.ItemText className={styles.itemLabel}>{option.label}</BaseSelect.ItemText>
+                </BaseSelect.Item>
+              );
+            })}
+          </BaseSelect.Popup>
+          <BaseSelect.ScrollDownArrow className={styles.scrollArrow} />
+        </BaseSelect.Positioner>
+      </BaseSelect.Portal>
+    </BaseSelect.Root>
+  );
+}
diff --git a/apps/client/src/common/hooks/useSocket.ts b/apps/client/src/common/hooks/useSocket.ts
index a045c1353..b15390e11 100644
--- a/apps/client/src/common/hooks/useSocket.ts
+++ b/apps/client/src/common/hooks/useSocket.ts
@@ -40,8 +40,7 @@ export const useMessagePreview = createSelector((state: RuntimeStore) => ({
   blink: state.message.timer.blink,
   blackout: state.message.timer.blackout,
   phase: state.timer.phase,
-  showAuxTimer: state.message.timer.secondarySource === 'aux',
-  showSecondaryMessage: state.message.timer.secondarySource === 'secondary' && Boolean(state.message.secondary),
+  secondarySource: state.message.timer.secondarySource,
   showTimerMessage: state.message.timer.visible && Boolean(state.message.timer.text),
   timerType: state.eventNow?.timerType ?? null,
   countToEnd: state.eventNow?.countToEnd ?? false,
@@ -53,7 +52,7 @@ export const setMessage = {
   secondaryMessage: (payload: string) => sendSocket('message', { secondary: payload }),
   timerBlink: (payload: boolean) => sendSocket('message', { timer: { blink: payload } }),
   timerBlackout: (payload: boolean) => sendSocket('message', { timer: { blackout: payload } }),
-  timerSecondary: (payload: TimerMessage['secondarySource']) =>
+  timerSecondarySource: (payload: TimerMessage['secondarySource']) =>
     sendSocket('message', { timer: { secondarySource: payload } }),
 };
 
@@ -86,19 +85,45 @@ export const setPlayback = {
   },
 };
 
-export const useAuxTimerTime = createSelector((state: RuntimeStore) => state.auxtimer1.current);
+export const useAuxTimersTime = createSelector((state: RuntimeStore) => {
+  return {
+    aux1: state.auxtimer1.current,
+    aux2: state.auxtimer2.current,
+    aux3: state.auxtimer3.current,
+  };
+});
 
-export const useAuxTimerControl = createSelector((state: RuntimeStore) => ({
-  playback: state.auxtimer1.playback,
-  direction: state.auxtimer1.direction,
-}));
+export const useAuxTimerTime = (index: number) =>
+  createSelector((state: RuntimeStore) => {
+    if (index === 1) return state.auxtimer1.current;
+    if (index === 2) return state.auxtimer2.current;
+    return state.auxtimer3.current;
+  })();
+
+export const useAuxTimerControl = (index: number) =>
+  createSelector((state: RuntimeStore) => {
+    if (index === 1)
+      return {
+        playback: state.auxtimer1.playback,
+        direction: state.auxtimer1.direction,
+      };
+    if (index === 2)
+      return {
+        playback: state.auxtimer2.playback,
+        direction: state.auxtimer2.direction,
+      };
+    return {
+      playback: state.auxtimer3.playback,
+      direction: state.auxtimer3.direction,
+    };
+  })();
 
 export const setAuxTimer = {
-  start: () => sendSocket('auxtimer', { '1': SimplePlayback.Start }),
-  pause: () => sendSocket('auxtimer', { '1': SimplePlayback.Pause }),
-  stop: () => sendSocket('auxtimer', { '1': SimplePlayback.Stop }),
-  setDirection: (direction: SimpleDirection) => sendSocket('auxtimer', { '1': { direction } }),
-  setDuration: (time: number) => sendSocket('auxtimer', { '1': { duration: time } }),
+  start: (index: number) => sendSocket('auxtimer', { [index]: SimplePlayback.Start }),
+  pause: (index: number) => sendSocket('auxtimer', { [index]: SimplePlayback.Pause }),
+  stop: (index: number) => sendSocket('auxtimer', { [index]: SimplePlayback.Stop }),
+  setDirection: (index: number, direction: SimpleDirection) => sendSocket('auxtimer', { [index]: { direction } }),
+  setDuration: (index: number, time: number) => sendSocket('auxtimer', { [index]: { duration: time } }),
 };
 
 export const useSelectedEventId = createSelector((state: RuntimeStore) => ({
diff --git a/apps/client/src/features/app-settings/panel/automations-panel/OntimeActionForm.tsx b/apps/client/src/features/app-settings/panel/automations-panel/OntimeActionForm.tsx
index 177760e65..21b10403f 100644
--- a/apps/client/src/features/app-settings/panel/automations-panel/OntimeActionForm.tsx
+++ b/apps/client/src/features/app-settings/panel/automations-panel/OntimeActionForm.tsx
@@ -42,17 +42,25 @@ export default function OntimeActionForm(props: PropsWithChildren<OntimeActionFo
           value={selectedAction}
           onChange={(event) => updateSelectedAction(event.target.value)}
         >
-          <option value='aux-start'>Auxiliary timer: start</option>
-          <option value='aux-pause'>Auxiliary timer: pause</option>
-          <option value='aux-stop'>Auxiliary timer: stop</option>
-          <option value='aux-set'>Auxiliary timer: set</option>
+          <option value='aux-start'>Aux 1: start</option>
+          <option value='aux-pause'>Aux 1: pause</option>
+          <option value='aux-stop'>Aux 1: stop</option>
+          <option value='aux-set'>Aux 2: set</option>
+          <option value='aux-start'>Aux 2: start</option>
+          <option value='aux-pause'>Aux 2: pause</option>
+          <option value='aux-stop'>Aux 2: stop</option>
+          <option value='aux-set'>Aux 2: set</option>
+          <option value='aux-start'>Aux 3: start</option>
+          <option value='aux-pause'>Aux 3: pause</option>
+          <option value='aux-stop'>Aux 3: stop</option>
+          <option value='aux-set'>Aux 3: set</option>
           <option value='message-set'>Timer: timer message</option>
           <option value='message-secondary'>Timer: timer secondary</option>
         </Select>
         <Panel.Error>{rowErrors?.action?.message}</Panel.Error>
       </label>
 
-      {selectedAction === 'aux-set' && (
+      {selectedAction === 'aux1-set' && (
         <label>
           New time
           <Input
diff --git a/apps/client/src/features/control/message/MessageControl.module.scss b/apps/client/src/features/control/message/MessageControl.module.scss
index 3faf87717..8efa3b875 100644
--- a/apps/client/src/features/control/message/MessageControl.module.scss
+++ b/apps/client/src/features/control/message/MessageControl.module.scss
@@ -10,7 +10,7 @@
 .previewContainer {
   display: grid;
   gap: $element-spacing;
-  grid-template-columns: 2fr 1fr;
+  grid-template-columns: 3fr 2fr;
 }
 
 .preview {
@@ -39,6 +39,7 @@
 .mainContent {
   font-size: 1rem;
   font-weight: 600;
+  width: 100%;
   color: var(--override-colour, $ui-white);
 
   &[data-phase='pending'] {
@@ -72,7 +73,3 @@
     color: $active-indicator;
   }
 }
-
-.divider {
-  border-top: 1px solid $gray-1000;
-}
diff --git a/apps/client/src/features/control/message/MessageControl.tsx b/apps/client/src/features/control/message/MessageControl.tsx
index af57f05c2..b53311910 100644
--- a/apps/client/src/features/control/message/MessageControl.tsx
+++ b/apps/client/src/features/control/message/MessageControl.tsx
@@ -1,12 +1,11 @@
 import { IoEye, IoEyeOffOutline } from 'react-icons/io5';
 
-import TooltipActionBtn from '../../../common/components/buttons/TooltipActionBtn';
+import IconButton from '../../../common/components/buttons/IconButton';
 import {
   setMessage,
   useExternalMessageInput as useSecondaryMessageInput,
   useTimerMessageInput,
 } from '../../../common/hooks/useSocket';
-import { tooltipDelayMid } from '../../../ontimeConfig';
 
 import InputRow from './InputRow';
 import TimerControlsPreview from './TimerViewControl';
@@ -32,15 +31,13 @@ function TimerMessageInput() {
       visible={visible}
       changeHandler={(newValue) => setMessage.timerText(newValue)}
     >
-      <TooltipActionBtn
-        clickHandler={() => setMessage.timerVisible(!visible)}
-        tooltip={visible ? 'Make invisible' : 'Make visible'}
+      <IconButton
         aria-label='Toggle timer message visibility'
-        openDelay={tooltipDelayMid}
-        icon={visible ? <IoEye size='18px' /> : <IoEyeOffOutline size='18px' />}
-        variant={visible ? 'ontime-filled' : 'ontime-subtle'}
-        size='sm'
-      />
+        onClick={() => setMessage.timerVisible(!visible)}
+        variant={visible ? 'primary' : 'subtle'}
+      >
+        {visible ? <IoEye /> : <IoEyeOffOutline />}
+      </IconButton>
     </InputRow>
   );
 }
@@ -50,9 +47,9 @@ function SecondaryInput() {
 
   const toggleSecondary = () => {
     if (visible) {
-      setMessage.timerSecondary(null);
+      setMessage.timerSecondarySource(null);
     } else {
-      setMessage.timerSecondary('secondary');
+      setMessage.timerSecondarySource('secondary');
     }
   };
 
@@ -64,15 +61,13 @@ function SecondaryInput() {
       visible={visible}
       changeHandler={(newValue) => setMessage.secondaryMessage(newValue)}
     >
-      <TooltipActionBtn
-        clickHandler={toggleSecondary}
-        tooltip={visible ? 'Make invisible' : 'Make visible'}
+      <IconButton
         aria-label='Toggle secondary message visibility'
-        openDelay={tooltipDelayMid}
-        icon={visible ? <IoEye size='18px' /> : <IoEyeOffOutline size='18px' />}
-        variant={visible ? 'ontime-filled' : 'ontime-subtle'}
-        size='sm'
-      />
+        onClick={toggleSecondary}
+        variant={visible ? 'primary' : 'subtle'}
+      >
+        {visible ? <IoEye /> : <IoEyeOffOutline />}
+      </IconButton>
     </InputRow>
   );
 }
diff --git a/apps/client/src/features/control/message/TimerPreview.tsx b/apps/client/src/features/control/message/TimerPreview.tsx
index 27e6a5cb1..700e0a633 100644
--- a/apps/client/src/features/control/message/TimerPreview.tsx
+++ b/apps/client/src/features/control/message/TimerPreview.tsx
@@ -11,12 +11,16 @@ import { tooltipDelayMid } from '../../../ontimeConfig';
 
 import style from './MessageControl.module.scss';
 
-export default function TimerPreview() {
-  const { blink, blackout, countToEnd, phase, showAuxTimer, showSecondaryMessage, showTimerMessage, timerType } =
-    useMessagePreview();
-  const { data } = useViewSettings();
+const secondarySourceLabels: Record<string, string> = {
+  aux1: 'Aux 1',
+  aux2: 'Aux 2',
+  aux3: 'Aux 3',
+  secondary: 'Secondary message',
+};
 
-  const contentClasses = cx([style.previewContent, blink && style.blink, blackout && style.blackout]);
+export default function TimerPreview() {
+  const { blink, blackout, countToEnd, phase, secondarySource, showTimerMessage, timerType } = useMessagePreview();
+  const { data } = useViewSettings();
 
   const main = (() => {
     if (showTimerMessage) return 'Message';
@@ -29,13 +33,11 @@ export default function TimerPreview() {
   })();
 
   const secondary = (() => {
-    // message is a fullscreen overlay
-    if (showTimerMessage) return null;
+    // message is a fullscreen overlay or secondary is not active
+    if (showTimerMessage || !secondarySource) return null;
 
     // we need to check aux first since it takes priority
-    if (showAuxTimer) return 'Aux Timer';
-    if (showSecondaryMessage) return 'Secondary message';
-    return null;
+    return secondarySourceLabels[secondarySource];
   })();
 
   const overrideColour = (() => {
@@ -46,6 +48,7 @@ export default function TimerPreview() {
   })();
 
   const showColourOverride = main == 'Timer';
+  const contentClasses = cx([blink && style.blink, blackout && style.blackout]);
 
   return (
     <div className={style.preview}>
diff --git a/apps/client/src/features/control/message/TimerViewControl.tsx b/apps/client/src/features/control/message/TimerViewControl.tsx
index f8197378f..0682d0620 100644
--- a/apps/client/src/features/control/message/TimerViewControl.tsx
+++ b/apps/client/src/features/control/message/TimerViewControl.tsx
@@ -1,6 +1,9 @@
-import { Button } from '@chakra-ui/react';
+import { useEffect, useState } from 'react';
 import { SecondarySource } from 'ontime-types';
 
+import Button from '../../../common/components/buttons/Button';
+import * as Editor from '../../../common/components/editor-utils/EditorUtils';
+import Select from '../../../common/components/select/Select';
 import { setMessage, useTimerViewControl } from '../../../common/hooks/useSocket';
 
 import TimerPreview from './TimerPreview';
@@ -8,50 +11,27 @@ import TimerPreview from './TimerPreview';
 import style from './MessageControl.module.scss';
 
 export default function TimerControlsPreview() {
-  const { blackout, blink, secondarySource } = useTimerViewControl();
-
-  const toggleSecondary = (newValue: SecondarySource) => {
-    if (secondarySource === newValue) {
-      setMessage.timerSecondary(null);
-    } else {
-      setMessage.timerSecondary(newValue);
-    }
-  };
+  const { blackout, blink } = useTimerViewControl();
 
   return (
     <div className={style.previewContainer}>
       <TimerPreview />
-
       <div className={style.options}>
-        <Button
-          size='sm'
-          variant={secondarySource === 'aux' ? 'ontime-filled' : 'ontime-subtle'}
-          onClick={() => toggleSecondary('aux')}
-        >
-          Show Aux timer
-        </Button>
-        <Button
-          size='sm'
-          variant={secondarySource === 'secondary' ? 'ontime-filled' : 'ontime-subtle'}
-          onClick={() => toggleSecondary('secondary')}
-        >
-          Show secondary
-        </Button>
+        <SecondarySourceControl />
 
-        <hr className={style.divider} />
+        <Editor.Separator orientation='horizontal' />
 
         <Button
-          size='sm'
-          variant={blink ? 'ontime-filled' : 'ontime-subtle'}
+          variant={blink ? 'primary' : 'subtle'}
+          fluid
           onClick={() => setMessage.timerBlink(!blink)}
           data-testid='toggle timer blink'
         >
           Blink
         </Button>
         <Button
-          size='sm'
-          className={style.blackoutButton}
-          variant={blackout ? 'ontime-filled' : 'ontime-subtle'}
+          variant={blackout ? 'primary' : 'subtle'}
+          fluid
           onClick={() => setMessage.timerBlackout(!blackout)}
           data-testid='toggle timer blackout'
         >
@@ -61,3 +41,55 @@ export default function TimerControlsPreview() {
     </div>
   );
 }
+
+function SecondarySourceControl() {
+  const { secondarySource } = useTimerViewControl();
+  const [value, setValue] = useState<SecondarySource>('aux1');
+
+  // sync secondary source with external changes
+  useEffect(() => {
+    if (secondarySource !== null) {
+      setValue(secondarySource);
+    }
+  }, [secondarySource]);
+
+  const toggleSecondary = () => {
+    if (secondarySource === value) {
+      setMessage.timerSecondarySource(null);
+    } else {
+      setMessage.timerSecondarySource(value);
+    }
+  };
+
+  const changeValue = (newValue: SecondarySource) => {
+    // we can only update the remote if it is enabled
+    if (secondarySource !== null) {
+      setMessage.timerSecondarySource(newValue);
+    }
+    setValue(newValue);
+  };
+
+  return (
+    <>
+      <Select
+        value={value}
+        placeholder='Secondary source'
+        options={[
+          { value: 'aux1', label: 'Aux 1' },
+          { value: 'aux2', label: 'Aux 2' },
+          { value: 'aux3', label: 'Aux 3' },
+          { value: 'secondary', label: 'Secondary message' },
+        ]}
+        onChange={changeValue}
+      />
+      <Button
+        variant={secondarySource !== null ? 'primary' : 'subtle'}
+        fluid
+        onClick={toggleSecondary}
+        data-testid='toggle secondary'
+      >
+        Show secondary
+      </Button>
+    </>
+  );
+}
diff --git a/apps/client/src/features/control/playback/PlaybackControl.module.scss b/apps/client/src/features/control/playback/PlaybackControl.module.scss
index b386e8914..246d85fe8 100644
--- a/apps/client/src/features/control/playback/PlaybackControl.module.scss
+++ b/apps/client/src/features/control/playback/PlaybackControl.module.scss
@@ -2,3 +2,8 @@
   width: 100%;
   margin: 0 auto;
 }
+
+.auxTimers {
+  display: flex;
+  gap: 0.5rem;
+}
diff --git a/apps/client/src/features/control/playback/PlaybackControl.tsx b/apps/client/src/features/control/playback/PlaybackControl.tsx
index 4c7210b07..560a9c013 100644
--- a/apps/client/src/features/control/playback/PlaybackControl.tsx
+++ b/apps/client/src/features/control/playback/PlaybackControl.tsx
@@ -23,7 +23,11 @@ export default function PlaybackControl() {
         selectedEventIndex={data.selectedEventIndex}
         timerPhase={data.timerPhase}
       />
-      <AuxTimer />
+      <div className={style.auxTimers}>
+        <AuxTimer index={1} />
+        <AuxTimer index={2} />
+        <AuxTimer index={3} />
+      </div>
     </div>
   );
 }
diff --git a/apps/client/src/features/control/playback/aux-timer/AuxTimer.module.scss b/apps/client/src/features/control/playback/aux-timer/AuxTimer.module.scss
index d72e218d4..889a46078 100644
--- a/apps/client/src/features/control/playback/aux-timer/AuxTimer.module.scss
+++ b/apps/client/src/features/control/playback/aux-timer/AuxTimer.module.scss
@@ -7,6 +7,18 @@
 
 .controls {
   margin-top: 0.25rem;
-  display: flex;
-  gap: 0.5rem;
+}
+
+.input {
+  display: grid;
+  grid-template-columns: 1fr auto;
+  gap: 0.25rem;
+}
+
+.twoSides {
+  margin-top: 0.25rem;
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 0.25rem;
+  height: 1.5rem;
 }
diff --git a/apps/client/src/features/control/playback/aux-timer/AuxTimer.tsx b/apps/client/src/features/control/playback/aux-timer/AuxTimer.tsx
index 0012df419..f483ac04a 100644
--- a/apps/client/src/features/control/playback/aux-timer/AuxTimer.tsx
+++ b/apps/client/src/features/control/playback/aux-timer/AuxTimer.tsx
@@ -8,71 +8,82 @@ import TapButton from '../tap-button/TapButton';
 
 import style from './AuxTimer.module.scss';
 
-export function AuxTimer() {
-  const { playback, direction } = useAuxTimerControl();
+interface AuxTimerProps {
+  index: number;
+}
 
-  const { start, pause, stop, setDirection } = setAuxTimer;
+export function AuxTimer({ index }: AuxTimerProps) {
+  const { playback, direction } = useAuxTimerControl(index);
+
+  const { stop, setDirection } = setAuxTimer;
 
   const toggleDirection = () => {
     const newDirection = direction === SimpleDirection.CountDown ? SimpleDirection.CountUp : SimpleDirection.CountDown;
-    setDirection(newDirection);
+    setDirection(index, newDirection);
   };
 
-  const userCan = {
-    start: playback !== SimplePlayback.Start,
-    pause: playback === SimplePlayback.Start,
-    stop: playback !== SimplePlayback.Stop,
-  };
+  const canStop = playback !== SimplePlayback.Stop;
+  const playbackAction = playback === SimplePlayback.Start ? 'pause' : 'play';
 
   return (
     <label className={style.label}>
-      Auxiliary Timer
+      Aux Timer {index}
       <div className={style.controls}>
-        <AuxTimerInput />
-        <TapButton onClick={toggleDirection} aspect='tight'>
-          {direction === SimpleDirection.CountDown && <IoArrowDown data-testid='aux-timer-direction' />}
-          {direction === SimpleDirection.CountUp && <IoArrowUp data-testid='aux-timer-direction' />}
-        </TapButton>
-
-        <TapButton
-          onClick={start}
-          theme={Playback.Play}
-          active={playback === SimplePlayback.Start}
-          disabled={!userCan.start}
-        >
-          <IoPlay data-testid='aux-timer-start' />
-        </TapButton>
-        <TapButton
-          onClick={pause}
-          theme={Playback.Pause}
-          active={playback === SimplePlayback.Pause}
-          disabled={!userCan.pause}
-        >
-          <IoPause data-testid='aux-timer-pause' />
-        </TapButton>
-        <TapButton onClick={stop} theme={Playback.Stop} disabled={!userCan.stop}>
-          <IoStop data-testid='aux-timer-stop' />
-        </TapButton>
+        <div className={style.input}>
+          <AuxTimerInput index={index} />
+          <TapButton onClick={toggleDirection} aspect='tight'>
+            {direction === SimpleDirection.CountDown && <IoArrowDown data-testid={`aux-timer-direction-${index}`} />}
+            {direction === SimpleDirection.CountUp && <IoArrowUp data-testid={`aux-timer-direction-${index}`} />}
+          </TapButton>
+        </div>
+        <div className={style.twoSides}>
+          <AuxTogglePlay index={index} action={playbackAction} />
+          <TapButton onClick={() => stop(index)} theme={Playback.Stop} disabled={!canStop}>
+            <IoStop data-testid={`aux-timer-stop-${index}`} />
+          </TapButton>
+        </div>
       </div>
     </label>
   );
 }
 
-function AuxTimerInput() {
-  const newTimeInMs = useAuxTimerTime();
+interface AuxTimerInput {
+  index: number;
+}
+
+function AuxTimerInput({ index }: AuxTimerProps) {
+  const newTimeInMs = useAuxTimerTime(index);
   const { setDuration } = setAuxTimer;
 
   const handleTimeUpdate = (_field: string, value: string) => {
     const newTimeInMs = parseUserTime(value);
-    setDuration(newTimeInMs);
+    setDuration(index, newTimeInMs);
   };
 
   return (
-    <TimeInput<'auxTimer'>
-      submitHandler={handleTimeUpdate}
-      name='auxTimer'
-      time={newTimeInMs}
-      placeholder='Aux Timer 1'
-    />
+    <TimeInput submitHandler={handleTimeUpdate} name={`aux${index}`} time={newTimeInMs} placeholder={`Aux ${index}`} />
+  );
+}
+
+interface AuxTogglePlayProps {
+  index: number;
+  action: 'play' | 'pause';
+}
+
+function AuxTogglePlay({ index, action }: AuxTogglePlayProps) {
+  const { start, pause } = setAuxTimer;
+
+  if (action === 'play') {
+    return (
+      <TapButton onClick={() => start(index)} theme={Playback.Play}>
+        <IoPlay data-testid={`aux-timer-start-${index}`} />
+      </TapButton>
+    );
+  }
+
+  return (
+    <TapButton onClick={() => pause(index)} theme={Playback.Pause}>
+      <IoPause data-testid={`aux-timer-pause-${index}`} />
+    </TapButton>
   );
 }
diff --git a/apps/client/src/views/studio/Studio.tsx b/apps/client/src/views/studio/Studio.tsx
index 2369ece8f..7823064a1 100644
--- a/apps/client/src/views/studio/Studio.tsx
+++ b/apps/client/src/views/studio/Studio.tsx
@@ -1,12 +1,4 @@
-import {
-  MessageState,
-  OntimeEvent,
-  ProjectData,
-  Runtime,
-  Settings,
-  SimpleTimerState,
-  ViewSettings,
-} from 'ontime-types';
+import { MessageState, OntimeEvent, ProjectData, Runtime, Settings, ViewSettings } from 'ontime-types';
 
 import ViewLogo from '../../common/components/view-logo/ViewLogo';
 import ViewParamsEditor from '../../common/components/view-params-editor/ViewParamsEditor';
@@ -22,7 +14,6 @@ import StudioTimers from './StudioTimers';
 import './Studio.scss';
 
 interface StudioProps {
-  auxTimer: SimpleTimerState;
   eventNow: OntimeEvent | null;
   eventNext: OntimeEvent | null;
   general: ProjectData;
@@ -36,7 +27,6 @@ interface StudioProps {
 }
 
 export default function Studio({
-  auxTimer,
   eventNow,
   eventNext,
   general,
@@ -70,7 +60,6 @@ export default function Studio({
           <StudioTimers
             eventNow={eventNow}
             eventNext={eventNext}
-            auxTimer={auxTimer.current}
             timerMessage={message.timer.visible ? message.timer.text : ''}
             secondaryMessage={message.secondary}
             runtime={runtime}
diff --git a/apps/client/src/views/studio/StudioTimers.tsx b/apps/client/src/views/studio/StudioTimers.tsx
index 35ebb7686..95f7f8663 100644
--- a/apps/client/src/views/studio/StudioTimers.tsx
+++ b/apps/client/src/views/studio/StudioTimers.tsx
@@ -1,6 +1,7 @@
 import { OntimeEvent, Playback, Runtime, TimerPhase, TimerState, ViewSettings } from 'ontime-types';
 import { millisToString } from 'ontime-utils';
 
+import { useAuxTimersTime } from '../../common/hooks/useSocket';
 import { cx } from '../../common/utils/styleUtils';
 import { useTranslation } from '../../translation/TranslationProvider';
 import { getTimerColour } from '../utils/presentation.utils';
@@ -14,7 +15,6 @@ interface StudioTimersProps {
   time: TimerState;
   eventNow: OntimeEvent | null;
   eventNext: OntimeEvent | null;
-  auxTimer: number;
   timerMessage: string;
   secondaryMessage: string;
   viewSettings: ViewSettings;
@@ -25,7 +25,6 @@ export default function StudioTimers({
   time,
   eventNow,
   eventNext,
-  auxTimer,
   timerMessage,
   secondaryMessage,
   viewSettings,
@@ -35,7 +34,6 @@ export default function StudioTimers({
   const schedule = getFormattedScheduleTimes(runtime);
   const event = getFormattedEventData(eventNow, time);
   const eventNextTitle = eventNext?.title || '-';
-  const formattedAuxTimer = millisToString(auxTimer);
   const formattedTimerMessage = timerMessage || '-';
   const formattedSecondaryMessage = secondaryMessage || '-';
 
@@ -110,24 +108,7 @@ export default function StudioTimers({
         </div>
       </div>
 
-      <div className='card' id='card-aux'>
-        <div className='card__row'>
-          <div>
-            <div className='label'>Aux 1</div>
-            <div className='extra'>{formattedAuxTimer}</div>
-          </div>
-
-          <div>
-            <div className='label center'>Aux 2</div>
-            <div className='extra center'>NOT YET</div>
-          </div>
-
-          <div>
-            <div className='label right'>Aux 3</div>
-            <div className='extra right'>NOT YET</div>
-          </div>
-        </div>
-      </div>
+      <StudioTimersAux />
 
       <div className='card' id='card-timer-message'>
         <div>
@@ -145,3 +126,28 @@ export default function StudioTimers({
     </div>
   );
 }
+
+function StudioTimersAux() {
+  const auxTimer = useAuxTimersTime();
+
+  return (
+    <div className='card' id='card-aux'>
+      <div className='card__row'>
+        <div>
+          <div className='label'>Aux 1</div>
+          <div className='extra'>{millisToString(auxTimer.aux1)}</div>
+        </div>
+
+        <div>
+          <div className='label center'>Aux 2</div>
+          <div className='extra center'>{millisToString(auxTimer.aux2)}</div>
+        </div>
+
+        <div>
+          <div className='label right'>Aux 3</div>
+          <div className='extra right'>{millisToString(auxTimer.aux3)}</div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/client/src/views/timer/Timer.tsx b/apps/client/src/views/timer/Timer.tsx
index feda356a2..406be6088 100644
--- a/apps/client/src/views/timer/Timer.tsx
+++ b/apps/client/src/views/timer/Timer.tsx
@@ -1,18 +1,11 @@
-import {
-  CustomFields,
-  MessageState,
-  OntimeEvent,
-  ProjectData,
-  Settings,
-  SimpleTimerState,
-  ViewSettings,
-} from 'ontime-types';
+import { CustomFields, MessageState, OntimeEvent, ProjectData, Settings, ViewSettings } from 'ontime-types';
 
 import { FitText } from '../../common/components/fit-text/FitText';
 import MultiPartProgressBar from '../../common/components/multi-part-progress-bar/MultiPartProgressBar';
 import TitleCard from '../../common/components/title-card/TitleCard';
 import ViewLogo from '../../common/components/view-logo/ViewLogo';
 import ViewParamsEditor from '../../common/components/view-params-editor/ViewParamsEditor';
+import { useAuxTimersTime } from '../../common/hooks/useSocket';
 import { useWindowTitle } from '../../common/hooks/useWindowTitle';
 import { ViewExtendedTimer } from '../../common/models/TimeManager.type';
 import { cx } from '../../common/utils/styleUtils';
@@ -38,7 +31,6 @@ import {
 import './Timer.scss';
 
 interface TimerProps {
-  auxTimer: SimpleTimerState;
   customFields: CustomFields;
   eventNext: OntimeEvent | null;
   eventNow: OntimeEvent | null;
@@ -51,8 +43,8 @@ interface TimerProps {
 }
 
 export default function Timer(props: TimerProps) {
-  const { auxTimer, customFields, eventNow, eventNext, general, isMirrored, message, settings, time, viewSettings } =
-    props;
+  const { customFields, eventNow, eventNext, general, isMirrored, message, settings, time, viewSettings } = props;
+  const auxTimer = useAuxTimersTime();
 
   const {
     hideClock,
@@ -104,9 +96,22 @@ export default function Timer(props: TimerProps) {
     removeLeadingZero: removeLeadingZeros,
   });
 
+  const currentAux = (() => {
+    if (message.timer.secondarySource === 'aux1') {
+      return auxTimer.aux1;
+    }
+    if (message.timer.secondarySource === 'aux2') {
+      return auxTimer.aux2;
+    }
+    if (message.timer.secondarySource === 'aux3') {
+      return auxTimer.aux3;
+    }
+    return null;
+  })();
+
   const secondaryContent = getSecondaryDisplay(
     message,
-    auxTimer.current,
+    currentAux,
     localisedMinutes,
     hideTimerSeconds,
     removeLeadingZeros,
diff --git a/apps/client/src/views/timer/timer.utils.ts b/apps/client/src/views/timer/timer.utils.ts
index 4dc67a883..707a5ca5f 100644
--- a/apps/client/src/views/timer/timer.utils.ts
+++ b/apps/client/src/views/timer/timer.utils.ts
@@ -116,7 +116,11 @@ export function getSecondaryDisplay(
   if (hideSecondary) {
     return;
   }
-  if (message.timer.secondarySource === 'aux') {
+  if (
+    message.timer.secondarySource === 'aux1' ||
+    message.timer.secondarySource === 'aux2' ||
+    message.timer.secondarySource === 'aux3'
+  ) {
     return getFormattedTimer(currentAux, TimerType.CountDown, localisedMinutes, {
       removeSeconds,
       removeLeadingZero,
diff --git a/apps/server/src/api-data/automation/__tests__/automation.validation.test.ts b/apps/server/src/api-data/automation/__tests__/automation.validation.test.ts
index 1ae0d08a7..f18462178 100644
--- a/apps/server/src/api-data/automation/__tests__/automation.validation.test.ts
+++ b/apps/server/src/api-data/automation/__tests__/automation.validation.test.ts
@@ -149,10 +149,10 @@ describe('parseOutput', () => {
       parseOutput({
         type: 'ontime',
         action: 'message-secondary',
-        secondarySource: 'aux',
+        secondarySource: 'aux1',
       }),
     ).toMatchObject({
-      secondarySource: 'aux',
+      secondarySource: 'aux1',
     });
     expect(
       parseOutput({
diff --git a/apps/server/src/api-data/automation/automation.validation.ts b/apps/server/src/api-data/automation/automation.validation.ts
index 340a8abc7..57e6c697b 100644
--- a/apps/server/src/api-data/automation/automation.validation.ts
+++ b/apps/server/src/api-data/automation/automation.validation.ts
@@ -189,13 +189,17 @@ function parseOntimeAction(maybeOntimeAction: object): OntimeAction {
 
   // we know we have a valid action, deal with special cases
 
-  if (maybeOntimeAction.action === 'aux-set') {
+  if (
+    maybeOntimeAction.action === 'aux1-set' ||
+    maybeOntimeAction.action === 'aux2-set' ||
+    maybeOntimeAction.action === 'aux3-set'
+  ) {
     assert.hasKeys(maybeOntimeAction, ['time']);
     assert.isString(maybeOntimeAction.time);
 
     return {
       type: 'ontime',
-      action: 'aux-set',
+      action: maybeOntimeAction.action,
       time: parseUserTime(maybeOntimeAction.time),
     };
   }
@@ -253,7 +257,9 @@ function indeterminateBooleanString(value: string): boolean | undefined {
  * Helper function to validate the secondary source
  */
 function chooseSecondarySource(value: string): SecondarySource {
-  if (value === 'aux') return 'aux';
+  if (value === 'aux1') return 'aux1';
+  if (value === 'aux2') return 'aux2';
+  if (value === 'aux3') return 'aux3';
   if (value === 'secondary') return 'secondary';
   return null;
 }
diff --git a/apps/server/src/api-data/automation/clients/ontime.client.ts b/apps/server/src/api-data/automation/clients/ontime.client.ts
index 70b659b70..160cf876b 100644
--- a/apps/server/src/api-data/automation/clients/ontime.client.ts
+++ b/apps/server/src/api-data/automation/clients/ontime.client.ts
@@ -8,18 +8,32 @@ export function toOntimeAction(action: OntimeAction) {
   const actionType = action.action;
   switch (actionType) {
     // Aux timer actions
-    case 'aux-start':
-      auxTimerService.start();
-      break;
-    case 'aux-stop':
-      auxTimerService.stop();
-      break;
-    case 'aux-pause':
-      auxTimerService.pause();
-      break;
-    case 'aux-set': {
-      auxTimerService.setTime(action.time);
-      break;
+    case 'aux1-start':
+      return auxTimerService.start(1);
+    case 'aux1-stop':
+      return auxTimerService.stop(1);
+    case 'aux1-pause':
+      return auxTimerService.pause(1);
+    case 'aux1-set': {
+      return auxTimerService.setTime(action.time, 1);
+    }
+    case 'aux2-start':
+      return auxTimerService.start(2);
+    case 'aux2-stop':
+      return auxTimerService.stop(2);
+    case 'aux2-pause':
+      return auxTimerService.pause(2);
+    case 'aux2-set': {
+      return auxTimerService.setTime(action.time, 2);
+    }
+    case 'aux3-start':
+      return auxTimerService.start(3);
+    case 'aux3-stop':
+      return auxTimerService.stop(3);
+    case 'aux3-pause':
+      return auxTimerService.pause(3);
+    case 'aux3-set': {
+      return auxTimerService.setTime(action.time, 3);
     }
 
     // Message actions
diff --git a/apps/server/src/api-integration/integration.controller.ts b/apps/server/src/api-integration/integration.controller.ts
index 10a94ab20..f6becf6de 100644
--- a/apps/server/src/api-integration/integration.controller.ts
+++ b/apps/server/src/api-integration/integration.controller.ts
@@ -18,7 +18,6 @@ import { validateMessage, validateTimerMessage } from '../services/message-servi
 import { runtimeService } from '../services/runtime-service/RuntimeService.js';
 import { eventStore } from '../stores/EventStore.js';
 import * as assert from '../utils/assert.js';
-import { isEmptyObject } from '../utils/parserUtils.js';
 import { parseProperty } from './integration.utils.js';
 import { socket } from '../adapters/WebsocketAdapter.js';
 import { throttle } from '../utils/throttle.js';
@@ -218,45 +217,61 @@ const actionHandlers: Record<ApiAction, ActionHandler> = {
     runtimeService.addTime(time);
     return { payload: 'success' };
   },
-  /* Extra timers */
+  /**
+   * Auxiliary timers, payload can be either:
+   *
+   * 1. a simple playback command
+   * {
+   *  "1": "start" | "pause" | "stop"
+   * }
+   *
+   * - or -
+   *
+   * 2. a patch object with properties
+   * {
+   *   "1": {
+   *       duration: "count-down"
+   *   }
+   * }
+   *
+   */
   auxtimer: (payload) => {
     assert.isObject(payload);
-    if (!('1' in payload)) {
+    const timerIndex = Object.keys(payload).at(0);
+    if (timerIndex !== '1' && timerIndex !== '2' && timerIndex !== '3') {
       throw new Error('Invalid auxtimer index');
     }
-    const command = payload['1'];
+
+    const command = payload[timerIndex as keyof typeof payload] as unknown;
+    const index = Number(timerIndex);
+
+    // 1. handle simple playback commands: start, pause, stop
     if (typeof command === 'string') {
-      if (command === SimplePlayback.Start) {
-        const reply = auxTimerService.start();
-        return { payload: reply };
+      switch (command) {
+        case SimplePlayback.Start:
+          return { payload: auxTimerService.start(index) };
+        case SimplePlayback.Pause:
+          return { payload: auxTimerService.pause(index) };
+        case SimplePlayback.Stop:
+          return { payload: auxTimerService.stop(index) };
+        default:
+          throw new Error('Invalid command');
       }
-      if (command === SimplePlayback.Pause) {
-        const reply = auxTimerService.pause();
-        return { payload: reply };
-      }
-      if (command === SimplePlayback.Stop) {
-        const reply = auxTimerService.stop();
-        return { payload: reply };
-      }
-    } else if (command && typeof command === 'object') {
-      const reply = { payload: {} };
+    }
+
+    // 2. command can be a patch object: duration, addtime, direction
+    if (command && typeof command === 'object') {
       if ('duration' in command) {
-        const timeInMs = numberOrError(command.duration);
-        reply.payload = auxTimerService.setTime(timeInMs);
+        return { payload: auxTimerService.setTime(numberOrError(command.duration), index) };
       }
       if ('addtime' in command) {
-        const timeInMs = numberOrError(command.addtime);
-        reply.payload = auxTimerService.addTime(timeInMs);
+        return { payload: auxTimerService.addTime(numberOrError(command.addtime), index) };
       }
       if ('direction' in command) {
         if (command.direction === SimpleDirection.CountUp || command.direction === SimpleDirection.CountDown) {
-          reply.payload = auxTimerService.setDirection(command.direction);
-        } else {
-          throw new Error('Invalid direction payload');
+          return { payload: auxTimerService.setDirection(command.direction, index) };
         }
-      }
-      if (!isEmptyObject(reply.payload)) {
-        return reply;
+        throw new Error('Invalid direction payload');
       }
     }
     throw new Error('No matching method provided');
diff --git a/apps/server/src/app.ts b/apps/server/src/app.ts
index 97e5aec1a..1e14acc01 100644
--- a/apps/server/src/app.ts
+++ b/apps/server/src/app.ts
@@ -193,6 +193,18 @@ export const startServer = async (): Promise<{ message: string; serverPort: numb
       playback: SimplePlayback.Stop,
       direction: SimpleDirection.CountDown,
     },
+    auxtimer2: {
+      duration: timerConfig.auxTimerDefault,
+      current: timerConfig.auxTimerDefault,
+      playback: SimplePlayback.Stop,
+      direction: SimpleDirection.CountDown,
+    },
+    auxtimer3: {
+      duration: timerConfig.auxTimerDefault,
+      current: timerConfig.auxTimerDefault,
+      playback: SimplePlayback.Stop,
+      direction: SimpleDirection.CountDown,
+    },
     ping: -1,
   });
 
diff --git a/apps/server/src/services/aux-timer-service/AuxTimerService.ts b/apps/server/src/services/aux-timer-service/AuxTimerService.ts
index 7e8fe90cb..4452961bb 100644
--- a/apps/server/src/services/aux-timer-service/AuxTimerService.ts
+++ b/apps/server/src/services/aux-timer-service/AuxTimerService.ts
@@ -1,91 +1,165 @@
-import { SimpleDirection, SimplePlayback, SimpleTimerState } from 'ontime-types';
+import { RuntimeStore, SimpleDirection, SimplePlayback } from 'ontime-types';
 
 import { SimpleTimer } from '../../classes/simple-timer/SimpleTimer.js';
 import { eventStore } from '../../stores/EventStore.js';
 import { timerConfig } from '../../setup/config.js';
 
-type EmitFn = (state: SimpleTimerState) => void;
+type AuxTimerStateUpdate = Partial<Pick<RuntimeStore, 'auxtimer1' | 'auxtimer2' | 'auxtimer3'>>;
+type EmitFn = (state: AuxTimerStateUpdate) => void;
 type GetTimeFn = () => number;
 
 export class AuxTimerService {
-  private timer: SimpleTimer;
+  private aux1: SimpleTimer;
+  private aux2: SimpleTimer;
+  private aux3: SimpleTimer;
   private interval: NodeJS.Timeout | null = null;
-  private emit: EmitFn;
+  protected emit: EmitFn;
   private getTime: GetTimeFn;
 
   constructor(emit: EmitFn, getTime: GetTimeFn) {
-    this.timer = new SimpleTimer(timerConfig.auxTimerDefault);
+    this.aux1 = new SimpleTimer(timerConfig.auxTimerDefault);
+    this.aux2 = new SimpleTimer(timerConfig.auxTimerDefault);
+    this.aux3 = new SimpleTimer(timerConfig.auxTimerDefault);
     this.emit = emit;
     this.getTime = getTime;
   }
 
+  /**
+   * Whether any of the aux timers are currently running
+   */
+  private hasActiveTimers(): boolean {
+    return (
+      this.aux1.state.playback === SimplePlayback.Start ||
+      this.aux2.state.playback === SimplePlayback.Start ||
+      this.aux3.state.playback === SimplePlayback.Start
+    );
+  }
+
   private startInterval() {
-    this.interval = setInterval(this.update.bind(this), 500);
+    if (!this.interval) {
+      this.interval = setInterval(this.update.bind(this), 500);
+    }
   }
 
+  /**
+   * Utility simplifies guarding against multiple intervals being set
+   */
   private stopInterval() {
-    if (this.interval) {
+    if (this.interval && !this.hasActiveTimers()) {
       clearInterval(this.interval);
+      this.interval = null;
     }
   }
 
   @broadcastReturn
-  setDirection(direction: SimpleDirection) {
-    return this.timer.setDirection(direction, this.getTime());
+  setDirection(direction: SimpleDirection, index: number) {
+    if (index === 1) return this.aux1.setDirection(direction, this.getTime());
+    if (index === 2) return this.aux2.setDirection(direction, this.getTime());
+    return this.aux3.setDirection(direction, this.getTime());
   }
 
   @broadcastReturn
-  start() {
+  start(index: number) {
     this.startInterval();
-    return this.timer.start(this.getTime());
+    if (index === 1) return this.aux1.start(this.getTime());
+    if (index === 2) return this.aux2.start(this.getTime());
+    return this.aux3.start(this.getTime());
   }
 
   @broadcastReturn
-  pause() {
-    this.stopInterval();
-    return this.timer.pause(this.getTime());
-  }
+  pause(index: number) {
+    // First pause the timer
+    let result;
+    if (index === 1) result = this.aux1.pause(this.getTime());
+    else if (index === 2) result = this.aux2.pause(this.getTime());
+    else result = this.aux3.pause(this.getTime());
 
-  @broadcastReturn
-  stop() {
-    this.stopInterval();
-    return this.timer.stop();
-  }
-
-  @broadcastReturn
-  setTime(duration: number) {
-    return this.timer.setTime(duration);
-  }
-
-  @broadcastReturn
-  addTime(millis: number) {
-    if (this.timer.state.playback === SimplePlayback.Start) {
-      this.timer.addTime(millis);
-      return this.timer.update(this.getTime());
+    // Then check if we need to keep the interval running
+    if (!this.hasActiveTimers()) {
+      this.stopInterval();
     }
-    return this.timer.addTime(millis);
+
+    return result;
   }
 
   @broadcastReturn
+  stop(index: number) {
+    // First stop the timer
+    let result;
+    if (index === 1) result = this.aux1.stop();
+    else if (index === 2) result = this.aux2.stop();
+    else result = this.aux3.stop();
+
+    // Then check if we need to keep the interval running
+    if (!this.hasActiveTimers()) {
+      this.stopInterval();
+    }
+
+    return result;
+  }
+
+  @broadcastReturn
+  setTime(duration: number, index: number) {
+    if (index === 1) return this.aux1.setTime(duration);
+    if (index === 2) return this.aux2.setTime(duration);
+    return this.aux3.setTime(duration);
+  }
+
+  @broadcastReturn
+  addTime(millis: number, index: number) {
+    const aux = index === 1 ? this.aux1 : index === 2 ? this.aux2 : this.aux3;
+    if (aux.state.playback === SimplePlayback.Start) {
+      aux.addTime(millis);
+      return aux.update(this.getTime());
+    }
+    return aux.addTime(millis);
+  }
+
   private update() {
-    return this.timer.update(this.getTime());
+    /**
+     * The update function affects any running timers,
+     * so we decide to emit a patch object rather
+     * than using the decorator which would emit individual updates.
+     */
+    const patch: AuxTimerStateUpdate = {};
+
+    const timeNow = this.getTime();
+    if (this.aux1.state.playback === SimplePlayback.Start) {
+      patch.auxtimer1 = this.aux1.update(timeNow);
+    }
+
+    if (this.aux2.state.playback === SimplePlayback.Start) {
+      patch.auxtimer2 = this.aux2.update(timeNow);
+    }
+
+    if (this.aux3.state.playback === SimplePlayback.Start) {
+      patch.auxtimer3 = this.aux3.update(timeNow);
+    }
+
+    if (Object.keys(patch).length > 0) {
+      this.emit(patch);
+    }
   }
 }
 
-function broadcastReturn(_target: any, _propertyKey: string, descriptor: PropertyDescriptor) {
+function broadcastReturn(_target: object, _propertyKey: string, descriptor: PropertyDescriptor) {
   const originalMethod = descriptor.value;
 
-  descriptor.value = function (...args: any[]) {
+  descriptor.value = function (this: AuxTimerService, ...args: unknown[]) {
     const result = originalMethod.apply(this, args);
-    // @ts-expect-error -- we can access private properties from the decorator
-    (this as AuxTimerService).emit(result);
+    const index = args[args.length - 1] as number;
+    this.emit({ [`auxtimer${index}`]: result });
     return result;
   };
 
   return descriptor;
 }
 
-const emit = (state: SimpleTimerState) => eventStore.set('auxtimer1', state);
+const emit = (state: AuxTimerStateUpdate) => {
+  for (const [key, value] of Object.entries(state)) {
+    eventStore.set(key as keyof RuntimeStore, value);
+  }
+};
 const timeNow = () => Date.now();
 
 export const auxTimerService = new AuxTimerService(emit, timeNow);
diff --git a/apps/server/src/services/message-service/message.utils.ts b/apps/server/src/services/message-service/message.utils.ts
index 985cea039..5e96357f5 100644
--- a/apps/server/src/services/message-service/message.utils.ts
+++ b/apps/server/src/services/message-service/message.utils.ts
@@ -33,7 +33,7 @@ export function validateTimerMessage(message: unknown): Partial<TimerMessage> {
  * Asserts that the secondary value is one of the permitted values
  */
 function assertSecondary(source: unknown): source is TimerMessage['secondarySource'] {
-  return source === 'aux' || source === 'secondary' || source === null;
+  return source === 'aux1' || source === 'aux2' || source === 'aux3' || source === 'secondary' || source === null;
 }
 
 /**
diff --git a/e2e/tests/features/208-auxtimer.spec.ts b/e2e/tests/features/208-auxtimer.spec.ts
index 8c5f75d37..a54c8fd4e 100644
--- a/e2e/tests/features/208-auxtimer.spec.ts
+++ b/e2e/tests/features/208-auxtimer.spec.ts
@@ -2,17 +2,18 @@ import { test, expect } from '@playwright/test';
 
 test('Aux timer buttons', async ({ page }) => {
   await page.goto('http://localhost:4001/editor');
-  await page.getByTestId('time-input-auxTimer').click();
-  await page.getByTestId('time-input-auxTimer').fill('123456');
-  await page.getByTestId('time-input-auxTimer').press('Enter');
-  await expect(page.getByTestId('time-input-auxTimer')).toHaveValue('12:34:56');
-  await page.getByTestId('aux-timer-start').click();
-  await expect(page.getByTestId('time-input-auxTimer')).toHaveValue('12:34:53', { timeout: 4000 });
-  await page.getByTestId('aux-timer-pause').click();
-  await expect(page.getByTestId('time-input-auxTimer')).toHaveValue('12:34:53');
-  await page.getByTestId('aux-timer-stop').click();
-  await expect(page.getByTestId('time-input-auxTimer')).toHaveValue('12:34:56');
-  await page.getByTestId('aux-timer-direction').click();
-  await page.getByTestId('aux-timer-start').click();
-  await expect(page.getByTestId('time-input-auxTimer')).toHaveValue('12:34:59', { timeout: 4000 });
+  await page.getByTestId('time-input-aux1').click();
+  await page.getByTestId('time-input-aux1').fill('123456');
+  await page.getByTestId('time-input-aux1').press('Enter');
+  await expect(page.getByTestId('time-input-aux1')).toHaveValue('12:34:56');
+  await page.getByTestId('aux-timer-start-1').click();
+  await expect(page.getByTestId('time-input-aux1')).toHaveValue('12:34:53', { timeout: 4000 });
+  await page.getByTestId('aux-timer-pause-1').click();
+  await expect(page.getByTestId('time-input-aux1')).toHaveValue('12:34:53');
+  await page.getByTestId('aux-timer-stop-1').click();
+  await expect(page.getByTestId('time-input-aux1')).toHaveValue('12:34:56');
+  await page.getByTestId('aux-timer-direction-1').click();
+  await page.getByTestId('aux-timer-start-1').click();
+  await expect(page.getByTestId('time-input-aux1')).toHaveValue('12:34:59', { timeout: 4000 });
+  await page.getByTestId('aux-timer-stop-1').click();
 });
diff --git a/packages/types/src/definitions/core/Automation.type.ts b/packages/types/src/definitions/core/Automation.type.ts
index 583df9b19..fd3077ec9 100644
--- a/packages/types/src/definitions/core/Automation.type.ts
+++ b/packages/types/src/definitions/core/Automation.type.ts
@@ -57,11 +57,20 @@ export type HTTPOutput = {
 export type OntimeAction =
   | {
       type: 'ontime';
-      action: 'aux-start' | 'aux-stop' | 'aux-pause';
+      action:
+        | 'aux1-start'
+        | 'aux1-stop'
+        | 'aux1-pause'
+        | 'aux2-start'
+        | 'aux2-stop'
+        | 'aux2-pause'
+        | 'aux3-start'
+        | 'aux3-stop'
+        | 'aux3-pause';
     }
   | {
       type: 'ontime';
-      action: 'aux-set';
+      action: 'aux1-set' | 'aux2-set' | 'aux3-set';
       time: number;
     }
   | {
diff --git a/packages/types/src/definitions/runtime/MessageControl.type.ts b/packages/types/src/definitions/runtime/MessageControl.type.ts
index a1a994245..bf448bb73 100644
--- a/packages/types/src/definitions/runtime/MessageControl.type.ts
+++ b/packages/types/src/definitions/runtime/MessageControl.type.ts
@@ -1,4 +1,4 @@
-export type SecondarySource = 'aux' | 'secondary' | null;
+export type SecondarySource = 'aux1' | 'aux2' | 'aux3' | 'secondary' | null;
 
 export type TimerMessage = {
   text: string;
diff --git a/packages/types/src/definitions/runtime/RuntimeStore.ts b/packages/types/src/definitions/runtime/RuntimeStore.ts
index 4cb4e193b..62c0efa21 100644
--- a/packages/types/src/definitions/runtime/RuntimeStore.ts
+++ b/packages/types/src/definitions/runtime/RuntimeStore.ts
@@ -52,5 +52,17 @@ export const runtimeStorePlaceholder: Readonly<RuntimeStore> = {
     duration: 0,
     playback: SimplePlayback.Stop,
   },
+  auxtimer2: {
+    current: 0,
+    direction: SimpleDirection.CountUp,
+    duration: 0,
+    playback: SimplePlayback.Stop,
+  },
+  auxtimer3: {
+    current: 0,
+    direction: SimpleDirection.CountUp,
+    duration: 0,
+    playback: SimplePlayback.Stop,
+  },
   ping: -1,
 };
diff --git a/packages/types/src/definitions/runtime/RuntimeStore.type.ts b/packages/types/src/definitions/runtime/RuntimeStore.type.ts
index b9ec0865d..eaa0de41c 100644
--- a/packages/types/src/definitions/runtime/RuntimeStore.type.ts
+++ b/packages/types/src/definitions/runtime/RuntimeStore.type.ts
@@ -22,6 +22,8 @@ export type RuntimeStore = {
 
   // extra timers
   auxtimer1: SimpleTimerState;
+  auxtimer2: SimpleTimerState;
+  auxtimer3: SimpleTimerState;
 
   // utils
   ping: number;