From faa29320c243054a264fffaeed25c258dbac28a2 Mon Sep 17 00:00:00 2001
From: Ollie Copping <oliver.copping@diamond.ac.uk>
Date: Wed, 20 May 2026 14:05:43 +0000
Subject: [PATCH 1/4] Add macros to mappings in techui-support.yaml

This is to allow for better macro management in an upcoming (breaking)
change to techui-builder
---
 techui-support.yaml | 74 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/techui-support.yaml b/techui-support.yaml
index de2375b..ac3ea14 100644
--- a/techui-support.yaml
+++ b/techui-support.yaml
@@ -4,9 +4,15 @@ ADAravis.aravisCamera:
   - file: "ADAravis/ADAravis_summary.bob"
     prefix: "$(P)$(R)"
     type: "embedded"
+    macros:
+      P:
+      R:
   - file: "ADAravis/ADAravis_detail.bob"
     prefix: "$(P)$(R)"
     type: "related"
+    macros:
+      P:
+      R:
 
 ADUVC.UVC:
   - file: "ADUVC/ADUVC_summary.bob"
@@ -20,31 +26,49 @@ ADSimDetector.simDetector:
   file: "ADAravis/ADAravis_summary.bob"
   prefix: "$(P)$(R)"
   type: "embedded"
+  macros:
+    P:
+    R:
 
 ADCore.NDROI:
   file: "ADAravis/NDPluginROI.pvi.bob"
   prefix: "$(P)$(R)"
   type: "related"
+  macros:
+    P:
+    R:
 
 ADCore.NDStats:
   file: "ADAravis/NDPluginStats.pvi.bob"
   prefix: "$(P)$(R)"
   type: "related"
+  macros:
+    P:
+    R:
 
 ADCore.NDPva:
   file: "ADAravis/NDPluginPva.pvi.bob"
   prefix: "$(P)$(R)"
   type: "related"
+  macros:
+    P:
+    R:
 
 ADCore.NDFileHDF5:
   file: "ADAravis/NDFileHDF5.pvi.bob"
   prefix: "$(P)$(R)"
   type: "related"
+  macros:
+    P:
+    R:
 
 ADCore.NDROIStat:
   file: "ADAravis/NDPluginROIStat.pvi.bob"
   prefix: "$(P)$(R)"
   type: "related"
+  macros:
+    P:
+    R:
 
 ADUVC.ADCore.NDROI:
   file: "$(IOC)/NDROI.pvi.bob"
@@ -71,33 +95,57 @@ detectorPlugins.detectorPlugins:
     prefix: "$(P)$(R)"
     suffix: ":STAT:"
     type: "related"
+    macros:
+      P:
+      R:
   - file: "ADAravis/NDPluginPva.pvi.bob"
     prefix: "$(P)$(R)"
     suffix: ":PVA:"
     type: "related"
+    macros:
+      P:
+      R:
   - file: "ADAravis/NDPluginROIStat.pvi.bob"
     prefix: "$(P)$(R)"
     suffix: ":ROISTAT:"
     type: "related"
+    macros:
+      P:
+      R:
   - file: "ADAravis/NDFileHDF5.pvi.bob"
     prefix: "$(P)$(R)"
     suffix: ":HDF5:"
     type: "related"
+    macros:
+      P:
+      R:
   #TODO: Legacy support
 
 Detector.plugins:
   - file: "ADAravis/NDPluginStats.pvi.bob"
     prefix: "$(P)$(R)"
     type: "related"
+    macros:
+      P:
+      R:
   - file: "ADAravis/NDPluginPva.pvi.bob"
     prefix: "$(P)$(R)"
     type: "related"
+    macros:
+      P:
+      R:
   - file: "ADAravis/NDPluginROIStat.pvi.bob"
     prefix: "$(P)$(R)"
     type: "related"
+    macros:
+      P:
+      R:
   - file: "ADAravis/NDFileHDF5.pvi.bob"
     prefix: "$(P)$(R)"
     type: "related"
+    macros:
+      P:
+      R:
 
 # Motion Controllers
 
@@ -105,21 +153,31 @@ pmac.dls_pmac_asyn_motor:
   file: "pmac/motor_embed.bob"
   prefix: "$(P)$(M)"
   type: "embedded"
+  macros:
+    P:
+    M:
 
 pmac.GeoBrick:
   file: "pmac/pmacController.bob"
   prefix: "$(P)"
   type: "related"
+  macros:
+    P:
 
 pmac.PowerPMAC:
   file: "pmac/ppmacController.bob"
   prefix: "$(P)"
   type: "related"
+  macros:
+    P:
 
 pmacUtil.dls_pmac_asyn_motor_no_coord:
   file: "pmac/motor_embed.bob"
   prefix: "$(P)$(M)"
   type: "embedded"
+  macros:
+    P:
+    M:
 
 # Vacuum
 
@@ -127,26 +185,36 @@ mks937a.mks937a:
   file: "mks937a/mks937a.bob"
   prefix: "$(P)"
   type: "embedded"
+  macros:
+    P:
 
 mks937a.mks937aImg:
   file: "mks937a/mks937aImg.bob"
   prefix: "$(P)"
   type: "embedded"
+  macros:
+    P:
 
 mks937a.mks937aGauge:
   file: "mks937a/mks937aGauge.bob"
   prefix: "$(P)"
   type: "embedded"
+  macros:
+    P:
 
 mks937a.mks937aPirg:
   file: "mks937a/mks937aPirg.bob"
   prefix: "$(P)"
   type: "embedded"
+  macros:
+    P:
 
 digitelMpc.digitelMpcIonp:
   file: "digitelMpc/digitelMpcIonp.bob"
   prefix: "$(P)"
   type: "embedded"
+  macros:
+    P:
 
 # Mirrors
 
@@ -154,11 +222,15 @@ mff.mff:
   file: "mff/mff.bob"
   prefix: "$(P)"
   type: "related"
+  macros:
+    P:
 
 alignmentMirror.mirror:
   file: "alignmentMirror/mirror.bob"
   prefix: "$(P)"
   type: "related"
+  macros:
+    P:
 
 # Detectors
 
@@ -166,3 +238,5 @@ fastcs_eiger.EigerController:
   file: "fastcs-eiger/eigerController.bob"
   prefix: "$(P)"
   type: "embedded"
+  macros:
+    P:

From dc28c43bdb1d061cdf7aa580eb12d9b346d313a2 Mon Sep 17 00:00:00 2001
From: Ollie Copping <oliver.copping@diamond.ac.uk>
Date: Thu, 21 May 2026 09:18:14 +0000
Subject: [PATCH 2/4] [BREAKING CHANGE] Rework techui-support.yaml to allow for
 more generic mappings

---
 techui-support.yaml | 250 +++++++++++++++++++++++---------------------
 1 file changed, 131 insertions(+), 119 deletions(-)

diff --git a/techui-support.yaml b/techui-support.yaml
index ac3ea14..0493ee9 100644
--- a/techui-support.yaml
+++ b/techui-support.yaml
@@ -1,242 +1,254 @@
 # Cameras
 
 ADAravis.aravisCamera:
-  - file: "ADAravis/ADAravis_summary.bob"
-    prefix: "$(P)$(R)"
-    type: "embedded"
-    macros:
-      P:
-      R:
-  - file: "ADAravis/ADAravis_detail.bob"
-    prefix: "$(P)$(R)"
-    type: "related"
-    macros:
-      P:
-      R:
+  prefix: "$(P)$(R)"
+  macros:
+    P:
+    R:
+  screens:
+    - file: "ADAravis/ADAravis_summary.bob"
+      type: "embedded"
+    - file: "ADAravis/ADAravis_detail.bob"
+      type: "related"
 
-ADUVC.UVC:
-  - file: "ADUVC/ADUVC_summary.bob"
+  ADUVC.UVC:
     prefix: "$(P)$(R)"
-    type: "embedded"
-  - file: "$(IOC)/ADUVC.pvi.bob"
-    prefix: "$(P)$(R)"
-    type: "related"
+    macros:
+      - P
+      - R
+    screens:
+      - file: "ADUVC/ADUVC_summary.bob"
+        type: "embedded"
+      - file: "$(IOC)/ADUVC.pvi.bob"
+        type: "related"
 
 ADSimDetector.simDetector:
-  file: "ADAravis/ADAravis_summary.bob"
   prefix: "$(P)$(R)"
-  type: "embedded"
   macros:
     P:
     R:
+  screens:
+    - file: "ADAravis/ADAravis_summary.bob"
+      type: "embedded"
 
 ADCore.NDROI:
-  file: "ADAravis/NDPluginROI.pvi.bob"
   prefix: "$(P)$(R)"
-  type: "related"
   macros:
     P:
     R:
+  screens:
+    - file: "ADAravis/NDPluginROI.pvi.bob"
+      type: "related"
 
 ADCore.NDStats:
-  file: "ADAravis/NDPluginStats.pvi.bob"
   prefix: "$(P)$(R)"
-  type: "related"
   macros:
     P:
     R:
+  screens:
+    - file: "ADAravis/NDPluginStats.pvi.bob"
+      type: "related"
 
 ADCore.NDPva:
-  file: "ADAravis/NDPluginPva.pvi.bob"
   prefix: "$(P)$(R)"
-  type: "related"
   macros:
     P:
     R:
+  screens:
+    - file: "ADAravis/NDPluginPva.pvi.bob"
+      type: "related"
 
 ADCore.NDFileHDF5:
-  file: "ADAravis/NDFileHDF5.pvi.bob"
   prefix: "$(P)$(R)"
-  type: "related"
   macros:
     P:
     R:
+  screens:
+    - file: "ADAravis/NDFileHDF5.pvi.bob"
+      type: "related"
 
 ADCore.NDROIStat:
-  file: "ADAravis/NDPluginROIStat.pvi.bob"
   prefix: "$(P)$(R)"
-  type: "related"
   macros:
     P:
     R:
+  screens:
+    - file: "ADAravis/NDPluginROIStat.pvi.bob"
+      type: "related"
 
-ADUVC.ADCore.NDROI:
-  file: "$(IOC)/NDROI.pvi.bob"
-  prefix: "$(P)$(R)"
-  type: "related"
-
-ADUVC.ADCore.NDStats:
-  file: "$(IOC)/NDStats.pvi.bob"
-  prefix: "$(P)$(R)"
-  type: "related"
-
-ADUVC.ADCore.NDPvxsPlugin:
-  file: "$(IOC)/NDPvxs.pvi.bob"
-  prefix: "$(P)$(R)"
-  type: "related"
-
-ADUVC.ADCore.NDFileHDF5:
-  file: "$(IOC)/NDFileHDF5.pvi.bob"
-  prefix: "$(P)$(R)"
-  type: "related"
-
-detectorPlugins.detectorPlugins:
-  - file: "ADAravis/NDPluginStats.pvi.bob"
+  ADUVC.ADCore.NDROI:
     prefix: "$(P)$(R)"
-    suffix: ":STAT:"
-    type: "related"
     macros:
-      P:
-      R:
-  - file: "ADAravis/NDPluginPva.pvi.bob"
+      - P
+      - R
+    screens:
+      - file: "$(IOC)/NDROI.pvi.bob"
+        type: "related"
+
+  ADUVC.ADCore.NDStats:
     prefix: "$(P)$(R)"
-    suffix: ":PVA:"
-    type: "related"
     macros:
-      P:
-      R:
-  - file: "ADAravis/NDPluginROIStat.pvi.bob"
+      - P
+      - R
+    screens:
+      - file: "$(IOC)/NDStats.pvi.bob"
+        type: "related"
+
+  ADUVC.ADCore.NDPvxsPlugin:
     prefix: "$(P)$(R)"
-    suffix: ":ROISTAT:"
-    type: "related"
     macros:
-      P:
-      R:
-  - file: "ADAravis/NDFileHDF5.pvi.bob"
+      - P
+      - R
+    screens:
+      - file: "$(IOC)/NDPvxs.pvi.bob"
+        type: "related"
+
+  ADUVC.ADCore.NDFileHDF5:
     prefix: "$(P)$(R)"
-    suffix: ":HDF5:"
-    type: "related"
     macros:
-      P:
-      R:
+      - P
+      - R
+    screens:
+      - file: "$(IOC)/NDFileHDF5.pvi.bob"
+        type: "related"
+
+detectorPlugins.detectorPlugins:
+  prefix: "$(P)$(R)"
+  macros:
+    P:
+    R:
+  screens:
+    - file: "ADAravis/NDPluginStats.pvi.bob"
+      suffix: ":STAT:"
+      type: "related"
+    - file: "ADAravis/NDPluginPva.pvi.bob"
+      suffix: ":PVA:"
+      type: "related"
+    - file: "ADAravis/NDPluginROIStat.pvi.bob"
+      suffix: ":ROISTAT:"
+      type: "related"
+    - file: "ADAravis/NDFileHDF5.pvi.bob"
+      suffix: ":HDF5:"
+      type: "related"
   #TODO: Legacy support
 
 Detector.plugins:
-  - file: "ADAravis/NDPluginStats.pvi.bob"
-    prefix: "$(P)$(R)"
-    type: "related"
-    macros:
-      P:
-      R:
-  - file: "ADAravis/NDPluginPva.pvi.bob"
-    prefix: "$(P)$(R)"
-    type: "related"
-    macros:
-      P:
-      R:
-  - file: "ADAravis/NDPluginROIStat.pvi.bob"
-    prefix: "$(P)$(R)"
-    type: "related"
-    macros:
-      P:
-      R:
-  - file: "ADAravis/NDFileHDF5.pvi.bob"
-    prefix: "$(P)$(R)"
-    type: "related"
-    macros:
-      P:
-      R:
+  prefix: "$(P)$(R)"
+  macros:
+    P:
+    R:
+  screens:
+    - file: "ADAravis/NDPluginStats.pvi.bob"
+      type: "related"
+    - file: "ADAravis/NDPluginPva.pvi.bob"
+      type: "related"
+    - file: "ADAravis/NDPluginROIStat.pvi.bob"
+      type: "related"
+    - file: "ADAravis/NDFileHDF5.pvi.bob"
+      type: "related"
 
 # Motion Controllers
 
 pmac.dls_pmac_asyn_motor:
-  file: "pmac/motor_embed.bob"
   prefix: "$(P)$(M)"
-  type: "embedded"
   macros:
     P:
     M:
+  screens:
+    - file: "pmac/motor_embed.bob"
+      type: "embedded"
 
 pmac.GeoBrick:
-  file: "pmac/pmacController.bob"
   prefix: "$(P)"
-  type: "related"
   macros:
     P:
+  screens:
+    - file: "pmac/pmacController.bob"
+      type: "related"
 
 pmac.PowerPMAC:
-  file: "pmac/ppmacController.bob"
   prefix: "$(P)"
-  type: "related"
   macros:
     P:
+  screens:
+    - file: "pmac/ppmacController.bob"
+      type: "related"
 
 pmacUtil.dls_pmac_asyn_motor_no_coord:
-  file: "pmac/motor_embed.bob"
   prefix: "$(P)$(M)"
-  type: "embedded"
   macros:
     P:
     M:
+  screens:
+    - file: "pmac/motor_embed.bob"
+      type: "embedded"
 
 # Vacuum
 
 mks937a.mks937a:
-  file: "mks937a/mks937a.bob"
   prefix: "$(P)"
-  type: "embedded"
   macros:
     P:
+  screens:
+    - file: "mks937a/mks937a.bob"
+      type: "embedded"
 
 mks937a.mks937aImg:
-  file: "mks937a/mks937aImg.bob"
   prefix: "$(P)"
-  type: "embedded"
   macros:
     P:
+  screens:
+    - file: "mks937a/mks937aImg.bob"
+      type: "embedded"
 
 mks937a.mks937aGauge:
-  file: "mks937a/mks937aGauge.bob"
   prefix: "$(P)"
-  type: "embedded"
   macros:
     P:
+  screens:
+    - file: "mks937a/mks937aGauge.bob"
+      type: "embedded"
 
 mks937a.mks937aPirg:
-  file: "mks937a/mks937aPirg.bob"
   prefix: "$(P)"
-  type: "embedded"
   macros:
     P:
+  screens:
+    - file: "mks937a/mks937aPirg.bob"
+      type: "embedded"
 
 digitelMpc.digitelMpcIonp:
-  file: "digitelMpc/digitelMpcIonp.bob"
   prefix: "$(P)"
-  type: "embedded"
   macros:
     P:
+  screens:
+    - file: "digitelMpc/digitelMpcIonp.bob"
+      type: "embedded"
 
 # Mirrors
 
 mff.mff:
-  file: "mff/mff.bob"
   prefix: "$(P)"
-  type: "related"
   macros:
     P:
+  screens:
+    - file: "mff/mff.bob"
+      type: "related"
 
 alignmentMirror.mirror:
-  file: "alignmentMirror/mirror.bob"
   prefix: "$(P)"
-  type: "related"
   macros:
     P:
+  screens:
+    - file: "alignmentMirror/mirror.bob"
+      type: "related"
 
 # Detectors
 
 fastcs_eiger.EigerController:
-  file: "fastcs-eiger/eigerController.bob"
   prefix: "$(P)"
-  type: "embedded"
   macros:
     P:
+  screens:
+    - file: "fastcs-eiger/eigerController.bob"
+      type: "embedded"

From 607143255d717dcfd9ee8e65cf7f79cca7f1a8dd Mon Sep 17 00:00:00 2001
From: Ollie Copping <oliver.copping@diamond.ac.uk>
Date: Thu, 21 May 2026 12:16:28 +0000
Subject: [PATCH 3/4] [BREAKING CHANGE] Convert macros to use jinja formatting

---
 techui-support.yaml | 52 ++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/techui-support.yaml b/techui-support.yaml
index 0493ee9..ee57f4a 100644
--- a/techui-support.yaml
+++ b/techui-support.yaml
@@ -1,7 +1,7 @@
 # Cameras
 
 ADAravis.aravisCamera:
-  prefix: "$(P)$(R)"
+  prefix: "{{P}}{{R}}"
   macros:
     P:
     R:
@@ -12,7 +12,7 @@ ADAravis.aravisCamera:
       type: "related"
 
   ADUVC.UVC:
-    prefix: "$(P)$(R)"
+    prefix: "{{ P }}{{ R }}"
     macros:
       - P
       - R
@@ -23,7 +23,7 @@ ADAravis.aravisCamera:
         type: "related"
 
 ADSimDetector.simDetector:
-  prefix: "$(P)$(R)"
+  prefix: "{{P}}{{R}}"
   macros:
     P:
     R:
@@ -32,7 +32,7 @@ ADSimDetector.simDetector:
       type: "embedded"
 
 ADCore.NDROI:
-  prefix: "$(P)$(R)"
+  prefix: "{{P}}{{R}}"
   macros:
     P:
     R:
@@ -41,7 +41,7 @@ ADCore.NDROI:
       type: "related"
 
 ADCore.NDStats:
-  prefix: "$(P)$(R)"
+  prefix: "{{P}}{{R}}"
   macros:
     P:
     R:
@@ -50,7 +50,7 @@ ADCore.NDStats:
       type: "related"
 
 ADCore.NDPva:
-  prefix: "$(P)$(R)"
+  prefix: "{{P}}{{R}}"
   macros:
     P:
     R:
@@ -59,7 +59,7 @@ ADCore.NDPva:
       type: "related"
 
 ADCore.NDFileHDF5:
-  prefix: "$(P)$(R)"
+  prefix: "{{P}}{{R}}"
   macros:
     P:
     R:
@@ -68,7 +68,7 @@ ADCore.NDFileHDF5:
       type: "related"
 
 ADCore.NDROIStat:
-  prefix: "$(P)$(R)"
+  prefix: "{{P}}{{R}}"
   macros:
     P:
     R:
@@ -77,7 +77,7 @@ ADCore.NDROIStat:
       type: "related"
 
   ADUVC.ADCore.NDROI:
-    prefix: "$(P)$(R)"
+    prefix: "{{ P }}{{ R }}"
     macros:
       - P
       - R
@@ -86,7 +86,7 @@ ADCore.NDROIStat:
         type: "related"
 
   ADUVC.ADCore.NDStats:
-    prefix: "$(P)$(R)"
+    prefix: "{{ P }}{{ R }}"
     macros:
       - P
       - R
@@ -95,7 +95,7 @@ ADCore.NDROIStat:
         type: "related"
 
   ADUVC.ADCore.NDPvxsPlugin:
-    prefix: "$(P)$(R)"
+    prefix: "{{ P }}{{ R }}"
     macros:
       - P
       - R
@@ -104,7 +104,7 @@ ADCore.NDROIStat:
         type: "related"
 
   ADUVC.ADCore.NDFileHDF5:
-    prefix: "$(P)$(R)"
+    prefix: "{{ P }}{{ R }}"
     macros:
       - P
       - R
@@ -113,7 +113,7 @@ ADCore.NDROIStat:
         type: "related"
 
 detectorPlugins.detectorPlugins:
-  prefix: "$(P)$(R)"
+  prefix: "{{P}}{{R}}"
   macros:
     P:
     R:
@@ -133,7 +133,7 @@ detectorPlugins.detectorPlugins:
   #TODO: Legacy support
 
 Detector.plugins:
-  prefix: "$(P)$(R)"
+  prefix: "{{P}}{{R}}"
   macros:
     P:
     R:
@@ -150,7 +150,7 @@ Detector.plugins:
 # Motion Controllers
 
 pmac.dls_pmac_asyn_motor:
-  prefix: "$(P)$(M)"
+  prefix: "{{P}}{{M}}"
   macros:
     P:
     M:
@@ -159,7 +159,7 @@ pmac.dls_pmac_asyn_motor:
       type: "embedded"
 
 pmac.GeoBrick:
-  prefix: "$(P)"
+  prefix: "{{P}}"
   macros:
     P:
   screens:
@@ -167,7 +167,7 @@ pmac.GeoBrick:
       type: "related"
 
 pmac.PowerPMAC:
-  prefix: "$(P)"
+  prefix: "{{P}}"
   macros:
     P:
   screens:
@@ -175,7 +175,7 @@ pmac.PowerPMAC:
       type: "related"
 
 pmacUtil.dls_pmac_asyn_motor_no_coord:
-  prefix: "$(P)$(M)"
+  prefix: "{{P}}{{M}}"
   macros:
     P:
     M:
@@ -186,7 +186,7 @@ pmacUtil.dls_pmac_asyn_motor_no_coord:
 # Vacuum
 
 mks937a.mks937a:
-  prefix: "$(P)"
+  prefix: "{{P}}"
   macros:
     P:
   screens:
@@ -194,7 +194,7 @@ mks937a.mks937a:
       type: "embedded"
 
 mks937a.mks937aImg:
-  prefix: "$(P)"
+  prefix: "{{P}}"
   macros:
     P:
   screens:
@@ -202,7 +202,7 @@ mks937a.mks937aImg:
       type: "embedded"
 
 mks937a.mks937aGauge:
-  prefix: "$(P)"
+  prefix: "{{P}}"
   macros:
     P:
   screens:
@@ -210,7 +210,7 @@ mks937a.mks937aGauge:
       type: "embedded"
 
 mks937a.mks937aPirg:
-  prefix: "$(P)"
+  prefix: "{{P}}"
   macros:
     P:
   screens:
@@ -218,7 +218,7 @@ mks937a.mks937aPirg:
       type: "embedded"
 
 digitelMpc.digitelMpcIonp:
-  prefix: "$(P)"
+  prefix: "{{P}}"
   macros:
     P:
   screens:
@@ -228,7 +228,7 @@ digitelMpc.digitelMpcIonp:
 # Mirrors
 
 mff.mff:
-  prefix: "$(P)"
+  prefix: "{{P}}"
   macros:
     P:
   screens:
@@ -236,7 +236,7 @@ mff.mff:
       type: "related"
 
 alignmentMirror.mirror:
-  prefix: "$(P)"
+  prefix: "{{P}}"
   macros:
     P:
   screens:
@@ -246,7 +246,7 @@ alignmentMirror.mirror:
 # Detectors
 
 fastcs_eiger.EigerController:
-  prefix: "$(P)"
+  prefix: "{{P}}"
   macros:
     P:
   screens:

From 4876d6760a8208deb6b4f5a1d2c3254ba36e8d39 Mon Sep 17 00:00:00 2001
From: Ollie Copping <oliver.copping@diamond.ac.uk>
Date: Thu, 21 May 2026 13:01:56 +0000
Subject: [PATCH 4/4] [BREAKING CHANGE] Move everything to under
 'support_modules' and change macros to be lists

---
 techui-support.yaml | 411 ++++++++++++++++++++++----------------------
 1 file changed, 206 insertions(+), 205 deletions(-)

diff --git a/techui-support.yaml b/techui-support.yaml
index ee57f4a..6310c5f 100644
--- a/techui-support.yaml
+++ b/techui-support.yaml
@@ -1,15 +1,16 @@
-# Cameras
-
-ADAravis.aravisCamera:
-  prefix: "{{P}}{{R}}"
-  macros:
-    P:
-    R:
-  screens:
-    - file: "ADAravis/ADAravis_summary.bob"
-      type: "embedded"
-    - file: "ADAravis/ADAravis_detail.bob"
-      type: "related"
+support_modules:
+  # Cameras
+
+  ADAravis.aravisCamera:
+    prefix: "{{ P }}{{ R }}"
+    macros:
+      - P
+      - R
+    screens:
+      - file: "ADAravis/ADAravis_summary.bob"
+        type: "embedded"
+      - file: "ADAravis/ADAravis_detail.bob"
+        type: "related"
 
   ADUVC.UVC:
     prefix: "{{ P }}{{ R }}"
@@ -22,59 +23,59 @@ ADAravis.aravisCamera:
       - file: "$(IOC)/ADUVC.pvi.bob"
         type: "related"
 
-ADSimDetector.simDetector:
-  prefix: "{{P}}{{R}}"
-  macros:
-    P:
-    R:
-  screens:
-    - file: "ADAravis/ADAravis_summary.bob"
-      type: "embedded"
-
-ADCore.NDROI:
-  prefix: "{{P}}{{R}}"
-  macros:
-    P:
-    R:
-  screens:
-    - file: "ADAravis/NDPluginROI.pvi.bob"
-      type: "related"
-
-ADCore.NDStats:
-  prefix: "{{P}}{{R}}"
-  macros:
-    P:
-    R:
-  screens:
-    - file: "ADAravis/NDPluginStats.pvi.bob"
-      type: "related"
-
-ADCore.NDPva:
-  prefix: "{{P}}{{R}}"
-  macros:
-    P:
-    R:
-  screens:
-    - file: "ADAravis/NDPluginPva.pvi.bob"
-      type: "related"
-
-ADCore.NDFileHDF5:
-  prefix: "{{P}}{{R}}"
-  macros:
-    P:
-    R:
-  screens:
-    - file: "ADAravis/NDFileHDF5.pvi.bob"
-      type: "related"
-
-ADCore.NDROIStat:
-  prefix: "{{P}}{{R}}"
-  macros:
-    P:
-    R:
-  screens:
-    - file: "ADAravis/NDPluginROIStat.pvi.bob"
-      type: "related"
+  ADSimDetector.simDetector:
+    prefix: "{{ P }}{{ R }}"
+    macros:
+      - P
+      - R
+    screens:
+      - file: "ADAravis/ADAravis_summary.bob"
+        type: "embedded"
+
+  ADCore.NDROI:
+    prefix: "{{ P }}{{ R }}"
+    macros:
+      - P
+      - R
+    screens:
+      - file: "ADAravis/NDPluginROI.pvi.bob"
+        type: "related"
+
+  ADCore.NDStats:
+    prefix: "{{ P }}{{ R }}"
+    macros:
+      - P
+      - R
+    screens:
+      - file: "ADAravis/NDPluginStats.pvi.bob"
+        type: "related"
+
+  ADCore.NDPva:
+    prefix: "{{ P }}{{ R }}"
+    macros:
+      - P
+      - R
+    screens:
+      - file: "ADAravis/NDPluginPva.pvi.bob"
+        type: "related"
+
+  ADCore.NDFileHDF5:
+    prefix: "{{ P }}{{ R }}"
+    macros:
+      - P
+      - R
+    screens:
+      - file: "ADAravis/NDFileHDF5.pvi.bob"
+        type: "related"
+
+  ADCore.NDROIStat:
+    prefix: "{{ P }}{{ R }}"
+    macros:
+      - P
+      - R
+    screens:
+      - file: "ADAravis/NDPluginROIStat.pvi.bob"
+        type: "related"
 
   ADUVC.ADCore.NDROI:
     prefix: "{{ P }}{{ R }}"
@@ -112,143 +113,143 @@ ADCore.NDROIStat:
       - file: "$(IOC)/NDFileHDF5.pvi.bob"
         type: "related"
 
-detectorPlugins.detectorPlugins:
-  prefix: "{{P}}{{R}}"
-  macros:
-    P:
-    R:
-  screens:
-    - file: "ADAravis/NDPluginStats.pvi.bob"
-      suffix: ":STAT:"
-      type: "related"
-    - file: "ADAravis/NDPluginPva.pvi.bob"
-      suffix: ":PVA:"
-      type: "related"
-    - file: "ADAravis/NDPluginROIStat.pvi.bob"
-      suffix: ":ROISTAT:"
-      type: "related"
-    - file: "ADAravis/NDFileHDF5.pvi.bob"
-      suffix: ":HDF5:"
-      type: "related"
-  #TODO: Legacy support
-
-Detector.plugins:
-  prefix: "{{P}}{{R}}"
-  macros:
-    P:
-    R:
-  screens:
-    - file: "ADAravis/NDPluginStats.pvi.bob"
-      type: "related"
-    - file: "ADAravis/NDPluginPva.pvi.bob"
-      type: "related"
-    - file: "ADAravis/NDPluginROIStat.pvi.bob"
-      type: "related"
-    - file: "ADAravis/NDFileHDF5.pvi.bob"
-      type: "related"
-
-# Motion Controllers
-
-pmac.dls_pmac_asyn_motor:
-  prefix: "{{P}}{{M}}"
-  macros:
-    P:
-    M:
-  screens:
-    - file: "pmac/motor_embed.bob"
-      type: "embedded"
-
-pmac.GeoBrick:
-  prefix: "{{P}}"
-  macros:
-    P:
-  screens:
-    - file: "pmac/pmacController.bob"
-      type: "related"
-
-pmac.PowerPMAC:
-  prefix: "{{P}}"
-  macros:
-    P:
-  screens:
-    - file: "pmac/ppmacController.bob"
-      type: "related"
-
-pmacUtil.dls_pmac_asyn_motor_no_coord:
-  prefix: "{{P}}{{M}}"
-  macros:
-    P:
-    M:
-  screens:
-    - file: "pmac/motor_embed.bob"
-      type: "embedded"
-
-# Vacuum
-
-mks937a.mks937a:
-  prefix: "{{P}}"
-  macros:
-    P:
-  screens:
-    - file: "mks937a/mks937a.bob"
-      type: "embedded"
-
-mks937a.mks937aImg:
-  prefix: "{{P}}"
-  macros:
-    P:
-  screens:
-    - file: "mks937a/mks937aImg.bob"
-      type: "embedded"
-
-mks937a.mks937aGauge:
-  prefix: "{{P}}"
-  macros:
-    P:
-  screens:
-    - file: "mks937a/mks937aGauge.bob"
-      type: "embedded"
-
-mks937a.mks937aPirg:
-  prefix: "{{P}}"
-  macros:
-    P:
-  screens:
-    - file: "mks937a/mks937aPirg.bob"
-      type: "embedded"
-
-digitelMpc.digitelMpcIonp:
-  prefix: "{{P}}"
-  macros:
-    P:
-  screens:
-    - file: "digitelMpc/digitelMpcIonp.bob"
-      type: "embedded"
-
-# Mirrors
-
-mff.mff:
-  prefix: "{{P}}"
-  macros:
-    P:
-  screens:
-    - file: "mff/mff.bob"
-      type: "related"
-
-alignmentMirror.mirror:
-  prefix: "{{P}}"
-  macros:
-    P:
-  screens:
-    - file: "alignmentMirror/mirror.bob"
-      type: "related"
-
-# Detectors
-
-fastcs_eiger.EigerController:
-  prefix: "{{P}}"
-  macros:
-    P:
-  screens:
-    - file: "fastcs-eiger/eigerController.bob"
-      type: "embedded"
+  detectorPlugins.detectorPlugins:
+    prefix: "{{ P }}{{ R }}"
+    macros:
+      - P
+      - R
+    screens:
+      - file: "ADAravis/NDPluginStats.pvi.bob"
+        suffix: ":STAT:"
+        type: "related"
+      - file: "ADAravis/NDPluginPva.pvi.bob"
+        suffix: ":PVA:"
+        type: "related"
+      - file: "ADAravis/NDPluginROIStat.pvi.bob"
+        suffix: ":ROISTAT:"
+        type: "related"
+      - file: "ADAravis/NDFileHDF5.pvi.bob"
+        suffix: ":HDF5:"
+        type: "related"
+    #TODO: Legacy support
+
+  Detector.plugins:
+    prefix: "{{ P }}{{ R }}"
+    macros:
+      - P
+      - R
+    screens:
+      - file: "ADAravis/NDPluginStats.pvi.bob"
+        type: "related"
+      - file: "ADAravis/NDPluginPva.pvi.bob"
+        type: "related"
+      - file: "ADAravis/NDPluginROIStat.pvi.bob"
+        type: "related"
+      - file: "ADAravis/NDFileHDF5.pvi.bob"
+        type: "related"
+
+  # Motion Controllers
+
+  pmac.dls_pmac_asyn_motor:
+    prefix: "{{ P }}{{ M }}"
+    macros:
+      - P
+      - M
+    screens:
+      - file: "pmac/motor_embed.bob"
+        type: "embedded"
+
+  pmac.GeoBrick:
+    prefix: "{{ P }}"
+    macros:
+      - P
+    screens:
+      - file: "pmac/pmacController.bob"
+        type: "related"
+
+  pmac.PowerPMAC:
+    prefix: "{{ P }}"
+    macros:
+      - P
+    screens:
+      - file: "pmac/ppmacController.bob"
+        type: "related"
+
+  pmacUtil.dls_pmac_asyn_motor_no_coord:
+    prefix: "{{ P }}{{ M }}"
+    macros:
+      - P
+      - M
+    screens:
+      - file: "pmac/motor_embed.bob"
+        type: "embedded"
+
+  # Vacuum
+
+  mks937a.mks937a:
+    prefix: "{{ P }}"
+    macros:
+      - P
+    screens:
+      - file: "mks937a/mks937a.bob"
+        type: "embedded"
+
+  mks937a.mks937aImg:
+    prefix: "{{ P }}"
+    macros:
+      - P
+    screens:
+      - file: "mks937a/mks937aImg.bob"
+        type: "embedded"
+
+  mks937a.mks937aGauge:
+    prefix: "{{ P }}"
+    macros:
+      - P
+    screens:
+      - file: "mks937a/mks937aGauge.bob"
+        type: "embedded"
+
+  mks937a.mks937aPirg:
+    prefix: "{{ P }}"
+    macros:
+      - P
+    screens:
+      - file: "mks937a/mks937aPirg.bob"
+        type: "embedded"
+
+  digitelMpc.digitelMpcIonp:
+    prefix: "{{ P }}"
+    macros:
+      - P
+    screens:
+      - file: "digitelMpc/digitelMpcIonp.bob"
+        type: "embedded"
+
+  # Mirrors
+
+  mff.mff:
+    prefix: "{{ P }}"
+    macros:
+      - P
+    screens:
+      - file: "mff/mff.bob"
+        type: "related"
+
+  alignmentMirror.mirror:
+    prefix: "{{ P }}"
+    macros:
+      - P
+    screens:
+      - file: "alignmentMirror/mirror.bob"
+        type: "related"
+
+  # Detectors
+
+  fastcs_eiger.EigerController:
+    prefix: "{{ P }}"
+    macros:
+      - P
+    screens:
+      - file: "fastcs-eiger/eigerController.bob"
+        type: "embedded"