diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Controllers/CV_FlowController_BlockIcon_Vertical_Right.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Controllers/CV_FlowController_BlockIcon_Vertical_Right.bob
index 8067834fb2b0652c501f3631568849dc4c037a05..71a633161ec02f3d4b17bd3f99bf36e7711b9ce7 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Controllers/CV_FlowController_BlockIcon_Vertical_Right.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Controllers/CV_FlowController_BlockIcon_Vertical_Right.bob
@@ -51,7 +51,7 @@
</widget>
<widget type="symbol" version="2.0.0">
<name>WID_CenterIcon</name>
- <pv_name>${WIDSecSub}:${WIDDis}-${WIDDev}-${WIDIndex}:ValveColor</pv_name>
+ <pv_name>${WIDSecSub}:${WIDDis}-${WIDDev}-${WIDIndex}:FCColor</pv_name>
<symbols>
<symbol>../../symbols/custom_v02/valve analog/valve_analog_OFF@64.png</symbol>
<symbol>../../symbols/custom_v02/valve analog/valve_analog_OK@64.png</symbol>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/DigitalMeasure/HW_INTLCK_Faceplate.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/DigitalMeasure/HW_INTLCK_Faceplate.bob
index c54e5bdd20debc0ab260a13a5686a3656a332851..4631c2d415126a6b28a0df67fcb647673d321e1b 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/DigitalMeasure/HW_INTLCK_Faceplate.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/DigitalMeasure/HW_INTLCK_Faceplate.bob
@@ -99,7 +99,7 @@
<color name="Grid" red="169" green="169" blue="169">
</color>
</off_color>
- <tooltip>Valve position</tooltip>
+ <tooltip>Interlock position</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>LB_Opened</name>
@@ -125,7 +125,7 @@
<color name="Grid" red="169" green="169" blue="169">
</color>
</off_color>
- <tooltip>Valve position</tooltip>
+ <tooltip>Interlock position</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>LB_Closed</name>
@@ -172,7 +172,7 @@
<color name="Grid" red="169" green="169" blue="169">
</color>
</off_color>
- <tooltip>Valve solenoid state</tooltip>
+ <tooltip>Relay state</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>LB_Solenoid</name>
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob b/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
index f1d1e88a392a7d0774eef5aafccb9b835f787d18..f6a483126c67edff07cf2f376618bc9123002e75 100755
--- a/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
+++ b/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
@@ -1071,7 +1071,7 @@
<transparent>true</transparent>
</widget>
<widget type="embedded" version="2.0.0">
- <name>PV_Valve_BlockIcon_Horizontal_25</name>
+ <name>FCV-041</name>
<file>../../ICS_OPI_LIBRARY/DeviceTypes/Controllers/CV_FlowController_BlockIcon_Vertical_Right.bob</file>
<macros>
<WIDDev>FCV</WIDDev>
@@ -1087,7 +1087,7 @@
<transparent>true</transparent>
</widget>
<widget type="embedded" version="2.0.0">
- <name>PV_Valve_BlockIcon_Horizontal_26</name>
+ <name>FCV-031</name>
<file>../../ICS_OPI_LIBRARY/DeviceTypes/Controllers/CV_FlowController_BlockIcon_Vertical_Right.bob</file>
<macros>
<WIDDev>FCV</WIDDev>
@@ -1103,7 +1103,7 @@
<transparent>true</transparent>
</widget>
<widget type="embedded" version="2.0.0">
- <name>PV_Valve_BlockIcon_Horizontal_27</name>
+ <name>FCV-021</name>
<file>../../ICS_OPI_LIBRARY/DeviceTypes/Controllers/CV_FlowController_BlockIcon_Vertical_Right.bob</file>
<macros>
<WIDDev>FCV</WIDDev>
@@ -2532,7 +2532,7 @@
<rotation>90.0</rotation>
</widget>
<widget type="embedded" version="2.0.0">
- <name>PV_Valve_BlockIcon_Horizontal_28</name>
+ <name>FCV-011</name>
<file>../../ICS_OPI_LIBRARY/DeviceTypes/Controllers/CV_FlowController_BlockIcon_Vertical_Right.bob</file>
<macros>
<WIDDev>FCV</WIDDev>
@@ -3407,7 +3407,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_20</name>
- <text>version 2020-07-31 15:00</text>
+ <text>version 2020-11-04 10:30</text>
<x>2287</x>
<y>1303</y>
<width>197</width>
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/Transitions/transitions.bob b/NON-APPROVED/TS2/ts2-cryomodule/Transitions/transitions.bob
index 33baa7465eefe25b7d45d93598d6cf2a84381db8..268417e8efed0a51b69944c90d921cad049694db 100644
--- a/NON-APPROVED/TS2/ts2-cryomodule/Transitions/transitions.bob
+++ b/NON-APPROVED/TS2/ts2-cryomodule/Transitions/transitions.bob
@@ -26,7 +26,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>T0</name>
- <pv_name>TS2-010:Cryo-Virt-Int001:Closed</pv_name>
+ <pv_name>TS2-010:Cryo-Virt-G01:T0</pv_name>
<x>472</x>
<y>10</y>
<off_color>
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/interlocks.bob b/NON-APPROVED/TS2/ts2-cryomodule/interlocks.bob
index 0f0d9dc55504206d13a7bc8b04bbda5ef61f346e..a4dfe8fa0902bdb74dc2d5a806c130a6d20788c9 100644
--- a/NON-APPROVED/TS2/ts2-cryomodule/interlocks.bob
+++ b/NON-APPROVED/TS2/ts2-cryomodule/interlocks.bob
@@ -129,16 +129,6 @@
</font>
</font>
</widget>
- <widget type="led" version="2.0.0">
- <name>CryoRdy_led_1</name>
- <pv_name>TS2-010:Cryo-Virt-CMRy:Opened</pv_name>
- <x>559</x>
- <y>149</y>
- <off_color>
- <color name="RED" red="252" green="13" blue="27">
- </color>
- </off_color>
- </widget>
<widget type="label" version="2.0.0">
<name>I3_label_text_1</name>
<text>TS2-010CRM:Cryo-CV-091:Closed</text>
@@ -397,4 +387,57 @@
<height>20</height>
<tooltip>$(actions)</tooltip>
</widget>
+ <widget type="embedded" version="2.0.0">
+ <name>Embedded Display_1</name>
+ <file>../../ICS_OPI_LIBRARY/DeviceTypes/DigitalMeasure/HW_INTLCK_BlockIcon_Compact.bob</file>
+ <macros>
+ <WIDDev>Virt</WIDDev>
+ <WIDDis>Cryo</WIDDis>
+ <WIDIndex>CMRy</WIDIndex>
+ <WIDSecSub>TS2-010</WIDSecSub>
+ </macros>
+ <x>559</x>
+ <y>140</y>
+ <width>50</width>
+ <height>32</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>I3_label_text_9</name>
+ <text>IsoVac and BeamVac and CDSVac OK</text>
+ <x>215</x>
+ <y>424</y>
+ <width>300</width>
+ <font>
+ <font family="Source Sans Pro" style="ITALIC" size="16.0">
+ </font>
+ </font>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>Embedded Display_2</name>
+ <file>../../ICS_OPI_LIBRARY/DeviceTypes/DigitalMeasure/HW_INTLCK_BlockIcon_Compact.bob</file>
+ <macros>
+ <WIDDev>Virt</WIDDev>
+ <WIDDis>Cryo</WIDDis>
+ <WIDIndex>Int001</WIDIndex>
+ <WIDSecSub>TS2-010</WIDSecSub>
+ </macros>
+ <x>559</x>
+ <y>415</y>
+ <width>50</width>
+ <height>32</height>
+ <resize>2</resize>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>13_label_3</name>
+ <text>VacuumOK:</text>
+ <x>26</x>
+ <y>424</y>
+ <width>180</width>
+ <font>
+ <font family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <horizontal_alignment>2</horizontal_alignment>
+ </widget>
</display>