diff --git a/X_X04SA.json b/X_X04SA.json
new file mode 100644
index 0000000..a0e4cfa
--- /dev/null
+++ b/X_X04SA.json
@@ -0,0 +1,101 @@
+{
+    "menu-title": {
+        "text": "X04SA Top-level Launcher"
+    },
+    "menu": [
+        {
+            "type": "title",
+            "text": "Global"
+        },
+        {
+            "type": "cmd",
+            "text": "Optics Overview",
+            "command": "caqtdm -dg +30+90 -x -attach -noMsg -macro B=X04SA X_X04SA_Overview.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Beamline Overview",
+            "command": "caqtdm -dg +20+80 -x -attach -noMsg -macro B=X04SA X_X04SA_SynVwSmall.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Powder Diffractometer Overview",
+            "command": "caqtdm -x -attach -noMsg X_X04SA_ES2_overview.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Surface Diffractometer Overview",
+            "command": "caqtdm -x -attach -noMsg X_X04SA_ES3_overview.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Operation Info Panel",
+            "command": "caqtdm -x -macro BL=X04SA SLS_OP_Info.ui"
+        },
+        {
+            "type": "menu",
+            "text": "Epics Tools",
+            "file": "X_X04SA_tools.json"
+        },
+        {
+            "type": "menu",
+            "text": "Unix Tools",
+            "file": "X_X04SA_unix_tools.json"
+        },
+        {
+            "type": "menu",
+            "text": "Scan Tools",
+            "file": "X_X04SA_sscan.json"
+        },
+        {
+            "type": "title",
+            "text": "Expert"
+        },
+        {
+            "type": "menu",
+            "text": "Monitors",
+            "file": "X_X04SA_monitors.json"
+        },
+        {
+            "type": "menu",
+            "text": "Undulator + FE",
+            "file": "X_X04SA_FE_top_menu.json"
+        },
+        {
+            "type": "menu",
+            "text": "Optics",
+            "file": "X_X04SA_Optics.json"
+        },
+        {
+            "type": "menu",
+            "text": "Powder Diffractometer",
+            "file": "X_X04SA_ES2_top_menu.json",
+            "style": "color: black;background-color: #7300ff006b00;"
+        },
+        {
+            "type": "menu",
+            "text": "In-Situ Surface Diffractometer",
+            "file": "X_X04SA_ES3_top_menu.json",
+            "style": "color: black;background-color: #9900ffffffff;"
+        },
+        {
+            "type": "title",
+            "text": "Diagnostics"
+        },
+        {
+            "type": "menu",
+            "text": "Diagnostics",
+            "file": "X_X04SA_Diag_top_menu.json"
+        },
+        {
+            "type": "cmd",
+            "text": "Webcam Viewer",
+            "command": "X_X04SA_webcam_visual.py"
+        },
+        {
+            "type": "cmd",
+            "text": "Photon Diagnostics",
+            "command": "caqtdm -x -attach -noMsg X_X04SA_PhotonDiag.ui"
+        }
+    ]
+}
diff --git a/X_X04SA_Diag_SoftIOC.json b/X_X04SA_Diag_SoftIOC.json
new file mode 100644
index 0000000..4b9cc28
--- /dev/null
+++ b/X_X04SA_Diag_SoftIOC.json
@@ -0,0 +1,50 @@
+{
+    "menu-title": {
+        "text": "SoftIOC"
+    },
+    "menu": [
+        {
+            "type": "title",
+            "text": "Restart"
+        },
+        {
+            "type": "cmd",
+            "text": "Robot",
+            "command": "bash -c \"echo exit > /dev/tcp/x04sa-softioc/50001\""
+        },
+        {
+            "type": "cmd",
+            "text": "Scan",
+            "command": "bash -c \"echo exit > /dev/tcp/x04sa-softioc/50002\""
+        },
+        {
+            "type": "cmd",
+            "text": "XPS",
+            "command": "bash -c \"echo exit > /dev/tcp/x04sa-softioc/50006\""
+        },
+        {
+            "type": "cmd",
+            "text": "MYTHEN",
+            "command": "bash -c \"echo exit > /dev/tcp/x04sa-softioc/50007\""
+        },
+        {
+            "type": "cmd",
+            "text": "Hexapod",
+            "command": "bash -c \"echo exit > /dev/tcp/x04sa-bpc/50003\""
+        },
+        {
+            "type": "title",
+            "text": "Status"
+        },
+        {
+            "type": "cmd",
+            "text": "softioc",
+            "command": "caqtdm -x -macro PC=X04SA-PC-ROBO G_PCMON_status.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "bpc",
+            "command": "caqtdm -x -macro PC=X04SA-PC-PLV G_PCMON_status.ui"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X04SA_Diag_VXstats.json b/X_X04SA_Diag_VXstats.json
new file mode 100644
index 0000000..a4c7070
--- /dev/null
+++ b/X_X04SA_Diag_VXstats.json
@@ -0,0 +1,41 @@
+{
+    "menu-title": {
+        "text": "VME Crate Statistics"
+    },
+    "menu": [
+        {
+            "type": "title",
+            "text": "VME Crate Statistics"
+        },
+        {
+            "type": "cmd",
+            "text": "ID1 Crate",
+            "command": "caqtdm -x -attach -macro IOC=X04SA-VME-ID1 G_IOCMON_ioc_status.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "ID2 Crate",
+            "command": "caqtdm -x -attach -macro IOC=X04SA-VME-ID2 G_IOCMON_ioc_status.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "OP Crate",
+            "command": "caqtdm -x -attach -macro IOC=X04SA-VME-OP G_IOCMON_ioc_status.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "ES2 Crate",
+            "command": "caqtdm -x -attach -macro IOC=X04SA-VME-ES2 G_IOCMON_ioc_status.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "ES3 Crate",
+            "command": "caqtdm -x -attach -macro IOC=X04SA-VME-ES3 G_IOCMON_ioc_status.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "PLD Crate",
+            "command": "caqtdm -x -attach -macro IOC=X04SA-VME-PLD G_IOCMON_ioc_status.ui"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X04SA_Diag_autoSR.json b/X_X04SA_Diag_autoSR.json
new file mode 100644
index 0000000..a83a22f
--- /dev/null
+++ b/X_X04SA_Diag_autoSR.json
@@ -0,0 +1,31 @@
+{
+    "menu-title": {
+        "text": "VME autoSaveRestore Status"
+    },
+    "menu": [
+        {
+            "type": "title",
+            "text": "VME autoSaveRestore Status"
+        },
+        {
+            "type": "cmd",
+            "text": "OP Crate",
+            "command": "caqtdm -x -attach -noMsg -dg +840+10 -macro \"IOC=X04SA-VME-OP\" srStatus2.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "ES2 Crate",
+            "command": "caqtdm -x -attach -noMsg -dg +840+10 -macro \"IOC=X04SA-VME-ES2\" srStatus2.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "ES3 Crate",
+            "command": "caqtdm -x -attach -noMsg -dg +840+10 -macro \"IOC=X04SA-VME-ES3\" srStatus2.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "PLD Crate",
+            "command": "caqtdm -x -attach -noMsg -dg +840+10 -macro \"IOC=X04SA-VME-PLD\" srStatus2.ui"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X04SA_Diag_encInit.json b/X_X04SA_Diag_encInit.json
new file mode 100644
index 0000000..0d3d1d9
--- /dev/null
+++ b/X_X04SA_Diag_encInit.json
@@ -0,0 +1,44 @@
+{
+    "menu-title": {
+        "text": "Encoder Initialisation Utilities"
+    },
+    "menu": [
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "Powder Diffractometer"
+        },
+        {
+            "type": "cmd",
+            "text": "Home Axis A (Analyser) - Clockwise",
+            "command": "xterm -sb -sl 1000 -T X04SA-ES2-TH1:RO -geometry 90x40+340+340 -e \"encoder-home.py -w --tol=50 X04SA-ES2-TH1:RO + 2.0\""
+        },
+        {
+            "type": "cmd",
+            "text": "Home Axis B (Microstrip) - Clockwise",
+            "command": "xterm -sb -sl 1000 -T X04SA-ES2-TH2:RO -geometry 90x40+340+340 -e \"encoder-home.py -w --tol=100 X04SA-ES2-TH2:RO - 2.0\""
+        },
+        {
+            "type": "cmd",
+            "text": "Home Axis C (Sample) - Clockwise",
+            "command": "xterm -sb -sl 1000 -T X04SA-ES2-TH3:RO -geometry 90x40+340+340 -e \"encoder-home.py -w --tol=50 X04SA-ES2-TH3:RO + 2.0\""
+        },
+        {
+            "type": "cmd",
+            "text": "Home Axis A (Analyser) - Anticlockwise",
+            "command": "xterm -sb -sl 1000 -T X04SA-ES2-TH1:RO -geometry 90x40+340+340 -e \"encoder-home.py -w --tol=50 X04SA-ES2-TH1:RO - 2.0\""
+        },
+        {
+            "type": "cmd",
+            "text": "Home Axis B (Microstrip) - Anticlockwise",
+            "command": "xterm -sb -sl 1000 -T X04SA-ES2-TH2:RO -geometry 90x40+340+340 -e \"encoder-home.py -w --tol=50 X04SA-ES2-TH2:RO + 2.0\""
+        },
+        {
+            "type": "cmd",
+            "text": "Home Axis C (Sample) - Anticlockwise",
+            "command": "xterm -sb -sl 1000 -T X04SA-ES2-TH3:RO -geometry 90x40+340+340 -e \"encoder-home.py -w --tol=50 X04SA-ES2-TH3:RO - 2.0\""
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X04SA_Diag_encMedm.json b/X_X04SA_Diag_encMedm.json
new file mode 100644
index 0000000..f4d9b48
--- /dev/null
+++ b/X_X04SA_Diag_encMedm.json
@@ -0,0 +1,63 @@
+{
+    "menu-title": {
+        "text": "Encoder caqtdm Panels"
+    },
+    "menu": [
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "PD",
+            "style": "color: black;background-color: #7300ff006b00;"
+        },
+        {
+            "type": "cmd",
+            "text": "Axis A",
+            "command": "caqtdm -x -attach -noMsg -dg +300+360 -macro P=X04SA-ES2-TH1:,E=ER,M=RO G_DRV_kmtEncoder.ui",
+            "style": "color: black;background-color: #7300ff006b00;"
+        },
+        {
+            "type": "cmd",
+            "text": "Axis B",
+            "command": "caqtdm -x -attach -noMsg -dg +310+370 -macro P=X04SA-ES2-TH2:,E=ER,M=RO G_DRV_kmtEncoder.ui",
+            "style": "color: black;background-color: #7300ff006b00;"
+        },
+        {
+            "type": "cmd",
+            "text": "Axis C",
+            "command": "caqtdm -x -attach -noMsg -dg +320+380 -macro P=X04SA-ES2-TH3:,E=ER,M=RO G_DRV_kmtEncoder.ui",
+            "style": "color: black;background-color: #7300ff006b00;"
+        },
+        {
+            "type": "cmd",
+            "text": "Analyser Xtal Rotn",
+            "command": "caqtdm -x -attach -noMsg -dg +330+390 -macro P=X04SA-ES2-ANA:,E=ROCR-E,M=ROCR G_DRV_kmtEncoder.ui",
+            "style": "color: black;background-color: #7300ff006b00;"
+        },
+        {
+            "type": "cmd",
+            "text": "Analyser Scint Rotn",
+            "command": "caqtdm -x -attach -noMsg -dg +340+400 -macro P=X04SA-ES2-ANA:,E=ROSC-E,M=ROSC G_DRV_kmtEncoder.ui",
+            "style": "color: black;background-color: #7300ff006b00;"
+        },
+        {
+            "type": "cmd",
+            "text": "Analyser Scint Translate",
+            "command": "caqtdm -x -attach -noMsg -dg +350+410 -macro P=X04SA-ES2-ANA:,E=TRSC-E,M=TRSC G_DRV_kmtEncoder.ui",
+            "style": "color: black;background-color: #7300ff006b00;"
+        },
+        {
+            "type": "cmd",
+            "text": "Sample Table Z",
+            "command": "caqtdm -x -attach -noMsg -dg +360+420 -macro P=X04SA-ES2-SAM:,E=ER1,M=TR1 G_DRV_kmtEncoder.ui",
+            "style": "color: black;background-color: #7300ff006b00;"
+        },
+        {
+            "type": "cmd",
+            "text": "Sample Table Y",
+            "command": "caqtdm -x -attach -noMsg -dg +370+430 -macro P=X04SA-ES2-SAM:,E=ER2,M=TR2 G_DRV_kmtEncoder.ui",
+            "style": "color: black;background-color: #7300ff006b00;"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X04SA_Diag_top_menu.json b/X_X04SA_Diag_top_menu.json
new file mode 100644
index 0000000..f375069
--- /dev/null
+++ b/X_X04SA_Diag_top_menu.json
@@ -0,0 +1,59 @@
+{
+    "menu-title": {
+        "text": "Diagnostics"
+    },
+    "menu": [
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "VME Crates",
+            "style": "color: black;background-color: #fb00f3004a00;"
+        },
+        {
+            "type": "menu",
+            "text": "ioc Statistics",
+            "file": "X_X04SA_Diag_VXstats.json",
+            "style": "color: black;background-color: #fb00f3004a00;"
+        },
+        {
+            "type": "menu",
+            "text": "softioc status",
+            "file": "X_X04SA_Diag_SoftIOC.json",
+            "style": "color: black;background-color: #fb00f3004a00;"
+        },
+        {
+            "type": "menu",
+            "text": "autoSaveRestore Status",
+            "file": "X_X04SA_Diag_autoSR.json",
+            "style": "color: black;background-color: #fb00f3004a00;"
+        },
+        {
+            "type": "cmd",
+            "text": "Reboot screen",
+            "command": "caqtdm -x -attach -noMsg -dg +355+400 -macro DAC=X04SA-ES3-AO:1,T=1 X_X04SA_bootSelect.ui",
+            "style": "color: black;background-color: #fb00f3004a00;"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "Encoders",
+            "style": "color: blue;"
+        },
+        {
+            "type": "menu",
+            "text": "Encoder caqtdm Panels",
+            "file": "X_X04SA_Diag_encMedm.json",
+            "style": "color: blue;"
+        },
+        {
+            "type": "menu",
+            "text": "Encoder Initialisation Utilities",
+            "file": "X_X04SA_Diag_encInit.json",
+            "style": "color: blue;"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X04SA_EH1_slits.json b/X_X04SA_EH1_slits.json
new file mode 100644
index 0000000..75f1381
--- /dev/null
+++ b/X_X04SA_EH1_slits.json
@@ -0,0 +1,21 @@
+{
+    "menu-title": {
+        "text": "EH1 Slits"
+    },
+    "menu": [
+        {
+            "type": "title",
+            "text": "Exp Hutch 1 Cleanup Slits"
+        },
+        {
+            "type": "cmd",
+            "text": "Horizontal Slits",
+            "command": "caqtdm -x -attach -noMsg -dg +790+130 -macro P=X04SA-EH1-,S=SH1:,mXp=SH1:TR2,mXn=SH1:TR1,T1=EH1,T2=Horiz,T3=Slits X_X04SA_2slitRWsmall.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Vertical Slits",
+            "command": "caqtdm -x -attach -noMsg -dg +790+370 -macro P=X04SA-EH1-,S=SV1:,mXp=SV1:TR1,mXn=SV1:TR2,T1=EH1,T2=Vert,T3=Slits X_X04SA_2slitUDsmall.ui"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X04SA_ES2_mainMotors.json b/X_X04SA_ES2_mainMotors.json
new file mode 100644
index 0000000..87c22b7
--- /dev/null
+++ b/X_X04SA_ES2_mainMotors.json
@@ -0,0 +1,224 @@
+{
+    "menu-title": {
+        "text": "PD Motors"
+    },
+    "menu": [
+        {
+            "type": "title",
+            "text": "PD Motors (Top Rack)"
+        },
+        {
+            "type": "cmd",
+            "text": "JJ Horiz. Slit",
+            "command": "caqtdm -x -attach -noMsg -dg +1020+130 -macro P=X04SA-ES2-,S=SH1:,mXp=SH1:TR2,mXn=SH1:TR1,T1=PD,T2=JJ,T3=Hor X_X04SA_2slitRWsmall.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "JJ Vert. Slit",
+            "command": "caqtdm -x -attach -noMsg -dg +1020+370 -macro P=X04SA-ES2-,S=SV1:,mXp=SV1:TR1,mXn=SV1:TR2,T1=PD,T2=JJ,T3=Vert X_X04SA_2slitUDsmall.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Prec. Horz. Slit",
+            "command": "caqtdm -x -attach -noMsg -dg +1240+130 -macro P=X04SA-ES2-,S=SH2:,mXp=SH2:TR2,mXn=SH2:TR1,T1=PD,T2=Precision,T3=Hor X_X04SA_2slitRWsmall.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Prec. Vert. Slit",
+            "command": "caqtdm -x -attach -noMsg -dg +1240+370 -macro P=X04SA-ES2-,S=SV2:,mXp=SV2:TR1,mXn=SV2:TR2,T1=PD,T2=Precision,T3=Vert X_X04SA_2slitUDsmall.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "PD Motors (Second Rack)"
+        },
+        {
+            "type": "cmd",
+            "text": "Axis A - Analyser Arm",
+            "command": "caqtdm -x -attach -noMsg -dg +482+254 -macro P=X04SA-ES2-,M=TH1:RO motorx.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Axis B - Microstrip",
+            "command": "caqtdm -x -attach -noMsg -dg +358+254 -macro P=X04SA-ES2-,M=TH2:RO motorx.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Axis C - Sample",
+            "command": "caqtdm -x -attach -noMsg -dg +234+254 -macro P=X04SA-ES2-,M=TH3:RO motorx.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Diffractometer Height",
+            "command": "caqtdm -x -attach -noMsg -dg +482+727 -macro P=X04SA-ES2-,M=LT1:TR2 motorx_du.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Lift Table",
+            "command": "caqtdm -x -attach -noMsg -dg +610+727 -macro P=X04SA-ES2-,M1=LT2:TR2,M2=LT2:TR1 motor2x.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "PD Motors (Third Rack)"
+        },
+        {
+            "type": "cmd",
+            "text": "Janis He Flow Valve",
+            "command": "caqtdm -x -attach -noMsg -dg +530+725 -macro P=X04SA-ES2-,M=CRY:ROT motorx.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Slits",
+            "command": "caqtdm -x -attach -noMsg -dg +800+725 -macro P=X04SA-ES2-,M1=PSL:TRYU,M2=PSL:TRYD,M3=PSL:TRZ motor3x.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Euler Circle",
+            "command": "caqtdm -x -attach -noMsg -dg +540+025 -macro P=X04SA-ES2-,M1=EUC:ROCHI,M2=EUC:ROPHI motor2x.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Sample Stage",
+            "command": "caqtdm -x -attach -noMsg -dg +358+727 -macro P=X04SA-ES2-,M1=SAM:TR1,M2=SAM:TR2,M3=SAM:TR3 motor3x.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "PD Motors (Fourth Rack)"
+        },
+        {
+            "type": "cmd",
+            "text": "PI XYZ Stage",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-,M1=XYZ:TRX,M2=XYZ:TRY,M3=XYZ:TRZ motor3x.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Single Crystal DAC",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-,M1=SCD:ROY,M2=SCD:TRX,M3=SCD:FOCUS motor3x.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Xray Eye",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-,M1=XRE:ZOOM,M2=XRE:FOCUS motor2x.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "PD Motors (Fifth Rack)"
+        },
+        {
+            "type": "cmd",
+            "text": "Nose",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-,M1=NOSE:TRX,M2=NOSE:TRY motor2x.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Mini Mythen",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-,M=MY:TRY motorx.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Optical Table",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-,M1=OT1:TRX,M2=OT1:TRY,M3=OT1:TRZ,M4=OT1:ROX motor4x.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Pilatus TRX",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-,M=DET:TRX motorx.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "PD Motors (Sixth Rack)"
+        },
+        {
+            "type": "cmd",
+            "text": "Sample Plate Manipulator",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-,M1=SPM:TRX,M2=SPM:TRY,M3=SPM:ROY motor3x.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Beam Stop",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-,M1=BS:TRY,M2=BS:TRZ,M3=BS:ROX,M4=BS:ROZ motor4x.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "PD Motors (Seventh Rack)"
+        },
+        {
+            "type": "cmd",
+            "text": "Sample Stage",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-,M1=SM:TRX,M2=SM:TRY,M3=SM:TRZ,M4=SM:ROX,M5=SM:ROYS,M6=SM:ROZS motor6x.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Gas Blower",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-,M1=GB:TRY,M2=GB:TRZ motor2x.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "PD Motors (8th Rack)"
+        },
+        {
+            "type": "cmd",
+            "text": "Pinhole",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-PH:,M1=TRX,M2=TRY,M3=ROX,M4=ROY motor4x.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Mill shaker",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-MILL:,M=ROT motorx.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Vacuum Chamber",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-VC:,M=ROX motorx.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "POSCAM TRX",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-POSCAM:,M=TRX motorx.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "PD Motors (9th Rack)"
+        },
+        {
+            "type": "cmd",
+            "text": "User Motors 1-8",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-USR:,M1=MOT1,M2=MOT2,M3=MOT3,M4=MOT4,M5=MOT5,M6=MOT6,M7=MOT7,M8=MOT8 motor8x.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "Encoders"
+        },
+        {
+            "type": "cmd",
+            "text": "Encoders (A/B/C)",
+            "command": "X_X04SA_multi-cmnd.sh \\\"bg X_X04SA_panel.sh -g +100+050 X04SA-ES2-   TH1:ER    12.4  TH1:ERraw 10.0\\\" \\\"bg X_X04SA_panel.sh -g +410+050 X04SA-ES2-   TH2:ER    12.4  TH2:ERraw 10.0\\\" \\\"bg X_X04SA_panel.sh -g +720+050 X04SA-ES2-   TH3:ER    12.4  TH3:ERraw 10.0\\\" \\\"X_X04SA_start-StripTool -g 450x300+050+200 X04SA-ES2- TH1:ER/-10.0/180.0 TH1:ERraw/0/2000000\\\" \\\"X_X04SA_start-StripTool -g 450x300+205+220 X04SA-ES2- TH2:ER/-90.0/90.0 TH2:ERraw/-1000000/100000\\\" \\\"X_X04SA_start-StripTool -g 450x300+360+240 X04SA-ES2- TH3:ER/-180.0/180.0 TH3:ERraw/-1000000/1000000\\\""
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X04SA_ES2_top_menu.json b/X_X04SA_ES2_top_menu.json
new file mode 100644
index 0000000..3562004
--- /dev/null
+++ b/X_X04SA_ES2_top_menu.json
@@ -0,0 +1,188 @@
+{
+    "menu-title": {
+        "text": "Powder Diffractometer",
+        "style": "color: black;background-color: #7300ff006b00;"
+    },
+    "menu": [
+        {
+            "type": "title",
+            "text": "PD - Powder Diffractometer"
+        },
+        {
+            "type": "menu",
+            "text": "Motors",
+            "file": "X_X04SA_ES2_mainMotors.json"
+        },
+        {
+            "type": "menu",
+            "text": "User Motors",
+            "file": "X_X04SA_ES2_userMotors.json"
+        },
+        {
+            "type": "cmd",
+            "text": "Scalers",
+            "command": "caqtdm -x -attach -noMsg -dg +100+680 -macro \"T=ES2,P=X04SA-ES2-SC:\" X_X04SA_dcr508.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "LCAD",
+            "command": "X_X04SA_lcad.sh -pC -sC X04SA-ES2- BM1:RANGE BM1:SIGNAL1"
+        },
+        {
+            "type": "cmd",
+            "text": "MYTHEN(I0) Upstream",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-SD2:,R=cam1:,S=Stats5: X_X04SA_MYTHEN_I0.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "MYTHEN(I0) Downstream",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-SD1:,R=cam1:,S=Stats5: X_X04SA_MYTHEN_I0.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Pilatus 6M",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-PIL:,R=cam1: pilatusDetector.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Filters",
+            "command": "caqtdm -x -attach -noMsg -dg +280+100 -macro B=X04SA,ES=ES2 X_X04SA_ES2_filter.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Old Sample Spinner",
+            "command": "caqtdm -x -attach -noMsg -dg +300+100 -macro P=X04SA-ES2-,M=SPN:RO1,T1=PD,T2=Old_Spinner X_X04SA_spinner_small.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Sample Spinner",
+            "command": "caqtdm -x -attach -noMsg -dg +300+100 -macro P=X04SA-ES2-,M=SM:ROX,T1=PD,T2=Spinner X_X04SA_spinner_small.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "On-the-Fly",
+            "command": "caqtdm -x -attach -noMsg -dg +100+550 -macro P=X04SA-ES2-OTF G_OTFSCAN_user.ui",
+            "style": "color: black;background-color: #7300ff006b00;"
+        },
+        {
+            "type": "cmd",
+            "text": "Sample Camera",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-SAMCAM:,R=cam1: prosilica_MX.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Sample Viewer",
+            "command": "QtAD --simple --prefix=X04SA-ES2-SAMCAM:image1:"
+        },
+        {
+            "type": "cmd",
+            "text": "Beam Position Camera",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-POSCAM:,R=cam1: prosilica_MX.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Beam Position Viewer",
+            "command": "QtAD --simple --prefix=X04SA-ES2-POSCAM:image1:"
+        },
+        {
+            "type": "cmd",
+            "text": "SCD Camera",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-SCDCAM:,R=cam1: prosilica_MX.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "SCD Viewer",
+            "command": "QtAD --simple --prefix=X04SA-ES2-SCDCAM:image1:"
+        },
+        {
+            "type": "cmd",
+            "text": "Optical Table Camera",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-OT1CAM:,R=cam1: prosilica_MX.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Optical Table Viewer",
+            "command": "QtAD --simple --prefix=X04SA-ES2-OT1CAM:image1:"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "X-ray Eye",
+            "command": "caqtdm -dg +20+80 -x -attach -noMsg -macro ES=ES2 X_X04SA_ES2_xRayEye.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Robot",
+            "command": "caqtdm -x -attach -noMsg X_ROBOT_X04SA_robot.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Cryojet",
+            "command": "caqtdm -x -attach -noMsg -macro NAME=X04SA-ES2-CRJT,TITLE=X04SA_ES2_Cryojet G_DRV_SATECO_cryojet.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Cryostream",
+            "command": "caqtdm -x -attach -noMsg -macro NAME=X04SA-ES2-CRSM,TITLE=ES2_Cryostream G_DRV_SATECO_cryostream.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Janis Cryostat (Lakeshore)",
+            "command": "caqtdm -x -attach -noMsg -macro NAME=X04SA-ES2-CRST,P=X04SA-ES2-CRY:,M=ROT,TITLE=X04SA_ES2_Cryostat G_DRV_SATECO_lakeshore_valve.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Stoe Oven(Eurotherm 2416)",
+            "command": "caqtdm -x -attach -noMsg -macro NAME=X04SA-ES2-OVEN,TITLE=X04SA_ES2_Oven G_DRV_SATECO_eurotherm.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Gas Blower(Eurotherm 2408)",
+            "command": "caqtdm -x -attach -noMsg -macro NAME=X04SA-ES2-BLOW,TITLE=X04SA_ES2_BLOW G_DRV_SATECO_eurotherm.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Heat Gun(Eurotherm 2408)",
+            "command": "caqtdm -x -attach -noMsg -macro NAME=X04SA-ES2-HGUN,TITLE=X04SA_ES2_HEAT_GUN G_DRV_SATECO_eurotherm.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Pyrometer KT19",
+            "command": "caqtdm -x -attach -noMsg -macro NAME=X04SA-ES2-KT19 X_X04SA_PyrometerKT19.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Euler chi/phi oscillation",
+            "command": "caqtdm -x -attach -dg +500+500 X_X04SA_ES2_chiphi.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Gas Pressure Controller",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-PACE: X_X04SA_ES2_PACE5000.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "E3649A Power Supply",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-PS: X_X04SA_E3649A.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "33250A Pulse Generator",
+            "command": "caqtdm -x -attach -noMsg -macro NAME=X04SA-ES2-PG X_X04SA_pg33250a.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "Crash Detection"
+        },
+        {
+            "type": "cmd",
+            "text": "Crash Detection",
+            "command": "caqtdm -x -attach -noMsg -dg +005+250 X_X04SA_ES2_crash.ui"
+        }
+    ]
+}
diff --git a/X_X04SA_ES2_userMotors.json b/X_X04SA_ES2_userMotors.json
new file mode 100644
index 0000000..29192af
--- /dev/null
+++ b/X_X04SA_ES2_userMotors.json
@@ -0,0 +1,64 @@
+{
+    "menu-title": {
+        "text": "PD User Motors",
+        "style": "color: black;background-color: #7300ff006b00;"
+    },
+    "menu": [
+        {
+            "type": "title",
+            "text": "PD User Motors"
+        },
+        {
+            "type": "cmd",
+            "text": "User Motor 1",
+            "command": "caqtdm -x -attach -noMsg -dg +660+725 -macro P=X04SA-ES2-,M=USR:MOT1 motorx.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "User Motor 2",
+            "command": "caqtdm -x -attach -noMsg -dg +780+725 -macro P=X04SA-ES2-,M=USR:MOT2 motorx.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "User Motor 3",
+            "command": "caqtdm -x -attach -noMsg -dg +900+725 -macro P=X04SA-ES2-,M=USR:MOT3 motorx.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "User Motor 4",
+            "command": "caqtdm -x -attach -noMsg -dg +1020+725 -macro P=X04SA-ES2-,M=USR:MOT4 motorx.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "User Motor 5",
+            "command": "caqtdm -x -attach -noMsg -dg +1140+725 -macro P=X04SA-ES2-,M=USR:MOT5 motorx.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "User Motor 6",
+            "command": "caqtdm -x -attach -noMsg -dg +1260+725 -macro P=X04SA-ES2-,M=USR:MOT6 motorx.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "User Motor 7",
+            "command": "caqtdm -x -attach -noMsg -dg +1380+725 -macro P=X04SA-ES2-,M=USR:MOT7 motorx.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "User Motor 8",
+            "command": "caqtdm -x -attach -noMsg -dg +1500+725 -macro P=X04SA-ES2-,M=USR:MOT8 motorx.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "Encoders"
+        },
+        {
+            "type": "cmd",
+            "text": "User Encoders",
+            "command": "X_X04SA_multi-cmnd.sh \"bg X_X04SA_panel.sh -g +100+050 X04SA-ES2-   USR:ER1    12.4  USR:ER1raw 10.0\" \"X_X04SA_start-StripTool -g 450x300+050+200 X04SA-ES2- USR:ER1/-20.0/20.0 USR:ER1raw/-100000/100000\" \"bg X_X04SA_panel.sh -g +350+050 X04SA-ES2-   USR:ER2    12.4  USR:ER2raw 10.0\" \"X_X04SA_start-StripTool -g 450x300+300+200 X04SA-ES2- USR:ER2/-20.0/20.0 USR:ER2raw/-100000/100000\" \"bg X_X04SA_panel.sh -g +600+050 X04SA-ES2-   USR:ER3    12.4  USR:ER3raw 10.0\" \"X_X04SA_start-StripTool -g 450x300+550+200 X04SA-ES2- USR:ER3/-20.0/20.0 USR:ER3raw/-100000/100000\""
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X04SA_ES3_motors.json b/X_X04SA_ES3_motors.json
new file mode 100644
index 0000000..8701dec
--- /dev/null
+++ b/X_X04SA_ES3_motors.json
@@ -0,0 +1,111 @@
+{
+    "menu-title": {
+        "text": "ISSD Motors",
+        "style": "color: black;background-color: #9900ffffffff;"
+    },
+    "menu": [
+        {
+            "type": "title",
+            "text": "Slits"
+        },
+        {
+            "type": "cmd",
+            "text": "JJ Horiz.",
+            "command": "caqtdm -x -attach -noMsg -dg +970+50 -macro P=X04SA-ES3-,S=SH1:,mXp=SH1:TR2,mXn=SH1:TR1,T1=ISSD,T2=JJ,T3=Hor X_X04SA_2slitRWsmall.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "JJ Vert.",
+            "command": "caqtdm -x -attach -noMsg -dg +970+290 -macro P=X04SA-ES3-,S=SV1:,mXp=SV1:TR2,mXn=SV1:TR1,T1=ISSD,T2=JJ,T3=Vert X_X04SA_2slitUDsmall.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Precision Horiz.",
+            "command": "caqtdm -x -attach -noMsg -dg +740+50 -macro P=X04SA-ES3-,S=SH2:,mXp=SH2:TR2,mXn=SH2:TR1,T1=ISSD,T2=Precision,T3=Hor X_X04SA_2slitRWsmall.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Precision Vert.",
+            "command": "caqtdm -x -attach -noMsg -dg +740+290 -macro P=X04SA-ES3-,S=SV2:,mXp=SV2:TR1,mXn=SV2:TR2,T1=ISSD,T2=Precision,T3=Vert X_X04SA_2slitUDsmall.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Beam Definition Horz.",
+            "command": "caqtdm -x -attach -noMsg -dg +510+50 -macro P=X04SA-ES3-,S=SH3:,mXp=SH3:TR2,mXn=SH3:TR1,T1=ISSD,T2=Definition,T3=Hor X_X04SA_2slitRWsmall.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Beam Definition Vert.",
+            "command": "caqtdm -x -attach -noMsg -dg +510+290 -macro P=X04SA-ES3-,S=SV3:,mXp=SV3:TR2,mXn=SV3:TR1,T1=ISSD,T2=Definition,T3=Vert X_X04SA_2slitUDsmall.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Pinocchio Horz.",
+            "command": "caqtdm -x -attach -noMsg -dg +280+50 -macro P=X04SA-ES3-,S=PNSH:,mXp=PNSH:TR2,mXn=PNSH:TR1,T1=ISSD,T2=Pinocchio,T3=Hor X_X04SA_2slitRWsmall.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Pinocchio Vert.",
+            "command": "caqtdm -x -attach -noMsg -dg +280+290 -macro P=X04SA-ES3-,S=PNSV:,mXp=PNSV:TR2,mXn=PNSV:TR1,T1=ISSD,T2=Pinocchio,T3=Vert X_X04SA_2slitUDsmall.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Detector Horz.",
+            "command": "caqtdm -x -attach -noMsg -dg +280+50 -macro P=X04SA-ES3-,S=PNSH2:,mXp=PNSH2:TR2,mXn=PNSH2:TR1,T1=ISSD,T2=Detector,T3=Hor X_X04SA_2slitRWsmall.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Detector Vert.",
+            "command": "caqtdm -x -attach -noMsg -dg +280+290 -macro P=X04SA-ES3-,S=PNSV2:,mXp=PNSV2:TR2,mXn=PNSV2:TR1,T1=ISSD,T2=Detector,T3=Vert X_X04SA_2slitUDsmall.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "Diffractometer"
+        },
+        {
+            "type": "cmd",
+            "text": "Vertical Geometry",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES3-,M1=XPS:GAMMA,M2=XPS:DELTA,M3=XPS:ALPHA,M4=XPS:OMEGAV,M5=XPS:XV,M6=XPS:NU motor6x.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Horizontal Geometry",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES3-,M1=XPS:GAMMA,M2=XPS:DELTA,M3=XPS:ALPHA,M4=XPS:PHI,M5=XPS:OMEGAH,M6=XPS:NU motor6x.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Base Movement",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES3-,M1=XPS:Y1,M2=XPS:Y2,M3=XPS:Y3,M4=XPS:TRX motor4x.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Nose",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES3-,M1=NOSE:TRX,M2=NOSE:TRY motor2x.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Hexapod",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES3-HXP:,M1=TRX,M2=TRY,M3=TRZ,M4=ROX,M5=ROY,M6=ROZ motor6x.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "User Motors"
+        },
+        {
+            "type": "cmd",
+            "text": "Motor 1",
+            "command": "caqtdm -x -attach -noMsg -dg +100+100 -macro P=X04SA-ES3-,M=USER:MOT1 G_DRV_motor_mp.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Motor 2",
+            "command": "caqtdm -x -attach -noMsg -dg +120+120 -macro P=X04SA-ES3-,M=USER:MOT2 G_DRV_motor_mp.ui"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X04SA_ES3_top_menu.json b/X_X04SA_ES3_top_menu.json
new file mode 100644
index 0000000..7370f3f
--- /dev/null
+++ b/X_X04SA_ES3_top_menu.json
@@ -0,0 +1,117 @@
+{
+    "menu-title": {
+        "text": "In-Situ Surface Diffractometer",
+        "style": "color: black;background-color: #9900ffffffff;"
+    },
+    "menu": [
+        {
+            "type": "title",
+            "text": "ISSD - In-Situ Surface Diffractometer"
+        },
+        {
+            "type": "cmd",
+            "text": "ISSD Main Display",
+            "command": "X_X04SA_ES3_main-display.sh"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "menu",
+            "text": "Motors",
+            "file": "X_X04SA_ES3_motors.json"
+        },
+        {
+            "type": "cmd",
+            "text": "Scaler",
+            "command": "caqtdm -x -attach -noMsg -dg +100+680 -macro T=ES3,P=X04SA-ES3-SC: X_X04SA_dcr508.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "LCAD Signals",
+            "command": "X_X04SA_lcad.sh -pC -sC X04SA-ES3- BM1:RANGE BM1:SIGNAL1 BM1:SIGNAL2 BM1:SIGNAL3 BM1:SIGNAL4"
+        },
+        {
+            "type": "cmd",
+            "text": "Filters",
+            "command": "caqtdm -x -attach -noMsg -dg +280+100 -macro B=X04SA,ES=ES2 X_X04SA_ES2_filter.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "CCD/Pixel Control Panel",
+            "command": "caqtdm -x -attach -noMsg -dg +255+350 -macro ES=ISSD X_X04SA_CCD.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Cryojet",
+            "command": "caqtdm -x -attach -noMsg -macro NAME=X04SA-ES3-CRJT,TITLE=X04SA_ES3_Cryojet G_DRV_SATECO_cryojet.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Cryostat Lakeshore",
+            "command": "caqtdm -x -attach -noMsg -macro NAME=X04SA-ES3-CRST,P=X04SA-ES3-CRY:,M=ROT,TITLE=X04SA_ES3_Cryostat G_DRV_SATECO_lakeshore_valve.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Cryostream",
+            "command": "caqtdm -x -attach -noMsg -macro NAME=X04SA-ES3-CRSM,TITLE=ES3_Cryostream G_DRV_SATECO_cryostream.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Ion Chamber Monitor",
+            "command": "caqtdm -x -attach -noMsg -dg +355+400 -macro IC=X04SA-ES3-IC:,SHTR=X04SA-ES3-SC:LEVEL X_X04SA_ionChamber.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Sample Chamber Pressure",
+            "command": "caqtdm -x -attach -noMsg -macro NAME=X04SA-ES3-BC X_X04SA_TPG26X.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Piezo Leak Valve",
+            "command": "caqtdm -x -attach -noMsg X_X04SA_ES3_LeakValve.ui"
+        },
+        {
+            "type": "title",
+            "text": "Cameras"
+        },
+        {
+            "type": "cmd",
+            "text": "Camera Selector",
+            "command": "X_X04SA_CamBar.py"
+        },
+        {
+            "type": "cmd",
+            "text": "Camera Viewer",
+            "command": "QtAD --simple --dg=+180+50 --prefix=X04SA-ES3-SDCAM:image1:"
+        },
+        {
+            "type": "cmd",
+            "text": "Sample Camera H",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES3-SAMCAMH:,R=cam1: prosilica.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Sample Camera V",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES3-SAMCAMV:,R=cam1: prosilica.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Webcameras",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES3-WEBCAM:,R=cam1: URLDriver.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "X-ray Eye",
+            "command": "caqtdm -dg +20+80 -x -attach -noMsg -macro ES=ES3 X_X04SA_ES2_xRayEye.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "PLD Launcher",
+            "command": "launcher.tcl -g +30-200 X_PLD_X04SA"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X04SA_FE_motors.json b/X_X04SA_FE_motors.json
new file mode 100644
index 0000000..58da9f3
--- /dev/null
+++ b/X_X04SA_FE_motors.json
@@ -0,0 +1,28 @@
+{
+    "menu": [
+        {
+            "type": "title",
+            "text": "Front-end Motors"
+        },
+        {
+            "type": "cmd",
+            "text": "FE BM1 (Vert.)",
+            "command": "caqtdm -x -attach -noMsg -dg +670+130 -macro P=X04SA-FE-,M=BM1:TRV motorx_du.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "FE BM1 (Horz.)",
+            "command": "caqtdm -x -attach -noMsg -dg +410+130 -macro P=X04SA-FE-,M=BM1:TRH motorx_wr.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "FE BM2 (Vert.)",
+            "command": "caqtdm -x -attach -noMsg -dg +540+030 -macro P=X04SA-FE-,M=BM2:TRV motorx_du.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "FE BM2 (Horz.)",
+            "command": "caqtdm -x -attach -noMsg -dg +540+260 -macro P=X04SA-FE-,M=BM2:TRH motorx_wr.ui"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X04SA_FE_top_menu.json b/X_X04SA_FE_top_menu.json
new file mode 100644
index 0000000..5b40c82
--- /dev/null
+++ b/X_X04SA_FE_top_menu.json
@@ -0,0 +1,53 @@
+{
+    "menu-title": {
+        "text": "X04SA Front End"
+    },
+    "menu": [
+        {
+            "type": "title",
+            "text": "Undulator"
+        },
+        {
+            "type": "cmd",
+            "text": "Gap",
+            "command": "caqtdm -x -attach -noMsg -dg +500+170 -macro \"DEVICE=X04SA-ID\" X_ID_Gap.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Cooling",
+            "command": "caqtdm -x -attach -noMsg X_ID_X04SA_Cooling.ui"
+        },
+        {
+            "type": "title",
+            "text": "Fontend"
+        },
+        {
+            "type": "cmd",
+            "text": "XBPM1",
+            "command": "caqtdm -x -attach -noMsg -macro \"XBPM=X04SA-FE-XBPM1,BML=X04SA,ID=ID\" X_XBPM_xbpm_new2.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "XBPM2",
+            "command": "caqtdm -x -attach -noMsg -macro \"XBPM=X04SA-FE-XBPM2,BML=X04SA,ID-ID\" X_XBPM_xbpm_new2.ui"
+        },
+        {
+            "type": "menu",
+            "text": "Motors",
+            "file": "X_X04SA_FE_motors.json",
+            "style": "color: blue;"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "Exp Hutch 1"
+        },
+        {
+            "type": "menu",
+            "text": "EH1 Slits",
+            "file": "X_X04SA_EH1_slits.json"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X04SA_Optics.json b/X_X04SA_Optics.json
new file mode 100644
index 0000000..898fb7c
--- /dev/null
+++ b/X_X04SA_Optics.json
@@ -0,0 +1,99 @@
+{
+    "menu-title": {
+        "text": "Optics"
+    },
+    "menu": [
+        {
+            "type": "cmd",
+            "text": "Optics Main Display",
+            "command": "X_X04SA_op-main-display.sh"
+        },
+        {
+            "type": "cmd",
+            "text": "Filters",
+            "command": "caqtdm -x -attach -noMsg -macro FILTER=X04SA-OP-FI,M=TR1 X_X04SA_OP_filters.ui"
+        },
+        {
+            "type": "title",
+            "text": "Slit"
+        },
+        {
+            "type": "cmd",
+            "text": "OP Horizontal Slits",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-OP-,S=SH1:,mXp=SH1:TR2,mXn=SH1:TR1,T1=OP,T2=Horiz,T3=Slits X_X04SA_2slitRWsmall.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "OP Vertical Slits",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-OP-,S=SV1:,mXp=SV1:TR1,mXn=SV1:TR2,T1=OP,T2=Vert,T3=Slits X_X04SA_2slitUDsmall.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "BPM 1",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-OP-BM1:,M1=TRY,M2=TRX motor2x.ui"
+        },
+        {
+            "type": "title",
+            "text": "Mono"
+        },
+        {
+            "type": "cmd",
+            "text": "Mono",
+            "command": "caqtdm -x -attach -noMsg X_X04SA_mono.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Visual Mono",
+            "command": "/work/sls/bin/X_X04SA_mono.py"
+        },
+        {
+            "type": "cmd",
+            "text": "Mono X1 Motors",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-OP-MOX1:,M1=TRY,M2=ROX,M3=ROZ motor3x.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Mono X2 Motors",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-OP-MOX2:,M1=TRX,M2=TRY,M3=TRZ,M4=ROX,M5=ROZ,M6=ROY motor6x.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Mono Bender Motors",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-OP-MOX2:,M1=TRYA,M2=TRYB,M3=TRYC,M4=TRYD motor4x.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "BPM 2",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-OP-BM2:,M1=TRY,M2=TRX motor2x.ui"
+        },
+        {
+            "type": "title",
+            "text": "Mirror"
+        },
+        {
+            "type": "cmd",
+            "text": "Mirror",
+            "command": "caqtdm -x -attach -noMsg -macro P1=X04SA-OP-MI1:,P2=X04SA-OP-MI2:,Q=t,T=T X_X04SA_mirrors.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Mirror 1 Motors",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-OP-MI1:,M1=TRX1,M2=TRY1,M3=TRY2,M4=TRY3 motor4x.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Mirror 2 Motors",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-OP-MI2:,M1=TRY1,M2=TRY2,M3=TRY3 motor3x.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Mirror Bender Motors",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-OP-MI2:,M1=TR3U,M2=TR3D motor2x.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "BPM 3",
+            "command": "caqtdm -x -attach -noMsg -macro P=X04SA-OP-BM3:,M1=TRY,M2=TRX motor2x.ui"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X04SA_loadsetup.json b/X_X04SA_loadsetup.json
new file mode 100644
index 0000000..f4454b6
--- /dev/null
+++ b/X_X04SA_loadsetup.json
@@ -0,0 +1,19 @@
+{
+    "menu-title": {
+        "text": "X04SA Restore Setpoints"
+    },
+    "menu": [
+        {
+            "type": "title",
+            "text": "Restore FE and Optics"
+        },
+        {
+            "type": "title",
+            "text": "Restore Powder Diffractometer"
+        },
+        {
+            "type": "title",
+            "text": "Restore Surface Diffractometer"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X04SA_monitors.json b/X_X04SA_monitors.json
new file mode 100644
index 0000000..b9d05e4
--- /dev/null
+++ b/X_X04SA_monitors.json
@@ -0,0 +1,50 @@
+{
+    "menu-title": {
+        "text": "Monitors for Users"
+    },
+    "menu": [
+        {
+            "type": "title",
+            "text": "Monitors for Users"
+        },
+        {
+            "type": "cmd",
+            "text": "SLS Status - X04SA Version",
+            "command": "caqtdm -x -attach -noMsg -dg +005+250 -macro B=X04SA X_X04SA_SLS_Status.ui"
+        },
+        {
+            "type": "title",
+            "text": "Strip Charts"
+        },
+        {
+            "type": "cmd",
+            "text": "Main",
+            "command": "X_X04SA_start-StripTool -g 700x450+750+400 \"\" ARIDI-PCT:CURRENT/0/450 X03MA-ID-LMD:PMU/0/20000 X04SA-ID-GAP:READ/0/20 X04SA-ID-GAP:HEATER-PWR/0/80 X04SA-ID-GAP:HEATER-PWR_DB/0/15 X04SA-ID-GAP:TEMP-LN2IN/80/95 X04SA-ID-GAP:TEMP-LN2OUT/80/95 X04SA-OP-MOX1:TC1/-180/-150 X04SA-OP-MOX1:TC2/-180/-150"
+        },
+        {
+            "type": "cmd",
+            "text": "Front End",
+            "command": "X_X04SA_start-StripTool \"\" X04SA-FE-MK1:TC1/10/50 X04SA-FE-MK1:TC2/10/50 X04SA-FE-BM1:TC1/10/50 X04SA-FE-PH1:TC1/10/80 X04SA-FE-PH1:TC2/10/80 X04SA-FE-BM2:TC1/10/50 X04SA-FE-FI1:TC1/10/50 X04SA-FE-WI1:TC1/10/50"
+        },
+        {
+            "type": "cmd",
+            "text": "Diaphragm",
+            "command": "X_X04SA_start-StripTool \"\" X04SA-FE-DI1:TC1/10/50 X04SA-FE-DI1:TC2/10/50 X04SA-FE-DI1:TC3/10/50 X04SA-FE-DI1:TC4/10/50 X04SA-FE-DI2:TC1/10/50 X04SA-FE-DI2:TC2/10/50 X04SA-FE-DI2:TC3/10/50 X04SA-FE-DI2:TC4/10/50"
+        },
+        {
+            "type": "cmd",
+            "text": "Mono",
+            "command": "X_X04SA_start-StripTool \"\" X04SA-OP-MOX1:TC1/-180/-150 X04SA-OP-MOX1:TC2/-180/-150 X04SA-OP-MOX1:TC3/-180/-150 X04SA-OP-MOX1:TC4/-180/-150 X04SA-OP-MOX2:TC1/-180/-150 X04SA-OP-MOX2:TC2/-180/-150 X04SA-OP-MOX2:TC3/-180/-150 X04SA-OP-MOX2:TC4/-180/-150"
+        },
+        {
+            "type": "cmd",
+            "text": "ID Temp",
+            "command": "X_X04SA_start-StripTool \"\" X04SA-ID-GAP:TEMP-HTU2/137/139 X04SA-ID-GAP:TEMP-HTC2/137/139 X04SA-ID-GAP:TEMP-HTD2/137/139 X04SA-ID-GAP:TEMP-HBU2/137/139 X04SA-ID-GAP:TEMP-HBC2/137/139 X04SA-ID-GAP:TEMP-HBD2/137/139 X04SA-ID-GAP:TEMP-LN2IN/80/95 X04SA-ID-GAP:TEMP-LN2OUT/80/95"
+        },
+        {
+            "type": "cmd",
+            "text": "ID Heater",
+            "command": "X_X04SA_start-StripTool \"\" X04SA-ID-GAP:HEATER-PWR-UT/0/20 X04SA-ID-GAP:HEATER-PWR-CT/0/20 X04SA-ID-GAP:HEATER-PWR-DT/0/20 X04SA-ID-GAP:HEATER-PWR-UB/0/20 X04SA-ID-GAP:HEATER-PWR-CB/0/20 X04SA-ID-GAP:HEATER-PWR-DB/0/20 X04SA-ID-GAP:HEATER-PWR/0/80 X04SA-OP-MOCC:LEVEL/0/100"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X04SA_savesetup.json b/X_X04SA_savesetup.json
new file mode 100644
index 0000000..79bb638
--- /dev/null
+++ b/X_X04SA_savesetup.json
@@ -0,0 +1,19 @@
+{
+    "menu-title": {
+        "text": "X04SA Save Setpoints"
+    },
+    "menu": [
+        {
+            "type": "title",
+            "text": "Save FE and Optics"
+        },
+        {
+            "type": "title",
+            "text": "Save Powder Diffractometer"
+        },
+        {
+            "type": "title",
+            "text": "Save Surface Diffractometer"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X04SA_sscan.json b/X_X04SA_sscan.json
new file mode 100644
index 0000000..c294c8c
--- /dev/null
+++ b/X_X04SA_sscan.json
@@ -0,0 +1,26 @@
+{
+    "menu": [
+        {
+            "type": "title",
+            "text": "X04SA SCAN TOOL"
+        },
+        {
+            "type": "cmd",
+            "text": "Scan 1",
+            "command": "caqtdm -x -attach -macro \\\"P=X04SA-PC-GES:,N=1,S=scan1\\\" scan_more.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Scan 2",
+            "command": "caqtdm -x -attach -macro \\\"P=X04SA-PC-GES:,N=2,S=scan2\\\" scan_more.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "Scan Data Viewer",
+            "command": "X_GES_Viewer.sh"
+        }
+    ]
+}
diff --git a/X_X04SA_tools.json b/X_X04SA_tools.json
new file mode 100644
index 0000000..4edf9f0
--- /dev/null
+++ b/X_X04SA_tools.json
@@ -0,0 +1,17 @@
+{
+    "menu-title": {
+        "text": "EPICS Tools"
+    },
+    "menu": [
+        {
+            "type": "cmd",
+            "text": "StripTool",
+            "command": "X_X04SA_start-StripTool -g +100+100"
+        },
+        {
+            "type": "cmd",
+            "text": "Panel",
+            "command": "X_X04SA_panel.sh -g +100+100"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X04SA_unix_tools.json b/X_X04SA_unix_tools.json
new file mode 100644
index 0000000..0aa6ce1
--- /dev/null
+++ b/X_X04SA_unix_tools.json
@@ -0,0 +1,67 @@
+{
+    "menu-title": {
+        "text": "Unix Tools"
+    },
+    "menu": [
+        {
+            "type": "title",
+            "text": "Print"
+        },
+        {
+            "type": "cmd",
+            "text": "Print a window",
+            "command": "ksnapshot -c"
+        },
+        {
+            "type": "cmd",
+            "text": "GhostView",
+            "command": "gv"
+        },
+        {
+            "type": "title",
+            "text": "Editors"
+        },
+        {
+            "type": "cmd",
+            "text": "XEmacs",
+            "command": "emacs -geometry 80x35 -bg grey80 -fg black"
+        },
+        {
+            "type": "cmd",
+            "text": "nedit",
+            "command": "nedit"
+        },
+        {
+            "type": "cmd",
+            "text": "vi",
+            "command": "xterm -geometry 80x35 -title vi -e vi"
+        },
+        {
+            "type": "title",
+            "text": "Graphics"
+        },
+        {
+            "type": "cmd",
+            "text": "Image Magick - graphics tool",
+            "command": "display"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "Scientific Calculator",
+            "command": "kcalc -caption \"Scientific Calculator\""
+        },
+        {
+            "type": "cmd",
+            "text": "xterm - terminal emulator",
+            "command": "xterm -geometry 90x40 -ls -sb -sl 1000 -rightbar"
+        },
+        {
+            "type": "cmd",
+            "text": "gnome-terminal - another term emulator",
+            "command": "gnome-terminal --geometry 90x40 --login"
+        }
+    ]
+}