diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
index 9af1d76da08828a2377ba14874a7c7e56a2424c6..f7a660fecefcd0b87a463860a1c7decf95dfa825 100644
--- a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
+++ b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
@@ -3,22 +3,6 @@
   <name>PSS1 PSS</name>
   <width>1040</width>
   <height>830</height>
-  <widget type="rectangle" version="2.0.0">
-    <name>Wave_Frame</name>
-    <x>205</x>
-    <y>230</y>
-    <width>342</width>
-    <height>185</height>
-    <line_width>1</line_width>
-    <line_color>
-      <color name="Header_Background" red="77" green="77" blue="77">
-      </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>BGGrey03-titlebar_1</name>
     <x>10</x>
@@ -68,9 +52,9 @@
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_2</name>
     <x>20</x>
-    <y>221</y>
+    <y>240</y>
     <width>990</width>
-    <height>589</height>
+    <height>570</height>
     <line_width>0</line_width>
     <background_color>
       <color name="Background" red="220" green="225" blue="221">
@@ -110,10 +94,10 @@
     <height>110</height>
     <style>3</style>
     <widget type="led" version="2.0.0">
-      <name>AccPSS-Z0:PSS-RIO-4:ISrcMagPS_PermitOn</name>
-      <pv_name>AccPSS-Z0:PSS-RIO-4:ISrcMagPS_PermitOn</pv_name>
+      <name>ISrcHVPS_PermitOn</name>
+      <pv_name>FEB-010Row:CnPw-U-007:ISrcHVPS_PermitOn</pv_name>
       <x>10</x>
-      <y>29</y>
+      <y>3</y>
       <off_color>
         <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
         </color>
@@ -124,25 +108,37 @@
       </on_color>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>ISrc Magnetron</name>
-      <text>ISrc magnetron PS</text>
+      <name>LB_ISrcHVPS_PermitOn</name>
+      <text>ISrc HVPS</text>
       <x>36</x>
-      <y>29</y>
+      <y>3</y>
       <width>120</width>
       <vertical_alignment>1</vertical_alignment>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>AB_ISrcHVPS_PermitOn</name>
       <actions>
         <action type="open_display">
-          <file>popups/permits/isrc_magnetron.bob</file>
+          <file>popups/permits/isrc_hvps.bob</file>
           <target>window</target>
           <description>Open Display</description>
         </action>
       </actions>
+      <text></text>
+      <x>36</x>
+      <y>3</y>
+      <width>120</width>
+      <height>20</height>
+      <transparent>true</transparent>
+      <tooltip>$(actions)</tooltip>
     </widget>
     <widget type="led" version="2.0.0">
-      <name>KG-NCG:PSS-ICC-1:RFQDTL1_PermitOn</name>
-      <pv_name>KG-NCG:PSS-ICC-1:RFQDTL1_PermitOn</pv_name>
+      <name>ISrcMagPS_PermitOn</name>
+      <pv_name>AccPSS-Z0:PSS-RIO-4:ISrcMagPS_PermitOn</pv_name>
       <x>10</x>
-      <y>56</y>
+      <y>29</y>
       <off_color>
         <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
         </color>
@@ -153,25 +149,37 @@
       </on_color>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>RFQ_Permit</name>
-      <text>RFQ &amp; DTL1 </text>
+      <name>LB_ISrcMagPS_PermitOn</name>
+      <text>ISrc magnetron PS</text>
       <x>36</x>
-      <y>56</y>
+      <y>29</y>
       <width>120</width>
       <vertical_alignment>1</vertical_alignment>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>AB_ISrcMagPS_PermitOn</name>
       <actions>
         <action type="open_display">
-          <file>popups/permits/rfq_dtl1.bob</file>
+          <file>popups/permits/isrc_magnetron.bob</file>
           <target>window</target>
           <description>Open Display</description>
         </action>
       </actions>
+      <text></text>
+      <x>36</x>
+      <y>29</y>
+      <width>120</width>
+      <height>20</height>
+      <transparent>true</transparent>
+      <tooltip>$(actions)</tooltip>
     </widget>
     <widget type="led" version="2.0.0">
-      <name>FEB-010Row:CnPw-U-007:ISrcHVPS_PermitOn</name>
-      <pv_name>FEB-010Row:CnPw-U-007:ISrcHVPS_PermitOn</pv_name>
+      <name>RFQDTL1_PermitOn</name>
+      <pv_name>KG-NCG:PSS-ICC-1:RFQDTL1_PermitOn</pv_name>
       <x>10</x>
-      <y>3</y>
+      <y>56</y>
       <off_color>
         <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
         </color>
@@ -182,36 +190,34 @@
       </on_color>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>ISrc HVPS</name>
-      <text>ISrc HVPS</text>
+      <name>LB_RFQDTL1_PermitOn</name>
+      <text>RFQ &amp; DTL1 </text>
       <x>36</x>
-      <y>3</y>
+      <y>56</y>
       <width>120</width>
       <vertical_alignment>1</vertical_alignment>
       <actions>
-        <action type="open_display">
-          <file>popups/permits/isrc_hvps.bob</file>
-          <target>window</target>
-          <description>Open Display</description>
-        </action>
       </actions>
     </widget>
-    <widget type="label" version="2.0.0">
-      <name>DTL2&amp;DTL3_Permit</name>
-      <text>DTL2 &amp; DTL3 </text>
-      <x>36</x>
-      <y>83</y>
-      <width>120</width>
+    <widget type="action_button" version="3.0.0">
+      <name>AB_RFQDTL1_PermitOn</name>
       <actions>
         <action type="open_display">
-          <file>popups/permits/dtl2_dtl3.bob</file>
+          <file>popups/permits/rfq_dtl1.bob</file>
           <target>window</target>
           <description>Open Display</description>
         </action>
       </actions>
+      <text></text>
+      <x>36</x>
+      <y>56</y>
+      <width>120</width>
+      <height>20</height>
+      <transparent>true</transparent>
+      <tooltip>$(actions)</tooltip>
     </widget>
     <widget type="led" version="2.0.0">
-      <name>KG-NCG:PSS-ICC-2:DTL2DTL3_PermitOn</name>
+      <name>DTL2DTL3_PermitOn</name>
       <pv_name>KG-NCG:PSS-ICC-2:DTL2DTL3_PermitOn</pv_name>
       <x>10</x>
       <y>83</y>
@@ -225,21 +231,33 @@
       </on_color>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>DTL4_Permit</name>
-      <text>DTL4 </text>
-      <x>210</x>
-      <y>3</y>
+      <name>LB_DTL2DTL3_PermitOn</name>
+      <text>DTL2 &amp; DTL3 </text>
+      <x>36</x>
+      <y>83</y>
       <width>120</width>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>AB_DTL2DTL3_PermitOn</name>
       <actions>
         <action type="open_display">
-          <file>popups/permits/dtl4.bob</file>
+          <file>popups/permits/dtl2_dtl3.bob</file>
           <target>window</target>
           <description>Open Display</description>
         </action>
       </actions>
+      <text></text>
+      <x>36</x>
+      <y>83</y>
+      <width>120</width>
+      <height>20</height>
+      <transparent>true</transparent>
+      <tooltip>$(actions)</tooltip>
     </widget>
     <widget type="led" version="2.0.0">
-      <name>KG-NCG:PSS-ICC-3:DTL4_PermitOn</name>
+      <name>DTL4_PermitOn</name>
       <pv_name>KG-NCG:PSS-ICC-3:DTL4_PermitOn</pv_name>
       <x>184</x>
       <y>3</y>
@@ -252,8 +270,39 @@
         </color>
       </on_color>
     </widget>
+    <widget type="label" version="2.0.0">
+      <name>LB_DTL4_PermitOn</name>
+      <text>DTL4 </text>
+      <x>210</x>
+      <y>3</y>
+      <width>120</width>
+      <actions>
+        <action type="open_display">
+          <file>popups/permits/dtl4.bob</file>
+          <target>window</target>
+          <description>Open Display</description>
+        </action>
+      </actions>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>AB_DTL4_PermitOn</name>
+      <actions>
+        <action type="open_display">
+          <file>popups/permits/dtl4.bob</file>
+          <target>window</target>
+          <description>Open Display</description>
+        </action>
+      </actions>
+      <text></text>
+      <x>210</x>
+      <y>3</y>
+      <width>120</width>
+      <height>20</height>
+      <transparent>true</transparent>
+      <tooltip>$(actions)</tooltip>
+    </widget>
     <widget type="led" version="2.0.0">
-      <name>KG-NCG:PSS-ICC-4:MEBT1_PermitOn</name>
+      <name>MEBT1_PermitOn</name>
       <pv_name>KG-NCG:PSS-ICC-4:MEBT1_PermitOn</pv_name>
       <x>184</x>
       <y>29</y>
@@ -266,8 +315,41 @@
         </color>
       </on_color>
     </widget>
+    <widget type="label" version="2.0.0">
+      <name>LB_MEBT1_PermitOn</name>
+      <text>MEBT1 buncher 1</text>
+      <x>210</x>
+      <y>29</y>
+      <width>117</width>
+      <height>23</height>
+      <auto_size>true</auto_size>
+      <actions>
+        <action type="open_display">
+          <file>popups/permits/mebt1.bob</file>
+          <target>window</target>
+          <description>Open Display</description>
+        </action>
+      </actions>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>AB_MEBT1_PermitOn</name>
+      <actions>
+        <action type="open_display">
+          <file>popups/permits/mebt1.bob</file>
+          <target>window</target>
+          <description>Open Display</description>
+        </action>
+      </actions>
+      <text></text>
+      <x>210</x>
+      <y>29</y>
+      <width>117</width>
+      <height>23</height>
+      <transparent>true</transparent>
+      <tooltip>$(actions)</tooltip>
+    </widget>
     <widget type="led" version="2.0.0">
-      <name>KG-NCG:PSS-ICC-4:MEBT2_PermitOn</name>
+      <name>MEBT2_PermitOn</name>
       <pv_name>KG-NCG:PSS-ICC-4:MEBT2_PermitOn</pv_name>
       <x>184</x>
       <y>56</y>
@@ -280,8 +362,41 @@
         </color>
       </on_color>
     </widget>
+    <widget type="label" version="2.0.0">
+      <name>LB_MEBT2_PermitOn</name>
+      <text>MEBT2 buncher 2</text>
+      <x>210</x>
+      <y>56</y>
+      <width>117</width>
+      <height>23</height>
+      <auto_size>true</auto_size>
+      <actions>
+        <action type="open_display">
+          <file>popups/permits/mebt2.bob</file>
+          <target>window</target>
+          <description>Open Display</description>
+        </action>
+      </actions>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>AB_MEBT2_PermitOn</name>
+      <actions>
+        <action type="open_display">
+          <file>popups/permits/mebt2.bob</file>
+          <target>window</target>
+          <description>Open Display</description>
+        </action>
+      </actions>
+      <text></text>
+      <x>210</x>
+      <y>56</y>
+      <width>117</width>
+      <height>23</height>
+      <transparent>true</transparent>
+      <tooltip>$(actions)</tooltip>
+    </widget>
     <widget type="led" version="2.0.0">
-      <name>KG-NCG:PSS-ICC-4:MEBT3_PermitOn</name>
+      <name>MEBT3_PermitOn</name>
       <pv_name>KG-NCG:PSS-ICC-4:MEBT3_PermitOn</pv_name>
       <x>184</x>
       <y>83</y>
@@ -295,7 +410,7 @@
       </on_color>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>MEBT3_Permit</name>
+      <name>LB_MEBT3_PermitOn</name>
       <text>MEBT3 buncher 3</text>
       <x>210</x>
       <y>83</y>
@@ -310,37 +425,22 @@
         </action>
       </actions>
     </widget>
-    <widget type="label" version="2.0.0">
-      <name>MEBT2_Permit</name>
-      <text>MEBT2 buncher 2</text>
-      <x>210</x>
-      <y>56</y>
-      <width>117</width>
-      <height>23</height>
-      <auto_size>true</auto_size>
+    <widget type="action_button" version="3.0.0">
+      <name>AB_MEBT3_PermitOn</name>
       <actions>
         <action type="open_display">
-          <file>popups/permits/mebt2.bob</file>
+          <file>popups/permits/mebt3.bob</file>
           <target>window</target>
           <description>Open Display</description>
         </action>
       </actions>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>MEBT1_Permit</name>
-      <text>MEBT1 buncher 1</text>
+      <text></text>
       <x>210</x>
-      <y>29</y>
+      <y>83</y>
       <width>117</width>
       <height>23</height>
-      <auto_size>true</auto_size>
-      <actions>
-        <action type="open_display">
-          <file>popups/permits/mebt1.bob</file>
-          <target>window</target>
-          <description>Open Display</description>
-        </action>
-      </actions>
+      <transparent>true</transparent>
+      <tooltip>$(actions)</tooltip>
     </widget>
   </widget>
   <widget type="group" version="2.0.0">
@@ -444,10 +544,20 @@
   </widget>
   <widget type="group" version="2.0.0">
     <name>Modes</name>
+    <macros>
+      <MODE_ALARM>Alarm Mode</MODE_ALARM>
+      <MODE_BEAM_ON>Beam On</MODE_BEAM_ON>
+      <MODE_OPEN_ACCESS>Open Access</MODE_OPEN_ACCESS>
+      <MODE_RESTRICTED_ACCESS>Restricted\nAccess</MODE_RESTRICTED_ACCESS>
+      <MODE_RM_INTERLOCK>RM Interlock</MODE_RM_INTERLOCK>
+      <MODE_RP_SURVEY>RP Survey</MODE_RP_SURVEY>
+      <MODE_SEARCH>Search</MODE_SEARCH>
+      <MODE_TUNNEL_CLOSED>Tunnel Closed</MODE_TUNNEL_CLOSED>
+    </macros>
     <x>30</x>
-    <y>175</y>
+    <y>185</y>
     <width>970</width>
-    <height>46</height>
+    <height>56</height>
     <style>3</style>
     <foreground_color>
       <color name="Read_Background" red="230" green="235" blue="232">
@@ -458,140 +568,829 @@
       </color>
     </background_color>
     <transparent>true</transparent>
-    <widget type="embedded" version="2.0.0">
-      <name>Beam On Mode</name>
-      <macros>
-        <MODE>Beam On</MODE>
-        <MODE_PV>AccPSS:PSS-Area-1:PSSMode</MODE_PV>
-        <MODE_VAL>4</MODE_VAL>
-      </macros>
-      <file>embedded_displays/mode.bob</file>
-      <width>120</width>
-      <height>46</height>
-      <resize>2</resize>
-      <transparent>true</transparent>
+    <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>
+      </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>
-    <widget type="embedded" version="2.0.0">
-      <name>Search Mode</name>
-      <macros>
-        <MODE>Search Mode</MODE>
-        <MODE_PV>AccPSS:PSS-Area-1:PSSMode</MODE_PV>
-        <MODE_VAL>2</MODE_VAL>
-      </macros>
-      <file>embedded_displays/mode.bob</file>
-      <x>121</x>
-      <width>120</width>
-      <height>46</height>
-      <resize>2</resize>
-      <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="embedded" version="2.0.0">
-      <name>Tunnel Closed</name>
-      <macros>
-        <MODE>Tunnel Closed</MODE>
-        <MODE_PV>AccPSS:PSS-Area-1:PSSMode</MODE_PV>
-        <MODE_VAL>3</MODE_VAL>
-      </macros>
-      <file>embedded_displays/mode.bob</file>
-      <x>484</x>
-      <width>120</width>
-      <height>46</height>
-      <resize>2</resize>
-      <transparent>true</transparent>
+    <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="embedded" version="2.0.0">
+    <widget type="multi_state_led" version="2.0.0">
       <name>RM Interlock</name>
-      <macros>
-        <MODE>RM Interlock</MODE>
-        <MODE_PV>AccPSS:PSS-Area-1:PSSMode</MODE_PV>
-        <MODE_VAL>5</MODE_VAL>
-      </macros>
-      <file>embedded_displays/mode.bob</file>
-      <x>242</x>
-      <width>120</width>
-      <height>46</height>
-      <resize>2</resize>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Open Acces</name>
-      <macros>
-        <MODE>Open Access</MODE>
-        <MODE_PV>AccPSS:PSS-Area-1:PSSMode</MODE_PV>
-        <MODE_VAL>1</MODE_VAL>
-      </macros>
-      <file>embedded_displays/mode.bob</file>
-      <x>363</x>
-      <width>120</width>
-      <height>46</height>
-      <resize>2</resize>
-      <transparent>true</transparent>
+      <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="embedded" version="2.0.0">
-      <name>RP Survey</name>
-      <macros>
-        <MODE>RP Survey</MODE>
-        <MODE_PV>AccPSS:PSS-Area-1:PSSMode</MODE_PV>
-        <MODE_VAL>6</MODE_VAL>
-      </macros>
-      <file>embedded_displays/mode.bob</file>
-      <x>726</x>
-      <width>120</width>
-      <height>46</height>
-      <resize>2</resize>
-      <transparent>true</transparent>
+    <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="embedded" version="2.0.0">
-      <name>Alarm Mode</name>
-      <macros>
-        <MODE>Alarm Mode</MODE>
-        <MODE_PV>AccPSS:PSS-Area-1:PSSMode</MODE_PV>
-        <MODE_VAL>0</MODE_VAL>
-      </macros>
-      <file>embedded_displays/mode.bob</file>
-      <x>605</x>
-      <width>120</width>
-      <height>46</height>
-      <resize>2</resize>
-      <transparent>true</transparent>
+    <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="embedded" version="2.0.0">
-      <name>Restricted Access</name>
-      <macros>
-        <MODE>Restricted Access</MODE>
-        <MODE_PV>AccPSS:PSS-Area-1:PSSMode</MODE_PV>
-        <MODE_VAL>7</MODE_VAL>
-      </macros>
-      <file>embedded_displays/mode.bob</file>
-      <x>850</x>
-      <width>120</width>
-      <height>46</height>
-      <resize>2</resize>
-      <transparent>true</transparent>
+    <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>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>
   <widget type="group" version="2.0.0">
     <name>MAS</name>
     <x>900</x>
-    <y>495</y>
-    <width>102</width>
-    <height>76</height>
+    <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>
-      <x>14</x>
       <y>28</y>
-      <width>72</width>
-      <height>17</height>
+      <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>
-      <width>102</width>
+      <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">
@@ -599,6 +1398,82 @@
       </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>
   <widget type="embedded" version="2.0.0">
     <name>ESOS1_Z2</name>
@@ -649,8 +1524,8 @@
       <ESOS_IDX>2</ESOS_IDX>
     </macros>
     <file>embedded_displays/esos.bob</file>
-    <x>588</x>
-    <y>661</y>
+    <x>915</x>
+    <y>730</y>
     <width>84</width>
     <height>28</height>
     <resize>2</resize>
@@ -663,8 +1538,8 @@
       <ESOS_IDX>3</ESOS_IDX>
     </macros>
     <file>embedded_displays/esos.bob</file>
-    <x>915</x>
-    <y>730</y>
+    <x>655</x>
+    <y>661</y>
     <width>84</width>
     <height>28</height>
     <resize>2</resize>
@@ -677,51 +1552,36 @@
       <ESOS_IDX>4</ESOS_IDX>
     </macros>
     <file>embedded_displays/esos.bob</file>
-    <x>785</x>
-    <y>661</y>
+    <x>915</x>
+    <y>610</y>
     <width>84</width>
     <height>28</height>
     <resize>2</resize>
     <transparent>true</transparent>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_29</name>
-    <x>30</x>
-    <y>130</y>
-    <width>280</width>
-    <height>45</height>
-    <line_width>2</line_width>
-    <line_color>
-      <color name="MINOR" red="252" green="242" blue="17">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="Button_Background" red="236" green="236" blue="236">
-      </color>
-    </background_color>
-  </widget>
   <widget type="group" version="2.0.0">
     <name>PAS</name>
-    <x>848</x>
-    <y>515</y>
-    <width>52</width>
-    <height>56</height>
+    <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>
-      <x>4</x>
-      <y>19</y>
-      <width>40</width>
-      <height>15</height>
+      <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>
-      <width>54</width>
+      <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">
@@ -729,6 +1589,48 @@
       </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>
   <widget type="embedded" version="2.0.0">
     <name>ESOS2_Z2</name>
@@ -744,20 +1646,6 @@
     <resize>2</resize>
     <transparent>true</transparent>
   </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>ESOS5_Z1</name>
-    <macros>
-      <ESOS>AccPSS-Z1:PSS-ESOS-$(ESOS_IDX)</ESOS>
-      <ESOS_IDX>5</ESOS_IDX>
-    </macros>
-    <file>embedded_displays/esos.bob</file>
-    <x>920</x>
-    <y>600</y>
-    <width>84</width>
-    <height>28</height>
-    <resize>2</resize>
-    <transparent>true</transparent>
-  </widget>
   <widget type="label" version="2.0.0">
     <name>FEB 90</name>
     <text>FEB level  90</text>
@@ -797,13 +1685,13 @@ Exit Door 1</text>
     </actions>
     <text>PSS Camera - FEB</text>
     <x>25</x>
-    <y>240</y>
+    <y>330</y>
     <width>150</width>
-    <height>37</height>
+    <height>35</height>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_2</name>
+    <name>ISrc</name>
     <text>Isrc</text>
     <x>768</x>
     <y>710</y>
@@ -813,7 +1701,7 @@ Exit Door 1</text>
       </font>
     </font>
     <foreground_color>
-      <color name="Header_ForeGround" red="255" green="255" blue="255">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
   </widget>
@@ -924,7 +1812,7 @@ Exit Door 1</text>
       </font>
     </font>
     <foreground_color>
-      <color name="Header_ForeGround" red="255" green="255" blue="255">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
   </widget>
@@ -939,7 +1827,7 @@ Exit Door 1</text>
       </font>
     </font>
     <foreground_color>
-      <color name="Header_ForeGround" red="255" green="255" blue="255">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
   </widget>
@@ -954,7 +1842,7 @@ Exit Door 1</text>
       </font>
     </font>
     <foreground_color>
-      <color name="Header_ForeGround" red="255" green="255" blue="255">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
   </widget>
@@ -969,7 +1857,7 @@ Exit Door 1</text>
       </font>
     </font>
     <foreground_color>
-      <color name="Header_ForeGround" red="255" green="255" blue="255">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
   </widget>
@@ -984,7 +1872,7 @@ Exit Door 1</text>
       </font>
     </font>
     <foreground_color>
-      <color name="Header_ForeGround" red="255" green="255" blue="255">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
   </widget>
@@ -999,7 +1887,7 @@ Exit Door 1</text>
       </font>
     </font>
     <foreground_color>
-      <color name="Header_ForeGround" red="255" green="255" blue="255">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
   </widget>
@@ -1200,18 +2088,6 @@ Exit Door 1</text>
       </color>
     </line_color>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_22</name>
-    <x>828</x>
-    <y>549</y>
-    <width>20</width>
-    <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="action_button" version="3.0.0">
     <name>PAS Camera</name>
     <actions>
@@ -1222,9 +2098,9 @@ Exit Door 1</text>
     </actions>
     <text>PSS Camera - PAS</text>
     <x>25</x>
-    <y>285</y>
+    <y>375</y>
     <width>150</width>
-    <height>37</height>
+    <height>35</height>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -1237,9 +2113,9 @@ Exit Door 1</text>
     </actions>
     <text>Camera - Controlled Area</text>
     <x>25</x>
-    <y>330</y>
+    <y>420</y>
     <width>150</width>
-    <height>37</height>
+    <height>35</height>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -1252,10 +2128,10 @@ Exit Door 1</text>
       </action>
     </actions>
     <text>MAS Details</text>
-    <x>25</x>
-    <y>375</y>
+    <x>200</x>
+    <y>330</y>
     <width>150</width>
-    <height>37</height>
+    <height>35</height>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -1268,10 +2144,10 @@ Exit Door 1</text>
       </action>
     </actions>
     <text>PSS Screen</text>
-    <x>25</x>
-    <y>419</y>
+    <x>200</x>
+    <y>375</y>
     <width>150</width>
-    <height>37</height>
+    <height>35</height>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="polyline" version="2.0.0">
@@ -1320,18 +2196,6 @@ Exit Door 1</text>
       </color>
     </line_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>PSS HMI in use - Expert mode</text>
-    <x>40</x>
-    <y>140</y>
-    <width>270</width>
-    <height>35</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="18.0">
-      </font>
-    </font>
-  </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_17</name>
     <x>800</x>
@@ -1714,11 +2578,14 @@ Door</text>
     <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_Green_right.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>730</x>
+    <x>748</x>
     <y>598</y>
-    <width>72</width>
+    <width>54</width>
     <height>54</height>
     <preserve_ratio>false</preserve_ratio>
   </widget>
@@ -1726,11 +2593,12 @@ Door</text>
     <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_Green_right.png</symbol>
+      <symbol>symbols/door v2/Door_thin/Left-right-RED.png</symbol>
+      <symbol>symbols/door v2/Door_thin/Left-right-GREEN.png</symbol>
     </symbols>
-    <x>489</x>
+    <x>511</x>
     <y>732</y>
-    <width>72</width>
+    <width>50</width>
     <height>50</height>
     <preserve_ratio>false</preserve_ratio>
   </widget>
@@ -1738,40 +2606,16 @@ Door</text>
     <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_Green_right.png</symbol>
+      <symbol>symbols/door v2/Door_thin/Left-right-RED.png</symbol>
     </symbols>
-    <x>29</x>
+    <x>51</x>
     <y>732</y>
-    <width>72</width>
+    <width>50</width>
     <height>50</height>
     <preserve_ratio>false</preserve_ratio>
   </widget>
-  <widget type="symbol" version="2.0.0">
-    <name>Symbol_4</name>
-    <pv_name>TBD</pv_name>
-    <symbols>
-      <symbol>symbols/door v2/Door_thin/Down_red_left.png</symbol>
-    </symbols>
-    <x>899</x>
-    <y>570</y>
-    <width>53</width>
-    <height>28</height>
-    <preserve_ratio>false</preserve_ratio>
-  </widget>
-  <widget type="symbol" version="2.0.0">
-    <name>Symbol_5</name>
-    <pv_name>TBD</pv_name>
-    <symbols>
-      <symbol>symbols/door v2/Door_thin/Down_red_Right.png</symbol>
-    </symbols>
-    <x>949</x>
-    <y>571</y>
-    <width>53</width>
-    <height>28</height>
-    <preserve_ratio>false</preserve_ratio>
-  </widget>
   <widget type="label" version="2.0.0">
-    <name>BGGrey03-title_1</name>
+    <name>Permits</name>
     <text>Permits</text>
     <x>651</x>
     <y>31</y>
@@ -1788,78 +2632,6 @@ Door</text>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
   </widget>
-  <widget type="symbol" version="2.0.0">
-    <name>Symbol_6</name>
-    <pv_name>TBD</pv_name>
-    <symbols>
-      <symbol>symbols/door v2/Door_thin/Down_red_left.png</symbol>
-    </symbols>
-    <x>848</x>
-    <y>569</y>
-    <width>52</width>
-    <height>28</height>
-    <preserve_ratio>false</preserve_ratio>
-  </widget>
-  <widget type="symbol" version="2.0.0">
-    <name>Symbol_7</name>
-    <pv_name>TBD</pv_name>
-    <symbols>
-      <symbol>symbols/door v2/Door_thin/Down_red_left.png</symbol>
-    </symbols>
-    <x>828</x>
-    <y>569</y>
-    <width>22</width>
-    <height>22</height>
-    <preserve_ratio>false</preserve_ratio>
-  </widget>
-  <widget type="symbol" version="2.0.0">
-    <name>Symbol_8</name>
-    <pv_name>TBD</pv_name>
-    <symbols>
-      <symbol>symbols/door v2/Door_thin/UP_red_right@512.png</symbol>
-    </symbols>
-    <x>949</x>
-    <y>470</y>
-    <width>53</width>
-    <height>28</height>
-    <preserve_ratio>false</preserve_ratio>
-  </widget>
-  <widget type="symbol" version="2.0.0">
-    <name>Symbol_9</name>
-    <pv_name>TBD</pv_name>
-    <symbols>
-      <symbol>symbols/door v2/Door_thin/UP_red_left@512.png</symbol>
-    </symbols>
-    <x>898</x>
-    <y>469</y>
-    <width>53</width>
-    <height>28</height>
-    <preserve_ratio>false</preserve_ratio>
-  </widget>
-  <widget type="symbol" version="2.0.0">
-    <name>Symbol_10</name>
-    <pv_name>TBD</pv_name>
-    <symbols>
-      <symbol>symbols/door v2/Door_thin/UP_Green_Left.png</symbol>
-    </symbols>
-    <x>847</x>
-    <y>488</y>
-    <width>53</width>
-    <height>28</height>
-    <preserve_ratio>false</preserve_ratio>
-  </widget>
-  <widget type="symbol" version="2.0.0">
-    <name>Symbol_11</name>
-    <pv_name>TBD</pv_name>
-    <symbols>
-      <symbol>symbols/door v2/Door_thin/UP_Green_Left.png</symbol>
-    </symbols>
-    <x>827</x>
-    <y>523</y>
-    <width>20</width>
-    <height>28</height>
-    <preserve_ratio>false</preserve_ratio>
-  </widget>
   <widget type="group" version="2.0.0">
     <name>Keys</name>
     <x>588</x>
@@ -2012,7 +2784,7 @@ Door</text>
       <P>REMS-SPKRS:RMT-AMM-001</P>
       <RM>G0199</RM>
     </macros>
-    <x>25</x>
+    <x>20</x>
     <y>680</y>
     <width>80</width>
     <height>30</height>
@@ -2062,4 +2834,115 @@ Door</text>
       <transparent>true</transparent>
     </widget>
   </widget>
+  <widget type="group" version="2.0.0">
+    <name>HMI Usage</name>
+    <x>30</x>
+    <y>130</y>
+    <width>280</width>
+    <height>45</height>
+    <style>3</style>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pvInt0 == 0">
+          <value>false</value>
+        </exp>
+        <pv_name>AccPSS:PSS-Area-1:HMI_User</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>
+      <line_color>
+        <color name="MINOR" red="252" green="242" blue="17">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="Button_Background" red="236" green="236" blue="236">
+        </color>
+      </background_color>
+    </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>
+      <font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </font>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>MiniMAS</name>
+    <x>828</x>
+    <y>535</y>
+    <width>20</width>
+    <height>48</height>
+    <style>3</style>
+    <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>
 </display>
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Down-left-BLACK.png b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Down-left-BLACK.png
new file mode 100644
index 0000000000000000000000000000000000000000..95b339c6907aef16d25541e88260924d87d9e8ed
Binary files /dev/null and b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Down-left-BLACK.png differ
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Down-left-GREEN.png b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Down-left-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ca9c437ad7605c02b621e280b38ebd026dc6a02
Binary files /dev/null and b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Down-left-GREEN.png differ
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Down-left-RED.png b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Down-left-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..50b9ef25b2ba684fe6ecb4220c0ec36b2a5b019a
Binary files /dev/null and b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Down-left-RED.png differ
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Down-right-BLACK.png b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Down-right-BLACK.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8af8377550de26e27eb8e00155adaeb14cc2eb0
Binary files /dev/null and b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Down-right-BLACK.png differ
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Down-right-GREEN.png b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Down-right-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8da53de7e70cfd26435c2db779ea722bc43f2c4
Binary files /dev/null and b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Down-right-GREEN.png differ
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Down-right-RED.png b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Down-right-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..3503770ff67779844e689abf0717a7cab73ed0c7
Binary files /dev/null and b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Down-right-RED.png differ
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Left-right-GREEN.png b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Left-right-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7059adad1d54e36467395b5862a542686844ae9
Binary files /dev/null and b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Left-right-GREEN.png differ
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Left-right-RED.png b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Left-right-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bb2bc789ee5db2ba7291cc033a76bc8a3120a97
Binary files /dev/null and b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Left-right-RED.png differ
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Up-left-BLACK.png b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Up-left-BLACK.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a50ea75d32d284cba9f12702929e87561de2bc8
Binary files /dev/null and b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Up-left-BLACK.png differ
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Up-left-GREEN.png b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Up-left-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..56fc55e5cc42ff0f1e93c1413077438ddf2bd11b
Binary files /dev/null and b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Up-left-GREEN.png differ
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Up-left-RED.png b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Up-left-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..eaf022c88f7eac9f2acd9d557899c6af5070bbee
Binary files /dev/null and b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Up-left-RED.png differ
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Up-right-BLACK.png b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Up-right-BLACK.png
new file mode 100644
index 0000000000000000000000000000000000000000..f18df7945cc5f159fd7090c1e3d8b8d8b8372a7e
Binary files /dev/null and b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Up-right-BLACK.png differ
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Up-right-GREEN.png b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Up-right-GREEN.png
new file mode 100644
index 0000000000000000000000000000000000000000..95fc5a18be6dc79327849e817715c7464f2cec59
Binary files /dev/null and b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Up-right-GREEN.png differ
diff --git a/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Up-right-RED.png b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Up-right-RED.png
new file mode 100644
index 0000000000000000000000000000000000000000..b53713eb0c8cf0b088d579841b55479c06ca4861
Binary files /dev/null and b/NON-APPROVED/pss1-pss/symbols/door v2/Door_thin/Up-right-RED.png differ