diff --git a/NON-APPROVED/ts2-pss/ODH_Expert_Monit.bob b/NON-APPROVED/ts2-pss/ODH_Expert_Monit.bob
index ac08d744f4c5595a8f9a9c62d090f53b4a794716..53bd864871b2c148b204525011843bcb55405f00 100644
--- a/NON-APPROVED/ts2-pss/ODH_Expert_Monit.bob
+++ b/NON-APPROVED/ts2-pss/ODH_Expert_Monit.bob
@@ -179,11 +179,11 @@
<x>24</x>
<y>187</y>
<off_color>
- <color name="LED-RED-OFF" red="110" green="101" blue="90">
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
</color>
</off_color>
<on_color>
- <color name="LED-RED-ON" red="255" green="60" blue="46">
+ <color name="LED-RED-OFF" red="110" green="101" blue="90">
</color>
</on_color>
</widget>
diff --git a/NON-APPROVED/ts2-pss/ODH_Monit_Area.bob b/NON-APPROVED/ts2-pss/ODH_Monit_Area.bob
index d337d83fdec5cbefc074e3a1bfed6db57e79d122..0bd4781c4301facb8b67fdd2f4ab6c6340777d1b 100644
--- a/NON-APPROVED/ts2-pss/ODH_Monit_Area.bob
+++ b/NON-APPROVED/ts2-pss/ODH_Monit_Area.bob
@@ -18,7 +18,7 @@
<name>OpenExpert</name>
<actions>
<action type="open_display">
- <file>../../../../ENGINEERING/COMMON/DEVICES/odh-detection-systems/ODH_Expert_Monit.bob</file>
+ <file>ODH_Expert_Monit.bob</file>
<macros>
<R>$(IDX)</R>
</macros>
@@ -67,7 +67,7 @@
<name>MonitHealthy</name>
<pv_name>$(ODH):MonitHealthy</pv_name>
<symbols>
- <symbol>/ess-symbols/badges/alarms/error.svg</symbol>
+ <symbol>/ess-symbols/badges/alarms/error@32.png</symbol>
</symbols>
<x>3</x>
<y>29</y>
diff --git a/NON-APPROVED/ts2-pss/PLC_module_status.bob b/NON-APPROVED/ts2-pss/PLC_module_status.bob
index e9202b6637cc15e87b396f63c8ff5a6957709d59..45a135899bb0fc5333ed191e8ef5fe82adb36f1a 100644
--- a/NON-APPROVED/ts2-pss/PLC_module_status.bob
+++ b/NON-APPROVED/ts2-pss/PLC_module_status.bob
@@ -7,7 +7,7 @@
<name>Error</name>
<pv_name>$(DIAG_STAT)</pv_name>
<symbols>
- <symbol>/ess-symbols/badges/alarms/error.svg</symbol>
+ <symbol>/ess-symbols/badges/alarms/error@32.png</symbol>
</symbols>
<x>3</x>
<y>43</y>
@@ -47,7 +47,7 @@ widget.setPropertyValue('tooltip', tooltip)
<name>Disconnected</name>
<pv_name>$(DIAG_CONN_STAT)</pv_name>
<symbols>
- <symbol>/ess-symbols/badges/alarms/unconnected.svg</symbol>
+ <symbol>/ess-symbols/badges/alarms/unconnected@32.png</symbol>
</symbols>
<x>3</x>
<y>3</y>
diff --git a/NON-APPROVED/ts2-pss/RIO.png b/NON-APPROVED/ts2-pss/RIO.png
index 7b1602b93284730e002aa877fecaf718231897d6..bb7fbc14b1005c2ef2186289678446cfb876f771 100644
Binary files a/NON-APPROVED/ts2-pss/RIO.png and b/NON-APPROVED/ts2-pss/RIO.png differ
diff --git a/NON-APPROVED/ts2-pss/TS2_Area_Layout.bob b/NON-APPROVED/ts2-pss/TS2_Area_Layout.bob
index 22f921697f15c3fefe2af8828757befd32fa27f4..8bb3e7bbf5929bf6a0bf7af94ce53893847aa1db 100644
--- a/NON-APPROVED/ts2-pss/TS2_Area_Layout.bob
+++ b/NON-APPROVED/ts2-pss/TS2_Area_Layout.bob
@@ -72,16 +72,16 @@
</widget>
<widget type="group" version="2.0.0">
<name>Signals</name>
- <x>740</x>
+ <x>700</x>
<y>10</y>
- <width>240</width>
+ <width>280</width>
<height>110</height>
<style>3</style>
<widget type="led" version="2.0.0">
- <name>GeneralAlarm</name>
- <pv_name>$(P):GeneralAlarm</pv_name>
+ <name>CriticalAlarm</name>
+ <pv_name>$(P):CriticalAlarm</pv_name>
<x>20</x>
- <y>20</y>
+ <y>3</y>
<off_color>
<color name="LED-RED-ON" red="255" green="60" blue="46">
</color>
@@ -95,14 +95,14 @@
<name>LB_GeneralAlarm</name>
<text>Alarms On</text>
<x>71</x>
- <y>20</y>
+ <y>3</y>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="led" version="2.0.0">
<name>PermitIssued</name>
<pv_name>$(P):PermitIssued</pv_name>
<x>20</x>
- <y>47</y>
+ <y>29</y>
<off_color>
<color name="LED-GREEN-OFF" red="90" green="110" blue="90">
</color>
@@ -116,14 +116,14 @@
<name>LB_Permit Issed</name>
<text>Permit Issued</text>
<x>71</x>
- <y>47</y>
+ <y>29</y>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="led" version="2.0.0">
- <name>AccessDoorOpen</name>
- <pv_name>$(P):AccessDoorOpen</pv_name>
+ <name>PADoorClosed</name>
+ <pv_name>$(P):PADoorClosed</pv_name>
<x>20</x>
- <y>74</y>
+ <y>56</y>
<off_color>
<color name="LED-BLUE-OFF" red="90" green="110" blue="110">
</color>
@@ -134,11 +134,35 @@
</on_color>
</widget>
<widget type="label" version="2.0.0">
- <name>LB_AccessDoorOpen</name>
- <text>Access Door Open</text>
+ <name>LB_PersonnelAccessDoorClosed</name>
+ <text>Personnel Access Door Closed</text>
<x>71</x>
- <y>74</y>
- <width>120</width>
+ <y>56</y>
+ <width>200</width>
+ <height>21</height>
+ <vertical_alignment>1</vertical_alignment>
+ <auto_size>true</auto_size>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>MADoorClosed</name>
+ <pv_name>$(P):MADoorClosed</pv_name>
+ <x>20</x>
+ <y>82</y>
+ <off_color>
+ <color name="LED-BLUE-OFF" red="90" green="110" blue="110">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="LED-BLUE-ON" red="81" green="232" blue="255">
+ </color>
+ </on_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_MaterialAccessDoorClosed</name>
+ <text>Material Access Door Closed</text>
+ <x>71</x>
+ <y>82</y>
+ <width>188</width>
<height>21</height>
<vertical_alignment>1</vertical_alignment>
<auto_size>true</auto_size>
@@ -161,7 +185,7 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>O2iM-1</name>
- <file>../CONTROL-ROOM/COMMON/DEVICES/odh-detection-systems/ODH_Monit_Area.bob</file>
+ <file>ODH_Monit_Area.bob</file>
<macros>
<IDX>1</IDX>
</macros>
@@ -174,7 +198,7 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Display</name>
- <file>../CONTROL-ROOM/COMMON/DEVICES/odh-detection-systems/ODH_Monit_Area.bob</file>
+ <file>ODH_Monit_Area.bob</file>
<macros>
<IDX>2</IDX>
</macros>