diff --git a/.gitea/workflows/publish-site.yml b/.gitea/workflows/publish-site.yml
new file mode 100644
index 0000000..ca6d80a
--- /dev/null
+++ b/.gitea/workflows/publish-site.yml
@@ -0,0 +1,35 @@
+name: Build and Publish Site
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'docs/**'
+  workflow_dispatch:
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest-intranet
+    container:
+      image: gitea.psi.ch/images/alpine-zensical
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Build page
+        run: /opt/python-env/bin/zensical build
+
+      - name: Configure Git
+        run: |
+          git config --global user.name "Gitea Actions"
+          git config --global user.email "actions@gitea.local"
+
+      - name: Push to gitea-pages branch
+        run: |
+          git checkout --orphan gitea-pages
+          git reset --hard
+          mv site/* .
+          git add .
+          git commit -m "Update site - $(date)"
+          git push -f https://${{ secrets.GITHUB_TOKEN }}@gitea.psi.ch/${{ github.repository }}.git gitea-pages
diff --git a/docs-unpublished/README.md b/docs-unpublished/README.md
new file mode 100644
index 0000000..a819865
--- /dev/null
+++ b/docs-unpublished/README.md
@@ -0,0 +1,3 @@
+# Unpublished docs
+
+Any docs in this subfolder will not be published to the Gitea Pages docs.
diff --git a/docs/developer/steps.md b/docs-unpublished/steps.md
similarity index 100%
rename from docs/developer/steps.md
rename to docs-unpublished/steps.md
diff --git a/docs/developer/cicd_runner.md b/docs/developer/cicd_runner.md
index 520166a..a43584d 100644
--- a/docs/developer/cicd_runner.md
+++ b/docs/developer/cicd_runner.md
@@ -1,17 +1,18 @@
 # CI/CD Runner
 
-## Host
+## Hosts
 
-TODO: Should we have a dedicated runner server?
-
-sls-vserv-bd-01-dev
+- `sls-vserv-bd-01(-dev)`
+    - Runs shellbox commands (and `ioc install ...`?)
+- `sls-vserv-bd-hla01(-dev)`
+    - Runs everything else
 
 ## Setup
 
 Resources:
 
- - https://docs.gitea.com/usage/actions/act-runner
- - https://linux.psi.ch/documentation/services/gitea/gitea-runner/
+- https://docs.gitea.com/usage/actions/act-runner
+- https://linux.psi.ch/documentation/services/gitea/gitea-runner/
 
 Register the runner: (by default the name is the machine name `sls-vserv-bd-hla01-dev.psi.ch`)
 ```
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 0000000..0d87f82
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,3 @@
+# Overview
+
+Documentation for the SLS 2.0 High Level Applications Framework
diff --git a/services/orbitbump/current/ioc/AGEBD-CPCL-ORBITBUMP_main.subs b/services/orbitbump/current/ioc/AGEBD-CPCL-ORBITBUMP_main.subs
index e485117..c6b7f96 100644
--- a/services/orbitbump/current/ioc/AGEBD-CPCL-ORBITBUMP_main.subs
+++ b/services/orbitbump/current/ioc/AGEBD-CPCL-ORBITBUMP_main.subs
@@ -1,62 +1,62 @@
 file ORBITBUMP_machine.template {
   pattern
-  {sourcepoint      beamline           LOX  HIX   X   LOXP HIXP  XP  LOY  HIY  Y   LOYP HIYP YP   BPM1             C1xx      C1xpx      C1yy       C1ypy       BPM2              C2xx     C2xpx    C2yy     C2ypy      BPM3              C3xx     C3xpx  C3yy     C3ypy     BPM4              C4xx     C4xpx     C4yy      C4ypy}
+  {DEVICE                                   sourcepoint      beamline           LOX  HIX   X   LOXP HIXP  XP  LOY  HIY  Y   LOYP HIYP YP   BPM1             C1xx      C1xpx      C1yy       C1ypy       BPM2              C2xx     C2xpx    C2yy     C2ypy      BPM3              C3xx     C3xpx  C3yy     C3ypy     BPM4              C4xx     C4xpx     C4yy      C4ypy}
   # Diagnostic dipole beamlines
-  {X01DD            NEMO              -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS01-DBPM-1080   -0.0009920 -0.0006308 -0.0001141 0.0001109  ARS01-DBPM-1460   0.9742755 -0.1432472 0.9455447 -0.0865934   ARS01-DBPM-1900   0.9277200 1.0454287 0.1445141 1.5920941   ARS01-DBPM-2410   -0.0809412 -0.0384293 0.0058229 0.1036650}
-  {X08DB            DISCO             -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS08-DBPM-1900   -0.2500389 -0.0365053 0.0001023 0.0000595   ARS08-DBPM-2410   1.2775662 -0.9246414 0.5814965 -0.4999301   ARS08-DBPM-2910   0.6885552 0.9211364 0.4873898 1.7550023   ARS08-DBPM-4220   -0.2391394 -0.0169593 0.0309046 0.1234665}
-  {X10DG            X11HEAT           -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS10-DBPM-4720   -0.0187    -0.0188    0         0           ARS10-DBPM-5250   1.6016    -1.2108    0.5496    -0.5376      ARS10-DBPM-5880   0.7075    1.0654    1.1093    1.9515      ARS11-DBPM-0850   0.0026      0.0044    0.0166    0.0304}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X01DD            NEMO              -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS01-DBPM-1080   -0.0009920 -0.0006308 -0.0001141 0.0001109  ARS01-DBPM-1460   0.9742755 -0.1432472 0.9455447 -0.0865934   ARS01-DBPM-1900   0.9277200 1.0454287 0.1445141 1.5920941   ARS01-DBPM-2410   -0.0809412 -0.0384293 0.0058229 0.1036650}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X08DB            DISCO             -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS08-DBPM-1900   -0.2500389 -0.0365053 0.0001023 0.0000595   ARS08-DBPM-2410   1.2775662 -0.9246414 0.5814965 -0.4999301   ARS08-DBPM-2910   0.6885552 0.9211364 0.4873898 1.7550023   ARS08-DBPM-4220   -0.2391394 -0.0169593 0.0309046 0.1234665}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X10DG            X11HEAT           -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS10-DBPM-4720   -0.0187    -0.0188    0         0           ARS10-DBPM-5250   1.6016    -1.2108    0.5496    -0.5376      ARS10-DBPM-5880   0.7075    1.0654    1.1093    1.9515      ARS11-DBPM-0850   0.0026      0.0044    0.0166    0.0304}
   # User dipole beamlines
-  {X01DA            DEBYE             -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS01-DBPM-2410   -0.2169694 -0.0006291 0.0001170 0.0000325   ARS01-DBPM-2910   1.2765938 -0.9208697 0.5792863 -0.5011470   ARS01-DBPM-4220   0.6866207 0.9198858 0.4842977 1.7595080   ARS01-DBPM-4720   -0.1924402 0.0258918 0.0307458 0.1239361}
-  {X02DA            S-TOMCAT          -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS02-DBPM-2410   -0.2089937 0.0072435 0.0001169 0.0000325   ARS02-DBPM-2910   1.2772588 -0.9200089 0.5792866 -0.5011606   ARS02-DBPM-4220   0.6864959 0.9194778 0.4843170 1.7595616   ARS02-DBPM-4720   -0.1833930 0.0352770 0.0307471 0.1239392}
-  {X03DA            PEARL             -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS03-DBPM-2410   -0.2016647 0.0152728 0.0001171 0.0000326   ARS03-DBPM-2910   1.2831552 -0.9190247 0.5819894 -0.5004911   ARS03-DBPM-4220   0.6905553 0.9206615 0.4875028 1.7552635   ARS03-DBPM-4720   -0.1749243 0.0438144 0.0309089 0.1234182}
-  {X04DB            VUV               -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS04-DBPM-1900   -0.1917962 0.0214714 0.0001022 0.0000595   ARS04-DBPM-2410   1.2842031 -0.9179380 0.5814999 -0.5000284   ARS04-DBPM-2910   0.6887599 0.9211626 0.4874732 1.7553295   ARS04-DBPM-4220   -0.1710439 0.0514609 0.0309080 0.1234788}
-  {X05DA            Optics            -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS05-DBPM-2410   -0.2740176 -0.0571105 0.0001170 0.0000321   ARS05-DBPM-2910   1.2732647 -0.9287209 0.5819890 -0.5003730   ARS05-DBPM-4220   0.6913367 0.9213802 0.4873370 1.7548006   ARS05-DBPM-4720   -0.2592981 -0.0408063 0.0308988 0.1233928}
-  {X06DA            PXIII             -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS06-DBPM-2410   -0.2675305 -0.0508248 0.0001170 0.0000321   ARS06-DBPM-2910   1.2749858 -0.9266845 0.5818007 -0.5004548   ARS06-DBPM-4220   0.6916389 0.9218001 0.4871613 1.7552275   ARS06-DBPM-4720   -0.2517260 -0.0332473 0.0308895 0.1234316}
-  {X07DB            nanoXAS           -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS07-DBPM-1900   -0.2563387 -0.0425222 0.0001023 0.0000596   ARS07-DBPM-2410   1.2761628 -0.9263027 0.5814954 -0.4999177   ARS07-DBPM-2910   0.6888233 0.9216262 0.4873810 1.7549631   ARS07-DBPM-4220   -0.2469055 -0.0248794 0.0309043 0.1234651}
-  {X07DA            PolLux            -300  300   0  -150  150   0  -300  300  0  -250  250  0    ARS07-DBPM-2410   -0.2606076 -0.0450539 0.0001170 0.0000326   ARS07-DBPM-2910   1.2750718 -0.9205684 0.5819899 -0.4976199   ARS07-DBPM-4220   0.6915728 0.9246379 0.4873668 1.7572153   ARS07-DBPM-4720   -0.2433555 -0.0254434 0.0309006 0.1235450}
-  {X10DA            SuperXAS          -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS10-DBPM-2410   -0.2392400 -0.0226765 0.0001170 0.0000321   ARS10-DBPM-2910   1.2780895 -0.9235140 0.5818007 -0.5005005   ARS10-DBPM-4220   0.6911875 0.9212713 0.4872251 1.7554059   ARS10-DBPM-4720   -0.2190626 -0.0004438 0.0308933 0.1234413}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X01DA            DEBYE             -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS01-DBPM-2410   -0.2169694 -0.0006291 0.0001170 0.0000325   ARS01-DBPM-2910   1.2765938 -0.9208697 0.5792863 -0.5011470   ARS01-DBPM-4220   0.6866207 0.9198858 0.4842977 1.7595080   ARS01-DBPM-4720   -0.1924402 0.0258918 0.0307458 0.1239361}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X02DA            S-TOMCAT          -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS02-DBPM-2410   -0.2089937 0.0072435 0.0001169 0.0000325   ARS02-DBPM-2910   1.2772588 -0.9200089 0.5792866 -0.5011606   ARS02-DBPM-4220   0.6864959 0.9194778 0.4843170 1.7595616   ARS02-DBPM-4720   -0.1833930 0.0352770 0.0307471 0.1239392}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X03DA            PEARL             -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS03-DBPM-2410   -0.2016647 0.0152728 0.0001171 0.0000326   ARS03-DBPM-2910   1.2831552 -0.9190247 0.5819894 -0.5004911   ARS03-DBPM-4220   0.6905553 0.9206615 0.4875028 1.7552635   ARS03-DBPM-4720   -0.1749243 0.0438144 0.0309089 0.1234182}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X04DB            VUV               -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS04-DBPM-1900   -0.1917962 0.0214714 0.0001022 0.0000595   ARS04-DBPM-2410   1.2842031 -0.9179380 0.5814999 -0.5000284   ARS04-DBPM-2910   0.6887599 0.9211626 0.4874732 1.7553295   ARS04-DBPM-4220   -0.1710439 0.0514609 0.0309080 0.1234788}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X05DA            Optics            -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS05-DBPM-2410   -0.2740176 -0.0571105 0.0001170 0.0000321   ARS05-DBPM-2910   1.2732647 -0.9287209 0.5819890 -0.5003730   ARS05-DBPM-4220   0.6913367 0.9213802 0.4873370 1.7548006   ARS05-DBPM-4720   -0.2592981 -0.0408063 0.0308988 0.1233928}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X06DA            PXIII             -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS06-DBPM-2410   -0.2675305 -0.0508248 0.0001170 0.0000321   ARS06-DBPM-2910   1.2749858 -0.9266845 0.5818007 -0.5004548   ARS06-DBPM-4220   0.6916389 0.9218001 0.4871613 1.7552275   ARS06-DBPM-4720   -0.2517260 -0.0332473 0.0308895 0.1234316}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X07DB            nanoXAS           -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS07-DBPM-1900   -0.2563387 -0.0425222 0.0001023 0.0000596   ARS07-DBPM-2410   1.2761628 -0.9263027 0.5814954 -0.4999177   ARS07-DBPM-2910   0.6888233 0.9216262 0.4873810 1.7549631   ARS07-DBPM-4220   -0.2469055 -0.0248794 0.0309043 0.1234651}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X07DA            PolLux            -300  300   0  -150  150   0  -300  300  0  -250  250  0    ARS07-DBPM-2410   -0.2606076 -0.0450539 0.0001170 0.0000326   ARS07-DBPM-2910   1.2750718 -0.9205684 0.5819899 -0.4976199   ARS07-DBPM-4220   0.6915728 0.9246379 0.4873668 1.7572153   ARS07-DBPM-4720   -0.2433555 -0.0254434 0.0309006 0.1235450}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X10DA            SuperXAS          -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS10-DBPM-2410   -0.2392400 -0.0226765 0.0001170 0.0000321   ARS10-DBPM-2910   1.2780895 -0.9235140 0.5818007 -0.5005005   ARS10-DBPM-4220   0.6911875 0.9212713 0.4872251 1.7554059   ARS10-DBPM-4720   -0.2190626 -0.0004438 0.0308933 0.1234413}
   # ID beamlines
-  {X02SA            I-TOMCAT          -500  500   0  -150  150   0  -500  500  0  -150  150  0    ARS01-DBPM-5250   -0.0161762 0.0645315 -0.0000522 0.0002217   ARS01-DBPM-5880   1.3057217 -3.1586368 0.7340909 -1.7908669   ARS02-DBPM-1080   1.1637103 2.7703664 0.8405251 2.0415012   ARS02-DBPM-1460   0.0473369 0.1176477 0.0354851 0.0914118}
-  {X03MA            ADRESS            -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS02-DBPM-5250   -0.0056074 0.0805576 -0.0000533 0.0001427   ARS02-DBPM-5880   1.2522257 -3.5240592 0.7649336 -2.1576328   ARS03-DBPM-0810   1.1134798 3.0406278 0.8874945 2.4488073   ARS03-DBPM-1080   0.0367597 0.0902093 0.0491615 0.1421129}
-  {X04SA            ADDAMS            -500  500   0  -150  150   0  -500  500  0  -150  150  0    ARS03-DBPM-5250   0.0006041 0.0811354 -0.0000524 0.0002222   ARS03-DBPM-5880   1.3048037 -3.1594991 0.7340820 -1.7909262   ARS04-DBPM-1080   1.1649402 2.7718322 0.8405182 2.0415768   ARS04-DBPM-1460   0.0441826 0.1145073 0.0354841 0.0914133}
-  {X05LA            QUEST             -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS04-DBPM-5880   0.0008866 0.0002252 -0.0001045 0.0002529   ARS05-DBPM-0410   0.8976150 -2.8499257 1.0112790 -2.8592349   ARS05-DBPM-1080   1.0880889 5.0183256 0.9137175 4.2390359   ARS05-DBPM-1460   0.0421489 0.1947713 0.0433357 0.2067705}
-  {X06SA            PXI               -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS05-DBPM-5250   -0.0776973 0.0030268 -0.0000523 0.0002212   ARS05-DBPM-5880   1.3044906 -3.1590695 0.7341239 -1.7906420   ARS06-DBPM-1080   1.1642809 2.7699897 0.8405515 2.0412179   ARS06-DBPM-1460   0.0604868 0.1306028 0.0354886 0.0914055}
-  {X07MA            Phoenix/XTreme    -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS06-DBPM-5250   -0.0684380 0.0189547 -0.0000531 0.0001447   ARS06-DBPM-5880   1.2508776 -3.5845660 0.7649630 -2.1939024   ARS07-DBPM-0810   1.1137188 2.9863773 0.8875136 2.4060190   ARS07-DBPM-1080   0.0093629 0.0606390 0.0491634 0.1397441}
-  {X08SA            micro-XAS         -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS07-DBPM-5250   -0.0624701 0.0181621 -0.0000523 0.0002216   ARS07-DBPM-5880   1.3039931 -3.1597229 0.7341156 -1.7906968   ARS08-DBPM-1080   1.1652753 2.7714013 0.8405450 2.0412871   ARS08-DBPM-1460   0.0575855 0.1278140 0.0354876 0.0914065}
-  {X09LA            PEARL/XIL-II      -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS08-DBPM-5880   0.0011254 0.0009724 -0.0000942 0.0002317   ARS09-DBPM-0570   0.8843735 -2.4344684 1.1263977 -3.0082085   ARS09-DBPM-1080   1.0591734 3.0395499 0.9413643 2.7184391   ARS09-DBPM-1460   0.0394021 0.1139547 0.0465775 0.1402264}
-  {X10SA            PXII              -500  500   0  -150  150   0  -500  500  0  -150  150  0    ARS09-DBPM-5250   -0.0473875 0.0333454 -0.0000523 0.0002213   ARS09-DBPM-5880   1.3047178 -3.1592507 0.7341077 -1.7907518   ARS10-DBPM-1080   1.1639981 2.7701547 0.8405387 2.0413565   ARS10-DBPM-1460   0.0540084 0.1242161 0.0354869 0.0914087}
-  {X11MA            SIM               -500  500   0  -150  150   0  -500  500  0  -150  150  0    ARS10-DBPM-5250   -0.0383667 0.0514782 -0.0000499 0.0001646   ARS10-DBPM-5880   1.2526899 -3.7342542 0.7640638 -2.2804441   ARS11-DBPM-0850   1.1168967 3.1441871 0.8845808 2.5170397   ARS11-DBPM-1080   0.0219427 0.0928506 0.0546028 0.1626088}
-  {X12SA            cSAXS             -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS11-DBPM-5250   -0.0326376 0.0479239 -0.0000524 0.0002219   ARS11-DBPM-5880   1.3047910 -3.1591765 0.7340995 -1.7908066   ARS12-DBPM-1080   1.1653151 2.7718178 0.8405322 2.0414257   ARS12-DBPM-1460   0.0513287 0.1216036 0.0354860 0.0914097}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X02SA            I-TOMCAT          -500  500   0  -150  150   0  -500  500  0  -150  150  0    ARS01-DBPM-5250   -0.0161762 0.0645315 -0.0000522 0.0002217   ARS01-DBPM-5880   1.3057217 -3.1586368 0.7340909 -1.7908669   ARS02-DBPM-1080   1.1637103 2.7703664 0.8405251 2.0415012   ARS02-DBPM-1460   0.0473369 0.1176477 0.0354851 0.0914118}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X03MA            ADRESS            -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS02-DBPM-5250   -0.0056074 0.0805576 -0.0000533 0.0001427   ARS02-DBPM-5880   1.2522257 -3.5240592 0.7649336 -2.1576328   ARS03-DBPM-0810   1.1134798 3.0406278 0.8874945 2.4488073   ARS03-DBPM-1080   0.0367597 0.0902093 0.0491615 0.1421129}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X04SA            ADDAMS            -500  500   0  -150  150   0  -500  500  0  -150  150  0    ARS03-DBPM-5250   0.0006041 0.0811354 -0.0000524 0.0002222   ARS03-DBPM-5880   1.3048037 -3.1594991 0.7340820 -1.7909262   ARS04-DBPM-1080   1.1649402 2.7718322 0.8405182 2.0415768   ARS04-DBPM-1460   0.0441826 0.1145073 0.0354841 0.0914133}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X05LA            QUEST             -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS04-DBPM-5880   0.0008866 0.0002252 -0.0001045 0.0002529   ARS05-DBPM-0410   0.8976150 -2.8499257 1.0112790 -2.8592349   ARS05-DBPM-1080   1.0880889 5.0183256 0.9137175 4.2390359   ARS05-DBPM-1460   0.0421489 0.1947713 0.0433357 0.2067705}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X06SA            PXI               -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS05-DBPM-5250   -0.0776973 0.0030268 -0.0000523 0.0002212   ARS05-DBPM-5880   1.3044906 -3.1590695 0.7341239 -1.7906420   ARS06-DBPM-1080   1.1642809 2.7699897 0.8405515 2.0412179   ARS06-DBPM-1460   0.0604868 0.1306028 0.0354886 0.0914055}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X07MA            Phoenix/XTreme    -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS06-DBPM-5250   -0.0684380 0.0189547 -0.0000531 0.0001447   ARS06-DBPM-5880   1.2508776 -3.5845660 0.7649630 -2.1939024   ARS07-DBPM-0810   1.1137188 2.9863773 0.8875136 2.4060190   ARS07-DBPM-1080   0.0093629 0.0606390 0.0491634 0.1397441}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X08SA            micro-XAS         -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS07-DBPM-5250   -0.0624701 0.0181621 -0.0000523 0.0002216   ARS07-DBPM-5880   1.3039931 -3.1597229 0.7341156 -1.7906968   ARS08-DBPM-1080   1.1652753 2.7714013 0.8405450 2.0412871   ARS08-DBPM-1460   0.0575855 0.1278140 0.0354876 0.0914065}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X09LA            PEARL/XIL-II      -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS08-DBPM-5880   0.0011254 0.0009724 -0.0000942 0.0002317   ARS09-DBPM-0570   0.8843735 -2.4344684 1.1263977 -3.0082085   ARS09-DBPM-1080   1.0591734 3.0395499 0.9413643 2.7184391   ARS09-DBPM-1460   0.0394021 0.1139547 0.0465775 0.1402264}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X10SA            PXII              -500  500   0  -150  150   0  -500  500  0  -150  150  0    ARS09-DBPM-5250   -0.0473875 0.0333454 -0.0000523 0.0002213   ARS09-DBPM-5880   1.3047178 -3.1592507 0.7341077 -1.7907518   ARS10-DBPM-1080   1.1639981 2.7701547 0.8405387 2.0413565   ARS10-DBPM-1460   0.0540084 0.1242161 0.0354869 0.0914087}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X11MA            SIM               -500  500   0  -150  150   0  -500  500  0  -150  150  0    ARS10-DBPM-5250   -0.0383667 0.0514782 -0.0000499 0.0001646   ARS10-DBPM-5880   1.2526899 -3.7342542 0.7640638 -2.2804441   ARS11-DBPM-0850   1.1168967 3.1441871 0.8845808 2.5170397   ARS11-DBPM-1080   0.0219427 0.0928506 0.0546028 0.1626088}
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X12SA            cSAXS             -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS11-DBPM-5250   -0.0326376 0.0479239 -0.0000524 0.0002219   ARS11-DBPM-5880   1.3047910 -3.1591765 0.7340995 -1.7908066   ARS12-DBPM-1080   1.1653151 2.7718178 0.8405322 2.0414257   ARS12-DBPM-1460   0.0513287 0.1216036 0.0354860 0.0914097}
 }
 
 
 file ORBITBUMP_beamline.template {
   pattern
-  {sourcepoint      beamline          DRVL DRVH X    XP   Y    YP }
+  {DEVICE                                   sourcepoint      beamline          DRVL DRVH X    XP   Y    YP }
   # Diagnostic dipole beamlines
-  {X01DD            NEMO              -10  10   0    0    0    0  }
-  {X08DB            DISCO             -10  10   0    0    0    0  }
-  {X10DG            X11HEAT           -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X01DD            NEMO              -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X08DB            DISCO             -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X10DG            X11HEAT           -10  10   0    0    0    0  }
   # User dipole beamlines
-  {X01DA            DEBYE             -10  10   0    0    0    0  }
-  {X02DA            S-TOMCAT          -10  10   0    0    0    0  }
-  {X03DA            PEARL             -10  10   0    0    0    0  }
-  {X04DB            VUV               -10  10   0    0    0    0  }
-  {X05DA            Optics            -10  10   0    0    0    0  }
-  {X06DA            PXIII             -10  10   0    0    0    0  }
-  {X07DB            nanoXAS           -10  10   0    0    0    0  }
-  {X07DA            PolLux            -10  10   0    0    0    0  }
-  {X10DA            SuperXAS          -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X01DA            DEBYE             -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X02DA            S-TOMCAT          -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X03DA            PEARL             -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X04DB            VUV               -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X05DA            Optics            -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X06DA            PXIII             -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X07DB            nanoXAS           -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X07DA            PolLux            -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X10DA            SuperXAS          -10  10   0    0    0    0  }
   # ID beamlines
-  {X02SA            I-TOMCAT          -10  10   0    0    0    0  }
-  {X03MA            ADRESS            -10  10   0    0    0    0  }
-  {X04SA            ADDAMS            -10  10   0    0    0    0  }
-  {X05LA            QUEST             -10  10   0    0    0    0  }
-  {X06SA            PXI               -10  10   0    0    0    0  }
-  {X07MA            Phoenix/XTreme    -10  10   0    0    0    0  }
-  {X08SA            micro-XAS         -10  10   0    0    0    0  }
-  {X09LA            PEARL/XIL-II      -10  10   0    0    0    0  }
-  {X10SA            PXII              -10  10   0    0    0    0  }
-  {X11MA            SIM               -10  10   0    0    0    0  }
-  {X12SA            cSAXS             -10  10   0    0    0    0  }
-}
\ No newline at end of file
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X02SA            I-TOMCAT          -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X03MA            ADRESS            -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X04SA            ADDAMS            -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X05LA            QUEST             -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X06SA            PXI               -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X07MA            Phoenix/XTreme    -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X08SA            micro-XAS         -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X09LA            PEARL/XIL-II      -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X10SA            PXII              -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X11MA            SIM               -10  10   0    0    0    0  }
+  {AGEBD-ORBITBUMP{{ agebd_env_suffix }}    X12SA            cSAXS             -10  10   0    0    0    0  }
+}
diff --git a/services/orbitbump/current/ioc/ORBITBUMP_beamline.template b/services/orbitbump/current/ioc/ORBITBUMP_beamline.template
index 14ba98f..3fad8c9 100644
--- a/services/orbitbump/current/ioc/ORBITBUMP_beamline.template
+++ b/services/orbitbump/current/ioc/ORBITBUMP_beamline.template
@@ -5,7 +5,7 @@ record(ao, "$(sourcepoint)-ORBITBUMP:OFFSET-X") {
     field(PREC, "0")
     field(VAL,  "$(X)")
     field(PINI, "YES")
-    field(FLNK, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-X-TOTAL")
+    field(FLNK, "$(DEVICE):$(sourcepoint)-OFFSET-X-TOTAL")
     field(DRVH, "$(DRVH)")
     field(DRVL, "$(DRVL)")
     field(HOPR, "$(DRVH)")
@@ -27,7 +27,7 @@ record(ao, "$(sourcepoint)-ORBITBUMP:OFFSET-XP") {
     field(PREC, "0")
     field(VAL,  "$(XP)")
     field(PINI, "YES")
-    field(FLNK, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-XP-TOTAL")
+    field(FLNK, "$(DEVICE):$(sourcepoint)-OFFSET-XP-TOTAL")
     field(DRVH, "$(DRVH)")
     field(DRVL, "$(DRVL)")
     field(HOPR, "$(DRVH)")
@@ -49,7 +49,7 @@ record(ao, "$(sourcepoint)-ORBITBUMP:OFFSET-Y") {
     field(PREC, "0")
     field(VAL,  "$(Y)")
     field(PINI, "YES")
-    field(FLNK, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-Y-TOTAL")
+    field(FLNK, "$(DEVICE):$(sourcepoint)-OFFSET-Y-TOTAL")
     field(DRVH, "$(DRVH)")
     field(DRVL, "$(DRVL)")
     field(HOPR, "$(DRVH)")
@@ -71,7 +71,7 @@ record(ao, "$(sourcepoint)-ORBITBUMP:OFFSET-YP") {
     field(PREC, "0")
     field(VAL,  "$(YP)")
     field(PINI, "YES")
-    field(FLNK, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-YP-TOTAL")
+    field(FLNK, "$(DEVICE):$(sourcepoint)-OFFSET-YP-TOTAL")
     field(DRVH, "$(DRVH)")
     field(DRVL, "$(DRVL)")
     field(HOPR, "$(DRVH)")
@@ -84,4 +84,4 @@ record(ao, "$(sourcepoint)-ORBITBUMP:OFFSET-YP") {
     field(LSV,  "MINOR")
     field(LOLO, "-10")
     field(LLSV, "MAJOR")
-}
\ No newline at end of file
+}
diff --git a/services/orbitbump/current/ioc/ORBITBUMP_machine.template b/services/orbitbump/current/ioc/ORBITBUMP_machine.template
index 31b8ed0..c1ac143 100644
--- a/services/orbitbump/current/ioc/ORBITBUMP_machine.template
+++ b/services/orbitbump/current/ioc/ORBITBUMP_machine.template
@@ -1,5 +1,5 @@
 # # on request writing total bump values to machine bumps and zero beamline bumps
-# record(bo, "AGEBD-ORBITBUMP:$(sourcepoint)-COPYOVER") {
+# record(bo, "$(DEVICE):$(sourcepoint)-COPYOVER") {
 #     field(DESC, "Request zeroing of beamline offsets")
 #     field(ASG,  "PROTECTED")
 #     field(PINI, "YES")
@@ -8,7 +8,7 @@
 #     field(OUT, "myDevice:addAndZero.PROC PP")
 # }
 
-# record(seq, "AGEBD-ORBITBUMP:$(sourcepoint)-COPYOVER") {
+# record(seq, "$(DEVICE):$(sourcepoint)-COPYOVER") {
 #     field(DESC, "On trigger: add PV_A to PV_B, zero PV_A")
 
 #     field(DOL1, "myDevice:add_calc NPP NMS")   # Value = A + B
@@ -22,14 +22,14 @@
 
 
 
-record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-X") {
+record(ao, "$(DEVICE):$(sourcepoint)-OFFSET-X") {
     field(DESC, "Machine x offset for $(beamline)")
     field(ASG,  "PROTECTED")
     field(EGU,  "um")
     field(PREC, "0")
     field(VAL,  "$(X)")
     field(PINI, "YES")
-    field(FLNK, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-X-TOTAL")
+    field(FLNK, "$(DEVICE):$(sourcepoint)-OFFSET-X-TOTAL")
     field(DRVH, "$(HIX)")
     field(DRVL, "$(LOX)")
     field(HOPR, "$(HIX)")
@@ -44,14 +44,14 @@ record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-X") {
     field(LLSV, "MAJOR")
 }
 
-record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-XP") {
+record(ao, "$(DEVICE):$(sourcepoint)-OFFSET-XP") {
     field(DESC, "Machine xp offset for $(beamline)")
     field(ASG,  "PROTECTED")
     field(EGU,  "urad")
     field(PREC, "0")
     field(VAL,  "$(XP)")
     field(PINI, "YES")
-    field(FLNK, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-XP-TOTAL")
+    field(FLNK, "$(DEVICE):$(sourcepoint)-OFFSET-XP-TOTAL")
     field(DRVH, "$(HIXP)")
     field(DRVL, "$(LOXP)")
     field(HOPR, "$(HIXP)")
@@ -66,14 +66,14 @@ record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-XP") {
     field(LLSV, "MAJOR")
 }
 
-record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-Y") {
+record(ao, "$(DEVICE):$(sourcepoint)-OFFSET-Y") {
     field(DESC, "Machine y offset for $(beamline)")
     field(ASG,  "PROTECTED")
     field(EGU,  "um")
     field(PREC, "0")
     field(VAL,  "$(Y)")
     field(PINI, "YES")
-    field(FLNK, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-Y-TOTAL")
+    field(FLNK, "$(DEVICE):$(sourcepoint)-OFFSET-Y-TOTAL")
     field(DRVH, "$(HIY)")
     field(DRVL, "$(LOY)")
     field(HOPR, "$(HIY)")
@@ -88,14 +88,14 @@ record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-Y") {
     field(LLSV, "MAJOR")
 }
 
-record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-YP") {
+record(ao, "$(DEVICE):$(sourcepoint)-OFFSET-YP") {
     field(DESC, "Machine yp offset for $(beamline)")
     field(ASG,  "PROTECTED")
     field(EGU,  "urad")
     field(PREC, "0")
     field(VAL,  "$(YP)")
     field(PINI, "YES")
-    field(FLNK, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-YP-TOTAL")
+    field(FLNK, "$(DEVICE):$(sourcepoint)-OFFSET-YP-TOTAL")
     field(DRVH, "$(HIYP)")
     field(DRVL, "$(LOYP)")
     field(HOPR, "$(HIYP)")
@@ -111,17 +111,17 @@ record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-YP") {
 }
 
 # Sum PVs for total desired orbit bumps, i.e., sum of machine and beamline
-record(calcout, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-X-TOTAL") {
+record(calcout, "$(DEVICE):$(sourcepoint)-OFFSET-X-TOTAL") {
     field(DESC, "Total x offset for $(beamline)")
     field(ASG,  "READONLY")
     field(SCAN, "Passive")
     field(PREC, "0")
     field(CALC, "A + B")
-    field(INPA, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-X")
+    field(INPA, "$(DEVICE):$(sourcepoint)-OFFSET-X")
     field(INPB, "$(sourcepoint)-ORBITBUMP:OFFSET-X")
     field(OOPT, "On Change")
     field(DOPT, "Use CALC")
-    field(FLNK, "AGEBD-ORBITBUMP:$(sourcepoint)-DELTAX-BPM1")
+    field(FLNK, "$(DEVICE):$(sourcepoint)-DELTAX-BPM1")
     field(HIHI, "100")
     field(HHSV, "MAJOR")
     field(HIGH, "1")
@@ -132,17 +132,17 @@ record(calcout, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-X-TOTAL") {
     field(LLSV, "MAJOR")
 }
 
-record(calcout, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-XP-TOTAL") {
+record(calcout, "$(DEVICE):$(sourcepoint)-OFFSET-XP-TOTAL") {
     field(DESC, "Total xp offset for $(beamline)")
     field(ASG,  "READONLY")
     field(SCAN, "Passive")
     field(PREC, "0")
     field(CALC, "A + B")
-    field(INPA, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-XP")
+    field(INPA, "$(DEVICE):$(sourcepoint)-OFFSET-XP")
     field(INPB, "$(sourcepoint)-ORBITBUMP:OFFSET-XP")
     field(OOPT, "On Change")
     field(DOPT, "Use CALC")
-    field(FLNK, "AGEBD-ORBITBUMP:$(sourcepoint)-DELTAX-BPM1")
+    field(FLNK, "$(DEVICE):$(sourcepoint)-DELTAX-BPM1")
     field(HIHI, "100")
     field(HHSV, "MAJOR")
     field(HIGH, "1")
@@ -153,17 +153,17 @@ record(calcout, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-XP-TOTAL") {
     field(LLSV, "MAJOR")
 }
 
-record(calcout, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-Y-TOTAL") {
+record(calcout, "$(DEVICE):$(sourcepoint)-OFFSET-Y-TOTAL") {
     field(DESC, "Total y offset for $(beamline)")
     field(ASG,  "READONLY")
     field(SCAN, "Passive")
     field(PREC, "0")
     field(CALC, "A + B")
-    field(INPA, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-Y")
+    field(INPA, "$(DEVICE):$(sourcepoint)-OFFSET-Y")
     field(INPB, "$(sourcepoint)-ORBITBUMP:OFFSET-Y")
     field(OOPT, "On Change")
     field(DOPT, "Use CALC")
-    field(FLNK, "AGEBD-ORBITBUMP:$(sourcepoint)-DELTAY-BPM1")
+    field(FLNK, "$(DEVICE):$(sourcepoint)-DELTAY-BPM1")
     field(HIHI, "100")
     field(HHSV, "MAJOR")
     field(HIGH, "1")
@@ -174,17 +174,17 @@ record(calcout, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-Y-TOTAL") {
     field(LLSV, "MAJOR")
 }
 
-record(calcout, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-YP-TOTAL") {
+record(calcout, "$(DEVICE):$(sourcepoint)-OFFSET-YP-TOTAL") {
     field(DESC, "Total y offset for $(beamline)")
     field(ASG,  "READONLY")
     field(SCAN, "Passive")
     field(PREC, "0")
     field(CALC, "A + B")
-    field(INPA, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-YP")
+    field(INPA, "$(DEVICE):$(sourcepoint)-OFFSET-YP")
     field(INPB, "$(sourcepoint)-ORBITBUMP:OFFSET-YP")
     field(OOPT, "On Change")
     field(DOPT, "Use CALC")
-    field(FLNK, "AGEBD-ORBITBUMP:$(sourcepoint)-DELTAY-BPM1")
+    field(FLNK, "$(DEVICE):$(sourcepoint)-DELTAY-BPM1")
     field(HIHI, "100")
     field(HHSV, "MAJOR")
     field(HIGH, "1")
@@ -197,14 +197,14 @@ record(calcout, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-YP-TOTAL") {
 
 # BPM1, C1xx,  C1xpx,  C1yy,  C1ypy,
 
-record(stringout, "AGEBD-ORBITBUMP:$(sourcepoint)-BPM1") {
+record(stringout, "$(DEVICE):$(sourcepoint)-BPM1") {
     field(DESC, "$(BPM1)")
     field(ASG,  "READONLY")
     field(VAL,  "$(BPM1)")
     field(PINI, "YES")
 }
 
-record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C1xx") {
+record(ao, "$(DEVICE):$(sourcepoint)-C1xx") {
     field(DESC, "Coefficient dx2dx at $(BPM1)")
     field(ASG,  "READONLY")
     field(EGU,  "mm/mm")
@@ -213,7 +213,7 @@ record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C1xx") {
     field(PINI, "YES")
 }
 
-record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C1xpx") {
+record(ao, "$(DEVICE):$(sourcepoint)-C1xpx") {
     field(DESC, "Coefficient dxp2dx at $(BPM1)")
     field(ASG,  "READONLY")
     field(EGU,  "mm/mrad")
@@ -222,7 +222,7 @@ record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C1xpx") {
     field(PINI, "YES")
 }
 
-record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C1yy") {
+record(ao, "$(DEVICE):$(sourcepoint)-C1yy") {
     field(DESC, "Coefficient dy2dy at $(BPM1)")
     field(ASG,  "READONLY")
     field(EGU,  "mm/mm")
@@ -231,7 +231,7 @@ record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C1yy") {
     field(PINI, "YES")
 }
 
-record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C1ypy") {
+record(ao, "$(DEVICE):$(sourcepoint)-C1ypy") {
     field(DESC, "Coefficient dyp2dy at $(BPM1)")
     field(ASG,  "READONLY")
     field(EGU,  "mm/mrad")
@@ -240,48 +240,48 @@ record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C1ypy") {
     field(PINI, "YES")
 }
 
-record(calcout, "AGEBD-ORBITBUMP:$(sourcepoint)-DELTAX-BPM1") {
+record(calcout, "$(DEVICE):$(sourcepoint)-DELTAX-BPM1") {
     field(DESC, "Hor. change for $(BPM1)")
     field(ASG,  "READONLY")
     field(SCAN, "Passive")
     field(PREC, "3")
     field(CALC, "A*B/1000 + C*D/1000")
-    field(INPA, "AGEBD-ORBITBUMP:$(sourcepoint)-C1xx")
-    field(INPB, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-X-TOTAL")
-    field(INPC, "AGEBD-ORBITBUMP:$(sourcepoint)-C1xpx")
-    field(INPD, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-XP-TOTAL")
+    field(INPA, "$(DEVICE):$(sourcepoint)-C1xx")
+    field(INPB, "$(DEVICE):$(sourcepoint)-OFFSET-X-TOTAL")
+    field(INPC, "$(DEVICE):$(sourcepoint)-C1xpx")
+    field(INPD, "$(DEVICE):$(sourcepoint)-OFFSET-XP-TOTAL")
     field(OOPT, "On Change")
     field(DOPT, "Use CALC")
     field(OUT,  "$(BPM1):X-B-REF-OP")
-    field(FLNK, "AGEBD-ORBITBUMP:$(sourcepoint)-DELTAX-BPM2")
+    field(FLNK, "$(DEVICE):$(sourcepoint)-DELTAX-BPM2")
 }
 
-record(calcout, "AGEBD-ORBITBUMP:$(sourcepoint)-DELTAY-BPM1") {
+record(calcout, "$(DEVICE):$(sourcepoint)-DELTAY-BPM1") {
     field(DESC, "Hor. change for $(BPM1)")
     field(ASG,  "READONLY")
     field(SCAN, "Passive")
     field(PREC, "3")
     field(CALC, "A*B/1000 + C*D/1000")
-    field(INPA, "AGEBD-ORBITBUMP:$(sourcepoint)-C1yy")
-    field(INPB, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-Y-TOTAL")
-    field(INPC, "AGEBD-ORBITBUMP:$(sourcepoint)-C1ypy")
-    field(INPD, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-YP-TOTAL")
+    field(INPA, "$(DEVICE):$(sourcepoint)-C1yy")
+    field(INPB, "$(DEVICE):$(sourcepoint)-OFFSET-Y-TOTAL")
+    field(INPC, "$(DEVICE):$(sourcepoint)-C1ypy")
+    field(INPD, "$(DEVICE):$(sourcepoint)-OFFSET-YP-TOTAL")
     field(OOPT, "On Change")
     field(DOPT, "Use CALC")
     field(OUT,  "$(BPM1):Y-B-REF-OP")
-    field(FLNK, "AGEBD-ORBITBUMP:$(sourcepoint)-DELTAY-BPM2")
+    field(FLNK, "$(DEVICE):$(sourcepoint)-DELTAY-BPM2")
 }
 
 # BPM2, C2xx,  C2xpx,  C2yy,  C2ypy,
 
-record(stringout, "AGEBD-ORBITBUMP:$(sourcepoint)-BPM2") {
+record(stringout, "$(DEVICE):$(sourcepoint)-BPM2") {
     field(DESC, "$(BPM2)")
     field(ASG,  "READONLY")
     field(VAL,  "$(BPM2)")
     field(PINI, "YES")
 }
 
-record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C2xx") {
+record(ao, "$(DEVICE):$(sourcepoint)-C2xx") {
     field(DESC, "Coefficient dx2dx at $(BPM2)")
     field(ASG,  "READONLY")
     field(EGU,  "mm/mm")
@@ -290,7 +290,7 @@ record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C2xx") {
     field(PINI, "YES")
 }
 
-record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C2xpx") {
+record(ao, "$(DEVICE):$(sourcepoint)-C2xpx") {
     field(DESC, "Coefficient dxp2dx at $(BPM2)")
     field(ASG,  "READONLY")
     field(EGU,  "mm/mrad")
@@ -299,7 +299,7 @@ record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C2xpx") {
     field(PINI, "YES")
 }
 
-record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C2yy") {
+record(ao, "$(DEVICE):$(sourcepoint)-C2yy") {
     field(DESC, "Coefficient dy2dy at $(BPM2)")
     field(ASG,  "READONLY")
     field(EGU,  "mm/mm")
@@ -308,7 +308,7 @@ record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C2yy") {
     field(PINI, "YES")
 }
 
-record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C2ypy") {
+record(ao, "$(DEVICE):$(sourcepoint)-C2ypy") {
     field(DESC, "Coefficient dyp2dy at $(BPM2)")
     field(ASG,  "READONLY")
     field(EGU,  "mm/mrad")
@@ -317,50 +317,50 @@ record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C2ypy") {
     field(PINI, "YES")
 }
 
-record(calcout, "AGEBD-ORBITBUMP:$(sourcepoint)-DELTAX-BPM2") {
+record(calcout, "$(DEVICE):$(sourcepoint)-DELTAX-BPM2") {
     field(DESC, "Hor. change for $(BPM2)")
     field(ASG,  "READONLY")
     field(SCAN, "Passive")
     field(PREC, "3")
     field(CALC, "A*B/1000 + C*D/1000")
-    field(INPA, "AGEBD-ORBITBUMP:$(sourcepoint)-C2xx")
-    field(INPB, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-X-TOTAL")
-    field(INPC, "AGEBD-ORBITBUMP:$(sourcepoint)-C2xpx")
-    field(INPD, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-XP-TOTAL")
+    field(INPA, "$(DEVICE):$(sourcepoint)-C2xx")
+    field(INPB, "$(DEVICE):$(sourcepoint)-OFFSET-X-TOTAL")
+    field(INPC, "$(DEVICE):$(sourcepoint)-C2xpx")
+    field(INPD, "$(DEVICE):$(sourcepoint)-OFFSET-XP-TOTAL")
     field(INPE, "$(sourcepoint)-ORBITBUMP:OFFSET-X")
     field(INPF, "$(sourcepoint)-ORBITBUMP:OFFSET-XP")
     field(OOPT, "On Change")
     field(DOPT, "Use CALC")
     field(OUT,  "$(BPM2):X-B-REF-OP")
-    field(FLNK, "AGEBD-ORBITBUMP:$(sourcepoint)-DELTAX-BPM3")
+    field(FLNK, "$(DEVICE):$(sourcepoint)-DELTAX-BPM3")
 }
 
-record(calcout, "AGEBD-ORBITBUMP:$(sourcepoint)-DELTAY-BPM2") {
+record(calcout, "$(DEVICE):$(sourcepoint)-DELTAY-BPM2") {
     field(DESC, "Hor. change for $(BPM2)")
     field(ASG,  "READONLY")
     field(SCAN, "Passive")
     field(PREC, "3")
     field(CALC, "A*B/1000 + C*D/1000")
-    field(INPA, "AGEBD-ORBITBUMP:$(sourcepoint)-C2yy")
-    field(INPB, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-Y-TOTAL")
-    field(INPC, "AGEBD-ORBITBUMP:$(sourcepoint)-C2ypy")
-    field(INPD, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-YP-TOTAL")
+    field(INPA, "$(DEVICE):$(sourcepoint)-C2yy")
+    field(INPB, "$(DEVICE):$(sourcepoint)-OFFSET-Y-TOTAL")
+    field(INPC, "$(DEVICE):$(sourcepoint)-C2ypy")
+    field(INPD, "$(DEVICE):$(sourcepoint)-OFFSET-YP-TOTAL")
     field(OOPT, "On Change")
     field(DOPT, "Use CALC")
     field(OUT,  "$(BPM2):Y-B-REF-OP")
-    field(FLNK, "AGEBD-ORBITBUMP:$(sourcepoint)-DELTAY-BPM3")
+    field(FLNK, "$(DEVICE):$(sourcepoint)-DELTAY-BPM3")
 }
 
 # BPM3, C3xx,  C3xpx,  C3yy,  C3ypy,
 
-record(stringout, "AGEBD-ORBITBUMP:$(sourcepoint)-BPM3") {
+record(stringout, "$(DEVICE):$(sourcepoint)-BPM3") {
     field(DESC, "$(BPM3)")
     field(VAL,  "$(BPM3)")
     field(ASG,  "READONLY")
     field(PINI, "YES")
 }
 
-record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C3xx") {
+record(ao, "$(DEVICE):$(sourcepoint)-C3xx") {
     field(DESC, "Coefficient dx2dx at $(BPM3)")
     field(EGU,  "mm/mm")
     field(PREC, "3")
@@ -368,7 +368,7 @@ record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C3xx") {
     field(PINI, "YES")
 }
 
-record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C3xpx") {
+record(ao, "$(DEVICE):$(sourcepoint)-C3xpx") {
     field(DESC, "Coefficient dxp2dx at $(BPM3)")
     field(EGU,  "mm/mrad")
     field(PREC, "3")
@@ -376,7 +376,7 @@ record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C3xpx") {
     field(PINI, "YES")
 }
 
-record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C3yy") {
+record(ao, "$(DEVICE):$(sourcepoint)-C3yy") {
     field(DESC, "Coefficient dy2dy at $(BPM3)")
     field(EGU,  "mm/mm")
     field(PREC, "3")
@@ -384,7 +384,7 @@ record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C3yy") {
     field(PINI, "YES")
 }
 
-record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C3ypy") {
+record(ao, "$(DEVICE):$(sourcepoint)-C3ypy") {
     field(DESC, "Coefficient dyp2dy at $(BPM3)")
     field(EGU,  "mm/mrad")
     field(PREC, "3")
@@ -392,50 +392,50 @@ record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C3ypy") {
     field(PINI, "YES")
 }
 
-record(calcout, "AGEBD-ORBITBUMP:$(sourcepoint)-DELTAX-BPM3") {
+record(calcout, "$(DEVICE):$(sourcepoint)-DELTAX-BPM3") {
     field(DESC, "Hor. change for $(BPM3)")
     field(ASG,  "READONLY")
     field(SCAN, "Passive")
     field(PREC, "3")
     field(CALC, "A*B/1000 + C*D/1000")
-    field(INPA, "AGEBD-ORBITBUMP:$(sourcepoint)-C3xx")
-    field(INPB, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-X-TOTAL")
-    field(INPC, "AGEBD-ORBITBUMP:$(sourcepoint)-C3xpx")
-    field(INPD, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-XP-TOTAL")
+    field(INPA, "$(DEVICE):$(sourcepoint)-C3xx")
+    field(INPB, "$(DEVICE):$(sourcepoint)-OFFSET-X-TOTAL")
+    field(INPC, "$(DEVICE):$(sourcepoint)-C3xpx")
+    field(INPD, "$(DEVICE):$(sourcepoint)-OFFSET-XP-TOTAL")
     field(INPE, "$(sourcepoint)-ORBITBUMP:OFFSET-X")
     field(INPF, "$(sourcepoint)-ORBITBUMP:OFFSET-XP")
     field(OOPT, "On Change")
     field(DOPT, "Use CALC")
     field(OUT,  "$(BPM3):X-B-REF-OP")
-    field(FLNK, "AGEBD-ORBITBUMP:$(sourcepoint)-DELTAX-BPM4")
+    field(FLNK, "$(DEVICE):$(sourcepoint)-DELTAX-BPM4")
 }
 
-record(calcout, "AGEBD-ORBITBUMP:$(sourcepoint)-DELTAY-BPM3") {
+record(calcout, "$(DEVICE):$(sourcepoint)-DELTAY-BPM3") {
     field(DESC, "Hor. change for $(BPM3)")
     field(ASG,  "READONLY")
     field(SCAN, "Passive")
     field(PREC, "3")
     field(CALC, "A*B/1000 + C*D/1000")
-    field(INPA, "AGEBD-ORBITBUMP:$(sourcepoint)-C3yy")
-    field(INPB, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-Y-TOTAL")
-    field(INPC, "AGEBD-ORBITBUMP:$(sourcepoint)-C3ypy")
-    field(INPD, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-YP-TOTAL")
+    field(INPA, "$(DEVICE):$(sourcepoint)-C3yy")
+    field(INPB, "$(DEVICE):$(sourcepoint)-OFFSET-Y-TOTAL")
+    field(INPC, "$(DEVICE):$(sourcepoint)-C3ypy")
+    field(INPD, "$(DEVICE):$(sourcepoint)-OFFSET-YP-TOTAL")
     field(OOPT, "On Change")
     field(DOPT, "Use CALC")
     field(OUT,  "$(BPM3):Y-B-REF-OP")
-    field(FLNK, "AGEBD-ORBITBUMP:$(sourcepoint)-DELTAY-BPM4")
+    field(FLNK, "$(DEVICE):$(sourcepoint)-DELTAY-BPM4")
 }
 
 # BPM4, C4xx,  C4xpx,  C4yy,  C4ypy,
 
-record(stringout, "AGEBD-ORBITBUMP:$(sourcepoint)-BPM4") {
+record(stringout, "$(DEVICE):$(sourcepoint)-BPM4") {
     field(DESC, "$(BPM4)")
     field(ASG,  "READONLY")
     field(VAL,  "$(BPM4)")
     field(PINI, "YES")
 }
 
-record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C4xx") {
+record(ao, "$(DEVICE):$(sourcepoint)-C4xx") {
     field(DESC, "Coefficient dx2dx at $(BPM4)")
     field(ASG,  "READONLY")
     field(EGU,  "mm/mm")
@@ -444,7 +444,7 @@ record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C4xx") {
     field(PINI, "YES")
 }
 
-record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C4xpx") {
+record(ao, "$(DEVICE):$(sourcepoint)-C4xpx") {
     field(DESC, "Coefficient dxp2dx at $(BPM4)")
     field(ASG,  "READONLY")
     field(EGU,  "mm/mrad")
@@ -453,7 +453,7 @@ record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C4xpx") {
     field(PINI, "YES")
 }
 
-record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C4yy") {
+record(ao, "$(DEVICE):$(sourcepoint)-C4yy") {
     field(DESC, "Coefficient dy2dy at $(BPM4)")
     field(ASG,  "READONLY")
     field(EGU,  "mm/mm")
@@ -462,7 +462,7 @@ record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C4yy") {
     field(PINI, "YES")
 }
 
-record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C4ypy") {
+record(ao, "$(DEVICE):$(sourcepoint)-C4ypy") {
     field(DESC, "Coefficient dyp2dy at $(BPM4)")
     field(ASG,  "READONLY")
     field(EGU,  "mm/mrad")
@@ -471,16 +471,16 @@ record(ao, "AGEBD-ORBITBUMP:$(sourcepoint)-C4ypy") {
     field(PINI, "YES")
 }
 
-record(calcout, "AGEBD-ORBITBUMP:$(sourcepoint)-DELTAX-BPM4") {
+record(calcout, "$(DEVICE):$(sourcepoint)-DELTAX-BPM4") {
     field(DESC, "Hor. change for $(BPM4)")
     field(ASG,  "READONLY")
     field(SCAN, "Passive")
     field(PREC, "3")
     field(CALC, "A*B/1000 + C*D/1000")
-    field(INPA, "AGEBD-ORBITBUMP:$(sourcepoint)-C4xx")
-    field(INPB, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-X-TOTAL")
-    field(INPC, "AGEBD-ORBITBUMP:$(sourcepoint)-C4xpx")
-    field(INPD, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-XP-TOTAL")
+    field(INPA, "$(DEVICE):$(sourcepoint)-C4xx")
+    field(INPB, "$(DEVICE):$(sourcepoint)-OFFSET-X-TOTAL")
+    field(INPC, "$(DEVICE):$(sourcepoint)-C4xpx")
+    field(INPD, "$(DEVICE):$(sourcepoint)-OFFSET-XP-TOTAL")
     field(INPE, "$(sourcepoint)-ORBITBUMP:OFFSET-X")
     field(INPF, "$(sourcepoint)-ORBITBUMP:OFFSET-XP")
     field(OOPT, "On Change")
@@ -488,17 +488,17 @@ record(calcout, "AGEBD-ORBITBUMP:$(sourcepoint)-DELTAX-BPM4") {
     field(OUT,  "$(BPM4):X-B-REF-OP")
 }
 
-record(calcout, "AGEBD-ORBITBUMP:$(sourcepoint)-DELTAY-BPM4") {
+record(calcout, "$(DEVICE):$(sourcepoint)-DELTAY-BPM4") {
     field(DESC, "Hor. change for $(BPM4)")
     field(ASG,  "READONLY")
     field(SCAN, "Passive")
     field(PREC, "3")
     field(CALC, "A*B/1000 + C*D/1000")
-    field(INPA, "AGEBD-ORBITBUMP:$(sourcepoint)-C4yy")
-    field(INPB, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-Y-TOTAL")
-    field(INPC, "AGEBD-ORBITBUMP:$(sourcepoint)-C4ypy")
-    field(INPD, "AGEBD-ORBITBUMP:$(sourcepoint)-OFFSET-YP-TOTAL")
+    field(INPA, "$(DEVICE):$(sourcepoint)-C4yy")
+    field(INPB, "$(DEVICE):$(sourcepoint)-OFFSET-Y-TOTAL")
+    field(INPC, "$(DEVICE):$(sourcepoint)-C4ypy")
+    field(INPD, "$(DEVICE):$(sourcepoint)-OFFSET-YP-TOTAL")
     field(OOPT, "On Change")
     field(DOPT, "Use CALC")
     field(OUT,  "$(BPM4):Y-B-REF-OP")
-}
\ No newline at end of file
+}
diff --git a/zensical.toml b/zensical.toml
new file mode 100644
index 0000000..7e44c89
--- /dev/null
+++ b/zensical.toml
@@ -0,0 +1,56 @@
+[project]
+repo_url = "https://gitea.psi.ch/sls/hla_framework_bd"
+edit_uri = "_edit/main/docs/"
+
+site_name = "SLS 2.0 High Level Applications Framework"
+
+site_description = """
+Documentation for SLS 2.0 High Level Applications Framework
+"""
+
+site_author = "Paul Scherrer Institute"
+
+site_url = "https://sls.pages.psi.ch/hla_framework_bd/"
+
+copyright = """
+Copyright © 2026 Paul Scherrer Institute
+"""
+
+language = "en"
+
+features = [
+    "announce.dismiss",
+    "content.action.edit",
+    "content.code.annotate",
+    "content.code.copy",
+    "content.code.select",
+    "content.footnote.tooltips",
+    "content.tabs.link",
+    "content.tooltips",
+    "navigation.footer",
+    "navigation.indexes",
+    "navigation.instant",
+    "navigation.instant.prefetch",
+    "navigation.path",
+    "search.highlight",
+    "navigation.top",
+    "navigation.tracking",
+]
+
+[project.theme]
+# do not use google fonts
+font = false
+
+[[project.theme.palette]]
+scheme = "default"
+toggle.icon = "lucide/sun"
+toggle.name = "Switch to dark mode"
+
+[[project.theme.palette]]
+scheme = "slate"
+toggle.icon = "lucide/moon"
+toggle.name = "Switch to light mode"
+
+[project.theme.icon]
+logo = "simple/gitea"
+repo = "simple/gitea"