diff --git a/X_X11MA_Undulator.json b/X_X11MA_Undulator.json
index 48ed1c7..308cd2c 100644
--- a/X_X11MA_Undulator.json
+++ b/X_X11MA_Undulator.json
@@ -4,25 +4,33 @@
             "type": "title",
             "text": "- Undulator -"
         },
-        {
-            "type": "cmd",
+	{
+            "type": "caqtdm",
             "text": "ID1 Gap",
-            "command": "caqtdm -noMsg -macro DEVICE=X11MA-ID1 -attach X_ID_GapShift.ui"
+            "panel": "Gap.ui",
+            "macros": "DEVICE=X11MA-UIND1",
+            "param": "-noMsg -attach -stylefile slses.qss"
         },
-        {
-            "type": "cmd",
+	{
+            "type": "caqtdm",
             "text": "ID2 Gap",
-            "command": "caqtdm -noMsg -macro DEVICE=X11MA-ID2 -attach X_ID_GapShift.ui"
+            "panel": "Gap.ui",
+            "macros": "DEVICE=X11MA-UIND2",
+            "param": "-noMsg -attach -stylefile slses.qss"
         },
-        {
-            "type": "cmd",
+	{
+            "type": "caqtdm",
             "text": "ID1 Energy",
-            "command": "caqtdm -noMsg -attach -macro DEVICE=X11MA-ID1 X_ID_EnergyPolar-more.ui"
+            "panel": "ID_Energy.ui",
+            "macros": "DEVICE=X11MA-UIND1",
+            "param": "-noMsg -attach -stylefile slses.qss"
         },
         {
-            "type": "cmd",
+            "type": "caqtdm",
             "text": "ID2 Energy",
-            "command": "caqtdm -noMsg -attach -macro DEVICE=X11MA-ID2 X_ID_EnergyPolar-more.ui"
+            "panel": "ID_Energy.ui",
+            "macros": "DEVICE=X11MA-UIND2",
+            "param": "-noMsg -attach -stylefile slses.qss"
         },
         {
             "type": "cmd",
@@ -42,11 +50,6 @@
         {
             "type": "separator"
         },
-        {
-            "type": "cmd",
-            "text": "Correctors",
-            "command": "caqtdm -noMsg -attach X_ID_PS_X11MA-Corr.ui"
-        },
         {
             "type": "cmd",
             "text": "Chicane PS",