From 7d7a010ae8e8fa39cc1203f2c3faa8eddaceab0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu>
Date: Wed, 28 Apr 2021 17:25:15 +0200
Subject: [PATCH] [WIP] Redesign by Dirk

---
 NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob       | 3836 ++++++++---------
 .../pss1-pss/PSS1_PSS_Diagnostics.bob         |   96 +-
 .../diagnostics/PLC_cabinet.bob               |    2 +-
 .../diagnostics/RIO4_cabinet.bob              |    2 +-
 .../diagnostics/RIO5_cabinet.bob              |    2 +-
 .../embedded_displays/diagnostics/cabinet.bob |    2 +-
 .../diagnostics/checksum.bob                  |    4 +
 .../embedded_displays/diagnostics/epics.bob   |  383 +-
 .../diagnostics/plc_software.bob              |  180 +-
 .../pss1-pss/embedded_displays/esob.bob       |   22 +-
 .../pss1-pss/embedded_displays/esos.bob       |   55 +-
 .../embedded_displays/operation_mode.bob      |  904 +---
 .../pss1-pss/embedded_displays/rad.bob        |   60 +-
 .../pss1-pss/embedded_displays/search.bob     |   22 +-
 .../pss1-pss/embedded_displays/tooltip.js     |    3 -
 .../pss1-pss/embedded_displays/waveguide.bob  |  102 +
 NON-APPROVED/pss1-pss/popups/PSS1_Legend.bob  |  652 +++
 .../diagnostics/PLC_cabinet_diagnostics.bob   |   18 +-
 .../RIO123_cabinet_diagnostics.bob            |   18 +-
 .../diagnostics/RIO4_cabinet_diagnostics.bob  |   22 +-
 .../diagnostics/RIO5_cabinet_diagnostics.bob  |   20 +-
 NON-APPROVED/pss1-pss/popups/key_exchange.bob | 2342 ++++------
 .../pss1-pss/popups/permits/dtl2_dtl3.bob     |  181 +-
 NON-APPROVED/pss1-pss/popups/permits/dtl4.bob |   16 +-
 .../pss1-pss/popups/permits/isrc_hvps.bob     |   18 +-
 .../popups/permits/isrc_magnetron.bob         |   13 +-
 .../pss1-pss/popups/permits/mebt1.bob         |   13 +-
 .../pss1-pss/popups/permits/mebt2.bob         |   16 +-
 .../pss1-pss/popups/permits/mebt3.bob         |   14 +-
 NON-APPROVED/pss1-pss/popups/permits/plc.bob  |   14 +-
 .../pss1-pss/popups/permits/rfq_dtl1.bob      |   16 +-
 .../pss1-pss/popups/rad_faceplate.bob         |   16 +-
 .../pss1-pss/symbols/Key/lock_v02.svg         |   31 +
 .../door v2/svg/double-left-close-black.svg   |    1 +
 .../door v2/svg/double-left-close-green.svg   |    1 +
 .../door v2/svg/double-left-close-red.svg     |    1 +
 .../door v2/svg/double-left-open-black.svg    |    1 +
 .../door v2/svg/double-left-open-green.svg    |    1 +
 .../door v2/svg/double-left-open-red.svg      |    1 +
 .../door v2/svg/double-right-close-black.svg  |    1 +
 .../door v2/svg/double-right-close-green.svg  |    1 +
 .../door v2/svg/double-right-close-red.svg    |    1 +
 .../door v2/svg/double-right-open-black.svg   |    1 +
 .../door v2/svg/double-right-open-green.svg   |    1 +
 .../door v2/svg/double-right-open-red.svg     |    1 +
 .../door v2/svg/singel-left-open-black.svg    |    1 +
 .../door v2/svg/singel-left-open-green.svg    |    1 +
 .../door v2/svg/singel-left-open-red.svg      |    1 +
 .../door v2/svg/singel-right-open-black.svg   |    1 +
 .../door v2/svg/singel-right-open-green.svg   |    1 +
 .../door v2/svg/singel-right-open-red.svg     |    1 +
 .../door v2/svg/single-left-close-black.svg   |    1 +
 .../door v2/svg/single-left-close-green.svg   |    1 +
 .../door v2/svg/single-left-close-red.svg     |    1 +
 .../door v2/svg/single-right-close-black.svg  |    1 +
 .../door v2/svg/single-right-close-green.svg  |    1 +
 .../door v2/svg/single-right-close-red.svg    |    1 +
 .../pss1-pss/symbols/map/Key_Exchange_v03.svg |   61 +
 .../symbols/map/PSS1_map_lines_v09.svg        |   23 +
 .../symbols/map/PSS1_map_solid_v08.svg        |   10 +
 .../symbols/map/PSS1_map_zone1blue_v08.svg    |   11 +
 .../symbols/map/PSS1_map_zone2blue_v08.svg    |   10 +
 .../rad/Ionising radiation green v02.svg      |    1 +
 .../rad/Ionising radiation grey v02.svg       |    1 +
 .../rad/Ionising radiation red v02.svg        |    1 +
 .../rad/Ionising radiation yellow v02.svg     |    1 +
 66 files changed, 4269 insertions(+), 4969 deletions(-)
 delete mode 100644 NON-APPROVED/pss1-pss/embedded_displays/tooltip.js
 create mode 100644 NON-APPROVED/pss1-pss/embedded_displays/waveguide.bob
 create mode 100644 NON-APPROVED/pss1-pss/popups/PSS1_Legend.bob
 create mode 100644 NON-APPROVED/pss1-pss/symbols/Key/lock_v02.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-close-black.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-close-green.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-close-red.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-open-black.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-open-green.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-open-red.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-close-black.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-close-green.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-close-red.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-open-black.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-open-green.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-open-red.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-left-open-black.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-left-open-green.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-left-open-red.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-right-open-black.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-right-open-green.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-right-open-red.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/single-left-close-black.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/single-left-close-green.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/single-left-close-red.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/single-right-close-black.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/single-right-close-green.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/door v2/svg/single-right-close-red.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/map/Key_Exchange_v03.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/map/PSS1_map_lines_v09.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/map/PSS1_map_solid_v08.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/map/PSS1_map_zone1blue_v08.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/map/PSS1_map_zone2blue_v08.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/rad/Ionising radiation green v02.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/rad/Ionising radiation grey v02.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/rad/Ionising radiation red v02.svg
 create mode 100644 NON-APPROVED/pss1-pss/symbols/rad/Ionising radiation yellow v02.svg

diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
index 657d193f..7d5ea2ec 100644
--- a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
+++ b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
@@ -1,121 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>PSS1</name>
-  <width>1040</width>
-  <height>830</height>
+  <width>1919</width>
+  <height>991</height>
+  <grid_visible>false</grid_visible>
   <widget type="rectangle" version="2.0.0">
-    <name>BGGrey03-titlebar_1</name>
-    <x>10</x>
-    <y>10</y>
-    <width>1010</width>
-    <height>810</height>
+    <name>Titlebar</name>
+    <width>1919</width>
+    <height>50</height>
     <line_width>0</line_width>
     <background_color>
-      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      <color red="218" green="110" blue="0">
       </color>
     </background_color>
-    <corner_width>10</corner_width>
-    <corner_height>10</corner_height>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>BGGrey03-title</name>
-    <text>PSS1 </text>
-    <x>10</x>
-    <y>10</y>
-    <width>1010</width>
-    <height>50</height>
-    <font>
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color name="TEXT-LIGHT" red="230" green="230" blue="230">
-      </color>
-    </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Permits</name>
-    <text>PSS Permits</text>
-    <x>654</x>
-    <y>31</y>
-    <width>346</width>
-    <height>30</height>
-    <font>
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+    <name>Title</name>
+    <class>TITLE</class>
+    <text>PSS1</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>800</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
     </font>
-    <foreground_color>
-      <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>BGGrey03-background_1</name>
-    <x>20</x>
-    <y>60</y>
-    <width>990</width>
-    <height>750</height>
-    <line_width>0</line_width>
-    <background_color>
-      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-      </color>
-    </background_color>
-    <corner_width>5</corner_width>
-    <corner_height>5</corner_height>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>BGGrey03-background_2</name>
+  <widget type="group" version="2.0.0">
+    <name>Top Left</name>
     <x>20</x>
-    <y>280</y>
-    <width>990</width>
-    <height>530</height>
-    <line_width>0</line_width>
-    <background_color>
-      <color name="Background" red="220" green="225" blue="221">
-      </color>
-    </background_color>
-    <corner_width>5</corner_width>
-    <corner_height>5</corner_height>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>LB Blue Lights</name>
-    <text>BLUE Lights:</text>
-    <x>325</x>
     <y>73</y>
-    <width>90</width>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>BlueLightsOn</name>
-    <pv_name>AccPSS:PSS-Area-1:BlueLightsOn</pv_name>
-    <x>360</x>
-    <y>93</y>
-    <off_color>
-      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="PRIMARY" red="0" green="148" blue="202">
-      </color>
-    </on_color>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>Acks</name>
-    <x>30</x>
-    <y>70</y>
-    <width>280</width>
-    <height>55</height>
+    <height>118</height>
     <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>Background</name>
+      <width>300</width>
+      <height>118</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-BACKGROUND" red="200" green="205" blue="201">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
     <widget type="led" version="2.0.0">
       <name>PSSAckRequired</name>
       <pv_name>AccPSS:PSS-Area-1:PSS1resetRequired</pv_name>
-      <x>10</x>
-      <y>3</y>
+      <x>21</x>
+      <y>21</y>
       <off_color>
         <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
         </color>
@@ -127,17 +74,21 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>LB_PSSAckRequired</name>
-      <text>PSS Acknowledgement Required</text>
-      <x>36</x>
-      <y>3</y>
-      <width>225</width>
+      <text>Acknowledgement Required</text>
+      <x>49</x>
+      <y>18</y>
+      <width>251</width>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="18.0">
+        </font>
+      </font>
       <vertical_alignment>1</vertical_alignment>
     </widget>
     <widget type="label" version="2.0.0">
       <name>Occupancy</name>
       <text>Current occupancy:</text>
-      <x>10</x>
-      <y>29</y>
+      <x>26</x>
+      <y>64</y>
       <width>131</width>
       <horizontal_alignment>2</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
@@ -145,25 +96,188 @@
     <widget type="textupdate" version="2.0.0">
       <name>AccPSS:PSS-Area-1:Occupancy</name>
       <pv_name>AccPSS:PSS-Area-1:Occupancy</pv_name>
-      <x>147</x>
-      <y>29</y>
+      <x>167</x>
+      <y>63</y>
       <width>110</width>
-      <horizontal_alignment>2</horizontal_alignment>
+      <height>30</height>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>Mode of Operation</name>
+    <x>20</x>
+    <y>211</y>
+    <height>130</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>Background</name>
+      <width>300</width>
+      <height>130</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-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>Mode of Operation</name>
+      <text>PSS1 Mode of Operation</text>
+      <width>300</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="21.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Operation Mode</name>
+      <file>embedded_displays/operation_mode.bob</file>
+      <x>40</x>
+      <y>57</y>
+      <width>220</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>Diagnostics</name>
+    <x>20</x>
+    <y>361</y>
+    <height>130</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>Background</name>
+      <width>300</width>
+      <height>130</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-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>Diagnostics</name>
+      <text>Diagnostics</text>
+      <width>300</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="21.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Open Diagnostics</name>
+      <actions>
+        <action type="open_display">
+          <file>PSS1_PSS_Diagnostics.bob</file>
+          <target>window</target>
+          <description>Open Diagnostics</description>
+        </action>
+      </actions>
+      <pv_name>FEB-090:PSS-PLC-1:DiagError</pv_name>
+      <text>Open</text>
+      <x>40</x>
+      <y>55</y>
+      <width>220</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="18.0">
+        </font>
+      </font>
+      <rules>
+        <rule name="Diagnostics Alarm Background" prop_id="background_color" out_exp="false">
+          <exp bool_exp="pvInt0">
+            <value>
+              <color name="ERROR" red="252" green="13" blue="27">
+              </color>
+            </value>
+          </exp>
+          <pv_name>$(pv_name)</pv_name>
+        </rule>
+        <rule name="Diagnostics Alarm Foreground" prop_id="foreground_color" out_exp="false">
+          <exp bool_exp="pvInt0">
+            <value>
+              <color name="WHITE" red="255" green="255" blue="255">
+              </color>
+            </value>
+          </exp>
+          <pv_name>$(pv_name)</pv_name>
+        </rule>
+        <rule name="Diagnostics Alarm Font" prop_id="font" out_exp="false">
+          <exp bool_exp="pvInt0">
+            <value>
+              <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+              </font>
+            </value>
+          </exp>
+          <pv_name>$(pv_name)</pv_name>
+        </rule>
+      </rules>
+      <tooltip>$(actions)</tooltip>
+    </widget>
   </widget>
   <widget type="group" version="2.0.0">
     <name>Permits</name>
-    <x>654</x>
-    <y>66</y>
-    <width>346</width>
-    <height>134</height>
+    <x>20</x>
+    <y>511</y>
+    <height>459</height>
     <style>3</style>
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="50.0">
+      </font>
+    </font>
+    <widget type="rectangle" version="2.0.0">
+      <name>Background</name>
+      <width>300</width>
+      <height>459</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-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>Permits</name>
+      <text>Permits</text>
+      <width>300</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="21.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
     <widget type="led" version="2.0.0">
       <name>ISrcHVPS_PermitOn</name>
       <pv_name>FEB-010Row:CnPw-U-007:ISrcHVPS_PermitOn</pv_name>
-      <x>10</x>
-      <y>3</y>
+      <x>21</x>
+      <y>54</y>
       <off_color>
         <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
         </color>
@@ -176,8 +290,8 @@
     <widget type="label" version="2.0.0">
       <name>LB_ISrcHVPS_PermitOn</name>
       <text>ISrc HVPS</text>
-      <x>36</x>
-      <y>3</y>
+      <x>47</x>
+      <y>52</y>
       <width>120</width>
       <vertical_alignment>1</vertical_alignment>
       <actions>
@@ -192,19 +306,21 @@
           <description>Open Display</description>
         </action>
       </actions>
-      <text></text>
-      <x>36</x>
-      <y>3</y>
-      <width>120</width>
-      <height>20</height>
-      <transparent>true</transparent>
+      <text>Details</text>
+      <x>208</x>
+      <y>49</y>
+      <width>70</width>
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
+        </font>
+      </font>
       <tooltip>$(actions)</tooltip>
     </widget>
     <widget type="led" version="2.0.0">
       <name>ISrcMagPS_PermitOn</name>
       <pv_name>AccPSS-Z0:PSS-RIO-4:ISrcMagPS_PermitOn</pv_name>
-      <x>10</x>
-      <y>29</y>
+      <x>21</x>
+      <y>94</y>
       <off_color>
         <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
         </color>
@@ -216,9 +332,9 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>LB_ISrcMagPS_PermitOn</name>
-      <text>ISrc magnetron PS</text>
-      <x>36</x>
-      <y>29</y>
+      <text>ISrc Magnetron PS</text>
+      <x>47</x>
+      <y>92</y>
       <width>120</width>
       <vertical_alignment>1</vertical_alignment>
       <actions>
@@ -233,19 +349,21 @@
           <description>Open Display</description>
         </action>
       </actions>
-      <text></text>
-      <x>36</x>
-      <y>29</y>
-      <width>120</width>
-      <height>20</height>
-      <transparent>true</transparent>
+      <text>Details</text>
+      <x>208</x>
+      <y>89</y>
+      <width>70</width>
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
+        </font>
+      </font>
       <tooltip>$(actions)</tooltip>
     </widget>
     <widget type="led" version="2.0.0">
       <name>RFQDTL1_PermitOn</name>
       <pv_name>KG-NCG:PSS-ICC-1:RFQDTL1_PermitOn</pv_name>
-      <x>10</x>
-      <y>56</y>
+      <x>21</x>
+      <y>144</y>
       <off_color>
         <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
         </color>
@@ -258,8 +376,8 @@
     <widget type="label" version="2.0.0">
       <name>LB_RFQDTL1_PermitOn</name>
       <text>RFQ &amp; DTL1 </text>
-      <x>36</x>
-      <y>56</y>
+      <x>47</x>
+      <y>142</y>
       <width>120</width>
       <vertical_alignment>1</vertical_alignment>
       <actions>
@@ -274,19 +392,21 @@
           <description>Open Display</description>
         </action>
       </actions>
-      <text></text>
-      <x>36</x>
-      <y>56</y>
-      <width>120</width>
-      <height>20</height>
-      <transparent>true</transparent>
+      <text>Details</text>
+      <x>208</x>
+      <y>139</y>
+      <width>70</width>
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
+        </font>
+      </font>
       <tooltip>$(actions)</tooltip>
     </widget>
     <widget type="led" version="2.0.0">
       <name>DTL2DTL3_PermitOn</name>
       <pv_name>KG-NCG:PSS-ICC-2:DTL2DTL3_PermitOn</pv_name>
-      <x>10</x>
-      <y>83</y>
+      <x>21</x>
+      <y>184</y>
       <off_color>
         <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
         </color>
@@ -299,8 +419,8 @@
     <widget type="label" version="2.0.0">
       <name>LB_DTL2DTL3_PermitOn</name>
       <text>DTL2 &amp; DTL3 </text>
-      <x>36</x>
-      <y>83</y>
+      <x>47</x>
+      <y>182</y>
       <width>120</width>
       <vertical_alignment>1</vertical_alignment>
       <actions>
@@ -315,19 +435,21 @@
           <description>Open Display</description>
         </action>
       </actions>
-      <text></text>
-      <x>36</x>
-      <y>83</y>
-      <width>120</width>
-      <height>20</height>
-      <transparent>true</transparent>
+      <text>Details</text>
+      <x>208</x>
+      <y>179</y>
+      <width>70</width>
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
+        </font>
+      </font>
       <tooltip>$(actions)</tooltip>
     </widget>
     <widget type="led" version="2.0.0">
       <name>DTL4_PermitOn</name>
       <pv_name>KG-NCG:PSS-ICC-3:DTL4_PermitOn</pv_name>
-      <x>184</x>
-      <y>3</y>
+      <x>21</x>
+      <y>224</y>
       <off_color>
         <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
         </color>
@@ -340,8 +462,8 @@
     <widget type="label" version="2.0.0">
       <name>LB_DTL4_PermitOn</name>
       <text>DTL4 </text>
-      <x>210</x>
-      <y>3</y>
+      <x>47</x>
+      <y>222</y>
       <width>120</width>
       <vertical_alignment>1</vertical_alignment>
       <actions>
@@ -356,19 +478,21 @@
           <description>Open Display</description>
         </action>
       </actions>
-      <text></text>
-      <x>210</x>
-      <y>3</y>
-      <width>120</width>
-      <height>20</height>
-      <transparent>true</transparent>
+      <text>Details</text>
+      <x>208</x>
+      <y>219</y>
+      <width>70</width>
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
+        </font>
+      </font>
       <tooltip>$(actions)</tooltip>
     </widget>
     <widget type="led" version="2.0.0">
       <name>MEBT1_PermitOn</name>
       <pv_name>KG-NCG:PSS-ICC-4:MEBT1_PermitOn</pv_name>
-      <x>184</x>
-      <y>29</y>
+      <x>21</x>
+      <y>274</y>
       <off_color>
         <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
         </color>
@@ -380,9 +504,9 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>LB_MEBT1_PermitOn</name>
-      <text>MEBT1 buncher 1</text>
-      <x>210</x>
-      <y>29</y>
+      <text>MEBT1 Buncher 1</text>
+      <x>47</x>
+      <y>272</y>
       <width>120</width>
       <vertical_alignment>1</vertical_alignment>
       <actions>
@@ -397,19 +521,21 @@
           <description>Open Display</description>
         </action>
       </actions>
-      <text></text>
-      <x>210</x>
-      <y>29</y>
-      <width>120</width>
-      <height>20</height>
-      <transparent>true</transparent>
+      <text>Details</text>
+      <x>208</x>
+      <y>269</y>
+      <width>70</width>
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
+        </font>
+      </font>
       <tooltip>$(actions)</tooltip>
     </widget>
     <widget type="led" version="2.0.0">
       <name>MEBT2_PermitOn</name>
       <pv_name>KG-NCG:PSS-ICC-4:MEBT2_PermitOn</pv_name>
-      <x>184</x>
-      <y>56</y>
+      <x>21</x>
+      <y>314</y>
       <off_color>
         <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
         </color>
@@ -421,9 +547,9 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>LB_MEBT2_PermitOn</name>
-      <text>MEBT2 buncher 2</text>
-      <x>210</x>
-      <y>56</y>
+      <text>MEBT2 Buncher 2</text>
+      <x>47</x>
+      <y>312</y>
       <width>120</width>
       <vertical_alignment>1</vertical_alignment>
       <actions>
@@ -438,19 +564,21 @@
           <description>Open Display</description>
         </action>
       </actions>
-      <text></text>
-      <x>210</x>
-      <y>56</y>
-      <width>120</width>
-      <height>20</height>
-      <transparent>true</transparent>
+      <text>Details</text>
+      <x>208</x>
+      <y>309</y>
+      <width>70</width>
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
+        </font>
+      </font>
       <tooltip>$(actions)</tooltip>
     </widget>
     <widget type="led" version="2.0.0">
       <name>MEBT3_PermitOn</name>
       <pv_name>KG-NCG:PSS-ICC-4:MEBT3_PermitOn</pv_name>
-      <x>184</x>
-      <y>83</y>
+      <x>21</x>
+      <y>354</y>
       <off_color>
         <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
         </color>
@@ -462,9 +590,9 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>LB_MEBT3_PermitOn</name>
-      <text>MEBT3 buncher 3</text>
-      <x>210</x>
-      <y>83</y>
+      <text>MEBT3 Buncher 3</text>
+      <x>47</x>
+      <y>352</y>
       <width>120</width>
       <vertical_alignment>1</vertical_alignment>
       <actions>
@@ -479,16 +607,18 @@
           <description>Open Display</description>
         </action>
       </actions>
-      <text></text>
-      <x>210</x>
-      <y>83</y>
-      <width>120</width>
-      <height>20</height>
-      <transparent>true</transparent>
+      <text>Details</text>
+      <x>208</x>
+      <y>349</y>
+      <width>70</width>
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
+        </font>
+      </font>
       <tooltip>$(actions)</tooltip>
     </widget>
     <widget type="action_button" version="3.0.0">
-      <name>AB_PLC Permit</name>
+      <name>AB_PLC Permits</name>
       <actions>
         <action type="open_display">
           <file>popups/permits/plc.bob</file>
@@ -497,444 +627,533 @@
         </action>
       </actions>
       <text>PLC Permits</text>
-      <x>210</x>
-      <y>108</y>
-      <width>120</width>
-      <height>23</height>
+      <x>21</x>
+      <y>396</y>
+      <width>257</width>
+      <height>42</height>
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
+        </font>
+      </font>
       <tooltip>$(actions)</tooltip>
     </widget>
   </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>map solid</name>
+    <symbols>
+      <symbol>symbols/map/PSS1_map_solid_v08.svg</symbol>
+    </symbols>
+    <x>635</x>
+    <y>141</y>
+    <width>1272</width>
+    <height>840</height>
+    <tooltip></tooltip>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>map zone 1 blue</name>
+    <pv_name>AccPSS-Z1:PSS-Area-1:ZoneSearched</pv_name>
+    <symbols>
+      <symbol>symbols/map/PSS1_map_zone1blue_v08.svg</symbol>
+    </symbols>
+    <x>635</x>
+    <y>141</y>
+    <width>1272</width>
+    <height>840</height>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="true">
+        <exp bool_exp="True">
+          <expression>pvInt0</expression>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>map zone 2 blue</name>
+    <pv_name>AccPSS-Z2:PSS-Area-1:ZoneSearched</pv_name>
+    <symbols>
+      <symbol>symbols/map/PSS1_map_zone2blue_v08.svg</symbol>
+    </symbols>
+    <x>635</x>
+    <y>141</y>
+    <width>1272</width>
+    <height>840</height>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="true">
+        <exp bool_exp="True">
+          <expression>pvInt0</expression>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>map lines</name>
+    <symbols>
+      <symbol>symbols/map/PSS1_map_lines_v09.svg</symbol>
+    </symbols>
+    <x>635</x>
+    <y>141</y>
+    <width>1272</width>
+    <height>840</height>
+  </widget>
   <widget type="group" version="2.0.0">
-    <name>HMI Usage</name>
-    <x>30</x>
-    <y>155</y>
-    <width>280</width>
-    <height>45</height>
+    <name>Occupancy warning</name>
+    <x>339</x>
+    <y>73</y>
+    <width>296</width>
+    <height>118</height>
     <style>3</style>
+    <transparent>true</transparent>
     <rules>
       <rule name="Visibility" prop_id="visible" out_exp="false">
-        <exp bool_exp="pvInt0 == 0">
+        <exp bool_exp="pvInt0 &lt; 10">
           <value>false</value>
         </exp>
-        <pv_name>AccPSS:PSS-Area-1:HMI_User</pv_name>
+        <pv_name>AccPSS:PSS-Area-1:Occupancy</pv_name>
       </rule>
     </rules>
     <widget type="rectangle" version="2.0.0">
-      <name>Rectangle_29</name>
-      <width>280</width>
-      <height>45</height>
-      <line_width>2</line_width>
+      <name>Background</name>
+      <width>296</width>
+      <height>118</height>
       <line_color>
-        <color name="MINOR" red="252" green="242" blue="17">
+        <color name="RED-BORDER" red="150" green="8" blue="16">
         </color>
       </line_color>
       <background_color>
-        <color name="Button_Background" red="236" green="236" blue="236">
+        <color name="RED-BACKGROUND" red="225" green="192" blue="188">
         </color>
       </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
     </widget>
-    <widget type="text-symbol" version="2.0.0">
-      <name>HMI_User</name>
-      <pv_name>AccPSS:PSS-Area-1:HMI_User</pv_name>
-      <symbols>
-        <symbol>No User</symbol>
-        <symbol>PSS HMI in use - Operator</symbol>
-        <symbol>PSS HMI in use - Admin</symbol>
-        <symbol>PSS HMI in use - RF Team</symbol>
-      </symbols>
-      <x>10</x>
-      <y>5</y>
-      <width>260</width>
-      <height>35</height>
+    <widget type="label" version="2.0.0">
+      <name>Warning</name>
+      <text>The occupancy number in the controlled area is &gt;= 10</text>
+      <y>8</y>
+      <width>296</width>
+      <height>60</height>
       <font>
-        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        <font name="MEDIUM-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="18.0">
         </font>
       </font>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Hide Button</name>
+      <actions>
+        <action type="execute">
+          <script file="EmbeddedPy">
+            <text><![CDATA[from org.csstudio.display.builder.runtime.script import ScriptUtil
+ScriptUtil.findWidgetByName(widget, "Occupancy warning").setPropertyValue("visible", False)]]></text>
+          </script>
+          <description>Execute Script</description>
+        </action>
+      </actions>
+      <text>Hide</text>
+      <x>102</x>
+      <y>73</y>
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
+        </font>
+      </font>
+      <tooltip>$(actions)</tooltip>
     </widget>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Open Diagnostics</name>
-    <actions>
-      <action type="open_display">
-        <file>PSS1_PSS_Diagnostics.bob</file>
-        <target>window</target>
-        <description>Open Diagnostics</description>
-      </action>
-    </actions>
-    <pv_name>FEB-090:PSS-PLC-1:DiagError</pv_name>
-    <x>440</x>
-    <y>80</y>
-    <width>150</width>
-    <height>37</height>
-    <rules>
-      <rule name="Diagnostics Alarm Background" prop_id="background_color" out_exp="false">
-        <exp bool_exp="pvInt0">
-          <value>
-            <color name="ERROR" red="252" green="13" blue="27">
-            </color>
-          </value>
-        </exp>
-        <pv_name>$(pv_name)</pv_name>
-      </rule>
-      <rule name="Diagnostics Alarm Foreground" prop_id="foreground_color" out_exp="false">
-        <exp bool_exp="pvInt0">
-          <value>
-            <color name="WHITE" red="255" green="255" blue="255">
-            </color>
-          </value>
-        </exp>
-        <pv_name>$(pv_name)</pv_name>
-      </rule>
-      <rule name="Diagnostics Alarm Font" prop_id="font" out_exp="false">
-        <exp bool_exp="pvInt0">
-          <value>
-            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-            </font>
-          </value>
-        </exp>
-        <pv_name>$(pv_name)</pv_name>
-      </rule>
-    </rules>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>Operation Mode</name>
-    <file>embedded_displays/operation_mode.bob</file>
-    <x>35</x>
-    <y>213</y>
-    <width>960</width>
-    <height>56</height>
-    <resize>2</resize>
   </widget>
   <widget type="group" version="2.0.0">
-    <name>Zone 2 Searched Group</name>
-    <x>103</x>
-    <y>625</y>
-    <width>457</width>
-    <height>155</height>
+    <name>HMI Usage</name>
+    <x>657</x>
+    <y>73</y>
+    <width>296</width>
+    <height>55</height>
     <style>3</style>
-    <transparent>true</transparent>
     <rules>
-      <rule name="Visibility" prop_id="visible" out_exp="true">
-        <exp bool_exp="True">
-          <expression>pvInt0</expression>
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pvInt0 == 0">
+          <value>false</value>
         </exp>
-        <pv_name>AccPSS-Z2:PSS-Area-1:ZoneSearched</pv_name>
+        <pv_name>AccPSS:PSS-Area-1:HMI_User</pv_name>
       </rule>
     </rules>
     <widget type="rectangle" version="2.0.0">
-      <name>Zone2 110</name>
-      <x>97</x>
-      <width>45</width>
-      <height>36</height>
-      <line_width>0</line_width>
-      <background_color>
-        <color red="0" green="204" blue="255">
-        </color>
-      </background_color>
-    </widget>
-    <widget type="rectangle" version="2.0.0">
-      <name>Zone2 100</name>
-      <x>362</x>
-      <width>45</width>
-      <height>36</height>
-      <line_width>0</line_width>
-      <background_color>
-        <color red="0" green="204" blue="255">
+      <name>Background</name>
+      <width>296</width>
+      <height>55</height>
+      <line_color>
+        <color name="YELLOW-BORDER" red="150" green="144" blue="10">
         </color>
-      </background_color>
-    </widget>
-    <widget type="rectangle" version="2.0.0">
-      <name>Zone 2 searched background</name>
-      <y>35</y>
-      <width>457</width>
-      <height>120</height>
-      <line_width>0</line_width>
+      </line_color>
       <background_color>
-        <color red="0" green="204" blue="255">
+        <color name="YELLOW-BACKGROUND" red="226" green="216" blue="193">
         </color>
       </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
     </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>Zone 1 Searched Group</name>
-    <x>561</x>
-    <y>571</y>
-    <width>438</width>
-    <height>210</height>
-    <style>3</style>
-    <rules>
-      <rule name="Visibility" prop_id="visible" out_exp="true">
-        <exp bool_exp="True">
-          <expression>pvInt0</expression>
-        </exp>
-        <pv_name>AccPSS-Z1:PSS-Area-1:ZoneSearched</pv_name>
-      </rule>
-    </rules>
-    <widget type="rectangle" version="2.0.0">
-      <name>Zone 1 FEB</name>
-      <x>240</x>
-      <width>198</width>
-      <height>90</height>
-      <line_width>0</line_width>
-      <background_color>
-        <color red="0" green="204" blue="255">
-        </color>
-      </background_color>
+    <widget type="label" version="2.0.0">
+      <name>Title</name>
+      <text>HMI In Use by:</text>
+      <x>28</x>
+      <y>8</y>
+      <width>146</width>
+      <height>40</height>
+      <font>
+        <font name="LARGE-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="21.0">
+        </font>
+      </font>
+      <vertical_alignment>1</vertical_alignment>
     </widget>
-    <widget type="rectangle" version="2.0.0">
-      <name>Zone 1 searched background</name>
-      <y>90</y>
-      <width>438</width>
-      <height>120</height>
-      <line_width>0</line_width>
-      <background_color>
-        <color red="0" green="204" blue="255">
-        </color>
-      </background_color>
+    <widget type="text-symbol" version="2.0.0">
+      <name>HMI_User</name>
+      <pv_name>AccPSS:PSS-Area-1:HMI_User</pv_name>
+      <symbols>
+        <symbol>No User</symbol>
+        <symbol>Operator</symbol>
+        <symbol>Admin</symbol>
+        <symbol>RF Team</symbol>
+      </symbols>
+      <x>167</x>
+      <y>8</y>
+      <width>125</width>
+      <height>40</height>
+      <font>
+        <font name="LARGE-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="21.0">
+        </font>
+      </font>
+      <horizontal_alignment>0</horizontal_alignment>
     </widget>
   </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>AB_Legend</name>
+    <text>Legend</text>
+    <x>1794</x>
+    <y>84</y>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
+      </font>
+    </font>
+    <tooltip>$(actions)</tooltip>
+  </widget>
   <widget type="rectangle" version="2.0.0">
-    <name>Zone DTL-MEBT-RFQ line</name>
-    <x>193</x>
-    <y>709</y>
-    <width>623</width>
+    <name>Rectangle</name>
+    <x>470</x>
+    <y>722</y>
+    <width>180</width>
+    <height>200</height>
     <line_width>0</line_width>
     <background_color>
-      <color name="Button_Background" red="236" green="236" blue="236">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
   </widget>
   <widget type="rectangle" version="2.0.0">
-    <name>Zone1 ISrc line</name>
-    <x>749</x>
-    <y>701</y>
-    <width>77</width>
-    <height>36</height>
+    <name>Rectangle_6</name>
+    <x>850</x>
+    <y>805</y>
+    <width>120</width>
+    <height>38</height>
     <line_width>0</line_width>
+    <line_color>
+      <color name="Background" red="220" green="225" blue="221">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="Grid" red="169" green="169" blue="169">
+      </color>
+    </background_color>
+    <corner_width>2</corner_width>
+    <corner_height>2</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label DTL-40</name>
+    <text>DTL-40</text>
+    <x>850</x>
+    <y>805</y>
+    <width>120</width>
+    <height>38</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="21.0">
+      </font>
+    </font>
     <background_color>
-      <color name="Button_Background" red="236" green="236" blue="236">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
   </widget>
   <widget type="rectangle" version="2.0.0">
-    <name>Zone1 ISrc small square</name>
-    <x>795</x>
-    <y>690</y>
-    <width>14</width>
-    <height>12</height>
+    <name>Rectangle_7</name>
+    <x>973</x>
+    <y>805</y>
+    <width>120</width>
+    <height>38</height>
     <line_width>0</line_width>
+    <line_color>
+      <color name="Background" red="220" green="225" blue="221">
+      </color>
+    </line_color>
     <background_color>
-      <color name="Button_Background" red="236" green="236" blue="236">
+      <color name="Grid" red="169" green="169" blue="169">
       </color>
     </background_color>
+    <corner_width>2</corner_width>
+    <corner_height>2</corner_height>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Zone_2</name>
-    <text>ZONE 2</text>
-    <x>290</x>
-    <y>680</y>
+    <name>Label DTL-30</name>
+    <text>DTL-30</text>
+    <x>973</x>
+    <y>805</y>
+    <width>120</width>
+    <height>38</height>
     <font>
-      <font family="Liberation Sans" style="BOLD" size="18.0">
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="21.0">
       </font>
     </font>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_13</name>
+    <x>1096</x>
+    <y>805</y>
+    <width>120</width>
+    <height>38</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="Background" red="220" green="225" blue="221">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="Grid" red="169" green="169" blue="169">
+      </color>
+    </background_color>
+    <corner_width>2</corner_width>
+    <corner_height>2</corner_height>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Zone_1</name>
-    <text>ZONE 1</text>
-    <x>823</x>
-    <y>707</y>
+    <name>Label DTL-20</name>
+    <text>DTL-20</text>
+    <x>1096</x>
+    <y>805</y>
+    <width>120</width>
+    <height>38</height>
     <font>
-      <font family="Liberation Sans" style="BOLD" size="18.0">
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="21.0">
       </font>
     </font>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
   </widget>
-  <widget type="group" version="2.0.0">
-    <name>MAS</name>
-    <x>900</x>
-    <y>467</y>
-    <width>100</width>
-    <height>132</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="label" version="2.0.0">
-      <name>MAS</name>
-      <text>MAS</text>
-      <y>28</y>
-      <height>75</height>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="rectangle" version="2.0.0">
-      <name>Rectangle_24</name>
-      <y>28</y>
-      <height>75</height>
-      <visible>false</visible>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="Text" red="25" green="25" blue="25">
-        </color>
-      </line_color>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="polyline" version="2.0.0">
-      <name>Polyline_1</name>
-      <y>24</y>
-      <height>79</height>
-      <points>
-        <point x="0.0" y="0.0">
-        </point>
-        <point x="0.0" y="79.0">
-        </point>
-      </points>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="Text" red="25" green="25" blue="25">
-        </color>
-      </line_color>
-    </widget>
-    <widget type="symbol" version="2.0.0">
-      <name>Door1Stat - Right</name>
-      <pv_name>FEB-090:PSS-MAS-1:Door1Stat</pv_name>
-      <symbols>
-        <symbol>symbols/door v2/Door_thin/Up-left-GREEN.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Up-left-RED.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Up-left-GREEN.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Up-left-BLACK.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Up-left-RED.png</symbol>
-      </symbols>
-      <width>50</width>
-      <height>28</height>
-      <preserve_ratio>false</preserve_ratio>
-    </widget>
-    <widget type="symbol" version="2.0.0">
-      <name>Door1Stat - Left</name>
-      <pv_name>FEB-090:PSS-MAS-1:Door1Stat</pv_name>
-      <symbols>
-        <symbol>symbols/door v2/Door_thin/Up-right-RED.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Up-right-GREEN.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Up-right-GREEN.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Up-right-BLACK.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Up-right-RED.png</symbol>
-      </symbols>
-      <x>50</x>
-      <width>50</width>
-      <height>28</height>
-      <preserve_ratio>false</preserve_ratio>
-    </widget>
-    <widget type="symbol" version="2.0.0">
-      <name>Door2Stat - Left</name>
-      <pv_name>FEB-090:PSS-MAS-1:Door2Stat</pv_name>
-      <symbols>
-        <symbol>symbols/door v2/Door_thin/Down-left-RED.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Down-left-GREEN.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Down-left-GREEN.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Down-left-BLACK.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Down-left-RED.png</symbol>
-      </symbols>
-      <y>104</y>
-      <width>50</width>
-      <height>28</height>
-      <preserve_ratio>false</preserve_ratio>
-    </widget>
-    <widget type="symbol" version="2.0.0">
-      <name>Door2Stat - Right</name>
-      <pv_name>FEB-090:PSS-MAS-1:Door2Stat</pv_name>
-      <symbols>
-        <symbol>symbols/door v2/Door_thin/Down-right-GREEN.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Down-right-RED.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Down-right-GREEN.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Down-right-BLACK.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Down-right-RED.png</symbol>
-      </symbols>
-      <x>50</x>
-      <y>104</y>
-      <width>50</width>
-      <height>28</height>
-      <preserve_ratio>false</preserve_ratio>
-    </widget>
-    <widget type="symbol" version="2.0.0">
-      <name>Door1Stat - Locked</name>
-      <pv_name>FEB-090:PSS-MAS-1:Door1Stat</pv_name>
-      <symbols>
-        <symbol>symbols/Key/lock.svg</symbol>
-      </symbols>
-      <x>40</x>
-      <y>28</y>
-      <width>20</width>
-      <height>20</height>
-      <rules>
-        <rule name="Visibility" prop_id="visible" out_exp="false">
-          <exp bool_exp="pvInt0 != 3">
-            <value>false</value>
-          </exp>
-          <pv_name>$(pv_name)</pv_name>
-        </rule>
-      </rules>
-    </widget>
-    <widget type="symbol" version="2.0.0">
-      <name>Door2Stat - Locked</name>
-      <pv_name>FEB-090:PSS-MAS-1:Door2Stat</pv_name>
-      <symbols>
-        <symbol>symbols/Key/lock.svg</symbol>
-      </symbols>
-      <x>40</x>
-      <y>80</y>
-      <width>20</width>
-      <height>20</height>
-      <rules>
-        <rule name="Visibility" prop_id="visible" out_exp="false">
-          <exp bool_exp="pvInt0 != 3">
-            <value>false</value>
-          </exp>
-          <pv_name>$(pv_name)</pv_name>
-        </rule>
-      </rules>
-    </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_14</name>
+    <x>1219</x>
+    <y>805</y>
+    <width>120</width>
+    <height>38</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="Background" red="220" green="225" blue="221">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="Grid" red="169" green="169" blue="169">
+      </color>
+    </background_color>
+    <corner_width>2</corner_width>
+    <corner_height>2</corner_height>
   </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>ESOS1_Z2</name>
-    <macros>
-      <ESOS>AccPSS-Z2:PSS-ESOS-$(ESOS_IDX)</ESOS>
-      <ESOS_IDX>1</ESOS_IDX>
-    </macros>
-    <file>embedded_displays/esos.bob</file>
-    <x>153</x>
-    <y>752</y>
-    <width>84</width>
-    <height>28</height>
-    <resize>2</resize>
-    <transparent>true</transparent>
+  <widget type="label" version="2.0.0">
+    <name>Label DTL-10</name>
+    <text>DTL-10</text>
+    <x>1219</x>
+    <y>805</y>
+    <width>120</width>
+    <height>38</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="21.0">
+      </font>
+    </font>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
   </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>ESOS3_Z2</name>
-    <macros>
-      <ESOS>AccPSS-Z2:PSS-ESOS-$(ESOS_IDX)</ESOS>
-      <ESOS_IDX>3</ESOS_IDX>
-    </macros>
-    <file>embedded_displays/esos.bob</file>
-    <x>400</x>
-    <y>752</y>
-    <width>84</width>
-    <height>28</height>
-    <resize>2</resize>
-    <transparent>true</transparent>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_15</name>
+    <x>1355</x>
+    <y>805</y>
+    <width>120</width>
+    <height>38</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="Background" red="220" green="225" blue="221">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="Grid" red="169" green="169" blue="169">
+      </color>
+    </background_color>
+    <corner_width>2</corner_width>
+    <corner_height>2</corner_height>
   </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>ESOS1_Z1</name>
-    <macros>
-      <ESOS>AccPSS-Z1:PSS-ESOS-$(ESOS_IDX)</ESOS>
-      <ESOS_IDX>1</ESOS_IDX>
-    </macros>
-    <file>embedded_displays/esos.bob</file>
-    <x>570</x>
-    <y>752</y>
-    <width>84</width>
-    <height>28</height>
-    <resize>2</resize>
-    <transparent>true</transparent>
+  <widget type="label" version="2.0.0">
+    <name>Label MEBT</name>
+    <text>MEBT</text>
+    <x>1355</x>
+    <y>805</y>
+    <width>120</width>
+    <height>38</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="21.0">
+      </font>
+    </font>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_18</name>
+    <x>1488</x>
+    <y>805</y>
+    <width>120</width>
+    <height>38</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="Background" red="220" green="225" blue="221">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="Grid" red="169" green="169" blue="169">
+      </color>
+    </background_color>
+    <corner_width>2</corner_width>
+    <corner_height>2</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label RFQ</name>
+    <text>RFQ</text>
+    <x>1488</x>
+    <y>805</y>
+    <width>120</width>
+    <height>38</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="21.0">
+      </font>
+    </font>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_25</name>
+    <x>1622</x>
+    <y>786</y>
+    <width>177</width>
+    <height>75</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="Background" red="220" green="225" blue="221">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="Grid" red="169" green="169" blue="169">
+      </color>
+    </background_color>
+    <corner_width>2</corner_width>
+    <corner_height>2</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label Isrc</name>
+    <text>Isrc</text>
+    <x>1622</x>
+    <y>786</y>
+    <width>177</width>
+    <height>42</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="21.0">
+      </font>
+    </font>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED</name>
+    <pv_name>FEB-010Row:CnPw-U-007:Grly_ConnectedToGround</pv_name>
+    <x>1633</x>
+    <y>826</y>
+    <off_color>
+      <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="OK" red="61" green="216" blue="61">
+      </color>
+    </on_color>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label HV Grounding</name>
+    <text>Grounding Relay</text>
+    <x>1662</x>
+    <y>822</y>
+    <width>137</width>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
+      </font>
+    </font>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>ESOS3_Z2</name>
+    <macros>
+      <ESOS>AccPSS-Z2:PSS-ESOS-$(ESOS_IDX)</ESOS>
+      <ESOS_IDX>3</ESOS_IDX>
+    </macros>
+    <file>embedded_displays/esos.bob</file>
+    <x>1136</x>
+    <y>875</y>
+    <width>130</width>
+    <height>45</height>
+    <resize>2</resize>
+    <transparent>true</transparent>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>ESOS1_Z1</name>
+    <macros>
+      <ESOS>AccPSS-Z1:PSS-ESOS-$(ESOS_IDX)</ESOS>
+      <ESOS_IDX>1</ESOS_IDX>
+    </macros>
+    <file>embedded_displays/esos.bob</file>
+    <x>1379</x>
+    <y>895</y>
+    <width>130</width>
+    <height>45</height>
+    <resize>2</resize>
+    <transparent>true</transparent>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>ESOS2_Z1</name>
@@ -943,10 +1162,10 @@
       <ESOS_IDX>2</ESOS_IDX>
     </macros>
     <file>embedded_displays/esos.bob</file>
-    <x>915</x>
-    <y>730</y>
-    <width>84</width>
-    <height>28</height>
+    <x>1761</x>
+    <y>895</y>
+    <width>130</width>
+    <height>45</height>
     <resize>2</resize>
     <transparent>true</transparent>
   </widget>
@@ -957,10 +1176,10 @@
       <ESOS_IDX>3</ESOS_IDX>
     </macros>
     <file>embedded_displays/esos.bob</file>
-    <x>655</x>
-    <y>661</y>
-    <width>84</width>
-    <height>28</height>
+    <x>1484</x>
+    <y>722</y>
+    <width>130</width>
+    <height>45</height>
     <resize>2</resize>
     <transparent>true</transparent>
   </widget>
@@ -971,124 +1190,13 @@
       <ESOS_IDX>4</ESOS_IDX>
     </macros>
     <file>embedded_displays/esos.bob</file>
-    <x>915</x>
-    <y>610</y>
-    <width>84</width>
-    <height>28</height>
+    <x>1761</x>
+    <y>620</y>
+    <width>130</width>
+    <height>45</height>
     <resize>2</resize>
     <transparent>true</transparent>
   </widget>
-  <widget type="group" version="2.0.0">
-    <name>PAS</name>
-    <x>850</x>
-    <y>487</y>
-    <width>50</width>
-    <height>112</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="label" version="2.0.0">
-      <name>PAS</name>
-      <text>PAS</text>
-      <y>28</y>
-      <width>50</width>
-      <height>56</height>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="rectangle" version="2.0.0">
-      <name>Rectangle_23</name>
-      <y>28</y>
-      <width>50</width>
-      <height>57</height>
-      <visible>false</visible>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="Text" red="25" green="25" blue="25">
-        </color>
-      </line_color>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="polyline" version="2.0.0">
-      <name>Polyline_2</name>
-      <y>28</y>
-      <width>50</width>
-      <height>57</height>
-      <points>
-        <point x="0.0" y="0.0">
-        </point>
-        <point x="0.0" y="57.0">
-        </point>
-      </points>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="Text" red="25" green="25" blue="25">
-        </color>
-      </line_color>
-    </widget>
-    <widget type="symbol" version="2.0.0">
-      <name>PAS Door1Stat</name>
-      <pv_name>FEB-090:PSS-PAS-1:Door1Stat</pv_name>
-      <symbols>
-        <symbol>symbols/door v2/Door_thin/Up-right-RED.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Up-right-GREEN.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Up-right-BLACK.png</symbol>
-      </symbols>
-      <width>50</width>
-      <height>28</height>
-      <preserve_ratio>false</preserve_ratio>
-    </widget>
-    <widget type="symbol" version="2.0.0">
-      <name>PAS Door2Stat</name>
-      <pv_name>FEB-090:PSS-PAS-1:Door2Stat</pv_name>
-      <symbols>
-        <symbol>symbols/door v2/Door_thin/Down-right-RED.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Down-right-GREEN.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Down-right-BLACK.png</symbol>
-      </symbols>
-      <y>84</y>
-      <width>50</width>
-      <height>28</height>
-      <preserve_ratio>false</preserve_ratio>
-    </widget>
-    <widget type="symbol" version="2.0.0">
-      <name>PAS Door1Stat - Locked</name>
-      <pv_name>FEB-090:PSS-PAS-1:Door1Stat</pv_name>
-      <symbols>
-        <symbol>symbols/Key/lock.svg</symbol>
-      </symbols>
-      <x>15</x>
-      <y>28</y>
-      <width>20</width>
-      <height>20</height>
-      <rules>
-        <rule name="Visibility" prop_id="visible" out_exp="false">
-          <exp bool_exp="pvInt0 != 2">
-            <value>false</value>
-          </exp>
-          <pv_name>$(pv_name)</pv_name>
-        </rule>
-      </rules>
-    </widget>
-    <widget type="symbol" version="2.0.0">
-      <name>PAS Door2Stat - Locked</name>
-      <pv_name>FEB-090:PSS-PAS-1:Door2Stat</pv_name>
-      <symbols>
-        <symbol>symbols/Key/lock.svg</symbol>
-      </symbols>
-      <x>15</x>
-      <y>61</y>
-      <width>20</width>
-      <height>20</height>
-      <rules>
-        <rule name="Visibility" prop_id="visible" out_exp="false">
-          <exp bool_exp="pvInt0 != 2">
-            <value>false</value>
-          </exp>
-          <pv_name>$(pv_name)</pv_name>
-        </rule>
-      </rules>
-    </widget>
-  </widget>
   <widget type="embedded" version="2.0.0">
     <name>ESOS2_Z2</name>
     <macros>
@@ -1096,495 +1204,428 @@
       <ESOS_IDX>2</ESOS_IDX>
     </macros>
     <file>embedded_displays/esos.bob</file>
-    <x>280</x>
-    <y>752</y>
-    <width>84</width>
-    <height>28</height>
+    <x>995</x>
+    <y>875</y>
+    <width>130</width>
+    <height>45</height>
     <resize>2</resize>
     <transparent>true</transparent>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>FEB 90</name>
-    <text>FEB level  90</text>
-    <x>754</x>
-    <y>480</y>
-    <width>126</width>
-    <font>
-      <font family="Liberation Sans" style="BOLD" size="18.0">
-      </font>
-    </font>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Emergency_Label</name>
-    <text>Emergency 
-Exit Door 1</text>
-    <x>686</x>
-    <y>610</y>
-    <width>83</width>
-    <height>34</height>
+    <name>TSW Fence Door</name>
+    <text>TSW Fence Door</text>
+    <x>514</x>
+    <y>870</y>
+    <width>146</width>
+    <height>38</height>
     <font>
-      <font family="Liberation Sans" style="BOLD" size="14.0">
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
       </font>
     </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>FEB Camera </name>
-    <actions>
-      <action type="command">
-        <command>vlc rtsp://LCRstream:password!@172.16.64.139:554/Streaming/Channels/102</command>
-        <description>Open Video feed</description>
-      </action>
-      <action type="open_webpage">
-        <url>https://pss-pas1-camera1.tn.esss.lu.se</url>
-        <description>Open Webpage</description>
-      </action>
-    </actions>
-    <text>PSS Camera - FEB</text>
-    <x>30</x>
-    <y>330</y>
-    <width>210</width>
-    <height>35</height>
-    <tooltip>$(actions)</tooltip>
+    <horizontal_alignment>1</horizontal_alignment>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>ISrc</name>
-    <text>Isrc</text>
-    <x>768</x>
-    <y>710</y>
-    <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="BOLD" size="18.0">
+    <name>Label_1</name>
+    <class>SUBTITLE</class>
+    <text>Overview</text>
+    <x>1514</x>
+    <y use_class="true">20</y>
+    <width>380</width>
+    <height use_class="true">30</height>
+    <font use_class="true">
+      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
       </font>
     </font>
-    <foreground_color>
-      <color name="BLACK" red="0" green="0" blue="0">
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
       </color>
     </foreground_color>
+    <horizontal_alignment use_class="true">2</horizontal_alignment>
+    <vertical_alignment use_class="true">2</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
   </widget>
-  <widget type="polyline" version="2.0.0">
-    <name>Polyline_9</name>
-    <x>750</x>
-    <y>708</y>
-    <width>1</width>
-    <points>
-      <point x="0.0" y="20.0">
-      </point>
-      <point x="0.0" y="0.0">
-      </point>
-    </points>
-    <line_color>
-      <color name="Header_Background" red="77" green="77" blue="77">
-      </color>
-    </line_color>
+  <widget type="symbol" version="2.0.0">
+    <name>Door1Stat - Right</name>
+    <pv_name>FEB-090:PSS-MAS-1:Door1Stat</pv_name>
+    <symbols>
+      <symbol>symbols/door v2/svg/double-left-close-green.svg</symbol>
+      <symbol>symbols/door v2/svg/double-left-open-red.svg</symbol>
+      <symbol>symbols/door v2/svg/double-left-close-green.svg</symbol>
+      <symbol>symbols/door v2/svg/double-left-close-black.svg</symbol>
+      <symbol>symbols/door v2/svg/double-left-open-red.svg</symbol>
+    </symbols>
+    <x>1763</x>
+    <y>215</y>
+    <width>73</width>
+    <height>78</height>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <preserve_ratio>false</preserve_ratio>
   </widget>
-  <widget type="polyline" version="2.0.0">
-    <name>Polyline_10</name>
-    <x>645</x>
-    <y>708</y>
-    <width>1</width>
-    <points>
-      <point x="0.0" y="20.0">
-      </point>
-      <point x="0.0" y="0.0">
-      </point>
-    </points>
-    <line_color>
-      <color name="Header_Background" red="77" green="77" blue="77">
-      </color>
-    </line_color>
+  <widget type="symbol" version="2.0.0">
+    <name>Door1Stat - Left</name>
+    <pv_name>FEB-090:PSS-MAS-1:Door1Stat</pv_name>
+    <symbols>
+      <symbol>symbols/door v2/svg/double-right-open-red.svg</symbol>
+      <symbol>symbols/door v2/svg/double-right-close-green.svg</symbol>
+      <symbol>symbols/door v2/svg/double-right-close-green.svg</symbol>
+      <symbol>symbols/door v2/svg/double-right-close-black.svg</symbol>
+      <symbol>symbols/door v2/svg/double-right-open-red.svg</symbol>
+    </symbols>
+    <x>1822</x>
+    <y>215</y>
+    <width>73</width>
+    <height>78</height>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <preserve_ratio>false</preserve_ratio>
   </widget>
-  <widget type="polyline" version="2.0.0">
-    <name>Polyline_11</name>
-    <x>468</x>
-    <y>708</y>
-    <width>1</width>
-    <points>
-      <point x="0.0" y="20.0">
-      </point>
-      <point x="0.0" y="0.0">
-      </point>
-    </points>
-    <line_color>
-      <color name="Header_Background" red="77" green="77" blue="77">
-      </color>
-    </line_color>
+  <widget type="symbol" version="2.0.0">
+    <name>PAS Door1Stat</name>
+    <pv_name>FEB-090:PSS-PAS-1:Door1Stat</pv_name>
+    <symbols>
+      <symbol>symbols/door v2/svg/singel-right-open-red.svg</symbol>
+      <symbol>symbols/door v2/svg/single-right-close-green.svg</symbol>
+      <symbol>symbols/door v2/svg/single-right-close-black.svg</symbol>
+    </symbols>
+    <x>1694</x>
+    <y>299</y>
+    <width>73</width>
+    <height>78</height>
+    <initial_index>2</initial_index>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <preserve_ratio>false</preserve_ratio>
   </widget>
-  <widget type="polyline" version="2.0.0">
-    <name>Polyline_12</name>
-    <x>376</x>
-    <y>708</y>
-    <width>1</width>
-    <points>
-      <point x="0.0" y="20.0">
-      </point>
-      <point x="0.0" y="0.0">
-      </point>
-    </points>
-    <line_color>
-      <color name="Header_Background" red="77" green="77" blue="77">
-      </color>
-    </line_color>
+  <widget type="symbol" version="2.0.0">
+    <name>MiniMAS1Stat</name>
+    <pv_name>FEB-090:PSS-PAS-1:MiniMAS1Stat</pv_name>
+    <symbols>
+      <symbol>symbols/door v2/svg/singel-left-open-red.svg</symbol>
+      <symbol>symbols/door v2/svg/single-left-close-green.svg</symbol>
+      <symbol>symbols/door v2/svg/single-left-close-black.svg</symbol>
+    </symbols>
+    <x>1624</x>
+    <y>299</y>
+    <width>73</width>
+    <height>78</height>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <preserve_ratio>false</preserve_ratio>
   </widget>
-  <widget type="polyline" version="2.0.0">
-    <name>Polyline_13</name>
-    <x>284</x>
-    <y>708</y>
-    <width>1</width>
-    <points>
-      <point x="0.0" y="20.0">
-      </point>
-      <point x="0.0" y="0.0">
-      </point>
-    </points>
-    <line_color>
-      <color name="Header_Background" red="77" green="77" blue="77">
-      </color>
-    </line_color>
+  <widget type="symbol" version="2.0.0">
+    <name>Door2Stat - Right</name>
+    <pv_name>FEB-090:PSS-MAS-1:Door2Stat</pv_name>
+    <symbols>
+      <symbol>symbols/door v2/svg/double-left-close-green.svg</symbol>
+      <symbol>symbols/door v2/svg/double-left-open-red.svg</symbol>
+      <symbol>symbols/door v2/svg/double-left-close-green.svg</symbol>
+      <symbol>symbols/door v2/svg/double-left-close-black.svg</symbol>
+      <symbol>symbols/door v2/svg/double-left-open-red.svg</symbol>
+    </symbols>
+    <x>1823</x>
+    <y>470</y>
+    <width>73</width>
+    <height>78</height>
+    <initial_index>1</initial_index>
+    <rotation>180.0</rotation>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <preserve_ratio>false</preserve_ratio>
   </widget>
-  <widget type="polyline" version="2.0.0">
-    <name>Polyline_14</name>
-    <x>192</x>
-    <y>708</y>
-    <width>1</width>
-    <points>
-      <point x="0.0" y="20.0">
-      </point>
-      <point x="0.0" y="0.0">
-      </point>
-    </points>
-    <line_color>
-      <color name="Header_Background" red="77" green="77" blue="77">
-      </color>
-    </line_color>
+  <widget type="symbol" version="2.0.0">
+    <name>Door2Stat - Left</name>
+    <pv_name>FEB-090:PSS-MAS-1:Door2Stat</pv_name>
+    <symbols>
+      <symbol>symbols/door v2/svg/double-right-open-red.svg</symbol>
+      <symbol>symbols/door v2/svg/double-right-close-green.svg</symbol>
+      <symbol>symbols/door v2/svg/double-right-close-green.svg</symbol>
+      <symbol>symbols/door v2/svg/double-right-close-black.svg</symbol>
+      <symbol>symbols/door v2/svg/double-right-open-red.svg</symbol>
+    </symbols>
+    <x>1764</x>
+    <y>470</y>
+    <width>73</width>
+    <height>78</height>
+    <initial_index>2</initial_index>
+    <rotation>180.0</rotation>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <preserve_ratio>false</preserve_ratio>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>RFQ</name>
-    <text>RFQ</text>
-    <x>685</x>
-    <y>710</y>
-    <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="BOLD" size="14.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color name="BLACK" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
+  <widget type="symbol" version="2.0.0">
+    <name>MiniMAS2Stat</name>
+    <pv_name>FEB-090:PSS-PAS-1:MiniMAS2Stat</pv_name>
+    <symbols>
+      <symbol>symbols/door v2/svg/singel-right-open-red.svg</symbol>
+      <symbol>symbols/door v2/svg/single-right-close-green.svg</symbol>
+      <symbol>symbols/door v2/svg/single-right-close-black.svg</symbol>
+    </symbols>
+    <x>1624</x>
+    <y>470</y>
+    <width>73</width>
+    <height>78</height>
+    <rotation>180.0</rotation>
+    <preserve_ratio>false</preserve_ratio>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>MEBT</name>
-    <text>MEBT</text>
-    <x>580</x>
-    <y>712</y>
-    <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="BOLD" size="13.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color name="BLACK" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
+  <widget type="symbol" version="2.0.0">
+    <name>PAS Door2Stat</name>
+    <pv_name>FEB-090:PSS-PAS-1:Door2Stat</pv_name>
+    <symbols>
+      <symbol>symbols/door v2/svg/singel-left-open-red.svg</symbol>
+      <symbol>symbols/door v2/Door_thin/Down-right-GREEN.png</symbol>
+      <symbol>symbols/door v2/Door_thin/Down-right-BLACK.png</symbol>
+    </symbols>
+    <x>1694</x>
+    <y>470</y>
+    <width>73</width>
+    <height>78</height>
+    <rotation>180.0</rotation>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <preserve_ratio>false</preserve_ratio>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>DTL10</name>
-    <text>DTL-10</text>
-    <x>492</x>
-    <y>712</y>
-    <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="BOLD" size="13.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color name="BLACK" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
+  <widget type="symbol" version="2.0.0">
+    <name>AccPSS-Z1:PSS-EscD-1:DoorStat_1</name>
+    <pv_name>AccPSS-Z1:PSS-EscD-1:DoorStat</pv_name>
+    <symbols>
+      <symbol>symbols/door v2/svg/singel-left-open-red.svg</symbol>
+      <symbol>symbols/door v2/svg/single-left-close-green.svg</symbol>
+      <symbol>symbols/door v2/svg/single-left-close-black.svg</symbol>
+      <symbol>symbols/door v2/svg/single-left-close-green.svg</symbol>
+    </symbols>
+    <x>1557</x>
+    <y>539</y>
+    <width>73</width>
+    <height>79</height>
+    <rotation>-90.0</rotation>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <preserve_ratio>false</preserve_ratio>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>DTL20</name>
-    <text>DTL-20</text>
-    <x>397</x>
-    <y>712</y>
-    <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="BOLD" size="13.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color name="BLACK" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>DTL30</name>
-    <text>DTL-30</text>
-    <x>302</x>
-    <y>712</y>
-    <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="BOLD" size="13.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color name="BLACK" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>DTL40</name>
-    <text>DTL-40</text>
-    <x>207</x>
-    <y>712</y>
-    <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="BOLD" size="13.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color name="BLACK" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>30</x>
-    <y>651</y>
-    <width>173</width>
-    <height>10</height>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_1</name>
-    <x>242</x>
-    <y>651</y>
-    <width>226</width>
-    <height>10</height>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_2</name>
-    <x>508</x>
-    <y>651</y>
-    <width>360</width>
-    <height>10</height>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </background_color>
+  <widget type="symbol" version="2.0.0">
+    <name>AccPSS-Z1:PSS-EscD-2:DoorStat</name>
+    <pv_name>AccPSS-Z1:PSS-EscD-2:DoorStat</pv_name>
+    <symbols>
+      <symbol>symbols/door v2/svg/singel-left-open-red.svg</symbol>
+      <symbol>symbols/door v2/svg/single-left-close-green.svg</symbol>
+    </symbols>
+    <x>1278</x>
+    <y>849</y>
+    <width>73</width>
+    <height>79</height>
+    <rotation>-90.0</rotation>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <preserve_ratio>false</preserve_ratio>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_3</name>
-    <x>30</x>
-    <y>780</y>
-    <width>979</width>
-    <height>8</height>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </background_color>
+  <widget type="symbol" version="2.0.0">
+    <name>AccPSS-Z2:PSS-EscD-1:DoorStat</name>
+    <pv_name>AccPSS-Z2:PSS-EscD-1:DoorStat</pv_name>
+    <symbols>
+      <symbol>symbols/door v2/svg/singel-left-open-red.svg</symbol>
+      <symbol>symbols/door v2/svg/singel-left-open-red.svg</symbol>
+      <symbol>symbols/door v2/svg/single-left-close-green.svg</symbol>
+      <symbol>symbols/door v2/svg/single-left-close-black.svg</symbol>
+      <symbol>symbols/door v2/svg/single-left-close-green.svg</symbol>
+    </symbols>
+    <x>661</x>
+    <y>848</y>
+    <width>73</width>
+    <height>79</height>
+    <rotation>-90.0</rotation>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <preserve_ratio>false</preserve_ratio>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_8</name>
-    <x>553</x>
-    <y>434</y>
-    <width>10</width>
-    <height>224</height>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </background_color>
+  <widget type="symbol" version="2.0.0">
+    <name>MiniMAS1Stat - Locked</name>
+    <pv_name>FEB-090:PSS-PAS-1:MiniMAS1Stat</pv_name>
+    <symbols>
+      <symbol>symbols/Key/lock_v02.svg</symbol>
+    </symbols>
+    <x>1641</x>
+    <y>340</y>
+    <width>38</width>
+    <height>38</height>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pvInt0 != 2">
+          <value>false</value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_9</name>
-    <x>920</x>
-    <y>651</y>
-    <width>88</width>
-    <height>10</height>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </background_color>
+  <widget type="symbol" version="2.0.0">
+    <name>MiniMAS2Stat - Locked</name>
+    <pv_name>FEB-090:PSS-PAS-1:MiniMAS2Stat</pv_name>
+    <symbols>
+      <symbol>symbols/Key/lock_v02.svg</symbol>
+    </symbols>
+    <x>1641</x>
+    <y>459</y>
+    <width>38</width>
+    <height>38</height>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pvInt0 != 2">
+          <value>false</value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_10</name>
-    <x>1000</x>
-    <y>434</y>
-    <width>9</width>
-    <height>346</height>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </background_color>
+  <widget type="symbol" version="2.0.0">
+    <name>PAS Door1Stat - Locked</name>
+    <pv_name>FEB-090:PSS-PAS-1:Door1Stat</pv_name>
+    <symbols>
+      <symbol>symbols/Key/lock_v02.svg</symbol>
+    </symbols>
+    <x>1710</x>
+    <y>340</y>
+    <width>38</width>
+    <height>38</height>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pvInt0 != 2">
+          <value>false</value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_16</name>
-    <x>508</x>
-    <y>625</y>
-    <width>10</width>
-    <height>30</height>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </background_color>
+  <widget type="symbol" version="2.0.0">
+    <name>PAS Door2Stat - Locked</name>
+    <pv_name>FEB-090:PSS-PAS-1:Door2Stat</pv_name>
+    <symbols>
+      <symbol>symbols/Key/lock_v02.svg</symbol>
+    </symbols>
+    <x>1711</x>
+    <y>459</y>
+    <width>38</width>
+    <height>38</height>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pvInt0 != 2">
+          <value>false</value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_17</name>
-    <x>458</x>
-    <y>625</y>
-    <width>10</width>
-    <height>30</height>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </background_color>
+  <widget type="symbol" version="2.0.0">
+    <name>Door1Stat - Locked_1</name>
+    <pv_name>FEB-090:PSS-MAS-1:Door1Stat</pv_name>
+    <symbols>
+      <symbol>symbols/Key/lock_v02.svg</symbol>
+    </symbols>
+    <x>1811</x>
+    <y>257</y>
+    <width>38</width>
+    <height>38</height>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pvInt0 != 3">
+          <value>false</value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_19</name>
-    <x>242</x>
-    <y>625</y>
-    <width>10</width>
-    <height>30</height>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </background_color>
+  <widget type="symbol" version="2.0.0">
+    <name>Door2Stat - Locked</name>
+    <pv_name>FEB-090:PSS-MAS-1:Door2Stat</pv_name>
+    <symbols>
+      <symbol>symbols/Key/lock_v02.svg</symbol>
+    </symbols>
+    <x>1812</x>
+    <y>459</y>
+    <width>38</width>
+    <height>38</height>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pvInt0 != 3">
+          <value>false</value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_20</name>
-    <x>193</x>
-    <y>625</y>
-    <width>10</width>
-    <height>30</height>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </background_color>
+  <widget type="symbol" version="2.0.0">
+    <name>AccPSS-Z2:PSS-EscD-1:DoorStat - Locked</name>
+    <pv_name>AccPSS-Z2:PSS-EscD-1:DoorStat</pv_name>
+    <symbols>
+      <symbol>symbols/Key/lock_v02.svg</symbol>
+    </symbols>
+    <x>705</x>
+    <y>869</y>
+    <width>38</width>
+    <height>38</height>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pvInt0 != 3">
+          <value>false</value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_21</name>
-    <x>130</x>
-    <y>655</y>
-    <width>15</width>
-    <height>74</height>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </background_color>
+  <widget type="label" version="2.0.0">
+    <name>Zone 2</name>
+    <text>Zone 2</text>
+    <x>783</x>
+    <y>722</y>
+    <width>101</width>
+    <height>48</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="23.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
   </widget>
-  <widget type="polyline" version="2.0.0">
-    <name>Polyline</name>
-    <x>800</x>
-    <y>570</y>
-    <width>203</width>
-    <height>1</height>
-    <points>
-      <point x="203.0" y="0.0">
-      </point>
-      <point x="0.0" y="0.0">
-      </point>
-    </points>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
+  <widget type="label" version="2.0.0">
+    <name>Zone 1</name>
+    <text>Zone 1</text>
+    <x>1348</x>
+    <y>721</y>
+    <width>101</width>
+    <height>48</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="23.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>PAS Camera</name>
-    <actions>
-      <action type="command">
-        <command>vlc rtsp://LCRstream:password!@172.16.64.140:554/Streaming/Channels/102</command>
-        <description>Open Video feed</description>
-      </action>
-      <action type="open_webpage">
-        <url>https://pss-pas1-camera2.tn.esss.lu.se</url>
-        <description>Open Webpage</description>
-      </action>
-    </actions>
-    <text>PSS Camera - PAS</text>
-    <x>30</x>
-    <y>375</y>
-    <width>210</width>
-    <height>35</height>
-    <tooltip>$(actions)</tooltip>
+  <widget type="label" version="2.0.0">
+    <name>FEB level  90</name>
+    <text>FEB level  90</text>
+    <x>1348</x>
+    <y>159</y>
+    <width>155</width>
+    <height>48</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="23.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Controlled Area Camera</name>
-    <actions>
-      <action type="command">
-        <command>vlc rtsp://LCRstream:password!@172.16.64.141:554/Streaming/Channels/102</command>
-        <description>Open Video feed</description>
-      </action>
-      <action type="open_webpage">
-        <url>https://pss-pas1-camera3.tn.esss.lu.se</url>
-        <description>Open Webpage</description>
-      </action>
-    </actions>
-    <text>Camera - Controlled Area</text>
-    <x>30</x>
-    <y>420</y>
-    <width>210</width>
-    <height>35</height>
-    <tooltip>$(actions)</tooltip>
+  <widget type="label" version="2.0.0">
+    <name>Label_MAS</name>
+    <text>MAS</text>
+    <x>1787</x>
+    <y>348</y>
+    <width>85</width>
+    <height>32</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="23.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>MAS Details</name>
+    <name>MAS Details_1</name>
     <actions>
       <action type="open_display">
         <file></file>
@@ -1592,13 +1633,35 @@ Exit Door 1</text>
         <description>Open MAS Details</description>
       </action>
     </actions>
-    <text>MAS Details</text>
-    <x>255</x>
-    <y>330</y>
-    <width>180</width>
-    <height>35</height>
+    <text>Details</text>
+    <x>1799</x>
+    <y>380</y>
+    <width>62</width>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
+      </font>
+    </font>
     <tooltip>$(actions)</tooltip>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_PAS</name>
+    <text>PAS</text>
+    <x>1698</x>
+    <y>385</y>
+    <width>62</width>
+    <height>32</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="23.0">
+      </font>
+    </font>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <transparent>false</transparent>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
   <widget type="action_button" version="3.0.0">
     <name>PAS Details</name>
     <actions>
@@ -1608,257 +1671,104 @@ Exit Door 1</text>
         <description>Open PAS Details</description>
       </action>
     </actions>
-    <text>PAS Details</text>
-    <x>255</x>
-    <y>375</y>
-    <width>180</width>
-    <height>35</height>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="polyline" version="2.0.0">
-    <name>Polyline_7</name>
-    <x>560</x>
-    <y>660</y>
-    <width>1</width>
-    <height>120</height>
-    <points>
-      <point x="0.0" y="120.0">
-      </point>
-      <point x="0.0" y="0.0">
-      </point>
-    </points>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-  </widget>
-  <widget type="polyline" version="2.0.0">
-    <name>Polyline_8</name>
-    <x>102</x>
-    <y>660</y>
-    <width>1</width>
-    <height>120</height>
-    <points>
-      <point x="0.0" y="120.0">
-      </point>
-      <point x="0.0" y="0.0">
-      </point>
-    </points>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-  </widget>
-  <widget type="polyline" version="2.0.0">
-    <name>Polyline_17</name>
-    <x>800</x>
-    <y>570</y>
-    <width>1</width>
-    <height>85</height>
-    <points>
-      <point x="0.0" y="85.0">
-      </point>
-      <point x="0.0" y="0.0">
-      </point>
-    </points>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_4</name>
-    <x>30</x>
-    <y>480</y>
-    <width>525</width>
-    <height>5</height>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_11</name>
-    <x>30</x>
-    <y>485</y>
-    <width>8</width>
-    <height>170</height>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_12</name>
-    <x>553</x>
-    <y>424</y>
-    <width>456</width>
-    <height>10</height>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>DTL-4 waveguide</name>
-    <x>115</x>
-    <y>495</y>
-    <width>20</width>
-    <height>85</height>
-    <line_width>2</line_width>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-    <transparent>true</transparent>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>DTL-3 waveguide</name>
-    <x>200</x>
-    <y>495</y>
-    <width>20</width>
-    <height>85</height>
-    <line_width>2</line_width>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-    <transparent>true</transparent>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>DTL-2 waveguide</name>
-    <x>285</x>
-    <y>495</y>
-    <width>20</width>
-    <height>85</height>
-    <line_width>2</line_width>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-    <transparent>true</transparent>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>DTL-1 waveguide</name>
-    <x>370</x>
-    <y>495</y>
-    <width>20</width>
-    <height>85</height>
-    <line_width>2</line_width>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-    <transparent>true</transparent>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>RFQ waveguide</name>
-    <x>458</x>
-    <y>495</y>
-    <width>20</width>
-    <height>85</height>
-    <line_width>2</line_width>
-    <line_color>
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </line_color>
-    <transparent>true</transparent>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>WaveG40</name>
-    <text>DTL-40</text>
-    <x>50</x>
-    <y>495</y>
-    <width>60</width>
-    <height>17</height>
+    <text>Details</text>
+    <x>1699</x>
+    <y>417</y>
+    <width>62</width>
     <font>
-      <font family="Liberation Sans" style="BOLD" size="14.0">
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
       </font>
     </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>WaveG30</name>
-    <text>DTL-30</text>
-    <x>135</x>
-    <y>495</y>
-    <width>60</width>
-    <height>17</height>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Emergency_Label</name>
+    <text>Emergency 
+Exit Door 1</text>
+    <x>1480</x>
+    <y>546</y>
+    <width>82</width>
+    <height>53</height>
     <font>
-      <font family="Liberation Sans" style="BOLD" size="14.0">
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
       </font>
     </font>
-    <horizontal_alignment>2</horizontal_alignment>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>WaveG20</name>
-    <text>DTL-20</text>
-    <x>220</x>
-    <y>495</y>
-    <width>60</width>
-    <height>17</height>
+    <name>Klystron Gallery</name>
+    <text>Klystron Gallery</text>
+    <x>639</x>
+    <y>329</y>
+    <width>202</width>
+    <height>48</height>
     <font>
-      <font family="Liberation Sans" style="BOLD" size="14.0">
+      <font family="Source Sans Pro" style="BOLD" size="23.0">
       </font>
     </font>
-    <horizontal_alignment>2</horizontal_alignment>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>WaveG10</name>
-    <text>DTL-10</text>
-    <x>305</x>
-    <y>495</y>
-    <width>60</width>
-    <height>17</height>
+    <name>RF Distribution System</name>
+    <text>RF Distribution System</text>
+    <x>751</x>
+    <y>377</y>
+    <width>482</width>
+    <height>50</height>
     <font>
-      <font family="Liberation Sans" style="BOLD" size="14.0">
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="21.0">
       </font>
     </font>
-    <horizontal_alignment>2</horizontal_alignment>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>RFQ</name>
-    <text>RFQ</text>
-    <x>390</x>
-    <y>495</y>
+    <name>WaveG40</name>
+    <text>DTL-40</text>
+    <x>751</x>
+    <y>429</y>
     <width>60</width>
-    <height>17</height>
+    <height>30</height>
+    <visible>false</visible>
     <font>
-      <font family="Liberation Sans" style="BOLD" size="14.0">
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="19.0">
       </font>
     </font>
-    <horizontal_alignment>2</horizontal_alignment>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>DTL-4 waveguide</name>
+    <x>771</x>
+    <y>467</y>
+    <width>20</width>
+    <height>85</height>
+    <visible>false</visible>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="Text" red="25" green="25" blue="25">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="Grid" red="169" green="169" blue="169">
+      </color>
+    </background_color>
   </widget>
   <widget type="led" version="2.0.0">
     <name>DTL-4 removable waveguide</name>
     <pv_name>KG-NCG:PSS-Area-1:DTL4_RWG_Removed</pv_name>
-    <x>115</x>
-    <y>523</y>
-    <height>30</height>
+    <x>771</x>
+    <y>485</y>
+    <height>50</height>
+    <visible>false</visible>
     <off_color>
-      <color name="OK" red="61" green="216" blue="61">
+      <color name="GREEN-BORDER" red="40" green="140" blue="40">
       </color>
     </off_color>
     <on_color>
-      <color name="OK" red="61" green="216" blue="61">
+      <color name="GREEN-BORDER" red="40" green="140" blue="40">
       </color>
     </on_color>
-    <line_color>
-      <color name="BLACK" red="0" green="0" blue="0">
-      </color>
-    </line_color>
     <square>true</square>
     <rules>
       <rule name="XPos" prop_id="x" out_exp="false">
@@ -1874,64 +1784,95 @@ Exit Door 1</text>
         <pv_name>KG-NCG:PSS-Area-1:DTL4_SCP_Installed</pv_name>
       </rule>
     </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="led" version="2.0.0">
-    <name>DTL-3 removable waveguide</name>
-    <pv_name>KG-NCG:PSS-Area-1:DTL3_RWG_Removed</pv_name>
-    <x>200</x>
-    <y>523</y>
-    <height>30</height>
+    <name>DTL-4 SCP</name>
+    <pv_name>KG-NCG:PSS-Area-1:DTL4_SCP_Installed</pv_name>
+    <x>755</x>
+    <y>500</y>
+    <width>50</width>
+    <visible>false</visible>
     <off_color>
-      <color name="OK" red="61" green="216" blue="61">
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
       </color>
     </off_color>
     <on_color>
-      <color name="OK" red="61" green="216" blue="61">
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
       </color>
     </on_color>
-    <line_color>
-      <color name="BLACK" red="0" green="0" blue="0">
+    <foreground_color>
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
       </color>
-    </line_color>
+    </foreground_color>
     <square>true</square>
     <rules>
-      <rule name="XPos" prop_id="x" out_exp="false">
-        <exp bool_exp="pvInt0">
-          <value>220</value>
-        </exp>
-        <pv_name>$(pv_name)</pv_name>
-      </rule>
       <rule name="Visibility" prop_id="visible" out_exp="true">
+        <exp bool_exp="not pvInt0">
+          <expression>False</expression>
+        </exp>
+        <exp bool_exp="pvInt1">
+          <expression>True</expression>
+        </exp>
         <exp bool_exp="True">
-          <expression>not pvInt0</expression>
+          <expression>pvInt2</expression>
         </exp>
-        <pv_name>KG-NCG:PSS-Area-1:DTL3_SCP_Installed</pv_name>
+        <pv_name>$(pv_name)</pv_name>
+        <pv_name>KG-NCG:PSS-Area-1:DTL4_waveguide_Isolated</pv_name>
+        <pv_name>sim://flipflop(1)</pv_name>
       </rule>
     </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
-  <widget type="led" version="2.0.0">
-    <name>DTL-2 removable waveguide</name>
-    <pv_name>KG-NCG:PSS-Area-1:DTL2_RWG_Removed</pv_name>
-    <x>285</x>
-    <y>523</y>
+  <widget type="label" version="2.0.0">
+    <name>WaveG30</name>
+    <text>DTL-30</text>
+    <x>856</x>
+    <y>428</y>
+    <width>60</width>
     <height>30</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="19.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>DTL-3 waveguide</name>
+    <x>876</x>
+    <y>467</y>
+    <width>20</width>
+    <height>85</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="Text" red="25" green="25" blue="25">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="Grid" red="169" green="169" blue="169">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>DTL-3 removable waveguide</name>
+    <pv_name>KG-NCG:PSS-Area-1:DTL3_RWG_Removed</pv_name>
+    <x>876</x>
+    <y>485</y>
+    <height>50</height>
     <off_color>
-      <color name="OK" red="61" green="216" blue="61">
+      <color name="GREEN-BORDER" red="40" green="140" blue="40">
       </color>
     </off_color>
     <on_color>
-      <color name="OK" red="61" green="216" blue="61">
+      <color name="GREEN-BORDER" red="40" green="140" blue="40">
       </color>
     </on_color>
-    <line_color>
-      <color name="BLACK" red="0" green="0" blue="0">
-      </color>
-    </line_color>
     <square>true</square>
     <rules>
       <rule name="XPos" prop_id="x" out_exp="false">
         <exp bool_exp="pvInt0">
-          <value>305</value>
+          <value>220</value>
         </exp>
         <pv_name>$(pv_name)</pv_name>
       </rule>
@@ -1939,67 +1880,97 @@ Exit Door 1</text>
         <exp bool_exp="True">
           <expression>not pvInt0</expression>
         </exp>
-        <pv_name>KG-NCG:PSS-Area-1:DTL2_SCP_Installed</pv_name>
+        <pv_name>KG-NCG:PSS-Area-1:DTL3_SCP_Installed</pv_name>
       </rule>
     </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="led" version="2.0.0">
-    <name>DTL-1 removable waveguide</name>
-    <pv_name>KG-NCG:PSS-Area-1:DTL1_RWG_Removed</pv_name>
-    <x>370</x>
-    <y>523</y>
-    <height>30</height>
+    <name>DTL-3 SCP</name>
+    <pv_name>KG-NCG:PSS-Area-1:DTL3_SCP_Installed</pv_name>
+    <x>861</x>
+    <y>500</y>
+    <width>50</width>
     <off_color>
-      <color name="OK" red="61" green="216" blue="61">
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
       </color>
     </off_color>
     <on_color>
-      <color name="OK" red="61" green="216" blue="61">
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
       </color>
     </on_color>
-    <line_color>
-      <color name="BLACK" red="0" green="0" blue="0">
+    <foreground_color>
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
       </color>
-    </line_color>
+    </foreground_color>
     <square>true</square>
     <rules>
-      <rule name="XPos" prop_id="x" out_exp="false">
-        <exp bool_exp="pvInt0">
-          <value>390</value>
-        </exp>
-        <pv_name>$(pv_name)</pv_name>
-      </rule>
       <rule name="Visibility" prop_id="visible" out_exp="true">
+        <exp bool_exp="not pvInt0">
+          <expression>False</expression>
+        </exp>
+        <exp bool_exp="pvInt1">
+          <expression>True</expression>
+        </exp>
         <exp bool_exp="True">
-          <expression>not pvInt0</expression>
+          <expression>pvInt2</expression>
         </exp>
-        <pv_name>KG-NCG:PSS-Area-1:DTL1_SCP_Installed</pv_name>
+        <pv_name>$(pv_name)</pv_name>
+        <pv_name>KG-NCG:PSS-Area-1:DTL3_waveguide_Isolated</pv_name>
+        <pv_name>sim://flipflop(1)</pv_name>
       </rule>
     </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
-  <widget type="led" version="2.0.0">
-    <name>RFQ removable waveguide</name>
-    <pv_name>KG-NCG:PSS-Area-1:RFQ_RWG_Removed</pv_name>
-    <x>458</x>
-    <y>523</y>
+  <widget type="label" version="2.0.0">
+    <name>WaveG20</name>
+    <text>DTL-20</text>
+    <x>961</x>
+    <y>428</y>
+    <width>60</width>
     <height>30</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="19.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>DTL-2 waveguide</name>
+    <x>981</x>
+    <y>467</y>
+    <width>20</width>
+    <height>85</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="Text" red="25" green="25" blue="25">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="Grid" red="169" green="169" blue="169">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>DTL-2 removable waveguide</name>
+    <pv_name>KG-NCG:PSS-Area-1:DTL2_RWG_Removed</pv_name>
+    <x>981</x>
+    <y>485</y>
+    <height>50</height>
     <off_color>
-      <color name="OK" red="61" green="216" blue="61">
+      <color name="GREEN-BORDER" red="40" green="140" blue="40">
       </color>
     </off_color>
     <on_color>
-      <color name="OK" red="61" green="216" blue="61">
+      <color name="GREEN-BORDER" red="40" green="140" blue="40">
       </color>
     </on_color>
-    <line_color>
-      <color name="BLACK" red="0" green="0" blue="0">
-      </color>
-    </line_color>
     <square>true</square>
     <rules>
       <rule name="XPos" prop_id="x" out_exp="false">
         <exp bool_exp="pvInt0">
-          <value>478</value>
+          <value>305</value>
         </exp>
         <pv_name>$(pv_name)</pv_name>
       </rule>
@@ -2007,20 +1978,29 @@ Exit Door 1</text>
         <exp bool_exp="True">
           <expression>not pvInt0</expression>
         </exp>
-        <pv_name>KG-NCG:PSS-Area-1:RFQ_SCP_Installed</pv_name>
+        <pv_name>KG-NCG:PSS-Area-1:DTL2_SCP_Installed</pv_name>
       </rule>
     </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="led" version="2.0.0">
-    <name>DTL-4 SCP</name>
-    <pv_name>KG-NCG:PSS-Area-1:DTL4_SCP_Installed</pv_name>
-    <x>105</x>
-    <y>528</y>
-    <width>40</width>
+    <name>DTL-2 SCP</name>
+    <pv_name>KG-NCG:PSS-Area-1:DTL2_SCP_Installed</pv_name>
+    <x>966</x>
+    <y>500</y>
+    <width>50</width>
+    <off_color>
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
+      </color>
+    </off_color>
     <on_color>
-      <color name="Off" red="90" green="110" blue="90">
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
       </color>
     </on_color>
+    <foreground_color>
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
+      </color>
+    </foreground_color>
     <square>true</square>
     <rules>
       <rule name="Visibility" prop_id="visible" out_exp="true">
@@ -2034,49 +2014,91 @@ Exit Door 1</text>
           <expression>pvInt2</expression>
         </exp>
         <pv_name>$(pv_name)</pv_name>
-        <pv_name>KG-NCG:PSS-Area-1:DTL4_waveguide_Isolated</pv_name>
+        <pv_name>KG-NCG:PSS-Area-1:DTL2_waveguide_Isolated</pv_name>
         <pv_name>sim://flipflop(1)</pv_name>
       </rule>
     </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>WaveG10</name>
+    <text>DTL-10</text>
+    <x>1066</x>
+    <y>428</y>
+    <width>60</width>
+    <height>30</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="19.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>DTL-1 waveguide</name>
+    <x>1086</x>
+    <y>467</y>
+    <width>20</width>
+    <height>85</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="Text" red="25" green="25" blue="25">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="Grid" red="169" green="169" blue="169">
+      </color>
+    </background_color>
   </widget>
   <widget type="led" version="2.0.0">
-    <name>DTL-3 SCP</name>
-    <pv_name>KG-NCG:PSS-Area-1:DTL3_SCP_Installed</pv_name>
-    <x>190</x>
-    <y>528</y>
-    <width>40</width>
+    <name>DTL-1 removable waveguide</name>
+    <pv_name>KG-NCG:PSS-Area-1:DTL1_RWG_Removed</pv_name>
+    <x>1086</x>
+    <y>485</y>
+    <height>50</height>
+    <off_color>
+      <color name="GREEN-BORDER" red="40" green="140" blue="40">
+      </color>
+    </off_color>
     <on_color>
-      <color name="Off" red="90" green="110" blue="90">
+      <color name="GREEN-BORDER" red="40" green="140" blue="40">
       </color>
     </on_color>
     <square>true</square>
     <rules>
-      <rule name="Visibility" prop_id="visible" out_exp="true">
-        <exp bool_exp="not pvInt0">
-          <expression>False</expression>
-        </exp>
-        <exp bool_exp="pvInt1">
-          <expression>True</expression>
+      <rule name="XPos" prop_id="x" out_exp="false">
+        <exp bool_exp="pvInt0">
+          <value>390</value>
         </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+      <rule name="Visibility" prop_id="visible" out_exp="true">
         <exp bool_exp="True">
-          <expression>pvInt2</expression>
+          <expression>not pvInt0</expression>
         </exp>
-        <pv_name>$(pv_name)</pv_name>
-        <pv_name>KG-NCG:PSS-Area-1:DTL3_waveguide_Isolated</pv_name>
-        <pv_name>sim://flipflop(1)</pv_name>
+        <pv_name>KG-NCG:PSS-Area-1:DTL1_SCP_Installed</pv_name>
       </rule>
     </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="led" version="2.0.0">
-    <name>DTL-2 SCP</name>
-    <pv_name>KG-NCG:PSS-Area-1:DTL2_SCP_Installed</pv_name>
-    <x>275</x>
-    <y>528</y>
-    <width>40</width>
+    <name>DTL-1 SCP</name>
+    <pv_name>KG-NCG:PSS-Area-1:DTL1_SCP_Installed</pv_name>
+    <x>1071</x>
+    <y>500</y>
+    <width>50</width>
+    <off_color>
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
+      </color>
+    </off_color>
     <on_color>
-      <color name="Off" red="90" green="110" blue="90">
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
       </color>
     </on_color>
+    <foreground_color>
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
+      </color>
+    </foreground_color>
     <square>true</square>
     <rules>
       <rule name="Visibility" prop_id="visible" out_exp="true">
@@ -2090,49 +2112,91 @@ Exit Door 1</text>
           <expression>pvInt2</expression>
         </exp>
         <pv_name>$(pv_name)</pv_name>
-        <pv_name>KG-NCG:PSS-Area-1:DTL2_waveguide_Isolated</pv_name>
+        <pv_name>KG-NCG:PSS-Area-1:DTL1_waveguide_Isolated</pv_name>
         <pv_name>sim://flipflop(1)</pv_name>
       </rule>
     </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>WaveGRFQ</name>
+    <text>RFQ</text>
+    <x>1173</x>
+    <y>428</y>
+    <width>60</width>
+    <height>30</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="19.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>RFQ waveguide</name>
+    <x>1194</x>
+    <y>467</y>
+    <width>20</width>
+    <height>85</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="Text" red="25" green="25" blue="25">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="Grid" red="169" green="169" blue="169">
+      </color>
+    </background_color>
   </widget>
   <widget type="led" version="2.0.0">
-    <name>DTL-1 SCP</name>
-    <pv_name>KG-NCG:PSS-Area-1:DTL1_SCP_Installed</pv_name>
-    <x>360</x>
-    <y>528</y>
-    <width>40</width>
+    <name>RFQ removable waveguide</name>
+    <pv_name>KG-NCG:PSS-Area-1:RFQ_RWG_Removed</pv_name>
+    <x>1194</x>
+    <y>485</y>
+    <height>50</height>
+    <off_color>
+      <color name="GREEN-BORDER" red="40" green="140" blue="40">
+      </color>
+    </off_color>
     <on_color>
-      <color name="Off" red="90" green="110" blue="90">
+      <color name="GREEN-BORDER" red="40" green="140" blue="40">
       </color>
     </on_color>
     <square>true</square>
     <rules>
-      <rule name="Visibility" prop_id="visible" out_exp="true">
-        <exp bool_exp="not pvInt0">
-          <expression>False</expression>
-        </exp>
-        <exp bool_exp="pvInt1">
-          <expression>True</expression>
+      <rule name="XPos" prop_id="x" out_exp="false">
+        <exp bool_exp="pvInt0">
+          <value>478</value>
         </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+      <rule name="Visibility" prop_id="visible" out_exp="true">
         <exp bool_exp="True">
-          <expression>pvInt2</expression>
+          <expression>not pvInt0</expression>
         </exp>
-        <pv_name>$(pv_name)</pv_name>
-        <pv_name>KG-NCG:PSS-Area-1:DTL1_waveguide_Isolated</pv_name>
-        <pv_name>sim://flipflop(1)</pv_name>
+        <pv_name>KG-NCG:PSS-Area-1:RFQ_SCP_Installed</pv_name>
       </rule>
     </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="led" version="2.0.0">
     <name>RFQ SCP</name>
     <pv_name>KG-NCG:PSS-Area-1:RFQ_SCP_Installed</pv_name>
-    <x>448</x>
-    <y>528</y>
-    <width>40</width>
+    <x>1179</x>
+    <y>500</y>
+    <width>50</width>
+    <off_color>
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
+      </color>
+    </off_color>
     <on_color>
-      <color name="Off" red="90" green="110" blue="90">
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
       </color>
     </on_color>
+    <foreground_color>
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
+      </color>
+    </foreground_color>
     <square>true</square>
     <rules>
       <rule name="Visibility" prop_id="visible" out_exp="true">
@@ -2150,401 +2214,86 @@ Exit Door 1</text>
         <pv_name>sim://flipflop(1)</pv_name>
       </rule>
     </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>AMM_204</name>
-    <text>TSW
-Fence
-Door</text>
-    <x>28</x>
-    <y>728</y>
-    <width>45</width>
-    <height>60</height>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>AMM_205</name>
-    <text>110</text>
-    <x>210</x>
-    <y>635</y>
-    <width>30</width>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>AMM_206</name>
-    <text>100</text>
-    <x>475</x>
-    <y>635</y>
-    <width>30</width>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>AMM_207</name>
-    <text>Zone
-Door</text>
-    <x>490</x>
-    <y>737</y>
-    <width>36</width>
-    <height>46</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="12.0">
-      </font>
-    </font>
-  </widget>
-  <widget type="symbol" version="2.0.0">
-    <name>AccPSS-Z1:PSS-EscD-1:DoorStat</name>
-    <pv_name>AccPSS-Z1:PSS-EscD-1:DoorStat</pv_name>
-    <symbols>
-      <symbol>symbols/door v2/Door_thin/Left-right-RED.png</symbol>
-      <symbol>symbols/door v2/Door_thin/Left-right-GREEN.png</symbol>
-      <symbol>symbols/door v2/Door_thin/Left-right-BLACK.png</symbol>
-      <symbol>symbols/door v2/Door_thin/Left-right-GREEN.png</symbol>
-    </symbols>
-    <x>748</x>
-    <y>598</y>
-    <width>54</width>
-    <height>54</height>
-    <preserve_ratio>false</preserve_ratio>
-  </widget>
-  <widget type="symbol" version="2.0.0">
-    <name>AccPSS-Z1:PSS-EscD-1:DoorStat - Locked</name>
-    <pv_name>AccPSS-Z1:PSS-EscD-1:DoorStat</pv_name>
-    <symbols>
-      <symbol>symbols/Key/lock.svg</symbol>
-    </symbols>
-    <x>770</x>
-    <y>615</y>
-    <width>20</width>
-    <height>20</height>
-    <rules>
-      <rule name="Visibility" prop_id="visible" out_exp="false">
-        <exp bool_exp="pvInt0 != 2">
-          <value>false</value>
-        </exp>
-        <pv_name>$(pv_name)</pv_name>
-      </rule>
-    </rules>
-  </widget>
-  <widget type="symbol" version="2.0.0">
-    <name>AccPSS-Z1:PSS-EscD-2:DoorStat</name>
-    <pv_name>AccPSS-Z1:PSS-EscD-2:DoorStat</pv_name>
-    <symbols>
-      <symbol>symbols/door v2/Door_thin/Left-right-RED.png</symbol>
-      <symbol>symbols/door v2/Door_thin/Left-right-GREEN.png</symbol>
-    </symbols>
-    <x>511</x>
-    <y>732</y>
-    <width>50</width>
-    <height>50</height>
-    <preserve_ratio>false</preserve_ratio>
-  </widget>
-  <widget type="symbol" version="2.0.0">
-    <name>AccPSS-Z2:PSS-EscD-1:DoorStat</name>
-    <pv_name>AccPSS-Z2:PSS-EscD-1:DoorStat</pv_name>
-    <symbols>
-      <symbol>symbols/door v2/Door_thin/Left-right-RED.png</symbol>
-      <symbol>symbols/door v2/Door_thin/Left-right-RED.png</symbol>
-      <symbol>symbols/door v2/Door_thin/Left-right-GREEN.png</symbol>
-      <symbol>symbols/door v2/Door_thin/Left-right-BLACK.png</symbol>
-      <symbol>symbols/door v2/Door_thin/Left-right-GREEN.png</symbol>
-    </symbols>
-    <x>56</x>
-    <y>732</y>
-    <width>50</width>
-    <height>50</height>
-    <preserve_ratio>false</preserve_ratio>
-  </widget>
-  <widget type="symbol" version="2.0.0">
-    <name>AccPSS-Z2:PSS-EscD-1:DoorStat - Locked</name>
-    <pv_name>AccPSS-Z2:PSS-EscD-1:DoorStat</pv_name>
-    <symbols>
-      <symbol>symbols/Key/lock.svg</symbol>
-    </symbols>
-    <x>77</x>
-    <y>747</y>
-    <width>20</width>
-    <height>20</height>
-    <rules>
-      <rule name="Visibility" prop_id="visible" out_exp="false">
-        <exp bool_exp="pvInt0 != 3">
-          <value>false</value>
-        </exp>
-        <pv_name>$(pv_name)</pv_name>
-      </rule>
-    </rules>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>Keys</name>
-    <x>588</x>
-    <y>456</y>
-    <width>132</width>
-    <height>60</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="action_button" version="3.0.0">
-      <name>Keys background</name>
-      <actions>
-      </actions>
-      <text></text>
-      <width>132</width>
-      <height>60</height>
-      <tooltip>$(actions)</tooltip>
-    </widget>
-    <widget type="symbol" version="2.0.0">
-      <name>Key</name>
-      <symbols>
-        <symbol>symbols/Key/Key-black@256.png</symbol>
-      </symbols>
-      <x>35</x>
-      <y>3</y>
-      <width>62</width>
-      <height>55</height>
-      <preserve_ratio>false</preserve_ratio>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>Keys</name>
-      <actions>
-        <action type="open_display">
-          <file>popups/key_exchange.bob</file>
-          <target>window</target>
-          <description>Open Display</description>
-        </action>
-      </actions>
-      <text></text>
-      <width>132</width>
-      <height>60</height>
-      <transparent>true</transparent>
-      <tooltip>$(actions)</tooltip>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>AMM $(RM)</name>
-    <macros>
-      <P>REMS-FEBRS:RMT-AMM-001</P>
-      <RM>G0101</RM>
-    </macros>
-    <x>905</x>
-    <y>435</y>
-    <width>80</width>
-    <height>30</height>
-    <style>3</style>
-    <widget type="label" version="2.0.0">
-      <name>LB_RM</name>
-      <text>$(RM)</text>
-      <width>50</width>
-      <height>30</height>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>RM</name>
-      <file>embedded_displays/rad.bob</file>
-      <x>50</x>
-      <width>30</width>
-      <height>30</height>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>AMM $(RM)</name>
-    <macros>
-      <P>REMS-S100RS:RMT-AMM-001</P>
-      <RM>G0201</RM>
-    </macros>
-    <x>440</x>
-    <y>590</y>
-    <width>80</width>
-    <height>30</height>
-    <style>3</style>
-    <widget type="label" version="2.0.0">
-      <name>LB_RM</name>
-      <text>$(RM)</text>
-      <width>50</width>
-      <height>30</height>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>RM</name>
-      <file>embedded_displays/rad.bob</file>
-      <x>50</x>
-      <width>30</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>AMM $(RM)</name>
+  <widget type="embedded" version="2.0.0">
+    <name>AMM G0202</name>
     <macros>
       <P>REMS-S110RS:RMT-AMM-001</P>
       <RM>G0202</RM>
     </macros>
-    <x>175</x>
-    <y>590</y>
-    <width>80</width>
-    <height>30</height>
-    <style>3</style>
-    <widget type="label" version="2.0.0">
-      <name>LB_RM</name>
-      <text>$(RM)</text>
-      <width>50</width>
-      <height>30</height>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>RM</name>
-      <file>embedded_displays/rad.bob</file>
-      <x>50</x>
-      <width>30</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>AMM $(RM)</name>
-    <macros>
-      <P>REMS-SPKRS:RMT-AMM-001</P>
-      <RM>G0199</RM>
-    </macros>
-    <x>20</x>
-    <y>680</y>
-    <width>80</width>
-    <height>30</height>
-    <style>3</style>
-    <widget type="label" version="2.0.0">
-      <name>LB_RM</name>
-      <text>$(RM)</text>
-      <width>50</width>
-      <height>30</height>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>RM</name>
-      <file>embedded_displays/rad.bob</file>
-      <x>50</x>
-      <width>30</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
+    <file>embedded_displays/rad.bob</file>
+    <x>755</x>
+    <y>591</y>
+    <width>210</width>
+    <height>50</height>
+    <transparent>true</transparent>
   </widget>
-  <widget type="group" version="2.0.0">
-    <name>AMM $(RM)</name>
+  <widget type="embedded" version="2.0.0">
+    <name>AMM G0201</name>
     <macros>
-      <P>REMS-FEBRS:RMT-AMM-002</P>
-      <RM>G0102</RM>
+      <P>REMS-S100RS:RMT-AMM-001</P>
+      <RM>G0201</RM>
     </macros>
-    <x>600</x>
-    <y>570</y>
-    <width>80</width>
-    <height>30</height>
-    <style>3</style>
-    <widget type="label" version="2.0.0">
-      <name>LB_RM</name>
-      <text>$(RM)</text>
-      <width>50</width>
-      <height>30</height>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>RM</name>
-      <file>embedded_displays/rad.bob</file>
-      <x>50</x>
-      <width>30</width>
-      <height>30</height>
-      <transparent>true</transparent>
-    </widget>
-  </widget>
-  <widget type="symbol" version="2.0.0">
-    <name>MiniMAS1Stat - Locked</name>
-    <pv_name>FEB-090:PSS-PAS-1:MiniMAS1Stat</pv_name>
-    <symbols>
-      <symbol>symbols/Key/lock.svg</symbol>
-    </symbols>
-    <x>828</x>
-    <y>525</y>
-    <width>20</width>
-    <height>20</height>
-    <rules>
-      <rule name="Visibility" prop_id="visible" out_exp="false">
-        <exp bool_exp="pvInt0 != 2">
-          <value>false</value>
-        </exp>
-        <pv_name>$(pv_name)</pv_name>
-      </rule>
-    </rules>
+    <file>embedded_displays/rad.bob</file>
+    <x>1097</x>
+    <y>591</y>
+    <width>210</width>
+    <height>50</height>
+    <transparent>true</transparent>
   </widget>
-  <widget type="group" version="2.0.0">
-    <name>MiniMAS</name>
-    <x>828</x>
-    <y>535</y>
-    <width>20</width>
+  <widget type="label" version="2.0.0">
+    <name>110</name>
+    <text>110</text>
+    <x>840</x>
+    <y>674</y>
+    <width>75</width>
     <height>48</height>
-    <style>3</style>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>100</name>
+    <text>100</text>
+    <x>1180</x>
+    <y>674</y>
+    <width>75</width>
+    <height>48</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>ESOS1_Z2</name>
+    <macros>
+      <ESOS>AccPSS-Z2:PSS-ESOS-$(ESOS_IDX)</ESOS>
+      <ESOS_IDX>1</ESOS_IDX>
+    </macros>
+    <file>embedded_displays/esos.bob</file>
+    <x>854</x>
+    <y>875</y>
+    <width>130</width>
+    <height>45</height>
+    <resize>2</resize>
     <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>Rectangle_22</name>
-      <y>14</y>
-      <width>20</width>
-      <visible>false</visible>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="Text" red="25" green="25" blue="25">
-        </color>
-      </line_color>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="polyline" version="2.0.0">
-      <name>Polyline_3</name>
-      <y>12</y>
-      <width>20</width>
-      <height>22</height>
-      <points>
-        <point x="0.0" y="0.0">
-        </point>
-        <point x="0.0" y="22.0">
-        </point>
-      </points>
-      <line_width>2</line_width>
-      <line_color>
-        <color name="Text" red="25" green="25" blue="25">
-        </color>
-      </line_color>
-    </widget>
-    <widget type="symbol" version="2.0.0">
-      <name>MiniMAS1Stat</name>
-      <pv_name>FEB-090:PSS-PAS-1:MiniMAS1Stat</pv_name>
-      <symbols>
-        <symbol>symbols/door v2/Door_thin/Up-left-RED.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Up-left-GREEN.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Up-left-BLACK.png</symbol>
-      </symbols>
-      <width>20</width>
-      <height>14</height>
-      <preserve_ratio>false</preserve_ratio>
-    </widget>
-    <widget type="symbol" version="2.0.0">
-      <name>MiniMAS2Stat</name>
-      <pv_name>FEB-090:PSS-PAS-1:MiniMAS2Stat</pv_name>
-      <symbols>
-        <symbol>symbols/door v2/Door_thin/Down-left-RED.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Down-left-GREEN.png</symbol>
-        <symbol>symbols/door v2/Door_thin/Down-left-BLACK.png</symbol>
-      </symbols>
-      <y>34</y>
-      <width>20</width>
-      <height>14</height>
-      <preserve_ratio>false</preserve_ratio>
-    </widget>
   </widget>
   <widget type="symbol" version="2.0.0">
-    <name>MiniMAS2Stat - Locked</name>
-    <pv_name>FEB-090:PSS-PAS-1:MiniMAS2Stat</pv_name>
+    <name>AccPSS-Z1:PSS-EscD-1:DoorStat - Locked</name>
+    <pv_name>AccPSS-Z1:PSS-EscD-1:DoorStat</pv_name>
     <symbols>
-      <symbol>symbols/Key/lock.svg</symbol>
+      <symbol>symbols/Key/lock_v02.svg</symbol>
     </symbols>
-    <x>828</x>
-    <y>573</y>
-    <width>20</width>
-    <height>20</height>
+    <x>1601</x>
+    <y>556</y>
+    <width>38</width>
+    <height>38</height>
     <rules>
       <rule name="Visibility" prop_id="visible" out_exp="false">
         <exp bool_exp="pvInt0 != 2">
@@ -2553,147 +2302,142 @@ Door</text>
         <pv_name>$(pv_name)</pv_name>
       </rule>
     </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
-  <widget type="group" version="2.0.0">
-    <name>Grly_ConnectedToGround</name>
-    <x>749</x>
-    <y>661</y>
-    <width>46</width>
-    <height>40</height>
-    <style>3</style>
-    <background_color>
-      <color name="OK" red="61" green="216" blue="61">
-      </color>
-    </background_color>
-    <transparent>true</transparent>
-    <rules>
-      <rule name="Transparency" prop_id="transparent" out_exp="true">
-        <exp bool_exp="True">
-          <expression>pvInt0</expression>
-        </exp>
-        <pv_name>FEB-010Row:CnPw-U-007:Grly_ConnectedToGround</pv_name>
-      </rule>
-    </rules>
-    <widget type="polyline" version="2.0.0">
-      <name>Upper Line</name>
-      <x>3</x>
-      <y>5</y>
-      <width>40</width>
-      <height>3</height>
-      <points>
-        <point x="0.0" y="0.0">
-        </point>
-        <point x="40.0" y="0.0">
-        </point>
-      </points>
-      <line_color>
-        <color name="BLACK" red="0" green="0" blue="0">
-        </color>
-      </line_color>
-    </widget>
-    <widget type="polyline" version="2.0.0">
-      <name>Vertical Line</name>
-      <x>22</x>
-      <y>3</y>
-      <width>3</width>
-      <height>17</height>
-      <points>
-        <point x="0.0" y="0.0">
-        </point>
-        <point x="0.0" y="17.0">
-        </point>
-      </points>
-      <line_color>
-        <color name="BLACK" red="0" green="0" blue="0">
-        </color>
-      </line_color>
-    </widget>
-    <widget type="polyline" version="2.0.0">
-      <name>Lower Line </name>
-      <x>5</x>
-      <y>11</y>
-      <width>36</width>
-      <height>9</height>
-      <points>
-        <point x="0.0" y="0.0">
-        </point>
-        <point x="0.0" y="9.0">
-        </point>
-        <point x="36.0" y="9.0">
-        </point>
-        <point x="36.0" y="0.0">
-        </point>
-      </points>
-      <line_color>
-        <color name="BLACK" red="0" green="0" blue="0">
-        </color>
-      </line_color>
-      <rules>
-        <rule name="Pos" prop_id="y" out_exp="false">
-          <exp bool_exp="not pvInt0">
-            <value>5</value>
-          </exp>
-          <pv_name>FEB-010Row:CnPw-U-007:Grly_ConnectedToGround</pv_name>
-        </rule>
-        <rule name="Height" prop_id="height" out_exp="false">
-          <exp bool_exp="not pvInt0">
-            <value>14</value>
-          </exp>
-          <pv_name>FEB-010Row:CnPw-U-007:Grly_ConnectedToGround</pv_name>
-        </rule>
-      </rules>
-    </widget>
-    <widget type="polygon" version="2.0.0">
-      <name>Polygon</name>
-      <x>5</x>
-      <y>20</y>
-      <width>36</width>
-      <points>
-        <point x="0.0" y="0.0">
-        </point>
-        <point x="9.0" y="20.0">
-        </point>
-        <point x="27.0" y="20.0">
-        </point>
-        <point x="36.0" y="0.0">
-        </point>
-      </points>
-      <line_width>1</line_width>
-      <line_color>
-        <color name="BLACK" red="0" green="0" blue="0">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="ActiveText" red="254" green="194" blue="81">
-        </color>
-      </background_color>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>Grounding relay</name>
-      <pv_name>FEB-010Row:CnPw-U-007:Grly_ConnectedToGround</pv_name>
-      <text></text>
-      <width>46</width>
-      <height>40</height>
-      <transparent>true</transparent>
-      <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-    </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>FEB Camera _1</name>
+    <actions>
+      <action type="command">
+        <command>vlc rtsp://LCRstream:password!@172.16.64.139:554/Streaming/Channels/102</command>
+        <description>Open Video feed</description>
+      </action>
+      <action type="open_webpage">
+        <url>https://pss-pas1-camera1.tn.esss.lu.se</url>
+        <description>Open Webpage</description>
+      </action>
+    </actions>
+    <text>FEB</text>
+    <x>923</x>
+    <y>265</y>
+    <width>125</width>
+    <height>35</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
+      </font>
+    </font>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>PAS Camera_1</name>
+    <actions>
+      <action type="command">
+        <command>vlc rtsp://LCRstream:password!@172.16.64.140:554/Streaming/Channels/102</command>
+        <description>Open Video feed</description>
+      </action>
+      <action type="open_webpage">
+        <url>https://pss-pas1-camera2.tn.esss.lu.se</url>
+        <description>Open Webpage</description>
+      </action>
+    </actions>
+    <text>PAS</text>
+    <x>1059</x>
+    <y>265</y>
+    <width>125</width>
+    <height>35</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
+      </font>
+    </font>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Controlled Area Camera_1</name>
+    <actions>
+      <action type="command">
+        <command>vlc rtsp://LCRstream:password!@172.16.64.141:554/Streaming/Channels/102</command>
+        <description>Open Video feed</description>
+      </action>
+      <action type="open_webpage">
+        <url>https://pss-pas1-camera3.tn.esss.lu.se</url>
+        <description>Open Webpage</description>
+      </action>
+    </actions>
+    <text>Controlled Area</text>
+    <x>1195</x>
+    <y>265</y>
+    <width>125</width>
+    <height>35</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
+      </font>
+    </font>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Zone_11</name>
+    <text>Cameras</text>
+    <x>923</x>
+    <y>220</y>
+    <width>118</width>
+    <height>35</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_MAS_1</name>
+    <text>MINI
+MAS</text>
+    <x>1623</x>
+    <y>377</y>
+    <width>73</width>
+    <height>82</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="23.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>AMM_205</name>
+    <text>Zone Door</text>
+    <x>1349</x>
+    <y>852</y>
+    <width>90</width>
+    <height>38</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
   </widget>
   <widget type="led" version="2.0.0">
     <name>TSW</name>
     <pv_name>FEB-020Row:CnPw-U-005:TSWKey</pv_name>
-    <x>130</x>
-    <y>710</y>
-    <width>15</width>
+    <x>783</x>
+    <y>848</y>
+    <width>3</width>
     <height>74</height>
     <off_color>
-      <color name="BLACK" red="0" green="0" blue="0">
+      <color red="99" green="102" blue="100">
       </color>
     </off_color>
     <on_color>
-      <color name="BLACK" red="0" green="0" blue="0">
+      <color red="99" green="102" blue="100">
       </color>
     </on_color>
+    <foreground_color>
+      <color red="99" green="102" blue="100">
+      </color>
+    </foreground_color>
+    <line_color>
+      <color red="99" green="102" blue="100">
+      </color>
+    </line_color>
     <square>true</square>
     <rules>
       <rule name="Visibility" prop_id="visible" out_exp="true">
@@ -2704,68 +2448,74 @@ $(pv_value)</tooltip>
       </rule>
     </rules>
   </widget>
-  <widget type="group" version="2.0.0">
-    <name>Occupancy warning</name>
-    <x>588</x>
-    <y>290</y>
-    <width>400</width>
-    <height>120</height>
-    <style>3</style>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_21</name>
+    <x>783</x>
+    <y>719</y>
+    <width>3</width>
+    <height>135</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="Text" red="25" green="25" blue="25">
+      </color>
+    </line_color>
+    <background_color>
+      <color red="99" green="102" blue="100">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>AMM G0102</name>
+    <macros>
+      <P>REMS-FEBRS:RMT-AMM-002</P>
+      <RM>G0102</RM>
+    </macros>
+    <file>embedded_displays/rad.bob</file>
+    <x>1369</x>
+    <y>445</y>
+    <width>210</width>
+    <height>50</height>
+    <transparent>true</transparent>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>AMM G0199</name>
+    <macros>
+      <P>REMS-SPKRS:RMT-AMM-001</P>
+      <RM>G0199</RM>
+    </macros>
+    <file>embedded_displays/rad.bob</file>
+    <x>491</x>
+    <y>772</y>
+    <width>210</width>
+    <height>50</height>
+    <transparent>true</transparent>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>AMM G0101</name>
+    <macros>
+      <P>REMS-FEBRS:RMT-AMM-001</P>
+      <RM>G0101</RM>
+    </macros>
+    <file>embedded_displays/rad.bob</file>
+    <x>1674</x>
+    <y>160</y>
+    <width>210</width>
+    <height>50</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>WaveG DTL-40</name>
+    <macros>
+      <RWG_REMOVED_PV>KG-NCG:PSS-Area-1:DTL4_RWG_Removed</RWG_REMOVED_PV>
+      <SCP_INSTALLED_PV>KG-NCG:PSS-Area-1:DTL4_SCP_Installed</SCP_INSTALLED_PV>
+      <WAVEGUIDE>DTL-40</WAVEGUIDE>
+      <WAVEGUIDE_ISOLATED_PV>KG-NCG:PSS-Area-1:DTL4_waveguide_Isolated</WAVEGUIDE_ISOLATED_PV>
+    </macros>
+    <file>embedded_displays/waveguide.bob</file>
+    <x>751</x>
+    <y>429</y>
+    <width>64</width>
+    <height>124</height>
+    <resize>2</resize>
     <transparent>true</transparent>
-    <rules>
-      <rule name="Visibility" prop_id="visible" out_exp="false">
-        <exp bool_exp="pvInt0 &lt; 10">
-          <value>false</value>
-        </exp>
-        <pv_name>AccPSS:PSS-Area-1:Occupancy</pv_name>
-      </rule>
-    </rules>
-    <widget type="rectangle" version="2.0.0">
-      <name>Background</name>
-      <width>400</width>
-      <height>120</height>
-      <line_width>5</line_width>
-      <line_color>
-        <color name="ERROR" red="252" green="13" blue="27">
-        </color>
-      </line_color>
-      <background_color>
-        <color name="RED-BACKGROUND" red="225" green="192" blue="188">
-        </color>
-      </background_color>
-      <corner_width>5</corner_width>
-      <corner_height>5</corner_height>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>Warning</name>
-      <text>The occupancy number in the PSS1 controlled area is &gt;= 10</text>
-      <x>40</x>
-      <y>10</y>
-      <width>320</width>
-      <height>60</height>
-      <font>
-        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
-        </font>
-      </font>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>Hide Button</name>
-      <actions>
-        <action type="execute">
-          <script file="EmbeddedPy">
-            <text><![CDATA[from org.csstudio.display.builder.runtime.script import ScriptUtil
-ScriptUtil.findWidgetByName(widget, "Occupancy warning").setPropertyValue("visible", False)]]></text>
-          </script>
-          <description>Execute Script</description>
-        </action>
-      </actions>
-      <text>Hide</text>
-      <x>150</x>
-      <y>80</y>
-      <height>25</height>
-      <tooltip>$(actions)</tooltip>
-    </widget>
   </widget>
 </display>
diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
index 1426625a..6722d3d6 100644
--- a/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
@@ -10,18 +10,16 @@
     <SYMBOLS>symbols</SYMBOLS>
     <WIRE_PY>scripts/wire.py</WIRE_PY>
   </macros>
-  <width>1500</width>
-  <height>1006</height>
+  <width>1510</width>
+  <height>1025</height>
+  <grid_visible>false</grid_visible>
   <widget type="rectangle" version="2.0.0">
     <name>Title Rectangle</name>
-    <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
-    <width>1500</width>
-    <height use_class="true">50</height>
-    <line_width use_class="true">0</line_width>
-    <background_color use_class="true">
-      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+    <width>1510</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color red="218" green="110" blue="0">
       </color>
     </background_color>
   </widget>
@@ -50,9 +48,9 @@
     <name>EPICS</name>
     <file>embedded_displays/diagnostics/epics.bob</file>
     <x>20</x>
-    <y>60</y>
-    <width>370</width>
-    <height>244</height>
+    <y>62</y>
+    <width>395</width>
+    <height>240</height>
     <resize>2</resize>
     <transparent>true</transparent>
   </widget>
@@ -60,9 +58,9 @@
     <name>PLC Software</name>
     <file>embedded_displays/diagnostics/plc_software.bob</file>
     <x>20</x>
-    <y>314</y>
+    <y>316</y>
     <width>395</width>
-    <height>182</height>
+    <height>200</height>
     <resize>2</resize>
   </widget>
   <widget type="polyline" version="2.0.0">
@@ -81,6 +79,7 @@
       <point x="220.0" y="0.0">
       </point>
     </points>
+    <line_width>4</line_width>
     <line_color>
       <color name="DISCONNECTED" red="105" green="77" blue="164">
       </color>
@@ -96,7 +95,7 @@
   <widget type="polyline" version="2.0.0">
     <name>FCPU Wire</name>
     <x>777</x>
-    <y>320</y>
+    <y>308</y>
     <width>150</width>
     <height>85</height>
     <points>
@@ -109,6 +108,7 @@
       <point x="150.0" y="0.0">
       </point>
     </points>
+    <line_width>4</line_width>
     <line_color>
       <color name="DISCONNECTED" red="105" green="77" blue="164">
       </color>
@@ -124,19 +124,20 @@
   <widget type="polyline" version="2.0.0">
     <name>PLC Wire</name>
     <x>150</x>
-    <y>325</y>
+    <y>334</y>
     <width>795</width>
-    <height>254</height>
+    <height>271</height>
     <points>
       <point x="795.0" y="0.0">
       </point>
-      <point x="795.0" y="179.0">
+      <point x="795.0" y="196.0">
       </point>
-      <point x="0.0" y="179.0">
+      <point x="0.0" y="196.0">
       </point>
-      <point x="0.0" y="254.0">
+      <point x="0.0" y="271.0">
       </point>
     </points>
+    <line_width>4</line_width>
     <line_color>
       <color name="DISCONNECTED" red="105" green="77" blue="164">
       </color>
@@ -151,20 +152,21 @@
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>RIO4 Wire</name>
-    <x>962</x>
-    <y>325</y>
-    <width>170</width>
-    <height>254</height>
+    <x>961</x>
+    <y>334</y>
+    <width>172</width>
+    <height>271</height>
     <points>
       <point x="0.0" y="0.0">
       </point>
-      <point x="0.0" y="179.0">
+      <point x="0.0" y="196.0">
       </point>
-      <point x="170.0" y="179.0">
+      <point x="172.0" y="196.0">
       </point>
-      <point x="170.0" y="254.0">
+      <point x="172.0" y="271.0">
       </point>
     </points>
+    <line_width>4</line_width>
     <line_color>
       <color name="DISCONNECTED" red="105" green="77" blue="164">
       </color>
@@ -193,6 +195,7 @@
       <point x="165.0" y="0.0">
       </point>
     </points>
+    <line_width>4</line_width>
     <line_color>
       <color name="DISCONNECTED" red="105" green="77" blue="164">
       </color>
@@ -208,7 +211,7 @@
   <widget type="polyline" version="2.0.0">
     <name>RIO1 Wire</name>
     <x>224</x>
-    <y>876</y>
+    <y>892</y>
     <width>131</width>
     <height>75</height>
     <points>
@@ -219,6 +222,7 @@
       <point x="131.0" y="0.0">
       </point>
     </points>
+    <line_width>4</line_width>
     <line_color>
       <color name="DISCONNECTED" red="105" green="77" blue="164">
       </color>
@@ -234,7 +238,7 @@
   <widget type="polyline" version="2.0.0">
     <name>RIO2 Wire</name>
     <x>465</x>
-    <y>876</y>
+    <y>892</y>
     <width>131</width>
     <height>75</height>
     <points>
@@ -247,6 +251,7 @@
       <point x="131.0" y="0.0">
       </point>
     </points>
+    <line_width>4</line_width>
     <line_color>
       <color name="DISCONNECTED" red="105" green="77" blue="164">
       </color>
@@ -262,7 +267,7 @@
   <widget type="polyline" version="2.0.0">
     <name>RIO3 Wire</name>
     <x>706</x>
-    <y>876</y>
+    <y>892</y>
     <width>131</width>
     <height>75</height>
     <points>
@@ -275,6 +280,7 @@
       <point x="131.0" y="0.0">
       </point>
     </points>
+    <line_width>4</line_width>
     <line_color>
       <color name="DISCONNECTED" red="105" green="77" blue="164">
       </color>
@@ -290,7 +296,7 @@
   <widget type="polyline" version="2.0.0">
     <name>RIO5 Wire</name>
     <x>947</x>
-    <y>876</y>
+    <y>892</y>
     <width>372</width>
     <height>75</height>
     <points>
@@ -303,6 +309,7 @@
       <point x="372.0" y="0.0">
       </point>
     </points>
+    <line_width>4</line_width>
     <line_color>
       <color name="DISCONNECTED" red="105" green="77" blue="164">
       </color>
@@ -327,6 +334,7 @@
       <point x="1.0" y="199.99999999999997">
       </point>
     </points>
+    <line_width>4</line_width>
     <line_color>
       <color name="DISCONNECTED" red="105" green="77" blue="164">
       </color>
@@ -353,7 +361,7 @@
       <width>162</width>
       <height>55</height>
       <font>
-        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        <font family="Source Sans Pro" style="BOLD" size="18.0">
         </font>
       </font>
       <horizontal_alignment>1</horizontal_alignment>
@@ -382,7 +390,7 @@
       <width>162</width>
       <height>55</height>
       <font>
-        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        <font family="Source Sans Pro" style="BOLD" size="18.0">
         </font>
       </font>
       <horizontal_alignment>1</horizontal_alignment>
@@ -426,7 +434,7 @@ Scalance</text>
       <width>120</width>
       <height>55</height>
       <font>
-        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        <font family="Source Sans Pro" style="BOLD" size="18.0">
         </font>
       </font>
       <horizontal_alignment>1</horizontal_alignment>
@@ -447,7 +455,7 @@ Scalance</text>
         <DIAG_STAT>FEB-010Row:CnPw-U-001:SCL_Stat</DIAG_STAT>
       </macros>
       <file>$(EMBEDDED_DIAG)/PLC_module_status.bob</file>
-      <x>45</x>
+      <x>37</x>
       <y>98</y>
       <width>30</width>
       <height>70</height>
@@ -469,7 +477,7 @@ Scalance</text>
       <width>210</width>
       <height>55</height>
       <font>
-        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        <font family="Source Sans Pro" style="BOLD" size="18.0">
         </font>
       </font>
       <horizontal_alignment>1</horizontal_alignment>
@@ -515,7 +523,7 @@ Scalance</text>
       <width>210</width>
       <height>55</height>
       <font>
-        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        <font family="Source Sans Pro" style="BOLD" size="18.0">
         </font>
       </font>
       <horizontal_alignment>1</horizontal_alignment>
@@ -557,7 +565,7 @@ Scalance</text>
     </macros>
     <file>$(EMBEDDED_DIAG)/PLC_cabinet.bob</file>
     <x>20</x>
-    <y>531</y>
+    <y>546</y>
     <width>240</width>
     <height>465</height>
     <resize>2</resize>
@@ -573,7 +581,7 @@ Scalance</text>
     </macros>
     <file>$(EMBEDDED_DIAG)/cabinet.bob</file>
     <x>300</x>
-    <y>531</y>
+    <y>546</y>
     <width>221</width>
     <height>345</height>
     <resize>2</resize>
@@ -589,7 +597,7 @@ Scalance</text>
     </macros>
     <file>$(EMBEDDED_DIAG)/cabinet.bob</file>
     <x>541</x>
-    <y>531</y>
+    <y>546</y>
     <width>221</width>
     <height>345</height>
     <resize>2</resize>
@@ -605,7 +613,7 @@ Scalance</text>
     </macros>
     <file>$(EMBEDDED_DIAG)/cabinet.bob</file>
     <x>781</x>
-    <y>531</y>
+    <y>546</y>
     <width>221</width>
     <height>345</height>
     <resize>2</resize>
@@ -619,7 +627,7 @@ Scalance</text>
     </macros>
     <file>$(EMBEDDED_DIAG)/RIO4_cabinet.bob</file>
     <x>1022</x>
-    <y>531</y>
+    <y>546</y>
     <width>221</width>
     <height>255</height>
     <resize>2</resize>
@@ -633,7 +641,7 @@ Scalance</text>
     </macros>
     <file>$(EMBEDDED_DIAG)/RIO5_cabinet.bob</file>
     <x>1263</x>
-    <y>531</y>
+    <y>546</y>
     <width>221</width>
     <height>405</height>
     <resize>2</resize>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_cabinet.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_cabinet.bob
index a5a23c9c..4ddc328d 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_cabinet.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_cabinet.bob
@@ -60,7 +60,7 @@
       <y>5</y>
       <width>220</width>
       <font>
-        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        <font family="Source Sans Pro" style="BOLD" size="18.0">
         </font>
       </font>
       <background_color>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO4_cabinet.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO4_cabinet.bob
index 8ced6ffd..dcc167b8 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO4_cabinet.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO4_cabinet.bob
@@ -64,7 +64,7 @@
       <y>5</y>
       <width>201</width>
       <font>
-        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        <font family="Source Sans Pro" style="BOLD" size="18.0">
         </font>
       </font>
       <background_color>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO5_cabinet.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO5_cabinet.bob
index 1975c622..e613062c 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO5_cabinet.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO5_cabinet.bob
@@ -78,7 +78,7 @@
       <y>5</y>
       <width>201</width>
       <font>
-        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        <font family="Source Sans Pro" style="BOLD" size="18.0">
         </font>
       </font>
       <background_color>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/cabinet.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/cabinet.bob
index f53eacc6..8ca9e3d0 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/cabinet.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/cabinet.bob
@@ -60,7 +60,7 @@
       <y>5</y>
       <width>201</width>
       <font>
-        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        <font family="Source Sans Pro" style="BOLD" size="18.0">
         </font>
       </font>
       <background_color>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/checksum.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/checksum.bob
index edba3c0d..630da37c 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/checksum.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/checksum.bob
@@ -8,6 +8,10 @@
     <width>368</width>
     <height>26</height>
     <style>3</style>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
     <widget type="textupdate" version="2.0.0">
       <name>StandardSW_Chksum0</name>
       <pv_name>$(CHKSUM_DEVICE):StandardSW_Chksum0</pv_name>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/epics.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/epics.bob
index c16867bf..c31eb10c 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/epics.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/epics.bob
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>EPICS</name>
-  <width>370</width>
-  <height>244</height>
+  <width>395</width>
+  <height>240</height>
   <widget type="group" version="2.0.0">
     <name>Software Diagnostics</name>
-    <width>370</width>
-    <height>244</height>
+    <width>395</width>
+    <height>240</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
-      <name>Title Background</name>
-      <width>370</width>
-      <height>244</height>
-      <line_width>2</line_width>
+      <name>Rectangle_29</name>
+      <width>395</width>
+      <height>240</height>
+      <line_width>0</line_width>
       <line_color>
         <color name="GROUP-BORDER" red="150" green="155" blue="151">
         </color>
@@ -26,258 +26,135 @@
       <corner_height>10</corner_height>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>EPICS Communication</name>
+      <name>ModbusConnected</name>
+      <text>ModbusConnected:</text>
+      <x>26</x>
+      <y>45</y>
+      <width>160</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>S7Connected</name>
+      <text>S7Connected:</text>
+      <x>26</x>
+      <y>72</y>
+      <width>160</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Alive</name>
+      <text>Alive:</text>
+      <x>26</x>
+      <y>99</y>
+      <width>160</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>PLC Hash OK</name>
+      <text>PLC Hash OK:</text>
+      <x>26</x>
+      <y>125</y>
+      <width>160</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>PLC HASH</name>
+      <text>PLC Hash:</text>
+      <x>26</x>
+      <y>152</y>
+      <width>160</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>IOC HASH</name>
+      <text>IOC Hash:</text>
+      <x>26</x>
+      <y>179</y>
+      <width>160</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Module Version</name>
+      <text>Module Version:</text>
+      <x>26</x>
+      <y>206</y>
+      <width>160</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>S7ConnectedR</name>
+      <pv_name>$(GPLC):S7ConnectedR</pv_name>
+      <x>196</x>
+      <y>72</y>
+      <width>154</width>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>AliveR</name>
+      <pv_name>$(GPLC):AliveR</pv_name>
+      <x>196</x>
+      <y>99</y>
+      <width>154</width>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>PLCHashCorrectR</name>
+      <pv_name>$(GPLC):PLCHashCorrectR</pv_name>
+      <x>196</x>
+      <y>125</y>
+      <width>154</width>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>CommsHashFromPLCR</name>
+      <pv_name>$(GPLC):CommsHashFromPLCR</pv_name>
+      <x>196</x>
+      <y>152</y>
+      <width>154</width>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>iCommsHashToPLC</name>
+      <pv_name>$(GPLC):iCommsHashToPLC</pv_name>
+      <x>196</x>
+      <y>179</y>
+      <width>154</width>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>ModVersionR</name>
+      <pv_name>$(GPLC):ModVersionR</pv_name>
+      <x>196</x>
+      <y>206</y>
+      <width>154</width>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Zone_6</name>
       <text>EPICS Communication</text>
-      <width>370</width>
+      <width>395</width>
       <height>40</height>
       <font>
-        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        <font family="Source Sans Pro" style="BOLD" size="18.0">
         </font>
       </font>
-      <foreground_color>
-        <color name="GROUP-TEXT" red="25" green="25" blue="25">
-        </color>
-      </foreground_color>
-      <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>
-      <wrap_words>false</wrap_words>
-    </widget>
-    <widget type="group" version="2.0.0">
-      <name>EPICS</name>
-      <x>10</x>
-      <y>40</y>
-      <width>350</width>
-      <height>194</height>
-      <style>3</style>
-      <transparent>true</transparent>
-      <widget type="rectangle" version="2.0.0">
-        <name>Content Background</name>
-        <width>350</width>
-        <height>194</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="Background" red="220" green="225" blue="221">
-          </color>
-        </background_color>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>ModbusConnected</name>
-        <text>ModbusConnected:</text>
-        <x>20</x>
-        <y>10</y>
-        <width>160</width>
-        <font>
-          <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
-          </font>
-        </font>
-        <foreground_color>
-          <color name="PRIMARY-DARK" red="31" green="83" blue="102">
-          </color>
-        </foreground_color>
-        <horizontal_alignment>2</horizontal_alignment>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="textupdate" version="2.0.0">
-        <name>ModbusConnectedR</name>
-        <pv_name>$(GPLC):ModbusConnectedR</pv_name>
-        <x>186</x>
-        <y>10</y>
-        <width>154</width>
-        <foreground_color>
-          <color name="ORANGE-BORDER" red="153" green="117" blue="49">
-          </color>
-        </foreground_color>
-        <transparent>true</transparent>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>S7Connected</name>
-        <text>S7Connected:</text>
-        <x>20</x>
-        <y>36</y>
-        <width>160</width>
-        <font>
-          <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
-          </font>
-        </font>
-        <foreground_color>
-          <color name="PRIMARY-DARK" red="31" green="83" blue="102">
-          </color>
-        </foreground_color>
-        <horizontal_alignment>2</horizontal_alignment>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="textupdate" version="2.0.0">
-        <name>S7ConnectedR</name>
-        <pv_name>$(GPLC):S7ConnectedR</pv_name>
-        <x>186</x>
-        <y>36</y>
-        <width>154</width>
-        <foreground_color>
-          <color name="ORANGE-BORDER" red="153" green="117" blue="49">
-          </color>
-        </foreground_color>
-        <transparent>true</transparent>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>Alive</name>
-        <text>Alive:</text>
-        <x>20</x>
-        <y>62</y>
-        <width>160</width>
-        <font>
-          <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
-          </font>
-        </font>
-        <foreground_color>
-          <color name="PRIMARY-DARK" red="31" green="83" blue="102">
-          </color>
-        </foreground_color>
-        <horizontal_alignment>2</horizontal_alignment>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="textupdate" version="2.0.0">
-        <name>AliveR</name>
-        <pv_name>$(GPLC):AliveR</pv_name>
-        <x>186</x>
-        <y>62</y>
-        <width>154</width>
-        <foreground_color>
-          <color name="ORANGE-BORDER" red="153" green="117" blue="49">
-          </color>
-        </foreground_color>
-        <transparent>true</transparent>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>PLC Hash OK</name>
-        <text>PLC Hash OK:</text>
-        <x>20</x>
-        <y>86</y>
-        <width>160</width>
-        <font>
-          <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
-          </font>
-        </font>
-        <foreground_color>
-          <color name="PRIMARY-DARK" red="31" green="83" blue="102">
-          </color>
-        </foreground_color>
-        <horizontal_alignment>2</horizontal_alignment>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="textupdate" version="2.0.0">
-        <name>PLCHashCorrectR</name>
-        <pv_name>$(GPLC):PLCHashCorrectR</pv_name>
-        <x>186</x>
-        <y>86</y>
-        <width>154</width>
-        <foreground_color>
-          <color name="ORANGE-BORDER" red="153" green="117" blue="49">
-          </color>
-        </foreground_color>
-        <transparent>true</transparent>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>PLC HASH</name>
-        <text>PLC Hash:</text>
-        <x>20</x>
-        <y>112</y>
-        <width>160</width>
-        <font>
-          <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
-          </font>
-        </font>
-        <foreground_color>
-          <color name="PRIMARY-DARK" red="31" green="83" blue="102">
-          </color>
-        </foreground_color>
-        <horizontal_alignment>2</horizontal_alignment>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="textupdate" version="2.0.0">
-        <name>CommsHashFromPLCR</name>
-        <pv_name>$(GPLC):CommsHashFromPLCR</pv_name>
-        <x>186</x>
-        <y>112</y>
-        <width>154</width>
-        <foreground_color>
-          <color name="ORANGE-BORDER" red="153" green="117" blue="49">
-          </color>
-        </foreground_color>
-        <transparent>true</transparent>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>IOC HASH</name>
-        <text>IOC Hash:</text>
-        <x>20</x>
-        <y>138</y>
-        <width>160</width>
-        <font>
-          <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
-          </font>
-        </font>
-        <foreground_color>
-          <color name="PRIMARY-DARK" red="31" green="83" blue="102">
-          </color>
-        </foreground_color>
-        <horizontal_alignment>2</horizontal_alignment>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="textupdate" version="2.0.0">
-        <name>iCommsHashToPLC</name>
-        <pv_name>$(GPLC):iCommsHashToPLC</pv_name>
-        <x>186</x>
-        <y>138</y>
-        <width>154</width>
-        <foreground_color>
-          <color name="ORANGE-BORDER" red="153" green="117" blue="49">
-          </color>
-        </foreground_color>
-        <transparent>true</transparent>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>Module Version</name>
-        <text>Module Version:</text>
-        <x>20</x>
-        <y>164</y>
-        <width>160</width>
-        <font>
-          <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
-          </font>
-        </font>
-        <foreground_color>
-          <color name="PRIMARY-DARK" red="31" green="83" blue="102">
-          </color>
-        </foreground_color>
-        <horizontal_alignment>2</horizontal_alignment>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="textupdate" version="2.0.0">
-        <name>ModVersionR</name>
-        <pv_name>$(GPLC):ModVersionR</pv_name>
-        <x>186</x>
-        <y>164</y>
-        <width>154</width>
-        <foreground_color>
-          <color name="ORANGE-BORDER" red="153" green="117" blue="49">
-          </color>
-        </foreground_color>
-        <transparent>true</transparent>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
     </widget>
   </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>ModbusConnectedR</name>
+    <pv_name>$(GPLC):ModbusConnectedR</pv_name>
+    <x>196</x>
+    <y>45</y>
+    <width>154</width>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
 </display>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/plc_software.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/plc_software.bob
index ef5697c7..71e9f4c5 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/plc_software.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/plc_software.bob
@@ -2,18 +2,17 @@
 <display version="2.0.0">
   <name>PLC Software</name>
   <width>395</width>
-  <height>182</height>
+  <height>200</height>
   <widget type="group" version="2.0.0">
     <name>Software Diagnostics</name>
     <width>395</width>
-    <height>182</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
       <name>Title Background</name>
       <width>395</width>
-      <height>182</height>
-      <line_width>2</line_width>
+      <height>200</height>
+      <line_width>0</line_width>
       <line_color>
         <color name="GROUP-BORDER" red="150" green="155" blue="151">
         </color>
@@ -31,7 +30,7 @@
       <width>396</width>
       <height>40</height>
       <font>
-        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        <font family="Source Sans Pro" style="BOLD" size="18.0">
         </font>
       </font>
       <foreground_color>
@@ -46,117 +45,68 @@
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
     </widget>
-    <widget type="group" version="2.0.0">
-      <name>Checksums</name>
-      <x>10</x>
-      <y>40</y>
-      <width>375</width>
-      <height>132</height>
-      <style>3</style>
+    <widget type="label" version="2.0.0">
+      <name>Software Checksum</name>
+      <text>Software Checksum</text>
+      <x>13</x>
+      <y>74</y>
+      <width>365</width>
+      <height>30</height>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>GW Software Checksum</name>
+      <text>GW Software Checksum</text>
+      <x>13</x>
+      <y>134</y>
+      <width>365</width>
+      <height>25</height>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>PLC Checksum</name>
+      <macros>
+        <CHKSUM_DEVICE>$(PLC)</CHKSUM_DEVICE>
+      </macros>
+      <file>checksum.bob</file>
+      <x>13</x>
+      <y>105</y>
+      <width>368</width>
+      <height>26</height>
+      <resize>2</resize>
       <transparent>true</transparent>
-      <widget type="rectangle" version="2.0.0">
-        <name>Rectangle</name>
-        <width>375</width>
-        <height>132</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="Background" red="220" green="225" blue="221">
-          </color>
-        </background_color>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>Software Checksum</name>
-        <text>Software Checksum:</text>
-        <x>6</x>
-        <y>10</y>
-        <width>174</width>
-        <font>
-          <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
-          </font>
-        </font>
-        <foreground_color>
-          <color name="PRIMARY-DARK" red="31" green="83" blue="102">
-          </color>
-        </foreground_color>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>Safety F-Signature</name>
-        <text>Safety F-Signature:</text>
-        <x>6</x>
-        <y>59</y>
-        <width>174</width>
-        <font>
-          <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
-          </font>
-        </font>
-        <foreground_color>
-          <color name="PRIMARY-DARK" red="31" green="83" blue="102">
-          </color>
-        </foreground_color>
-        <horizontal_alignment>2</horizontal_alignment>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="textupdate" version="2.0.0">
-        <name>FSignature</name>
-        <pv_name>$(PLC):SafetySW_FSignature</pv_name>
-        <x>186</x>
-        <y>59</y>
-        <width>181</width>
-        <foreground_color>
-          <color name="ORANGE-BORDER" red="153" green="117" blue="49">
-          </color>
-        </foreground_color>
-        <transparent>true</transparent>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>GW Software Checksum</name>
-        <text>GW Software Checksum:</text>
-        <x>6</x>
-        <y>79</y>
-        <width>174</width>
-        <font>
-          <font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
-          </font>
-        </font>
-        <foreground_color>
-          <color name="PRIMARY-DARK" red="31" green="83" blue="102">
-          </color>
-        </foreground_color>
-        <horizontal_alignment>2</horizontal_alignment>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="embedded" version="2.0.0">
-        <name>PLC Checksum</name>
-        <macros>
-          <CHKSUM_DEVICE>$(PLC)</CHKSUM_DEVICE>
-        </macros>
-        <file>checksum.bob</file>
-        <x>3</x>
-        <y>30</y>
-        <width>368</width>
-        <height>26</height>
-        <resize>2</resize>
-        <transparent>true</transparent>
-      </widget>
-      <widget type="embedded" version="2.0.0">
-        <name>GPLC Checksum</name>
-        <macros>
-          <CHKSUM_DEVICE>$(GPLC)</CHKSUM_DEVICE>
-        </macros>
-        <file>checksum.bob</file>
-        <x>3</x>
-        <y>99</y>
-        <width>368</width>
-        <height>26</height>
-        <resize>2</resize>
-        <transparent>true</transparent>
-      </widget>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>GPLC Checksum</name>
+      <macros>
+        <CHKSUM_DEVICE>$(GPLC)</CHKSUM_DEVICE>
+      </macros>
+      <file>checksum.bob</file>
+      <x>13</x>
+      <y>163</y>
+      <width>368</width>
+      <height>26</height>
+      <resize>2</resize>
+      <transparent>true</transparent>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>FSignature</name>
+      <pv_name>$(PLC):SafetySW_FSignature</pv_name>
+      <x>193</x>
+      <y>43</y>
+      <width>181</width>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Safety F-Signature</name>
+      <text>Safety F-Signature:</text>
+      <x>13</x>
+      <y>43</y>
+      <width>174</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
     </widget>
   </widget>
 </display>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/esob.bob b/NON-APPROVED/pss1-pss/embedded_displays/esob.bob
index 35eeadd8..6507513e 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/esob.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/esob.bob
@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>ESOB</name>
-  <width>28</width>
-  <height>28</height>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <width>28</width>
-    <height>28</height>
-    <line_width>1</line_width>
-    <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
-      </color>
-    </line_color>
-    <transparent>true</transparent>
-  </widget>
+  <width>35</width>
+  <height>35</height>
   <widget type="symbol" version="2.0.0">
     <name>$(ESOS):ESOBStat</name>
     <pv_name>$(ESOS):ESOBStat</pv_name>
@@ -21,9 +10,8 @@
       <symbol>../symbols/esos/emergency-button-RED.svg</symbol>
       <symbol>../symbols/esos/emergency-button-OFF.svg</symbol>
     </symbols>
-    <x>3</x>
-    <y>3</y>
-    <width>22</width>
-    <height>22</height>
+    <width>35</width>
+    <height>35</height>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
 </display>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/esos.bob b/NON-APPROVED/pss1-pss/embedded_displays/esos.bob
index ac74666c..fa5dac7b 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/esos.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/esos.bob
@@ -1,13 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>ESOS</name>
-  <width>84</width>
-  <height>28</height>
+  <width>130</width>
+  <height>45</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <width>130</width>
+    <height>45</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="Grid" red="169" green="169" blue="169">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="Background" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+  </widget>
   <widget type="rectangle" version="2.0.0">
     <name>ESOS $(ESOS_IDX)</name>
-    <width>28</width>
-    <height>28</height>
-    <line_width>1</line_width>
+    <y>3</y>
+    <width>40</width>
+    <height>40</height>
+    <line_width>0</line_width>
     <line_color>
       <color name="Grid" red="169" green="169" blue="169">
       </color>
@@ -21,27 +40,33 @@
   <widget type="label" version="2.0.0">
     <name>ESOS $(ESOS_IDX)</name>
     <text>$(ESOS_IDX)</text>
-    <width>28</width>
-    <height>28</height>
+    <x>4</x>
+    <y>5</y>
+    <width>30</width>
+    <height>35</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="20.0">
+      </font>
+    </font>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Search Button</name>
     <file>search.bob</file>
-    <x>28</x>
-    <width>28</width>
-    <height>28</height>
+    <x>41</x>
+    <y>6</y>
+    <width>35</width>
+    <height>35</height>
     <resize>2</resize>
-    <transparent>true</transparent>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>ESOB</name>
     <file>esob.bob</file>
-    <x>56</x>
-    <width>28</width>
-    <height>28</height>
+    <x>85</x>
+    <y>5</y>
+    <width>35</width>
+    <height>35</height>
     <resize>2</resize>
-    <transparent>true</transparent>
   </widget>
 </display>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/operation_mode.bob b/NON-APPROVED/pss1-pss/embedded_displays/operation_mode.bob
index 4cae4195..806a6d4c 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/operation_mode.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/operation_mode.bob
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>PSS Operation mode</name>
-  <width>960</width>
-  <height>56</height>
+  <width>220</width>
+  <height>50</height>
   <widget type="group" version="2.0.0">
     <name>Modes</name>
     <macros>
@@ -15,9 +15,7 @@
       <MODE_SEARCH>Search</MODE_SEARCH>
       <MODE_TUNNEL_CLOSED>Tunnel Closed</MODE_TUNNEL_CLOSED>
     </macros>
-    <x>3</x>
-    <y>3</y>
-    <width>954</width>
+    <width>220</width>
     <height>50</height>
     <style>3</style>
     <foreground_color>
@@ -29,806 +27,102 @@
       </color>
     </background_color>
     <transparent>true</transparent>
-    <widget type="multi_state_led" version="2.0.0">
-      <name>Beam On</name>
-      <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
-      <width>114</width>
-      <height>50</height>
-      <font>
-        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
-        </font>
-      </font>
-      <foreground_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </foreground_color>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <square>true</square>
-      <rules>
-        <rule name="Line color" prop_id="line_color" out_exp="false">
-          <exp bool_exp="pvInt0 == 4">
-            <value>
-              <color name="GREEN" red="61" green="216" blue="61">
-              </color>
-            </value>
-          </exp>
-          <pv_name>$(pv_name)</pv_name>
-        </rule>
-      </rules>
-      <states>
-        <state>
-          <value>0</value>
-          <label>$(MODE_BEAM_ON)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>1</value>
-          <label>$(MODE_BEAM_ON)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>2</value>
-          <label>$(MODE_BEAM_ON)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>3</value>
-          <label>$(MODE_BEAM_ON)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>4</value>
-          <label>$(MODE_BEAM_ON)</label>
-          <color>
-            <color name="GREEN-BORDER" red="40" green="140" blue="40">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>5</value>
-          <label>$(MODE_BEAM_ON)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>6</value>
-          <label>$(MODE_BEAM_ON)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>7</value>
-          <label>$(MODE_BEAM_ON)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-      </states>
-      <fallback_label>$(MODE_BEAM_ON)</fallback_label>
-    </widget>
-    <widget type="multi_state_led" version="2.0.0">
-      <name>Search</name>
-      <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
-      <x>120</x>
-      <width>114</width>
-      <height>50</height>
-      <font>
-        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
-        </font>
-      </font>
-      <foreground_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </foreground_color>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <square>true</square>
-      <rules>
-        <rule name="Line color" prop_id="line_color" out_exp="false">
-          <exp bool_exp="pvInt0 == 2">
-            <value>
-              <color name="GREEN" red="61" green="216" blue="61">
-              </color>
-            </value>
-          </exp>
-          <pv_name>$(pv_name)</pv_name>
-        </rule>
-      </rules>
-      <states>
-        <state>
-          <value>0</value>
-          <label>Search</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>1</value>
-          <label>Search</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>2</value>
-          <label>Search</label>
-          <color>
-            <color name="GREEN-BORDER" red="40" green="140" blue="40">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>3</value>
-          <label>Search</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>4</value>
-          <label>Search</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>5</value>
-          <label>Search</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>6</value>
-          <label>Search</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>7</value>
-          <label>Search</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-      </states>
-      <fallback_label>Search</fallback_label>
-    </widget>
-    <widget type="multi_state_led" version="2.0.0">
-      <name>RM Interlock</name>
-      <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
-      <x>240</x>
-      <width>114</width>
-      <height>50</height>
-      <font>
-        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
-        </font>
-      </font>
-      <foreground_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </foreground_color>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <square>true</square>
-      <rules>
-        <rule name="Line color" prop_id="line_color" out_exp="false">
-          <exp bool_exp="pvInt0 == 5">
-            <value>
-              <color name="GREEN" red="61" green="216" blue="61">
-              </color>
-            </value>
-          </exp>
-          <pv_name>$(pv_name)</pv_name>
-        </rule>
-      </rules>
-      <states>
-        <state>
-          <value>0</value>
-          <label>RM Interlock</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>1</value>
-          <label>RM Interlock</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>2</value>
-          <label>RM Interlock</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>3</value>
-          <label>RM Interlock</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>4</value>
-          <label>RM Interlock</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>5</value>
-          <label>RM Interlock</label>
-          <color>
-            <color name="GREEN-BORDER" red="40" green="140" blue="40">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>6</value>
-          <label>RM Interlock</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>7</value>
-          <label>RM Interlock</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-      </states>
-      <fallback_label>RM Interlock</fallback_label>
-    </widget>
-    <widget type="multi_state_led" version="2.0.0">
-      <name>Open Access</name>
-      <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
-      <x>360</x>
-      <width>114</width>
-      <height>50</height>
-      <font>
-        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
-        </font>
-      </font>
-      <foreground_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </foreground_color>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <square>true</square>
-      <rules>
-        <rule name="Line color" prop_id="line_color" out_exp="false">
-          <exp bool_exp="pvInt0 == 1">
-            <value>
-              <color name="GREEN" red="61" green="216" blue="61">
-              </color>
-            </value>
-          </exp>
-          <pv_name>$(pv_name)</pv_name>
-        </rule>
-      </rules>
-      <states>
-        <state>
-          <value>0</value>
-          <label>$(MODE_OPEN_ACCESS)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>1</value>
-          <label>$(MODE_OPEN_ACCESS)</label>
-          <color>
-            <color name="GREEN-BORDER" red="40" green="140" blue="40">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>2</value>
-          <label>$(MODE_OPEN_ACCESS)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>3</value>
-          <label>$(MODE_OPEN_ACCESS)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>4</value>
-          <label>$(MODE_OPEN_ACCESS)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>5</value>
-          <label>$(MODE_OPEN_ACCESS)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>6</value>
-          <label>$(MODE_OPEN_ACCESS)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>7</value>
-          <label>$(MODE_OPEN_ACCESS)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-      </states>
-      <fallback_label>$(MODE_OPEN_ACCESS)</fallback_label>
-    </widget>
-    <widget type="multi_state_led" version="2.0.0">
-      <name>Tunnel Closed</name>
-      <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
-      <x>480</x>
-      <width>114</width>
-      <height>50</height>
-      <font>
-        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
-        </font>
-      </font>
-      <foreground_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </foreground_color>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <square>true</square>
-      <rules>
-        <rule name="Line color" prop_id="line_color" out_exp="false">
-          <exp bool_exp="pvInt0 == 3">
-            <value>
-              <color name="GREEN" red="61" green="216" blue="61">
-              </color>
-            </value>
-          </exp>
-          <pv_name>$(pv_name)</pv_name>
-        </rule>
-      </rules>
-      <states>
-        <state>
-          <value>0</value>
-          <label>$(MODE_TUNNEL_CLOSED)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>1</value>
-          <label>$(MODE_TUNNEL_CLOSED)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>2</value>
-          <label>$(MODE_TUNNEL_CLOSED)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>3</value>
-          <label>$(MODE_TUNNEL_CLOSED)</label>
-          <color>
-            <color name="GREEN-BORDER" red="40" green="140" blue="40">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>4</value>
-          <label>$(MODE_TUNNEL_CLOSED)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>5</value>
-          <label>$(MODE_TUNNEL_CLOSED)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>6</value>
-          <label>$(MODE_TUNNEL_CLOSED)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>7</value>
-          <label>$(MODE_TUNNEL_CLOSED)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-      </states>
-      <fallback_label>$(MODE_TUNNEL_CLOSED)</fallback_label>
-    </widget>
-    <widget type="multi_state_led" version="2.0.0">
-      <name>Alarm Mode</name>
-      <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
-      <x>600</x>
-      <width>114</width>
-      <height>50</height>
-      <font>
-        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
-        </font>
-      </font>
-      <foreground_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </foreground_color>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <square>true</square>
-      <rules>
-        <rule name="Line color" prop_id="line_color" out_exp="false">
-          <exp bool_exp="pvInt0 == 0">
-            <value>
-              <color name="RED" red="252" green="13" blue="27">
-              </color>
-            </value>
-          </exp>
-          <pv_name>$(pv_name)</pv_name>
-        </rule>
-        <rule name="Font color" prop_id="foreground_color" out_exp="false">
-          <exp bool_exp="pvInt0 == 0">
-            <value>
-              <color name="WHITE" red="255" green="255" blue="255">
-              </color>
-            </value>
-          </exp>
-          <pv_name>$(pv_name)</pv_name>
-        </rule>
-      </rules>
-      <states>
-        <state>
-          <value>0</value>
-          <label>$(MODE_ALARM)</label>
-          <color>
-            <color name="RED-BORDER" red="150" green="8" blue="16">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>1</value>
-          <label>$(MODE_ALARM)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>2</value>
-          <label>$(MODE_ALARM)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>3</value>
-          <label>$(MODE_ALARM)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>4</value>
-          <label>$(MODE_ALARM)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>5</value>
-          <label>$(MODE_ALARM)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>6</value>
-          <label>$(MODE_ALARM)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>7</value>
-          <label>$(MODE_ALARM)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-      </states>
-      <fallback_label>$(MODE_ALARM)</fallback_label>
-    </widget>
-    <widget type="multi_state_led" version="2.0.0">
-      <name>RP Survey</name>
-      <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
-      <x>720</x>
-      <width>114</width>
-      <height>50</height>
-      <font>
-        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
-        </font>
-      </font>
-      <foreground_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </foreground_color>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <square>true</square>
-      <rules>
-        <rule name="Line color" prop_id="line_color" out_exp="false">
-          <exp bool_exp="pvInt0 == 6">
-            <value>
-              <color name="GREEN" red="61" green="216" blue="61">
-              </color>
-            </value>
-          </exp>
-          <pv_name>$(pv_name)</pv_name>
-        </rule>
-      </rules>
-      <states>
-        <state>
-          <value>0</value>
-          <label>$(MODE_RP_SURVEY)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>1</value>
-          <label>$(MODE_RP_SURVEY)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>2</value>
-          <label>$(MODE_RP_SURVEY)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>3</value>
-          <label>$(MODE_RP_SURVEY)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>4</value>
-          <label>$(MODE_RP_SURVEY)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>5</value>
-          <label>$(MODE_RP_SURVEY)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>6</value>
-          <label>$(MODE_RP_SURVEY)</label>
-          <color>
-            <color name="GREEN-BORDER" red="40" green="140" blue="40">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>7</value>
-          <label>$(MODE_RP_SURVEY)</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-      </states>
-      <fallback_label>$(MODE_RP_SURVEY)</fallback_label>
-    </widget>
-    <widget type="multi_state_led" version="2.0.0">
-      <name>Restricted Access</name>
-      <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
-      <x>840</x>
-      <width>114</width>
-      <height>50</height>
-      <font>
-        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
-        </font>
+  </widget>
+  <widget type="multi_state_led" version="2.0.0">
+    <name>Beam On</name>
+    <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
+    <width>220</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="21.0">
       </font>
-      <foreground_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </foreground_color>
-      <line_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </line_color>
-      <square>true</square>
-      <rules>
-        <rule name="Line color" prop_id="line_color" out_exp="false">
-          <exp bool_exp="pvInt0 == 7">
-            <value>
-              <color name="GREEN" red="61" green="216" blue="61">
-              </color>
-            </value>
-          </exp>
-          <pv_name>$(pv_name)</pv_name>
-        </rule>
-      </rules>
-      <states>
-        <state>
-          <value>0</value>
-          <label>Restricted
-Access</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>1</value>
-          <label>Restricted
-Access</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>2</value>
-          <label>Restricted
-Access</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>3</value>
-          <label>Restricted
-Access</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>4</value>
-          <label>Restricted
-Access</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>5</value>
-          <label>Restricted
-Access</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>6</value>
-          <label>Restricted
-Access</label>
-          <color>
-            <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-            </color>
-          </color>
-        </state>
-        <state>
-          <value>7</value>
-          <label>Restricted
-Access</label>
-          <color>
-            <color name="GREEN-BORDER" red="40" green="140" blue="40">
-            </color>
-          </color>
-        </state>
-      </states>
-      <fallback_label>Restricted
-Access</fallback_label>
-    </widget>
+    </font>
+    <foreground_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </foreground_color>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </line_color>
+    <square>true</square>
+    <rules>
+      <rule name="Line color" prop_id="line_color" out_exp="false">
+        <exp bool_exp="pvInt0 == 4">
+          <value>
+            <color name="GREEN" red="61" green="216" blue="61">
+            </color>
+          </value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+    <states>
+      <state>
+        <value>0</value>
+        <label>$(MODE_ALARM)</label>
+        <color>
+          <color name="RED-BORDER" red="150" green="8" blue="16">
+          </color>
+        </color>
+      </state>
+      <state>
+        <value>1</value>
+        <label>$(MODE_OPEN_ACCESS)</label>
+        <color>
+          <color name="GREEN-BORDER" red="40" green="140" blue="40">
+          </color>
+        </color>
+      </state>
+      <state>
+        <value>2</value>
+        <label>Search</label>
+        <color>
+          <color name="GREEN-BORDER" red="40" green="140" blue="40">
+          </color>
+        </color>
+      </state>
+      <state>
+        <value>3</value>
+        <label>$(MODE_TUNNEL_CLOSED)</label>
+        <color>
+          <color name="GREEN-BORDER" red="40" green="140" blue="40">
+          </color>
+        </color>
+      </state>
+      <state>
+        <value>4</value>
+        <label>$(MODE_BEAM_ON)</label>
+        <color>
+          <color name="GREEN-BORDER" red="40" green="140" blue="40">
+          </color>
+        </color>
+      </state>
+      <state>
+        <value>5</value>
+        <label>RM Interlock</label>
+        <color>
+          <color name="GREEN-BORDER" red="40" green="140" blue="40">
+          </color>
+        </color>
+      </state>
+      <state>
+        <value>6</value>
+        <label>$(MODE_RP_SURVEY)</label>
+        <color>
+          <color name="GREEN-BORDER" red="40" green="140" blue="40">
+          </color>
+        </color>
+      </state>
+      <state>
+        <value>7</value>
+        <label>Restricted Access</label>
+        <color>
+          <color name="GREEN-BORDER" red="40" green="140" blue="40">
+          </color>
+        </color>
+      </state>
+    </states>
+    <fallback_label>$(MODE_BEAM_ON)</fallback_label>
   </widget>
 </display>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/rad.bob b/NON-APPROVED/pss1-pss/embedded_displays/rad.bob
index 8c4b2efe..4e6a787a 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/rad.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/rad.bob
@@ -4,38 +4,51 @@
   <macros>
     <RAD_STAT_PV>$(P):Stat</RAD_STAT_PV>
   </macros>
-  <width>30</width>
-  <height>30</height>
+  <width>210</width>
+  <height>50</height>
   <widget type="rectangle" version="2.0.0">
     <name>Rectangle</name>
-    <width>30</width>
-    <height>30</height>
-    <line_width>1</line_width>
+    <width>210</width>
+    <height>50</height>
+    <line_width>0</line_width>
     <line_color>
       <color name="Grid" red="169" green="169" blue="169">
       </color>
     </line_color>
-    <transparent>true</transparent>
+    <background_color>
+      <color name="Background" red="220" green="225" blue="221">
+      </color>
+    </background_color>
   </widget>
   <widget type="symbol" version="2.0.0">
     <name>Symbol</name>
     <pv_name>$(RAD_STAT_PV)</pv_name>
     <symbols>
-      <symbol>../symbols/rad/Ionising_radiation_red.svg</symbol>
-      <symbol>../symbols/rad/Ionising_radiation_grey.svg</symbol>
+      <symbol>../symbols/rad/Ionising radiation red v02.svg</symbol>
+      <symbol>../symbols/rad/Ionising radiation grey v02.svg</symbol>
     </symbols>
-    <x>3</x>
+    <x>9</x>
     <y>3</y>
-    <width>24</width>
-    <height>24</height>
-    <scripts>
-      <script file="tooltip.js" check_connections="false">
-        <pv_name>$(pv_name)</pv_name>
-      </script>
-    </scripts>
+    <width>40</width>
+    <height>40</height>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>LB_RM</name>
+    <text>$(RM)</text>
+    <x>54</x>
+    <width>67</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="20.0">
+      </font>
+    </font>
+    <transparent>false</transparent>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button</name>
+    <name>Details</name>
     <actions>
       <action type="open_display">
         <file>../popups/rad_faceplate.bob</file>
@@ -44,9 +57,14 @@
       </action>
     </actions>
     <pv_name>$(RAD_STAT_PV)</pv_name>
-    <text></text>
-    <width>30</width>
-    <transparent>true</transparent>
-    <tooltip>N/A</tooltip>
+    <text>Details</text>
+    <x>128</x>
+    <y>9</y>
+    <width>70</width>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
+      </font>
+    </font>
+    <tooltip>$(actions)</tooltip>
   </widget>
 </display>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/search.bob b/NON-APPROVED/pss1-pss/embedded_displays/search.bob
index a5dd1d28..3ead7818 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/search.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/search.bob
@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>SEARCH</name>
-  <width>28</width>
-  <height>28</height>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <width>28</width>
-    <height>28</height>
-    <line_width>1</line_width>
-    <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
-      </color>
-    </line_color>
-    <transparent>true</transparent>
-  </widget>
+  <width>35</width>
+  <height>35</height>
   <widget type="symbol" version="2.0.0">
     <name>$(ESOS):SearchButtonStat</name>
     <pv_name>$(ESOS):SearchButtonStat</pv_name>
@@ -21,9 +10,8 @@
       <symbol>../symbols/search/search-person-OFF.svg</symbol>
       <symbol>../symbols/search/search-person-ON.svg</symbol>
     </symbols>
-    <x>3</x>
-    <y>3</y>
-    <width>22</width>
-    <height>22</height>
+    <width>35</width>
+    <height>35</height>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
 </display>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/tooltip.js b/NON-APPROVED/pss1-pss/embedded_displays/tooltip.js
deleted file mode 100644
index 2bdd26bf..00000000
--- a/NON-APPROVED/pss1-pss/embedded_displays/tooltip.js
+++ /dev/null
@@ -1,3 +0,0 @@
-ScriptUtil = org.csstudio.display.builder.runtime.script.ScriptUtil;
-
-ScriptUtil.findWidgetByName(widget, "Action Button").setPropertyValue("tooltip", widget.propPVName().value + "\n" + widget.runtimePropValue().value)
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/waveguide.bob b/NON-APPROVED/pss1-pss/embedded_displays/waveguide.bob
new file mode 100644
index 00000000..f166a0d3
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/embedded_displays/waveguide.bob
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Waveguide</name>
+  <width>64</width>
+  <height>124</height>
+  <widget type="label" version="2.0.0">
+    <name>Title</name>
+    <text>$(WAVEGUIDE)</text>
+    <width>60</width>
+    <height>30</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="19.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Waveguide</name>
+    <x>20</x>
+    <y>39</y>
+    <width>20</width>
+    <height>85</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="Text" red="25" green="25" blue="25">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="Grid" red="169" green="169" blue="169">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>Removable waveguide</name>
+    <pv_name>$(RWG_REMOVED_PV)</pv_name>
+    <x>20</x>
+    <y>57</y>
+    <height>50</height>
+    <off_color>
+      <color name="GREEN-BORDER" red="40" green="140" blue="40">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="GREEN-BORDER" red="40" green="140" blue="40">
+      </color>
+    </on_color>
+    <square>true</square>
+    <rules>
+      <rule name="XPos" prop_id="x" out_exp="false">
+        <exp bool_exp="pvInt0">
+          <value>40</value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+      <rule name="Visibility" prop_id="visible" out_exp="true">
+        <exp bool_exp="True">
+          <expression>not pvInt0</expression>
+        </exp>
+        <pv_name>$(SCP_INSTALLED_PV)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>SCP</name>
+    <pv_name>$(SCP_INSTALLED_PV)</pv_name>
+    <x>4</x>
+    <y>72</y>
+    <width>50</width>
+    <off_color>
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
+      </color>
+    </on_color>
+    <foreground_color>
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
+      </color>
+    </foreground_color>
+    <square>true</square>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="true">
+        <exp bool_exp="not pvInt0">
+          <expression>False</expression>
+        </exp>
+        <exp bool_exp="pvInt1">
+          <expression>True</expression>
+        </exp>
+        <exp bool_exp="True">
+          <expression>pvInt2</expression>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+        <pv_name>$(WAVEGUIDE_ISOLATED_PV)</pv_name>
+        <pv_name>sim://flipflop(1)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+</display>
diff --git a/NON-APPROVED/pss1-pss/popups/PSS1_Legend.bob b/NON-APPROVED/pss1-pss/popups/PSS1_Legend.bob
new file mode 100644
index 00000000..636b7f60
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/popups/PSS1_Legend.bob
@@ -0,0 +1,652 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>PSS 1 Legend</name>
+  <class>PSS 1 Legend</class>
+  <width>640</width>
+  <height>880</height>
+  <grid_visible>false</grid_visible>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_11</name>
+    <x>330</x>
+    <y>71</y>
+    <width>290</width>
+    <height>310</height>
+    <line_width>0</line_width>
+    <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="rectangle" version="2.0.0">
+    <name>Rectangle_7</name>
+    <x>20</x>
+    <y>71</y>
+    <width>290</width>
+    <height>510</height>
+    <line_width>0</line_width>
+    <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="rectangle" version="2.0.0">
+    <name>Rectangle_6</name>
+    <x>20</x>
+    <y>601</y>
+    <width>290</width>
+    <height>260</height>
+    <line_width>0</line_width>
+    <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="rectangle" version="2.0.0">
+    <name>Rectangle_5</name>
+    <width>640</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color red="218" green="110" blue="0">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_8</name>
+    <x>330</x>
+    <y>663</y>
+    <width>290</width>
+    <height>198</height>
+    <line_width>0</line_width>
+    <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="rectangle" version="2.0.0">
+    <name>Rectangle_10</name>
+    <x>330</x>
+    <y>401</y>
+    <width>290</width>
+    <height>242</height>
+    <line_width>0</line_width>
+    <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>Label</name>
+    <class>TITLE</class>
+    <text> PSS1 Legend</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>326</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>Symbol</name>
+    <pv_name>0</pv_name>
+    <symbols>
+      <symbol>../symbols/rad/Ionising radiation red v02.svg</symbol>
+      <symbol>../symbols/rad/Ionising radiation grey v02.svg</symbol>
+    </symbols>
+    <x>46</x>
+    <y>736</y>
+    <width>40</width>
+    <height>40</height>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>Symbol_1</name>
+    <pv_name>0</pv_name>
+    <symbols>
+      <symbol>../symbols/rad/Ionising radiation red v02.svg</symbol>
+      <symbol>../symbols/rad/Ionising radiation grey v02.svg</symbol>
+    </symbols>
+    <x>46</x>
+    <y>796</y>
+    <width>40</width>
+    <height>40</height>
+    <initial_index>1</initial_index>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Zone_6</name>
+    <text>Radiological and Environmental
+Monitoring System</text>
+    <x>20</x>
+    <y>601</y>
+    <width>290</width>
+    <height>118</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>WaveG40_1</name>
+    <text>High radiation or
+Major fault</text>
+    <x>108</x>
+    <y>727</y>
+    <width>179</width>
+    <height>55</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Zone_7</name>
+    <text>RF Distribution System</text>
+    <x>20</x>
+    <y>71</y>
+    <width>290</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>WaveG40_2</name>
+    <text>Normal condition</text>
+    <x>108</x>
+    <y>803</y>
+    <width>179</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>WaveG40_3</name>
+    <text>RFQ &amp; DTL1 RF cell isolation
+needs to be confirmed</text>
+    <x>104</x>
+    <y>250</y>
+    <width>197</width>
+    <height>57</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>WaveG40_4</name>
+    <text>Waveguide is in</text>
+    <x>104</x>
+    <y>149</y>
+    <width>179</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>$(ESOS):SearchButtonStat</name>
+    <symbols>
+      <symbol>../symbols/search/search-person-OFF.svg</symbol>
+      <symbol>../symbols/search/search-person-ON.svg</symbol>
+    </symbols>
+    <x>356</x>
+    <y>578</y>
+    <width>40</width>
+    <height>40</height>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Zone_8</name>
+    <text>Emergency Switch off Button</text>
+    <x>330</x>
+    <y>663</y>
+    <width>290</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>WaveG40_5</name>
+    <text>Pressed</text>
+    <x>418</x>
+    <y>733</y>
+    <width>179</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>WaveG40_6</name>
+    <text>Normal condition</text>
+    <x>418</x>
+    <y>795</y>
+    <width>179</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>$(ESOS):ESOBStat</name>
+    <symbols>
+      <symbol>../symbols/esos/emergency-button-RED.svg</symbol>
+      <symbol>../symbols/esos/emergency-button-OFF.svg</symbol>
+    </symbols>
+    <x>356</x>
+    <y>728</y>
+    <width>40</width>
+    <height>40</height>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>$(ESOS):ESOBStat_1</name>
+    <symbols>
+      <symbol>../symbols/esos/emergency-button-RED.svg</symbol>
+      <symbol>../symbols/esos/emergency-button-OFF.svg</symbol>
+    </symbols>
+    <x>356</x>
+    <y>788</y>
+    <width>40</width>
+    <height>40</height>
+    <initial_index>1</initial_index>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Zone_9</name>
+    <text>Search Button</text>
+    <x>330</x>
+    <y>401</y>
+    <width>280</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>WaveG40_7</name>
+    <text>Pressed</text>
+    <x>418</x>
+    <y>523</y>
+    <width>179</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>WaveG40_8</name>
+    <text>Normal condition</text>
+    <x>418</x>
+    <y>585</y>
+    <width>179</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>$(ESOS):SearchButtonStat_1</name>
+    <symbols>
+      <symbol>../symbols/search/search-person-OFF.svg</symbol>
+      <symbol>../symbols/search/search-person-ON.svg</symbol>
+    </symbols>
+    <x>356</x>
+    <y>518</y>
+    <width>40</width>
+    <height>40</height>
+    <initial_index>1</initial_index>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>MiniMAS1Stat_1</name>
+    <symbols>
+      <symbol>../symbols/door v2/svg/singel-right-open-red.svg</symbol>
+      <symbol>../symbols/door v2/svg/single-right-close-green.svg</symbol>
+      <symbol>symbols/door v2/svg/single-left-close-black.svg</symbol>
+    </symbols>
+    <x>348</x>
+    <y>196</y>
+    <width>60</width>
+    <height>65</height>
+    <initial_index>1</initial_index>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <preserve_ratio>false</preserve_ratio>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>MiniMAS1Stat_2</name>
+    <symbols>
+      <symbol>../symbols/door v2/svg/singel-right-open-red.svg</symbol>
+      <symbol>../symbols/door v2/svg/single-right-close-green.svg</symbol>
+      <symbol>../symbols/door v2/svg/single-right-close-black.svg</symbol>
+    </symbols>
+    <x>348</x>
+    <y>281</y>
+    <width>60</width>
+    <height>65</height>
+    <initial_index>2</initial_index>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <preserve_ratio>false</preserve_ratio>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>MiniMAS1Stat - Locked</name>
+    <pv_name>FEB-090:PSS-PAS-1:MiniMAS1Stat</pv_name>
+    <symbols>
+      <symbol>../symbols/Key/lock_v02.svg</symbol>
+    </symbols>
+    <x>364</x>
+    <y>318</y>
+    <width>30</width>
+    <height>30</height>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pvInt0 != 2">
+          <value>false</value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Zone_10</name>
+    <text>Door</text>
+    <x>330</x>
+    <y>71</y>
+    <width>290</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>WaveG40_9</name>
+    <text>Open</text>
+    <x>418</x>
+    <y>146</y>
+    <width>179</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>WaveG40_10</name>
+    <text>Closed and unlock</text>
+    <x>418</x>
+    <y>236</y>
+    <width>179</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>MiniMAS1Stat</name>
+    <symbols>
+      <symbol>../symbols/door v2/svg/singel-right-open-red.svg</symbol>
+      <symbol>symbols/door v2/svg/single-left-close-green.svg</symbol>
+      <symbol>symbols/door v2/svg/single-left-close-black.svg</symbol>
+    </symbols>
+    <x>348</x>
+    <y>130</y>
+    <width>60</width>
+    <height>65</height>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <preserve_ratio>false</preserve_ratio>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>WaveG40_11</name>
+    <text>Closed and locked</text>
+    <x>418</x>
+    <y>322</y>
+    <width>179</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_1</name>
+    <class>SUBTITLE</class>
+    <text>Overview</text>
+    <x>417</x>
+    <y use_class="true">20</y>
+    <width>203</width>
+    <height use_class="true">30</height>
+    <font use_class="true">
+      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <horizontal_alignment use_class="true">2</horizontal_alignment>
+    <vertical_alignment use_class="true">2</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>DTL-4 waveguide_2</name>
+    <x>57</x>
+    <y>121</y>
+    <width>20</width>
+    <height>85</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="Text" red="25" green="25" blue="25">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="Grid" red="169" green="169" blue="169">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>DTL-4 removable waveguide_1</name>
+    <pv_name>KG-NCG:PSS-Area-1:DTL4_RWG_Removed</pv_name>
+    <x>57</x>
+    <y>139</y>
+    <height>50</height>
+    <off_color>
+      <color name="GREEN-BORDER" red="40" green="140" blue="40">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="GREEN-BORDER" red="40" green="140" blue="40">
+      </color>
+    </on_color>
+    <square>true</square>
+    <rules>
+      <rule name="XPos" prop_id="x" out_exp="false">
+        <exp bool_exp="pvInt0">
+          <value>135</value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+      <rule name="Visibility" prop_id="visible" out_exp="true">
+        <exp bool_exp="True">
+          <expression>not pvInt0</expression>
+        </exp>
+        <pv_name>KG-NCG:PSS-Area-1:DTL4_SCP_Installed</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>DTL-4 waveguide_3</name>
+    <x>56</x>
+    <y>235</y>
+    <width>20</width>
+    <height>85</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="Text" red="25" green="25" blue="25">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="Grid" red="169" green="169" blue="169">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>DTL-4 SCP_2</name>
+    <pv_name>KG-NCG:PSS-Area-1:DTL4_SCP_Installed</pv_name>
+    <x>40</x>
+    <y>268</y>
+    <width>50</width>
+    <off_color>
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
+      </color>
+    </on_color>
+    <foreground_color>
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
+      </color>
+    </foreground_color>
+    <square>true</square>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="true">
+        <exp bool_exp="not pvInt0">
+          <expression>False</expression>
+        </exp>
+        <exp bool_exp="pvInt1">
+          <expression>True</expression>
+        </exp>
+        <exp bool_exp="True">
+          <expression>pvInt2</expression>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+        <pv_name>KG-NCG:PSS-Area-1:DTL4_waveguide_Isolated</pv_name>
+        <pv_name>sim://flipflop(1)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>DTL-4 waveguide_4</name>
+    <x>56</x>
+    <y>349</y>
+    <width>20</width>
+    <height>85</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="Text" red="25" green="25" blue="25">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="Grid" red="169" green="169" blue="169">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>DTL-4 SCP_3</name>
+    <pv_name>KG-NCG:PSS-Area-1:DTL4_SCP_Installed</pv_name>
+    <x>40</x>
+    <y>382</y>
+    <width>50</width>
+    <off_color>
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
+      </color>
+    </on_color>
+    <foreground_color>
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
+      </color>
+    </foreground_color>
+    <square>true</square>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="true">
+        <exp bool_exp="not pvInt0">
+          <expression>False</expression>
+        </exp>
+        <exp bool_exp="pvInt1">
+          <expression>True</expression>
+        </exp>
+        <exp bool_exp="True">
+          <expression>pvInt2</expression>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+        <pv_name>KG-NCG:PSS-Area-1:DTL4_waveguide_Isolated</pv_name>
+        <pv_name>sim://flipflop(1)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>WaveG40_12</name>
+    <text>SCP isolation confirmed</text>
+    <x>104</x>
+    <y>376</y>
+    <width>197</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>DTL-4 waveguide_5</name>
+    <x>56</x>
+    <y>463</y>
+    <width>20</width>
+    <height>85</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color name="Text" red="25" green="25" blue="25">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="Grid" red="169" green="169" blue="169">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>WaveG40_13</name>
+    <text>Waveguide is out
+SCP is out</text>
+    <x>104</x>
+    <y>476</y>
+    <width>197</width>
+    <height>58</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>WaveG40_14</name>
+    <text>Ready to be pressed</text>
+    <x>418</x>
+    <y>456</y>
+    <width>202</width>
+    <height>50</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>$(ESOS):SearchButtonStat_2</name>
+    <symbols>
+      <symbol>../symbols/search/search-person-OFF.svg</symbol>
+      <symbol>../symbols/search/search-person-ON.svg</symbol>
+    </symbols>
+    <x>356</x>
+    <y>458</y>
+    <width>40</width>
+    <height>40</height>
+    <initial_index>1</initial_index>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+</display>
diff --git a/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob b/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob
index f7b913b7..0eee6cd8 100644
--- a/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob
@@ -12,17 +12,15 @@
     <WIRE_PY>../../scripts/wire.py</WIRE_PY>
   </macros>
   <width>1433</width>
-  <height>545</height>
+  <height>555</height>
+  <grid_visible>false</grid_visible>
   <widget type="rectangle" version="2.0.0">
-    <name>Title Rectangle</name>
-    <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
+    <name>Title Rectangle_1</name>
     <width>1433</width>
-    <height use_class="true">50</height>
-    <line_width use_class="true">0</line_width>
-    <background_color use_class="true">
-      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color red="218" green="110" blue="0">
       </color>
     </background_color>
   </widget>
@@ -58,7 +56,7 @@
     <file>$(EMBEDDED_DIAG)/PLC_cabinet.bob</file>
     <x>20</x>
     <y>70</y>
-    <width>260</width>
+    <width>240</width>
     <height>465</height>
     <resize>2</resize>
   </widget>
diff --git a/NON-APPROVED/pss1-pss/popups/diagnostics/RIO123_cabinet_diagnostics.bob b/NON-APPROVED/pss1-pss/popups/diagnostics/RIO123_cabinet_diagnostics.bob
index dce7fb19..4007a6a9 100644
--- a/NON-APPROVED/pss1-pss/popups/diagnostics/RIO123_cabinet_diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/popups/diagnostics/RIO123_cabinet_diagnostics.bob
@@ -8,17 +8,15 @@
     <PLC_SYMBOLS>../../symbols/plc</PLC_SYMBOLS>
   </macros>
   <width>1433</width>
-  <height>470</height>
+  <height>476</height>
+  <grid_visible>false</grid_visible>
   <widget type="rectangle" version="2.0.0">
-    <name>Title Rectangle</name>
-    <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
-    <width>1423</width>
-    <height use_class="true">50</height>
-    <line_width use_class="true">0</line_width>
-    <background_color use_class="true">
-      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+    <name>Title Rectangle_1</name>
+    <width>1433</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color red="218" green="110" blue="0">
       </color>
     </background_color>
   </widget>
diff --git a/NON-APPROVED/pss1-pss/popups/diagnostics/RIO4_cabinet_diagnostics.bob b/NON-APPROVED/pss1-pss/popups/diagnostics/RIO4_cabinet_diagnostics.bob
index e13e9413..61d2c58d 100644
--- a/NON-APPROVED/pss1-pss/popups/diagnostics/RIO4_cabinet_diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/popups/diagnostics/RIO4_cabinet_diagnostics.bob
@@ -8,18 +8,16 @@
     <PLC>FEB-090:PSS-PLC-1</PLC>
     <PLC_SYMBOLS>../../symbols/plc</PLC_SYMBOLS>
   </macros>
-  <width>648</width>
-  <height>461</height>
+  <width>658</width>
+  <height>471</height>
+  <grid_visible>false</grid_visible>
   <widget type="rectangle" version="2.0.0">
-    <name>Title Rectangle</name>
-    <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
-    <width>648</width>
-    <height use_class="true">50</height>
-    <line_width use_class="true">0</line_width>
-    <background_color use_class="true">
-      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+    <name>Title Rectangle_1</name>
+    <width>658</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color red="218" green="110" blue="0">
       </color>
     </background_color>
   </widget>
@@ -29,7 +27,7 @@
     <text>PSS1 $(CABINET) Cabinet Diagnostics</text>
     <x use_class="true">20</x>
     <y use_class="true">0</y>
-    <width>628</width>
+    <width>580</width>
     <height use_class="true">50</height>
     <font use_class="true">
       <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
diff --git a/NON-APPROVED/pss1-pss/popups/diagnostics/RIO5_cabinet_diagnostics.bob b/NON-APPROVED/pss1-pss/popups/diagnostics/RIO5_cabinet_diagnostics.bob
index 51394d86..6579d015 100644
--- a/NON-APPROVED/pss1-pss/popups/diagnostics/RIO5_cabinet_diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/popups/diagnostics/RIO5_cabinet_diagnostics.bob
@@ -8,18 +8,16 @@
     <PLC>FEB-090:PSS-PLC-1</PLC>
     <PLC_SYMBOLS>../../symbols/plc</PLC_SYMBOLS>
   </macros>
-  <width>1376</width>
-  <height>485</height>
+  <width>1386</width>
+  <height>495</height>
+  <grid_visible>false</grid_visible>
   <widget type="rectangle" version="2.0.0">
-    <name>Title Rectangle</name>
-    <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
-    <width>1376</width>
-    <height use_class="true">50</height>
-    <line_width use_class="true">0</line_width>
-    <background_color use_class="true">
-      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+    <name>Title Rectangle_1</name>
+    <width>1386</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color red="218" green="110" blue="0">
       </color>
     </background_color>
   </widget>
diff --git a/NON-APPROVED/pss1-pss/popups/key_exchange.bob b/NON-APPROVED/pss1-pss/popups/key_exchange.bob
index 4a9454ca..8d05d2fd 100644
--- a/NON-APPROVED/pss1-pss/popups/key_exchange.bob
+++ b/NON-APPROVED/pss1-pss/popups/key_exchange.bob
@@ -4,18 +4,52 @@
   <macros>
     <SYMBOLS>../symbols</SYMBOLS>
   </macros>
-  <width>980</width>
-  <height>835</height>
+  <width>1827</width>
+  <height>973</height>
+  <grid_visible>false</grid_visible>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_1</name>
+    <x>350</x>
+    <y>70</y>
+    <width>1457</width>
+    <height>883</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-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_29</name>
+    <x>20</x>
+    <y>70</y>
+    <width>310</width>
+    <height>130</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-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
   <widget type="rectangle" version="2.0.0">
     <name>Title Rectangle</name>
-    <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
-    <width>980</width>
-    <height use_class="true">50</height>
-    <line_width use_class="true">0</line_width>
-    <background_color use_class="true">
-      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+    <width>1827</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color red="218" green="110" blue="0">
       </color>
     </background_color>
   </widget>
@@ -43,1442 +77,920 @@
   <widget type="embedded" version="2.0.0">
     <name>Operation Mode</name>
     <file>../embedded_displays/operation_mode.bob</file>
-    <x>10</x>
-    <y>60</y>
-    <width>960</width>
-    <height>56</height>
+    <x>60</x>
+    <y>125</y>
+    <width>220</width>
+    <height>50</height>
     <resize>2</resize>
   </widget>
-  <widget type="group" version="2.0.0">
-    <name>Legend</name>
-    <x>10</x>
-    <y>275</y>
-    <width>290</width>
-    <height>300</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>Rectangle</name>
-      <width>290</width>
-      <height>300</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>Title</name>
-      <class>GROUP-TITLE</class>
-      <text>Legend</text>
-      <width>290</width>
-      <height use_class="true">30</height>
-      <font use_class="true">
-        <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-        </font>
+  <widget type="label" version="2.0.0">
+    <name>Zone_6</name>
+    <text>PSS1 Mode of Operation</text>
+    <x>20</x>
+    <y>70</y>
+    <width>300</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
       </font>
-      <foreground_color use_class="true">
-        <color name="GROUP-TEXT" red="25" green="25" blue="25">
-        </color>
-      </foreground_color>
-      <horizontal_alignment use_class="true">1</horizontal_alignment>
-      <vertical_alignment use_class="true">1</vertical_alignment>
-      <wrap_words use_class="true">false</wrap_words>
-    </widget>
-    <widget type="group" version="2.0.0">
-      <name>Content Group</name>
-      <x>10</x>
-      <y>40</y>
-      <width>270</width>
-      <height>250</height>
-      <style>3</style>
-      <transparent>true</transparent>
-      <widget type="rectangle" version="2.0.0">
-        <name>Content Rectangle</name>
-        <width>270</width>
-        <height>250</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="Background" red="220" green="225" blue="221">
-          </color>
-        </background_color>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Mech interlock symbol</name>
-        <x>10</x>
-        <y>10</y>
-        <width>80</width>
-        <height>50</height>
-        <points>
-          <point x="0.0" y="25.0">
-          </point>
-          <point x="80.0" y="25.0">
-          </point>
-        </points>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>Mech interlock label</name>
-        <text>The connected slots are mechanically interlocked</text>
-        <x>100</x>
-        <y>10</y>
-        <width>160</width>
-        <height>50</height>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Same key connection symbol</name>
-        <x>10</x>
-        <y>70</y>
-        <width>80</width>
-        <height>50</height>
-        <points>
-          <point x="0.0" y="25.0">
-          </point>
-          <point x="80.0" y="25.0">
-          </point>
-        </points>
-        <line_width>1</line_width>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-        <line_style>1</line_style>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>Same key connection label</name>
-        <text>The connected slots can be selected by the same key</text>
-        <x>100</x>
-        <y>70</y>
-        <width>160</width>
-        <height>50</height>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="picture" version="2.0.0">
-        <name>Locked symbol</name>
-        <file>$(SYMBOLS)/Key/lock.svg</file>
-        <x>10</x>
-        <y>130</y>
-        <width>80</width>
-        <height>30</height>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>Locked label</name>
-        <text>Keys locked with solenoid</text>
-        <x>100</x>
-        <y>130</y>
-        <width>160</width>
-        <height>30</height>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>Home symbol</name>
-        <x>10</x>
-        <y>170</y>
-        <width>30</width>
-        <height>30</height>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </on_color>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>Slash</name>
-        <text>/</text>
-        <x>40</x>
-        <y>170</y>
-        <width>20</width>
-        <height>30</height>
-        <font>
-          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-          </font>
-        </font>
-        <horizontal_alignment>1</horizontal_alignment>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>Other symbol</name>
-        <x>60</x>
-        <y>170</y>
-        <width>30</width>
-        <height>30</height>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </on_color>
-        <square>true</square>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>Home - other label</name>
-        <text>Home / Other position</text>
-        <x>100</x>
-        <y>170</y>
-        <width>160</width>
-        <height>30</height>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>ON circle symbol</name>
-        <x>10</x>
-        <y>210</y>
-        <width>30</width>
-        <height>30</height>
-        <off_color>
-          <color name="On" red="70" green="255" blue="70">
-          </color>
-        </off_color>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>ON slash</name>
-        <text>/</text>
-        <x>40</x>
-        <y>210</y>
-        <width>20</width>
-        <height>30</height>
-        <font>
-          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-          </font>
-        </font>
-        <horizontal_alignment>1</horizontal_alignment>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>ON square symbol</name>
-        <x>60</x>
-        <y>210</y>
-        <width>30</width>
-        <height>30</height>
-        <off_color>
-          <color name="On" red="70" green="255" blue="70">
-          </color>
-        </off_color>
-        <square>true</square>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>ON label</name>
-        <text>Key inserted in position ON</text>
-        <x>100</x>
-        <y>210</y>
-        <width>160</width>
-        <height>30</height>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-    </widget>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
   </widget>
-  <widget type="group" version="2.0.0">
-    <name>Key Exchange</name>
-    <x>310</x>
-    <y>130</y>
-    <width>660</width>
-    <height>695</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="polyline" version="2.0.0">
-      <name>RP Line</name>
-      <x>10</x>
-      <y>320</y>
-      <width>70</width>
-      <height>30</height>
-      <points>
-        <point x="35.0" y="0.0">
-        </point>
-        <point x="35.0" y="30.0">
-        </point>
-      </points>
-      <line_color>
-        <color name="BLACK" red="0" green="0" blue="0">
-        </color>
-      </line_color>
-    </widget>
-    <widget type="polyline" version="2.0.0">
-      <name>RA Line</name>
-      <x>100</x>
-      <y>320</y>
-      <width>135</width>
-      <height>215</height>
-      <points>
-        <point x="35.0" y="0.0">
-        </point>
-        <point x="35.0" y="215.0">
-        </point>
-        <point x="135.0" y="215.0">
-        </point>
-      </points>
-      <line_color>
-        <color name="BLACK" red="0" green="0" blue="0">
-        </color>
-      </line_color>
-    </widget>
-    <widget type="polyline" version="2.0.0">
-      <name>Line 1</name>
-      <x>225</x>
-      <y>70</y>
-      <width>270</width>
-      <height>280</height>
-      <points>
-        <point x="0.0" y="280.0">
-        </point>
-        <point x="0.0" y="0.0">
-        </point>
-        <point x="269.99999999999994" y="0.0">
-        </point>
-      </points>
-      <line_color>
-        <color name="BLACK" red="0" green="0" blue="0">
-        </color>
-      </line_color>
-    </widget>
-    <widget type="group" version="2.0.0">
-      <name>Main key</name>
-      <x>30</x>
-      <width>240</width>
-      <height>115</height>
-      <style>3</style>
-      <background_color>
-        <color name="GRAY" red="169" green="169" blue="169">
-        </color>
-      </background_color>
-      <widget type="label" version="2.0.0">
-        <name>Main Key</name>
-        <class>HEADER3</class>
-        <text>Main Key</text>
-        <width>230</width>
-        <height>25</height>
-        <font use_class="true">
-          <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
-          </font>
-        </font>
-        <foreground_color use_class="true">
-          <color name="Text" red="25" green="25" blue="25">
-          </color>
-        </foreground_color>
-        <horizontal_alignment>1</horizontal_alignment>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Dashed Line</name>
-        <x>60</x>
-        <y>50</y>
-        <width>120</width>
-        <height>40</height>
-        <points>
-          <point x="0.0" y="20.0">
-          </point>
-          <point x="120.0" y="20.0">
-          </point>
-        </points>
-        <line_width>1</line_width>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-        <line_style>1</line_style>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Line Down</name>
-        <x>170</x>
-        <y>85</y>
-        <width>50</width>
-        <height>30</height>
-        <points>
-          <point x="25.0" y="0.0">
-          </point>
-          <point x="25.0" y="30.0">
-          </point>
-        </points>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Line Right</name>
-        <x>215</x>
-        <y>50</y>
-        <width>25</width>
-        <height>40</height>
-        <points>
-          <point x="0.0" y="20.0">
-          </point>
-          <point x="25.0" y="20.0">
-          </point>
-        </points>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>MainKeySlot1</name>
-        <pv_name>FEB-020Row:CnPw-U-005:MainKeySlot1</pv_name>
-        <x>10</x>
-        <y>35</y>
-        <width>70</width>
-        <height>70</height>
-        <off_label>ON</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>ON</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>MainKeySlot2</name>
-        <pv_name>FEB-020Row:CnPw-U-005:MainKeySlot2</pv_name>
-        <x>160</x>
-        <y>35</y>
-        <width>70</width>
-        <height>70</height>
-        <off_label>OFF</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>OFF</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-        <square>true</square>
-      </widget>
-      <widget type="symbol" version="2.0.0">
-        <name>MainKeyLocked</name>
-        <pv_name>FEB-020Row:CnPw-U-005:MainKeyLocked</pv_name>
-        <symbols>
-          <symbol>$(SYMBOLS)/Key/lock.svg</symbol>
-        </symbols>
-        <x>203</x>
-        <y>80</y>
-        <width>30</width>
-        <height>30</height>
-        <rules>
-          <rule name="Visibility" prop_id="visible" out_exp="true">
-            <exp bool_exp="True">
-              <expression>pvInt0</expression>
-            </exp>
-            <pv_name>$(pv_name)</pv_name>
-          </rule>
-        </rules>
-      </widget>
-    </widget>
-    <widget type="group" version="2.0.0">
-      <name>Shield configuration</name>
-      <x>490</x>
-      <width>170</width>
-      <height>460</height>
-      <style>3</style>
-      <background_color>
-        <color name="GRAY" red="169" green="169" blue="169">
-        </color>
-      </background_color>
-      <widget type="label" version="2.0.0">
-        <name>Shield Configuration</name>
-        <class>HEADER3</class>
-        <text>Shield Configuration</text>
-        <width>170</width>
-        <height>25</height>
-        <font use_class="true">
-          <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
-          </font>
-        </font>
-        <foreground_color use_class="true">
-          <color name="Text" red="25" green="25" blue="25">
-          </color>
-        </foreground_color>
-        <horizontal_alignment>1</horizontal_alignment>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>SC Line</name>
-        <x>50</x>
-        <y>70</y>
-        <width>70</width>
-        <height>355</height>
-        <points>
-          <point x="35.0" y="0.0">
-          </point>
-          <point x="35.0" y="355.0">
-          </point>
-        </points>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Line Left</name>
-        <y>35</y>
-        <width>55</width>
-        <height>70</height>
-        <points>
-          <point x="0.0" y="35.0">
-          </point>
-          <point x="55.0" y="35.0">
-          </point>
-        </points>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>ShieldConfigKeyMain</name>
-        <pv_name>FEB-020Row:CnPw-U-005:ShieldConfigKeyMain</pv_name>
-        <x>50</x>
-        <y>35</y>
-        <width>70</width>
-        <height>70</height>
-        <off_label>Config.
-Mgmt
-key</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>Config.
-Mgmt
-key</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-        <tooltip>Config. Management key
-$(pv_name)
-$(pv_value)</tooltip>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>ShieldConfigKeyMode</name>
-        <pv_name>FEB-020Row:CnPw-U-005:ShieldConfigKeyMode</pv_name>
-        <x>50</x>
-        <y>140</y>
-        <width>70</width>
-        <height>70</height>
-        <off_label>Shielding
-Config.
-Mgmt</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>Shielding
-Config.
-Mgmt</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-        <tooltip>Shielding Config. Management
-$(pv_name)
-$(pv_value)</tooltip>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>TSWKey</name>
-        <pv_name>FEB-020Row:CnPw-U-005:TSWKey</pv_name>
-        <x>50</x>
-        <y>220</y>
-        <width>70</width>
-        <height>70</height>
-        <off_label>TSW
-key</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>TSW
-key</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-        <tooltip>Temporary Shielding wall Key
-$(pv_name)
-$(pv_value)</tooltip>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>SpareKey1</name>
-        <pv_name>FEB-020Row:CnPw-U-005:SpareKey1</pv_name>
-        <x>50</x>
-        <y>300</y>
-        <width>70</width>
-        <height>70</height>
-        <off_label>Spare
-key</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>Spare
-key</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-        <tooltip>Spare key
-$(pv_name)
-$(pv_value)</tooltip>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>SpareKey2</name>
-        <pv_name>FEB-020Row:CnPw-U-005:SpareKey2</pv_name>
-        <x>50</x>
-        <y>380</y>
-        <width>70</width>
-        <height>70</height>
-        <off_label>Spare
-key</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>Spare
-key</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-        <tooltip>Spare key
-$(pv_name)
-$(pv_value)</tooltip>
-      </widget>
-    </widget>
-    <widget type="group" version="2.0.0">
-      <name>Mode selection key</name>
-      <y>125</y>
-      <width>360</width>
-      <style>3</style>
-      <background_color>
-        <color name="GRAY" red="169" green="169" blue="169">
-        </color>
-      </background_color>
-      <widget type="label" version="2.0.0">
-        <name>Mode Selection Key</name>
-        <class>HEADER3</class>
-        <text>Mode Selection Key</text>
-        <width>200</width>
-        <height>25</height>
-        <font use_class="true">
-          <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
-          </font>
-        </font>
-        <foreground_color use_class="true">
-          <color name="Text" red="25" green="25" blue="25">
-          </color>
-        </foreground_color>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Line Mode</name>
-        <x>190</x>
-        <width>70</width>
-        <height>30</height>
-        <points>
-          <point x="35.0" y="0.0">
-          </point>
-          <point x="35.0" y="30.0">
-          </point>
-        </points>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Dashed Line 1</name>
-        <x>10</x>
-        <y>110</y>
-        <width>340</width>
-        <height>40</height>
-        <points>
-          <point x="35.0" y="40.0">
-          </point>
-          <point x="35.0" y="0.0">
-          </point>
-          <point x="125.0" y="0.0">
-          </point>
-          <point x="125.0" y="40.0">
-          </point>
-        </points>
-        <line_width>1</line_width>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-        <line_style>1</line_style>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Dashed Line 2</name>
-        <x>10</x>
-        <y>80</y>
-        <width>340</width>
-        <height>70</height>
-        <points>
-          <point x="215.0" y="0.0">
-          </point>
-          <point x="215.0" y="70.0">
-          </point>
-        </points>
-        <line_width>1</line_width>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-        <line_style>1</line_style>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Dashed Line 3</name>
-        <x>10</x>
-        <y>110</y>
-        <width>340</width>
-        <height>40</height>
-        <points>
-          <point x="125.0" y="0.0">
-          </point>
-          <point x="305.0" y="0.0">
-          </point>
-          <point x="305.0" y="40.0">
-          </point>
-        </points>
-        <line_width>1</line_width>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-        <line_style>1</line_style>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Line RP</name>
-        <x>10</x>
-        <y>185</y>
-        <width>70</width>
-        <height>15</height>
-        <points>
-          <point x="35.0" y="0.0">
-          </point>
-          <point x="35.0" y="15.0">
-          </point>
-        </points>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Line RA</name>
-        <x>100</x>
-        <y>185</y>
-        <width>70</width>
-        <height>15</height>
-        <points>
-          <point x="35.0" y="0.0">
-          </point>
-          <point x="35.0" y="15.0">
-          </point>
-        </points>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Line Search</name>
-        <x>190</x>
-        <y>185</y>
-        <width>70</width>
-        <height>15</height>
-        <points>
-          <point x="35.0" y="0.0">
-          </point>
-          <point x="35.0" y="15.0">
-          </point>
-        </points>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>ModeKeyHome</name>
-        <pv_name>FEB-020Row:CnPw-U-005:ModeKeyHome</pv_name>
-        <x>190</x>
-        <y>25</y>
-        <width>70</width>
-        <height>70</height>
-        <off_label>Mode
-Key</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>Mode
-Key</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>ModeKeyRPM</name>
-        <pv_name>FEB-020Row:CnPw-U-005:ModeKeyRPM</pv_name>
-        <x>10</x>
-        <y>140</y>
-        <width>70</width>
-        <height>50</height>
-        <off_label>RP
+  <widget type="symbol" version="2.0.0">
+    <name>Symbol</name>
+    <symbols>
+      <symbol>../symbols/map/Key_Exchange_v03.svg</symbol>
+    </symbols>
+    <x>381</x>
+    <y>120</y>
+    <width>1396</width>
+    <height>805</height>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>MainKeySlot1</name>
+    <pv_name>FEB-020Row:CnPw-U-005:MainKeySlot1</pv_name>
+    <x>559</x>
+    <y>183</y>
+    <width>80</width>
+    <height>80</height>
+    <off_label>ON</off_label>
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>ON</on_label>
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>MainKeySlot2</name>
+    <pv_name>FEB-020Row:CnPw-U-005:MainKeySlot2</pv_name>
+    <x>741</x>
+    <y>183</y>
+    <width>80</width>
+    <height>80</height>
+    <off_label>OFF</off_label>
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>OFF</on_label>
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>ModeKeyRPM</name>
+    <pv_name>FEB-020Row:CnPw-U-005:ModeKeyRPM</pv_name>
+    <x>559</x>
+    <y>505</y>
+    <width>80</width>
+    <height>60</height>
+    <off_label>RP
 Survey</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>RP
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>RP
 Survey</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-        <square>true</square>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>ModeKeyRAM</name>
-        <pv_name>FEB-020Row:CnPw-U-005:ModeKeyRAM</pv_name>
-        <x>100</x>
-        <y>140</y>
-        <width>70</width>
-        <height>50</height>
-        <off_label>Restricted
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>ModeKeyRAM</name>
+    <pv_name>FEB-020Row:CnPw-U-005:ModeKeyRAM</pv_name>
+    <x>680</x>
+    <y>505</y>
+    <width>80</width>
+    <height>60</height>
+    <off_label>Restricted
 Access</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>Restricted
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>Restricted
 Access</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-        <square>true</square>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>ModeKeySM</name>
-        <pv_name>FEB-020Row:CnPw-U-005:ModeKeySM</pv_name>
-        <x>190</x>
-        <y>140</y>
-        <width>70</width>
-        <height>50</height>
-        <off_label>Search</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>Search</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-        <square>true</square>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>ModeKeyOAM</name>
-        <pv_name>FEB-020Row:CnPw-U-005:ModeKeyOAM</pv_name>
-        <x>280</x>
-        <y>140</y>
-        <width>70</width>
-        <height>50</height>
-        <off_label>Open
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>ModeKeySM</name>
+    <pv_name>FEB-020Row:CnPw-U-005:ModeKeySM</pv_name>
+    <x>799</x>
+    <y>505</y>
+    <width>80</width>
+    <height>60</height>
+    <off_label>Search</off_label>
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>Search</on_label>
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>ModeKeyOAM</name>
+    <pv_name>FEB-020Row:CnPw-U-005:ModeKeyOAM</pv_name>
+    <x>917</x>
+    <y>504</y>
+    <width>80</width>
+    <height>60</height>
+    <off_label>Open
 Access</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>Open
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>Open
 Access</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-        <square>true</square>
-      </widget>
-    </widget>
-    <widget type="group" version="2.0.0">
-      <name>Entry key unlock</name>
-      <y>345</y>
-      <width>360</width>
-      <height>120</height>
-      <style>3</style>
-      <background_color>
-        <color name="GRAY" red="169" green="169" blue="169">
-        </color>
-      </background_color>
-      <widget type="label" version="2.0.0">
-        <name>Entry Key Unlock</name>
-        <class>HEADER3</class>
-        <text>Entry Key Unlock</text>
-        <width>360</width>
-        <height>25</height>
-        <font use_class="true">
-          <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
-          </font>
-        </font>
-        <foreground_color use_class="true">
-          <color name="Text" red="25" green="25" blue="25">
-          </color>
-        </foreground_color>
-        <horizontal_alignment>2</horizontal_alignment>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Dashed Line 1</name>
-        <x>10</x>
-        <y>80</y>
-        <width>250</width>
-        <height>30</height>
-        <points>
-          <point x="35.0" y="0.0">
-          </point>
-          <point x="35.0" y="25.0">
-          </point>
-          <point x="215.0" y="25.0">
-          </point>
-          <point x="215.0" y="0.0">
-          </point>
-        </points>
-        <line_width>1</line_width>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-        <line_style>1</line_style>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Line RP</name>
-        <x>10</x>
-        <width>70</width>
-        <height>30</height>
-        <points>
-          <point x="35.0" y="0.0">
-          </point>
-          <point x="35.0" y="30.0">
-          </point>
-        </points>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Line RA</name>
-        <x>100</x>
-        <width>70</width>
-        <height>30</height>
-        <points>
-          <point x="35.0" y="0.0">
-          </point>
-          <point x="35.0" y="30.0">
-          </point>
-        </points>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Line Search</name>
-        <x>190</x>
-        <width>70</width>
-        <height>30</height>
-        <points>
-          <point x="35.0" y="0.0">
-          </point>
-          <point x="35.0" y="30.0">
-          </point>
-        </points>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Dashed Line RA</name>
-        <x>100</x>
-        <y>85</y>
-        <width>70</width>
-        <height>35</height>
-        <points>
-          <point x="35.0" y="0.0">
-          </point>
-          <point x="35.0" y="35.0">
-          </point>
-        </points>
-        <line_width>1</line_width>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-        <line_style>1</line_style>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>RPKey</name>
-        <pv_name>FEB-020Row:CnPw-U-005:RPKey</pv_name>
-        <x>10</x>
-        <y>25</y>
-        <width>70</width>
-        <height>70</height>
-        <off_label>RP
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>ModeKeyHome</name>
+    <pv_name>FEB-020Row:CnPw-U-005:ModeKeyHome</pv_name>
+    <x>739</x>
+    <y>380</y>
+    <width>80</width>
+    <height>80</height>
+    <off_label>Mode
 Key</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>RP
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>Mode
 Key</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>RAKey</name>
-        <pv_name>FEB-020Row:CnPw-U-005:RAKey</pv_name>
-        <x>100</x>
-        <y>25</y>
-        <width>70</width>
-        <height>70</height>
-        <off_label>RA
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>RPKey</name>
+    <pv_name>FEB-020Row:CnPw-U-005:RPKey</pv_name>
+    <x>559</x>
+    <y>690</y>
+    <width>80</width>
+    <height>80</height>
+    <off_label>RP
 Key</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>RA
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>RP
 Key</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>SMKey</name>
-        <pv_name>FEB-020Row:CnPw-U-005:SMKey</pv_name>
-        <x>190</x>
-        <y>25</y>
-        <width>70</width>
-        <height>70</height>
-        <off_label>Search
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>RAKey</name>
+    <pv_name>FEB-020Row:CnPw-U-005:RAKey</pv_name>
+    <x>680</x>
+    <y>690</y>
+    <width>80</width>
+    <height>80</height>
+    <off_label>RA
 Key</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>Search
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>RA
 Key</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-      </widget>
-    </widget>
-    <widget type="group" version="2.0.0">
-      <name>FEB PAS</name>
-      <x>90</x>
-      <y>465</y>
-      <width>90</width>
-      <height>115</height>
-      <style>3</style>
-      <background_color>
-        <color name="GRAY" red="169" green="169" blue="169">
-        </color>
-      </background_color>
-      <widget type="polyline" version="2.0.0">
-        <name>Dashed Line</name>
-        <x>10</x>
-        <width>70</width>
-        <height>40</height>
-        <points>
-          <point x="35.0" y="0.0">
-          </point>
-          <point x="35.0" y="40.0">
-          </point>
-        </points>
-        <line_width>1</line_width>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-        <line_style>1</line_style>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Line Right</name>
-        <x>75</x>
-        <y>35</y>
-        <width>15</width>
-        <height>70</height>
-        <points>
-          <point x="0.0" y="35.0">
-          </point>
-          <point x="15.0" y="35.0">
-          </point>
-        </points>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>FEBKeySlot</name>
-        <pv_name>FEB-090:PSS-PAS-1:FEBKeySlot</pv_name>
-        <x>10</x>
-        <y>35</y>
-        <width>70</width>
-        <height>70</height>
-        <off_label>FEB
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>SMKey</name>
+    <pv_name>FEB-020Row:CnPw-U-005:SMKey</pv_name>
+    <x>799</x>
+    <y>690</y>
+    <width>80</width>
+    <height>80</height>
+    <off_label>Search
+Key</off_label>
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>Search
+Key</on_label>
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>FEBKeySlot</name>
+    <pv_name>FEB-090:PSS-PAS-1:FEBKeySlot</pv_name>
+    <x>680</x>
+    <y>810</y>
+    <width>80</width>
+    <height>80</height>
+    <off_label>FEB
 PAS</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>FEB
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>FEB
 PAS</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-        <square>true</square>
-      </widget>
-    </widget>
-    <widget type="group" version="2.0.0">
-      <name>Entry keys</name>
-      <x>200</x>
-      <y>475</y>
-      <width>360</width>
-      <height>105</height>
-      <style>3</style>
-      <background_color>
-        <color name="GRAY" red="169" green="169" blue="169">
-        </color>
-      </background_color>
-      <widget type="label" version="2.0.0">
-        <name>Entry Keys</name>
-        <class>HEADER3</class>
-        <text>Entry Keys</text>
-        <width>360</width>
-        <height>25</height>
-        <font use_class="true">
-          <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
-          </font>
-        </font>
-        <foreground_color use_class="true">
-          <color name="Text" red="25" green="25" blue="25">
-          </color>
-        </foreground_color>
-        <horizontal_alignment>1</horizontal_alignment>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Line</name>
-        <y>25</y>
-        <width>340</width>
-        <height>70</height>
-        <points>
-          <point x="0.0" y="35.0">
-          </point>
-          <point x="305.0" y="35.0">
-          </point>
-        </points>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>EntryKey1</name>
-        <pv_name>FEB-090:PSS-PAS-1:EntryKey1</pv_name>
-        <x>10</x>
-        <y>25</y>
-        <width>70</width>
-        <height>70</height>
-        <off_label>Entry key
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>EntryKey1</name>
+    <pv_name>FEB-090:PSS-PAS-1:EntryKey1</pv_name>
+    <x>1122</x>
+    <y>810</y>
+    <width>80</width>
+    <height>80</height>
+    <off_label>Entry key
 1</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>Entry key
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>Entry key
 1</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-      </widget>
-      <widget type="symbol" version="2.0.0">
-        <name>EntryKey1Locked</name>
-        <pv_name>FEB-090:PSS-PAS-1:EntryKey1Locked</pv_name>
-        <symbols>
-          <symbol>$(SYMBOLS)/Key/lock.svg</symbol>
-        </symbols>
-        <x>55</x>
-        <y>70</y>
-        <width>30</width>
-        <height>30</height>
-        <rules>
-          <rule name="Visibility" prop_id="visible" out_exp="true">
-            <exp bool_exp="True">
-              <expression>pvInt0</expression>
-            </exp>
-            <pv_name>$(pv_name)</pv_name>
-          </rule>
-        </rules>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>EntryKey2</name>
-        <pv_name>FEB-090:PSS-PAS-1:EntryKey2</pv_name>
-        <x>100</x>
-        <y>25</y>
-        <width>70</width>
-        <height>70</height>
-        <off_label>Entry key
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>EntryKey2</name>
+    <pv_name>FEB-090:PSS-PAS-1:EntryKey2</pv_name>
+    <x>1237</x>
+    <y>810</y>
+    <width>80</width>
+    <height>80</height>
+    <off_label>Entry key
 2</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>Entry key
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>Entry key
 2</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-      </widget>
-      <widget type="symbol" version="2.0.0">
-        <name>EntryKey2Locked</name>
-        <pv_name>FEB-090:PSS-PAS-1:EntryKey2Locked</pv_name>
-        <symbols>
-          <symbol>$(SYMBOLS)/Key/lock.svg</symbol>
-        </symbols>
-        <x>145</x>
-        <y>70</y>
-        <width>30</width>
-        <height>30</height>
-        <rules>
-          <rule name="Visibility" prop_id="visible" out_exp="true">
-            <exp bool_exp="True">
-              <expression>pvInt0</expression>
-            </exp>
-            <pv_name>$(pv_name)</pv_name>
-          </rule>
-        </rules>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>EntryKey3</name>
-        <pv_name>FEB-090:PSS-PAS-1:EntryKey3</pv_name>
-        <x>190</x>
-        <y>25</y>
-        <width>70</width>
-        <height>70</height>
-        <off_label>Entry key
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>EntryKey3</name>
+    <pv_name>FEB-090:PSS-PAS-1:EntryKey3</pv_name>
+    <x>1351</x>
+    <y>810</y>
+    <width>80</width>
+    <height>80</height>
+    <off_label>Entry key
 3</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>Entry key
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>Entry key
 3</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>EntryKey4</name>
-        <pv_name>FEB-090:PSS-PAS-1:EntryKey4</pv_name>
-        <x>280</x>
-        <y>25</y>
-        <width>70</width>
-        <height>70</height>
-        <off_label>Entry key
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>EntryKey4</name>
+    <pv_name>FEB-090:PSS-PAS-1:EntryKey4</pv_name>
+    <x>1461</x>
+    <y>810</y>
+    <width>80</width>
+    <height>80</height>
+    <off_label>Entry key
 4</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>Entry key
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>Entry key
 4</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-      </widget>
-      <widget type="symbol" version="2.0.0">
-        <name>EntryKey3Locked</name>
-        <pv_name>FEB-090:PSS-PAS-1:EntryKey3Locked</pv_name>
-        <symbols>
-          <symbol>$(SYMBOLS)/Key/lock.svg</symbol>
-        </symbols>
-        <x>235</x>
-        <y>70</y>
-        <width>30</width>
-        <height>30</height>
-        <rules>
-          <rule name="Visibility" prop_id="visible" out_exp="true">
-            <exp bool_exp="True">
-              <expression>pvInt0</expression>
-            </exp>
-            <pv_name>$(pv_name)</pv_name>
-          </rule>
-        </rules>
-      </widget>
-      <widget type="symbol" version="2.0.0">
-        <name>EntryKey4Locked</name>
-        <pv_name>FEB-090:PSS-PAS-1:EntryKey4Locked</pv_name>
-        <symbols>
-          <symbol>$(SYMBOLS)/Key/lock.svg</symbol>
-        </symbols>
-        <x>325</x>
-        <y>70</y>
-        <width>30</width>
-        <height>30</height>
-        <rules>
-          <rule name="Visibility" prop_id="visible" out_exp="true">
-            <exp bool_exp="True">
-              <expression>pvInt0</expression>
-            </exp>
-            <pv_name>$(pv_name)</pv_name>
-          </rule>
-        </rules>
-      </widget>
-    </widget>
-    <widget type="group" version="2.0.0">
-      <name>Access veto key</name>
-      <x>200</x>
-      <y>590</y>
-      <width>210</width>
-      <height>105</height>
-      <style>3</style>
-      <background_color>
-        <color name="GRAY" red="169" green="169" blue="169">
-        </color>
-      </background_color>
-      <widget type="label" version="2.0.0">
-        <name>Access Veto Key</name>
-        <class>HEADER3</class>
-        <text>Access Veto Key</text>
-        <width>210</width>
-        <height>25</height>
-        <font use_class="true">
-          <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
-          </font>
-        </font>
-        <foreground_color use_class="true">
-          <color name="Text" red="25" green="25" blue="25">
-          </color>
-        </foreground_color>
-        <horizontal_alignment>1</horizontal_alignment>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="polyline" version="2.0.0">
-        <name>Line</name>
-        <x>10</x>
-        <y>25</y>
-        <width>190</width>
-        <height>70</height>
-        <points>
-          <point x="35.0" y="35.0">
-          </point>
-          <point x="155.0" y="35.0">
-          </point>
-        </points>
-        <line_color>
-          <color name="BLACK" red="0" green="0" blue="0">
-          </color>
-        </line_color>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>RAVKey</name>
-        <pv_name>FEB-020Row:CnPw-U-005:RAVKey</pv_name>
-        <x>10</x>
-        <y>25</y>
-        <width>70</width>
-        <height>70</height>
-        <off_label>Release
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>RAVKey</name>
+    <pv_name>FEB-020Row:CnPw-U-005:RAVKey</pv_name>
+    <x>1171</x>
+    <y>343</y>
+    <width>80</width>
+    <height>80</height>
+    <off_label>Release
 Access
 Veto</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>Release
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>Release
 Access
 Veto</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-        <square>true</square>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>AVKey</name>
-        <pv_name>FEB-020Row:CnPw-U-005:AVKey</pv_name>
-        <x>130</x>
-        <y>25</y>
-        <width>70</width>
-        <height>70</height>
-        <off_label>Access
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>AVKey</name>
+    <pv_name>FEB-020Row:CnPw-U-005:AVKey</pv_name>
+    <x>1301</x>
+    <y>343</y>
+    <width>80</width>
+    <height>80</height>
+    <off_label>Access
 Veto</off_label>
-        <off_color>
-          <color name="WHITE" red="255" green="255" blue="255">
-          </color>
-        </off_color>
-        <on_label>Access
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>Access
 Veto</on_label>
-        <font>
-          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-          </font>
-        </font>
-      </widget>
-    </widget>
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>ShieldConfigKeyMain</name>
+    <pv_name>FEB-020Row:CnPw-U-005:ShieldConfigKeyMain</pv_name>
+    <x>1615</x>
+    <y>183</y>
+    <width>80</width>
+    <height>80</height>
+    <off_label>Config.
+Mgmt
+key</off_label>
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>Config.
+Mgmt
+key</on_label>
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+    <tooltip>Config. Management key
+$(pv_name)
+$(pv_value)</tooltip>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>ShieldConfigKeyMode</name>
+    <pv_name>FEB-020Row:CnPw-U-005:ShieldConfigKeyMode</pv_name>
+    <x>1615</x>
+    <y>280</y>
+    <width>80</width>
+    <height>80</height>
+    <off_label>Shielding
+Config.
+Mgmt</off_label>
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>Shielding
+Config.
+Mgmt</on_label>
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+    <tooltip>Shielding Config. Management
+$(pv_name)
+$(pv_value)</tooltip>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>SpareKey2</name>
+    <pv_name>FEB-020Row:CnPw-U-005:SpareKey2</pv_name>
+    <x>1615</x>
+    <y>580</y>
+    <width>80</width>
+    <height>80</height>
+    <off_label>Spare
+key</off_label>
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>Spare
+key</on_label>
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+    <tooltip>Spare key
+$(pv_name)
+$(pv_value)</tooltip>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>SpareKey1</name>
+    <pv_name>FEB-020Row:CnPw-U-005:SpareKey1</pv_name>
+    <x>1615</x>
+    <y>479</y>
+    <width>80</width>
+    <height>80</height>
+    <off_label>Spare
+key</off_label>
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>Spare
+key</on_label>
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+    <tooltip>Spare key
+$(pv_name)
+$(pv_value)</tooltip>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>TSWKey</name>
+    <pv_name>FEB-020Row:CnPw-U-005:TSWKey</pv_name>
+    <x>1615</x>
+    <y>379</y>
+    <width>80</width>
+    <height>80</height>
+    <off_label>TSW
+key</off_label>
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_label>TSW
+key</on_label>
+    <on_color>
+      <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+      </color>
+    </on_color>
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="15.0">
+      </font>
+    </font>
+    <tooltip>Temporary Shielding wall Key
+$(pv_name)
+$(pv_value)</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Entry Key Unlock</name>
+    <text>Entry Key Unlock</text>
+    <x>408</x>
+    <y>625</y>
+    <width>190</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="19.0">
+      </font>
+    </font>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Entry Key Unlock_1</name>
+    <text>Mode Selection Key</text>
+    <x>408</x>
+    <y>340</y>
+    <width>241</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="19.0">
+      </font>
+    </font>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Entry Key Unlock_2</name>
+    <text>Main Key</text>
+    <x>408</x>
+    <y>127</y>
+    <width>241</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="19.0">
+      </font>
+    </font>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Entry Key Unlock_3</name>
+    <text>Access Veto Key</text>
+    <x>1091</x>
+    <y>268</y>
+    <width>241</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="19.0">
+      </font>
+    </font>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Entry Key Unlock_4</name>
+    <text>Entry Keys</text>
+    <x>1091</x>
+    <y>735</y>
+    <width>241</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="19.0">
+      </font>
+    </font>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Entry Key Unlock_5</name>
+    <text>Shield Configuration</text>
+    <x>1563</x>
+    <y>127</y>
+    <width>241</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="19.0">
+      </font>
+    </font>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>MainKeyLocked</name>
+    <pv_name>FEB-020Row:CnPw-U-005:MainKeyLocked</pv_name>
+    <symbols>
+      <symbol>$(SYMBOLS)/Key/lock.svg</symbol>
+    </symbols>
+    <x>799</x>
+    <y>234</y>
+    <width>30</width>
+    <height>30</height>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="true">
+        <exp bool_exp="True">
+          <expression>pvInt0</expression>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>EntryKey1Locked</name>
+    <pv_name>FEB-090:PSS-PAS-1:EntryKey1Locked</pv_name>
+    <symbols>
+      <symbol>$(SYMBOLS)/Key/lock.svg</symbol>
+    </symbols>
+    <x>1175</x>
+    <y>861</y>
+    <width>30</width>
+    <height>30</height>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="true">
+        <exp bool_exp="True">
+          <expression>pvInt0</expression>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>EntryKey2Locked</name>
+    <pv_name>FEB-090:PSS-PAS-1:EntryKey2Locked</pv_name>
+    <symbols>
+      <symbol>$(SYMBOLS)/Key/lock.svg</symbol>
+    </symbols>
+    <x>1290</x>
+    <y>861</y>
+    <width>30</width>
+    <height>30</height>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="true">
+        <exp bool_exp="True">
+          <expression>pvInt0</expression>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>EntryKey3Locked</name>
+    <pv_name>FEB-090:PSS-PAS-1:EntryKey3Locked</pv_name>
+    <symbols>
+      <symbol>$(SYMBOLS)/Key/lock.svg</symbol>
+    </symbols>
+    <x>1403</x>
+    <y>861</y>
+    <width>30</width>
+    <height>30</height>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="true">
+        <exp bool_exp="True">
+          <expression>pvInt0</expression>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>EntryKey4Locked</name>
+    <pv_name>FEB-090:PSS-PAS-1:EntryKey4Locked</pv_name>
+    <symbols>
+      <symbol>$(SYMBOLS)/Key/lock.svg</symbol>
+    </symbols>
+    <x>1514</x>
+    <y>861</y>
+    <width>30</width>
+    <height>30</height>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="true">
+        <exp bool_exp="True">
+          <expression>pvInt0</expression>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <x>20</x>
+    <y>587</y>
+    <width>310</width>
+    <height>366</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-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>Title</name>
+    <text>Legend</text>
+    <x>20</x>
+    <y>587</y>
+    <width>310</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="GROUP-TEXT" red="25" green="25" blue="25">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="polyline" version="2.0.0">
+    <name>Mech interlock symbol</name>
+    <x>45</x>
+    <y>649</y>
+    <width>80</width>
+    <height>50</height>
+    <points>
+      <point x="0.0" y="25.0">
+      </point>
+      <point x="80.0" y="25.0">
+      </point>
+    </points>
+    <line_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </line_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Mech interlock label</name>
+    <text>The connected slots are mechanically interlocked</text>
+    <x>140</x>
+    <y>649</y>
+    <width>160</width>
+    <height>50</height>
+    <font>
+      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="polyline" version="2.0.0">
+    <name>Same key connection symbol</name>
+    <x>45</x>
+    <y>709</y>
+    <width>80</width>
+    <height>50</height>
+    <points>
+      <point x="0.0" y="25.0">
+      </point>
+      <point x="80.0" y="25.0">
+      </point>
+    </points>
+    <line_width>1</line_width>
+    <line_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </line_color>
+    <line_style>1</line_style>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Same key connection label</name>
+    <text>The connected slots can be selected by the same key</text>
+    <x>140</x>
+    <y>709</y>
+    <width>160</width>
+    <height>50</height>
+    <font>
+      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="picture" version="2.0.0">
+    <name>Locked symbol</name>
+    <file>$(SYMBOLS)/Key/lock.svg</file>
+    <x>45</x>
+    <y>774</y>
+    <width>80</width>
+    <height>30</height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Locked label</name>
+    <text>Keys locked with solenoid</text>
+    <x>140</x>
+    <y>774</y>
+    <width>160</width>
+    <height>30</height>
+    <font>
+      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>Home symbol</name>
+    <x>45</x>
+    <y>829</y>
+    <width>30</width>
+    <height>30</height>
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Slash</name>
+    <text>/</text>
+    <x>75</x>
+    <y>829</y>
+    <width>20</width>
+    <height>30</height>
+    <font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>Other symbol</name>
+    <x>95</x>
+    <y>829</y>
+    <width>30</width>
+    <height>30</height>
+    <off_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </on_color>
+    <square>true</square>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Home - other label</name>
+    <text>Home / Other position</text>
+    <x>140</x>
+    <y>829</y>
+    <width>160</width>
+    <height>30</height>
+    <font>
+      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>ON circle symbol</name>
+    <x>45</x>
+    <y>889</y>
+    <width>30</width>
+    <height>30</height>
+    <off_color>
+      <color name="On" red="70" green="255" blue="70">
+      </color>
+    </off_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>ON slash</name>
+    <text>/</text>
+    <x>75</x>
+    <y>889</y>
+    <width>20</width>
+    <height>30</height>
+    <font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>ON square symbol</name>
+    <x>95</x>
+    <y>889</y>
+    <width>30</width>
+    <height>30</height>
+    <off_color>
+      <color name="On" red="70" green="255" blue="70">
+      </color>
+    </off_color>
+    <square>true</square>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>ON label</name>
+    <text>Key inserted in position ON</text>
+    <x>140</x>
+    <y>889</y>
+    <width>160</width>
+    <height>30</height>
+    <font>
+      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Title_1</name>
+    <text>Key Exchange</text>
+    <x>350</x>
+    <y>70</y>
+    <width>1454</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="GROUP-TEXT" red="25" green="25" blue="25">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
   </widget>
 </display>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/dtl2_dtl3.bob b/NON-APPROVED/pss1-pss/popups/permits/dtl2_dtl3.bob
index 1011a6a4..d54cbab6 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/dtl2_dtl3.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/dtl2_dtl3.bob
@@ -2,17 +2,15 @@
 <display version="2.0.0">
   <name>DTL-2 and DTL-3</name>
   <width>1020</width>
-  <height>320</height>
+  <height>330</height>
+  <grid_visible>false</grid_visible>
   <widget type="rectangle" version="2.0.0">
-    <name>Title Rectangle</name>
-    <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
+    <name>Title Rectangle_1</name>
     <width>1020</width>
-    <height use_class="true">50</height>
-    <line_width use_class="true">0</line_width>
-    <background_color use_class="true">
-      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color red="218" green="110" blue="0">
       </color>
     </background_color>
   </widget>
@@ -392,93 +390,84 @@
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
-    <widget type="group" version="2.0.0">
-      <name>RFWG-content-group</name>
-      <x>10</x>
-      <y>30</y>
-      <width>280</width>
-      <height>180</height>
-      <style>3</style>
-      <transparent>true</transparent>
-      <widget type="led" version="2.0.0">
-        <name>DTL2DTL3isolationConfirmed</name>
-        <pv_name>KG-NCG:PSS-Area-1:DTL2DTL3isolationConfirmed</pv_name>
-        <x>20</x>
-        <y>20</y>
-        <off_color>
-          <color name="Background" red="220" green="225" blue="221">
-          </color>
-        </off_color>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>LB_DTL2DTL3isolationConfirmed</name>
-        <text>Isolated</text>
-        <x>46</x>
-        <y>20</y>
-        <width>230</width>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>DTL2DTL3_fbkErrorLLRF_DTL2_1</name>
-        <x>20</x>
-        <y>60</y>
-        <visible>false</visible>
-        <off_color>
-          <color name="LED-RED-ON" red="255" green="60" blue="46">
-          </color>
-        </off_color>
-        <on_color>
-          <color name="Background" red="220" green="225" blue="221">
-          </color>
-        </on_color>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>LB_DTL2DTL3_fbkErrorLLRF_DTL2_1</name>
-        <text>Feedback error in DTL-2 relay</text>
-        <x>46</x>
-        <y>60</y>
-        <width>230</width>
-        <visible>false</visible>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>DTL3_LLRF_Energised_1</name>
-        <x>20</x>
-        <y>100</y>
-        <visible>false</visible>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>LB_DTL3_LLRF_Energised_1</name>
-        <text>DTL-3 relay closed</text>
-        <x>46</x>
-        <y>100</y>
-        <width>230</width>
-        <visible>false</visible>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
-      <widget type="led" version="2.0.0">
-        <name>DTL2DTL3_fbkErrorLLRF_DTL3_1</name>
-        <x>20</x>
-        <y>140</y>
-        <visible>false</visible>
-        <off_color>
-          <color name="LED-RED-ON" red="255" green="60" blue="46">
-          </color>
-        </off_color>
-        <on_color>
-          <color name="Background" red="220" green="225" blue="221">
-          </color>
-        </on_color>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>LB_DTL2DTL3_fbkErrorLLRF_DTL3_1</name>
-        <text>Feedback error in DTL-3 relay</text>
-        <x>46</x>
-        <y>140</y>
-        <width>230</width>
-        <visible>false</visible>
-        <vertical_alignment>1</vertical_alignment>
-      </widget>
+    <widget type="led" version="2.0.0">
+      <name>DTL2DTL3isolationConfirmed</name>
+      <pv_name>KG-NCG:PSS-Area-1:DTL2DTL3isolationConfirmed</pv_name>
+      <x>30</x>
+      <y>50</y>
+      <off_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </off_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>LB_DTL2DTL3isolationConfirmed</name>
+      <text>Isolated</text>
+      <x>56</x>
+      <y>50</y>
+      <width>230</width>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>DTL2DTL3_fbkErrorLLRF_DTL2_1</name>
+      <x>30</x>
+      <y>90</y>
+      <visible>false</visible>
+      <off_color>
+        <color name="LED-RED-ON" red="255" green="60" blue="46">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </on_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>LB_DTL2DTL3_fbkErrorLLRF_DTL2_1</name>
+      <text>Feedback error in DTL-2 relay</text>
+      <x>56</x>
+      <y>90</y>
+      <width>230</width>
+      <visible>false</visible>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>DTL3_LLRF_Energised_1</name>
+      <x>30</x>
+      <y>130</y>
+      <visible>false</visible>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>LB_DTL3_LLRF_Energised_1</name>
+      <text>DTL-3 relay closed</text>
+      <x>56</x>
+      <y>130</y>
+      <width>230</width>
+      <visible>false</visible>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>DTL2DTL3_fbkErrorLLRF_DTL3_1</name>
+      <x>30</x>
+      <y>170</y>
+      <visible>false</visible>
+      <off_color>
+        <color name="LED-RED-ON" red="255" green="60" blue="46">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Background" red="220" green="225" blue="221">
+        </color>
+      </on_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>LB_DTL2DTL3_fbkErrorLLRF_DTL3_1</name>
+      <text>Feedback error in DTL-3 relay</text>
+      <x>56</x>
+      <y>170</y>
+      <width>230</width>
+      <visible>false</visible>
+      <vertical_alignment>1</vertical_alignment>
     </widget>
   </widget>
 </display>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/dtl4.bob b/NON-APPROVED/pss1-pss/popups/permits/dtl4.bob
index 6a6f1fd0..b8502d5b 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/dtl4.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/dtl4.bob
@@ -2,17 +2,15 @@
 <display version="2.0.0">
   <name>DTL-4</name>
   <width>1020</width>
-  <height>320</height>
+  <height>330</height>
+  <grid_visible>false</grid_visible>
   <widget type="rectangle" version="2.0.0">
-    <name>Title Rectangle</name>
-    <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
+    <name>Title Rectangle_1</name>
     <width>1020</width>
-    <height use_class="true">50</height>
-    <line_width use_class="true">0</line_width>
-    <background_color use_class="true">
-      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color red="218" green="110" blue="0">
       </color>
     </background_color>
   </widget>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/isrc_hvps.bob b/NON-APPROVED/pss1-pss/popups/permits/isrc_hvps.bob
index 339d52f4..e0238096 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/isrc_hvps.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/isrc_hvps.bob
@@ -2,17 +2,15 @@
 <display version="2.0.0">
   <name>Ion source HV PS and grounding relay</name>
   <width>690</width>
-  <height>320</height>
+  <height>330</height>
+  <grid_visible>false</grid_visible>
   <widget type="rectangle" version="2.0.0">
-    <name>Title Rectangle</name>
-    <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
+    <name>Title Rectangle_1</name>
     <width>690</width>
-    <height use_class="true">50</height>
-    <line_width use_class="true">0</line_width>
-    <background_color use_class="true">
-      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color red="218" green="110" blue="0">
       </color>
     </background_color>
   </widget>
@@ -22,7 +20,7 @@
     <text>Ion source HV PS and grounding relay</text>
     <x use_class="true">20</x>
     <y use_class="true">0</y>
-    <width>670</width>
+    <width>630</width>
     <height use_class="true">50</height>
     <font use_class="true">
       <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
diff --git a/NON-APPROVED/pss1-pss/popups/permits/isrc_magnetron.bob b/NON-APPROVED/pss1-pss/popups/permits/isrc_magnetron.bob
index 95a524f7..b2bbdf44 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/isrc_magnetron.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/isrc_magnetron.bob
@@ -4,15 +4,12 @@
   <width>340</width>
   <height>290</height>
   <widget type="rectangle" version="2.0.0">
-    <name>Title Rectangle</name>
-    <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
+    <name>Title Rectangle_1</name>
     <width>340</width>
-    <height use_class="true">50</height>
-    <line_width use_class="true">0</line_width>
-    <background_color use_class="true">
-      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color red="218" green="110" blue="0">
       </color>
     </background_color>
   </widget>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/mebt1.bob b/NON-APPROVED/pss1-pss/popups/permits/mebt1.bob
index a0829f6c..e13b969a 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/mebt1.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/mebt1.bob
@@ -4,15 +4,12 @@
   <width>1020</width>
   <height>290</height>
   <widget type="rectangle" version="2.0.0">
-    <name>Title Rectangle</name>
-    <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
+    <name>Title Rectangle_1</name>
     <width>1020</width>
-    <height use_class="true">50</height>
-    <line_width use_class="true">0</line_width>
-    <background_color use_class="true">
-      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color red="218" green="110" blue="0">
       </color>
     </background_color>
   </widget>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/mebt2.bob b/NON-APPROVED/pss1-pss/popups/permits/mebt2.bob
index 9724a10b..7e9aa814 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/mebt2.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/mebt2.bob
@@ -3,16 +3,14 @@
   <name>MEBT-2</name>
   <width>1020</width>
   <height>290</height>
+  <grid_visible>false</grid_visible>
   <widget type="rectangle" version="2.0.0">
-    <name>Title Rectangle</name>
-    <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
+    <name>Title Rectangle_1</name>
     <width>1020</width>
-    <height use_class="true">50</height>
-    <line_width use_class="true">0</line_width>
-    <background_color use_class="true">
-      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color red="218" green="110" blue="0">
       </color>
     </background_color>
   </widget>
@@ -22,7 +20,7 @@
     <text>MEBT-2</text>
     <x use_class="true">20</x>
     <y use_class="true">0</y>
-    <width>670</width>
+    <width>300</width>
     <height use_class="true">50</height>
     <font use_class="true">
       <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
diff --git a/NON-APPROVED/pss1-pss/popups/permits/mebt3.bob b/NON-APPROVED/pss1-pss/popups/permits/mebt3.bob
index e0984691..90370ff7 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/mebt3.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/mebt3.bob
@@ -3,16 +3,14 @@
   <name>MEBT-3</name>
   <width>1020</width>
   <height>290</height>
+  <grid_visible>false</grid_visible>
   <widget type="rectangle" version="2.0.0">
-    <name>Title Rectangle</name>
-    <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
+    <name>Title Rectangle_1</name>
     <width>1020</width>
-    <height use_class="true">50</height>
-    <line_width use_class="true">0</line_width>
-    <background_color use_class="true">
-      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color red="218" green="110" blue="0">
       </color>
     </background_color>
   </widget>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/plc.bob b/NON-APPROVED/pss1-pss/popups/permits/plc.bob
index 82ee9ad9..9da3d8a9 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/plc.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/plc.bob
@@ -3,16 +3,14 @@
   <name>Ion source HV PS and grounding relay</name>
   <width>490</width>
   <height>370</height>
+  <grid_visible>false</grid_visible>
   <widget type="rectangle" version="2.0.0">
-    <name>Title Rectangle</name>
-    <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
+    <name>Title Rectangle_1</name>
     <width>490</width>
-    <height use_class="true">50</height>
-    <line_width use_class="true">0</line_width>
-    <background_color use_class="true">
-      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color red="218" green="110" blue="0">
       </color>
     </background_color>
   </widget>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/rfq_dtl1.bob b/NON-APPROVED/pss1-pss/popups/permits/rfq_dtl1.bob
index 23dd14cc..79365a97 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/rfq_dtl1.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/rfq_dtl1.bob
@@ -2,17 +2,15 @@
 <display version="2.0.0">
   <name>RFQ and DTL-1</name>
   <width>1020</width>
-  <height>320</height>
+  <height>330</height>
+  <grid_visible>false</grid_visible>
   <widget type="rectangle" version="2.0.0">
-    <name>Title Rectangle</name>
-    <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
+    <name>Title Rectangle_1</name>
     <width>1020</width>
-    <height use_class="true">50</height>
-    <line_width use_class="true">0</line_width>
-    <background_color use_class="true">
-      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color red="218" green="110" blue="0">
       </color>
     </background_color>
   </widget>
diff --git a/NON-APPROVED/pss1-pss/popups/rad_faceplate.bob b/NON-APPROVED/pss1-pss/popups/rad_faceplate.bob
index c38e94a8..d9f740bf 100644
--- a/NON-APPROVED/pss1-pss/popups/rad_faceplate.bob
+++ b/NON-APPROVED/pss1-pss/popups/rad_faceplate.bob
@@ -3,16 +3,14 @@
   <name>AMM $(RM)</name>
   <width>340</width>
   <height>250</height>
+  <grid_visible>false</grid_visible>
   <widget type="rectangle" version="2.0.0">
-    <name>Title Rectangle</name>
-    <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
+    <name>Rectangle_5</name>
     <width>340</width>
-    <height use_class="true">50</height>
-    <line_width use_class="true">0</line_width>
-    <background_color use_class="true">
-      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color red="218" green="110" blue="0">
       </color>
     </background_color>
   </widget>
@@ -22,7 +20,7 @@
     <text>AMM $(RM)</text>
     <x use_class="true">20</x>
     <y use_class="true">0</y>
-    <width>320</width>
+    <width>210</width>
     <height use_class="true">50</height>
     <font use_class="true">
       <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
diff --git a/NON-APPROVED/pss1-pss/symbols/Key/lock_v02.svg b/NON-APPROVED/pss1-pss/symbols/Key/lock_v02.svg
new file mode 100644
index 00000000..504f382f
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/Key/lock_v02.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#C8CDC9;}
+</style>
+<g>
+	<path d="M362.72263,229.31934v-80.04198c0-58.83251-47.86343-106.72263-106.72264-106.72263
+		c-58.84586,0-106.72263,47.89011-106.72263,106.72263v80.04198c-29.46879,0-53.36131,23.89253-53.36131,53.36133v133.40329
+		c0,29.46878,23.89252,53.3613,53.36131,53.3613h213.44527c29.46878,0,53.3613-23.89252,53.3613-53.3613V282.68066
+		C416.08392,253.21187,392.19141,229.31934,362.72263,229.31934z M269.34033,358.63214v44.11148
+		c0,7.37384-5.96649,13.34033-13.34035,13.34033s-13.34032-5.96649-13.34032-13.34033v-44.11148
+		c-7.82996-4.63824-13.34033-12.81921-13.34033-22.59018c0-14.74771,11.94626-26.68066,26.68065-26.68066
+		s26.68068,11.93375,26.68068,26.68066C282.68066,345.81293,277.17026,353.9939,269.34033,358.63214z M309.3613,229.31934H202.63867
+		v-80.04198c0-29.44294,23.93172-53.36131,53.36131-53.36131c29.41628,0,53.36131,23.91921,53.36131,53.36131V229.31934z"/>
+	<path class="st0" d="M256,42.5547c58.85916,0,106.7226,47.8902,106.7226,106.7227v80.04198
+		c29.46875,0,53.36136,23.89246,53.36136,53.36122v133.40335c0,29.46875-23.89261,53.36133-53.36136,53.36133H149.2774
+		c-29.46887,0-53.36134-23.89258-53.36134-53.36133V282.6806c0-29.46877,23.89247-53.36122,53.36134-53.36122V149.2774
+		C149.2774,90.4449,197.15416,42.5547,256,42.5547 M202.63864,229.31938h106.72272V149.2774
+		c0-29.44212-23.94516-53.36135-53.36136-53.36135c-29.42964,0-53.36136,23.91839-53.36136,53.36135V229.31938 M256,416.08395
+		c7.37384,0,13.34036-5.96652,13.34036-13.34039v-44.11145c7.82983-4.63824,13.34027-12.81918,13.34027-22.59015
+		c0-14.74686-11.94626-26.6806-26.68063-26.6806s-26.68062,11.93292-26.68062,26.6806c0,9.77097,5.5103,17.9519,13.34026,22.59015
+		v44.11145C242.65964,410.11743,248.62614,416.08395,256,416.08395 M256,14.97198
+		c-74.05618,0-134.30531,60.24913-134.30531,134.30542v57.2986c-31.09267,11.30472-53.36135,41.15364-53.36135,76.1046v133.40335
+		c0,44.63272,36.31134,80.94406,80.94407,80.94406H362.7226c44.63272,0,80.94406-36.31134,80.94406-80.94406V282.6806
+		c0-34.95096-22.26868-64.79988-53.36133-76.1046v-57.2986C390.30533,75.22112,330.05618,14.97198,256,14.97198L256,14.97198z
+		 M230.22137,201.73666V149.2774c0-14.21442,11.56422-25.77863,25.77863-25.77863c14.21442,0,25.77863,11.56421,25.77863,25.77863
+		v52.45926H230.22137L230.22137,201.73666z"/>
+</g>
+</svg>
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-close-black.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-close-black.svg
new file mode 100644
index 00000000..65edff53
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-close-black.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#191919;}.cls-2{fill:none;}</style></defs><title>double-left-close-black</title><polygon class="cls-1" points="7.71 93.3 7.71 83.95 3.04 83.95 3.04 102.65 12.39 102.65 12.39 93.3 7.71 93.3"/><rect class="cls-1" x="7.72" y="83.95" width="80.87" height="9.35"/><rect class="cls-1" x="72.1" y="81.86" width="12.01" height="6.86" rx="0.65" transform="translate(163.39 7.18) rotate(90)"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-close-green.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-close-green.svg
new file mode 100644
index 00000000..846795f0
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-close-green.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#288c28;}.cls-2{fill:none;}</style></defs><title>double-left-close-green</title><polygon class="cls-1" points="7.71 93.3 7.71 83.95 3.04 83.95 3.04 102.65 12.39 102.65 12.39 93.3 7.71 93.3"/><rect class="cls-1" x="7.72" y="83.95" width="80.87" height="9.35"/><rect class="cls-1" x="72.1" y="81.86" width="12.01" height="6.86" rx="0.65" transform="translate(163.39 7.18) rotate(90)"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-close-red.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-close-red.svg
new file mode 100644
index 00000000..e2db814d
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-close-red.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#ca0000;}.cls-2{fill:none;}</style></defs><title>double-left-close-red</title><polygon class="cls-1" points="7.71 93.3 7.71 83.95 3.04 83.95 3.04 102.65 12.39 102.65 12.39 93.3 7.71 93.3"/><rect class="cls-1" x="7.72" y="83.95" width="80.87" height="9.35"/><rect class="cls-1" x="72.1" y="81.86" width="12.01" height="6.86" rx="0.65" transform="translate(163.39 7.18) rotate(90)"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-open-black.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-open-black.svg
new file mode 100644
index 00000000..0c232059
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-open-black.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#191919;}.cls-2{fill:none;}</style></defs><title>double-left-open-black</title><path class="cls-1" d="M87.51,84h-3c0-2.31-.11-4.64-.32-6.93l2.94-.28C87.4,79.16,87.51,81.59,87.51,84ZM83.27,70.18c-.43-2.26-1-4.54-1.62-6.75l2.84-.82c.67,2.3,1.23,4.66,1.68,7ZM79.41,56.86c-.85-2.15-1.81-4.28-2.86-6.33l2.64-1.34c1.08,2.14,2.08,4.35,3,6.58ZM73.12,44.48c-1.23-1.95-2.56-3.87-4-5.7L71.49,37c1.46,1.9,2.85,3.89,4.13,5.92Zm-8.45-11c-1.56-1.7-3.22-3.34-4.93-4.89l2-2.19c1.78,1.61,3.5,3.32,5.12,5.08ZM54.38,24.15c-1.84-1.4-3.77-2.72-5.73-3.94l1.56-2.51c2,1.27,4,2.64,5.95,4.09ZM42.6,16.8c-2.06-1.05-4.19-2-6.34-2.87l1.1-2.74c2.22.89,4.44,1.89,6.57,3ZM29.7,11.63C27.49,11,25.22,10.39,23,9.92L23.56,7c2.35.49,4.7,1.08,7,1.77ZM16.1,8.8c-2.29-.27-4.63-.45-6.94-.52l.1-2.95c2.39.08,4.81.26,7.18.54Z"/><polygon class="cls-1" points="7.71 93.29 7.71 83.94 3.04 83.94 3.04 102.64 12.39 102.64 12.39 93.29 7.71 93.29"/><rect class="cls-1" x="7.72" y="3.07" width="9.35" height="80.87"/><rect class="cls-1" x="3.04" y="10.12" width="12.01" height="6.86" rx="0.65"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-open-green.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-open-green.svg
new file mode 100644
index 00000000..c56fedd1
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-open-green.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#288c28;}.cls-2{fill:none;}</style></defs><title>double-left-open-green</title><path class="cls-1" d="M87.51,84h-3c0-2.31-.11-4.64-.32-6.93l2.94-.28C87.4,79.16,87.51,81.59,87.51,84ZM83.27,70.18c-.43-2.26-1-4.54-1.62-6.75l2.84-.82c.67,2.3,1.23,4.66,1.68,7ZM79.41,56.86c-.85-2.15-1.81-4.28-2.86-6.33l2.64-1.34c1.08,2.14,2.08,4.35,3,6.58ZM73.12,44.48c-1.23-1.95-2.56-3.87-4-5.7L71.49,37c1.46,1.9,2.85,3.89,4.13,5.92Zm-8.45-11c-1.56-1.7-3.22-3.34-4.93-4.89l2-2.19c1.78,1.61,3.5,3.32,5.12,5.08ZM54.38,24.15c-1.84-1.4-3.77-2.72-5.73-3.94l1.56-2.51c2,1.27,4,2.64,5.95,4.09ZM42.6,16.8c-2.06-1.05-4.19-2-6.34-2.87l1.1-2.74c2.22.89,4.44,1.89,6.57,3ZM29.7,11.63C27.49,11,25.22,10.39,23,9.92L23.56,7c2.35.49,4.7,1.08,7,1.77ZM16.1,8.8c-2.29-.27-4.63-.45-6.94-.52l.1-2.95c2.39.08,4.81.26,7.18.54Z"/><polygon class="cls-1" points="7.71 93.29 7.71 83.94 3.04 83.94 3.04 102.64 12.39 102.64 12.39 93.29 7.71 93.29"/><rect class="cls-1" x="7.72" y="3.07" width="9.35" height="80.87"/><rect class="cls-1" x="3.04" y="10.12" width="12.01" height="6.86" rx="0.65"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-open-red.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-open-red.svg
new file mode 100644
index 00000000..b24f595d
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-left-open-red.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#ca0000;}.cls-2{fill:none;}</style></defs><title>double-left-open-red</title><path class="cls-1" d="M87.51,84h-3c0-2.31-.11-4.64-.32-6.93l2.94-.28C87.4,79.16,87.51,81.59,87.51,84ZM83.27,70.18c-.43-2.26-1-4.54-1.62-6.75l2.84-.82c.67,2.3,1.23,4.66,1.68,7ZM79.41,56.86c-.85-2.15-1.81-4.28-2.86-6.33l2.64-1.34c1.08,2.14,2.08,4.35,3,6.58ZM73.12,44.48c-1.23-1.95-2.56-3.87-4-5.7L71.49,37c1.46,1.9,2.85,3.89,4.13,5.92Zm-8.45-11c-1.56-1.7-3.22-3.34-4.93-4.89l2-2.19c1.78,1.61,3.5,3.32,5.12,5.08ZM54.38,24.15c-1.84-1.4-3.77-2.72-5.73-3.94l1.56-2.51c2,1.27,4,2.64,5.95,4.09ZM42.6,16.8c-2.06-1.05-4.19-2-6.34-2.87l1.1-2.74c2.22.89,4.44,1.89,6.57,3ZM29.7,11.63C27.49,11,25.22,10.39,23,9.92L23.56,7c2.35.49,4.7,1.08,7,1.77ZM16.1,8.8c-2.29-.27-4.63-.45-6.94-.52l.1-2.95c2.39.08,4.81.26,7.18.54Z"/><polygon class="cls-1" points="7.71 93.29 7.71 83.94 3.04 83.94 3.04 102.64 12.39 102.64 12.39 93.29 7.71 93.29"/><rect class="cls-1" x="7.72" y="3.07" width="9.35" height="80.87"/><rect class="cls-1" x="3.04" y="10.12" width="12.01" height="6.86" rx="0.65"/><rect class="cls-2" width="96.3" height="105.64"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-close-black.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-close-black.svg
new file mode 100644
index 00000000..065d3fd1
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-close-black.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#191919;}.cls-2{fill:none;}</style></defs><title>double-right-close-black</title><polygon class="cls-1" points="88.59 93.3 88.59 83.95 93.26 83.95 93.26 102.65 83.91 102.65 83.91 93.3 88.59 93.3"/><rect class="cls-1" x="7.72" y="83.95" width="80.87" height="9.35"/><rect class="cls-1" x="12.19" y="81.86" width="12.01" height="6.86" rx="0.65" transform="translate(103.48 67.09) rotate(90)"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-close-green.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-close-green.svg
new file mode 100644
index 00000000..15c7e098
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-close-green.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#288c28;}.cls-2{fill:none;}</style></defs><title>double-right-close-green</title><polygon class="cls-1" points="88.59 93.3 88.59 83.95 93.26 83.95 93.26 102.65 83.91 102.65 83.91 93.3 88.59 93.3"/><rect class="cls-1" x="7.72" y="83.95" width="80.87" height="9.35"/><rect class="cls-1" x="12.19" y="81.86" width="12.01" height="6.86" rx="0.65" transform="translate(103.48 67.09) rotate(90)"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-close-red.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-close-red.svg
new file mode 100644
index 00000000..7087c9a6
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-close-red.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#ca0000;}.cls-2{fill:none;}</style></defs><title>double-right-close-red</title><polygon class="cls-1" points="88.59 93.3 88.59 83.95 93.26 83.95 93.26 102.65 83.91 102.65 83.91 93.3 88.59 93.3"/><rect class="cls-1" x="7.72" y="83.95" width="80.87" height="9.35"/><rect class="cls-1" x="12.19" y="81.86" width="12.01" height="6.86" rx="0.65" transform="translate(103.48 67.09) rotate(90)"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-open-black.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-open-black.svg
new file mode 100644
index 00000000..7de77455
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-open-black.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#191919;}.cls-2{fill:none;}</style></defs><title>double-right-open-black</title><path class="cls-1" d="M9.12,76.78l2.94.28c-.21,2.29-.32,4.62-.32,6.93h-3C8.79,81.59,8.9,79.16,9.12,76.78Zm1-7.15c.45-2.36,1-4.72,1.68-7l2.84.82C14,65.64,13.46,67.92,13,70.18Zm4-13.86c.88-2.23,1.88-4.44,3-6.58l2.64,1.34c-1.05,2-2,4.18-2.86,6.33Zm6.53-12.86c1.28-2,2.67-4,4.13-5.92l2.34,1.79c-1.4,1.83-2.74,3.75-4,5.7Zm8.78-11.44c1.62-1.76,3.34-3.47,5.12-5.08l2,2.19c-1.72,1.55-3.38,3.19-4.94,4.89Zm10.68-9.68c1.92-1.45,3.92-2.82,6-4.09l1.56,2.51c-2,1.22-3.88,2.54-5.73,3.94Zm12.23-7.63c2.14-1.08,4.35-2.08,6.57-3L60,13.93c-2.15.86-4.28,1.82-6.33,2.87ZM65.75,8.8c2.29-.69,4.64-1.28,7-1.77l.6,2.89c-2.26.47-4.53,1.05-6.74,1.71ZM79.86,5.87c2.37-.28,4.79-.46,7.19-.54l.09,2.95c-2.31.07-4.65.25-6.93.52Z"/><polygon class="cls-1" points="88.59 93.29 88.59 83.94 93.26 83.94 93.26 102.64 83.91 102.64 83.91 93.29 88.59 93.29"/><rect class="cls-1" x="79.24" y="3.07" width="9.35" height="80.87"/><rect class="cls-1" x="81.25" y="10.12" width="12.01" height="6.86" rx="0.65" transform="translate(174.51 27.1) rotate(-180)"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-open-green.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-open-green.svg
new file mode 100644
index 00000000..2f34d27a
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-open-green.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#288c28;}.cls-2{fill:none;}</style></defs><title>double-right-open-green</title><path class="cls-1" d="M9.12,76.78l2.94.28c-.21,2.29-.32,4.62-.32,6.93h-3C8.79,81.59,8.9,79.16,9.12,76.78Zm1-7.15c.45-2.36,1-4.72,1.68-7l2.84.82C14,65.64,13.46,67.92,13,70.18Zm4-13.86c.88-2.23,1.88-4.44,3-6.58l2.64,1.34c-1.05,2-2,4.18-2.86,6.33Zm6.53-12.86c1.28-2,2.67-4,4.13-5.92l2.34,1.79c-1.4,1.83-2.74,3.75-4,5.7Zm8.78-11.44c1.62-1.76,3.34-3.47,5.12-5.08l2,2.19c-1.72,1.55-3.38,3.19-4.94,4.89Zm10.68-9.68c1.92-1.45,3.92-2.82,6-4.09l1.56,2.51c-2,1.22-3.88,2.54-5.73,3.94Zm12.23-7.63c2.14-1.08,4.35-2.08,6.57-3L60,13.93c-2.15.86-4.28,1.82-6.33,2.87ZM65.75,8.8c2.29-.69,4.64-1.28,7-1.77l.6,2.89c-2.26.47-4.53,1.05-6.74,1.71ZM79.86,5.87c2.37-.28,4.79-.46,7.19-.54l.09,2.95c-2.31.07-4.65.25-6.93.52Z"/><polygon class="cls-1" points="88.59 93.29 88.59 83.94 93.26 83.94 93.26 102.64 83.91 102.64 83.91 93.29 88.59 93.29"/><rect class="cls-1" x="79.24" y="3.07" width="9.35" height="80.87"/><rect class="cls-1" x="81.25" y="10.12" width="12.01" height="6.86" rx="0.65" transform="translate(174.51 27.1) rotate(-180)"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-open-red.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-open-red.svg
new file mode 100644
index 00000000..76c9dec7
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/double-right-open-red.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#ca0000;}.cls-2{fill:none;}</style></defs><title>double-right-open-red</title><path class="cls-1" d="M9.12,76.78l2.94.28c-.21,2.29-.32,4.62-.32,6.93h-3C8.79,81.59,8.9,79.16,9.12,76.78Zm1-7.15c.45-2.36,1-4.72,1.68-7l2.84.82C14,65.64,13.46,67.92,13,70.18Zm4-13.86c.88-2.23,1.88-4.44,3-6.58l2.64,1.34c-1.05,2-2,4.18-2.86,6.33Zm6.53-12.86c1.28-2,2.67-4,4.13-5.92l2.34,1.79c-1.4,1.83-2.74,3.75-4,5.7Zm8.78-11.44c1.62-1.76,3.34-3.47,5.12-5.08l2,2.19c-1.72,1.55-3.38,3.19-4.94,4.89Zm10.68-9.68c1.92-1.45,3.92-2.82,6-4.09l1.56,2.51c-2,1.22-3.88,2.54-5.73,3.94Zm12.23-7.63c2.14-1.08,4.35-2.08,6.57-3L60,13.93c-2.15.86-4.28,1.82-6.33,2.87ZM65.75,8.8c2.29-.69,4.64-1.28,7-1.77l.6,2.89c-2.26.47-4.53,1.05-6.74,1.71ZM79.86,5.87c2.37-.28,4.79-.46,7.19-.54l.09,2.95c-2.31.07-4.65.25-6.93.52Z"/><polygon class="cls-1" points="88.59 93.29 88.59 83.94 93.26 83.94 93.26 102.64 83.91 102.64 83.91 93.29 88.59 93.29"/><rect class="cls-1" x="79.24" y="3.07" width="9.35" height="80.87"/><rect class="cls-1" x="81.25" y="10.12" width="12.01" height="6.86" rx="0.65" transform="translate(174.51 27.1) rotate(-180)"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-left-open-black.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-left-open-black.svg
new file mode 100644
index 00000000..cb86389b
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-left-open-black.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#191919;}.cls-2{fill:none;}</style></defs><title>singel-left-open-black</title><path class="cls-1" d="M87.51,84h-3c0-2.31-.11-4.64-.32-6.93l2.94-.28C87.4,79.16,87.51,81.59,87.51,84ZM83.27,70.18c-.43-2.26-1-4.54-1.62-6.75l2.84-.82c.67,2.3,1.23,4.66,1.68,7ZM79.41,56.86c-.85-2.15-1.81-4.28-2.86-6.33l2.64-1.34c1.08,2.14,2.08,4.35,3,6.58ZM73.12,44.48c-1.23-1.95-2.56-3.87-4-5.7L71.49,37c1.46,1.9,2.85,3.89,4.13,5.92Zm-8.45-11c-1.56-1.7-3.22-3.34-4.93-4.89l2-2.19c1.78,1.61,3.5,3.32,5.12,5.08ZM54.38,24.15c-1.84-1.4-3.77-2.72-5.73-3.94l1.56-2.51c2,1.27,4,2.64,5.95,4.09ZM42.6,16.8c-2.06-1.05-4.19-2-6.34-2.87l1.1-2.74c2.22.89,4.44,1.89,6.57,3ZM29.7,11.63C27.49,11,25.22,10.39,23,9.92L23.56,7c2.35.49,4.7,1.08,7,1.77ZM16.1,8.8c-2.29-.27-4.63-.45-6.94-.52l.1-2.95c2.39.08,4.81.26,7.18.54Z"/><polygon class="cls-1" points="7.71 93.29 7.71 83.94 3.04 83.94 3.04 102.64 12.39 102.64 12.39 93.29 7.71 93.29"/><polygon class="cls-1" points="88.59 93.29 88.59 83.94 93.26 83.94 93.26 102.64 83.91 102.64 83.91 93.29 88.59 93.29"/><rect class="cls-1" x="7.72" y="3.07" width="9.35" height="80.87"/><rect class="cls-1" x="3.04" y="10.12" width="12.01" height="6.86" rx="0.65"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-left-open-green.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-left-open-green.svg
new file mode 100644
index 00000000..561d8ed4
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-left-open-green.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#288c28;}.cls-2{fill:none;}</style></defs><title>singel-left-open-green</title><path class="cls-1" d="M87.51,84h-3c0-2.31-.11-4.64-.32-6.93l2.94-.28C87.4,79.16,87.51,81.59,87.51,84ZM83.27,70.18c-.43-2.26-1-4.54-1.62-6.75l2.84-.82c.67,2.3,1.23,4.66,1.68,7ZM79.41,56.86c-.85-2.15-1.81-4.28-2.86-6.33l2.64-1.34c1.08,2.14,2.08,4.35,3,6.58ZM73.12,44.48c-1.23-1.95-2.56-3.87-4-5.7L71.49,37c1.46,1.9,2.85,3.89,4.13,5.92Zm-8.45-11c-1.56-1.7-3.22-3.34-4.93-4.89l2-2.19c1.78,1.61,3.5,3.32,5.12,5.08ZM54.38,24.15c-1.84-1.4-3.77-2.72-5.73-3.94l1.56-2.51c2,1.27,4,2.64,5.95,4.09ZM42.6,16.8c-2.06-1.05-4.19-2-6.34-2.87l1.1-2.74c2.22.89,4.44,1.89,6.57,3ZM29.7,11.63C27.49,11,25.22,10.39,23,9.92L23.56,7c2.35.49,4.7,1.08,7,1.77ZM16.1,8.8c-2.29-.27-4.63-.45-6.94-.52l.1-2.95c2.39.08,4.81.26,7.18.54Z"/><polygon class="cls-1" points="7.71 93.29 7.71 83.94 3.04 83.94 3.04 102.64 12.39 102.64 12.39 93.29 7.71 93.29"/><polygon class="cls-1" points="88.59 93.29 88.59 83.94 93.26 83.94 93.26 102.64 83.91 102.64 83.91 93.29 88.59 93.29"/><rect class="cls-1" x="7.72" y="3.07" width="9.35" height="80.87"/><rect class="cls-1" x="3.04" y="10.12" width="12.01" height="6.86" rx="0.65"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-left-open-red.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-left-open-red.svg
new file mode 100644
index 00000000..f1ac0de5
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-left-open-red.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#ca0000;}.cls-2{fill:none;}</style></defs><title>singel-left-open-red</title><path class="cls-1" d="M87.51,84h-3c0-2.31-.11-4.64-.32-6.93l2.94-.28C87.4,79.16,87.51,81.59,87.51,84ZM83.27,70.18c-.43-2.26-1-4.54-1.62-6.75l2.84-.82c.67,2.3,1.23,4.66,1.68,7ZM79.41,56.86c-.85-2.15-1.81-4.28-2.86-6.33l2.64-1.34c1.08,2.14,2.08,4.35,3,6.58ZM73.12,44.48c-1.23-1.95-2.56-3.87-4-5.7L71.49,37c1.46,1.9,2.85,3.89,4.13,5.92Zm-8.45-11c-1.56-1.7-3.22-3.34-4.93-4.89l2-2.19c1.78,1.61,3.5,3.32,5.12,5.08ZM54.38,24.15c-1.84-1.4-3.77-2.72-5.73-3.94l1.56-2.51c2,1.27,4,2.64,5.95,4.09ZM42.6,16.8c-2.06-1.05-4.19-2-6.34-2.87l1.1-2.74c2.22.89,4.44,1.89,6.57,3ZM29.7,11.63C27.49,11,25.22,10.39,23,9.92L23.56,7c2.35.49,4.7,1.08,7,1.77ZM16.1,8.8c-2.29-.27-4.63-.45-6.94-.52l.1-2.95c2.39.08,4.81.26,7.18.54Z"/><polygon class="cls-1" points="7.71 93.29 7.71 83.94 3.04 83.94 3.04 102.64 12.39 102.64 12.39 93.29 7.71 93.29"/><polygon class="cls-1" points="88.59 93.29 88.59 83.94 93.26 83.94 93.26 102.64 83.91 102.64 83.91 93.29 88.59 93.29"/><rect class="cls-1" x="7.72" y="3.07" width="9.35" height="80.87"/><rect class="cls-1" x="3.04" y="10.12" width="12.01" height="6.86" rx="0.65"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-right-open-black.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-right-open-black.svg
new file mode 100644
index 00000000..cefe9f60
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-right-open-black.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#191919;}.cls-2{fill:none;}</style></defs><title>singel-right-open-black</title><path class="cls-1" d="M9.12,76.78l2.94.28c-.21,2.29-.32,4.62-.32,6.93h-3C8.79,81.59,8.9,79.16,9.12,76.78Zm1-7.15c.45-2.36,1-4.72,1.68-7l2.84.82C14,65.64,13.46,67.92,13,70.18Zm4-13.86c.88-2.23,1.88-4.44,3-6.58l2.64,1.34c-1.05,2-2,4.18-2.86,6.33Zm6.53-12.86c1.28-2,2.67-4,4.13-5.92l2.34,1.79c-1.4,1.83-2.74,3.75-4,5.7Zm8.78-11.44c1.62-1.76,3.34-3.47,5.12-5.08l2,2.19c-1.72,1.55-3.38,3.19-4.94,4.89Zm10.68-9.68c1.92-1.45,3.92-2.82,6-4.09l1.56,2.51c-2,1.22-3.88,2.54-5.73,3.94Zm12.23-7.63c2.14-1.08,4.35-2.08,6.57-3L60,13.93c-2.15.86-4.28,1.82-6.33,2.87ZM65.75,8.8c2.29-.69,4.64-1.28,7-1.77l.6,2.89c-2.26.47-4.53,1.05-6.74,1.71ZM79.86,5.87c2.37-.28,4.79-.46,7.19-.54l.09,2.95c-2.31.07-4.65.25-6.93.52Z"/><polygon class="cls-1" points="88.59 93.29 88.59 83.94 93.26 83.94 93.26 102.64 83.91 102.64 83.91 93.29 88.59 93.29"/><polygon class="cls-1" points="7.71 93.29 7.71 83.94 3.04 83.94 3.04 102.64 12.39 102.64 12.39 93.29 7.71 93.29"/><rect class="cls-1" x="79.24" y="3.07" width="9.35" height="80.87"/><rect class="cls-1" x="81.25" y="10.12" width="12.01" height="6.86" rx="0.65" transform="translate(174.51 27.1) rotate(-180)"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-right-open-green.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-right-open-green.svg
new file mode 100644
index 00000000..d8503a4a
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-right-open-green.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#288c28;}.cls-2{fill:none;}</style></defs><title>singel-right-open-green</title><path class="cls-1" d="M9.12,76.78l2.94.28c-.21,2.29-.32,4.62-.32,6.93h-3C8.79,81.59,8.9,79.16,9.12,76.78Zm1-7.15c.45-2.36,1-4.72,1.68-7l2.84.82C14,65.64,13.46,67.92,13,70.18Zm4-13.86c.88-2.23,1.88-4.44,3-6.58l2.64,1.34c-1.05,2-2,4.18-2.86,6.33Zm6.53-12.86c1.28-2,2.67-4,4.13-5.92l2.34,1.79c-1.4,1.83-2.74,3.75-4,5.7Zm8.78-11.44c1.62-1.76,3.34-3.47,5.12-5.08l2,2.19c-1.72,1.55-3.38,3.19-4.94,4.89Zm10.68-9.68c1.92-1.45,3.92-2.82,6-4.09l1.56,2.51c-2,1.22-3.88,2.54-5.73,3.94Zm12.23-7.63c2.14-1.08,4.35-2.08,6.57-3L60,13.93c-2.15.86-4.28,1.82-6.33,2.87ZM65.75,8.8c2.29-.69,4.64-1.28,7-1.77l.6,2.89c-2.26.47-4.53,1.05-6.74,1.71ZM79.86,5.87c2.37-.28,4.79-.46,7.19-.54l.09,2.95c-2.31.07-4.65.25-6.93.52Z"/><polygon class="cls-1" points="88.59 93.29 88.59 83.94 93.26 83.94 93.26 102.64 83.91 102.64 83.91 93.29 88.59 93.29"/><polygon class="cls-1" points="7.71 93.29 7.71 83.94 3.04 83.94 3.04 102.64 12.39 102.64 12.39 93.29 7.71 93.29"/><rect class="cls-1" x="79.24" y="3.07" width="9.35" height="80.87"/><rect class="cls-1" x="81.25" y="10.12" width="12.01" height="6.86" rx="0.65" transform="translate(174.51 27.1) rotate(-180)"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-right-open-red.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-right-open-red.svg
new file mode 100644
index 00000000..a630002b
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/singel-right-open-red.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#ca0000;}.cls-2{fill:none;}</style></defs><title>singel-right-open-red</title><path class="cls-1" d="M9.12,76.78l2.94.28c-.21,2.29-.32,4.62-.32,6.93h-3C8.79,81.59,8.9,79.16,9.12,76.78Zm1-7.15c.45-2.36,1-4.72,1.68-7l2.84.82C14,65.64,13.46,67.92,13,70.18Zm4-13.86c.88-2.23,1.88-4.44,3-6.58l2.64,1.34c-1.05,2-2,4.18-2.86,6.33Zm6.53-12.86c1.28-2,2.67-4,4.13-5.92l2.34,1.79c-1.4,1.83-2.74,3.75-4,5.7Zm8.78-11.44c1.62-1.76,3.34-3.47,5.12-5.08l2,2.19c-1.72,1.55-3.38,3.19-4.94,4.89Zm10.68-9.68c1.92-1.45,3.92-2.82,6-4.09l1.56,2.51c-2,1.22-3.88,2.54-5.73,3.94Zm12.23-7.63c2.14-1.08,4.35-2.08,6.57-3L60,13.93c-2.15.86-4.28,1.82-6.33,2.87ZM65.75,8.8c2.29-.69,4.64-1.28,7-1.77l.6,2.89c-2.26.47-4.53,1.05-6.74,1.71ZM79.86,5.87c2.37-.28,4.79-.46,7.19-.54l.09,2.95c-2.31.07-4.65.25-6.93.52Z"/><polygon class="cls-1" points="88.59 93.29 88.59 83.94 93.26 83.94 93.26 102.64 83.91 102.64 83.91 93.29 88.59 93.29"/><polygon class="cls-1" points="7.71 93.29 7.71 83.94 3.04 83.94 3.04 102.64 12.39 102.64 12.39 93.29 7.71 93.29"/><rect class="cls-1" x="79.24" y="3.07" width="9.35" height="80.87"/><rect class="cls-1" x="81.25" y="10.12" width="12.01" height="6.86" rx="0.65" transform="translate(174.51 27.1) rotate(-180)"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/single-left-close-black.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/single-left-close-black.svg
new file mode 100644
index 00000000..4897486d
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/single-left-close-black.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#191919;}.cls-2{fill:none;}</style></defs><title>single-left-close-black</title><polygon class="cls-1" points="7.71 93.3 7.71 83.95 3.04 83.95 3.04 102.65 12.39 102.65 12.39 93.3 7.71 93.3"/><polygon class="cls-1" points="88.59 93.3 88.59 83.95 93.26 83.95 93.26 102.65 83.91 102.65 83.91 93.3 88.59 93.3"/><rect class="cls-1" x="7.72" y="83.95" width="80.87" height="9.35"/><rect class="cls-1" x="72.1" y="81.86" width="12.01" height="6.86" rx="0.65" transform="translate(163.39 7.18) rotate(90)"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/single-left-close-green.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/single-left-close-green.svg
new file mode 100644
index 00000000..d6058481
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/single-left-close-green.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#288c28;}.cls-2{fill:none;}</style></defs><title>single-left-close-green</title><polygon class="cls-1" points="7.71 93.3 7.71 83.95 3.04 83.95 3.04 102.65 12.39 102.65 12.39 93.3 7.71 93.3"/><polygon class="cls-1" points="88.59 93.3 88.59 83.95 93.26 83.95 93.26 102.65 83.91 102.65 83.91 93.3 88.59 93.3"/><rect class="cls-1" x="7.72" y="83.95" width="80.87" height="9.35"/><rect class="cls-1" x="72.1" y="81.86" width="12.01" height="6.86" rx="0.65" transform="translate(163.39 7.18) rotate(90)"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/single-left-close-red.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/single-left-close-red.svg
new file mode 100644
index 00000000..3e2e4b08
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/single-left-close-red.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#ca0000;}.cls-2{fill:none;}</style></defs><title>single-left-close-red</title><polygon class="cls-1" points="7.71 93.3 7.71 83.95 3.04 83.95 3.04 102.65 12.39 102.65 12.39 93.3 7.71 93.3"/><polygon class="cls-1" points="88.59 93.3 88.59 83.95 93.26 83.95 93.26 102.65 83.91 102.65 83.91 93.3 88.59 93.3"/><rect class="cls-1" x="7.72" y="83.95" width="80.87" height="9.35"/><rect class="cls-1" x="72.1" y="81.86" width="12.01" height="6.86" rx="0.65" transform="translate(163.39 7.18) rotate(90)"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/single-right-close-black.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/single-right-close-black.svg
new file mode 100644
index 00000000..f234d381
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/single-right-close-black.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#191919;}.cls-2{fill:none;}</style></defs><title>single-right-close-black</title><polygon class="cls-1" points="88.59 93.3 88.59 83.95 93.26 83.95 93.26 102.65 83.91 102.65 83.91 93.3 88.59 93.3"/><polygon class="cls-1" points="7.71 93.3 7.71 83.95 3.04 83.95 3.04 102.65 12.39 102.65 12.39 93.3 7.71 93.3"/><rect class="cls-1" x="7.72" y="83.95" width="80.87" height="9.35"/><rect class="cls-1" x="12.19" y="81.86" width="12.01" height="6.86" rx="0.65" transform="translate(103.48 67.09) rotate(90)"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/single-right-close-green.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/single-right-close-green.svg
new file mode 100644
index 00000000..59f647c8
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/single-right-close-green.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#288c28;}.cls-2{fill:none;}</style></defs><title>single-right-close-green</title><polygon class="cls-1" points="88.59 93.3 88.59 83.95 93.26 83.95 93.26 102.65 83.91 102.65 83.91 93.3 88.59 93.3"/><polygon class="cls-1" points="7.71 93.3 7.71 83.95 3.04 83.95 3.04 102.65 12.39 102.65 12.39 93.3 7.71 93.3"/><rect class="cls-1" x="7.72" y="83.95" width="80.87" height="9.35"/><rect class="cls-1" x="12.19" y="81.86" width="12.01" height="6.86" rx="0.65" transform="translate(103.48 67.09) rotate(90)"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/svg/single-right-close-red.svg b/NON-APPROVED/pss1-pss/symbols/door v2/svg/single-right-close-red.svg
new file mode 100644
index 00000000..da016ca4
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/door v2/svg/single-right-close-red.svg	
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.3 105.64"><defs><style>.cls-1{fill:#ca0000;}.cls-2{fill:none;}</style></defs><title>single-right-close-red</title><polygon class="cls-1" points="88.59 93.3 88.59 83.95 93.26 83.95 93.26 102.65 83.91 102.65 83.91 93.3 88.59 93.3"/><polygon class="cls-1" points="7.71 93.3 7.71 83.95 3.04 83.95 3.04 102.65 12.39 102.65 12.39 93.3 7.71 93.3"/><rect class="cls-1" x="7.72" y="83.95" width="80.87" height="9.35"/><rect class="cls-1" x="12.19" y="81.86" width="12.01" height="6.86" rx="0.65" transform="translate(103.48 67.09) rotate(90)"/><rect class="cls-2" width="96.3" height="105.64"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/map/Key_Exchange_v03.svg b/NON-APPROVED/pss1-pss/symbols/map/Key_Exchange_v03.svg
new file mode 100644
index 00000000..6fc982f7
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/map/Key_Exchange_v03.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1396 805" style="enable-background:new 0 0 1396 805;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#DCE1DD;}
+	.st1{fill:none;stroke:#4C4C4C;stroke-width:4;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#4C4C4C;stroke-width:4;stroke-miterlimit:10;stroke-dasharray:6.0741,6.0741;}
+	.st3{fill:none;stroke:#4C4C4C;stroke-width:4;stroke-miterlimit:10;stroke-dasharray:6;}
+	.st4{fill:none;stroke:#4C4C4C;stroke-width:4.0661;stroke-miterlimit:10;stroke-dasharray:6.0992;}
+	.st5{fill:none;stroke:#4C4C4C;stroke-width:3;stroke-miterlimit:10;}
+</style>
+<g id="Group_1_">
+	<g>
+		<path class="st0" d="M514,182.5H6c-2.8,0-5-2.2-5-5V7.5c0-2.8,2.2-5,5-5h508c2.8,0,5,2.2,5,5v170C519,180.3,516.8,182.5,514,182.5
+			z"/>
+	</g>
+	<g>
+		<path class="st0" d="M631.5,467.5H6.5c-2.8,0-5-2.2-5-5v-243c0-2.8,2.2-5,5-5h625c2.8,0,5,2.2,5,5v243
+			C636.5,465.3,634.3,467.5,631.5,467.5z"/>
+	</g>
+	<g>
+		<path class="st0" d="M631.5,804.5H6.5c-2.8,0-5-2.2-5-5v-294c0-2.8,2.2-5,5-5h625c2.8,0,5,2.2,5,5v294
+			C636.5,802.3,634.3,804.5,631.5,804.5z"/>
+	</g>
+	<g>
+		<path class="st0" d="M1221.5,804.5h-533c-2.8,0-5-2.2-5-5v-185c0-2.8,2.2-5,5-5h533c2.8,0,5,2.2,5,5v185
+			C1226.5,802.3,1224.3,804.5,1221.5,804.5z"/>
+	</g>
+	<g>
+		<path class="st0" d="M1100.5,335.5h-412c-2.8,0-5-2.2-5-5V148c0-2.8,2.2-5,5-5h412c2.8,0,5,2.2,5,5v182.5
+			C1105.5,333.3,1103.3,335.5,1100.5,335.5z"/>
+	</g>
+	<g>
+		<path class="st0" d="M1390.5,587.5h-236c-2.8,0-5-2.2-5-5V5.5c0-2.8,2.2-5,5-5h236c2.8,0,5,2.2,5,5v577
+			C1395.5,585.3,1393.3,587.5,1390.5,587.5z"/>
+	</g>
+</g>
+<g id="Lines">
+	<g>
+		<g>
+			<line class="st1" x1="228.5" y1="103.5" x2="231.5" y2="103.5"/>
+			<line class="st2" x1="237.6" y1="103.5" x2="392.5" y2="103.5"/>
+			<line class="st1" x1="395.5" y1="103.5" x2="398.5" y2="103.5"/>
+		</g>
+	</g>
+	<polyline class="st1" points="398.5,103.5 1273.5,103 1273.5,514.5 	"/>
+	<line class="st1" x1="338.5" y1="730.5" x2="1130" y2="730.5"/>
+	<line class="st1" x1="398.5" y1="301.5" x2="398.5" y2="103.5"/>
+	<line class="st1" x1="217.5" y1="612.5" x2="217.5" y2="413.5"/>
+	<line class="st1" x1="338.5" y1="612.5" x2="338.5" y2="416.5"/>
+	<line class="st1" x1="457.5" y1="614.5" x2="457.5" y2="415.5"/>
+	<polyline class="st3" points="217.5,413.5 217.5,361.5 397.5,361.5 576.5,361.5 576.5,416.5 	"/>
+	<polyline class="st3" points="217.5,612.5 217.5,672.5 336.8,672.5 457.5,672.5 457.5,614.5 	"/>
+	<line class="st3" x1="398.5" y1="301.5" x2="398.5" y2="361.5"/>
+	<line class="st4" x1="338.5" y1="366.5" x2="338.5" y2="416.5"/>
+	<line class="st4" x1="457.5" y1="366.5" x2="457.5" y2="415.5"/>
+	<line class="st3" x1="338.5" y1="612.5" x2="338.5" y2="730.5"/>
+	<line class="st5" x1="826.5" y1="262" x2="962.5" y2="263"/>
+</g>
+</svg>
diff --git a/NON-APPROVED/pss1-pss/symbols/map/PSS1_map_lines_v09.svg b/NON-APPROVED/pss1-pss/symbols/map/PSS1_map_lines_v09.svg
new file mode 100644
index 00000000..3fa9ce7d
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/map/PSS1_map_lines_v09.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="lines" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1748 1125.33" style="enable-background:new 0 0 1748 1125.33;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;stroke:#636664;stroke-width:4.8086;stroke-linecap:square;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#636664;stroke-width:4.8086;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#636664;stroke-width:4.8084;stroke-linecap:square;stroke-miterlimit:10;}
+	.st3{fill:none;stroke:#636664;stroke-width:4.808;stroke-miterlimit:10;}
+</style>
+<polyline class="st0" points="749.44,720.15 749.44,780.56 386.97,780.56 386.97,720.15 "/>
+<polyline class="st0" points="282.02,720.15 282.02,780.56 10.22,780.56 10.22,240 979.01,240 "/>
+<line class="st1" x1="1618" y1="781.25" x2="979.01" y2="781.25"/>
+<line class="st1" x1="1729.64" y1="709.68" x2="1253.17" y2="709.68"/>
+<line class="st2" x1="979.01" y1="964.23" x2="979.01" y2="780.56"/>
+<line class="st3" x1="132.94" y1="964.81" x2="132.94" y2="780.56"/>
+<line class="st2" x1="1363.05" y1="540.25" x2="1363.05" y2="300.49"/>
+<polyline class="st2" points="1192.67,781.25 1192.67,635.34 1410,635.34 "/>
+<line class="st2" x1="1553.15" y1="449.46" x2="1553.15" y2="185.54"/>
+<line class="st2" x1="1458.13" y1="449.46" x2="1458.13" y2="300.04"/>
+<polyline class="st0" points="10.22,1059.34 1019.79,1059.34 1019.79,1086.52 1099.84,1086.52 1099.84,1122.77 1596.74,1122.77 
+	1596.74,1086.52 1729.06,1086.7 1729.06,6.4 979.01,6.23 979.01,781.25 854.39,781.25 854.39,720.84 "/>
+</svg>
diff --git a/NON-APPROVED/pss1-pss/symbols/map/PSS1_map_solid_v08.svg b/NON-APPROVED/pss1-pss/symbols/map/PSS1_map_solid_v08.svg
new file mode 100644
index 00000000..01941387
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/map/PSS1_map_solid_v08.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="solid" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1748 1125.33" style="enable-background:new 0 0 1748 1125.33;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#C8CDC9;}
+</style>
+<polygon class="st0" points="10.22,240 10.22,1059.34 1019.79,1059.34 1019.79,1086.52 1099.84,1086.52 1099.84,1122.77 
+	1596.74,1122.77 1596.74,1086.52 1729.06,1086.7 1729.06,6.41 979.01,6.23 979.01,240 "/>
+</svg>
diff --git a/NON-APPROVED/pss1-pss/symbols/map/PSS1_map_zone1blue_v08.svg b/NON-APPROVED/pss1-pss/symbols/map/PSS1_map_zone1blue_v08.svg
new file mode 100644
index 00000000..2e5d14bb
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/map/PSS1_map_zone1blue_v08.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="zone_1_blue_1_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 1748 1125.33" style="enable-background:new 0 0 1748 1125.33;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#78C7DF;}
+</style>
+<polygon class="st0" points="979.01,780.56 1192.67,780.56 1192.67,635.34 1363.36,635.34 1363.05,450.17 1729.06,450.17 
+	1729.06,1086.7 1596.74,1086.52 1596.74,1122.77 1099.84,1122.77 1099.84,1086.52 1019.79,1086.52 1019.79,1059.34 979.42,1060.12 
+	"/>
+</svg>
diff --git a/NON-APPROVED/pss1-pss/symbols/map/PSS1_map_zone2blue_v08.svg b/NON-APPROVED/pss1-pss/symbols/map/PSS1_map_zone2blue_v08.svg
new file mode 100644
index 00000000..23a80158
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/map/PSS1_map_zone2blue_v08.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="zone_2_blue" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 1748 1125.33" style="enable-background:new 0 0 1748 1125.33;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#78C7DF;}
+</style>
+<polygon class="st0" points="979.01,1059.34 132.94,1059.34 132.94,780.51 282.02,780.56 282.02,720.15 386.97,720.15 
+	386.97,780.56 749.44,780.56 749.44,720.15 854.39,720.84 854.39,781.25 979.01,781.25 "/>
+</svg>
diff --git a/NON-APPROVED/pss1-pss/symbols/rad/Ionising radiation green v02.svg b/NON-APPROVED/pss1-pss/symbols/rad/Ionising radiation green v02.svg
new file mode 100644
index 00000000..20f96167
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/rad/Ionising radiation green v02.svg	
@@ -0,0 +1 @@
+<svg id="_Layer_" data-name="&lt;Layer&gt;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 289 260"><defs><style>.cls-1{fill:none;}.cls-2{fill:#205929;}.cls-3{fill:#62b33d;}.cls-4{fill:#010101;}</style></defs><title>Ionising radiation green</title><rect class="cls-1" width="289" height="260"/><path id="sign_border" data-name="sign border" class="cls-2" d="M283.3,240.87,151,11.67a7.45,7.45,0,0,0-6.48-3.73A7.56,7.56,0,0,0,138,11.67L5.7,240.87a7.33,7.33,0,0,0,0,7.46,7.45,7.45,0,0,0,6.48,3.73H276.82a7.56,7.56,0,0,0,6.48-3.73,7.33,7.33,0,0,0,0-7.46Z"/><polygon id="polygon7" class="cls-3" points="25.19 237.11 144.55 31.27 263.91 237.11 25.19 237.11"/><path id="circle4439" class="cls-4" d="M156.93,166.83a12.45,12.45,0,1,1-12.45-12.44A12.45,12.45,0,0,1,156.93,166.83Zm18.74-54-21.82,37.81c.37.24.74.42,1.12.7a15.44,15.44,0,0,1,1.44,1.08c.47.37.89.79,1.35,1.21s.84.88,1.22,1.3.74.94,1.07,1.45.65,1,.93,1.54a16.38,16.38,0,0,1,.79,1.63,17.72,17.72,0,0,1,.66,1.73c.18.6.32,1.16.46,1.77a11.11,11.11,0,0,1,.28,1.86c.05.61.1,1.26.1,1.91h43.64c-.1-22.94-11.38-42.52-31.24-54Zm-62.34,0c-19.86,11.47-31.14,31-31.14,54h43.64c0-.65,0-1.3.09-1.91s.19-1.26.28-1.86a18.29,18.29,0,0,1,.47-1.77,10.26,10.26,0,0,1,.65-1.73,16.38,16.38,0,0,1,.79-1.63c.28-.51.61-1,.93-1.54a17,17,0,0,1,1.08-1.45,16.48,16.48,0,0,1,1.21-1.3,20,20,0,0,1,2.8-2.29l1.11-.7-21.91-37.81ZM135.15,183l-21.82,37.82c19.86,11.47,42.48,11.47,62.34,0L153.85,183l-.42.28c-.51.28-1.07.56-1.63.8s-1.12.46-1.73.65-1.16.32-1.77.46a11.23,11.23,0,0,1-1.87.28c-.6.05-1.25.1-1.91.1s-1.26-.05-1.91-.1a11.94,11.94,0,0,1-1.86-.28c-.61-.14-1.22-.28-1.78-.46a11.48,11.48,0,0,1-1.72-.65c-.56-.24-1.12-.52-1.63-.8A2.92,2.92,0,0,1,135.15,183Z"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/rad/Ionising radiation grey v02.svg b/NON-APPROVED/pss1-pss/symbols/rad/Ionising radiation grey v02.svg
new file mode 100644
index 00000000..ea7d1dd2
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/rad/Ionising radiation grey v02.svg	
@@ -0,0 +1 @@
+<svg id="_Layer_" data-name="&lt;Layer&gt;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 289 260"><defs><style>.cls-1{fill:none;}.cls-2{fill:#59595a;}.cls-3{fill:#a8a8a8;}.cls-4{fill:#373737;}</style></defs><title>Ionising radiation grey</title><rect class="cls-1" width="289" height="260"/><path id="sign_border" data-name="sign border" class="cls-2" d="M283.3,240.87,151,11.67a7.45,7.45,0,0,0-6.48-3.73A7.56,7.56,0,0,0,138,11.67L5.7,240.87a7.33,7.33,0,0,0,0,7.46,7.45,7.45,0,0,0,6.48,3.73H276.82a7.56,7.56,0,0,0,6.48-3.73,7.33,7.33,0,0,0,0-7.46Z"/><polygon id="polygon7" class="cls-3" points="25.19 237.11 144.55 31.27 263.91 237.11 25.19 237.11"/><path id="circle4439" class="cls-4" d="M156.93,166.83a12.45,12.45,0,1,1-12.45-12.44A12.45,12.45,0,0,1,156.93,166.83Zm18.74-54-21.82,37.81c.37.24.74.42,1.12.7a15.44,15.44,0,0,1,1.44,1.08c.47.37.89.79,1.35,1.21s.84.88,1.22,1.3.74.94,1.07,1.45.65,1,.93,1.54a16.38,16.38,0,0,1,.79,1.63,17.72,17.72,0,0,1,.66,1.73c.18.6.32,1.16.46,1.77a11.11,11.11,0,0,1,.28,1.86c.05.61.1,1.26.1,1.91h43.64c-.1-22.94-11.38-42.52-31.24-54Zm-62.34,0c-19.86,11.47-31.14,31-31.14,54h43.64c0-.65,0-1.3.09-1.91s.19-1.26.28-1.86a18.29,18.29,0,0,1,.47-1.77,10.26,10.26,0,0,1,.65-1.73,16.38,16.38,0,0,1,.79-1.63c.28-.51.61-1,.93-1.54a17,17,0,0,1,1.08-1.45,16.48,16.48,0,0,1,1.21-1.3,20,20,0,0,1,2.8-2.29l1.11-.7-21.91-37.81ZM135.15,183l-21.82,37.82c19.86,11.47,42.48,11.47,62.34,0L153.85,183l-.42.28c-.51.28-1.07.56-1.63.8s-1.12.46-1.73.65-1.16.32-1.77.46a11.23,11.23,0,0,1-1.87.28c-.6.05-1.25.1-1.91.1s-1.26-.05-1.91-.1a11.94,11.94,0,0,1-1.86-.28c-.61-.14-1.22-.28-1.78-.46a11.48,11.48,0,0,1-1.72-.65c-.56-.24-1.12-.52-1.63-.8A2.92,2.92,0,0,1,135.15,183Z"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/rad/Ionising radiation red v02.svg b/NON-APPROVED/pss1-pss/symbols/rad/Ionising radiation red v02.svg
new file mode 100644
index 00000000..e4c69ab5
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/rad/Ionising radiation red v02.svg	
@@ -0,0 +1 @@
+<svg id="_Layer_" data-name="&lt;Layer&gt;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 289 260"><defs><style>.cls-1{fill:none;}.cls-2{fill:#581213;}.cls-3{fill:#e6282a;}.cls-4{fill:#fff;}</style></defs><title>Ionising radiation red</title><rect class="cls-1" width="289" height="260"/><path id="sign_border" data-name="sign border" class="cls-2" d="M283.3,240.87,151,11.67a7.45,7.45,0,0,0-6.48-3.73A7.56,7.56,0,0,0,138,11.67L5.7,240.87a7.33,7.33,0,0,0,0,7.46,7.45,7.45,0,0,0,6.48,3.73H276.82a7.56,7.56,0,0,0,6.48-3.73,7.33,7.33,0,0,0,0-7.46Z"/><polygon id="polygon7" class="cls-3" points="25.19 237.11 144.55 31.27 263.91 237.11 25.19 237.11"/><path id="circle4439" class="cls-4" d="M156.93,166.83a12.45,12.45,0,1,1-12.45-12.44A12.45,12.45,0,0,1,156.93,166.83Zm18.74-54-21.82,37.81c.37.24.74.42,1.12.7a15.44,15.44,0,0,1,1.44,1.08c.47.37.89.79,1.35,1.21s.84.88,1.22,1.3.74.94,1.07,1.45.65,1,.93,1.54a16.38,16.38,0,0,1,.79,1.63,17.72,17.72,0,0,1,.66,1.73c.18.6.32,1.16.46,1.77a11.11,11.11,0,0,1,.28,1.86c.05.61.1,1.26.1,1.91h43.64c-.1-22.94-11.38-42.52-31.24-54Zm-62.34,0c-19.86,11.47-31.14,31-31.14,54h43.64c0-.65,0-1.3.09-1.91s.19-1.26.28-1.86a18.29,18.29,0,0,1,.47-1.77,10.26,10.26,0,0,1,.65-1.73,16.38,16.38,0,0,1,.79-1.63c.28-.51.61-1,.93-1.54a17,17,0,0,1,1.08-1.45,16.48,16.48,0,0,1,1.21-1.3,20,20,0,0,1,2.8-2.29l1.11-.7-21.91-37.81ZM135.15,183l-21.82,37.82c19.86,11.47,42.48,11.47,62.34,0L153.85,183l-.42.28c-.51.28-1.07.56-1.63.8s-1.12.46-1.73.65-1.16.32-1.77.46a11.23,11.23,0,0,1-1.87.28c-.6.05-1.25.1-1.91.1s-1.26-.05-1.91-.1a11.94,11.94,0,0,1-1.86-.28c-.61-.14-1.22-.28-1.78-.46a11.48,11.48,0,0,1-1.72-.65c-.56-.24-1.12-.52-1.63-.8A2.92,2.92,0,0,1,135.15,183Z"/></svg>
\ No newline at end of file
diff --git a/NON-APPROVED/pss1-pss/symbols/rad/Ionising radiation yellow v02.svg b/NON-APPROVED/pss1-pss/symbols/rad/Ionising radiation yellow v02.svg
new file mode 100644
index 00000000..a102b293
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/rad/Ionising radiation yellow v02.svg	
@@ -0,0 +1 @@
+<svg id="_Layer_" data-name="&lt;Layer&gt;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 289 260"><defs><style>.cls-1{fill:none;}.cls-2{fill:#3d3517;}.cls-3{fill:#f7e82c;}.cls-4{fill:#010101;}</style></defs><title>Ionising radiation yellow</title><rect class="cls-1" width="289" height="260"/><path id="sign_border" data-name="sign border" class="cls-2" d="M283.3,240.87,151,11.67a7.45,7.45,0,0,0-6.48-3.73A7.56,7.56,0,0,0,138,11.67L5.7,240.87a7.33,7.33,0,0,0,0,7.46,7.45,7.45,0,0,0,6.48,3.73H276.82a7.56,7.56,0,0,0,6.48-3.73,7.33,7.33,0,0,0,0-7.46Z"/><polygon id="polygon7" class="cls-3" points="25.19 237.11 144.55 31.27 263.91 237.11 25.19 237.11"/><path id="circle4439" class="cls-4" d="M156.93,166.83a12.45,12.45,0,1,1-12.45-12.44A12.45,12.45,0,0,1,156.93,166.83Zm18.74-54-21.82,37.81c.37.24.74.42,1.12.7a15.44,15.44,0,0,1,1.44,1.08c.47.37.89.79,1.35,1.21s.84.88,1.22,1.3.74.94,1.07,1.45.65,1,.93,1.54a16.38,16.38,0,0,1,.79,1.63,17.72,17.72,0,0,1,.66,1.73c.18.6.32,1.16.46,1.77a11.11,11.11,0,0,1,.28,1.86c.05.61.1,1.26.1,1.91h43.64c-.1-22.94-11.38-42.52-31.24-54Zm-62.34,0c-19.86,11.47-31.14,31-31.14,54h43.64c0-.65,0-1.3.09-1.91s.19-1.26.28-1.86a18.29,18.29,0,0,1,.47-1.77,10.26,10.26,0,0,1,.65-1.73,16.38,16.38,0,0,1,.79-1.63c.28-.51.61-1,.93-1.54a17,17,0,0,1,1.08-1.45,16.48,16.48,0,0,1,1.21-1.3,20,20,0,0,1,2.8-2.29l1.11-.7-21.91-37.81ZM135.15,183l-21.82,37.82c19.86,11.47,42.48,11.47,62.34,0L153.85,183l-.42.28c-.51.28-1.07.56-1.63.8s-1.12.46-1.73.65-1.16.32-1.77.46a11.23,11.23,0,0,1-1.87.28c-.6.05-1.25.1-1.91.1s-1.26-.05-1.91-.1a11.94,11.94,0,0,1-1.86-.28c-.61-.14-1.22-.28-1.78-.46a11.48,11.48,0,0,1-1.72-.65c-.56-.24-1.12-.52-1.63-.8A2.92,2.92,0,0,1,135.15,183Z"/></svg>
\ No newline at end of file
-- 
GitLab