diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_BCM_rr.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_BCM_rr.bob
similarity index 95%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_BCM_rr.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_BCM_rr.bob
index a5a66b7e07845e802411aaada341711ff9eb9a60..12cbdfef990b58c0e01730f9b1fee2d17488f55a 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_BCM_rr.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_BCM_rr.bob
@@ -11,7 +11,7 @@
     <name>Label_304</name>
     <actions>
       <action type="open_display">
-        <file>../SubWindows/BCM.bob</file>
+        <file>../../SubScreens/DetailedScreens/BCM.bob</file>
         <target>window</target>
         <description>LaunchBCM</description>
       </action>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_Beam-and-Systems-Permit.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_Beam-and-Systems-Permit.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_Beam-and-Systems-Permit.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_Beam-and-Systems-Permit.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_PBI_blm-widget.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_PBI_blm-widget.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_PBI_blm-widget.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_PBI_blm-widget.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_PBI_bpm-widget.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_PBI_bpm-widget.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_PBI_bpm-widget.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_PBI_bpm-widget.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_PBI_labbpm-widget.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_PBI_labbpm-widget.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_PBI_labbpm-widget.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_PBI_labbpm-widget.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_beamdestinations.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_beamdestinations.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_beamdestinations.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_beamdestinations.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_beammodes.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_beammodes.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_beammodes.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_beammodes.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_chopper_rw.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_chopper_rw.bob
similarity index 99%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_chopper_rw.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_chopper_rw.bob
index 7c9213ebedf108d94b436ab46bd26c231195c7c7..00c3dadd7f78004de2803e5abf2e1935366ff367 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_chopper_rw.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_chopper_rw.bob
@@ -17,7 +17,7 @@
       <name>Action Button</name>
       <actions>
         <action type="open_display">
-          <file>SubWindows/detailed_chopper.bob</file>
+          <file>../../SubScreens/DetailedScreens/Chopper.bob</file>
           <target>window</target>
           <description>Open Display</description>
         </action>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_A2T.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_A2T.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_A2T.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_A2T.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_DTL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_DTL.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_DTL.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_DTL.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_DmpL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_DmpL.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_DmpL.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_DmpL.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_HBL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_HBL.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_HBL.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_HBL.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_HEBT.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_HEBT.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_HEBT.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_HEBT.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_HEBT2DmpL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_HEBT2DmpL.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_HEBT2DmpL.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_HEBT2DmpL.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_HEBT2Target.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_HEBT2Target.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_HEBT2Target.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_HEBT2Target.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_MBL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_MBL.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_MBL.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_MBL.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_MEBT.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_MEBT.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_MEBT.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_MEBT.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_NCL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_NCL.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_NCL.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_NCL.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_SCL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_SCL.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_SCL.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_SCL.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_Spk.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_Spk.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_Spk.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_Spk.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_full2DmpL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_full2DmpL.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_full2DmpL.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_full2DmpL.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_full2target.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_full2target.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-blm_loss_widget_full2target.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-blm_loss_widget_full2target.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_A2T.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_A2T.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_A2T.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_A2T.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_DTL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_DTL.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_DTL.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_DTL.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_DmpL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_DmpL.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_DmpL.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_DmpL.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_HBL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_HBL.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_HBL.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_HBL.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_HEBT.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_HEBT.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_HEBT.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_HEBT.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_HEBT2DmpL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_HEBT2DmpL.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_HEBT2DmpL.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_HEBT2DmpL.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_HEBT2Target.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_HEBT2Target.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_HEBT2Target.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_HEBT2Target.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_LAB.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_LAB.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_LAB.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_LAB.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_MBL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_MBL.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_MBL.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_MBL.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_MEBT.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_MEBT.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_MEBT.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_MEBT.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_NCL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_NCL.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_NCL.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_NCL.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_SCL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_SCL.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_SCL.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_SCL.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_Spk.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_Spk.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_Spk.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_Spk.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_full2DmpL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_full2DmpL.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_full2DmpL.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_full2DmpL.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_full2target.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_full2target.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/wdg-bpm_traj_widget_full2target.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/wdg-bpm_traj_widget_full2target.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_cav_rr.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Cavities/em_cav_rr.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_cav_rr.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Cavities/em_cav_rr.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_rf_rr.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Cavities/em_rf_rr.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_rf_rr.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Cavities/em_rf_rr.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_rf_rr_d.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Cavities/em_rf_rr_d.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_rf_rr_d.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Cavities/em_rf_rr_d.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_rf_rr_less.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Cavities/em_rf_rr_less.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_rf_rr_less.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Cavities/em_rf_rr_less.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_tet_rr.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Cavities/em_tet_rr.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_tet_rr.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Cavities/em_tet_rr.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_magV_rr.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Magnet/em_magV_rr.bob
similarity index 98%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_magV_rr.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Magnet/em_magV_rr.bob
index 4a8fd682a4e1357efed365c0774cd67251f1f9a9..9ade9e30fc0060703272fad185b79d7465a87a3f 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_magV_rr.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Magnet/em_magV_rr.bob
@@ -17,7 +17,7 @@
       <name>Label_1</name>
       <actions>
         <action type="open_display">
-          <file>$(repFile)</file>
+          <file>../../SubScreens/DetailedScreens/Repellers.bob</file>
           <target>window</target>
           <description>Open Repellers Detailed</description>
         </action>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_mag_rr.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Magnet/em_mag_rr.bob
similarity index 98%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_mag_rr.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Magnet/em_mag_rr.bob
index d1525150d536f5e1c699947f6fa9cf7eaee2173d..727f3d5e926846d2ccf5f2078f679f40744409b7 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_mag_rr.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Magnet/em_mag_rr.bob
@@ -17,7 +17,7 @@
       <name>Label_1</name>
       <actions>
         <action type="open_display">
-          <file>../SubWindows/detailed_magnets.bob</file>
+          <file>../../SubScreens/DetailedScreens/Magnets.bob</file>
           <macros>
             <name>$(name)</name>
             <pv_name>$(pv_name)</pv_name>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_mag_rw.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Magnet/em_mag_rw.bob
similarity index 98%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_mag_rw.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Magnet/em_mag_rw.bob
index d8cd5b3cc8cc55fb8dae06430c75e9ebe0ebfe04..e42953e6217a157931111e64d9398e9fe58d3f4d 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_mag_rw.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Magnet/em_mag_rw.bob
@@ -112,7 +112,7 @@
       <name>Label_1</name>
       <actions>
         <action type="open_display">
-          <file>../SubWindows/detailed_magnets.bob</file>
+          <file>../../SubScreens/DetailedScreens/Magnets.bob</file>
           <macros>
             <name>$(name)</name>
             <pv_name>$(pv_name)</pv_name>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_SL_OPI_TS2.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Other/em_SL_OPI_TS2.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_SL_OPI_TS2.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Other/em_SL_OPI_TS2.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_SL_OPI_operations.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Other/em_SL_OPI_operations.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_SL_OPI_operations.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Other/em_SL_OPI_operations.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/publicOPIsWeb.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Other/publicOPIsWeb.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/publicOPIsWeb.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Other/publicOPIsWeb.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_flows_rr.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/System/em_flows_rr.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_flows_rr.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/System/em_flows_rr.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_interlocks_rr.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/System/em_interlocks_rr.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_interlocks_rr.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/System/em_interlocks_rr.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_valves_rw.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/System/em_valves_rw.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_valves_rw.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/System/em_valves_rw.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/TSS_picture.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Target/TSS_picture.bob
similarity index 91%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/TSS_picture.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Target/TSS_picture.bob
index e4b4292f638b457b1f2ee734786fa94e3f40ff11..d704df08a3c665aa2bdb8f1b2b1d12f82f04234f 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/TSS_picture.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Target/TSS_picture.bob
@@ -10,7 +10,7 @@
   </background_color>
   <widget type="picture" version="2.0.0">
     <name>Picture</name>
-    <file>../Figures/TSS.png</file>
+    <file>../../Figures/TSS.png</file>
     <width>1420</width>
     <height>940</height>
   </widget>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/thccs/OFTTech_Circulator_BlockIcon.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Target/thccs/OFTTech_Circulator_BlockIcon.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/thccs/OFTTech_Circulator_BlockIcon.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Target/thccs/OFTTech_Circulator_BlockIcon.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/thccs/OFTTech_Circulators_BlockIcon.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Target/thccs/OFTTech_Circulators_BlockIcon.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/thccs/OFTTech_Circulators_BlockIcon.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Target/thccs/OFTTech_Circulators_BlockIcon.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/thccs/hx_horizontal.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Target/thccs/hx_horizontal.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/thccs/hx_horizontal.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Target/thccs/hx_horizontal.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/thccs/hx_vertical.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Target/thccs/hx_vertical.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/thccs/hx_vertical.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Target/thccs/hx_vertical.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/thccs/io_card_state.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Target/thccs/io_card_state.bob
similarity index 91%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/thccs/io_card_state.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Target/thccs/io_card_state.bob
index 92545d64451755fbbf0d48c7b9a1e538ad39706c..7bef9721d65e69f7b932bb7a34c29c7fc5c90c4a 100755
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/thccs/io_card_state.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Target/thccs/io_card_state.bob
@@ -10,7 +10,7 @@
   <widget type="symbol" version="2.0.0">
     <name>WID_IOErrorIcon_3</name>
     <symbols>
-      <symbol>../../../../ICS_OPI_LIBRARY/symbols/custom_v02/WARNING@32.png</symbol>
+      <symbol>../../../../../ICS_OPI_LIBRARY/symbols/custom_v02/WARNING@32.png</symbol>
     </symbols>
     <x>2</x>
     <y>31</y>
@@ -53,7 +53,7 @@
   <widget type="symbol" version="2.0.0">
     <name>WID_IOErrorIcon_4</name>
     <symbols>
-      <symbol>../../../../ICS_OPI_LIBRARY/symbols/custom_v02/Disconnect.png</symbol>
+      <symbol>../../../../../ICS_OPI_LIBRARY/symbols/custom_v02/Disconnect.png</symbol>
     </symbols>
     <x>4</x>
     <width>25</width>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/thccs/racks.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Target/thccs/racks.bob
similarity index 99%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/thccs/racks.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Target/thccs/racks.bob
index 0d39aa315b60ccf44f0956b1831859c0f1ebfe4a..e6b907ff67cbb565d58d7629c3b7a7c848d51f4c 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/thccs/racks.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Target/thccs/racks.bob
@@ -57,7 +57,7 @@
   </widget>
   <widget type="picture" version="2.0.0">
     <name>Picture</name>
-    <file>../../Figures/thccs/plc_racks.png</file>
+    <file>../../../Figures/thccs/plc_racks.png</file>
     <x>15</x>
     <y>34</y>
     <width>1080</width>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Figures/DTLem01.png b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Figures/DTLem01.png
deleted file mode 100644
index e8f2c4ece82c7612340a981c7f249ff6c0beb93d..0000000000000000000000000000000000000000
Binary files a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Figures/DTLem01.png and /dev/null differ
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Figures/LEBTem01.png b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Figures/LEBTem01.png
deleted file mode 100644
index f0daeb4a9ccbc0541aafe5a9a4e71a0d1c5e9519..0000000000000000000000000000000000000000
Binary files a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Figures/LEBTem01.png and /dev/null differ
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Figures/MEBTem01.png b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Figures/MEBTem01.png
deleted file mode 100644
index 342765959316ef1d77f930eb44da80587658c408..0000000000000000000000000000000000000000
Binary files a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Figures/MEBTem01.png and /dev/null differ
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Main_OPI_Navigator.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Navigator.bob
similarity index 94%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Main_OPI_Navigator.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Navigator.bob
index bced84e0fedfc1d38e6659452b08e8a821e47404..09fcf2fcaaaa4f08af15c05c4893797b37ec548d 100755
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Main_OPI_Navigator.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Navigator.bob
@@ -118,77 +118,77 @@
     <tabs>
       <tab>
         <name>Main</name>
-        <file>collectedOPIs_01_mainOverview.bob</file>
+        <file>OverviewScreens/0_Overview.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>Logbook</name>
-        <file>collectedOPIs_01_logbook.bob</file>
+        <file>OverviewScreens/Logbook.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>System</name>
-        <file>collectedOPIs_01_system.bob</file>
+        <file>OverviewScreens/System/0_Navigator.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>PBI</name>
-        <file>collectedOPIs_01_diagnostics.bob</file>
+        <file>OverviewScreens/Beam/PBI.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>Beam Setup</name>
-        <file>collectedOPIs_01_beamsettings.bob</file>
+        <file>OverviewScreens/Beam/BeamSettings.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>Magnets</name>
-        <file>collectedOPIs_01_magnets.bob</file>
+        <file>OverviewScreens/Magnet/0_Navigator.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>RF Systems</name>
-        <file>collectedOPIs_01_cavities.bob</file>
+        <file>OverviewScreens/Cavities/0_Navigator.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>Target</name>
-        <file>collectedOPIs_01_target.bob</file>
+        <file>OverviewScreens/Target/0_Navigator.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>Beamlines</name>
-        <file>collectedOPIs_01_Beamlines.bob</file>
+        <file>OverviewScreens/Beamlines/0_Overview.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>TS2</name>
-        <file>collectedOPIs_01_teststand2.bob</file>
+        <file>OverviewScreens/TS2/Cryogenics.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>Playground</name>
-        <file></file>
+        <file>OverviewScreens/TestEnvironment.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mainOverview.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/0_Overview.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mainOverview.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/0_Overview.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_beamsettings.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Beam/BeamSettings.bob
similarity index 96%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_beamsettings.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Beam/BeamSettings.bob
index 507a9a6c522b911d9eb47520eb1fe2bbe3acbf19..5bcb060be4e6f7bda1218ec8419a0da414ac126d 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_beamsettings.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Beam/BeamSettings.bob
@@ -3,6 +3,8 @@
   <name>Beam Settings</name>
   <class></class>
   <macros>
+    <BeamDestFile>../../EmbeddedScreens/Beam/em_beamdestinations.bob</BeamDestFile>
+    <BeamModeFile>../../EmbeddedScreens/Beam/em_beammodes.bob</BeamModeFile>
     <ISRC_Coil_01>ISrc-010:PwrC-CoilPS-01</ISRC_Coil_01>
     <ISRC_Coil_02>ISrc-010:PwrC-CoilPS-02</ISRC_Coil_02>
     <ISRC_Coil_03>ISrc-010:PwrC-CoilPS-03</ISRC_Coil_03>
@@ -13,10 +15,10 @@
     <PV_beamfrequency>loc://PV_beamfrequency</PV_beamfrequency>
     <PV_beammode>loc://beammode("No Beam")</PV_beammode>
     <PV_beampulselength>loc://PV_beampulselength</PV_beampulselength>
-    <RR_MagsFile>./EmbedddedWindows/em_mag_rr.bob</RR_MagsFile>
-    <RR_MagsFileV>./EmbedddedWindows/em_magV_rr.bob</RR_MagsFileV>
-    <RW_ChopFile>./EmbedddedWindows/em_chopper_rw.bob</RW_ChopFile>
-    <RW_MagsFile>./EmbedddedWindows/em_mag_rw.bob</RW_MagsFile>
+    <RR_MagsFile>../../EmbeddedScreens/Magnet/em_mag_rr.bob</RR_MagsFile>
+    <RR_MagsFileV>../../EmbeddedScreens/Magnet/em_magV_rr.bob</RR_MagsFileV>
+    <RW_ChopFile>../../EmbeddedScreens/Beam/em_chopper_rw.bob</RW_ChopFile>
+    <RW_MagsFile>../../EmbeddedScreens/Magnet/em_mag_rw.bob</RW_MagsFile>
   </macros>
   <width>2410</width>
   <height>1040</height>
@@ -467,7 +469,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>beammode11</name>
-      <file>EmbedddedWindows/em_beammodes.bob</file>
+      <file>$(BeamModeFile)</file>
       <macros>
         <ITf>TBD</ITf>
         <Imax>TBD</Imax>
@@ -484,7 +486,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>beammode10</name>
-      <file>EmbedddedWindows/em_beammodes.bob</file>
+      <file>$(BeamModeFile)</file>
       <macros>
         <ITf>5.958</ITf>
         <Imax>2.86</Imax>
@@ -503,7 +505,7 @@ Can be used to monitor stability between long pulses (1 Hz).</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>beammode09</name>
-      <file>EmbedddedWindows/em_beammodes.bob</file>
+      <file>$(BeamModeFile)</file>
       <macros>
         <ITf>3.125</ITf>
         <Imax>62.5</Imax>
@@ -521,7 +523,7 @@ Long pulses. Used to perform more precise single-pulse measurements.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>beammode05</name>
-      <file>EmbedddedWindows/em_beammodes.bob</file>
+      <file>$(BeamModeFile)</file>
       <macros>
         <ITf>0.3</ITf>
         <Imax>6</Imax>
@@ -538,7 +540,7 @@ Long pulses. Used to perform more precise single-pulse measurements.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>beammode06</name>
-      <file>EmbedddedWindows/em_beammodes.bob</file>
+      <file>$(BeamModeFile)</file>
       <macros>
         <ITf>4.2</ITf>
         <Imax>6</Imax>
@@ -555,7 +557,7 @@ Long pulses. Used to perform more precise single-pulse measurements.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>beammode07</name>
-      <file>EmbedddedWindows/em_beammodes.bob</file>
+      <file>$(BeamModeFile)</file>
       <macros>
         <ITf>0.3125</ITf>
         <Imax>62.5</Imax>
@@ -573,7 +575,7 @@ Allows installation of the SCL in parallel to Beam Commissioning of the NCL.</to
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>beammode08</name>
-      <file>EmbedddedWindows/em_beammodes.bob</file>
+      <file>$(BeamModeFile)</file>
       <macros>
         <ITf>4.375</ITf>
         <Imax>62.5</Imax>
@@ -592,7 +594,7 @@ and measure beam profiles with wire scanners.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>beammode03</name>
-      <file>EmbedddedWindows/em_beammodes.bob</file>
+      <file>$(BeamModeFile)</file>
       <macros>
         <ITf>0.03</ITf>
         <Imax>6</Imax>
@@ -611,7 +613,7 @@ Used to verify machine configuration.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>beammode04</name>
-      <file>EmbedddedWindows/em_beammodes.bob</file>
+      <file>$(BeamModeFile)</file>
       <macros>
         <ITf>0.42</ITf>
         <Imax>6</Imax>
@@ -629,7 +631,7 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>beammode02</name>
-      <file>EmbedddedWindows/em_beammodes.bob</file>
+      <file>$(BeamModeFile)</file>
       <macros>
         <ITf>0</ITf>
         <Imax>0</Imax>
@@ -646,7 +648,7 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>beammode01</name>
-      <file>EmbedddedWindows/em_beammodes.bob</file>
+      <file>$(BeamModeFile)</file>
       <macros>
         <ITf>0</ITf>
         <Imax>0</Imax>
@@ -664,7 +666,7 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>beammode12</name>
-      <file>EmbedddedWindows/em_beammodes.bob</file>
+      <file>$(BeamModeFile)</file>
       <macros>
         <ITf>2502.5</ITf>
         <Imax>62.5</Imax>
@@ -845,7 +847,7 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>destinationmode01</name>
-      <file>EmbedddedWindows/em_beamdestinations.bob</file>
+      <file>$(BeamDestFile)</file>
       <macros>
         <ITf>0</ITf>
         <Imax>0</Imax>
@@ -863,7 +865,7 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>destinationmode02</name>
-      <file>EmbedddedWindows/em_beamdestinations.bob</file>
+      <file>$(BeamDestFile)</file>
       <macros>
         <ITf>2502.5</ITf>
         <Imax>62.5</Imax>
@@ -881,7 +883,7 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>destinationmode03a</name>
-      <file>EmbedddedWindows/em_beamdestinations.bob</file>
+      <file>$(BeamDestFile)</file>
       <macros>
         <ITf>3.125</ITf>
         <Imax>62.5</Imax>
@@ -899,7 +901,7 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>destinationmode03b</name>
-      <file>EmbedddedWindows/em_beamdestinations.bob</file>
+      <file>$(BeamDestFile)</file>
       <macros>
         <ITf>4.375</ITf>
         <Imax>62.5</Imax>
@@ -917,7 +919,7 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>destinationmode04a</name>
-      <file>EmbedddedWindows/em_beamdestinations.bob</file>
+      <file>$(BeamDestFile)</file>
       <macros>
         <ITf>3.125</ITf>
         <Imax>62.5</Imax>
@@ -935,7 +937,7 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>destinationmode04b</name>
-      <file>EmbedddedWindows/em_beamdestinations.bob</file>
+      <file>$(BeamDestFile)</file>
       <macros>
         <ITf>4.375</ITf>
         <Imax>62.5</Imax>
@@ -953,7 +955,7 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>destinationmode05a</name>
-      <file>EmbedddedWindows/em_beamdestinations.bob</file>
+      <file>$(BeamDestFile)</file>
       <macros>
         <ITf>3.125</ITf>
         <Imax>62.5</Imax>
@@ -971,7 +973,7 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>destinationmode05b</name>
-      <file>EmbedddedWindows/em_beamdestinations.bob</file>
+      <file>$(BeamDestFile)</file>
       <macros>
         <ITf>4.375</ITf>
         <Imax>62.5</Imax>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_diagnostics.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Beam/PBI.bob
similarity index 97%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_diagnostics.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Beam/PBI.bob
index fcbefb67f0d27095fc9f0c15c4b5052953edb249..f682df1736b8ece205d4bb70c040f8c8bce66ba8 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_diagnostics.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Beam/PBI.bob
@@ -4,7 +4,7 @@
   <class></class>
   <macros>
     <A2TBCM01>A2T-010LWU:PBI-BCM-001</A2TBCM01>
-    <BCMfile>./EmbedddedWindows/em_BCM_rr.bob</BCMfile>
+    <BCMfile>../../EmbeddedScreens/Beam/em_BCM_rr.bob</BCMfile>
     <DTLBCM01>DTL-010:PBI-BCM-001</DTLBCM01>
     <DTLBCM02>DTL-010:PBI-BCM-002</DTLBCM02>
     <DTLBCM03>DTL-010:PBI-BCM-003</DTLBCM03>
@@ -34,7 +34,7 @@
   </background_color>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_18</name>
-    <file>../LINAC-SYNOPTIC/synopticsfiles/linac_synoptics_main.bob</file>
+    <file>../../../LINAC-SYNOPTIC/synopticsfiles/linac_synoptics_main.bob</file>
     <y>740</y>
     <width>2380</width>
     <height>470</height>
@@ -68,14 +68,14 @@
       <tabs>
         <tab>
           <name>LabBeam Position</name>
-          <file>EmbedddedWindows/em_PBI_labbpm-widget.bob</file>
+          <file>../../EmbeddedScreens/Beam/em_PBI_labbpm-widget.bob</file>
           <macros>
           </macros>
           <group_name></group_name>
         </tab>
         <tab>
           <name>Beam Loss Monitors</name>
-          <file>./EmbedddedWindows/em_PBI_blm-widget.bob</file>
+          <file>../../EmbeddedScreens/Beam/em_PBI_blm-widget.bob</file>
           <macros>
           </macros>
           <group_name></group_name>
@@ -89,7 +89,7 @@
         </tab>
         <tab>
           <name>Beam Position</name>
-          <file>./EmbedddedWindows/em_PBI_bpm-widget.bob</file>
+          <file>../../EmbeddedScreens/Beam/em_PBI_bpm-widget.bob</file>
           <macros>
           </macros>
           <group_name></group_name>
@@ -106,10 +106,10 @@
       <name>Action Button_10</name>
       <actions>
         <action type="open_display">
-          <file>detachwindowcontainer.bob</file>
+          <file>../../SubScreens/detachwindowcontainer.bob</file>
           <macros>
             <ROOT>$(ROOT)</ROOT>
-            <detachwindowpath>EmbedddedWindows/em_PBI_bpm-widget.bob</detachwindowpath>
+            <detachwindowpath>../EmbeddedScreens/Beam/em_PBI_bpm-widget.bob</detachwindowpath>
             <windowheight>1342</windowheight>
             <windowtitle>PBI: Beam Position</windowtitle>
             <windowwidth>2350</windowwidth>
@@ -118,10 +118,10 @@
           <description>Detach Beam Position</description>
         </action>
         <action type="open_display">
-          <file>detachwindowcontainer.bob</file>
+          <file>../../SubScreens/detachwindowcontainer.bob</file>
           <macros>
             <ROOT>$(ROOT)</ROOT>
-            <detachwindowpath>EmbedddedWindows/em_PBI_blm-widget.bob</detachwindowpath>
+            <detachwindowpath>../EmbeddedScreens/Beam/em_PBI_blm-widget.bob</detachwindowpath>
             <windowheight>1342</windowheight>
             <windowtitle>PBI: Beam Loss Monitors</windowtitle>
             <windowwidth>2350</windowwidth>
@@ -1130,7 +1130,7 @@
     <name>Action Button_11</name>
     <actions>
       <action type="open_display">
-        <file>../LINAC-SYNOPTIC/linac_synoptics.bob</file>
+        <file>../../../LINAC-SYNOPTIC/linac_synoptics.bob</file>
         <target>window</target>
         <description>Detach</description>
       </action>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_Beamlines.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Beamlines/0_Overview.bob
similarity index 91%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_Beamlines.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Beamlines/0_Overview.bob
index 95540e1911b6c0fb44b0d29d333b89c96c967d3d..ff852202ce36ad804a764540c2293c41f902681c 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_Beamlines.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Beamlines/0_Overview.bob
@@ -10,7 +10,7 @@
   <widget type="picture" version="2.0.0">
     <name>Picture</name>
     <class></class>
-    <file>Figures/target.png</file>
+    <file>../../Figures/target.png</file>
     <y>20</y>
     <width>2350</width>
     <height>1200</height>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavities.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/0_Navigator.bob
similarity index 77%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavities.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/0_Navigator.bob
index 09579aa21c3d7dc897e70194d67436eb74e56ca0..70d5e61249d6653cb2fc9154e3dc2601d98e1386 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavities.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/0_Navigator.bob
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <name>Cavities</name>
+  <name>Cavities Navigator</name>
   <class></class>
   <width>2370</width>
   <height>1240</height>
@@ -23,56 +23,56 @@
     <tabs>
       <tab>
         <name>Overview</name>
-        <file>collectedOPIs_01_cavs_overview.bob</file>
+        <file>0_Overview.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>NCL Cavities</name>
-        <file>collectedOPIs_01_cavs_NCL.bob</file>
+        <file>NCL.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>Spk Cavities</name>
-        <file>collectedOPIs_01_cavs_Spk.bob</file>
+        <file>Spk.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>MBL Cavities 1-6</name>
-        <file>collectedOPIs_01_cavs_MBL_1.bob</file>
+        <file>MBL_1.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>MBL Cavities 7-9</name>
-        <file>collectedOPIs_01_cavs_MBL_2.bob</file>
+        <file>MBL_2.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>HBL Cavities 1-8</name>
-        <file>collectedOPIs_01_cavs_HBL_1.bob</file>
+        <file>HBL_1.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>HBL Cavities 9-16</name>
-        <file>collectedOPIs_01_cavs_HBL_2.bob</file>
+        <file>HBL_2.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>HBL Cavities 17-21</name>
-        <file>collectedOPIs_01_cavs_HBL_3.bob</file>
+        <file>HBL_3.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
@@ -96,9 +96,9 @@
     <name>DetachButton</name>
     <actions>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>../../SubScreens/detachwindowcontainer.bob</file>
         <macros>
-          <detachwindowpath>collectedOPIs_01_cavs_overview.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/Cavities/0_Overview.bob</detachwindowpath>
           <windowheight>500</windowheight>
           <windowtitle>RF Systems Overview</windowtitle>
           <windowwidth>1420</windowwidth>
@@ -107,10 +107,10 @@
         <description>Detach RF Overview</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>../../SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_cavs_NCL.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/Cavities/NCL.bob</detachwindowpath>
           <windowheight>1240</windowheight>
           <windowtitle>NCL Cavities</windowtitle>
           <windowwidth>2100</windowwidth>
@@ -119,10 +119,10 @@
         <description>Detach NCL</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>../../SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_cavs_Spk.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/Cavities/Spk.bob</detachwindowpath>
           <windowheight>1300</windowheight>
           <windowtitle>Spk Cavities</windowtitle>
           <windowwidth>2350</windowwidth>
@@ -131,10 +131,10 @@
         <description>Detach Spk</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>../../SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_cavs_MBL_1.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/Cavities/MBL_1.bob</detachwindowpath>
           <windowheight>1200</windowheight>
           <windowtitle>MBL Cavities 1-6</windowtitle>
           <windowwidth>2100</windowwidth>
@@ -143,10 +143,10 @@
         <description>Detach MBL 1-6</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>../../SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_cavs_MBL_2.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/Cavities/MBL_2.bob</detachwindowpath>
           <windowheight>1300</windowheight>
           <windowtitle>MBL Cavities 7-9 + History Diagram</windowtitle>
           <windowwidth>2350</windowwidth>
@@ -155,10 +155,10 @@
         <description>Detach MBL 7-9</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>../../SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_cavs_HBL_1.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/Cavities/HBL_1.bob</detachwindowpath>
           <windowheight>1200</windowheight>
           <windowtitle>HBL Cavities 1-8</windowtitle>
           <windowwidth>2180</windowwidth>
@@ -167,10 +167,10 @@
         <description>Detach HBL 1-8</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>../../SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_cavs_HBL_2.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/Cavities/HBL_2.bob</detachwindowpath>
           <windowheight>1200</windowheight>
           <windowtitle>HBL Cavities 9-16</windowtitle>
           <windowwidth>2180</windowwidth>
@@ -179,10 +179,10 @@
         <description>Detach HBL 9-16</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>../../SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_cavs_HBL_3.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/Cavities/HBL_3.bob</detachwindowpath>
           <windowheight>1300</windowheight>
           <windowtitle>HBL Cavities 17-21 + History Diagram</windowtitle>
           <windowwidth>2350</windowwidth>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_overview.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/0_Overview.bob
similarity index 99%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_overview.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/0_Overview.bob
index f1b75245fc014310c17aae76552075cd8361ee57..24569f8fab58aa27ee6a415f1dd3f37db8aa8d15 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_overview.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/0_Overview.bob
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <name>Cavities - overview</name>
+  <name>Cavities Overview</name>
   <class></class>
   <macros>
     <DTL_K01_amp>PV_DTL_K01_amp</DTL_K01_amp>
@@ -76,7 +76,7 @@
     <RFQ_K01_ref>PV_RFQ_K01_fwd</RFQ_K01_ref>
     <RFQ_K01_ref_max>PV_RFQ_K01_ref_max</RFQ_K01_ref_max>
     <RF_LPS_path>$(ROOT)/ess-opis/ess-opis/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainRFQ.bob</RF_LPS_path>
-    <RFpowerFile>./EmbedddedWindows/em_rf_rr.bob</RFpowerFile>
+    <RFpowerFile>../../EmbeddedScreens/Cavities/em_rf_rr.bob</RFpowerFile>
   </macros>
   <width>1410</width>
   <height>480</height>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL_1.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/HBL_1.bob
similarity index 97%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL_1.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/HBL_1.bob
index bd28b5ecce539eb5493076d8ffd8ebbd202ed612..a8081b609ba01fc0429dc89c2dd335d32c720797 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL_1.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/HBL_1.bob
@@ -201,7 +201,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 01</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL01_K01_amp)</K01_amp>
         <K01_phase>$(HBL01_K01_phase)</K01_phase>
@@ -221,7 +221,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 02</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL02_K01_amp)</K01_amp>
         <K01_phase>$(HBL02_K01_phase)</K01_phase>
@@ -241,7 +241,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 03</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL03_K01_amp)</K01_amp>
         <K01_phase>$(HBL03_K01_phase)</K01_phase>
@@ -261,7 +261,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 04</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL04_K01_amp)</K01_amp>
         <K01_phase>$(HBL04_K01_phase)</K01_phase>
@@ -302,7 +302,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 05</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL05_K01_amp)</K01_amp>
         <K01_phase>$(HBL05_K01_phase)</K01_phase>
@@ -322,7 +322,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 06</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL06_K01_amp)</K01_amp>
         <K01_phase>$(HBL06_K01_phase)</K01_phase>
@@ -342,7 +342,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 07</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL07_K01_amp)</K01_amp>
         <K01_phase>$(HBL07_K01_phase)</K01_phase>
@@ -362,7 +362,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 08</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL08_K01_amp)</K01_amp>
         <K01_phase>$(HBL08_K01_phase)</K01_phase>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL_2.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/HBL_2.bob
similarity index 97%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL_2.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/HBL_2.bob
index efcaf86df83d7357e8442b5876373d84ad817e9c..78cd34b12f742697e559bb4ffd129ed6c64303ee 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL_2.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/HBL_2.bob
@@ -201,7 +201,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 10</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL10_K01_amp)</K01_amp>
         <K01_phase>$(HBL10_K01_phase)</K01_phase>
@@ -221,7 +221,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 11</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL11_K01_amp)</K01_amp>
         <K01_phase>$(HBL11_K01_phase)</K01_phase>
@@ -241,7 +241,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 12</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL12_K01_amp)</K01_amp>
         <K01_phase>$(HBL12_K01_phase)</K01_phase>
@@ -261,7 +261,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 09</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL09_K01_amp)</K01_amp>
         <K01_phase>$(HBL09_K01_phase)</K01_phase>
@@ -302,7 +302,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 14</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL14_K01_amp)</K01_amp>
         <K01_phase>$(HBL14_K01_phase)</K01_phase>
@@ -322,7 +322,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 15</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL15_K01_amp)</K01_amp>
         <K01_phase>$(HBL15_K01_phase)</K01_phase>
@@ -342,7 +342,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 16</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL16_K01_amp)</K01_amp>
         <K01_phase>$(HBL16_K01_phase)</K01_phase>
@@ -362,7 +362,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 13</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL13_K01_amp)</K01_amp>
         <K01_phase>$(HBL13_K01_phase)</K01_phase>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL_3.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/HBL_3.bob
similarity index 99%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL_3.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/HBL_3.bob
index f0d8a63dd9870c3ed1be8161d1e6f5d265788ca1..ba6925d577b39a7a7b5d6396b6367330f2b7a507 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL_3.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/HBL_3.bob
@@ -717,7 +717,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 17</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL17_K01_amp)</K01_amp>
         <K01_phase>$(HBL17_K01_phase)</K01_phase>
@@ -737,7 +737,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 18</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL18_K01_amp)</K01_amp>
         <K01_phase>$(HBL18_K01_phase)</K01_phase>
@@ -757,7 +757,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 19</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL19_K01_amp)</K01_amp>
         <K01_phase>$(HBL19_K01_phase)</K01_phase>
@@ -798,7 +798,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 20</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL20_K01_amp)</K01_amp>
         <K01_phase>$(HBL20_K01_phase)</K01_phase>
@@ -818,7 +818,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 21</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(HBL21_K01_amp)</K01_amp>
         <K01_phase>$(HBL21_K01_phase)</K01_phase>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_MBL_1.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/MBL_1.bob
similarity index 93%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_MBL_1.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/MBL_1.bob
index 7b849342176e8acb1d37bacfca897c518dc90c48..7100cda6120cb74ad5927d3cca8ba15dd5e5b9a5 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_MBL_1.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/MBL_1.bob
@@ -32,7 +32,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display MBL 01</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(MBL01_K01_amp)</K01_amp>
         <K01_phase>$(MBL01_K01_phase)</K01_phase>
@@ -52,7 +52,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display MBL 02</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(MBL02_K01_amp)</K01_amp>
         <K01_phase>$(MBL02_K01_phase)</K01_phase>
@@ -72,7 +72,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display MBL 03</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(MBL03_K01_amp)</K01_amp>
         <K01_phase>$(MBL03_K01_phase)</K01_phase>
@@ -113,7 +113,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display MBL 04</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(MBL04_K01_amp)</K01_amp>
         <K01_phase>$(MBL04_K01_phase)</K01_phase>
@@ -133,7 +133,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display MBL 05</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(MBL05_K01_amp)</K01_amp>
         <K01_phase>$(MBL05_K01_phase)</K01_phase>
@@ -153,7 +153,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display MBL 06</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(MBL06_K01_amp)</K01_amp>
         <K01_phase>$(MBL06_K01_phase)</K01_phase>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_MBL_2.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/MBL_2.bob
similarity index 99%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_MBL_2.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/MBL_2.bob
index d2e51f656d296d6987d3925f1e42e9349cc941d3..3d15adb7d7d97d3278afe112b08514bc1d2a975a 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_MBL_2.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/MBL_2.bob
@@ -550,7 +550,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display MBL 07</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(MBL07_K01_amp)</K01_amp>
         <K01_phase>$(MBL07_K01_phase)</K01_phase>
@@ -570,7 +570,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display MBL 08</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(MBL08_K01_amp)</K01_amp>
         <K01_phase>$(MBL08_K01_phase)</K01_phase>
@@ -611,7 +611,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display MBL 09</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <file>../../EmbeddedScreens/Cavities/em_cav_rr.bob</file>
       <macros>
         <K01_amp>$(MBL09_K01_amp)</K01_amp>
         <K01_phase>$(MBL09_K01_phase)</K01_phase>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_NCL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/NCL.bob
similarity index 99%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_NCL.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/NCL.bob
index 4ca7f33b08f528fe6adabc4f60bb7fb96b474aff..8164dafa6e8d2d1d0bea95fbfdc2ad3f64913dd6 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_NCL.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/NCL.bob
@@ -75,8 +75,8 @@
     <RFQ_K01_powerON>PV_RFQ_K01_powerON)</RFQ_K01_powerON>
     <RFQ_K01_ref>$(PV_RFQ_K01_fwd)</RFQ_K01_ref>
     <RFQ_K01_ref_max>$(PV_RFQ_K01_ref_max)</RFQ_K01_ref_max>
-    <RF_LPS_path>$(ROOT)/ess-opis/ess-opis/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainRFQ.bob</RF_LPS_path>
-    <RFpowerFile>./EmbedddedWindows/em_rf_rr.bob</RFpowerFile>
+    <RF_LPS_path>../../../../TS2/ts2-010rfc-rflps/rflpsMainRFQ.bob</RF_LPS_path>
+    <RFpowerFile>../../EmbeddedScreens/Cavities/em_rf_rr.bob</RFpowerFile>
   </macros>
   <width>1850</width>
   <height>1220</height>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_Spk.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/Spk.bob
similarity index 98%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_Spk.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/Spk.bob
index 906dc40da90143457525e622f5050dc0bff707d2..043b8b8459204f38d49c2473b9ef2854ed94ef4f 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_Spk.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Cavities/Spk.bob
@@ -152,7 +152,7 @@
   </background_color>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display Spk Tet 01</name>
-    <file>EmbedddedWindows/em_tet_rr.bob</file>
+    <file>../../EmbeddedScreens/Cavities/em_tet_rr.bob</file>
     <macros>
       <PV_amp>$(Spk01_amp)</PV_amp>
       <PV_fwd>$(Spk01_fwd)</PV_fwd>
@@ -184,7 +184,7 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display Spk Tet 02</name>
-    <file>EmbedddedWindows/em_tet_rr.bob</file>
+    <file>../../EmbeddedScreens/Cavities/em_tet_rr.bob</file>
     <macros>
       <PV_amp>$(Spk02_amp)</PV_amp>
       <PV_fwd>$(Spk02_fwd)</PV_fwd>
@@ -216,7 +216,7 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display Spk Tet 03</name>
-    <file>EmbedddedWindows/em_tet_rr.bob</file>
+    <file>../../EmbeddedScreens/Cavities/em_tet_rr.bob</file>
     <macros>
       <PV_amp>$(Spk03_amp)</PV_amp>
       <PV_fwd>$(Spk03_fwd)</PV_fwd>
@@ -248,7 +248,7 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display Spk Tet 04</name>
-    <file>EmbedddedWindows/em_tet_rr.bob</file>
+    <file>../../EmbeddedScreens/Cavities/em_tet_rr.bob</file>
     <macros>
       <PV_amp>$(Spk04_amp)</PV_amp>
       <PV_fwd>$(Spk04_fwd)</PV_fwd>
@@ -280,7 +280,7 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display Spk Tet 05</name>
-    <file>EmbedddedWindows/em_tet_rr.bob</file>
+    <file>../../EmbeddedScreens/Cavities/em_tet_rr.bob</file>
     <macros>
       <PV_amp>$(Spk05_amp)</PV_amp>
       <PV_fwd>$(Spk05_fwd)</PV_fwd>
@@ -312,7 +312,7 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display Spk Tet 06</name>
-    <file>EmbedddedWindows/em_tet_rr.bob</file>
+    <file>../../EmbeddedScreens/Cavities/em_tet_rr.bob</file>
     <macros>
       <PV_amp>$(Spk06_amp)</PV_amp>
       <PV_fwd>$(Spk06_fwd)</PV_fwd>
@@ -344,7 +344,7 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display Spk Tet 07</name>
-    <file>EmbedddedWindows/em_tet_rr.bob</file>
+    <file>../../EmbeddedScreens/Cavities/em_tet_rr.bob</file>
     <macros>
       <PV_amp>$(Spk07_amp)</PV_amp>
       <PV_fwd>$(Spk07_fwd)</PV_fwd>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_logbook.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Logbook.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_logbook.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Logbook.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_magnets.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Magnet/0_Navigator.bob
similarity index 86%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_magnets.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Magnet/0_Navigator.bob
index ffb721c8d9c261f39c6090e5cc9af8a1db4c6e7d..b6fa73bdb5ffe4b55d8701bd98a9c34e1dd4c2ad 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_magnets.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Magnet/0_Navigator.bob
@@ -26,14 +26,14 @@
     <tabs>
       <tab>
         <name>LEBT+MEBT</name>
-        <file>collectedOPIs_01_mags_lebtmebt.bob</file>
+        <file>LEBTMEBT.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>DTL</name>
-        <file>collectedOPIs_01_mags_dtl.bob</file>
+        <file>DTL.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
@@ -57,11 +57,11 @@
     <name>DetachButton</name>
     <actions>
       <action type="open_display">
-        <file>detachwindowcontainer_boolean.bob</file>
+        <file>../../SubScreens/detachwindowcontainer_boolean.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <boolpv>loc://magcontrolbool</boolpv>
-          <detachwindowpath>collectedOPIs_01_mags_lebtmebt.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/Magnet/LEBTMEBT.bob</detachwindowpath>
           <windowheight>1220</windowheight>
           <windowtitle>LEBT and MEBT magnets</windowtitle>
           <windowwidth>1946</windowwidth>
@@ -70,11 +70,11 @@
         <description>Detach LEBT+MEBT</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer_boolean.bob</file>
+        <file>../../SubScreens/detachwindowcontainer_boolean.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <boolpv>loc://magcontrolbool</boolpv>
-          <detachwindowpath>collectedOPIs_01_mags_dtl.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/Magnet/DTL.bob</detachwindowpath>
           <windowheight>1220</windowheight>
           <windowtitle>DTL magnets</windowtitle>
           <windowwidth>1946</windowwidth>
@@ -83,11 +83,11 @@
         <description>Detach DTL</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer_boolean.bob</file>
+        <file>../../SubScreens/detachwindowcontainer_boolean.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <boolpv>loc://magcontrolbool</boolpv>
-          <detachwindowpath>collectedOPIs_01_mags_CH.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/Magnet/CH.bob</detachwindowpath>
           <windowheight>1220</windowheight>
           <windowtitle>CH (Horizontal Corrector) magnets</windowtitle>
           <windowwidth>1946</windowwidth>
@@ -96,11 +96,11 @@
         <description>Detach CH</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer_boolean.bob</file>
+        <file>../../SubScreens/detachwindowcontainer_boolean.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <boolpv>loc://magcontrolbool</boolpv>
-          <detachwindowpath>collectedOPIs_01_mags_CV.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/Magnet/CV.bob</detachwindowpath>
           <windowheight>1220</windowheight>
           <windowtitle>CV (Vertical Corrector) magnets</windowtitle>
           <windowwidth>1946</windowwidth>
@@ -109,11 +109,11 @@
         <description>Detach CV</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer_boolean.bob</file>
+        <file>../../SubScreens/detachwindowcontainer_boolean.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <boolpv>loc://magcontrolbool</boolpv>
-          <detachwindowpath>collectedOPIs_01_mags_others.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/Magnet/Others.bob</detachwindowpath>
           <windowheight>1220</windowheight>
           <windowtitle>ISrc and Focusing magnets</windowtitle>
           <windowwidth>1946</windowwidth>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mags_CH.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Magnet/CH.bob
similarity index 99%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mags_CH.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Magnet/CH.bob
index a9d6b0f2b72e34d84cbd689d81f988adfbedffac..e988ae54be9caae091bbf27ac4049c316e4135c8 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mags_CH.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Magnet/CH.bob
@@ -30,8 +30,8 @@
     <MEBT_CH_09>MEBT-010:PwrC-PSCH-009</MEBT_CH_09>
     <MEBT_CH_10>MEBT-010:PwrC-PSCH-010</MEBT_CH_10>
     <MEBT_CH_11>MEBT-010:PwrC-PSCH-011</MEBT_CH_11>
-    <RR_MagsFile>./EmbedddedWindows/em_mag_rr.bob</RR_MagsFile>
-    <RW_MagsFile>./EmbedddedWindows/em_mag_rw.bob</RW_MagsFile>
+    <RR_MagsFile>../../EmbeddedScreens/Magnet/em_mag_rr.bob</RR_MagsFile>
+    <RW_MagsFile>../../EmbeddedScreens/Magnet/em_mag_rw.bob</RW_MagsFile>
   </macros>
   <width>1220</width>
   <height>820</height>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mags_CV.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Magnet/CV.bob
similarity index 99%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mags_CV.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Magnet/CV.bob
index ec8a2e396b3bef76bc1535db7bcaf8af0881ef81..14b13259205a78f3302d5b44b76b13bbff8505a5 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mags_CV.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Magnet/CV.bob
@@ -30,8 +30,8 @@
     <MEBT_CV_09>MEBT-010:PwrC-PSCV-009</MEBT_CV_09>
     <MEBT_CV_10>MEBT-010:PwrC-PSCV-010</MEBT_CV_10>
     <MEBT_CV_11>MEBT-010:PwrC-PSCV-011</MEBT_CV_11>
-    <RR_MagsFile>./EmbedddedWindows/em_mag_rr.bob</RR_MagsFile>
-    <RW_MagsFile>./EmbedddedWindows/em_mag_rw.bob</RW_MagsFile>
+    <RR_MagsFile>../../EmbeddedScreens/Magnet/em_mag_rr.bob</RR_MagsFile>
+    <RW_MagsFile>../../EmbeddedScreens/Magnet/em_mag_rw.bob</RW_MagsFile>
   </macros>
   <width>1220</width>
   <height>820</height>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mags_dtl.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Magnet/DTL.bob
similarity index 92%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mags_dtl.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Magnet/DTL.bob
index 635c3091f237a8333463b0f11a89f41fd9dc8d04..86f42e1239a4663776c71342f44287482507ac66 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mags_dtl.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Magnet/DTL.bob
@@ -32,8 +32,8 @@
     <DTL_CV_13>DTL-040:PwrC-PSCV-002</DTL_CV_13>
     <DTL_CV_14>DTL-050:PwrC-PSCV-001</DTL_CV_14>
     <DTL_CV_15>DTL-050:PwrC-PSCV-002</DTL_CV_15>
-    <RR_MagsFile>./EmbedddedWindows/em_mag_rr.bob</RR_MagsFile>
-    <RW_MagsFile>./EmbedddedWindows/em_mag_rw.bob</RW_MagsFile>
+    <RR_MagsFile>../../EmbeddedScreens/Magnet/em_mag_rr.bob</RR_MagsFile>
+    <RW_MagsFile>../../EmbeddedScreens/Magnet/em_mag_rw.bob</RW_MagsFile>
   </macros>
   <width>1220</width>
   <height>820</height>
@@ -272,77 +272,77 @@
     <widget type="action_button" version="3.0.0">
       <name>Action Button</name>
       <actions execute_as_one="true">
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_01):PwrS</pv_name>
           <value>1</value>
           <description>DTL CH 1</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_02):PwrS</pv_name>
           <value>1</value>
           <description>DTL CH 2</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_03):PwrS</pv_name>
           <value>1</value>
           <description>DTL CH 3</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_04):PwrS</pv_name>
           <value>1</value>
           <description>DTL CH 4</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_05):PwrS</pv_name>
           <value>1</value>
           <description>DTL CH 5</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_06):PwrS</pv_name>
           <value>1</value>
           <description>DTL CH 6</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_07):PwrS</pv_name>
           <value>1</value>
           <description>DTL CH 7</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_08):PwrS</pv_name>
           <value>1</value>
           <description>DTL CH 8</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_09):PwrS</pv_name>
           <value>1</value>
           <description>DTL CH 9</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_10):PwrS</pv_name>
           <value>1</value>
           <description>DTL CH 10</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_11):PwrS</pv_name>
           <value>1</value>
           <description>DTL CH 11</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_12):PwrS</pv_name>
           <value>1</value>
           <description>DTL CH 12</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_13):PwrS</pv_name>
           <value>1</value>
           <description>DTL CH 13</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_14):PwrS</pv_name>
           <value>1</value>
           <description>DTL CH 14</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_15):PwrS</pv_name>
           <value>1</value>
           <description>DTL CH 15</description>
@@ -368,77 +368,77 @@
     <widget type="action_button" version="3.0.0">
       <name>Action Button_2</name>
       <actions execute_as_one="true">
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_01):PwrS</pv_name>
           <value>0</value>
           <description>DTL CH 1</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_02):PwrS</pv_name>
           <value>0</value>
           <description>DTL CH 2</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_03):PwrS</pv_name>
           <value>0</value>
           <description>DTL CH 3</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_04):PwrS</pv_name>
           <value>0</value>
           <description>DTL CH 4</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_05):PwrS</pv_name>
           <value>0</value>
           <description>DTL CH 5</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_06):PwrS</pv_name>
           <value>0</value>
           <description>DTL CH 6</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_07):PwrS</pv_name>
           <value>0</value>
           <description>DTL CH 7</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_08):PwrS</pv_name>
           <value>0</value>
           <description>DTL CH 8</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_09):PwrS</pv_name>
           <value>0</value>
           <description>DTL CH 9</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_10):PwrS</pv_name>
           <value>0</value>
           <description>DTL CH 10</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_11):PwrS</pv_name>
           <value>0</value>
           <description>DTL CH 11</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_12):PwrS</pv_name>
           <value>0</value>
           <description>DTL CH 12</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_13):PwrS</pv_name>
           <value>0</value>
           <description>DTL CH 13</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_14):PwrS</pv_name>
           <value>0</value>
           <description>DTL CH 14</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CH_15):PwrS</pv_name>
           <value>0</value>
           <description>DTL CH 15</description>
@@ -693,77 +693,77 @@
     <widget type="action_button" version="3.0.0">
       <name>Action Button_3</name>
       <actions execute_as_one="true">
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_01):PwrS</pv_name>
           <value>1</value>
           <description>DTL CV 1</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_02):PwrS</pv_name>
           <value>1</value>
           <description>DTL CV 2</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_03):PwrS</pv_name>
           <value>1</value>
           <description>DTL CV 3</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_04):PwrS</pv_name>
           <value>1</value>
           <description>DTL CV 4</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_05):PwrS</pv_name>
           <value>1</value>
           <description>DTL CV 5</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_06):PwrS</pv_name>
           <value>1</value>
           <description>DTL CV 6</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_07):PwrS</pv_name>
           <value>1</value>
           <description>DTL CV 7</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_08):PwrS</pv_name>
           <value>1</value>
           <description>DTL CV 8</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_09):PwrS</pv_name>
           <value>1</value>
           <description>DTL CV 9</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_10):PwrS</pv_name>
           <value>1</value>
           <description>DTL CV 10</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_11):PwrS</pv_name>
           <value>1</value>
           <description>DTL CV 11</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_12):PwrS</pv_name>
           <value>1</value>
           <description>DTL CV 12</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_13):PwrS</pv_name>
           <value>1</value>
           <description>DTL CV 13</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_14):PwrS</pv_name>
           <value>1</value>
           <description>DTL CV 14</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_15):PwrS</pv_name>
           <value>1</value>
           <description>DTL CV 15</description>
@@ -789,77 +789,77 @@
     <widget type="action_button" version="3.0.0">
       <name>Action Button_4</name>
       <actions execute_as_one="true">
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_01):PwrS</pv_name>
           <value>0</value>
           <description>DTL CV 1</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_02):PwrS</pv_name>
           <value>0</value>
           <description>DTL CV 2</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_03):PwrS</pv_name>
           <value>0</value>
           <description>DTL CV 3</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_04):PwrS</pv_name>
           <value>0</value>
           <description>DTL CV 4</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_05):PwrS</pv_name>
           <value>0</value>
           <description>DTL CV 5</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_06):PwrS</pv_name>
           <value>0</value>
           <description>DTL CV 6</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_07):PwrS</pv_name>
           <value>0</value>
           <description>DTL CV 7</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_08):PwrS</pv_name>
           <value>0</value>
           <description>DTL CV 8</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_09):PwrS</pv_name>
           <value>0</value>
           <description>DTL CV 9</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_10):PwrS</pv_name>
           <value>0</value>
           <description>DTL CV 10</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_11):PwrS</pv_name>
           <value>0</value>
           <description>DTL CV 11</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_12):PwrS</pv_name>
           <value>0</value>
           <description>DTL CV 12</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_13):PwrS</pv_name>
           <value>0</value>
           <description>DTL CV 13</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_14):PwrS</pv_name>
           <value>0</value>
           <description>DTL CV 14</description>
         </action>
-        <action type='write_pv'>
+        <action type="write_pv">
           <pv_name>$(DTL_CV_15):PwrS</pv_name>
           <value>0</value>
           <description>DTL CV 15</description>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mags_lebtmebt.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Magnet/LEBTMEBT.bob
similarity index 99%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mags_lebtmebt.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Magnet/LEBTMEBT.bob
index b300c6c1c49e84c3027cba82c722fb5808a5f16d..a18c92f5f89549a5bb330e6d0828537693ab61f3 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mags_lebtmebt.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Magnet/LEBTMEBT.bob
@@ -42,7 +42,7 @@
     <MEBT_Q_09>MEBT-010:PwrC-PSQH-009</MEBT_Q_09>
     <MEBT_Q_10>MEBT-010:PwrC-PSQV-010</MEBT_Q_10>
     <MEBT_Q_11>MEBT-010:PwrC-PSQH-011</MEBT_Q_11>
-    <RW_MagsFile>./EmbedddedWindows/em_mag_rw.bob</RW_MagsFile>
+    <RW_MagsFile>../../EmbeddedScreens/Magnet/em_mag_rw.bob</RW_MagsFile>
   </macros>
   <width>1880</width>
   <height>850</height>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mags_others.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Magnet/Others.bob
similarity index 98%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mags_others.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Magnet/Others.bob
index e2cd88ab40e9587e9e00929d52cd9bc00dc3ed98..a4b3b9e06bc946e516718609503f45a9b431be77 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mags_others.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Magnet/Others.bob
@@ -21,9 +21,9 @@
     <MEBT_Q_09>MEBT-010:PwrC-PSQH-009</MEBT_Q_09>
     <MEBT_Q_10>MEBT-010:PwrC-PSQV-010</MEBT_Q_10>
     <MEBT_Q_11>MEBT-010:PwrC-PSQH-011</MEBT_Q_11>
-    <RR_MagsFile>./EmbedddedWindows/em_mag_rr.bob</RR_MagsFile>
-    <RR_MagsFileV>./EmbedddedWindows/em_magV_rr.bob</RR_MagsFileV>
-    <RW_MagsFile>./EmbedddedWindows/em_mag_rw.bob</RW_MagsFile>
+    <RR_MagsFile>../../EmbeddedScreens/Magnet/em_mag_rr.bob</RR_MagsFile>
+    <RR_MagsFileV>../../EmbeddedScreens/Magnet/em_magV_rr.bob</RR_MagsFileV>
+    <RW_MagsFile>../../EmbeddedScreens/Magnet/em_mag_rw.bob</RW_MagsFile>
   </macros>
   <width>1310</width>
   <height>810</height>
@@ -672,7 +672,7 @@
       <name>Action Button</name>
       <actions>
         <action type="open_display">
-          <file>SubWindows/detailed_magnetron.bob</file>
+          <file>../../SubScreens/DetailedScreens/Magnetron.bob</file>
           <target>window</target>
           <description>Launch Magnetron Controller</description>
         </action>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_teststand2.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/System/0_Navigator.bob
similarity index 59%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_teststand2.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/System/0_Navigator.bob
index 342a20d28d90a29f33c5fb12de8eddd3b4c74440..b80e3fd022c4c98dbb7041faae174a0da4b6d4c9 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_teststand2.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/System/0_Navigator.bob
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <name>Test Stand 2</name>
+  <name>System Navigator</name>
   <width>2350</width>
   <height>1238</height>
   <background_color>
@@ -22,29 +22,29 @@
     <name>SubNavigation Tabs</name>
     <tabs>
       <tab>
-        <name>Cryomodule Overview</name>
-        <file>collectedOPIs_01_ts2_cryo.bob</file>
+        <name>Machine Protection</name>
+        <file>MachineProtection.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
-        <name>Water Cooling</name>
-        <file>collectedOPIs_01_ts2_water.bob</file>
+        <name>Vacuum Systems</name>
+        <file>Vacuum.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
-        <name>Vacuum</name>
-        <file>collectedOPIs_01_ts2_vacuum.bob</file>
+        <name>Cryogenics</name>
+        <file>Cryogenics.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>PSS</name>
-        <file>collectedOPIs_01_targs_pss.bob</file>
+        <file></file>
         <macros>
         </macros>
         <group_name></group_name>
@@ -68,52 +68,40 @@
     <name>DetachButton</name>
     <actions>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>../../SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_ts2_cryo.bob</detachwindowpath>
-          <windowheight>1220</windowheight>
-          <windowtitle>TS2 Overview</windowtitle>
-          <windowwidth>1946</windowwidth>
-        </macros>
-        <target>window</target>
-        <description>Detach Overview</description>
-      </action>
-      <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
-        <macros>
-          <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_ts2_water.bob</detachwindowpath>
-          <windowheight>950</windowheight>
-          <windowtitle>TS2 Water Cooling</windowtitle>
-          <windowwidth>1240</windowwidth>
+          <detachwindowpath>../OverviewScreens/System/MachineProtection.bob</detachwindowpath>
+          <windowheight>1300</windowheight>
+          <windowtitle>NCL Machine State Overview</windowtitle>
+          <windowwidth>2100</windowwidth>
         </macros>
         <target>window</target>
-        <description>Detach Water Cooling</description>
+        <description>Detach Machine Protection</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>../../SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_ts2_vacuum.bob</detachwindowpath>
-          <windowheight>800</windowheight>
-          <windowtitle>TS2 Vacuum Systems</windowtitle>
-          <windowwidth>1240</windowwidth>
+          <detachwindowpath>../OverviewScreens/System/Vacuum.bob</detachwindowpath>
+          <windowheight>1220</windowheight>
+          <windowtitle>Valves, Flows and Temperatures Overview</windowtitle>
+          <windowwidth>1946</windowwidth>
         </macros>
         <target>window</target>
-        <description>Detach Vacuum Systems</description>
+        <description>Detach Vacuum</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>../../SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_targs_pss.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/System/Cryogenics.bob</detachwindowpath>
           <windowheight>1220</windowheight>
-          <windowtitle>TS2 PSS Overview</windowtitle>
+          <windowtitle>Cryogenics</windowtitle>
           <windowwidth>1946</windowwidth>
         </macros>
         <target>window</target>
-        <description>Detach PSS</description>
+        <description>Detach Cryogenics</description>
       </action>
     </actions>
     <text>Detach</text>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_cryogenics.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/System/Cryogenics.bob
similarity index 87%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_cryogenics.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/System/Cryogenics.bob
index f1c17ee57634511322022d2ae73e9b77810adec9..94307f703d8a2c95df44af651499b580a0cdb8bc 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_cryogenics.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/System/Cryogenics.bob
@@ -10,7 +10,7 @@
   </background_color>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display</name>
-    <file>../../Cryo/TICP/CrS-TICP_CRYO_LCR/cryo-00-main.bob</file>
+    <file>../../../../Cryo/TICP/CrS-TICP_CRYO_LCR/cryo-00-main.bob</file>
     <x>20</x>
     <y>20</y>
     <width>2130</width>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_overview.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/System/MachineProtection.bob
similarity index 86%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_overview.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/System/MachineProtection.bob
index ac89d43e6181595a6103bae507cae973bcbba4c9..94772a337d3c4af61974d03d0b0c6e634f4113f4 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_overview.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/System/MachineProtection.bob
@@ -6,16 +6,16 @@
     <Interlock01>PSS</Interlock01>
     <Interlock02>PLC</Interlock02>
     <Interlock03>MPS</Interlock03>
-    <InterlocksFile>./EmbedddedWindows/em_interlocks_rr.bob</InterlocksFile>
-    <RFpowerFile>./EmbedddedWindows/em_rf_rr_less.bob</RFpowerFile>
-    <ValvesFile>./EmbedddedWindows/em_valves_rw.bob</ValvesFile>
+    <InterlocksFile>../../EmbeddedScreens/System/em_interlocks_rr.bob</InterlocksFile>
+    <RFpowerFile>../../EmbeddedScreens/Cavities/em_rf_rr_less.bob</RFpowerFile>
+    <ValvesFile>../../EmbeddedScreens/System/em_valves_rw.bob</ValvesFile>
     <section01>NCL</section01>
     <section02>SCL</section02>
     <section03>Target</section03>
     <section04>Beamlines</section04>
   </macros>
-  <width>1940</width>
-  <height>960</height>
+  <width>1810</width>
+  <height>740</height>
   <background_color>
     <color name="Transparent" red="255" green="255" blue="255" alpha="0">
     </color>
@@ -251,7 +251,7 @@
   </widget>
   <widget type="group" version="2.0.0">
     <name>ResetGroup</name>
-    <x>1590</x>
+    <x>1460</x>
     <y>20</y>
     <width>330</width>
     <style>3</style>
@@ -325,73 +325,10 @@
       <tooltip>Open $(name) Control Panel</tooltip>
     </widget>
   </widget>
-  <widget type="group" version="2.0.0">
-    <name>BeamCharge</name>
-    <x>20</x>
-    <y>240</y>
-    <width>700</width>
-    <height>340</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_14</name>
-      <width>700</width>
-      <height>340</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>MGGrey03-title_14</name>
-      <text>Beam Charge at BCM/FC</text>
-      <width>700</width>
-      <height>50</height>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="RED-BORDER" red="150" green="8" blue="16">
-        </color>
-      </background_color>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="databrowser" version="2.0.0">
-      <name>Data Browser</name>
-      <x>20</x>
-      <y>50</y>
-      <width>660</width>
-      <height>270</height>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_2</name>
-      <text>BCM or FC used depends on Beam Mode</text>
-      <x>140</x>
-      <y>110</y>
-      <width>360</width>
-      <height>80</height>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="28.0">
-        </font>
-      </font>
-      <transparent>false</transparent>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-  </widget>
   <widget type="group" version="2.0.0">
     <name>Availability</name>
     <x>740</x>
-    <y>240</y>
+    <y>20</y>
     <width>700</width>
     <height>340</height>
     <style>3</style>
@@ -491,7 +428,7 @@
   <widget type="group" version="2.0.0">
     <name>Availability_1</name>
     <x>740</x>
-    <y>600</y>
+    <y>380</y>
     <width>700</width>
     <height>340</height>
     <style>3</style>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_valvesflows.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/System/Vacuum.bob
similarity index 99%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_valvesflows.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/System/Vacuum.bob
index 044fa468938d7fbd9e81623c3837ebd747ddcb9e..b60a64dbc05b0afa3c86df238a1d9d1fcacb6830 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_valvesflows.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/System/Vacuum.bob
@@ -8,9 +8,9 @@
     <Interlock04>IntL 04</Interlock04>
     <Interlock05>IntL 05</Interlock05>
     <Interlock06>IntL 06</Interlock06>
-    <InterlocksFile>./EmbedddedWindows/em_interlocks_rr.bob</InterlocksFile>
-    <RR_FlowsFile>./EmbedddedWindows/em_flows_rr.bob</RR_FlowsFile>
-    <ValvesFile>./EmbedddedWindows/em_valves_rw.bob</ValvesFile>
+    <InterlocksFile>../../EmbeddedScreens/System/em_interlocks_rr.bob</InterlocksFile>
+    <RR_FlowsFile>../../EmbeddedScreens/System/em_flows_rr.bob</RR_FlowsFile>
+    <ValvesFile>../../EmbeddedScreens/System/em_valves_rw.bob</ValvesFile>
     <flow_h2>ISrc-010:Vac-VVMC-01100:FlwR</flow_h2>
     <flow_n2>LEBT-010:Vac-VVMC-01100:FlwR</flow_n2>
     <pressure_dtl>DTL-010:Vac-ABC-XXX:PrsR</pressure_dtl>
@@ -484,7 +484,7 @@
         <name>NCLflowBtn</name>
         <actions>
           <action type="open_display">
-            <file>../../lebt-010_vac/LEBT.bob</file>
+            <file>../../../../lebt-010_vac/LEBT.bob</file>
             <target>window</target>
             <description>LEBT</description>
           </action>
@@ -499,7 +499,7 @@
         <name>NCLflowBtn_1</name>
         <actions>
           <action type="open_display">
-            <file>../../rfq-010_vac/RFQ.bob</file>
+            <file>../../../../rfq-010_vac/RFQ.bob</file>
             <target>window</target>
             <description>RFQ</description>
           </action>
@@ -514,7 +514,7 @@
         <name>NCLflowBtn_2</name>
         <actions>
           <action type="open_display">
-            <file>../../mebt-010_vac/MEBT.bob</file>
+            <file>../../../../mebt-010_vac/MEBT.bob</file>
             <target>window</target>
             <description>MEBT</description>
           </action>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/TS2/0_Navigator.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/TS2/0_Navigator.bob
new file mode 100644
index 0000000000000000000000000000000000000000..9cb5f8622f099df72c2bdc160db34d8ce98da2f3
--- /dev/null
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/TS2/0_Navigator.bob
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TS2 Navigator</name>
+  <class></class>
+  <width>2350</width>
+  <height>1238</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_40</name>
+    <class></class>
+    <width>200</width>
+    <height>1238</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="navtabs" version="2.0.0">
+    <name>SubNavigation Tabs</name>
+    <tabs>
+      <tab>
+        <name>Cryogenics</name>
+        <file>Cryogenics.bob</file>
+        <macros>
+        </macros>
+        <group_name></group_name>
+      </tab>
+      <tab>
+        <name>Vacuum</name>
+        <file>Vacuum.bob</file>
+        <macros>
+        </macros>
+        <group_name></group_name>
+      </tab>
+      <tab>
+        <name>Water</name>
+        <file>Water.bob</file>
+        <macros>
+        </macros>
+        <group_name></group_name>
+      </tab>
+    </tabs>
+    <width>2370</width>
+    <height>1238</height>
+    <tab_width>200</tab_width>
+    <tab_height>40</tab_height>
+    <tab_spacing>10</tab_spacing>
+    <selected_color>
+      <color name="Read_Background" red="240" green="240" blue="240">
+      </color>
+    </selected_color>
+    <deselected_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </deselected_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>DetachButton</name>
+    <actions>
+      <action type="open_display">
+        <file>../../SubScreens/detachwindowcontainer.bob</file>
+        <macros>
+          <ROOT>$(ROOT)</ROOT>
+          <detachwindowpath>../OverviewScreens/TS2/Cryogenics.bob</detachwindowpath>
+          <windowheight>1400</windowheight>
+          <windowtitle>TS2 Cryogenics Overview</windowtitle>
+          <windowwidth>2200</windowwidth>
+        </macros>
+        <target>window</target>
+        <description>Detach Cryogenics</description>
+      </action>
+      <action type="open_display">
+        <file>../../SubScreens/detachwindowcontainer.bob</file>
+        <macros>
+          <ROOT>$(ROOT)</ROOT>
+          <detachwindowpath>../OverviewScreens/TS2/Vacuum.bob</detachwindowpath>
+          <windowheight>800</windowheight>
+          <windowtitle>TS2 Vacuum Overview</windowtitle>
+          <windowwidth>1400</windowwidth>
+        </macros>
+        <target>window</target>
+        <description>Detach Vacuum</description>
+      </action>
+      <action type="open_display">
+        <file>../../SubScreens/detachwindowcontainer.bob</file>
+        <macros>
+          <ROOT>$(ROOT)</ROOT>
+          <detachwindowpath>../OverviewScreens/TS2/Water.bob</detachwindowpath>
+          <windowheight>1000</windowheight>
+          <windowtitle>TS2 Water Overview</windowtitle>
+          <windowwidth>1400</windowwidth>
+        </macros>
+        <target>window</target>
+        <description>Detach Water</description>
+      </action>
+    </actions>
+    <text>Detach</text>
+    <x>5</x>
+    <y>150</y>
+    <width>185</width>
+    <height>40</height>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+</display>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_ts2_cryo.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/TS2/Cryogenics.bob
similarity index 89%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_ts2_cryo.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/TS2/Cryogenics.bob
index 205e4993c30f0eae91b6df20d1188ccac9b60a33..26b3dd062b0daae6ff5302de8952b55420d89a46 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_ts2_cryo.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/TS2/Cryogenics.bob
@@ -10,7 +10,7 @@
   </background_color>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display</name>
-    <file>../../TS2/ts2-cryomodule/TS2_main.bob</file>
+    <file>../../../../TS2/ts2-cryomodule/TS2_main.bob</file>
     <x>20</x>
     <y>20</y>
     <width>2120</width>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_ts2_vacuum.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/TS2/Vacuum.bob
similarity index 91%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_ts2_vacuum.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/TS2/Vacuum.bob
index 6d07f6515c98864908dba68da119060dc3a0a35b..dc10c8e96539376ea84043ef5a6a82d35bb0d1dd 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_ts2_vacuum.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/TS2/Vacuum.bob
@@ -10,7 +10,7 @@
   </background_color>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display</name>
-    <file>../../TS2/ts2_vac/TS2.bob</file>
+    <file>../../../../TS2/ts2_vac/TS2.bob</file>
     <x>20</x>
     <y>20</y>
     <width>1202</width>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_ts2_water.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/TS2/Water.bob
similarity index 90%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_ts2_water.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/TS2/Water.bob
index 6661530a6c5df6143a51a0662748358e0920db28..bc1b2c67e2b7c4305ac85391c3aae4cf6560a1c3 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_ts2_water.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/TS2/Water.bob
@@ -10,7 +10,7 @@
   </background_color>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display</name>
-    <file>../../TS2/ts2-wtrc/ts2-wtrc.bob</file>
+    <file>../../../../TS2/ts2-wtrc/ts2-wtrc.bob</file>
     <x>20</x>
     <y>20</y>
     <width>1202</width>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_target.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/0_Navigator.bob
similarity index 81%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_target.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/0_Navigator.bob
index 78d83d1084442356d6a62bb744269fbc20f64781..0febe7ded0674b3c019c5ab65bc397d77bb810fa 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_target.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/0_Navigator.bob
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <name>Target</name>
-  <macros>
-    <ROOT>$(ROOT)</ROOT>
-  </macros>
-  <width>2370</width>
+  <name>Target Navigator</name>
+  <width>2350</width>
   <height>1238</height>
   <background_color>
     <color name="BACKGROUND" red="220" green="225" blue="221">
@@ -26,14 +23,14 @@
     <tabs>
       <tab>
         <name>Overview</name>
-        <file></file>
+        <file>0_Overview.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>THCCS</name>
-        <file>collectedOPIs_01_thccs.bob</file>
+        <file>THCCS/0_Navigator.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
@@ -66,13 +63,6 @@
         </macros>
         <group_name></group_name>
       </tab>
-      <tab>
-        <name>NBPI-NBOA CS</name>
-        <file>../../target-systems/thccs/thccs.bob</file>
-        <macros>
-        </macros>
-        <group_name></group_name>
-      </tab>
     </tabs>
     <width>2370</width>
     <height>1238</height>
@@ -92,10 +82,10 @@
     <name>DetachButton</name>
     <actions>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>../../SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_targ_overview.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/Target/0_Overview.bob</detachwindowpath>
           <windowheight>1220</windowheight>
           <windowtitle>Target Overview</windowtitle>
           <windowwidth>1946</windowwidth>
@@ -104,10 +94,10 @@
         <description>Detach Overview</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>../../SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>../../target-systems/thccs/thccs.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/Target/THCCS/0_Navigator.bob</detachwindowpath>
           <windowheight>1220</windowheight>
           <windowtitle>Target Helium Cooling Control System</windowtitle>
           <windowwidth>1946</windowwidth>
@@ -117,8 +107,8 @@
       </action>
     </actions>
     <text>Detach</text>
-    <x>5</x>
-    <y>350</y>
+    <x>6</x>
+    <y>300</y>
     <width>185</width>
     <height>40</height>
     <tooltip>$(actions)</tooltip>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_targ_overview.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/0_Overview.bob
similarity index 69%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_targ_overview.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/0_Overview.bob
index f16973c5341cf237f0468605dd4ed9ac0066492c..d339ace3064c77224aca848bc853643199339fa7 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_targ_overview.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/0_Overview.bob
@@ -6,7 +6,7 @@
     <ROOT>$(ROOT)</ROOT>
   </macros>
   <width>1330</width>
-  <height>640</height>
+  <height>820</height>
   <background_color>
     <color name="BACKGROUND" red="220" green="225" blue="221">
     </color>
@@ -57,13 +57,13 @@
     <x>20</x>
     <y>330</y>
     <width>560</width>
-    <height>290</height>
+    <height>470</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
       <name>MGGrey03-background_18</name>
       <width>560</width>
-      <height>290</height>
+      <height>470</height>
       <line_width>2</line_width>
       <line_color>
         <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -95,7 +95,7 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display</name>
-    <file>EmbedddedWindows/TSS_picture.bob</file>
+    <file>../../EmbeddedScreens/Target/TSS_picture.bob</file>
     <x>600</x>
     <y>20</y>
     <width>710</width>
@@ -103,4 +103,45 @@
     <resize>1</resize>
     <transparent>true</transparent>
   </widget>
+  <widget type="group" version="2.0.0">
+    <name>THCCSGroup</name>
+    <x>600</x>
+    <y>510</y>
+    <width>710</width>
+    <height>290</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>MGGrey03-background_19</name>
+      <width>710</width>
+      <height>290</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>MGGrey03-title_17</name>
+      <text>THCCS</text>
+      <width>710</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+        </font>
+      </font>
+      <background_color>
+        <color name="RED-BORDER" red="150" green="8" blue="16">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+  </widget>
 </display>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/0_Navigator.bob
similarity index 98%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/0_Navigator.bob
index d7dee18f9eeba0f264829d27534e940c4c40f2a1..e4abc3486f54df84025f06b8d96ff91023754200 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/0_Navigator.bob
@@ -25,42 +25,42 @@
     <tabs>
       <tab>
         <name>Overview</name>
-        <file>collectedOPIs_01_thccs_overview.bob</file>
+        <file>0_Overview.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>1010</name>
-        <file>collectedOPIs_01_thccs_1010.bob</file>
+        <file>1010.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>1011</name>
-        <file>collectedOPIs_01_thccs_1011.bob</file>
+        <file>1011.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>1013</name>
-        <file>collectedOPIs_01_thccs_1013.bob</file>
+        <file>1013.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>1015</name>
-        <file>collectedOPIs_01_thccs_1015.bob</file>
+        <file>1015.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
         <name>Status</name>
-        <file>collectedOPIs_01_thccs_status.bob</file>
+        <file>Status.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs_overview.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/0_Overview.bob
similarity index 94%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs_overview.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/0_Overview.bob
index feec38c47c2db456849900b5b80db598edb7c145..8e4c22db407f6130251fef1f07c2eca260b5d079 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs_overview.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/0_Overview.bob
@@ -13,7 +13,7 @@
   </background_color>
   <widget type="picture" version="2.0.0">
     <name>Target</name>
-    <file>../../target-systems/thccs/targetwheel.png</file>
+    <file>../../../../../target-systems/thccs/targetwheel.png</file>
     <x>1324</x>
     <y>149</y>
     <width>250</width>
@@ -133,7 +133,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_52</name>
-      <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Horizontal.bob</file>
+      <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Horizontal.bob</file>
       <macros>
         <WIDDev>PCV</WIDDev>
         <WIDDis>Proc</WIDDis>
@@ -253,7 +253,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_58</name>
-      <file>../../target-systems/thccs/hx_horizontal.bob</file>
+      <file>../../../../../target-systems/thccs/hx_horizontal.bob</file>
       <macros>
         <COND>SEC-SUB:DIS-YSV-001:Opened</COND>
         <DIR>D</DIR>
@@ -356,7 +356,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_57</name>
-      <file>../../target-systems/thccs/hx_horizontal.bob</file>
+      <file>../../../../../target-systems/thccs/hx_horizontal.bob</file>
       <macros>
         <COND>SEC-SUB:DIS-YSV-001:Opened</COND>
         <DIR>L</DIR>
@@ -370,7 +370,7 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_56</name>
-      <file>../../target-systems/thccs/hx_vertical.bob</file>
+      <file>../../../../../target-systems/thccs/hx_vertical.bob</file>
       <macros>
         <COND>SEC-SUB:DIS-YSV-001:Opened</COND>
         <DIR>L</DIR>
@@ -640,7 +640,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>TT-002</name>
-      <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+      <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
       <macros>
         <WIDDev>TT</WIDDev>
         <WIDDis>Proc</WIDDis>
@@ -657,7 +657,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>TT-003</name>
-      <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+      <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
       <macros>
         <WIDDev>TT</WIDDev>
         <WIDDis>Proc</WIDDis>
@@ -674,7 +674,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>TT-004</name>
-      <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+      <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
       <macros>
         <WIDDev>TT</WIDDev>
         <WIDDis>Proc</WIDDis>
@@ -691,7 +691,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>TT-005</name>
-      <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+      <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
       <macros>
         <WIDDev>TT</WIDDev>
         <WIDDis>Proc</WIDDis>
@@ -708,7 +708,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>FT-001a</name>
-      <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+      <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
       <macros>
         <WIDDev>FT</WIDDev>
         <WIDDis>Proc</WIDDis>
@@ -725,7 +725,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>FT-001b</name>
-      <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+      <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
       <macros>
         <WIDDev>FT</WIDDev>
         <WIDDis>Proc</WIDDis>
@@ -742,7 +742,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>TT-005_1</name>
-      <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+      <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
       <macros>
         <WIDDev>PT</WIDDev>
         <WIDDis>Proc</WIDDis>
@@ -1075,7 +1075,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_60</name>
-      <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+      <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
       <macros>
         <WIDDev>YSV</WIDDev>
         <WIDDis>Proc</WIDDis>
@@ -1165,7 +1165,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="picture" version="2.0.0">
       <name>Picture</name>
-      <file>../../Cryo/PHS/symbols/custom/gas-cylinder-fill.png</file>
+      <file>../../../../../Cryo/PHS/symbols/custom/gas-cylinder-fill.png</file>
       <x>245</x>
       <y>48</y>
       <width>22</width>
@@ -1173,7 +1173,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="picture" version="2.0.0">
       <name>Picture_2</name>
-      <file>../../Cryo/PHS/symbols/custom/gas-cylinder-fill.png</file>
+      <file>../../../../../Cryo/PHS/symbols/custom/gas-cylinder-fill.png</file>
       <x>267</x>
       <y>48</y>
       <width>22</width>
@@ -1181,7 +1181,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="picture" version="2.0.0">
       <name>Picture_3</name>
-      <file>../../Cryo/PHS/symbols/custom/gas-cylinder-fill.png</file>
+      <file>../../../../../Cryo/PHS/symbols/custom/gas-cylinder-fill.png</file>
       <x>311</x>
       <y>48</y>
       <width>22</width>
@@ -1189,7 +1189,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="picture" version="2.0.0">
       <name>Picture_4</name>
-      <file>../../Cryo/PHS/symbols/custom/gas-cylinder-fill.png</file>
+      <file>../../../../../Cryo/PHS/symbols/custom/gas-cylinder-fill.png</file>
       <x>289</x>
       <y>48</y>
       <width>22</width>
@@ -1289,7 +1289,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_65</name>
-      <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Vertical_Left.bob</file>
+      <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Vertical_Left.bob</file>
       <macros>
         <WIDDev>PCV</WIDDev>
         <WIDDis>Proc</WIDDis>
@@ -1305,7 +1305,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>V-001a_1</name>
-      <file>../../ICS_OPI_LIBRARY/DeviceTypes/Pumps/TP_TurbinePump_BlockIcon_Vertical.bob</file>
+      <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Pumps/TP_TurbinePump_BlockIcon_Vertical.bob</file>
       <macros>
         <WIDDev>V</WIDDev>
         <WIDDis>Proc</WIDDis>
@@ -1658,7 +1658,7 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>V-001a</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Pumps/TP_TurbinePump_BlockIcon_Vertical.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Pumps/TP_TurbinePump_BlockIcon_Vertical.bob</file>
     <macros>
       <WIDDev>V</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -1674,7 +1674,7 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>V-001b</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Pumps/TP_TurbinePump_BlockIcon_Vertical.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Pumps/TP_TurbinePump_BlockIcon_Vertical.bob</file>
     <macros>
       <WIDDev>V</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -1690,7 +1690,7 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_64</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>YSV</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -1706,7 +1706,7 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_66</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>PCV</WIDDev>
       <WIDDis>Proc</WIDDis>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs_1010.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/1010.bob
similarity index 87%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs_1010.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/1010.bob
index 1d046abeb4650134bfda02b486d58e14c765047c..3571f4444ae1064020be8a7e965c96a88145b8fc 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs_1010.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/1010.bob
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>1010</name>
+  <class></class>
   <macros>
     <Dis>Dis</Dis>
     <SecSub>SecSub</SecSub>
   </macros>
-  <width>1788</width>
-  <height>1050</height>
+  <width>1797</width>
+  <height>995</height>
   <background_color>
     <color red="255" green="255" blue="255" alpha="0">
     </color>
   </background_color>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_2</name>
-    <x>1220</x>
-    <y>163</y>
+    <x>1217</x>
+    <y>123</y>
     <width>260</width>
     <height>266</height>
     <line_width>1</line_width>
@@ -36,14 +37,14 @@
     <name>circulator</name>
     <actions>
       <action type="open_display">
-        <file>../../thccs-circulator/opi/circulator.bob</file>
+        <file>../../../../../thccs-circulator/opi/circulator.bob</file>
         <target>window</target>
         <description>Open Display</description>
       </action>
     </actions>
     <text></text>
-    <x>287</x>
-    <y>584</y>
+    <x>284</x>
+    <y>544</y>
     <width>340</width>
     <height>414</height>
     <background_color>
@@ -54,8 +55,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_753</name>
-    <x>68</x>
-    <y>620</y>
+    <x>65</x>
+    <y>580</y>
     <height>1</height>
     <line_width>1</line_width>
     <line_color>
@@ -71,8 +72,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_770</name>
-    <x>748</x>
-    <y>567</y>
+    <x>745</x>
+    <y>527</y>
     <width>88</width>
     <height>76</height>
     <line_width>1</line_width>
@@ -92,8 +93,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_769</name>
-    <x>652</x>
-    <y>711</y>
+    <x>649</x>
+    <y>671</y>
     <width>494</width>
     <height>45</height>
     <line_width>1</line_width>
@@ -115,8 +116,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_766</name>
-    <x>1093</x>
-    <y>440</y>
+    <x>1090</x>
+    <y>400</y>
     <width>382</width>
     <height>323</height>
     <line_width>1</line_width>
@@ -138,8 +139,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_763</name>
-    <x>1093</x>
-    <y>724</y>
+    <x>1090</x>
+    <y>684</y>
     <width>120</width>
     <height>101</height>
     <line_width>1</line_width>
@@ -159,8 +160,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_761</name>
-    <x>653</x>
-    <y>723</y>
+    <x>650</x>
+    <y>683</y>
     <width>68</width>
     <height>98</height>
     <line_width>1</line_width>
@@ -180,8 +181,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_758</name>
-    <x>306</x>
-    <y>553</y>
+    <x>303</x>
+    <y>513</y>
     <width>418</width>
     <height>158</height>
     <line_width>1</line_width>
@@ -203,8 +204,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_757</name>
-    <x>169</x>
-    <y>202</y>
+    <x>166</x>
+    <y>162</y>
     <width>1100</width>
     <height>598</height>
     <line_color>
@@ -226,8 +227,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_689</name>
-    <x>360</x>
-    <y>283</y>
+    <x>357</x>
+    <y>243</y>
     <width>43</width>
     <height>68</height>
     <line_width>1</line_width>
@@ -247,8 +248,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_760</name>
-    <x>54</x>
-    <y>689</y>
+    <x>51</x>
+    <y>649</y>
     <width>227</width>
     <height>217</height>
     <line_width>1</line_width>
@@ -277,8 +278,8 @@
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_32</name>
-    <x>23</x>
-    <y>765</y>
+    <x>20</x>
+    <y>725</y>
     <width>86</width>
     <height>28</height>
     <line_width>1</line_width>
@@ -305,8 +306,8 @@
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_31</name>
-    <x>112</x>
-    <y>793</y>
+    <x>109</x>
+    <y>753</y>
     <width>86</width>
     <height>28</height>
     <line_width>1</line_width>
@@ -331,38 +332,10 @@
       </point>
     </points>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>title bg</name>
-    <class>GROUP-BLUE</class>
-    <width>1788</width>
-    <height>50</height>
-    <line_width>0</line_width>
-    <line_color>
-      <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="BLUE-GROUP-BACKGROUND" red="179" green="209" blue="209">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_5</name>
-    <class>TITLE</class>
-    <text>Target Primary He Cooling Control System - 1010</text>
-    <width>780</width>
-    <height>50</height>
-    <font>
-      <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-  </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_659</name>
-    <x>1566</x>
-    <y>802</y>
+    <x>1563</x>
+    <y>762</y>
     <width>132</width>
     <height>1</height>
     <line_color>
@@ -378,8 +351,8 @@
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_19</name>
-    <x>1657</x>
-    <y>791</y>
+    <x>1654</x>
+    <y>751</y>
     <width>86</width>
     <height>28</height>
     <line_width>1</line_width>
@@ -406,8 +379,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_660</name>
-    <x>1524</x>
-    <y>637</y>
+    <x>1521</x>
+    <y>597</y>
     <width>120</width>
     <height>2</height>
     <line_width>1</line_width>
@@ -439,8 +412,8 @@
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_20</name>
-    <x>1637</x>
-    <y>626</y>
+    <x>1634</x>
+    <y>586</y>
     <width>86</width>
     <height>28</height>
     <line_width>1</line_width>
@@ -467,8 +440,8 @@
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_21</name>
-    <x>25</x>
-    <y>610</y>
+    <x>22</x>
+    <y>570</y>
     <width>86</width>
     <height>28</height>
     <line_width>1</line_width>
@@ -495,8 +468,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_663</name>
-    <x>951</x>
-    <y>802</y>
+    <x>948</x>
+    <y>762</y>
     <width>1</width>
     <height>60</height>
     <line_width>1</line_width>
@@ -533,8 +506,8 @@
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_23</name>
-    <x>942</x>
-    <y>861</y>
+    <x>939</x>
+    <y>821</y>
     <width>21</width>
     <height>60</height>
     <line_width>1</line_width>
@@ -561,8 +534,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_664</name>
-    <x>57</x>
-    <y>441</y>
+    <x>54</x>
+    <y>401</y>
     <width>93</width>
     <height>37</height>
     <line_width>1</line_width>
@@ -594,8 +567,8 @@
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_24</name>
-    <x>128</x>
-    <y>453</y>
+    <x>125</x>
+    <y>413</y>
     <width>86</width>
     <height>28</height>
     <line_width>1</line_width>
@@ -622,8 +595,8 @@
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_25</name>
-    <x>38</x>
-    <y>431</y>
+    <x>35</x>
+    <y>391</y>
     <width>86</width>
     <height>28</height>
     <line_width>1</line_width>
@@ -650,8 +623,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_665</name>
-    <x>56</x>
-    <y>243</y>
+    <x>53</x>
+    <y>203</y>
     <width>93</width>
     <height>37</height>
     <line_width>1</line_width>
@@ -683,8 +656,8 @@
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_26</name>
-    <x>125</x>
-    <y>255</y>
+    <x>122</x>
+    <y>215</y>
     <width>86</width>
     <height>28</height>
     <line_width>1</line_width>
@@ -711,8 +684,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_667</name>
-    <x>853</x>
-    <y>907</y>
+    <x>850</x>
+    <y>867</y>
     <width>93</width>
     <height>37</height>
     <line_width>1</line_width>
@@ -747,8 +720,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_670</name>
-    <x>229</x>
-    <y>802</y>
+    <x>226</x>
+    <y>762</y>
     <width>66</width>
     <height>1</height>
     <line_color>
@@ -764,8 +737,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_673</name>
-    <x>170</x>
-    <y>366</y>
+    <x>167</x>
+    <y>326</y>
     <width>15</width>
     <height>1</height>
     <line_color>
@@ -781,8 +754,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_674</name>
-    <x>359</x>
-    <y>366</y>
+    <x>356</x>
+    <y>326</y>
     <width>59</width>
     <height>87</height>
     <line_width>1</line_width>
@@ -802,8 +775,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_675</name>
-    <x>1125</x>
-    <y>66</y>
+    <x>1122</x>
+    <y>26</y>
     <width>423</width>
     <height>55</height>
     <line_width>1</line_width>
@@ -823,8 +796,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_676</name>
-    <x>1476</x>
-    <y>82</y>
+    <x>1473</x>
+    <y>42</y>
     <width>47</width>
     <height>36</height>
     <line_width>1</line_width>
@@ -844,8 +817,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_677</name>
-    <x>168</x>
-    <y>233</y>
+    <x>165</x>
+    <y>193</y>
     <width>1</width>
     <height>1</height>
     <points>
@@ -855,8 +828,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_678</name>
-    <x>1125</x>
-    <y>173</y>
+    <x>1122</x>
+    <y>133</y>
     <width>1</width>
     <height>28</height>
     <line_color>
@@ -872,15 +845,15 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_679</name>
-    <x>680</x>
-    <y>152</y>
+    <x>677</x>
+    <y>112</y>
     <width>1</width>
     <height>50</height>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_680</name>
-    <x>1084</x>
-    <y>202</y>
+    <x>1081</x>
+    <y>162</y>
     <width>20</width>
     <line_width>1</line_width>
     <line_color>
@@ -901,8 +874,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_681</name>
-    <x>755</x>
-    <y>174</y>
+    <x>752</x>
+    <y>134</y>
     <width>1</width>
     <height>28</height>
     <line_color>
@@ -918,8 +891,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_682</name>
-    <x>346</x>
-    <y>164</y>
+    <x>343</x>
+    <y>124</y>
     <width>1</width>
     <height>1</height>
     <points>
@@ -929,8 +902,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_683</name>
-    <x>384</x>
-    <y>202</y>
+    <x>381</x>
+    <y>162</y>
     <width>20</width>
     <line_width>1</line_width>
     <line_color>
@@ -951,8 +924,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_684</name>
-    <x>267</x>
-    <y>173</y>
+    <x>264</x>
+    <y>133</y>
     <width>1</width>
     <height>28</height>
     <line_color>
@@ -968,15 +941,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_685</name>
-    <x>223</x>
-    <y>152</y>
+    <x>220</x>
+    <y>112</y>
     <width>1</width>
     <height>50</height>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_686</name>
-    <x>152</x>
-    <y>344</y>
+    <x>149</x>
+    <y>304</y>
     <width>21</width>
     <height>1</height>
     <line_color>
@@ -992,8 +965,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_687</name>
-    <x>359</x>
-    <y>202</y>
+    <x>356</x>
+    <y>162</y>
     <width>1</width>
     <height>28</height>
     <line_color>
@@ -1009,8 +982,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_690</name>
-    <x>302</x>
-    <y>367</y>
+    <x>299</x>
+    <y>327</y>
     <width>113</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -1028,8 +1001,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_697</name>
-    <x>1270</x>
-    <y>248</y>
+    <x>1267</x>
+    <y>208</y>
     <width>1</width>
     <height>45</height>
     <line_color>
@@ -1045,8 +1018,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Pipe First_6</name>
-    <x>1220</x>
-    <y>203</y>
+    <x>1217</x>
+    <y>163</y>
     <width>280</width>
     <height>1</height>
     <line_color>
@@ -1062,8 +1035,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Pipe First_7</name>
-    <x>1295</x>
-    <y>192</y>
+    <x>1292</x>
+    <y>152</y>
     <width>280</width>
     <height>1</height>
     <line_color>
@@ -1081,8 +1054,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Pipe First_8</name>
-    <x>1344</x>
-    <y>192</y>
+    <x>1341</x>
+    <y>152</y>
     <width>280</width>
     <height>1</height>
     <line_color>
@@ -1100,8 +1073,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_699</name>
-    <x>1524</x>
-    <y>192</y>
+    <x>1521</x>
+    <y>152</y>
     <width>248</width>
     <height>2</height>
     <line_color>
@@ -1117,8 +1090,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Pipe First_9</name>
-    <x>1295</x>
-    <y>192</y>
+    <x>1292</x>
+    <y>152</y>
     <width>280</width>
     <height>1</height>
     <line_color>
@@ -1138,15 +1111,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_700</name>
-    <x>1394</x>
-    <y>142</y>
+    <x>1391</x>
+    <y>102</y>
     <width>1</width>
     <height>50</height>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_701</name>
-    <x>138</x>
-    <y>260</y>
+    <x>135</x>
+    <y>220</y>
     <width>1</width>
     <height>1</height>
     <points>
@@ -1156,8 +1129,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_702</name>
-    <x>1428</x>
-    <y>192</y>
+    <x>1425</x>
+    <y>152</y>
     <width>20</width>
     <line_width>1</line_width>
     <line_color>
@@ -1178,8 +1151,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_703</name>
-    <x>1330</x>
-    <y>163</y>
+    <x>1327</x>
+    <y>123</y>
     <width>1</width>
     <height>28</height>
     <line_color>
@@ -1195,15 +1168,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_704</name>
-    <x>1286</x>
-    <y>142</y>
+    <x>1283</x>
+    <y>102</y>
     <width>1</width>
     <height>50</height>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_706</name>
-    <x>1218</x>
-    <y>248</y>
+    <x>1215</x>
+    <y>208</y>
     <width>1</width>
     <height>1</height>
     <points>
@@ -1213,8 +1186,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_707</name>
-    <x>1219</x>
-    <y>204</y>
+    <x>1216</x>
+    <y>164</y>
     <width>1</width>
     <height>1</height>
     <points>
@@ -1224,8 +1197,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_708</name>
-    <x>604</x>
-    <y>802</y>
+    <x>601</x>
+    <y>762</y>
     <width>47</width>
     <height>1</height>
     <line_color>
@@ -1241,8 +1214,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_709</name>
-    <x>1262</x>
-    <y>803</y>
+    <x>1259</x>
+    <y>763</y>
     <width>1</width>
     <height>28</height>
     <line_color>
@@ -1258,15 +1231,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_711</name>
-    <x>1369</x>
-    <y>753</y>
+    <x>1366</x>
+    <y>713</y>
     <width>1</width>
     <height>50</height>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_716</name>
-    <x>1473</x>
-    <y>636</y>
+    <x>1470</x>
+    <y>596</y>
     <width>64</width>
     <height>165</height>
     <line_width>1</line_width>
@@ -1285,8 +1258,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_717</name>
-    <x>359</x>
-    <y>567</y>
+    <x>356</x>
+    <y>527</y>
     <width>440</width>
     <height>120</height>
     <line_width>1</line_width>
@@ -1305,8 +1278,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_718</name>
-    <x>732</x>
-    <y>567</y>
+    <x>729</x>
+    <y>527</y>
     <width>303</width>
     <height>14</height>
     <line_width>1</line_width>
@@ -1323,8 +1296,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_721</name>
-    <x>297</x>
-    <y>702</y>
+    <x>294</x>
+    <y>662</y>
     <width>65</width>
     <height>1</height>
     <line_color>
@@ -1340,8 +1313,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_722</name>
-    <x>296</x>
-    <y>901</y>
+    <x>293</x>
+    <y>861</y>
     <width>60</width>
     <height>1</height>
     <line_color>
@@ -1357,8 +1330,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_725</name>
-    <x>563</x>
-    <y>702</y>
+    <x>560</x>
+    <y>662</y>
     <width>41</width>
     <height>100</height>
     <line_color>
@@ -1376,8 +1349,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_726</name>
-    <x>544</x>
-    <y>901</y>
+    <x>541</x>
+    <y>861</y>
     <width>47</width>
     <height>1</height>
     <line_color>
@@ -1395,8 +1368,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_727</name>
-    <x>685</x>
-    <y>801</y>
+    <x>682</x>
+    <y>761</y>
     <width>2</width>
     <line_color>
       <color name="BLACK" red="0" green="0" blue="0">
@@ -1411,8 +1384,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_731</name>
-    <x>1115</x>
-    <y>801</y>
+    <x>1112</x>
+    <y>761</y>
     <width>1</width>
     <height>28</height>
     <line_color>
@@ -1428,8 +1401,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_734</name>
-    <x>306</x>
-    <y>465</y>
+    <x>303</x>
+    <y>425</y>
     <width>75</width>
     <height>70</height>
     <line_width>1</line_width>
@@ -1452,8 +1425,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_7</name>
     <pv_name>Tgt-HeC1010:Ctrl-PLC-001:PD-005</pv_name>
-    <x>384</x>
-    <y>442</y>
+    <x>381</x>
+    <y>402</y>
     <height>30</height>
     <precision>2</precision>
     <vertical_alignment>1</vertical_alignment>
@@ -1461,8 +1434,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_736</name>
-    <x>169</x>
-    <y>540</y>
+    <x>166</x>
+    <y>500</y>
     <width>22</width>
     <height>1</height>
     <line_color>
@@ -1479,8 +1452,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_8</name>
     <pv_name>Tgt-HeC1010:Ctrl-PLC-001:PD-006</pv_name>
-    <x>687</x>
-    <y>702</y>
+    <x>684</x>
+    <y>662</y>
     <height>30</height>
     <precision>2</precision>
     <vertical_alignment>1</vertical_alignment>
@@ -1489,8 +1462,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_9</name>
     <pv_name>Tgt-HeC1010:Ctrl-PLC-001:PD-004</pv_name>
-    <x>384</x>
-    <y>344</y>
+    <x>381</x>
+    <y>304</y>
     <height>30</height>
     <precision>2</precision>
     <vertical_alignment>1</vertical_alignment>
@@ -1499,8 +1472,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_10</name>
     <pv_name>Tgt-HeC1010:Ctrl-PLC-001:PD-007</pv_name>
-    <x>1135</x>
-    <y>703</y>
+    <x>1132</x>
+    <y>663</y>
     <height>30</height>
     <precision>2</precision>
     <vertical_alignment>1</vertical_alignment>
@@ -1510,8 +1483,8 @@ $(pv_value)</tooltip>
     <name>Label</name>
     <class>HEADER2</class>
     <text>D02.115.3067</text>
-    <x>951</x>
-    <y>293</y>
+    <x>948</x>
+    <y>253</y>
     <width>30</width>
     <height>150</height>
     <font>
@@ -1524,8 +1497,8 @@ $(pv_value)</tooltip>
     <name>Label_1</name>
     <class>HEADER2</class>
     <text>D02.115.4003</text>
-    <x>1005</x>
-    <y>293</y>
+    <x>1002</x>
+    <y>253</y>
     <width>30</width>
     <height>150</height>
     <font>
@@ -1536,8 +1509,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_737</name>
-    <x>478</x>
-    <y>702</y>
+    <x>475</x>
+    <y>662</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -1559,8 +1532,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_740</name>
-    <x>478</x>
-    <y>901</y>
+    <x>475</x>
+    <y>861</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -1582,8 +1555,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_741</name>
-    <x>629</x>
-    <y>802</y>
+    <x>626</x>
+    <y>762</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -1605,8 +1578,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_742</name>
-    <x>1609</x>
-    <y>802</y>
+    <x>1606</x>
+    <y>762</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -1628,8 +1601,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_743</name>
-    <x>1758</x>
-    <y>192</y>
+    <x>1755</x>
+    <y>152</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -1651,15 +1624,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>YSV-006</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>YSV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>006</WIDIndex>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>1486</x>
-    <y>560</y>
+    <x>1483</x>
+    <y>520</y>
     <width>100</width>
     <height>160</height>
     <resize>1</resize>
@@ -1667,15 +1640,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>YSV-002</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>YSV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>002</WIDIndex>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>1487</x>
-    <y>724</y>
+    <x>1484</x>
+    <y>684</y>
     <width>100</width>
     <height>160</height>
     <resize>1</resize>
@@ -1683,15 +1656,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>YSV-004</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>YSV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>004</WIDIndex>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>182</x>
-    <y>725</y>
+    <x>179</x>
+    <y>685</y>
     <width>100</width>
     <height>160</height>
     <resize>1</resize>
@@ -1699,13 +1672,13 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_56</name>
-    <file>../../target-systems/thccs/hx_vertical.bob</file>
+    <file>../../../../../target-systems/thccs/hx_vertical.bob</file>
     <macros>
       <COND>SEC-SUB:DIS-YSV-001:Opened</COND>
       <DIR>L</DIR>
     </macros>
-    <x>137</x>
-    <y>224</y>
+    <x>134</x>
+    <y>184</y>
     <width>60</width>
     <height>60</height>
     <resize>1</resize>
@@ -1713,13 +1686,13 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_57</name>
-    <file>../../target-systems/thccs/hx_vertical.bob</file>
+    <file>../../../../../target-systems/thccs/hx_vertical.bob</file>
     <macros>
       <COND>SEC-SUB:DIS-YSV-001:Opened</COND>
       <DIR>L</DIR>
     </macros>
-    <x>139</x>
-    <y>422</y>
+    <x>136</x>
+    <y>382</y>
     <width>60</width>
     <height>60</height>
     <resize>1</resize>
@@ -1727,13 +1700,13 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_58</name>
-    <file>../../target-systems/thccs/hx_horizontal.bob</file>
+    <file>../../../../../target-systems/thccs/hx_horizontal.bob</file>
     <macros>
       <COND>SEC-SUB:DIS-YSV-001:Opened</COND>
       <DIR>D</DIR>
     </macros>
-    <x>834</x>
-    <y>774</y>
+    <x>831</x>
+    <y>734</y>
     <width>60</width>
     <height>60</height>
     <resize>1</resize>
@@ -1741,8 +1714,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_27</name>
-    <x>36</x>
-    <y>233</y>
+    <x>33</x>
+    <y>193</y>
     <width>86</width>
     <height>28</height>
     <line_width>1</line_width>
@@ -1770,22 +1743,22 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_2</name>
     <text>1046</text>
-    <x>39</x>
-    <y>232</y>
+    <x>36</x>
+    <y>192</y>
     <width>50</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_3</name>
     <text>1046</text>
-    <x>69</x>
-    <y>254</y>
+    <x>66</x>
+    <y>214</y>
     <width>50</width>
     <horizontal_alignment>2</horizontal_alignment>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_744</name>
-    <x>126</x>
-    <y>458</y>
+    <x>123</x>
+    <y>418</y>
     <width>1</width>
     <height>1</height>
     <points>
@@ -1796,22 +1769,22 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_10</name>
     <text>1046</text>
-    <x>71</x>
-    <y>452</y>
+    <x>68</x>
+    <y>412</y>
     <width>50</width>
     <horizontal_alignment>2</horizontal_alignment>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_11</name>
     <text>1046</text>
-    <x>41</x>
-    <y>430</y>
+    <x>38</x>
+    <y>390</y>
     <width>50</width>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_745</name>
-    <x>147</x>
-    <y>946</y>
+    <x>144</x>
+    <y>906</y>
     <width>1</width>
     <height>1</height>
     <points>
@@ -1821,8 +1794,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_28</name>
-    <x>843</x>
-    <y>859</y>
+    <x>840</x>
+    <y>819</y>
     <width>21</width>
     <height>60</height>
     <line_width>1</line_width>
@@ -1849,8 +1822,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_29</name>
-    <x>866</x>
-    <y>949</y>
+    <x>863</x>
+    <y>909</y>
     <width>21</width>
     <height>60</height>
     <line_width>1</line_width>
@@ -1878,8 +1851,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_13</name>
     <text>1046</text>
-    <x>842</x>
-    <y>867</y>
+    <x>839</x>
+    <y>827</y>
     <width>20</width>
     <height>50</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1888,8 +1861,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_14</name>
     <text>1046</text>
-    <x>865</x>
-    <y>894</y>
+    <x>862</x>
+    <y>854</y>
     <width>20</width>
     <height>50</height>
     <rotation_step>1</rotation_step>
@@ -1897,8 +1870,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_15</name>
     <text>1011</text>
-    <x>940</x>
-    <y>869</y>
+    <x>937</x>
+    <y>829</y>
     <width>20</width>
     <height>50</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1906,8 +1879,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_746</name>
-    <x>1779</x>
-    <y>548</y>
+    <x>1776</x>
+    <y>508</y>
     <width>1</width>
     <height>1</height>
     <points>
@@ -1918,21 +1891,21 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_17</name>
     <text>1015</text>
-    <x>28</x>
-    <y>609</y>
+    <x>25</x>
+    <y>569</y>
     <width>50</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_18</name>
     <text>1027</text>
-    <x>1640</x>
-    <y>625</y>
+    <x>1637</x>
+    <y>585</y>
     <width>50</width>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_747</name>
-    <x>1634</x>
-    <y>737</y>
+    <x>1631</x>
+    <y>697</y>
     <width>145</width>
     <height>258</height>
     <line_width>5</line_width>
@@ -1953,16 +1926,16 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_19</name>
     <text>1000</text>
-    <x>1660</x>
-    <y>790</y>
+    <x>1657</x>
+    <y>750</y>
     <width>50</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_20</name>
     <class>HEADER2</class>
     <text>D02.115.4001</text>
-    <x>1644</x>
-    <y>743</y>
+    <x>1641</x>
+    <y>703</y>
     <width>127</width>
     <height>30</height>
     <font>
@@ -1972,8 +1945,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_748</name>
-    <x>169</x>
-    <y>669</y>
+    <x>166</x>
+    <y>629</y>
     <width>1</width>
     <line_width>1</line_width>
     <line_color>
@@ -1994,8 +1967,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_749</name>
-    <x>1037</x>
-    <y>802</y>
+    <x>1034</x>
+    <y>762</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -2019,8 +1992,8 @@ $(pv_value)</tooltip>
     <name>Label_21</name>
     <text>Target Intermediate
 Water Cooling</text>
-    <x>35</x>
-    <y>177</y>
+    <x>32</x>
+    <y>137</y>
     <width>200</width>
     <height>45</height>
     <font>
@@ -2032,8 +2005,8 @@ Water Cooling</text>
     <name>Label_22</name>
     <text>Target Intermediate
 Water Cooling</text>
-    <x>36</x>
-    <y>390</y>
+    <x>33</x>
+    <y>350</y>
     <width>200</width>
     <height>45</height>
     <font>
@@ -2045,8 +2018,8 @@ Water Cooling</text>
     <name>Label_23</name>
     <text>Target Intermediate
 Water Cooling</text>
-    <x>887</x>
-    <y>799</y>
+    <x>884</x>
+    <y>759</y>
     <width>45</width>
     <height>150</height>
     <font>
@@ -2057,10 +2030,10 @@ Water Cooling</text>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_24</name>
-    <text>Target He Cooling 
+    <text>Target He Cooling
 Pressure Control</text>
-    <x>960</x>
-    <y>799</y>
+    <x>957</x>
+    <y>759</y>
     <width>45</width>
     <height>150</height>
     <font>
@@ -2073,8 +2046,8 @@ Pressure Control</text>
     <name>Label_25</name>
     <text>Monolith Rough
 Vacuum Pumps</text>
-    <x>1637</x>
-    <y>645</y>
+    <x>1634</x>
+    <y>605</y>
     <width>127</width>
     <height>45</height>
     <font>
@@ -2086,8 +2059,8 @@ Vacuum Pumps</text>
     <name>Label_26</name>
     <text>Target He
 Purification</text>
-    <x>25</x>
-    <y>628</y>
+    <x>22</x>
+    <y>588</y>
     <width>103</width>
     <height>45</height>
     <font>
@@ -2099,8 +2072,8 @@ Purification</text>
     <name>Label_27</name>
     <text>Target Wheel,
 Drive &amp; Shaft</text>
-    <x>1657</x>
-    <y>810</y>
+    <x>1654</x>
+    <y>770</y>
     <width>121</width>
     <height>45</height>
     <font>
@@ -2110,7 +2083,7 @@ Drive &amp; Shaft</text>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>TT-003</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>TT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -2118,8 +2091,8 @@ Drive &amp; Shaft</text>
       <WIDLabel>Temperature</WIDLabel>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>32</x>
-    <y>318</y>
+    <x>29</x>
+    <y>278</y>
     <width>120</width>
     <height>75</height>
     <resize>1</resize>
@@ -2127,7 +2100,7 @@ Drive &amp; Shaft</text>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>PT-005</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>PT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -2135,8 +2108,8 @@ Drive &amp; Shaft</text>
       <WIDLabel>Pressure</WIDLabel>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>186</x>
-    <y>514</y>
+    <x>183</x>
+    <y>474</y>
     <width>120</width>
     <height>75</height>
     <resize>1</resize>
@@ -2144,7 +2117,7 @@ Drive &amp; Shaft</text>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>PT-004</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>PT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -2152,8 +2125,8 @@ Drive &amp; Shaft</text>
       <WIDLabel>Pressure</WIDLabel>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>182</x>
-    <y>344</y>
+    <x>179</x>
+    <y>304</y>
     <width>120</width>
     <height>75</height>
     <resize>1</resize>
@@ -2161,7 +2134,7 @@ Drive &amp; Shaft</text>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>PT-003</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>PT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -2169,8 +2142,8 @@ Drive &amp; Shaft</text>
       <WIDLabel>Pressure</WIDLabel>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>284</x>
-    <y>230</y>
+    <x>281</x>
+    <y>190</y>
     <width>120</width>
     <height>75</height>
     <resize>1</resize>
@@ -2178,15 +2151,15 @@ Drive &amp; Shaft</text>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_752</name>
-    <x>916</x>
-    <y>586</y>
+    <x>913</x>
+    <y>546</y>
     <width>1</width>
     <height>1</height>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_754</name>
-    <x>931</x>
-    <y>539</y>
+    <x>928</x>
+    <y>499</y>
     <width>1</width>
     <height>28</height>
     <line_color>
@@ -2202,7 +2175,7 @@ Drive &amp; Shaft</text>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>PT-008</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>PT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -2210,8 +2183,8 @@ Drive &amp; Shaft</text>
       <WIDLabel>Pressure</WIDLabel>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>871</x>
-    <y>488</y>
+    <x>868</x>
+    <y>448</y>
     <width>120</width>
     <height>75</height>
     <resize>1</resize>
@@ -2219,8 +2192,8 @@ Drive &amp; Shaft</text>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_720</name>
-    <x>296</x>
-    <y>701</y>
+    <x>293</x>
+    <y>661</y>
     <width>1</width>
     <height>200</height>
     <line_color>
@@ -2238,8 +2211,8 @@ Drive &amp; Shaft</text>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_759</name>
-    <x>109</x>
-    <y>718</y>
+    <x>106</x>
+    <y>678</y>
     <width>1</width>
     <height>1</height>
     <points>
@@ -2250,24 +2223,24 @@ Drive &amp; Shaft</text>
   <widget type="label" version="2.0.0">
     <name>Label_31</name>
     <text>1046</text>
-    <x>54</x>
-    <y>793</y>
+    <x>51</x>
+    <y>753</y>
     <width>50</width>
     <horizontal_alignment>2</horizontal_alignment>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_32</name>
     <text>1046</text>
-    <x>25</x>
-    <y>764</y>
+    <x>22</x>
+    <y>724</y>
     <width>50</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_34</name>
     <text>Target Intermediate
 Water Cooling</text>
-    <x>23</x>
-    <y>819</y>
+    <x>20</x>
+    <y>779</y>
     <width>200</width>
     <height>45</height>
     <font>
@@ -2277,7 +2250,7 @@ Water Cooling</text>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>PT-006</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>PT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -2285,8 +2258,8 @@ Water Cooling</text>
       <WIDLabel>Pressure</WIDLabel>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>638</x>
-    <y>822</y>
+    <x>635</x>
+    <y>782</y>
     <width>120</width>
     <height>75</height>
     <resize>1</resize>
@@ -2294,7 +2267,7 @@ Water Cooling</text>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>PT-007</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>PT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -2302,8 +2275,8 @@ Water Cooling</text>
       <WIDLabel>Pressure</WIDLabel>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>1040</x>
-    <y>828</y>
+    <x>1037</x>
+    <y>788</y>
     <width>120</width>
     <height>75</height>
     <resize>1</resize>
@@ -2311,7 +2284,7 @@ Water Cooling</text>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>TT-005</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>TT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -2319,8 +2292,8 @@ Water Cooling</text>
       <WIDLabel>Temperature</WIDLabel>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>1214</x>
-    <y>830</y>
+    <x>1211</x>
+    <y>790</y>
     <width>120</width>
     <height>75</height>
     <resize>1</resize>
@@ -2328,7 +2301,7 @@ Water Cooling</text>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>FT-002</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>FT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -2336,8 +2309,8 @@ Water Cooling</text>
       <WIDLabel>Flow</WIDLabel>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>836</x>
-    <y>615</y>
+    <x>833</x>
+    <y>575</y>
     <width>120</width>
     <height>75</height>
     <resize>1</resize>
@@ -2345,8 +2318,8 @@ Water Cooling</text>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_739</name>
-    <x>296</x>
-    <y>815</y>
+    <x>293</x>
+    <y>775</y>
     <width>1</width>
     <line_width>1</line_width>
     <line_color>
@@ -2367,8 +2340,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_738</name>
-    <x>296</x>
-    <y>768</y>
+    <x>293</x>
+    <y>728</y>
     <width>1</width>
     <line_width>1</line_width>
     <line_color>
@@ -2389,8 +2362,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_713</name>
-    <x>152</x>
-    <y>571</y>
+    <x>149</x>
+    <y>531</y>
     <width>21</width>
     <height>1</height>
     <line_color>
@@ -2406,7 +2379,7 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>TT-004</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>TT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -2414,8 +2387,8 @@ $(pv_value)</tooltip>
       <WIDLabel>Temperature</WIDLabel>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>32</x>
-    <y>544</y>
+    <x>29</x>
+    <y>504</y>
     <width>120</width>
     <height>75</height>
     <resize>1</resize>
@@ -2423,8 +2396,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>Rectangle_4</name>
-    <x>1204</x>
-    <y>214</y>
+    <x>1201</x>
+    <y>174</y>
     <width>31</width>
     <height>52</height>
     <line_color>
@@ -2438,8 +2411,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>Rectangle_6</name>
-    <x>1254</x>
-    <y>214</y>
+    <x>1251</x>
+    <y>174</y>
     <width>31</width>
     <height>52</height>
     <line_color>
@@ -2453,15 +2426,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>Rectangle</name>
-    <x>971</x>
-    <y>310</y>
+    <x>968</x>
+    <y>270</y>
     <width>1</width>
     <height>1</height>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_4</name>
-    <x>1257</x>
-    <y>239</y>
+    <x>1254</x>
+    <y>199</y>
     <width>26</width>
     <height>1</height>
     <line_width>2</line_width>
@@ -2479,8 +2452,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_5</name>
-    <x>1207</x>
-    <y>239</y>
+    <x>1204</x>
+    <y>199</y>
     <width>26</width>
     <height>1</height>
     <line_width>2</line_width>
@@ -2498,7 +2471,7 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>PT-002</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>PT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -2506,8 +2479,8 @@ $(pv_value)</tooltip>
       <WIDLabel>Pressure</WIDLabel>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>1065</x>
-    <y>121</y>
+    <x>1062</x>
+    <y>81</y>
     <width>120</width>
     <height>75</height>
     <resize>1</resize>
@@ -2515,7 +2488,7 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>PT-001</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>PT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -2523,8 +2496,8 @@ $(pv_value)</tooltip>
       <WIDLabel>Pressure</WIDLabel>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>1455</x>
-    <y>118</y>
+    <x>1452</x>
+    <y>78</y>
     <width>120</width>
     <height>75</height>
     <resize>1</resize>
@@ -2532,8 +2505,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_691</name>
-    <x>1515</x>
-    <y>170</y>
+    <x>1512</x>
+    <y>130</y>
     <width>1</width>
     <height>28</height>
     <line_color>
@@ -2550,8 +2523,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_5</name>
     <pv_name>Tgt-HeC1010:Ctrl-PLC-001:PD-002</pv_name>
-    <x>1497</x>
-    <y>60</y>
+    <x>1494</x>
+    <y>20</y>
     <height>30</height>
     <precision>2</precision>
     <vertical_alignment>1</vertical_alignment>
@@ -2560,8 +2533,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_6</name>
     <pv_name>Tgt-HeC1010:Ctrl-PLC-001:PD-008</pv_name>
-    <x>1140</x>
-    <y>420</y>
+    <x>1137</x>
+    <y>380</y>
     <height>30</height>
     <precision>2</precision>
     <vertical_alignment>1</vertical_alignment>
@@ -2569,8 +2542,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_694</name>
-    <x>1177</x>
-    <y>249</y>
+    <x>1174</x>
+    <y>209</y>
     <width>33</width>
     <height>1</height>
     <line_color>
@@ -2586,8 +2559,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_756</name>
-    <x>894</x>
-    <y>567</y>
+    <x>891</x>
+    <y>527</y>
     <width>1</width>
     <height>48</height>
     <line_color>
@@ -2603,15 +2576,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_764</name>
-    <x>1193</x>
-    <y>760</y>
+    <x>1190</x>
+    <y>720</y>
     <width>1</width>
     <height>1</height>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_765</name>
-    <x>1200</x>
-    <y>721</y>
+    <x>1197</x>
+    <y>681</y>
     <width>1</width>
     <height>1</height>
     <points>
@@ -2621,15 +2594,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_768</name>
-    <x>660</x>
-    <y>750</y>
+    <x>657</x>
+    <y>710</y>
     <width>1</width>
     <height>1</height>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_771</name>
-    <x>994</x>
-    <y>66</y>
+    <x>991</x>
+    <y>26</y>
     <width>1</width>
     <height>1</height>
     <points>
@@ -2639,8 +2612,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_772</name>
-    <x>993</x>
-    <y>65</y>
+    <x>990</x>
+    <y>25</y>
     <width>427</width>
     <height>933</height>
     <line_width>5</line_width>
@@ -2662,15 +2635,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>YSV-001</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>YSV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>001</WIDIndex>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>1642</x>
-    <y>114</y>
+    <x>1639</x>
+    <y>74</y>
     <width>100</width>
     <height>160</height>
     <resize>1</resize>
@@ -2678,7 +2651,7 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>RT-001</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>RT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -2686,8 +2659,8 @@ $(pv_value)</tooltip>
       <WIDLabel>Radiation</WIDLabel>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>1270</x>
-    <y>111</y>
+    <x>1267</x>
+    <y>71</y>
     <width>120</width>
     <height>75</height>
     <resize>1</resize>
@@ -2695,7 +2668,7 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>RT-002a</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>RT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -2703,8 +2676,8 @@ $(pv_value)</tooltip>
       <WIDLabel>Radiation</WIDLabel>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>1210</x>
-    <y>293</y>
+    <x>1207</x>
+    <y>253</y>
     <width>120</width>
     <height>75</height>
     <resize>1</resize>
@@ -2712,7 +2685,7 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>RT-002b</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>RT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -2720,8 +2693,8 @@ $(pv_value)</tooltip>
       <WIDLabel>Radiation</WIDLabel>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>1058</x>
-    <y>221</y>
+    <x>1055</x>
+    <y>181</y>
     <width>120</width>
     <height>75</height>
     <resize>1</resize>
@@ -2729,7 +2702,7 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>TT-002</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>TT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -2737,8 +2710,8 @@ $(pv_value)</tooltip>
       <WIDLabel>Temperature</WIDLabel>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>207</x>
-    <y>122</y>
+    <x>204</x>
+    <y>82</y>
     <width>120</width>
     <height>75</height>
     <resize>1</resize>
@@ -2746,7 +2719,7 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>RT-003</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>RT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -2754,8 +2727,8 @@ $(pv_value)</tooltip>
       <WIDLabel>Radiation</WIDLabel>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>695</x>
-    <y>122</y>
+    <x>692</x>
+    <y>82</y>
     <width>120</width>
     <height>75</height>
     <resize>1</resize>
@@ -2763,8 +2736,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline</name>
-    <x>447</x>
-    <y>639</y>
+    <x>444</x>
+    <y>599</y>
     <width>1</width>
     <height>61</height>
     <line_color>
@@ -2780,8 +2753,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_1</name>
-    <x>460</x>
-    <y>901</y>
+    <x>457</x>
+    <y>861</y>
     <width>1</width>
     <height>39</height>
     <line_color>
@@ -2797,15 +2770,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>FCV-001</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>FCV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>001</WIDIndex>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>698</x>
-    <y>490</y>
+    <x>695</x>
+    <y>450</y>
     <width>100</width>
     <height>160</height>
     <resize>1</resize>
@@ -2814,8 +2787,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_30</name>
     <text>Target He Cooling Pressure Control</text>
-    <x>1019</x>
-    <y>578</y>
+    <x>1016</x>
+    <y>538</y>
     <width>143</width>
     <height>45</height>
     <font>
@@ -2825,8 +2798,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>polygon 1030 inside 1013_2</name>
-    <x>1019</x>
-    <y>557</y>
+    <x>1016</x>
+    <y>517</y>
     <width>103</width>
     <height>35</height>
     <line_width>1</line_width>
@@ -2854,15 +2827,15 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_28</name>
     <text>1011</text>
-    <x>1056</x>
-    <y>556</y>
+    <x>1053</x>
+    <y>516</y>
     <width>50</width>
     <horizontal_alignment>2</horizontal_alignment>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_751</name>
-    <x>1324</x>
-    <y>656</y>
+    <x>1321</x>
+    <y>616</y>
     <width>2</width>
     <height>145</height>
     <line_width>1</line_width>
@@ -2879,8 +2852,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_34</name>
-    <x>1315</x>
-    <y>685</y>
+    <x>1312</x>
+    <y>645</y>
     <width>21</width>
     <height>60</height>
     <line_width>1</line_width>
@@ -2908,8 +2881,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_38</name>
     <text>1015</text>
-    <x>1314</x>
-    <y>630</y>
+    <x>1311</x>
+    <y>590</y>
     <width>20</width>
     <height>50</height>
     <rotation_step>1</rotation_step>
@@ -2917,8 +2890,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_39</name>
     <text>Target HePurification</text>
-    <x>1336</x>
-    <y>535</y>
+    <x>1333</x>
+    <y>495</y>
     <width>45</width>
     <height>150</height>
     <font>
@@ -2929,7 +2902,7 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>FT-001b</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>FT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -2937,8 +2910,8 @@ $(pv_value)</tooltip>
       <WIDLabel>Flow</WIDLabel>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>400</x>
-    <y>940</y>
+    <x>397</x>
+    <y>900</y>
     <width>120</width>
     <height>75</height>
     <resize>1</resize>
@@ -2946,7 +2919,7 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>FT-001a</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>FT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -2954,8 +2927,8 @@ $(pv_value)</tooltip>
       <WIDLabel>Flow</WIDLabel>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>389</x>
-    <y>589</y>
+    <x>386</x>
+    <y>549</y>
     <width>120</width>
     <height>75</height>
     <resize>1</resize>
@@ -2963,15 +2936,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>YSV-005a</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>YSV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>005a</WIDIndex>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>513</x>
-    <y>625</y>
+    <x>510</x>
+    <y>585</y>
     <width>100</width>
     <height>160</height>
     <resize>1</resize>
@@ -2979,15 +2952,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>YSV-005b</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>YSV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>005b</WIDIndex>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>513</x>
-    <y>824</y>
+    <x>510</x>
+    <y>784</y>
     <width>100</width>
     <height>160</height>
     <resize>1</resize>
@@ -2995,15 +2968,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>V-001a</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Pumps/TP_TurbinePump_BlockIcon_Vertical.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Pumps/TP_TurbinePump_BlockIcon_Vertical.bob</file>
     <macros>
       <WIDDev>V</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>001a</WIDIndex>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>296</x>
-    <y>642</y>
+    <x>293</x>
+    <y>602</y>
     <width>100</width>
     <height>165</height>
     <resize>1</resize>
@@ -3011,15 +2984,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>V-001b</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Pumps/TP_TurbinePump_BlockIcon_Vertical.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Pumps/TP_TurbinePump_BlockIcon_Vertical.bob</file>
     <macros>
       <WIDDev>V</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>001b</WIDIndex>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>296</x>
-    <y>841</y>
+    <x>293</x>
+    <y>801</y>
     <width>100</width>
     <height>165</height>
     <resize>1</resize>
@@ -3027,15 +3000,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>V001a_2</name>
-    <file>/home/jkazan/thccs-circulator/opi/custom/OFTTech_Circulators_BlockIcon.bob</file>
+    <file>../../../EmbeddedScreens/Target/thccs/OFTTech_Circulators_BlockIcon.bob</file>
     <macros>
       <WIDDev>V</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>001</WIDIndex>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>296</x>
-    <y>642</y>
+    <x>293</x>
+    <y>602</y>
     <width>100</width>
     <height>126</height>
     <resize>1</resize>
@@ -3043,15 +3016,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>V001a_3</name>
-    <file>/home/jkazan/thccs-circulator/opi/custom/OFTTech_Circulators_BlockIcon.bob</file>
+    <file>../../../EmbeddedScreens/Target/thccs/OFTTech_Circulators_BlockIcon.bob</file>
     <macros>
       <WIDDev>V</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>001</WIDIndex>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>296</x>
-    <y>841</y>
+    <x>293</x>
+    <y>801</y>
     <width>100</width>
     <height>126</height>
     <resize>1</resize>
@@ -3066,8 +3039,8 @@ $(pv_value)</tooltip>
       <WIDIndex>001</WIDIndex>
       <WIDSecSub>Tgt-HeC1010</WIDSecSub>
     </macros>
-    <x>405</x>
-    <y>748</y>
+    <x>402</x>
+    <y>708</y>
     <width>100</width>
     <height>165</height>
     <resize>1</resize>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs_1011.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/1011.bob
similarity index 71%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs_1011.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/1011.bob
index 64a9a19e2089086e746b049f035c6bd85ccf1e41..df35c87a081ce8a6bc7746614bf08b03e2f1d38e 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs_1011.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/1011.bob
@@ -15,8 +15,8 @@
   </background_color>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_789</name>
-    <x>789</x>
-    <y>602</y>
+    <x>799</x>
+    <y>560</y>
     <width>15</width>
     <height>23</height>
     <line_color>
@@ -36,8 +36,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_796</name>
-    <x>879</x>
-    <y>602</y>
+    <x>889</x>
+    <y>560</y>
     <width>15</width>
     <height>23</height>
     <line_color>
@@ -57,8 +57,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_792</name>
-    <x>969</x>
-    <y>602</y>
+    <x>979</x>
+    <y>560</y>
     <width>15</width>
     <height>23</height>
     <line_color>
@@ -78,8 +78,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_784</name>
-    <x>572</x>
-    <y>418</y>
+    <x>582</x>
+    <y>376</y>
     <width>305</width>
     <height>94</height>
     <line_color>
@@ -97,8 +97,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_783</name>
-    <x>90</x>
-    <y>149</y>
+    <x>100</x>
+    <y>107</y>
     <width>788</width>
     <height>365</height>
     <line_color>
@@ -118,8 +118,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_782</name>
-    <x>344</x>
-    <y>514</y>
+    <x>354</x>
+    <y>472</y>
     <width>207</width>
     <height>260</height>
     <line_color>
@@ -137,8 +137,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline</name>
-    <x>343</x>
-    <y>299</y>
+    <x>353</x>
+    <y>257</y>
     <width>219</width>
     <height>476</height>
     <line_color>
@@ -156,8 +156,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_20</name>
-    <x>121</x>
-    <y>776</y>
+    <x>131</x>
+    <y>734</y>
     <width>1200</width>
     <height>1</height>
     <line_color>
@@ -173,8 +173,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_762</name>
-    <x>599</x>
-    <y>299</y>
+    <x>609</x>
+    <y>257</y>
     <width>279</width>
     <height>1</height>
     <line_color>
@@ -190,8 +190,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_759</name>
-    <x>119</x>
-    <y>658</y>
+    <x>129</x>
+    <y>616</y>
     <width>224</width>
     <height>1</height>
     <line_color>
@@ -205,38 +205,10 @@
       </point>
     </points>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>title bg</name>
-    <class>GROUP-BLUE</class>
-    <width>1788</width>
-    <height>50</height>
-    <line_width>0</line_width>
-    <line_color>
-      <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="BLUE-GROUP-BACKGROUND" red="179" green="209" blue="209">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_5</name>
-    <class>TITLE</class>
-    <text>Target He Cooling Pressure Control System - 1011</text>
-    <width>798</width>
-    <height>50</height>
-    <font>
-      <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-  </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_19</name>
-    <x>1279</x>
-    <y>765</y>
+    <x>1289</x>
+    <y>723</y>
     <width>86</width>
     <height>28</height>
     <line_width>1</line_width>
@@ -266,8 +238,8 @@
     <class>HEADER2</class>
     <text>D02.103.3067
 Utility 100 (Rectangular Room)</text>
-    <x>1015</x>
-    <y>257</y>
+    <x>1025</x>
+    <y>215</y>
     <width>60</width>
     <height>308</height>
     <font>
@@ -278,8 +250,8 @@ Utility 100 (Rectangular Room)</text>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_742</name>
-    <x>1238</x>
-    <y>776</y>
+    <x>1248</x>
+    <y>734</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -301,15 +273,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_53</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>YSV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>011</WIDIndex>
       <WIDSecSub>Tgt-HePC1011</WIDSecSub>
     </macros>
-    <x>1094</x>
-    <y>698</y>
+    <x>1104</x>
+    <y>656</y>
     <width>100</width>
     <height>165</height>
     <resize>1</resize>
@@ -318,16 +290,16 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_19</name>
     <text>1010</text>
-    <x>1287</x>
-    <y>767</y>
+    <x>1297</x>
+    <y>725</y>
     <width>50</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_27</name>
     <text>Target Primary
 Cooling System</text>
-    <x>1279</x>
-    <y>784</y>
+    <x>1289</x>
+    <y>742</y>
     <width>121</width>
     <height>45</height>
     <font>
@@ -337,15 +309,15 @@ Cooling System</text>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_52</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>PCV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>015</WIDIndex>
       <WIDSecSub>Tgt-HePC1011</WIDSecSub>
     </macros>
-    <x>364</x>
-    <y>699</y>
+    <x>374</x>
+    <y>657</y>
     <width>100</width>
     <height>180</height>
     <resize>1</resize>
@@ -353,8 +325,8 @@ Cooling System</text>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_750</name>
-    <x>1207</x>
-    <y>776</y>
+    <x>1217</x>
+    <y>734</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -376,8 +348,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Nitrogen</name>
-    <x>55</x>
-    <y>765</y>
+    <x>65</x>
+    <y>723</y>
     <width>86</width>
     <height>28</height>
     <line_width>1</line_width>
@@ -416,15 +388,15 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_20</name>
     <text>Nitrogen</text>
-    <x>58</x>
-    <y>764</y>
+    <x>68</x>
+    <y>722</y>
     <width>59</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_28</name>
     <text>Nitrogen Supply</text>
-    <x>54</x>
-    <y>784</y>
+    <x>64</x>
+    <y>742</y>
     <width>121</width>
     <height>45</height>
     <font>
@@ -434,15 +406,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_54</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>YSV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>010</WIDIndex>
       <WIDSecSub>Tgt-HePC1011</WIDSecSub>
     </macros>
-    <x>177</x>
-    <y>698</y>
+    <x>187</x>
+    <y>656</y>
     <width>100</width>
     <height>165</height>
     <resize>1</resize>
@@ -450,8 +422,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Pristine He</name>
-    <x>57</x>
-    <y>648</y>
+    <x>67</x>
+    <y>606</y>
     <width>86</width>
     <height>28</height>
     <line_width>1</line_width>
@@ -490,21 +462,21 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_29</name>
     <text>1030</text>
-    <x>60</x>
-    <y>647</y>
+    <x>70</x>
+    <y>605</y>
     <width>59</width>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_55</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>YSV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>012</WIDIndex>
       <WIDSecSub>Tgt-HePC1011</WIDSecSub>
     </macros>
-    <x>177</x>
-    <y>581</y>
+    <x>187</x>
+    <y>539</y>
     <width>100</width>
     <height>165</height>
     <resize>1</resize>
@@ -512,15 +484,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_56</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>YSV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>013</WIDIndex>
       <WIDSecSub>Tgt-HePC1011</WIDSecSub>
     </macros>
-    <x>294</x>
-    <y>568</y>
+    <x>304</x>
+    <y>526</y>
     <width>100</width>
     <height>165</height>
     <resize>1</resize>
@@ -529,8 +501,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_32</name>
     <text>Pristine Helium</text>
-    <x>56</x>
-    <y>668</y>
+    <x>66</x>
+    <y>626</y>
     <width>121</width>
     <height>45</height>
     <font>
@@ -540,15 +512,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_58</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>YSV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>022a</WIDIndex>
       <WIDSecSub>Tgt-HePC1011</WIDSecSub>
     </macros>
-    <x>364</x>
-    <y>223</y>
+    <x>374</x>
+    <y>181</y>
     <width>100</width>
     <height>165</height>
     <resize>1</resize>
@@ -556,8 +528,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_760</name>
-    <x>572</x>
-    <y>264</y>
+    <x>582</x>
+    <y>222</y>
     <width>1</width>
     <height>28</height>
     <line_color>
@@ -573,7 +545,7 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_64</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>PT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -581,8 +553,8 @@ $(pv_value)</tooltip>
       <WIDLabel>Pressure</WIDLabel>
       <WIDSecSub>Tgt-HePC1011</WIDSecSub>
     </macros>
-    <x>512</x>
-    <y>212</y>
+    <x>522</x>
+    <y>170</y>
     <width>120</width>
     <height>65</height>
     <resize>1</resize>
@@ -590,15 +562,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_66</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>YSV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>023a</WIDIndex>
       <WIDSecSub>Tgt-HePC1011</WIDSecSub>
     </macros>
-    <x>648</x>
-    <y>221</y>
+    <x>658</x>
+    <y>179</y>
     <width>100</width>
     <height>165</height>
     <resize>1</resize>
@@ -606,15 +578,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_69</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>YSV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>018</WIDIndex>
       <WIDSecSub>Tgt-HePC1011</WIDSecSub>
     </macros>
-    <x>760</x>
-    <y>340</y>
+    <x>770</x>
+    <y>298</y>
     <width>100</width>
     <height>165</height>
     <resize>1</resize>
@@ -622,7 +594,7 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_59</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>PT</WIDDev>
       <WIDDis>Proc</WIDDis>
@@ -630,8 +602,8 @@ $(pv_value)</tooltip>
       <WIDLabel>Pressure</WIDLabel>
       <WIDSecSub>Tgt-HePC1011</WIDSecSub>
     </macros>
-    <x>688</x>
-    <y>635</y>
+    <x>698</x>
+    <y>593</y>
     <width>120</width>
     <height>65</height>
     <resize>1</resize>
@@ -639,15 +611,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_70</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>YSV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>021</WIDIndex>
       <WIDSecSub>Tgt-HePC1011</WIDSecSub>
     </macros>
-    <x>717</x>
-    <y>72</y>
+    <x>727</x>
+    <y>30</y>
     <width>100</width>
     <height>165</height>
     <resize>1</resize>
@@ -655,15 +627,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_61</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>YSV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>016</WIDIndex>
       <WIDSecSub>Tgt-HePC1011</WIDSecSub>
     </macros>
-    <x>409</x>
-    <y>436</y>
+    <x>419</x>
+    <y>394</y>
     <width>100</width>
     <height>165</height>
     <resize>1</resize>
@@ -674,8 +646,8 @@ $(pv_value)</tooltip>
     <class>HEADER2</class>
     <text>Utility 110 (Rectangular Room)
 D02.115.3067</text>
-    <x>1078</x>
-    <y>257</y>
+    <x>1088</x>
+    <y>215</y>
     <width>60</width>
     <height>308</height>
     <font>
@@ -686,8 +658,8 @@ D02.115.3067</text>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_744</name>
-    <x>496</x>
-    <y>776</y>
+    <x>506</x>
+    <y>734</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -709,8 +681,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_753</name>
-    <x>569</x>
-    <y>149</y>
+    <x>579</x>
+    <y>107</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -732,8 +704,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_755</name>
-    <x>765</x>
-    <y>298</y>
+    <x>775</x>
+    <y>256</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -755,15 +727,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_60</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>PCV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>014</WIDIndex>
       <WIDSecSub>Tgt-HePC1011</WIDSecSub>
     </macros>
-    <x>492</x>
-    <y>627</y>
+    <x>502</x>
+    <y>585</y>
     <width>100</width>
     <height>180</height>
     <resize>1</resize>
@@ -771,8 +743,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_778</name>
-    <x>344</x>
-    <y>545</y>
+    <x>354</x>
+    <y>503</y>
     <width>1</width>
     <line_width>1</line_width>
     <line_color>
@@ -793,8 +765,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_780</name>
-    <x>344</x>
-    <y>518</y>
+    <x>354</x>
+    <y>476</y>
     <width>1</width>
     <line_width>1</line_width>
     <line_color>
@@ -815,8 +787,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_776</name>
-    <x>490</x>
-    <y>299</y>
+    <x>500</x>
+    <y>257</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -838,15 +810,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_14</name>
-    <x>493</x>
-    <y>259</y>
+    <x>503</x>
+    <y>217</y>
     <width>1</width>
     <height>1</height>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_786</name>
-    <x>540</x>
-    <y>613</y>
+    <x>550</x>
+    <y>571</y>
     <width>430</width>
     <height>1</height>
     <line_color>
@@ -862,8 +834,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_790</name>
-    <x>1069</x>
-    <y>62</y>
+    <x>1079</x>
+    <y>20</y>
     <width>5</width>
     <height>961</height>
     <line_width>5</line_width>
@@ -881,8 +853,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_791</name>
-    <x>748</x>
-    <y>613</y>
+    <x>758</x>
+    <y>571</y>
     <width>1</width>
     <height>22</height>
     <line_color>
@@ -898,8 +870,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_23</name>
-    <x>171</x>
-    <y>139</y>
+    <x>181</x>
+    <y>97</y>
     <width>86</width>
     <height>28</height>
     <line_width>1</line_width>
@@ -938,8 +910,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_31</name>
     <text>1150</text>
-    <x>107</x>
-    <y>140</y>
+    <x>117</x>
+    <y>98</y>
     <width>59</width>
     <horizontal_alignment>2</horizontal_alignment>
   </widget>
@@ -947,8 +919,8 @@ $(pv_value)</tooltip>
     <name>Label_33</name>
     <text>Monolith Pressure
 Relief System</text>
-    <x>10</x>
-    <y>159</y>
+    <x>20</x>
+    <y>117</y>
     <width>161</width>
     <height>46</height>
     <font>
@@ -959,40 +931,40 @@ Relief System</text>
   </widget>
   <widget type="picture" version="2.0.0">
     <name>Picture_18</name>
-    <file>../../ICS_OPI_LIBRARY/symbols/custom_v02/gas-cylinder-fill.png</file>
-    <x>528</x>
-    <y>266</y>
+    <file>../../../../../ICS_OPI_LIBRARY/symbols/custom_v02/gas-cylinder-fill.png</file>
+    <x>538</x>
+    <y>224</y>
     <width>22</width>
     <height>80</height>
   </widget>
   <widget type="picture" version="2.0.0">
     <name>Picture_19</name>
-    <file>../../ICS_OPI_LIBRARY/symbols/custom_v02/gas-cylinder-fill.png</file>
-    <x>550</x>
-    <y>266</y>
+    <file>../../../../../ICS_OPI_LIBRARY/symbols/custom_v02/gas-cylinder-fill.png</file>
+    <x>560</x>
+    <y>224</y>
     <width>22</width>
     <height>80</height>
   </widget>
   <widget type="picture" version="2.0.0">
     <name>Picture_20</name>
-    <file>../../ICS_OPI_LIBRARY/symbols/custom_v02/gas-cylinder-fill.png</file>
-    <x>594</x>
-    <y>266</y>
+    <file>../../../../../ICS_OPI_LIBRARY/symbols/custom_v02/gas-cylinder-fill.png</file>
+    <x>604</x>
+    <y>224</y>
     <width>22</width>
     <height>80</height>
   </widget>
   <widget type="picture" version="2.0.0">
     <name>Picture_21</name>
-    <file>../../ICS_OPI_LIBRARY/symbols/custom_v02/gas-cylinder-fill.png</file>
-    <x>572</x>
-    <y>266</y>
+    <file>../../../../../ICS_OPI_LIBRARY/symbols/custom_v02/gas-cylinder-fill.png</file>
+    <x>582</x>
+    <y>224</y>
     <width>22</width>
     <height>80</height>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_793</name>
-    <x>343</x>
-    <y>406</y>
+    <x>353</x>
+    <y>364</y>
     <width>1</width>
     <line_width>1</line_width>
     <line_color>
@@ -1013,8 +985,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_794</name>
-    <x>878</x>
-    <y>348</y>
+    <x>888</x>
+    <y>306</y>
     <width>1</width>
     <line_width>1</line_width>
     <line_color>
@@ -1035,8 +1007,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_795</name>
-    <x>654</x>
-    <y>418</y>
+    <x>664</x>
+    <y>376</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -1058,8 +1030,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_797</name>
-    <x>541</x>
-    <y>566</y>
+    <x>551</x>
+    <y>524</y>
     <width>1</width>
     <line_width>1</line_width>
     <line_color>
@@ -1080,8 +1052,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_798</name>
-    <x>656</x>
-    <y>614</y>
+    <x>666</x>
+    <y>572</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -1103,8 +1075,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_799</name>
-    <x>627</x>
-    <y>614</y>
+    <x>637</x>
+    <y>572</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -1126,8 +1098,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_800</name>
-    <x>295</x>
-    <y>658</y>
+    <x>305</x>
+    <y>616</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -1149,8 +1121,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_801</name>
-    <x>295</x>
-    <y>776</y>
+    <x>305</x>
+    <y>734</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -1173,8 +1145,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_34</name>
     <text>Helium Storage</text>
-    <x>512</x>
-    <y>346</y>
+    <x>522</x>
+    <y>304</y>
     <width>121</width>
     <height>45</height>
     <font>
@@ -1185,45 +1157,45 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="picture" version="2.0.0">
     <name>Picture_22</name>
-    <file>../../ICS_OPI_LIBRARY/symbols/custom_v02/gas-cylinder-fill.png</file>
-    <x>794</x>
-    <y>591</y>
+    <file>../../../../../ICS_OPI_LIBRARY/symbols/custom_v02/gas-cylinder-fill.png</file>
+    <x>804</x>
+    <y>549</y>
     <width>80</width>
     <height>22</height>
     <rotation>270.0</rotation>
   </widget>
   <widget type="picture" version="2.0.0">
     <name>Picture_23</name>
-    <file>../../ICS_OPI_LIBRARY/symbols/custom_v02/gas-cylinder-fill.png</file>
-    <x>794</x>
-    <y>613</y>
+    <file>../../../../../ICS_OPI_LIBRARY/symbols/custom_v02/gas-cylinder-fill.png</file>
+    <x>804</x>
+    <y>571</y>
     <width>80</width>
     <height>22</height>
     <rotation>270.0</rotation>
   </widget>
   <widget type="picture" version="2.0.0">
     <name>Picture_24</name>
-    <file>../../ICS_OPI_LIBRARY/symbols/custom_v02/gas-cylinder-fill.png</file>
-    <x>884</x>
-    <y>591</y>
+    <file>../../../../../ICS_OPI_LIBRARY/symbols/custom_v02/gas-cylinder-fill.png</file>
+    <x>894</x>
+    <y>549</y>
     <width>80</width>
     <height>22</height>
     <rotation>270.0</rotation>
   </widget>
   <widget type="picture" version="2.0.0">
     <name>Picture_25</name>
-    <file>../../ICS_OPI_LIBRARY/symbols/custom_v02/gas-cylinder-fill.png</file>
-    <x>884</x>
-    <y>613</y>
+    <file>../../../../../ICS_OPI_LIBRARY/symbols/custom_v02/gas-cylinder-fill.png</file>
+    <x>894</x>
+    <y>571</y>
     <width>80</width>
     <height>22</height>
     <rotation>270.0</rotation>
   </widget>
   <widget type="picture" version="2.0.0">
     <name>Picture_26</name>
-    <file>../../ICS_OPI_LIBRARY/symbols/custom_v02/gas-cylinder-fill.png</file>
-    <x>974</x>
-    <y>591</y>
+    <file>../../../../../ICS_OPI_LIBRARY/symbols/custom_v02/gas-cylinder-fill.png</file>
+    <x>984</x>
+    <y>549</y>
     <width>80</width>
     <height>22</height>
     <rotation>270.0</rotation>
@@ -1231,8 +1203,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_35</name>
     <text>Passive Buffer</text>
-    <x>869</x>
-    <y>633</y>
+    <x>879</x>
+    <y>591</y>
     <width>121</width>
     <height>45</height>
     <font>
@@ -1243,8 +1215,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_743</name>
-    <x>1006</x>
-    <y>776</y>
+    <x>1016</x>
+    <y>734</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -1266,8 +1238,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_751</name>
-    <x>975</x>
-    <y>776</y>
+    <x>985</x>
+    <y>734</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -1289,15 +1261,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>V-001a</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Pumps/TP_TurbinePump_BlockIcon_Vertical.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Pumps/TP_TurbinePump_BlockIcon_Vertical.bob</file>
     <macros>
       <WIDDev>V</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>011</WIDIndex>
       <WIDSecSub>Tgt-HePC1011</WIDSecSub>
     </macros>
-    <x>635</x>
-    <y>452</y>
+    <x>645</x>
+    <y>410</y>
     <width>100</width>
     <height>165</height>
     <resize>1</resize>
@@ -1305,8 +1277,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_803</name>
-    <x>374</x>
-    <y>514</y>
+    <x>384</x>
+    <y>472</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -1328,8 +1300,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_804</name>
-    <x>878</x>
-    <y>206</y>
+    <x>888</x>
+    <y>164</y>
     <width>1</width>
     <line_width>1</line_width>
     <line_color>
@@ -1350,8 +1322,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_805</name>
-    <x>794</x>
-    <y>514</y>
+    <x>804</x>
+    <y>472</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -1380,8 +1352,8 @@ $(pv_value)</tooltip>
       <WIDIndex>011</WIDIndex>
       <WIDSecSub>Tgt-HePC1011</WIDSecSub>
     </macros>
-    <x>594</x>
-    <y>831</y>
+    <x>604</x>
+    <y>789</y>
     <width>100</width>
     <height>165</height>
     <resize>1</resize>
@@ -1389,8 +1361,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_787</name>
-    <x>694</x>
-    <y>899</y>
+    <x>704</x>
+    <y>857</y>
     <height>1</height>
     <line_width>1</line_width>
     <line_color>
@@ -1407,8 +1379,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_25</name>
-    <x>850</x>
-    <y>889</y>
+    <x>860</x>
+    <y>847</y>
     <width>86</width>
     <height>28</height>
     <line_width>1</line_width>
@@ -1447,15 +1419,15 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_40</name>
     <text>PT-007</text>
-    <x>786</x>
-    <y>890</y>
+    <x>796</x>
+    <y>848</y>
     <width>59</width>
     <horizontal_alignment>2</horizontal_alignment>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_788</name>
-    <x>694</x>
-    <y>864</y>
+    <x>704</x>
+    <y>822</y>
     <width>200</width>
     <height>1</height>
     <line_width>1</line_width>
@@ -1473,16 +1445,16 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="picture" version="2.0.0">
     <name>Picture</name>
-    <file>../../target-systems/thccs/pressure_control.png</file>
-    <x>862</x>
-    <y>793</y>
+    <file>../../../../../target-systems/thccs/pressure_control.png</file>
+    <x>872</x>
+    <y>751</y>
     <width>190</width>
     <height>140</height>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_802</name>
-    <x>500</x>
-    <y>910</y>
+    <x>510</x>
+    <y>868</y>
     <width>1</width>
     <height>1</height>
     <points>
@@ -1492,8 +1464,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_806</name>
-    <x>564</x>
-    <y>730</y>
+    <x>574</x>
+    <y>688</y>
     <width>29</width>
     <height>155</height>
     <line_width>1</line_width>
@@ -1513,8 +1485,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_807</name>
-    <x>414</x>
-    <y>845</y>
+    <x>424</x>
+    <y>803</y>
     <width>180</width>
     <height>40</height>
     <line_width>1</line_width>
@@ -1535,294 +1507,302 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_41</name>
     <text>+</text>
-    <x>534</x>
-    <y>885</y>
+    <x>544</x>
+    <y>843</y>
     <width>5</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_42</name>
     <text>-</text>
-    <x>571</x>
-    <y>852</y>
+    <x>581</x>
+    <y>810</y>
     <width>5</width>
   </widget>
   <widget type="group" version="2.0.0">
     <name>group.fill_1</name>
-    <x>1152</x>
-    <y>153</y>
+    <x>1162</x>
+    <y>111</y>
     <width>225</width>
     <style>3</style>
-    <widget type="rectangle" version="2.0.0">
-      <name>group.border_2</name>
-      <width>225</width>
-      <height>200</height>
-      <line_width>0</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </background_color>
-    </widget>
-    <widget type="rectangle" version="2.0.0">
-      <name>group.background_2</name>
-      <x>5</x>
-      <y>35</y>
-      <width>215</width>
-      <height>155</height>
-      <line_width>0</line_width>
-      <line_color>
-        <color name="PRIMARY-GROUP-BORDER" red="151" green="188" blue="202">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>title_2</name>
-      <text>FILL FROM SOURCE</text>
-      <width>225</width>
-      <height>35</height>
-      <font>
-        <font name="Header 2" family="Liberation Sans" style="BOLD" size="18.0">
-        </font>
-      </font>
-      <foreground_color>
-        <color name="GRAY-TEXT" red="255" green="255" blue="255">
-        </color>
-      </foreground_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>B-020a_4</name>
-      <actions>
-        <action type="write_pv">
-          <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Src</pv_name>
-          <value>100</value>
-          <description>Write PV</description>
-        </action>
-      </actions>
-      <text>Storage B-020a</text>
-      <x>40</x>
-      <y>50</y>
-      <width>150</width>
-      <rules>
-        <rule name="Active" prop_id="background_color" out_exp="false">
-          <exp bool_exp="pv0==100">
-            <value>
-              <color name="GREEN-GROUP-BORDER" red="131" green="150" blue="131">
-              </color>
-            </value>
-          </exp>
-          <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Src</pv_name>
-        </rule>
-      </rules>
-      <tooltip>$(actions)</tooltip>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>Pristine He_4</name>
-      <actions>
-        <action type="write_pv">
-          <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Src</pv_name>
-          <value>200</value>
-          <description>Write PV</description>
-        </action>
-      </actions>
-      <text>Pristine He</text>
-      <x>40</x>
-      <y>80</y>
-      <width>150</width>
-      <rules>
-        <rule name="Active" prop_id="background_color" out_exp="false">
-          <exp bool_exp="pv0==200">
-            <value>
-              <color name="GREEN-GROUP-BORDER" red="131" green="150" blue="131">
-              </color>
-            </value>
-          </exp>
-          <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Src</pv_name>
-        </rule>
-      </rules>
-      <tooltip>$(actions)</tooltip>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>Nitrogen_4</name>
-      <actions>
-        <action type="write_pv">
-          <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Src</pv_name>
-          <value>300</value>
-          <description>Write PV</description>
-        </action>
-      </actions>
-      <text>Nitrogen</text>
-      <x>40</x>
-      <y>110</y>
-      <width>150</width>
-      <rules>
-        <rule name="Active" prop_id="background_color" out_exp="false">
-          <exp bool_exp="pv0==300">
-            <value>
-              <color name="GREEN-GROUP-BORDER" red="131" green="150" blue="131">
-              </color>
-            </value>
-          </exp>
-          <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Src</pv_name>
-        </rule>
-      </rules>
-      <tooltip>$(actions)</tooltip>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>Air_3</name>
-      <actions>
-        <action type="write_pv">
-          <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Src</pv_name>
-          <value>900</value>
-          <description>Write PV</description>
-        </action>
-      </actions>
-      <text>Air</text>
-      <x>40</x>
-      <y>140</y>
-      <width>150</width>
-      <rules>
-        <rule name="Active" prop_id="background_color" out_exp="false">
-          <exp bool_exp="pv0==900">
-            <value>
-              <color name="GREEN-GROUP-BORDER" red="131" green="150" blue="131">
-              </color>
-            </value>
-          </exp>
-          <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Src</pv_name>
-        </rule>
-      </rules>
-      <tooltip>$(actions)</tooltip>
-    </widget>
   </widget>
   <widget type="group" version="2.0.0">
     <name>group.drain_1</name>
-    <x>1152</x>
-    <y>373</y>
+    <x>1162</x>
+    <y>331</y>
     <width>225</width>
     <style>3</style>
-    <widget type="rectangle" version="2.0.0">
-      <name>group.border_3</name>
-      <width>225</width>
-      <height>200</height>
-      <line_width>0</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </background_color>
-    </widget>
-    <widget type="rectangle" version="2.0.0">
-      <name>group.background_3</name>
-      <x>5</x>
-      <y>35</y>
-      <width>215</width>
-      <height>155</height>
-      <line_width>0</line_width>
-      <line_color>
-        <color name="PRIMARY-GROUP-BORDER" red="151" green="188" blue="202">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>title_3</name>
-      <text>DRAIN TO DESTINATION</text>
-      <width>225</width>
-      <height>35</height>
-      <font>
-        <font name="Header 2" family="Liberation Sans" style="BOLD" size="18.0">
-        </font>
-      </font>
-      <foreground_color>
-        <color name="GRAY-TEXT" red="255" green="255" blue="255">
-        </color>
-      </foreground_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>B-020a_5</name>
-      <actions>
-        <action type="write_pv">
-          <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Dest</pv_name>
-          <value>100</value>
-          <description>Write PV</description>
-        </action>
-      </actions>
-      <text>Storage B-020a</text>
-      <x>40</x>
-      <y>80</y>
-      <width>150</width>
-      <rules>
-        <rule name="Active" prop_id="background_color" out_exp="false">
-          <exp bool_exp="pv0==100">
-            <value>
-              <color name="GREEN-GROUP-BORDER" red="131" green="150" blue="131">
-              </color>
-            </value>
-          </exp>
-          <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Dest</pv_name>
-        </rule>
-      </rules>
-      <tooltip>$(actions)</tooltip>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>1027_1</name>
-      <actions>
-        <action type="write_pv">
-          <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Dest</pv_name>
-          <value>200</value>
-          <description>Write PV</description>
-        </action>
-      </actions>
-      <text>Offgas Extracting</text>
-      <x>40</x>
-      <y>110</y>
-      <width>150</width>
-      <rules>
-        <rule name="Active" prop_id="background_color" out_exp="false">
-          <exp bool_exp="pv0==200">
-            <value>
-              <color name="GREEN-GROUP-BORDER" red="131" green="150" blue="131">
-              </color>
-            </value>
-          </exp>
-          <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Dest</pv_name>
-        </rule>
-      </rules>
-      <tooltip>$(actions)</tooltip>
-    </widget>
   </widget>
   <widget type="picture" version="2.0.0">
     <name>Picture_27</name>
-    <file>../../ICS_OPI_LIBRARY/symbols/custom_v02/gas-cylinder-fill.png</file>
-    <x>974</x>
-    <y>613</y>
+    <file>../../../../../ICS_OPI_LIBRARY/symbols/custom_v02/gas-cylinder-fill.png</file>
+    <x>984</x>
+    <y>571</y>
     <width>80</width>
     <height>22</height>
     <rotation>270.0</rotation>
   </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>group.border_2</name>
+    <x>1172</x>
+    <y>69</y>
+    <width>225</width>
+    <height>200</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>group.background_2</name>
+    <x>1177</x>
+    <y>104</y>
+    <width>215</width>
+    <height>155</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="PRIMARY-GROUP-BORDER" red="151" green="188" blue="202">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title_2</name>
+    <text>FILL FROM SOURCE</text>
+    <x>1172</x>
+    <y>69</y>
+    <width>225</width>
+    <height>35</height>
+    <font>
+      <font name="Header 2" family="Liberation Sans" style="BOLD" size="18.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="GRAY-TEXT" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>B-020a_4</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Src</pv_name>
+        <value>100</value>
+        <description>Write PV</description>
+      </action>
+    </actions>
+    <text>Storage B-020a</text>
+    <x>1212</x>
+    <y>119</y>
+    <width>150</width>
+    <rules>
+      <rule name="Active" prop_id="background_color" out_exp="false">
+        <exp bool_exp="pv0==100">
+          <value>
+            <color name="GREEN-GROUP-BORDER" red="131" green="150" blue="131">
+            </color>
+          </value>
+        </exp>
+        <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Src</pv_name>
+      </rule>
+    </rules>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Pristine He_4</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Src</pv_name>
+        <value>200</value>
+        <description>Write PV</description>
+      </action>
+    </actions>
+    <text>Pristine He</text>
+    <x>1212</x>
+    <y>149</y>
+    <width>150</width>
+    <rules>
+      <rule name="Active" prop_id="background_color" out_exp="false">
+        <exp bool_exp="pv0==200">
+          <value>
+            <color name="GREEN-GROUP-BORDER" red="131" green="150" blue="131">
+            </color>
+          </value>
+        </exp>
+        <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Src</pv_name>
+      </rule>
+    </rules>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Nitrogen_4</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Src</pv_name>
+        <value>300</value>
+        <description>Write PV</description>
+      </action>
+    </actions>
+    <text>Nitrogen</text>
+    <x>1212</x>
+    <y>179</y>
+    <width>150</width>
+    <rules>
+      <rule name="Active" prop_id="background_color" out_exp="false">
+        <exp bool_exp="pv0==300">
+          <value>
+            <color name="GREEN-GROUP-BORDER" red="131" green="150" blue="131">
+            </color>
+          </value>
+        </exp>
+        <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Src</pv_name>
+      </rule>
+    </rules>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Air_3</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Src</pv_name>
+        <value>900</value>
+        <description>Write PV</description>
+      </action>
+    </actions>
+    <text>Air</text>
+    <x>1212</x>
+    <y>209</y>
+    <width>150</width>
+    <rules>
+      <rule name="Active" prop_id="background_color" out_exp="false">
+        <exp bool_exp="pv0==900">
+          <value>
+            <color name="GREEN-GROUP-BORDER" red="131" green="150" blue="131">
+            </color>
+          </value>
+        </exp>
+        <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Src</pv_name>
+      </rule>
+    </rules>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>group.border_3</name>
+    <x>1172</x>
+    <y>289</y>
+    <width>225</width>
+    <height>200</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>group.background_3</name>
+    <x>1177</x>
+    <y>324</y>
+    <width>215</width>
+    <height>155</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="PRIMARY-GROUP-BORDER" red="151" green="188" blue="202">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title_3</name>
+    <text>DRAIN TO DESTINATION</text>
+    <x>1172</x>
+    <y>289</y>
+    <width>225</width>
+    <height>35</height>
+    <font>
+      <font name="Header 2" family="Liberation Sans" style="BOLD" size="18.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="GRAY-TEXT" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>B-020a_5</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Dest</pv_name>
+        <value>100</value>
+        <description>Write PV</description>
+      </action>
+    </actions>
+    <text>Storage B-020a</text>
+    <x>1212</x>
+    <y>369</y>
+    <width>150</width>
+    <rules>
+      <rule name="Active" prop_id="background_color" out_exp="false">
+        <exp bool_exp="pv0==100">
+          <value>
+            <color name="GREEN-GROUP-BORDER" red="131" green="150" blue="131">
+            </color>
+          </value>
+        </exp>
+        <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Dest</pv_name>
+      </rule>
+    </rules>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>1027_1</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Dest</pv_name>
+        <value>200</value>
+        <description>Write PV</description>
+      </action>
+    </actions>
+    <text>Offgas Extracting</text>
+    <x>1212</x>
+    <y>399</y>
+    <width>150</width>
+    <rules>
+      <rule name="Active" prop_id="background_color" out_exp="false">
+        <exp bool_exp="pv0==200">
+          <value>
+            <color name="GREEN-GROUP-BORDER" red="131" green="150" blue="131">
+            </color>
+          </value>
+        </exp>
+        <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:P_Gas_Dest</pv_name>
+      </rule>
+    </rules>
+    <tooltip>$(actions)</tooltip>
+  </widget>
 </display>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs_1013.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/1013.bob
similarity index 82%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs_1013.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/1013.bob
index 054ec9b4ec893140d209e767a440c47dc31a2ad3..83a0c18d18b5b0a2bb82c3e8194a0b2e427cb42a 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs_1013.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/1013.bob
@@ -13,8 +13,8 @@
   </background_color>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_661</name>
-    <x>802</x>
-    <y>579</y>
+    <x>671</x>
+    <y>520</y>
     <width>1</width>
     <height>49</height>
     <line_color>
@@ -30,8 +30,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_9</name>
-    <x>669</x>
-    <y>726</y>
+    <x>538</x>
+    <y>667</y>
     <width>46</width>
     <height>49</height>
     <line_width>1</line_width>
@@ -51,8 +51,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_672</name>
-    <x>562</x>
-    <y>725</y>
+    <x>431</x>
+    <y>666</y>
     <width>88</width>
     <height>52</height>
     <line_width>1</line_width>
@@ -72,8 +72,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_4</name>
-    <x>656</x>
-    <y>639</y>
+    <x>525</x>
+    <y>580</y>
     <width>1</width>
     <height>81</height>
     <line_width>1</line_width>
@@ -93,8 +93,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_2</name>
-    <x>675</x>
-    <y>643</y>
+    <x>544</x>
+    <y>584</y>
     <width>69</width>
     <height>8</height>
     <line_width>1</line_width>
@@ -114,8 +114,8 @@
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_30</name>
-    <x>622</x>
-    <y>695</y>
+    <x>491</x>
+    <y>636</y>
     <width>86</width>
     <height>28</height>
     <line_width>1</line_width>
@@ -142,45 +142,10 @@
       </point>
     </points>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>title bg</name>
-    <class>GROUP-BLUE</class>
-    <width>1788</width>
-    <height>50</height>
-    <line_width>0</line_width>
-    <line_color>
-      <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="BLUE-GROUP-BACKGROUND" red="179" green="209" blue="209">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_5</name>
-    <class>TITLE</class>
-    <text>Target He Injection System - 1013</text>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
-    <width>798</width>
-    <height>50</height>
-    <font use_class="true">
-      <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
-      </font>
-    </font>
-    <foreground_color use_class="true">
-      <color name="Text" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <transparent use_class="true">true</transparent>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-  </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_659</name>
-    <x>304</x>
-    <y>580</y>
+    <x>173</x>
+    <y>521</y>
     <width>856</width>
     <height>12</height>
     <line_color>
@@ -196,8 +161,8 @@
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_19</name>
-    <x>1125</x>
-    <y>570</y>
+    <x>994</x>
+    <y>511</y>
     <width>86</width>
     <height>28</height>
     <line_width>1</line_width>
@@ -224,8 +189,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_668</name>
-    <x>899</x>
-    <y>79</y>
+    <x>768</x>
+    <y>20</y>
     <width>1</width>
     <height>922</height>
     <line_width>5</line_width>
@@ -246,8 +211,8 @@
     <class>HEADER2</class>
     <text>D02.103.3067
 Utility 100 (Rectangular Room)</text>
-    <x>839</x>
-    <y>693</y>
+    <x>708</x>
+    <y>634</y>
     <width>60</width>
     <height>308</height>
     <font>
@@ -259,16 +224,16 @@ Utility 100 (Rectangular Room)</text>
   <widget type="label" version="2.0.0">
     <name>Label_19</name>
     <text>1000</text>
-    <x>1128</x>
-    <y>569</y>
+    <x>997</x>
+    <y>510</y>
     <width>50</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_27</name>
-    <text>Target Rotational 
+    <text>Target Rotational
 Seal Unit</text>
-    <x>1125</x>
-    <y>589</y>
+    <x>994</x>
+    <y>530</y>
     <width>136</width>
     <height>45</height>
     <font>
@@ -278,15 +243,15 @@ Seal Unit</text>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_52</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>PCV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>033</WIDIndex>
       <WIDSecSub>Tgt-HeIn1013</WIDSecSub>
     </macros>
-    <x>616</x>
-    <y>502</y>
+    <x>485</x>
+    <y>443</y>
     <width>100</width>
     <height>149</height>
     <resize>1</resize>
@@ -294,8 +259,8 @@ Seal Unit</text>
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_21</name>
-    <x>472</x>
-    <y>765</y>
+    <x>341</x>
+    <y>706</y>
     <width>86</width>
     <height>28</height>
     <line_width>1</line_width>
@@ -323,15 +288,15 @@ Seal Unit</text>
   <widget type="label" version="2.0.0">
     <name>Label_29</name>
     <text>1010</text>
-    <x>472</x>
-    <y>764</y>
+    <x>341</x>
+    <y>705</y>
     <width>83</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_32</name>
     <text>Target Primary Cooling</text>
-    <x>471</x>
-    <y>784</y>
+    <x>340</x>
+    <y>725</y>
     <width>121</width>
     <height>45</height>
     <font>
@@ -341,15 +306,15 @@ Seal Unit</text>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_58</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>YSV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>033</WIDIndex>
       <WIDSecSub>Tgt-HeIn1013</WIDSecSub>
     </macros>
-    <x>441</x>
-    <y>504</y>
+    <x>310</x>
+    <y>445</y>
     <width>100</width>
     <height>160</height>
     <resize>1</resize>
@@ -358,8 +323,8 @@ Seal Unit</text>
   <widget type="label" version="2.0.0">
     <name>Label_30</name>
     <text>ADD-033</text>
-    <x>622</x>
-    <y>700</y>
+    <x>491</x>
+    <y>641</y>
     <width>70</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -370,8 +335,8 @@ Seal Unit</text>
     <class>HEADER2</class>
     <text>Utility 110 (Rectangular Room)
 D02.115.3067</text>
-    <x>908</x>
-    <y>693</y>
+    <x>777</x>
+    <y>634</y>
     <width>60</width>
     <height>308</height>
     <font>
@@ -382,8 +347,8 @@ D02.115.3067</text>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_669</name>
-    <x>1050</x>
-    <y>79</y>
+    <x>919</x>
+    <y>20</y>
     <width>1</width>
     <height>922</height>
     <line_width>5</line_width>
@@ -404,8 +369,8 @@ D02.115.3067</text>
     <class>HEADER2</class>
     <text>Monolith 110
 D02.115.4001</text>
-    <x>1051</x>
-    <y>693</y>
+    <x>920</x>
+    <y>634</y>
     <width>60</width>
     <height>308</height>
     <font>
@@ -416,15 +381,15 @@ D02.115.4001</text>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_70</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
     <macros>
       <WIDDev>PT</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>033</WIDIndex>
       <WIDSecSub>Tgt-HeIn1013</WIDSecSub>
     </macros>
-    <x>744</x>
-    <y>628</y>
+    <x>613</x>
+    <y>569</y>
     <width>120</width>
     <height>65</height>
     <resize>1</resize>
@@ -432,8 +397,8 @@ D02.115.4001</text>
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_22</name>
-    <x>242</x>
-    <y>571</y>
+    <x>111</x>
+    <y>512</y>
     <width>86</width>
     <height>28</height>
     <line_width>1</line_width>
@@ -461,15 +426,15 @@ D02.115.4001</text>
   <widget type="label" version="2.0.0">
     <name>Label_34</name>
     <text>1030</text>
-    <x>245</x>
-    <y>570</y>
+    <x>114</x>
+    <y>511</y>
     <width>59</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_35</name>
     <text>Pristine Helium</text>
-    <x>241</x>
-    <y>590</y>
+    <x>110</x>
+    <y>531</y>
     <width>121</width>
     <height>45</height>
     <font>
@@ -480,40 +445,40 @@ D02.115.4001</text>
   <widget type="label" version="2.0.0">
     <name>Label</name>
     <text>1010:PT-007</text>
-    <x>561</x>
-    <y>754</y>
+    <x>430</x>
+    <y>695</y>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_2</name>
     <text>SP</text>
-    <x>636</x>
-    <y>651</y>
+    <x>505</x>
+    <y>592</y>
     <width>20</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_3</name>
     <text>PV</text>
-    <x>678</x>
-    <y>651</y>
+    <x>547</x>
+    <y>592</y>
     <width>20</width>
   </widget>
   <widget type="textentry" version="3.0.0">
     <name>Text Entry</name>
-    <x>715</x>
-    <y>765</y>
+    <x>584</x>
+    <y>706</y>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_4</name>
     <text>Offset 1-10 kPa</text>
-    <x>703</x>
-    <y>785</y>
+    <x>572</x>
+    <y>726</y>
     <width>122</width>
     <horizontal_alignment>1</horizontal_alignment>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_754</name>
-    <x>963</x>
-    <y>580</y>
+    <x>832</x>
+    <y>521</y>
     <width>20</width>
     <height>1</height>
     <line_width>1</line_width>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs_1015.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/1015.bob
similarity index 81%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs_1015.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/1015.bob
index 109aa63806835f413063b1be3b93de330af19d9b..b5d452390ac8bdce988148c3fdb5e0c58c63eccf 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs_1015.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/1015.bob
@@ -13,8 +13,8 @@
   </background_color>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_3</name>
-    <x>566</x>
-    <y>442</y>
+    <x>569</x>
+    <y>369</y>
     <width>79</width>
     <height>223</height>
     <line_color>
@@ -34,8 +34,8 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_2</name>
-    <x>366</x>
-    <y>164</y>
+    <x>369</x>
+    <y>91</y>
     <width>201</width>
     <height>498</height>
     <line_color>
@@ -57,47 +57,12 @@
       </point>
     </points>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>title bg</name>
-    <class>GROUP-BLUE</class>
-    <width>1788</width>
-    <height>50</height>
-    <line_width>0</line_width>
-    <line_color>
-      <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="BLUE-GROUP-BACKGROUND" red="179" green="209" blue="209">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_5</name>
-    <class>TITLE</class>
-    <text>Helium Purification System -  1015</text>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
-    <width>844</width>
-    <height>50</height>
-    <font use_class="true">
-      <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
-      </font>
-    </font>
-    <foreground_color use_class="true">
-      <color name="Text" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <transparent use_class="true">true</transparent>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-  </widget>
   <widget type="label" version="2.0.0">
     <name>Label_33</name>
     <text>Target Primary
 Cooling System</text>
-    <x>320</x>
-    <y>174</y>
+    <x>323</x>
+    <y>101</y>
     <width>121</width>
     <height>45</height>
     <font>
@@ -107,8 +72,8 @@ Cooling System</text>
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_23</name>
-    <x>415</x>
-    <y>232</y>
+    <x>418</x>
+    <y>159</y>
     <width>86</width>
     <height>28</height>
     <line_width>1</line_width>
@@ -136,15 +101,15 @@ Cooling System</text>
   <widget type="label" version="2.0.0">
     <name>Label_31</name>
     <text>1010</text>
-    <x>351</x>
-    <y>231</y>
+    <x>354</x>
+    <y>158</y>
     <width>59</width>
     <horizontal_alignment>2</horizontal_alignment>
   </widget>
   <widget type="polygon" version="2.0.0">
     <name>Polygon_20</name>
-    <x>324</x>
-    <y>154</y>
+    <x>327</x>
+    <y>81</y>
     <width>86</width>
     <height>28</height>
     <line_width>1</line_width>
@@ -172,16 +137,16 @@ Cooling System</text>
   <widget type="label" version="2.0.0">
     <name>Label_20</name>
     <text>1010</text>
-    <x>327</x>
-    <y>153</y>
+    <x>330</x>
+    <y>80</y>
     <width>50</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_28</name>
     <text>Target Primary
 Cooling System</text>
-    <x>320</x>
-    <y>252</y>
+    <x>323</x>
+    <y>179</y>
     <width>121</width>
     <height>45</height>
     <font>
@@ -191,15 +156,15 @@ Cooling System</text>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_62</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>YSV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>405</WIDIndex>
       <WIDSecSub>Tgt-HePu1015</WIDSecSub>
     </macros>
-    <x>430</x>
-    <y>459</y>
+    <x>433</x>
+    <y>386</y>
     <width>100</width>
     <height>165</height>
     <resize>1</resize>
@@ -207,8 +172,8 @@ Cooling System</text>
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>group.border_2</name>
-    <x>547</x>
-    <y>459</y>
+    <x>550</x>
+    <y>386</y>
     <width>44</width>
     <height>168</height>
     <line_width>1</line_width>
@@ -223,8 +188,8 @@ Cooling System</text>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_13</name>
-    <x>547</x>
-    <y>617</y>
+    <x>550</x>
+    <y>544</y>
     <width>44</width>
     <height>1</height>
     <line_color>
@@ -241,14 +206,14 @@ Cooling System</text>
   <widget type="label" version="2.0.0">
     <name>Label_1</name>
     <text>F-114</text>
-    <x>550</x>
-    <y>509</y>
+    <x>553</x>
+    <y>436</y>
     <width>43</width>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_14</name>
-    <x>547</x>
-    <y>469</y>
+    <x>550</x>
+    <y>396</y>
     <width>44</width>
     <height>1</height>
     <line_color>
@@ -264,8 +229,8 @@ Cooling System</text>
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>group.border_3</name>
-    <x>623</x>
-    <y>459</y>
+    <x>626</x>
+    <y>386</y>
     <width>44</width>
     <height>168</height>
     <line_width>1</line_width>
@@ -280,8 +245,8 @@ Cooling System</text>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_15</name>
-    <x>623</x>
-    <y>617</y>
+    <x>626</x>
+    <y>544</y>
     <width>44</width>
     <height>1</height>
     <line_color>
@@ -298,14 +263,14 @@ Cooling System</text>
   <widget type="label" version="2.0.0">
     <name>Label_4</name>
     <text>F-115</text>
-    <x>626</x>
-    <y>509</y>
+    <x>629</x>
+    <y>436</y>
     <width>43</width>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_16</name>
-    <x>623</x>
-    <y>469</y>
+    <x>626</x>
+    <y>396</y>
     <width>44</width>
     <height>1</height>
     <line_color>
@@ -321,8 +286,8 @@ Cooling System</text>
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>group.border_4</name>
-    <x>629</x>
-    <y>536</y>
+    <x>632</x>
+    <y>463</y>
     <width>33</width>
     <height>44</height>
     <line_width>1</line_width>
@@ -337,8 +302,8 @@ Cooling System</text>
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>group.border_5</name>
-    <x>553</x>
-    <y>536</y>
+    <x>556</x>
+    <y>463</y>
     <width>33</width>
     <height>44</height>
     <line_width>1</line_width>
@@ -355,8 +320,8 @@ Cooling System</text>
     <name>D02.115.3067</name>
     <class>HEADER2</class>
     <text>D02.115.4003</text>
-    <x>732</x>
-    <y>283</y>
+    <x>735</x>
+    <y>210</y>
     <width>290</width>
     <height>33</height>
     <font>
@@ -369,8 +334,8 @@ Cooling System</text>
     <name>D02.115.3067_2</name>
     <class>HEADER2</class>
     <text>D02.103.4003</text>
-    <x>732</x>
-    <y>340</y>
+    <x>735</x>
+    <y>267</y>
     <width>290</width>
     <height>33</height>
     <font>
@@ -381,8 +346,8 @@ Cooling System</text>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline</name>
-    <x>107</x>
-    <y>327</y>
+    <x>110</x>
+    <y>254</y>
     <width>1483</width>
     <height>7</height>
     <line_width>5</line_width>
@@ -400,15 +365,15 @@ Cooling System</text>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_58</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>YSV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>101</WIDIndex>
       <WIDSecSub>Tgt-HePu1015</WIDSecSub>
     </macros>
-    <x>518</x>
-    <y>326</y>
+    <x>521</x>
+    <y>253</y>
     <width>100</width>
     <height>165</height>
     <resize>1</resize>
@@ -416,22 +381,22 @@ Cooling System</text>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_1</name>
-    <x>387</x>
-    <y>401</y>
+    <x>390</x>
+    <y>328</y>
     <width>310</width>
     <height>310</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_63</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/DeviceTypes/Valves/PV_VALVE_BlockIcon_Horizontal.bob</file>
     <macros>
       <WIDDev>YSV</WIDDev>
       <WIDDis>Proc</WIDDis>
       <WIDIndex>120</WIDIndex>
       <WIDSecSub>Tgt-HePu1015</WIDSecSub>
     </macros>
-    <x>237</x>
-    <y>591</y>
+    <x>240</x>
+    <y>518</y>
     <width>100</width>
     <height>165</height>
     <resize>1</resize>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs_status.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/Status.bob
similarity index 85%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs_status.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/Status.bob
index b68d91d98b5939e06bfb75f94ccf31a07cf3d753..cd3b8c6a6e3185345ed118214fdaf50d1bf5add8 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_thccs_status.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Target/THCCS/Status.bob
@@ -1,57 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>Settings</name>
+  <class></class>
   <macros>
     <Dev>PLC</Dev>
     <Dis>Ctrl</Dis>
     <Index>001</Index>
     <SecSub>Tgt-HeC1010</SecSub>
   </macros>
-  <width>1788</width>
-  <height>1050</height>
+  <width>1150</width>
+  <height>1010</height>
   <background_color>
     <color red="255" green="255" blue="255" alpha="0">
     </color>
   </background_color>
-  <widget type="rectangle" version="2.0.0">
-    <name>title bg</name>
-    <class>GROUP-BLUE</class>
-    <width>1788</width>
-    <height>50</height>
-    <line_width>0</line_width>
-    <line_color>
-      <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="BLUE-GROUP-BACKGROUND" red="179" green="209" blue="209">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>title</name>
-    <class>TITLE</class>
-    <text>Settings</text>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
-    <width>798</width>
-    <height>50</height>
-    <font use_class="true">
-      <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
-      </font>
-    </font>
-    <foreground_color use_class="true">
-      <color name="Text" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <transparent use_class="true">true</transparent>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-  </widget>
   <widget type="group" version="2.0.0">
     <name>group.fill</name>
-    <x>85</x>
-    <y>70</y>
+    <x>70</x>
+    <y>20</y>
     <width>310</width>
     <height>300</height>
     <style>3</style>
@@ -112,8 +78,8 @@
   </widget>
   <widget type="group" version="2.0.0">
     <name>group.drain</name>
-    <x>415</x>
-    <y>70</y>
+    <x>400</x>
+    <y>20</y>
     <width>310</width>
     <height>300</height>
     <style>3</style>
@@ -174,24 +140,24 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display</name>
-    <file>../../ICS_OPI_LIBRARY/EPICSConnection.bob</file>
+    <file>../../../../../ICS_OPI_LIBRARY/EPICSConnection.bob</file>
     <macros>
       <Dev>PLC</Dev>
       <Dis>Ctrl</Dis>
       <Index>001</Index>
       <SecSub>Tgt-HeC1010</SecSub>
     </macros>
-    <x>745</x>
-    <y>70</y>
+    <x>730</x>
+    <y>20</y>
     <width>350</width>
     <height>310</height>
     <transparent>true</transparent>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_1</name>
-    <file>EmbedddedWindows/thccs/racks.bob</file>
-    <x>35</x>
-    <y>390</y>
+    <file>../../../EmbeddedScreens/Target/thccs/racks.bob</file>
+    <x>20</x>
+    <y>340</y>
     <width>1110</width>
     <height>650</height>
     <transparent>true</transparent>
@@ -206,8 +172,8 @@
       </action>
     </actions>
     <text>Air</text>
-    <x>165</x>
-    <y>248</y>
+    <x>150</x>
+    <y>198</y>
     <width>150</width>
     <rules>
       <rule name="Active" prop_id="background_color" out_exp="false">
@@ -232,8 +198,8 @@
       </action>
     </actions>
     <text>Nitrogen</text>
-    <x>165</x>
-    <y>218</y>
+    <x>150</x>
+    <y>168</y>
     <width>150</width>
     <rules>
       <rule name="Active" prop_id="background_color" out_exp="false">
@@ -258,8 +224,8 @@
       </action>
     </actions>
     <text>Pristine He</text>
-    <x>165</x>
-    <y>188</y>
+    <x>150</x>
+    <y>138</y>
     <width>150</width>
     <rules>
       <rule name="Active" prop_id="background_color" out_exp="false">
@@ -284,8 +250,8 @@
       </action>
     </actions>
     <text>Storage B-020a</text>
-    <x>165</x>
-    <y>158</y>
+    <x>150</x>
+    <y>108</y>
     <width>150</width>
     <rules>
       <rule name="Active" prop_id="background_color" out_exp="false">
@@ -310,8 +276,8 @@
       </action>
     </actions>
     <text>Offgas Extracting</text>
-    <x>495</x>
-    <y>188</y>
+    <x>480</x>
+    <y>138</y>
     <width>150</width>
     <rules>
       <rule name="Active" prop_id="background_color" out_exp="false">
@@ -336,8 +302,8 @@
       </action>
     </actions>
     <text>Storage B-020a</text>
-    <x>495</x>
-    <y>158</y>
+    <x>480</x>
+    <y>108</y>
     <width>150</width>
     <rules>
       <rule name="Active" prop_id="background_color" out_exp="false">
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_TestEnv_01.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/TestEnvironment.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_TestEnv_01.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/TestEnvironment.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubWindows/BCM.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/DetailedScreens/BCM.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubWindows/BCM.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/DetailedScreens/BCM.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubWindows/detailed_chopper.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/DetailedScreens/Chopper.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubWindows/detailed_chopper.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/DetailedScreens/Chopper.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubWindows/detailed_magnetron.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/DetailedScreens/Magnetron.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubWindows/detailed_magnetron.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/DetailedScreens/Magnetron.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubWindows/detailed_magnets.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/DetailedScreens/Magnets.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubWindows/detailed_magnets.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/DetailedScreens/Magnets.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubWindows/detailed_repellers.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/DetailedScreens/Repellers.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubWindows/detailed_repellers.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/DetailedScreens/Repellers.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/ShiftLeaderOPI/README.md b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/ShiftLeader/README.md
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/ShiftLeaderOPI/README.md
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/ShiftLeader/README.md
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/ShiftLeaderOPI/ShiftID.py b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/ShiftLeader/ShiftID.py
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/ShiftLeaderOPI/ShiftID.py
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/ShiftLeader/ShiftID.py
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/ShiftLeaderOPI/SourceStatus.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/ShiftLeader/SourceStatus.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/ShiftLeaderOPI/SourceStatus.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/ShiftLeader/SourceStatus.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/ShiftLeaderOPI/integratedcharge.plt b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/ShiftLeader/integratedcharge.plt
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/ShiftLeaderOPI/integratedcharge.plt
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/ShiftLeader/integratedcharge.plt
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/detachwindowcontainer.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/detachwindowcontainer.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/detachwindowcontainer.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/detachwindowcontainer.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/detachwindowcontainer_boolean.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/detachwindowcontainer_boolean.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/detachwindowcontainer_boolean.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/detachwindowcontainer_boolean.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Main_OPI_Navigator_treemockup.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/XXNavigator_treemockup.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Main_OPI_Navigator_treemockup.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/XXNavigator_treemockup.bob
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_system.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_system.bob
deleted file mode 100644
index ccc9da5d807e187711ef2e619b6e7674d884f045..0000000000000000000000000000000000000000
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_system.bob
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<display version="2.0.0">
-  <name>System</name>
-  <width>2350</width>
-  <height>1238</height>
-  <background_color>
-    <color name="BACKGROUND" red="220" green="225" blue="221">
-    </color>
-  </background_color>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_40</name>
-    <class></class>
-    <width>200</width>
-    <height>1238</height>
-    <line_width>0</line_width>
-    <background_color>
-      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="navtabs" version="2.0.0">
-    <name>SubNavigation Tabs</name>
-    <tabs>
-      <tab>
-        <name>Machine States</name>
-        <file>collectedOPIs_01_systs_interlocks.bob</file>
-        <macros>
-        </macros>
-        <group_name></group_name>
-      </tab>
-      <tab>
-        <name>Vacuum Systems</name>
-        <file>collectedOPIs_01_systs_valvesflows.bob</file>
-        <macros>
-        </macros>
-        <group_name></group_name>
-      </tab>
-      <tab>
-        <name>Cryogenics</name>
-        <file>collectedOPIs_01_systs_cryogenics.bob</file>
-        <macros>
-        </macros>
-        <group_name></group_name>
-      </tab>
-    </tabs>
-    <width>2370</width>
-    <height>1238</height>
-    <tab_width>200</tab_width>
-    <tab_height>40</tab_height>
-    <tab_spacing>10</tab_spacing>
-    <selected_color>
-      <color name="Read_Background" red="240" green="240" blue="240">
-      </color>
-    </selected_color>
-    <deselected_color>
-      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-      </color>
-    </deselected_color>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>DetachButton</name>
-    <actions>
-      <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
-        <macros>
-          <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_systs_ints_overview.bob</detachwindowpath>
-          <windowheight>1300</windowheight>
-          <windowtitle>NCL Machine State Overview</windowtitle>
-          <windowwidth>2100</windowwidth>
-        </macros>
-        <target>window</target>
-        <description>Detach Interlocks Overview</description>
-      </action>
-      <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
-        <macros>
-          <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_systs_ints_NCL.bob</detachwindowpath>
-          <windowheight>1220</windowheight>
-          <windowtitle>NCL Interlocks</windowtitle>
-          <windowwidth>1946</windowwidth>
-        </macros>
-        <target>window</target>
-        <description>Detach NCL Interlocks</description>
-      </action>
-      <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
-        <macros>
-          <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_systs_ints_SCL.bob</detachwindowpath>
-          <windowheight>1220</windowheight>
-          <windowtitle>SCL Interlocks</windowtitle>
-          <windowwidth>1946</windowwidth>
-        </macros>
-        <target>window</target>
-        <description>Detach SCL Interlocks</description>
-      </action>
-      <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
-        <macros>
-          <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_systs_ints_target.bob</detachwindowpath>
-          <windowheight>1220</windowheight>
-          <windowtitle>Target Interlocks</windowtitle>
-          <windowwidth>1946</windowwidth>
-        </macros>
-        <target>window</target>
-        <description>Detach Target Interlocks</description>
-      </action>
-      <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
-        <macros>
-          <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_systs_ints_pss.bob</detachwindowpath>
-          <windowheight>1220</windowheight>
-          <windowtitle>ODH</windowtitle>
-          <windowwidth>1946</windowwidth>
-        </macros>
-        <target>window</target>
-        <description>Detach ODH</description>
-      </action>
-      <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
-        <macros>
-          <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_systs_ints_history.bob</detachwindowpath>
-          <windowheight>1220</windowheight>
-          <windowtitle>Interlocks History</windowtitle>
-          <windowwidth>1946</windowwidth>
-        </macros>
-        <target>window</target>
-        <description>Detach History</description>
-      </action>
-      <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
-        <macros>
-          <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_systs_valvesflows.bob</detachwindowpath>
-          <windowheight>1220</windowheight>
-          <windowtitle>Valves, Flows and Temperatures Overview</windowtitle>
-          <windowwidth>1946</windowwidth>
-        </macros>
-        <target>window</target>
-        <description>Detach Valves and Flows</description>
-      </action>
-      <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
-        <macros>
-          <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>../../Cryo/TICP/CrS-TICP_CRYO_LCR/cryo-00-main.bob</detachwindowpath>
-          <windowheight>1220</windowheight>
-          <windowtitle>Cryogenics</windowtitle>
-          <windowwidth>1946</windowwidth>
-        </macros>
-        <target>window</target>
-        <description>Detach Cryogenics</description>
-      </action>
-    </actions>
-    <text>Detach</text>
-    <x>5</x>
-    <y>150</y>
-    <width>185</width>
-    <height>40</height>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-</display>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_interlocks.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_interlocks.bob
deleted file mode 100644
index 9ab1d4797586abf32d57e8c354d235d67529b13b..0000000000000000000000000000000000000000
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_interlocks.bob
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<display version="2.0.0">
-  <name>Systems - Interlocks</name>
-  <class></class>
-  <width>2156</width>
-  <height>1226</height>
-  <background_color>
-    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
-    </color>
-  </background_color>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_39</name>
-    <width>200</width>
-    <height>1226</height>
-    <line_width>0</line_width>
-    <background_color>
-      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="navtabs" version="2.0.0">
-    <name>SubNavigation Tabs</name>
-    <tabs>
-      <tab>
-        <name>Overview</name>
-        <file>collectedOPIs_01_systs_ints_overview.bob</file>
-        <macros>
-        </macros>
-        <group_name></group_name>
-      </tab>
-      <tab>
-        <name>NCL</name>
-        <file>collectedOPIs_01_systs_ints_NCL.bob</file>
-        <macros>
-        </macros>
-        <group_name></group_name>
-      </tab>
-      <tab>
-        <name>SCL</name>
-        <file>collectedOPIs_01_systs_ints_SCL.bob</file>
-        <macros>
-        </macros>
-        <group_name></group_name>
-      </tab>
-      <tab>
-        <name>Target</name>
-        <file>collectedOPIs_01_systs_ints_target.bob</file>
-        <macros>
-        </macros>
-        <group_name></group_name>
-      </tab>
-      <tab>
-        <name>ODH</name>
-        <file>../../odh/ODH_Main.bob</file>
-        <macros>
-        </macros>
-        <group_name></group_name>
-      </tab>
-      <tab>
-        <name>History</name>
-        <file>collectedOPIs_01_systs_ints_history.bob</file>
-        <macros>
-        </macros>
-        <group_name></group_name>
-      </tab>
-    </tabs>
-    <width>2156</width>
-    <height>1226</height>
-    <tab_width>200</tab_width>
-    <tab_height>40</tab_height>
-    <tab_spacing>10</tab_spacing>
-    <selected_color>
-      <color name="Read_Background" red="240" green="240" blue="240">
-      </color>
-    </selected_color>
-    <deselected_color>
-      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-      </color>
-    </deselected_color>
-  </widget>
-</display>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_BL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_BL.bob
deleted file mode 100644
index 6adb3d461b309c12a6ef3cef5a5021d0ce5ffb10..0000000000000000000000000000000000000000
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_BL.bob
+++ /dev/null
@@ -1,3472 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<display version="2.0.0">
-  <name>Systems - Interlocks - BL</name>
-  <macros>
-    <Interlock01>IntL 01</Interlock01>
-    <Interlock02>IntL 02</Interlock02>
-    <Interlock03>IntL 03</Interlock03>
-    <Interlock04>IntL 04</Interlock04>
-    <Interlock05>IntL 05</Interlock05>
-    <Interlock06>IntL 06</Interlock06>
-    <InterlocksFile>./EmbedddedWindows/em_interlocks_rr.bob</InterlocksFile>
-    <ValvesFile>./EmbedddedWindows/em_valves_rw.bob</ValvesFile>
-    <section01>ESTIA</section01>
-    <section02>SKADI</section02>
-    <section03>VESPA</section03>
-    <section04>DREAM</section04>
-    <section05>ODIN</section05>
-    <section06>NMX</section06>
-    <section07>BEER</section07>
-    <section08>CSPEC</section08>
-    <section09>BIFROST</section09>
-    <section10>MIRACLES</section10>
-    <section11>MAGiC</section11>
-    <section12>T-REX</section12>
-    <section13>HEIMDAL</section13>
-    <section14>LoKI</section14>
-    <section15>FREIA</section15>
-  </macros>
-  <width>1200</width>
-  <height>900</height>
-  <background_color>
-    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
-    </color>
-  </background_color>
-  <widget type="picture" version="2.0.0">
-    <name>Picture</name>
-    <file>Figures/target.png</file>
-    <x>1400</x>
-    <y>720</y>
-    <width>810</width>
-    <height>640</height>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>ISrcInterlocksGroup</name>
-    <x>20</x>
-    <y>20</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_1</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_6</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <PV_state>PV_state</PV_state>
-        <name>$(section01) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_1</name>
-      <text>$(section01) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_7</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_8</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>LEBTInterlocksGroup</name>
-    <x>260</x>
-    <y>20</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_2</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_12</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_2</name>
-      <text>$(section02) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_13</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_14</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>RFQInterlocksGroup</name>
-    <x>500</x>
-    <y>20</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_3</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_18</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_3</name>
-      <text>$(section03) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_19</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_20</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>MEBTInterlocksGroup</name>
-    <x>740</x>
-    <y>20</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_4</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_24</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_4</name>
-      <text>$(section04) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_25</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_26</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>DTLInterlocksGroup</name>
-    <x>980</x>
-    <y>20</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_5</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_30</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_5</name>
-      <text>$(section05) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_31</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_32</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>ISrcInterlocksGroup_1</name>
-    <x>20</x>
-    <y>240</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_6</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_36</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_6</name>
-      <text>$(section01) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_37</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_38</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>LEBTInterlocksGroup_1</name>
-    <x>260</x>
-    <y>240</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_7</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_42</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_7</name>
-      <text>$(section02) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_43</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_44</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>RFQInterlocksGroup_1</name>
-    <x>500</x>
-    <y>240</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_8</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_48</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_8</name>
-      <text>$(section03) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_49</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_50</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>MEBTInterlocksGroup_1</name>
-    <x>740</x>
-    <y>240</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_9</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_54</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_9</name>
-      <text>$(section04) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_55</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_56</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>DTLInterlocksGroup_1</name>
-    <x>980</x>
-    <y>240</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_10</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_60</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_10</name>
-      <text>$(section05) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_61</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_62</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>ISrcInterlocksGroup_3</name>
-    <x>20</x>
-    <y>460</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_16</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_96</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_16</name>
-      <text>$(section01) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_97</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_98</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>LEBTInterlocksGroup_3</name>
-    <x>260</x>
-    <y>460</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_17</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_102</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_17</name>
-      <text>$(section02) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_103</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_104</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>RFQInterlocksGroup_3</name>
-    <x>500</x>
-    <y>460</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_18</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_108</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_18</name>
-      <actions>
-      </actions>
-      <text>$(section03) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_109</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_110</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>MEBTInterlocksGroup_3</name>
-    <x>740</x>
-    <y>460</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_19</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_114</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_19</name>
-      <text>$(section04) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_115</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_116</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>DTLInterlocksGroup_3</name>
-    <x>980</x>
-    <y>460</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_20</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_120</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_20</name>
-      <text>$(section05) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_121</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_122</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>ISrcInterlocksGroup_2</name>
-    <x>1220</x>
-    <y>20</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_11</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_9</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <PV_state>PV_state</PV_state>
-        <name>$(section06) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_11</name>
-      <text>$(section06) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_10</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section06) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_11</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section06) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>LEBTInterlocksGroup_2</name>
-    <x>1460</x>
-    <y>20</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_12</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_15</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section07) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_12</name>
-      <text>$(section07) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_16</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section07) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_17</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section07) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>RFQInterlocksGroup_2</name>
-    <x>1700</x>
-    <y>20</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_13</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_21</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section08) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_13</name>
-      <text>$(section08) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_22</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section08) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_23</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section08) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>MEBTInterlocksGroup_2</name>
-    <x>1940</x>
-    <y>20</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_14</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_27</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section09) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_14</name>
-      <text>$(section09) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_28</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section09) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_29</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section09) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>DTLInterlocksGroup_2</name>
-    <x>20</x>
-    <y>720</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_15</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_33</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section10) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_15</name>
-      <text>$(section10) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_34</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section10) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_35</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section10) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>ISrcInterlocksGroup_4</name>
-    <x>1220</x>
-    <y>240</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_21</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_39</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section06) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_21</name>
-      <text>$(section06) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_40</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section06) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_41</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section06) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>LEBTInterlocksGroup_4</name>
-    <x>1460</x>
-    <y>240</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_22</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_45</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section07) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_22</name>
-      <text>$(section07) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_46</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section07) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_47</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section07) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>RFQInterlocksGroup_4</name>
-    <x>1700</x>
-    <y>240</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_23</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_51</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section08) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_23</name>
-      <text>$(section08) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_52</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section08) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_53</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section08) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>MEBTInterlocksGroup_4</name>
-    <x>1940</x>
-    <y>240</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_24</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_57</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section09) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_24</name>
-      <text>$(section09) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_58</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section09) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_59</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section09) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>DTLInterlocksGroup_4</name>
-    <x>20</x>
-    <y>940</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_25</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_63</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section10) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_25</name>
-      <text>$(section10) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_64</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section10) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_65</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section10) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>ISrcInterlocksGroup_5</name>
-    <x>1220</x>
-    <y>460</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_26</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_99</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section06) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_26</name>
-      <text>$(section06) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_100</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section06) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_101</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section06) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>LEBTInterlocksGroup_5</name>
-    <x>1460</x>
-    <y>460</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_27</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_105</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section07) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_27</name>
-      <text>$(section07) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_106</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section07) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_107</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section07) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>RFQInterlocksGroup_5</name>
-    <x>1700</x>
-    <y>460</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_28</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_111</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section08) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_28</name>
-      <actions>
-      </actions>
-      <text>$(section08) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_112</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section08) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_113</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section08) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>MEBTInterlocksGroup_5</name>
-    <x>1940</x>
-    <y>460</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_29</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_117</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section09) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_29</name>
-      <text>$(section09) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_118</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section09) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_119</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section09) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>DTLInterlocksGroup_5</name>
-    <x>20</x>
-    <y>1160</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_30</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_123</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section10) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_30</name>
-      <text>$(section10) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_124</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section10) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_125</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section10) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>ISrcInterlocksGroup_6</name>
-    <x>260</x>
-    <y>720</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_31</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_126</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <PV_state>PV_state</PV_state>
-        <name>$(section11) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_31</name>
-      <text>$(section11) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_127</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section11) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_128</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section11) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>LEBTInterlocksGroup_6</name>
-    <x>500</x>
-    <y>720</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_32</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_129</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section12) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_32</name>
-      <text>$(section12) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_130</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section12) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_131</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section12) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>RFQInterlocksGroup_6</name>
-    <x>740</x>
-    <y>720</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_33</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_132</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section13) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_33</name>
-      <text>$(section13) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_133</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section13) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_134</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section13) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>MEBTInterlocksGroup_6</name>
-    <x>980</x>
-    <y>720</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_34</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_135</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section14) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_34</name>
-      <text>$(section14) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_136</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section14) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_137</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section14) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>DTLInterlocksGroup_6</name>
-    <x>1220</x>
-    <y>720</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_35</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_138</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section15) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_35</name>
-      <text>$(section15) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_139</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section15) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_140</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section15) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>ISrcInterlocksGroup_7</name>
-    <x>260</x>
-    <y>940</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_36</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_141</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section11) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_36</name>
-      <text>$(section11) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_142</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section11) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_143</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section11) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>LEBTInterlocksGroup_7</name>
-    <x>500</x>
-    <y>940</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_37</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_144</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section12) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_37</name>
-      <text>$(section12) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_145</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section12) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_146</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section12) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>RFQInterlocksGroup_7</name>
-    <x>740</x>
-    <y>940</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_38</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_147</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section13) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_38</name>
-      <text>$(section13) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_148</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section13) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_149</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section13) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>MEBTInterlocksGroup_7</name>
-    <x>980</x>
-    <y>940</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_39</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_150</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section14) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_39</name>
-      <text>$(section14) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_151</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section14) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_152</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section14) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>DTLInterlocksGroup_7</name>
-    <x>1220</x>
-    <y>940</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_40</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_153</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section15) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_40</name>
-      <text>$(section15) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_154</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section15) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_155</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section15) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>ISrcInterlocksGroup_8</name>
-    <x>260</x>
-    <y>1160</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_41</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_156</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section11) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_41</name>
-      <text>$(section11) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_157</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section11) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_158</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section11) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>LEBTInterlocksGroup_8</name>
-    <x>500</x>
-    <y>1160</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_42</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_159</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section12) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_42</name>
-      <text>$(section12) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_160</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section12) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_161</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section12) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>RFQInterlocksGroup_8</name>
-    <x>740</x>
-    <y>1160</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_43</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_162</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section13) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_43</name>
-      <actions>
-      </actions>
-      <text>$(section13) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_163</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section13) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_164</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section13) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>MEBTInterlocksGroup_8</name>
-    <x>980</x>
-    <y>1160</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_44</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_165</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section14) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_44</name>
-      <text>$(section14) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_166</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section14) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_167</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section14) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>DTLInterlocksGroup_8</name>
-    <x>1220</x>
-    <y>1160</y>
-    <width>220</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_45</name>
-      <width>220</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_168</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section15) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_45</name>
-      <text>$(section15) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_169</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section15) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_170</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section15) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-</display>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_NCL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_NCL.bob
deleted file mode 100644
index fb92ddd2349c183016aec78e7b566a51770eb88e..0000000000000000000000000000000000000000
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_NCL.bob
+++ /dev/null
@@ -1,1804 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<display version="2.0.0">
-  <name>Systems - Interlocks - NCL</name>
-  <macros>
-    <Interlock01>IntL 01</Interlock01>
-    <Interlock02>IntL 02</Interlock02>
-    <Interlock03>IntL 03</Interlock03>
-    <Interlock04>IntL 04</Interlock04>
-    <Interlock05>IntL 05</Interlock05>
-    <Interlock06>IntL 06</Interlock06>
-    <InterlocksFile>./EmbedddedWindows/em_interlocks_rr.bob</InterlocksFile>
-    <ValvesFile>./EmbedddedWindows/em_valves_rw.bob</ValvesFile>
-    <section01>ISrc</section01>
-    <section02>LEBT</section02>
-    <section03>RFQ</section03>
-    <section04>MEBT</section04>
-    <section05>DTL</section05>
-  </macros>
-  <width>1200</width>
-  <height>900</height>
-  <background_color>
-    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
-    </color>
-  </background_color>
-  <widget type="group" version="2.0.0">
-    <name>ISrcInterlocksGroup</name>
-    <x>20</x>
-    <y>20</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_1</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_6</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <PV_state>PV_state</PV_state>
-        <name>$(section01) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_1</name>
-      <text>$(section01) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_7</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_8</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_9</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_10</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_11</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>LEBTInterlocksGroup</name>
-    <x>260</x>
-    <y>20</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_2</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_12</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_2</name>
-      <text>$(section02) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_13</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_14</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_15</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_16</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_17</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>RFQInterlocksGroup</name>
-    <x>500</x>
-    <y>20</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_3</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_18</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_3</name>
-      <text>$(section03) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_19</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_20</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_21</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_22</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_23</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>MEBTInterlocksGroup</name>
-    <x>740</x>
-    <y>20</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_4</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_24</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_4</name>
-      <text>$(section04) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_25</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_26</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_27</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_28</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_29</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>DTLInterlocksGroup</name>
-    <x>980</x>
-    <y>20</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_5</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_30</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_5</name>
-      <text>$(section05) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_31</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_32</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_33</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_34</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_35</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>ISrcInterlocksGroup_1</name>
-    <x>20</x>
-    <y>390</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_6</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_36</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_6</name>
-      <text>$(section01) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_37</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_38</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_39</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_40</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_41</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>LEBTInterlocksGroup_1</name>
-    <x>260</x>
-    <y>390</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_7</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_42</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_7</name>
-      <text>$(section02) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_43</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_44</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_45</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_46</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_47</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>RFQInterlocksGroup_1</name>
-    <x>500</x>
-    <y>390</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_8</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_48</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_8</name>
-      <text>$(section03) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_49</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_50</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_51</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_52</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_53</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>MEBTInterlocksGroup_1</name>
-    <x>740</x>
-    <y>390</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_9</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_54</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_9</name>
-      <text>$(section04) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_55</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_56</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_57</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_58</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_59</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>DTLInterlocksGroup_1</name>
-    <x>980</x>
-    <y>390</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_10</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_60</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_10</name>
-      <text>$(section05) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_61</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_62</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_63</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_64</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_65</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>ISrcInterlocksGroup_3</name>
-    <x>20</x>
-    <y>760</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_16</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_96</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_16</name>
-      <text>$(section01) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_97</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_98</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_99</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_100</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_101</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>LEBTInterlocksGroup_3</name>
-    <x>260</x>
-    <y>760</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_17</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_102</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_17</name>
-      <text>$(section02) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_103</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_104</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_105</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_106</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_107</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>RFQInterlocksGroup_3</name>
-    <x>500</x>
-    <y>760</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_18</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_108</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_18</name>
-      <actions>
-        <action type="open_display">
-          <file>$(ROOT)/Thomas_RFQ/gui-rfq-lps/overview-rfq-lps.bob</file>
-          <target>window</target>
-          <description>Open_RFQ-MPS</description>
-        </action>
-      </actions>
-      <text>$(section03) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_109</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_110</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_111</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_112</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_113</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>MEBTInterlocksGroup_3</name>
-    <x>740</x>
-    <y>760</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_19</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_114</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_19</name>
-      <text>$(section04) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_115</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_116</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_117</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_118</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_119</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>DTLInterlocksGroup_3</name>
-    <x>980</x>
-    <y>760</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_20</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_120</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_20</name>
-      <text>$(section05) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_121</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_122</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_123</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_124</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_125</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>ResetGroup</name>
-    <x>1590</x>
-    <y>20</y>
-    <width>330</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_11</name>
-      <width>330</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>MGGrey03-title_11</name>
-      <text>???</text>
-      <width>330</width>
-      <height>50</height>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="RED-BORDER" red="150" green="8" blue="16">
-        </color>
-      </background_color>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>Valve</name>
-      <text>PLC Controllers</text>
-      <x>20</x>
-      <y>50</y>
-      <width>290</width>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip>Open $(name) Control Panel</tooltip>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>Valve_1</name>
-      <text>MPS Controllers</text>
-      <x>20</x>
-      <y>100</y>
-      <width>290</width>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip>Open $(name) Control Panel</tooltip>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>Valve_2</name>
-      <text>PSS Controllers</text>
-      <x>20</x>
-      <y>150</y>
-      <width>290</width>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip>Open $(name) Control Panel</tooltip>
-    </widget>
-  </widget>
-</display>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_SCL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_SCL.bob
deleted file mode 100644
index b6160f34f1365cf80622d86cccde09e8ed0bd86b..0000000000000000000000000000000000000000
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_SCL.bob
+++ /dev/null
@@ -1,1804 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<display version="2.0.0">
-  <name>Systems - Interlocks - SCL</name>
-  <macros>
-    <Interlock01>IntL 01</Interlock01>
-    <Interlock02>IntL 02</Interlock02>
-    <Interlock03>IntL 03</Interlock03>
-    <Interlock04>IntL 04</Interlock04>
-    <Interlock05>IntL 05</Interlock05>
-    <Interlock06>IntL 06</Interlock06>
-    <InterlocksFile>./EmbedddedWindows/em_interlocks_rr.bob</InterlocksFile>
-    <ValvesFile>./EmbedddedWindows/em_valves_rw.bob</ValvesFile>
-    <section01>Spk</section01>
-    <section02>MBL</section02>
-    <section03>HBL</section03>
-    <section04>HEBT</section04>
-    <section05>A2T/DmpL</section05>
-  </macros>
-  <width>1200</width>
-  <height>900</height>
-  <background_color>
-    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
-    </color>
-  </background_color>
-  <widget type="group" version="2.0.0">
-    <name>ISrcInterlocksGroup</name>
-    <x>20</x>
-    <y>20</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_1</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_6</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <PV_state>PV_state</PV_state>
-        <name>$(section01) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_1</name>
-      <text>$(section01) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_7</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_8</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_9</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_10</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_11</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>LEBTInterlocksGroup</name>
-    <x>260</x>
-    <y>20</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_2</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_12</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_2</name>
-      <text>$(section02) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_13</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_14</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_15</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_16</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_17</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>RFQInterlocksGroup</name>
-    <x>500</x>
-    <y>20</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_3</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_18</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_3</name>
-      <text>$(section03) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_19</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_20</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_21</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_22</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_23</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>MEBTInterlocksGroup</name>
-    <x>740</x>
-    <y>20</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_4</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_24</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_4</name>
-      <text>$(section04) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_25</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_26</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_27</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_28</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_29</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>DTLInterlocksGroup</name>
-    <x>980</x>
-    <y>20</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_5</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_30</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_5</name>
-      <text>$(section05) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_31</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_32</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_33</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_34</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_35</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>ISrcInterlocksGroup_1</name>
-    <x>20</x>
-    <y>390</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_6</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_36</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_6</name>
-      <text>$(section01) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_37</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_38</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_39</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_40</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_41</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>LEBTInterlocksGroup_1</name>
-    <x>260</x>
-    <y>390</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_7</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_42</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_7</name>
-      <text>$(section02) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_43</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_44</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_45</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_46</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_47</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>RFQInterlocksGroup_1</name>
-    <x>500</x>
-    <y>390</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_8</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_48</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_8</name>
-      <text>$(section03) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_49</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_50</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_51</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_52</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_53</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>MEBTInterlocksGroup_1</name>
-    <x>740</x>
-    <y>390</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_9</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_54</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_9</name>
-      <text>$(section04) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_55</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_56</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_57</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_58</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_59</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>DTLInterlocksGroup_1</name>
-    <x>980</x>
-    <y>390</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_10</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_60</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_10</name>
-      <text>$(section05) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_61</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_62</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_63</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_64</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_65</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>ISrcInterlocksGroup_3</name>
-    <x>20</x>
-    <y>760</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_16</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_96</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_16</name>
-      <text>$(section01) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_97</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_98</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_99</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_100</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_101</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>LEBTInterlocksGroup_3</name>
-    <x>260</x>
-    <y>760</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_17</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_102</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_17</name>
-      <text>$(section02) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_103</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_104</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_105</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_106</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_107</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>RFQInterlocksGroup_3</name>
-    <x>500</x>
-    <y>760</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_18</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_108</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_18</name>
-      <actions>
-        <action type="open_display">
-          <file>../gui-rfq-lps/overview-rfq-lps.bob</file>
-          <target>standalone</target>
-          <description>Open_RFQ-MPS</description>
-        </action>
-      </actions>
-      <text>$(section03) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_109</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_110</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_111</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_112</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_113</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>MEBTInterlocksGroup_3</name>
-    <x>740</x>
-    <y>760</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_19</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_114</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_19</name>
-      <text>$(section04) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_115</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_116</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_117</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_118</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_119</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section04) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>DTLInterlocksGroup_3</name>
-    <x>980</x>
-    <y>760</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_20</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_120</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_20</name>
-      <text>$(section05) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_121</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_122</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_123</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_124</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_125</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section05) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>ResetGroup</name>
-    <x>1590</x>
-    <y>20</y>
-    <width>330</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_11</name>
-      <width>330</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>MGGrey03-title_11</name>
-      <text>???</text>
-      <width>330</width>
-      <height>50</height>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="RED-BORDER" red="150" green="8" blue="16">
-        </color>
-      </background_color>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>Valve</name>
-      <text>PLC Controllers</text>
-      <x>20</x>
-      <y>50</y>
-      <width>290</width>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip>Open $(name) Control Panel</tooltip>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>Valve_1</name>
-      <text>MPS Controllers</text>
-      <x>20</x>
-      <y>100</y>
-      <width>290</width>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip>Open $(name) Control Panel</tooltip>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>Valve_2</name>
-      <text>PSS Controllers</text>
-      <x>20</x>
-      <y>150</y>
-      <width>290</width>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip>Open $(name) Control Panel</tooltip>
-    </widget>
-  </widget>
-</display>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_history.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_history.bob
deleted file mode 100644
index d404a6b8bcb7b77f840c08ecdd0521cdb1ff8081..0000000000000000000000000000000000000000
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_history.bob
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<display version="2.0.0">
-  <name>Interlocks History</name>
-  <class></class>
-  <width>1946</width>
-  <height>1220</height>
-  <background_color>
-    <color name="BACKGROUND" red="220" green="225" blue="221">
-    </color>
-  </background_color>
-  <widget type="table" version="2.0.0">
-    <name>Interlocks Table</name>
-    <x>20</x>
-    <y>70</y>
-    <width>1906</width>
-    <height>1130</height>
-    <columns>
-      <column>
-        <name>Timestamp</name>
-        <width>120</width>
-        <editable>false</editable>
-      </column>
-      <column>
-        <name>Tag</name>
-        <width>130</width>
-        <editable>false</editable>
-      </column>
-      <column>
-        <name>Description of Interlock(s)</name>
-        <width>1650</width>
-        <editable>true</editable>
-      </column>
-    </columns>
-    <row_selection_mode>true</row_selection_mode>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>Group</name>
-    <x>20</x>
-    <y>20</y>
-    <width>460</width>
-    <height>40</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>Rectangle</name>
-      <width>460</width>
-      <height>40</height>
-      <line_color>
-        <color name="Transparent" red="255" green="255" blue="255" alpha="0">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="Button_Background" red="210" green="210" blue="210">
-        </color>
-      </background_color>
-    </widget>
-    <widget type="checkbox" version="2.0.0">
-      <name>Check Box</name>
-      <label>Interlocks</label>
-      <x>100</x>
-      <y>10</y>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>IncludeLbl</name>
-      <text>Include:</text>
-      <x>10</x>
-      <y>10</y>
-      <width>80</width>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="checkbox" version="2.0.0">
-      <name>Check Box_1</name>
-      <label>Warnings</label>
-      <x>200</x>
-      <y>10</y>
-    </widget>
-    <widget type="checkbox" version="2.0.0">
-      <name>Check Box_2</name>
-      <label>Connection Errors</label>
-      <x>300</x>
-      <y>10</y>
-      <width>150</width>
-    </widget>
-  </widget>
-</display>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_target.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_target.bob
deleted file mode 100644
index 307253fa6e1a56939085b89db4695b0f2490aa52..0000000000000000000000000000000000000000
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_target.bob
+++ /dev/null
@@ -1,1257 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<display version="2.0.0">
-  <name>Systems - Interlocks - Target</name>
-  <macros>
-    <Interlock01>IntL 01</Interlock01>
-    <Interlock02>IntL 02</Interlock02>
-    <Interlock03>IntL 03</Interlock03>
-    <Interlock04>IntL 04</Interlock04>
-    <Interlock05>IntL 05</Interlock05>
-    <Interlock06>IntL 06</Interlock06>
-    <InterlocksFile>./EmbedddedWindows/em_interlocks_rr.bob</InterlocksFile>
-    <ValvesFile>./EmbedddedWindows/em_valves_rw.bob</ValvesFile>
-    <section01>Wheel</section01>
-    <section02>Moderator</section02>
-    <section03>Cryogenics</section03>
-    <section04>TSS</section04>
-  </macros>
-  <width>1200</width>
-  <height>900</height>
-  <background_color>
-    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
-    </color>
-  </background_color>
-  <widget type="group" version="2.0.0">
-    <name>ISrcInterlocksGroup</name>
-    <x>20</x>
-    <y>20</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_1</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_6</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <PV_state>PV_state</PV_state>
-        <name>$(section01) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_1</name>
-      <text>$(section01) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_7</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_8</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_9</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_10</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_11</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>LEBTInterlocksGroup</name>
-    <x>260</x>
-    <y>20</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_2</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_12</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_2</name>
-      <text>$(section02) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_13</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_14</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_15</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_16</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_17</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>RFQInterlocksGroup</name>
-    <x>500</x>
-    <y>20</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_3</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_18</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_3</name>
-      <text>$(section03) PSS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_19</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_20</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_21</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_22</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_23</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>ISrcInterlocksGroup_1</name>
-    <x>20</x>
-    <y>390</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_6</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_36</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_6</name>
-      <text>$(section01) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_37</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_38</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_39</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_40</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_41</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>LEBTInterlocksGroup_1</name>
-    <x>260</x>
-    <y>390</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_7</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_42</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_7</name>
-      <text>$(section02) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_43</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_44</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_45</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_46</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_47</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>RFQInterlocksGroup_1</name>
-    <x>500</x>
-    <y>390</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_8</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_48</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_8</name>
-      <text>$(section03) PLC</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_49</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_50</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_51</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_52</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_53</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>ISrcInterlocksGroup_3</name>
-    <x>20</x>
-    <y>760</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_16</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_96</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_16</name>
-      <text>$(section01) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_97</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_98</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_99</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_100</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_101</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section01) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>LEBTInterlocksGroup_3</name>
-    <x>260</x>
-    <y>760</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_17</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_102</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_17</name>
-      <text>$(section02) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_103</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_104</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_105</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_106</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_107</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section02) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>RFQInterlocksGroup_3</name>
-    <x>500</x>
-    <y>760</y>
-    <width>220</width>
-    <height>350</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_18</name>
-      <width>220</width>
-      <height>350</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_108</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock01)</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_18</name>
-      <actions>
-        <action type="open_display">
-          <file>../gui-rfq-lps/overview-rfq-lps.bob</file>
-          <target>standalone</target>
-          <description>Open_RFQ-MPS</description>
-        </action>
-      </actions>
-      <text>$(section03) MPS</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip></tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_109</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock02)</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_110</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock03)</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_111</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock04)</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_112</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock05)</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_113</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>$(section03) $(Interlock06)</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>ResetGroup</name>
-    <x>1590</x>
-    <y>20</y>
-    <width>330</width>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_11</name>
-      <width>330</width>
-      <height>200</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>MGGrey03-title_11</name>
-      <text>???</text>
-      <width>330</width>
-      <height>50</height>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="RED-BORDER" red="150" green="8" blue="16">
-        </color>
-      </background_color>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>Valve</name>
-      <text>PLC Controllers</text>
-      <x>20</x>
-      <y>50</y>
-      <width>290</width>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip>Open $(name) Control Panel</tooltip>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>Valve_1</name>
-      <text>MPS Controllers</text>
-      <x>20</x>
-      <y>100</y>
-      <width>290</width>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip>Open $(name) Control Panel</tooltip>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>Valve_2</name>
-      <text>PSS Controllers</text>
-      <x>20</x>
-      <y>150</y>
-      <width>290</width>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip>Open $(name) Control Panel</tooltip>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>RFQInterlocksGroup_2</name>
-    <x>820</x>
-    <y>290</y>
-    <width>220</width>
-    <height>400</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_9</name>
-      <width>220</width>
-      <height>400</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_54</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>ISrc Actuation</name>
-      </macros>
-      <x>20</x>
-      <y>50</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MGGrey03-title_9</name>
-      <actions>
-        <action type="open_display">
-          <file>EmbedddedWindows/TSS_picture.bob</file>
-          <target>window</target>
-          <description>Open TSSpic</description>
-        </action>
-      </actions>
-      <text>$(section04)</text>
-      <x>20</x>
-      <y>10</y>
-      <width>180</width>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Background" red="255" green="255" blue="255">
-        </color>
-      </background_color>
-      <tooltip>(Target Safety System)</tooltip>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_55</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>RFQ Actuation</name>
-      </macros>
-      <x>20</x>
-      <y>100</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_56</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>HE flow error</name>
-      </macros>
-      <x>20</x>
-      <y>150</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_57</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>HE temperature error</name>
-      </macros>
-      <x>20</x>
-      <y>200</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_58</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>HE pressure error</name>
-      </macros>
-      <x>20</x>
-      <y>250</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_59</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>Mon. P</name>
-      </macros>
-      <x>20</x>
-      <y>300</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_60</name>
-      <file>$(InterlocksFile)</file>
-      <macros>
-        <name>Rotation</name>
-      </macros>
-      <x>20</x>
-      <y>350</y>
-      <width>180</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-</display>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_targs_overview.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_targs_overview.bob
deleted file mode 100644
index 73d211ffe8643271e7c03499e0a4e6580e47087f..0000000000000000000000000000000000000000
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_targs_overview.bob
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<display version="2.0.0">
-  <name>Target Overview</name>
-  <macros>
-    <ROOT>$(ROOT)</ROOT>
-  </macros>
-  <width>1200</width>
-  <height>900</height>
-  <background_color>
-    <color name="BACKGROUND" red="220" green="225" blue="221">
-    </color>
-  </background_color>
-  <widget type="group" version="2.0.0">
-    <name>WheelGroup</name>
-    <x>20</x>
-    <y>20</y>
-    <width>560</width>
-    <height>290</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_17</name>
-      <width>560</width>
-      <height>290</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>MGGrey03-title_15</name>
-      <text>Wheel</text>
-      <width>560</width>
-      <height>50</height>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="RED-BORDER" red="150" green="8" blue="16">
-        </color>
-      </background_color>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>ModeratorGroup</name>
-    <x>20</x>
-    <y>330</y>
-    <width>560</width>
-    <height>290</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_18</name>
-      <width>560</width>
-      <height>290</height>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>MGGrey03-title_16</name>
-      <text>Moderator</text>
-      <width>560</width>
-      <height>50</height>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="RED-BORDER" red="150" green="8" blue="16">
-        </color>
-      </background_color>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-  </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>Embedded Display</name>
-    <file>EmbedddedWindows/TSS_picture.bob</file>
-    <x>600</x>
-    <y>20</y>
-    <width>710</width>
-    <height>470</height>
-    <resize>1</resize>
-    <transparent>true</transparent>
-  </widget>
-</display>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_targs_pss.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_targs_pss.bob
deleted file mode 100644
index 3d041d9d5dcf5f97ffda00de6d448180a0294acc..0000000000000000000000000000000000000000
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_targs_pss.bob
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<display version="2.0.0">
-  <name>Target PSS</name>
-  <macros>
-    <ROOT>$(ROOT)</ROOT>
-  </macros>
-  <width>1200</width>
-  <height>900</height>
-  <background_color>
-    <color name="BACKGROUND" red="220" green="225" blue="221">
-    </color>
-  </background_color>
-  <widget type="embedded" version="2.0.0">
-    <name>Embedded Display</name>
-    <file>../../TS2/pss/TS2_PSS_Area.bob</file>
-    <x>20</x>
-    <y>20</y>
-    <width>1040</width>
-    <height>830</height>
-    <resize>2</resize>
-    <transparent>true</transparent>
-  </widget>
-</display>
diff --git a/NON-APPROVED/TS2/TS2_ops.bob b/NON-APPROVED/TS2/TS2_ops-panel.bob
similarity index 100%
rename from NON-APPROVED/TS2/TS2_ops.bob
rename to NON-APPROVED/TS2/TS2_ops-panel.bob