diff --git a/X_X12SA.json b/X_X12SA.json
new file mode 100644
index 0000000..e5e74aa
--- /dev/null
+++ b/X_X12SA.json
@@ -0,0 +1,72 @@
+{
+    "menu-title": {
+        "text": "X12SA Launcher"
+    },
+    "menu": [
+        {
+            "type": "title",
+            "text": "General"
+        },
+        {
+            "type": "caqtdm",
+            "text": "Operation Panel",
+            "panel": "SLS_OP_Info.ui",
+	    "macros": "BL=X12SA",
+	    "param": "-noMsg -attach"
+        },
+        {
+            "type": "menu",
+            "text": "StripTool",
+            "file": "X_X12SA_StripTool.json"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "Special"
+        },
+        {
+            "type": "cmd",
+            "text": "Detector Table",
+            "command": "caqtdm -attach -macro \"P=X12SA-ES1-DETT:,E=ETRY1,M=TRY1\" G_DRV_kmtEncoder.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "Girder Mover",
+            "command": "caqtdm -attach G_HEXGIR_X12SA.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "PSL Detector",
+            "command": "caqtdm -attach -macro \"P=X12SA-ES-PSL:,R=cam1:\" -dg +350+3050 PSL.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "menu",
+            "text": "pAm_BPM's",
+            "file": "X_X12SA_pAm_expert.json"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "menu",
+            "text": "Soft-IOC TEMPER.C.",
+            "file": "X_X12SA_TC_expert.json"
+        },
+        {
+            "type": "menu",
+            "text": "Soft-IOC FalconX1",
+            "file": "X_X12SA_FalconX1.json"
+        }
+    ]
+}
diff --git a/X_X12SA_BPM-tools.json b/X_X12SA_BPM-tools.json
new file mode 100644
index 0000000..14440ea
--- /dev/null
+++ b/X_X12SA_BPM-tools.json
@@ -0,0 +1,47 @@
+{
+    "menu": [
+        {
+            "type": "cmd",
+            "text": "ID/Machine BPM",
+            "command": "X_ID_BPM.sh X12SA"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "caqtdm",
+            "text": "Front End BPM1 Grid",
+            "panel": "X_X12SA_BPM.ui",
+            "macros": "BPM=1,POS=FE",
+            "param": "-noMsg -attach"
+        },
+        {
+            "type": "caqtdm",
+            "text": "Front End BPM2 Grid",
+            "panel": "X_X12SA_BPM.ui",
+            "macros": "BPM=2,POS=FE",
+            "param": "-noMsg -attach"
+        },
+        {
+            "type": "caqtdm",
+            "text": "Monochrom. BPM1 Grid",
+            "panel": "X_X12SA_BPM.ui",
+            "macros": "BPM=1,POS=OP",
+            "param": "-noMsg -attach"
+        },
+        {
+            "type": "caqtdm",
+            "text": "Monochrom. BPM2 Grid",
+            "panel": "X_X12SA_BPM.ui",
+            "macros": "BPM=2,POS=OP",
+            "param": "-noMsg -attach"
+        },
+        {
+            "type": "caqtdm",
+            "text": "Monochrom. BPM3 Grid",
+            "panel": "X_X12SA_BPM.ui",
+            "macros": "BPM=3,POS=OP",
+            "param": "-noMsg -attach"
+        }
+    ]
+}
diff --git a/X_X12SA_Beamline-motors.json b/X_X12SA_Beamline-motors.json
new file mode 100644
index 0000000..172f505
--- /dev/null
+++ b/X_X12SA_Beamline-motors.json
@@ -0,0 +1,160 @@
+{
+    "menu": [
+        {
+            "type": "cmd",
+            "text": "FE slit X (X12SA-FE-SH1:TRX1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-PIN1:,M=TRX1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "FE slit X (X12SA-FE-SH1:TRX2)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-PIN1:,M=TRY1 motorx_tiny.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "X-Box Apperture X (X12SA-ES1-PIN1:TRX1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-PIN1:,M=TRX1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "X-Box Aperture Y (X12SA-ES1-PIN1:TRY1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-PIN1:,M=TRY1 motorx_tiny.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "X box 2 X (X12SA-ES1-EB:TRX1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-EB:,M=TRX1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "X box 2 Y (X12SA-ES1-EB:TRY1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-EB:,M=TRY1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "X box 2 Z (X12SA-ES1-EB:TRZ1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-EB:,M=TRZ1 motorx_tiny.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "Flighttube Supp. 1X (X12SA-ES1-FTS1:TRX1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-FTS1:,M=TRX1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Flighttube Supp. 1Y (X12SA-ES1-FTS1:TRY1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-FTS1:,M=TRY1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Flighttube Supp. 1Z (X12SA-ES1-FTS1:TRZ1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-FTS1:,M=TRZ1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Flighttube Supp. 2X (X12SA-ES1-FTS2:TRX1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-FTS2:,M=TRX1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Flighttube Supp. 2Y (X12SA-ES1-FTS2:TRY1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-FTS2:,M=TRY1 motorx_tiny.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "Detector Table X (X12SA-ES1-DETT:TRX1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-DETT:,M=TRX1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Detector Table Y (X12SA-ES1-DETT:TRY1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-DETT:,M=TRY1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Detector Table Z (X12SA-ES1-DETT:TRZ1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-DETT:,M=TRZ1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Detector Table Pitch (X12SA-ES1-DETT:ROX1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-DETT:,M=ROX1 motorx_tiny.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "Beam stop 1 X (X12SA-ES1-BS1:TRX1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-BS1:,M=TRX1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Beam stop 1 Y (X12SA-ES1-BS1:TRY1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-BS1:,M=TRY1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Beam stop 2 X (X12SA-ES1-BS2:TRX1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-BS2:,M=TRX1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Beam stop 2 Y (X12SA-ES1-BS2:TRY1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-BS2:,M=TRY1 motorx_tiny.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "Detector stage X (X12SA-ES1-DET1:TRX1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-DET1:,M=TRX1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Detector stage Y (X12SA-ES1-DET1:TRY1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-DET1:,M=TRY1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Add. Det. stage 1 (X12SA-ES1-DET2:TR1)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-DET2:,M=TR1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Add. Det. stage 2 (X12SA-ES1-DET2:TR2)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-DET2:,M=TR2 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Add. Det. stage 3 (X12SA-ES1-DET2:TR3)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-DET2:,M=TR3 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Add. Det. stage 4 (X12SA-ES1-DET2:TR4)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-DET2:,M=TR4 motorx_tiny.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "Camera 1 focus (X12SA-ES1-CAM1:FOCUS)",
+            "command": "caqtdm -attach -macro P=X12SA-ES1-CAM1:,M=FOCUS motorx_tiny.ui"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X12SA_ES-motors.json b/X_X12SA_ES-motors.json
new file mode 100644
index 0000000..b59480b
--- /dev/null
+++ b/X_X12SA_ES-motors.json
@@ -0,0 +1,66 @@
+{
+    "menu": [
+        {
+            "type": "cmd",
+            "text": "Scaler (X12SA-ES1-SCALER)",
+            "command": "caqtdm -macro P=X12SA-ES1-,S=SCALER scaler16.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Cryojet",
+            "command": "caqtdm -macro \"TITLE=X12SACryojet,NAME=X12SA-PC-CRYOJET\" G_DRV_SATECO_cryojet.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "Julabo chiller Nr.1",
+            "command": "caqtdm -macro \"DEVICE=X12SA-PC-JUL1,PORT=PORT15\" X_X12SA_PC_JUL_Chiller.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Julabo chiller Nr.2",
+            "command": "caqtdm -macro \"DEVICE=X12SA-PC-JUL2,PORT=PORT16\" X_X12SA_PC_JUL_Chiller.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "start X12Keithley1",
+            "command": "start_keithley X12Keithley1 129.129.122.35 14"
+        },
+        {
+            "type": "cmd",
+            "text": "MCS scaler",
+            "command": "caqtdm -macro \"P=X12SA-MCS:\" Struck8.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Fast shutter",
+            "command": "caqtdm -macro \"DEVICE=X12SA-ES1-FSHDELAY,OUTPUT=X12SA-ES1-TTL:OUT_01\" X_X12SA_shutter.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "menu",
+            "text": "Beamline Motors",
+            "file": "X_X12SA_Beamline-motors.json"
+        },
+        {
+            "type": "menu",
+            "text": "User Motors",
+            "file": "X_X12SA_User-motors.json"
+        },
+        {
+            "type": "menu",
+            "text": "User Encoders",
+            "file": "X_X12SA_User-Encoders.json"
+        }
+    ]
+}
diff --git a/X_X12SA_FE-encoder.json b/X_X12SA_FE-encoder.json
new file mode 100644
index 0000000..24d7e39
--- /dev/null
+++ b/X_X12SA_FE-encoder.json
@@ -0,0 +1,48 @@
+{
+    "menu": [
+        {
+            "type": "title",
+            "text": "Front End Encoders"
+        },
+        {
+            "type": "cmd",
+            "text": "XBPM1 Horizontal Readback (X12SA-FE-BM1:ECH )",
+            "command": "caqtdm -attach -macro ENCODER=X12SA-FE-BM1:ECH X_X12SA_encoder_cal.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "XBPM1 Vertical Readback (X12SA-FE-BM1:ECV )",
+            "command": "caqtdm -attach -macro ENCODER=X12SA-FE-BM1:ECV X_X12SA_encoder_cal.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "XBPM2 Horizontal Readback (X12SA-FE-BM2:ECH )",
+            "command": "caqtdm -attach -macro ENCODER=X12SA-FE-BM2:ECH X_X12SA_encoder_cal.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "XBPM2 Vertical Readback (X12SA-FE-BM2:ECV )",
+            "command": "caqtdm -attach -macro ENCODER=X12SA-FE-BM2:ECV X_X12SA_encoder_cal.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Diaphragm 2 Horizontal Readback (X12SA-FE-DI2:ECX1)",
+            "command": "caqtdm -attach -macro ENCODER=X12SA-FE-DI2:ECX1 X_X12SA_encoder_cal.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Diaphragm 2 Vertical Readback (X12SA-FE-DI2:ECY1)",
+            "command": "caqtdm -attach -macro ENCODER=X12SA-FE-DI2:ECY1 X_X12SA_encoder_cal.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Horiz. Slit (Ring) (X12SA-FE-SH1:ECX1)",
+            "command": "caqtdm -attach -macro DEVICE=X12SA-FE-SH1:ECX1 X_X12SA_ecm514a.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Horiz. Slit (Wall) (X12SA-FE-SH1:ECX2)",
+            "command": "caqtdm -attach -macro DEVICE=X12SA-FE-SH1:ECX2 X_X12SA_ecm514a.ui"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X12SA_FE-motors.json b/X_X12SA_FE-motors.json
new file mode 100644
index 0000000..3da0c9e
--- /dev/null
+++ b/X_X12SA_FE-motors.json
@@ -0,0 +1,48 @@
+{
+    "menu": [
+        {
+            "type": "title",
+            "text": "Front End Motors"
+        },
+        {
+            "type": "cmd",
+            "text": "XBPM 1 (Horizontal) (X12SA-FE-BM1:TRH )",
+            "command": "caqtdm -attach -macro P=X12SA-FE-BM1:,M=TRH motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "XBPM 1 (Vertical) (X12SA-FE-BM1:TRV )",
+            "command": "caqtdm -attach -macro P=X12SA-FE-BM1:,M=TRV motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "XBPM 2 (Horizontal) (X12SA-FE-BM2:TRH )",
+            "command": "caqtdm -attach -macro P=X12SA-FE-BM2:,M=TRH motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "XBPM 2 (Vertical) (X12SA-FE-BM2:TRV )",
+            "command": "caqtdm -attach -macro P=X12SA-FE-BM2:,M=TRV motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Diaphragm 2 (Horiz) (X12SA-FE-DI2:TRX1)",
+            "command": "caqtdm -attach -macro P=X12SA-FE-DI2:,M=TRX1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Diaphragm 2 (Vert) (X12SA-FE-DI2:TRY1)",
+            "command": "caqtdm -attach -macro P=X12SA-FE-DI2:,M=TRY1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Horiz. slit (Ring) (X12SA-FE-SH1:TRX1)",
+            "command": "caqtdm -attach -macro P=X12SA-FE-SH1:,M=TRX1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Horiz. slit (Wall) (X12SA-FE-SH1:TRX2)",
+            "command": "caqtdm -attach -macro P=X12SA-FE-SH1:,M=TRX2 motorx_tiny.ui"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X12SA_FE-tools.json b/X_X12SA_FE-tools.json
new file mode 100644
index 0000000..ac710c3
--- /dev/null
+++ b/X_X12SA_FE-tools.json
@@ -0,0 +1,28 @@
+{
+    "menu": [
+        {
+            "type": "caqtdm",
+            "text": "Front End BPM1 Grid",
+            "panel": "X_X12SA_BPM.ui",
+            "macros": "BPM=BPM1",
+            "param": "-noMsg -attach"
+        },
+        {
+            "type": "caqtdm",
+            "text": "Front End BPM1 Grid",
+            "panel": "X_X12SA_BPM.ui",
+            "macros": "BPM=BPM2",
+            "param": "-noMsg -attach"
+        },
+        {
+            "type": "menu",
+            "text": "Front End Motors",
+            "file": "X_X12SA_FE-motors.json"
+        },
+        {
+            "type": "menu",
+            "text": "Front End Encoders",
+            "file": "X_X12SA_FE-encoder.json"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X12SA_FalconX1.json b/X_X12SA_FalconX1.json
index ccfa1a0..f79feef 100644
--- a/X_X12SA_FalconX1.json
+++ b/X_X12SA_FalconX1.json
@@ -20,6 +20,13 @@
         {
             "type": "separator"
         },
+        {
+            "type": "title",
+            "text": "FalconX1 Savings"
+        },
+        {
+            "type": "separator"
+        },
         {
             "type": "title",
             "text": "Delete auto_save/restore files"
diff --git a/X_X12SA_ID-tools.json b/X_X12SA_ID-tools.json
new file mode 100644
index 0000000..015c752
--- /dev/null
+++ b/X_X12SA_ID-tools.json
@@ -0,0 +1,44 @@
+{
+    "menu": [
+        {
+            "type": "cmd",
+            "text": "Energy Control",
+            "command": "caqtdm -macro DEVICE=X12SA-ID X_ID_Energy.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Gap Control",
+            "command": "caqtdm -macro DEVICE=X12SA-ID X_ID_Gap.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Corrector PS",
+            "command": "caqtdm X_ID_PS_X12SA-Corr.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Feed Forward Control",
+            "command": "caqtdm X_ID_PS_X12SA-FF.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Bergoz BPMs",
+            "command": "caqtdm X_ID_BPM_X12SA.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Bergoz BPMs graph",
+            "command": "X_ID_BPM.tcl X12SA"
+        },
+        {
+            "type": "cmd",
+            "text": "Temperatures",
+            "command": "bar.tk -f X_ID_TC_X12SA.bar"
+        },
+        {
+            "type": "cmd",
+            "text": "Loss rate monitor",
+            "command": "caqtdm X_X12SA_loss-monitor.ui"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X12SA_OP-encoder.json b/X_X12SA_OP-encoder.json
new file mode 100644
index 0000000..1106e8e
--- /dev/null
+++ b/X_X12SA_OP-encoder.json
@@ -0,0 +1,33 @@
+{
+    "menu": [
+        {
+            "type": "title",
+            "text": "Optic Encoders"
+        },
+        {
+            "type": "cmd",
+            "text": "BPM x encoder (X12SA-OP-BM1:ECX1)",
+            "command": "caqtdm -x -macro ENCODER=X12SA-OP-BM1:ECX1 X_X12SA_encoder_cal.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "BPM y encoder (X12SA-OP-BM1:ECY1)",
+            "command": "caqtdm -x -macro ENCODER=X12SA-OP-BM1:ECY1 X_X12SA_encoder_cal.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "1st crystal Theta (X12SA-OP-MO:ECX1)",
+            "command": "caqtdm -x -macro DEVICE=X12SA-OP-MO:ECX1 X_X12SA_ecm514a.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "2nd crystal Theta (X12SA-OP-MO:ECX2)",
+            "command": "caqtdm -x -macro DEVICE=X12SA-OP-MO:ECX2 X_X12SA_ecm514a.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "1st crystal Z (X12SA-OP-MO:ECZ1)",
+            "command": "caqtdm -x -macro DEVICE=X12SA-OP-MO:ECZ1 X_X12SA_ecm514a.ui"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X12SA_OP-motors.json b/X_X12SA_OP-motors.json
new file mode 100644
index 0000000..408acd0
--- /dev/null
+++ b/X_X12SA_OP-motors.json
@@ -0,0 +1,211 @@
+{
+    "menu": [
+        {
+            "type": "cmd",
+            "text": "BPM3 X (X12SA-OP-BM1:TRX1)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-BM1:,M=TRX1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "BPM3 Y (X12SA-OP-BM1:TRY1)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-BM1:,M=TRY1 motorx_tiny.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "Primary Slit X inb. (X12SA-OP-SH1:TRX1)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-SH1:,M=TRX1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Primary Slit X outb. (X12SA-OP-SH1:TRX2)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-SH1:,M=TRX2 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Primary Slit Y top (X12SA-OP-SV1:TRY1)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-SV1:,M=TRY1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Primary Slit Y bot. (X12SA-OP-SV1:TRY2)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-SV1:,M=TRY2 motorx_tiny.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "Filter Unit 1 (X12SA-OP-FI1:TRY1)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-FI1:,M=TRY1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Filter Unit 2 (X12SA-OP-FI2:TRY1)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-FI2:,M=TRY1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Filter Unit 3 (X12SA-OP-FI3:TRY1)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-FI3:,M=TRY1 motorx_tiny.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "Mono Bender A (X12SA-OP-MO:TRYA)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-MO:,M=TRYA motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Mono Bender B (X12SA-OP-MO:TRYB)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-MO:,M=TRYB motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Mono Bender C (X12SA-OP-MO:TRYC)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-MO:,M=TRYC motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Mono Bender D (X12SA-OP-MO:TRYD)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-MO:,M=TRYD motorx_tiny.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "Crystal 1 Z (X12SA-OP-MO:TRZ1)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-MO:,M=TRZ1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Crystal 1 Theta (X12SA-OP-MO:ROX1)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-MO:,M=ROX1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Crystal 1 Chi (X12SA-OP-MO:ROZ1)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-MO:,M=ROZ1 motorx_tiny.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "Crystal 2 Y (X12SA-OP-MO:TRY2)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-MO:,M=TRY2 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Crystal 2 X (X12SA-OP-MO:TRX2)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-MO:,M=TRX2 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Crystal 2 Theta (X12SA-OP-MO:ROX2)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-MO:,M=ROX2 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Crystal 2 Phi (X12SA-OP-MO:ROY2)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-MO:,M=ROY2 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Crystal 2 Chi (X12SA-OP-MO:ROZ2)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-MO:,M=ROZ2 motorx_tiny.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "Mirror X (X12SA-OP-MI:TRX1)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-MI:,M=TRX1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Mirror Y1 (X12SA-OP-MI:TRY1)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-MI:,M=TRY1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Mirror Y2 (X12SA-OP-MI:TRY2)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-MI:,M=TRY2 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Mirror Y3 (X12SA-OP-MI:TRY3)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-MI:,M=TRY3 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Mirror bender 1 (X12SA-OP-MI:TRZ1)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-MI:,M=TRZ1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Mirror bender 2 (X12SA-OP-MI:TRZ2)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-MI:,M=TRZ2 motorx_tiny.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "Optical Table Y (X12SA-OP-OT:TRY)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-OT:,M=TRY motorx_tiny.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "BPM4 X (X12SA-OP-BM2:TRX1)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-BM2:,M=TRX1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "BPM4 Y (X12SA-OP-BM2:TRY1)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-BM2:,M=TRY1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "BPM5 X (X12SA-OP-BM3:TRX1)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-BM3:,M=TRX1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "BPM5 Y (X12SA-OP-BM3:TRY1)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-BM3:,M=TRY1 motorx_tiny.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "Second. Slit X inb. (X12SA-OP-SH2:TRX1)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-SH2:,M=TRX1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Second. Slit X outb. (X12SA-OP-SH2:TRX2)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-SH2:,M=TRX2 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Second. Slit Y top (X12SA-OP-SV2:TRY1)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-SV2:,M=TRY1 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Second. Slit Y bot. (X12SA-OP-SV2:TRY2)",
+            "command": "caqtdm -attach -macro P=X12SA-OP-SV2:,M=TRY2 motorx_tiny.ui"
+        }
+    ]
+}
diff --git a/X_X12SA_OP-tools.json b/X_X12SA_OP-tools.json
new file mode 100644
index 0000000..e8299c9
--- /dev/null
+++ b/X_X12SA_OP-tools.json
@@ -0,0 +1,55 @@
+{
+    "menu": [
+        {
+            "type": "cmd",
+            "text": "Status Optic",
+            "command": "caqtdm -x X_X12SA_BLStatus.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "cmd",
+            "text": "Slit 1",
+            "command": "X_X12SA_slit.tcl /work/sls/config/app/X_X12SA_OP-1.slit"
+        },
+        {
+            "type": "cmd",
+            "text": "Filterbox",
+            "command": "caqtdm -x -macro \"FILTER=X12SA-OP-FI\" X_X12SA_filterbox.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Monochromator",
+            "command": "caqtdm -x X_X12SA_expert-mono.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Mirror",
+            "command": "caqtdm -x X_X12SA_mirror.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Slit 2",
+            "command": "X_X12SA_slit.tcl /work/sls/config/app/X_X12SA_OP-2.slit"
+        },
+        {
+            "type": "cmd",
+            "text": "Scaler (X12SA-OP1-SCALER)",
+            "command": "caqtdm -x -macro \"P=X12SA-OP1-,S=SCALER\" scaler16.ui"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "menu",
+            "text": "Optic Motors",
+            "file": "X_X12SA_OP-motors.json"
+        },
+        {
+            "type": "menu",
+            "text": "Optic Encoders",
+            "file": "X_X12SA_OP-encoder.json"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X12SA_Opt-tools.json b/X_X12SA_Opt-tools.json
new file mode 100644
index 0000000..ddd722b
--- /dev/null
+++ b/X_X12SA_Opt-tools.json
@@ -0,0 +1,14 @@
+{
+    "menu": [
+        {
+            "type": "cmd",
+            "text": "Scaler (X12SA-OP1-SCALER)",
+            "command": "caqtdm -x -macro \"P=X12SA-OP1-,S=SCALER\" scaler16.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "CPU Watch",
+            "command": "caqtdm -x X_X12SA_cpuwatch.ui"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X12SA_StripTool.json b/X_X12SA_StripTool.json
new file mode 100644
index 0000000..fb5fe3b
--- /dev/null
+++ b/X_X12SA_StripTool.json
@@ -0,0 +1,9 @@
+{
+    "menu": [
+        {
+            "type": "cmd",
+            "text": "StripTool",
+            "command": "jStripTool"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X12SA_TC_expert.json b/X_X12SA_TC_expert.json
new file mode 100644
index 0000000..acd7f4e
--- /dev/null
+++ b/X_X12SA_TC_expert.json
@@ -0,0 +1,21 @@
+{
+    "menu-title": {
+        "text": "Temp. controler"
+    },
+    "menu": [
+        {
+            "type": "title",
+            "text": "Expert Commands"
+        },
+        {
+            "type": "cmd",
+            "text": "Restart IOC",
+            "command": "X_X12SA_TC_restartIOC.sh"
+        },
+        {
+            "type": "cmd",
+            "text": "Lakeshore336",
+            "command": "caqtdm -x -attach -macro \"NAME=X12SA-PC-TC,TITLE=lakeshore336\" -dg +350+350 G_DRV_SATECO_lakeshore_336.ui"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X12SA_User-Encoders.json b/X_X12SA_User-Encoders.json
new file mode 100644
index 0000000..254d056
--- /dev/null
+++ b/X_X12SA_User-Encoders.json
@@ -0,0 +1,44 @@
+{
+    "menu": [
+        {
+            "type": "cmd",
+            "text": "Encoder #1 (X12SA-ES2-EC1)",
+            "command": "caqtdm -x -macro \"ENCODER=X12SA-ES2-EC1\" X_X12SA_encoder_cal.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Encoder #1 (X12SA-ES2-EC2)",
+            "command": "caqtdm -x -macro \"ENCODER=X12SA-ES2-EC2\" X_X12SA_encoder_cal.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Encoder #1 (X12SA-ES2-EC3)",
+            "command": "caqtdm -x -macro \"ENCODER=X12SA-ES2-EC3\" X_X12SA_encoder_cal.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Encoder #1 (X12SA-ES2-EC4)",
+            "command": "caqtdm -x -macro \"ENCODER=X12SA-ES2-EC4\" X_X12SA_encoder_cal.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Encoder #1 (X12SA-ES2-EC5)",
+            "command": "caqtdm -x -macro \"ENCODER=X12SA-ES2-EC5\" X_X12SA_encoder_cal.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Encoder #1 (X12SA-ES2-EC6)",
+            "command": "caqtdm -x -macro \"ENCODER=X12SA-ES2-EC6\" X_X12SA_encoder_cal.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Encoder #1 (X12SA-ES2-EC7)",
+            "command": "caqtdm -x -macro \"ENCODER=X12SA-ES2-EC7\" X_X12SA_encoder_cal.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Encoder #1 (X12SA-ES2-EC8)",
+            "command": "caqtdm -x -macro \"ENCODER=X12SA-ES2-EC8\" X_X12SA_encoder_cal.ui"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X12SA_User-motors.json b/X_X12SA_User-motors.json
new file mode 100644
index 0000000..aebdbd8
--- /dev/null
+++ b/X_X12SA_User-motors.json
@@ -0,0 +1,204 @@
+{
+    "menu": [
+        {
+            "type": "cmd",
+            "text": "Aux. motor #01 (X12SA-ES2-ES01)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES01 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #02 (X12SA-ES2-ES02)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES02 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #03 (X12SA-ES2-ES03)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES03 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #04 (X12SA-ES2-ES04)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES04 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #05 (X12SA-ES2-ES05)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES05 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #06 (X12SA-ES2-ES06)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES06 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #07 (X12SA-ES2-ES07)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES07 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #08 (X12SA-ES2-ES08)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES08 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #09 (X12SA-ES2-ES09)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES09 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #10 (X12SA-ES2-ES10)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES10 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #11 (X12SA-ES2-ES11)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES11 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #12 (X12SA-ES2-ES12)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES12 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #13 (X12SA-ES2-ES13)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES13 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #14 (X12SA-ES2-ES14)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES14 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #15 (X12SA-ES2-ES15)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES15 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #16 (X12SA-ES2-ES16)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES16 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #17 (X12SA-ES2-ES17)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES17 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #18 (X12SA-ES2-ES18)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES18 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #19 (X12SA-ES2-ES19)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES19 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #20 (X12SA-ES2-ES20)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES20 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #21 (X12SA-ES2-ES21)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES21 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #22 (X12SA-ES2-ES22)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES22 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #23 (X12SA-ES2-ES23)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES23 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #24 (X12SA-ES2-ES24)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES24 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #25 (X12SA-ES2-ES25)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES25 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #26 (X12SA-ES2-ES26)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES26 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #27 (X12SA-ES2-ES27)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES27 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #28 (X12SA-ES2-ES28)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES28 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #29 (X12SA-ES2-ES29)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES29 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #30 (X12SA-ES2-ES30)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES30 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #31 (X12SA-ES2-ES31)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES31 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #32 (X12SA-ES2-ES32)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES32 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #33 (X12SA-ES2-ES33)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES33 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #34 (X12SA-ES2-ES34)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES34 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #35 (X12SA-ES2-ES35)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES35 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #36 (X12SA-ES2-ES36)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES36 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #37 (X12SA-ES2-ES37)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES37 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #38 (X12SA-ES2-ES38)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES38 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #39 (X12SA-ES2-ES39)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES39 motorx_tiny.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Aux. motor #40 (X12SA-ES2-ES40)",
+            "command": "caqtdm -attach -macro P=X12SA-ES2-,M=ES40 motorx_tiny.ui"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X12SA_expert-main.json b/X_X12SA_expert-main.json
new file mode 100644
index 0000000..3b6c97b
--- /dev/null
+++ b/X_X12SA_expert-main.json
@@ -0,0 +1,83 @@
+{
+    "menu-title": {
+        "text": "X12SA Expert Launcher"
+    },
+    "file-choice": [
+        {
+            "text": "User Version",
+            "file": "X_X12SA.json"
+        }
+    ],
+    "menu": [
+        {
+            "type": "title",
+            "text": "General"
+        },
+        {           
+	    "type": "caqtdm",
+            "text": "Operation Panel",
+            "panel": "SLS_OP_Info.ui",
+            "macros": "BL=X12SA",
+            "param": "-noMsg -attach"
+        },
+        {
+            "type": "menu",
+            "text": "StripTool",
+            "file": "X_X12SA_StripTool.json"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "Favorites"
+        },
+        {
+            "type": "cmd",
+            "text": "Temperatures",
+            "command": "caqtdm $SLSBASE/sls/config/panel/ILUUL_HT-n.prc"
+        },
+        {
+            "type": "separator"
+        },
+        {
+            "type": "title",
+            "text": "Utilities"
+        },
+        {
+            "type": "menu",
+            "text": "ID Tools",
+            "file": "X_X12SA_ID-tools.json"
+        },
+        {
+            "type": "menu",
+            "text": "EPS Tools",
+            "file": "X_EPS_X12SA-Subs.json"
+        },
+        {
+            "type": "menu",
+            "text": "BPM Tools",
+            "file": "X_X12SA_BPM-tools.json"
+        },
+        {
+            "type": "menu",
+            "text": "Front End Tools",
+            "file": "X_X12SA_FE-tools.json"
+        },
+        {
+            "type": "menu",
+            "text": "Optic Tools",
+            "file": "X_X12SA_OP-tools.json"
+        },
+        {
+            "type": "menu",
+            "text": "Experimental Tools",
+            "file": "X_X12SA_ES-motors.json"
+        },
+        {
+            "type": "menu",
+            "text": "Miscellaneous Tools",
+            "file": "X_X12SA_Opt-tools.json"
+        }
+    ]
+}
diff --git a/X_X12SA_pAm_expert.json b/X_X12SA_pAm_expert.json
new file mode 100644
index 0000000..a668cb1
--- /dev/null
+++ b/X_X12SA_pAm_expert.json
@@ -0,0 +1,71 @@
+{
+    "menu-title": {
+        "text": "pAm Meter"
+    },
+    "menu": [
+        {
+            "type": "title",
+            "text": "Expert Commands"
+        },
+        {
+            "type": "cmd",
+            "text": "Restart IOC - BPM1",
+            "command": "X_X12SA_BPM1_restartIOC.sh"
+        },
+        {
+            "type": "cmd",
+            "text": "Elettra pAm BPM1",
+            "command": "caqtdm -x -attach -macro \"P=X12SA-OP-,R=BPM1:\" quadEM.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Restart IOC - BPM2",
+            "command": "X_X12SA_BPM2_restartIOC.sh"
+        },
+        {
+            "type": "cmd",
+            "text": "Elettra pAm BPM2",
+            "command": "caqtdm -x -attach -macro \"P=X12SA-OP-,R=BPM2:\" quadEM.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Restart IOC - BPM3",
+            "command": "X_X12SA_BPM3_restartIOC.sh"
+        },
+        {
+            "type": "cmd",
+            "text": "Elettra pAm BPM3",
+            "command": "caqtdm -x -attach -macro \"P=X12SA-OP-,R=BPM3:\" quadEM.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Restart IOC - BPM4",
+            "command": "X_X12SA_BPM4_restartIOC.sh"
+        },
+        {
+            "type": "cmd",
+            "text": "Elettra pAm BPM4",
+            "command": "caqtdm -x -attach -macro \"P=X12SA-OP-,R=BPM4:\" quadEM.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Restart IOC - BPM5",
+            "command": "X_X12SA_BPM5_restartIOC.sh"
+        },
+        {
+            "type": "cmd",
+            "text": "Elettra pAm BPM5",
+            "command": "caqtdm -x -attach -macro \"P=X12SA-OP-,R=BPM5:\" quadEM.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "Restart IOC - BPM6",
+            "command": "X_X12SA_BPM6_restartIOC.sh"
+        },
+        {
+            "type": "cmd",
+            "text": "Elettra pAm BPM6",
+            "command": "caqtdm -x -attach -macro \"P=X12SA-OP-,R=BPM6:\" quadEM.ui"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/X_X12SA_restoresetup.json b/X_X12SA_restoresetup.json
new file mode 100644
index 0000000..9d1ae9e
--- /dev/null
+++ b/X_X12SA_restoresetup.json
@@ -0,0 +1,3 @@
+{
+    "menu": []
+}
\ No newline at end of file
diff --git a/X_X12SA_savesetup.json b/X_X12SA_savesetup.json
new file mode 100644
index 0000000..9d1ae9e
--- /dev/null
+++ b/X_X12SA_savesetup.json
@@ -0,0 +1,3 @@
+{
+    "menu": []
+}
\ No newline at end of file