diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
index e8443624b35057faa15a0be69edcdab72482c8c0..1681fb6935e7fbadbb51cdcec6607b7bd9ac376d 100644
--- a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
+++ b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
@@ -52,9 +52,9 @@
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_2</name>
     <x>20</x>
-    <y>240</y>
+    <y>280</y>
     <width>990</width>
-    <height>570</height>
+    <height>530</height>
     <line_width>0</line_width>
     <background_color>
       <color name="Background" red="220" green="225" blue="221">
@@ -91,7 +91,7 @@
     <x>654</x>
     <y>66</y>
     <width>346</width>
-    <height>110</height>
+    <height>134</height>
     <style>3</style>
     <widget type="led" version="2.0.0">
       <name>ISrcHVPS_PermitOn</name>
@@ -236,6 +236,7 @@
       <x>36</x>
       <y>83</y>
       <width>120</width>
+      <vertical_alignment>1</vertical_alignment>
       <actions>
       </actions>
     </widget>
@@ -276,12 +277,8 @@
       <x>210</x>
       <y>3</y>
       <width>120</width>
+      <vertical_alignment>1</vertical_alignment>
       <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">
@@ -320,15 +317,9 @@
       <text>MEBT1 buncher 1</text>
       <x>210</x>
       <y>29</y>
-      <width>117</width>
-      <height>23</height>
-      <auto_size>true</auto_size>
+      <width>120</width>
+      <vertical_alignment>1</vertical_alignment>
       <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">
@@ -343,8 +334,8 @@
       <text></text>
       <x>210</x>
       <y>29</y>
-      <width>117</width>
-      <height>23</height>
+      <width>120</width>
+      <height>20</height>
       <transparent>true</transparent>
       <tooltip>$(actions)</tooltip>
     </widget>
@@ -367,15 +358,9 @@
       <text>MEBT2 buncher 2</text>
       <x>210</x>
       <y>56</y>
-      <width>117</width>
-      <height>23</height>
-      <auto_size>true</auto_size>
+      <width>120</width>
+      <vertical_alignment>1</vertical_alignment>
       <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">
@@ -390,8 +375,8 @@
       <text></text>
       <x>210</x>
       <y>56</y>
-      <width>117</width>
-      <height>23</height>
+      <width>120</width>
+      <height>20</height>
       <transparent>true</transparent>
       <tooltip>$(actions)</tooltip>
     </widget>
@@ -414,9 +399,13 @@
       <text>MEBT3 buncher 3</text>
       <x>210</x>
       <y>83</y>
-      <width>117</width>
-      <height>23</height>
-      <auto_size>true</auto_size>
+      <width>120</width>
+      <vertical_alignment>1</vertical_alignment>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>AB_MEBT3_PermitOn</name>
       <actions>
         <action type="open_display">
           <file>popups/permits/mebt3.bob</file>
@@ -424,22 +413,28 @@
           <description>Open Display</description>
         </action>
       </actions>
+      <text></text>
+      <x>210</x>
+      <y>83</y>
+      <width>120</width>
+      <height>20</height>
+      <transparent>true</transparent>
+      <tooltip>$(actions)</tooltip>
     </widget>
     <widget type="action_button" version="3.0.0">
-      <name>AB_MEBT3_PermitOn</name>
+      <name>AB_PLC Permit</name>
       <actions>
         <action type="open_display">
-          <file>popups/permits/mebt3.bob</file>
+          <file>popups/permits/plc.bob</file>
           <target>window</target>
           <description>Open Display</description>
         </action>
       </actions>
-      <text></text>
+      <text>PLC Permits</text>
       <x>210</x>
-      <y>83</y>
-      <width>117</width>
+      <y>108</y>
+      <width>120</width>
       <height>23</height>
-      <transparent>true</transparent>
       <tooltip>$(actions)</tooltip>
     </widget>
   </widget>
@@ -929,9 +924,9 @@ Exit Door 1</text>
       </action>
     </actions>
     <text>PSS Camera - FEB</text>
-    <x>25</x>
+    <x>30</x>
     <y>330</y>
-    <width>150</width>
+    <width>210</width>
     <height>35</height>
     <tooltip>$(actions)</tooltip>
   </widget>
@@ -1346,9 +1341,9 @@ Exit Door 1</text>
       </action>
     </actions>
     <text>PSS Camera - PAS</text>
-    <x>25</x>
+    <x>30</x>
     <y>375</y>
-    <width>150</width>
+    <width>210</width>
     <height>35</height>
     <tooltip>$(actions)</tooltip>
   </widget>
@@ -1365,9 +1360,9 @@ Exit Door 1</text>
       </action>
     </actions>
     <text>Camera - Controlled Area</text>
-    <x>25</x>
+    <x>30</x>
     <y>420</y>
-    <width>150</width>
+    <width>210</width>
     <height>35</height>
     <tooltip>$(actions)</tooltip>
   </widget>
@@ -1381,9 +1376,9 @@ Exit Door 1</text>
       </action>
     </actions>
     <text>MAS Details</text>
-    <x>200</x>
+    <x>255</x>
     <y>330</y>
-    <width>150</width>
+    <width>180</width>
     <height>35</height>
     <tooltip>$(actions)</tooltip>
   </widget>
@@ -1397,9 +1392,9 @@ Exit Door 1</text>
       </action>
     </actions>
     <text>PAS Details</text>
-    <x>200</x>
+    <x>255</x>
     <y>375</y>
-    <width>150</width>
+    <width>180</width>
     <height>35</height>
     <tooltip>$(actions)</tooltip>
   </widget>
@@ -1824,10 +1819,18 @@ Exit Door 1</text>
     <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>pvInt0</expression>
+          <expression>pvInt2</expression>
         </exp>
         <pv_name>$(pv_name)</pv_name>
+        <pv_name>KG-NCG:PSS-Area-1:DTL4isolationConfirmed</pv_name>
+        <pv_name>sim://flipflop(1)</pv_name>
       </rule>
     </rules>
   </widget>
@@ -1844,10 +1847,18 @@ Exit Door 1</text>
     <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>pvInt0</expression>
+          <expression>pvInt2</expression>
         </exp>
         <pv_name>$(pv_name)</pv_name>
+        <pv_name>KG-NCG:PSS-Area-1:DTL2DTL3isolationConfirmed</pv_name>
+        <pv_name>sim://flipflop(1)</pv_name>
       </rule>
     </rules>
   </widget>
@@ -1864,10 +1875,18 @@ Exit Door 1</text>
     <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>pvInt0</expression>
+          <expression>pvInt2</expression>
         </exp>
         <pv_name>$(pv_name)</pv_name>
+        <pv_name>KG-NCG:PSS-Area-1:DTL2DTL3isolationConfirmed</pv_name>
+        <pv_name>sim://flipflop(1)</pv_name>
       </rule>
     </rules>
   </widget>
@@ -1884,10 +1903,18 @@ Exit Door 1</text>
     <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>pvInt0</expression>
+          <expression>pvInt2</expression>
         </exp>
         <pv_name>$(pv_name)</pv_name>
+        <pv_name>KG-NCG:PSS-Area-1:RFQDTL1isolationConfirmed</pv_name>
+        <pv_name>sim://flipflop(1)</pv_name>
       </rule>
     </rules>
   </widget>
@@ -1904,27 +1931,21 @@ Exit Door 1</text>
     <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>pvInt0</expression>
+          <expression>pvInt2</expression>
         </exp>
         <pv_name>$(pv_name)</pv_name>
+        <pv_name>KG-NCG:PSS-Area-1:RFQDTL1isolationConfirmed</pv_name>
+        <pv_name>sim://flipflop(1)</pv_name>
       </rule>
     </rules>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>RFQ SCP</name>
-    <x>478</x>
-    <y>523</y>
-    <width>20</width>
-    <height>30</height>
-    <visible>false</visible>
-    <line_width>1</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>AMM_204</name>
     <text>TSW
@@ -2046,10 +2067,10 @@ Door</text>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Permits</name>
-    <text>Permits</text>
-    <x>651</x>
+    <text>PSS Permits</text>
+    <x>654</x>
     <y>31</y>
-    <width>348</width>
+    <width>346</width>
     <height>30</height>
     <font>
       <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
@@ -2421,7 +2442,7 @@ Door</text>
     <name>Operation Mode</name>
     <file>embedded_displays/operation_mode.bob</file>
     <x>35</x>
-    <y>185</y>
+    <y>213</y>
     <width>960</width>
     <height>56</height>
     <resize>2</resize>
diff --git a/NON-APPROVED/pss1-pss/popups/key_exchange.bob b/NON-APPROVED/pss1-pss/popups/key_exchange.bob
index 661bdb2cad1d270be12c65f19b996fb09864e86b..4a9454ca73a6fc8683b172485cd5920562c3fccf 100644
--- a/NON-APPROVED/pss1-pss/popups/key_exchange.bob
+++ b/NON-APPROVED/pss1-pss/popups/key_exchange.bob
@@ -389,11 +389,10 @@
           <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
           </font>
         </font>
-        <background_color use_class="true">
-          <color name="Background" red="220" green="225" blue="221">
+        <foreground_color use_class="true">
+          <color name="Text" red="25" green="25" blue="25">
           </color>
-        </background_color>
-        <transparent use_class="true">true</transparent>
+        </foreground_color>
         <horizontal_alignment>1</horizontal_alignment>
         <vertical_alignment>1</vertical_alignment>
       </widget>
@@ -406,7 +405,7 @@
         <points>
           <point x="0.0" y="20.0">
           </point>
-          <point x="119.99999999999999" y="20.0">
+          <point x="120.0" y="20.0">
           </point>
         </points>
         <line_width>1</line_width>
@@ -527,11 +526,10 @@
           <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
           </font>
         </font>
-        <background_color use_class="true">
-          <color name="Background" red="220" green="225" blue="221">
+        <foreground_color use_class="true">
+          <color name="Text" red="25" green="25" blue="25">
           </color>
-        </background_color>
-        <transparent use_class="true">true</transparent>
+        </foreground_color>
         <horizontal_alignment>1</horizontal_alignment>
         <vertical_alignment>1</vertical_alignment>
       </widget>
@@ -576,17 +574,17 @@
         <width>70</width>
         <height>70</height>
         <off_label>Config.
-Management
+Mgmt
 key</off_label>
         <off_color>
           <color name="WHITE" red="255" green="255" blue="255">
           </color>
         </off_color>
         <on_label>Config.
-Management
+Mgmt
 key</on_label>
         <font>
-          <font name="TINY-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="12.0">
+          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
           </font>
         </font>
         <tooltip>Config. Management key
@@ -602,16 +600,16 @@ $(pv_value)</tooltip>
         <height>70</height>
         <off_label>Shielding
 Config.
-Management</off_label>
+Mgmt</off_label>
         <off_color>
           <color name="WHITE" red="255" green="255" blue="255">
           </color>
         </off_color>
         <on_label>Shielding
 Config.
-Management</on_label>
+Mgmt</on_label>
         <font>
-          <font name="TINY-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="12.0">
+          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
           </font>
         </font>
         <tooltip>Shielding Config. Management
@@ -625,18 +623,16 @@ $(pv_value)</tooltip>
         <y>220</y>
         <width>70</width>
         <height>70</height>
-        <off_label>Temporary
-Shielding wall
+        <off_label>TSW
 key</off_label>
         <off_color>
           <color name="WHITE" red="255" green="255" blue="255">
           </color>
         </off_color>
-        <on_label>Temporary
-Shielding wall
+        <on_label>TSW
 key</on_label>
         <font>
-          <font name="TINY-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="12.0">
+          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
           </font>
         </font>
         <tooltip>Temporary Shielding wall Key
@@ -659,7 +655,7 @@ key</off_label>
         <on_label>Spare
 key</on_label>
         <font>
-          <font name="TINY-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="12.0">
+          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
           </font>
         </font>
         <tooltip>Spare key
@@ -682,7 +678,7 @@ key</off_label>
         <on_label>Spare
 key</on_label>
         <font>
-          <font name="TINY-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="12.0">
+          <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
           </font>
         </font>
         <tooltip>Spare key
@@ -709,11 +705,10 @@ $(pv_value)</tooltip>
           <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
           </font>
         </font>
-        <background_color use_class="true">
-          <color name="Background" red="220" green="225" blue="221">
+        <foreground_color use_class="true">
+          <color name="Text" red="25" green="25" blue="25">
           </color>
-        </background_color>
-        <transparent use_class="true">true</transparent>
+        </foreground_color>
         <vertical_alignment>1</vertical_alignment>
       </widget>
       <widget type="polyline" version="2.0.0">
@@ -969,11 +964,10 @@ Access</on_label>
           <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
           </font>
         </font>
-        <background_color use_class="true">
-          <color name="Background" red="220" green="225" blue="221">
+        <foreground_color use_class="true">
+          <color name="Text" red="25" green="25" blue="25">
           </color>
-        </background_color>
-        <transparent use_class="true">true</transparent>
+        </foreground_color>
         <horizontal_alignment>2</horizontal_alignment>
         <vertical_alignment>1</vertical_alignment>
       </widget>
@@ -1217,11 +1211,10 @@ PAS</on_label>
           <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
           </font>
         </font>
-        <background_color use_class="true">
-          <color name="Background" red="220" green="225" blue="221">
+        <foreground_color use_class="true">
+          <color name="Text" red="25" green="25" blue="25">
           </color>
-        </background_color>
-        <transparent use_class="true">true</transparent>
+        </foreground_color>
         <horizontal_alignment>1</horizontal_alignment>
         <vertical_alignment>1</vertical_alignment>
       </widget>
@@ -1419,11 +1412,10 @@ PAS</on_label>
           <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
           </font>
         </font>
-        <background_color use_class="true">
-          <color name="Background" red="220" green="225" blue="221">
+        <foreground_color use_class="true">
+          <color name="Text" red="25" green="25" blue="25">
           </color>
-        </background_color>
-        <transparent use_class="true">true</transparent>
+        </foreground_color>
         <horizontal_alignment>1</horizontal_alignment>
         <vertical_alignment>1</vertical_alignment>
       </widget>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/isrc_hvps.bob b/NON-APPROVED/pss1-pss/popups/permits/isrc_hvps.bob
index 147a75dc60b651317a6a9cfd17c644c2045805dd..339d52f4b89fdd2ed43c2a613ffe536a8d968b37 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/isrc_hvps.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/isrc_hvps.bob
@@ -2,7 +2,7 @@
 <display version="2.0.0">
   <name>Ion source HV PS and grounding relay</name>
   <width>690</width>
-  <height>290</height>
+  <height>320</height>
   <widget type="rectangle" version="2.0.0">
     <name>Title Rectangle</name>
     <class>TITLE-BAR</class>
@@ -41,7 +41,7 @@
     <name>Grounding Relay</name>
     <x>30</x>
     <y>80</y>
-    <height>180</height>
+    <height>220</height>
     <style>3</style>
     <background_color>
       <color name="BACKGROUND" red="220" green="225" blue="221">
@@ -50,7 +50,7 @@
     <widget type="rectangle" version="2.0.0">
       <name>GR-titlebar</name>
       <width>300</width>
-      <height>180</height>
+      <height>220</height>
       <line_width>2</line_width>
       <line_color>
         <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -63,24 +63,6 @@
       <corner_width>10</corner_width>
       <corner_height>10</corner_height>
     </widget>
-    <widget type="rectangle" version="2.0.0">
-      <name>GR-background</name>
-      <x>10</x>
-      <y>30</y>
-      <width>280</width>
-      <height>140</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>
-      <corner_width>5</corner_width>
-      <corner_height>5</corner_height>
-    </widget>
     <widget type="label" version="2.0.0">
       <name>GR-title</name>
       <text>Grounding Relay</text>
@@ -99,9 +81,25 @@
       <x>10</x>
       <y>30</y>
       <width>280</width>
-      <height>140</height>
+      <height>180</height>
       <style>3</style>
       <transparent>true</transparent>
+      <widget type="rectangle" version="2.0.0">
+        <name>GR-background</name>
+        <width>280</width>
+        <height>180</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>
+        <corner_width>5</corner_width>
+        <corner_height>5</corner_height>
+      </widget>
       <widget type="led" version="2.0.0">
         <name>Grly_ConnectedToGround</name>
         <pv_name>FEB-010Row:CnPw-U-007:Grly_ConnectedToGround</pv_name>
@@ -120,11 +118,33 @@
         <width>230</width>
         <vertical_alignment>1</vertical_alignment>
       </widget>
+      <widget type="led" version="2.0.0">
+        <name>Grly_ConnectedToGround</name>
+        <pv_name>FEB-010Row:CnPw-U-007:Grly_ConnectedToGround</pv_name>
+        <x>20</x>
+        <y>60</y>
+        <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_Grly_ConnectedToGround_1</name>
+        <text>Disconnected from ground</text>
+        <x>46</x>
+        <y>60</y>
+        <width>230</width>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
       <widget type="led" version="2.0.0">
         <name>Grly_fbkError</name>
         <pv_name>AccPSS-Z0:PSS-GRly-1:Grly_fbkError</pv_name>
         <x>20</x>
-        <y>60</y>
+        <y>100</y>
         <off_color>
           <color name="LED-RED-ON" red="255" green="60" blue="46">
           </color>
@@ -138,7 +158,7 @@
         <name>LB_Grly_fbkError</name>
         <text>Feedback error in grounding relay</text>
         <x>46</x>
-        <y>60</y>
+        <y>100</y>
         <width>230</width>
         <vertical_alignment>1</vertical_alignment>
       </widget>
@@ -146,7 +166,7 @@
         <name>Grly_fbkErrorGrCr</name>
         <pv_name>FEB-010Row:CnPw-U-007:Grly_fbkErrorGrCr</pv_name>
         <x>20</x>
-        <y>100</y>
+        <y>140</y>
         <off_color>
           <color name="LED-RED-ON" red="255" green="60" blue="46">
           </color>
@@ -160,7 +180,7 @@
         <name>LB_Grly_fbkErrorGrCr</name>
         <text>Feedback error in control relay</text>
         <x>46</x>
-        <y>100</y>
+        <y>140</y>
         <width>230</width>
         <vertical_alignment>1</vertical_alignment>
       </widget>
@@ -170,7 +190,7 @@
     <name>HV PS</name>
     <x>360</x>
     <y>80</y>
-    <height>180</height>
+    <height>220</height>
     <style>3</style>
     <background_color>
       <color name="BACKGROUND" red="220" green="225" blue="221">
@@ -179,7 +199,7 @@
     <widget type="rectangle" version="2.0.0">
       <name>HVPS-titlebar</name>
       <width>300</width>
-      <height>180</height>
+      <height>220</height>
       <line_width>2</line_width>
       <line_color>
         <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -192,24 +212,6 @@
       <corner_width>10</corner_width>
       <corner_height>10</corner_height>
     </widget>
-    <widget type="rectangle" version="2.0.0">
-      <name>HVPS-background</name>
-      <x>10</x>
-      <y>30</y>
-      <width>280</width>
-      <height>140</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>
-      <corner_width>5</corner_width>
-      <corner_height>5</corner_height>
-    </widget>
     <widget type="label" version="2.0.0">
       <name>HVPS-title</name>
       <text>High Voltage Power Supply</text>
@@ -228,9 +230,25 @@
       <x>10</x>
       <y>30</y>
       <width>280</width>
-      <height>140</height>
+      <height>180</height>
       <style>3</style>
       <transparent>true</transparent>
+      <widget type="rectangle" version="2.0.0">
+        <name>HVPS-background</name>
+        <width>280</width>
+        <height>180</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>
+        <corner_width>5</corner_width>
+        <corner_height>5</corner_height>
+      </widget>
       <widget type="led" version="2.0.0">
         <name>ISrcHVPS_ActuatorsEnergised</name>
         <pv_name>FEB-010Row:CnPw-U-007:ISrcHVPS_ActuatorsEnergised</pv_name>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/plc.bob b/NON-APPROVED/pss1-pss/popups/permits/plc.bob
new file mode 100644
index 0000000000000000000000000000000000000000..82ee9ad9d85af3228e75ecbf0bfe7b49ac7307d1
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/popups/permits/plc.bob
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Ion source HV PS and grounding relay</name>
+  <width>490</width>
+  <height>370</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>
+    <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">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Title</name>
+    <class>TITLE</class>
+    <text>PLC Permits</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>426</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="group" version="2.0.0">
+    <name>Grounding Relay</name>
+    <x>30</x>
+    <y>80</y>
+    <width>430</width>
+    <height>260</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>GR-titlebar</name>
+      <width>430</width>
+      <height>260</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>GR-title</name>
+      <text>Permits to interfacing control system</text>
+      <x>10</x>
+      <width>406</width>
+      <height>30</height>
+      <font>
+        <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="group" version="2.0.0">
+      <name>GR-content-group</name>
+      <x>10</x>
+      <y>30</y>
+      <width>410</width>
+      <height>220</height>
+      <style>3</style>
+      <transparent>true</transparent>
+      <widget type="rectangle" version="2.0.0">
+        <name>GR-background</name>
+        <width>410</width>
+        <height>220</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>
+        <corner_width>5</corner_width>
+        <corner_height>5</corner_height>
+      </widget>
+      <widget type="led" version="2.0.0">
+        <name>ToFBIS</name>
+        <pv_name>FEB-010Row:CnPw-U-002:ToFBIS</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_ToFBIS</name>
+        <text>To FBIS</text>
+        <x>46</x>
+        <y>20</y>
+        <width>160</width>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+      <widget type="led" version="2.0.0">
+        <name>ToISrcInterlockPLC</name>
+        <pv_name>FEB-010Row:CnPw-U-001:ToISrcInterlockPLC</pv_name>
+        <x>20</x>
+        <y>60</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_ToISrcInterlockPLC</name>
+        <text>To ISrc Interlock PLC</text>
+        <x>46</x>
+        <y>60</y>
+        <width>160</width>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+      <widget type="led" version="2.0.0">
+        <name>ToRFQLPS</name>
+        <pv_name>FEB-010Row:CnPw-U-004:ToRFQLPS</pv_name>
+        <x>20</x>
+        <y>100</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_ToRFQLPS</name>
+        <text>To RFQ LPS</text>
+        <x>46</x>
+        <y>100</y>
+        <width>160</width>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+      <widget type="led" version="2.0.0">
+        <name>ToDTL1LPS</name>
+        <pv_name>FEB-010Row:CnPw-U-004:ToDTL1LPS</pv_name>
+        <x>20</x>
+        <y>140</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_ToDTL1LPS</name>
+        <text>To DTL1 LPS</text>
+        <x>46</x>
+        <y>140</y>
+        <width>160</width>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+      <widget type="led" version="2.0.0">
+        <name>ToDTL2LPS</name>
+        <pv_name>FEB-010Row:CnPw-U-004:ToDTL2LPS</pv_name>
+        <x>20</x>
+        <y>180</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_ToDTL2LPS</name>
+        <text>To DTL2 LPS</text>
+        <x>46</x>
+        <y>180</y>
+        <width>160</width>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+      <widget type="led" version="2.0.0">
+        <name>ToDTL3LPS</name>
+        <pv_name>FEB-010Row:CnPw-U-004:ToDTL3LPS</pv_name>
+        <x>220</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_ToDTL3LPS</name>
+        <text>To DTL3 LPS</text>
+        <x>246</x>
+        <y>20</y>
+        <width>160</width>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+      <widget type="led" version="2.0.0">
+        <name>ToDTL4LPS</name>
+        <pv_name>FEB-010Row:CnPw-U-004:ToDTL4LPS</pv_name>
+        <x>220</x>
+        <y>60</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_ToDTL4LPS</name>
+        <text>To DTL4 LPS</text>
+        <x>246</x>
+        <y>60</y>
+        <width>160</width>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+      <widget type="led" version="2.0.0">
+        <name>ToMEBT1LPS</name>
+        <pv_name>FEB-010Row:CnPw-U-004:ToMEBT1LPS</pv_name>
+        <x>220</x>
+        <y>100</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_ToMEBT1LPS</name>
+        <text>To MEBT 1 LPS</text>
+        <x>246</x>
+        <y>100</y>
+        <width>160</width>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+      <widget type="led" version="2.0.0">
+        <name>ToMEBT2LPS</name>
+        <pv_name>FEB-010Row:CnPw-U-004:ToMEBT2LPS</pv_name>
+        <x>220</x>
+        <y>140</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_ToMEBT2LPS</name>
+        <text>To MEBT 2 LPS</text>
+        <x>246</x>
+        <y>140</y>
+        <width>160</width>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+      <widget type="led" version="2.0.0">
+        <name>ToMEBT3LPS</name>
+        <pv_name>FEB-010Row:CnPw-U-004:ToMEBT3LPS</pv_name>
+        <x>220</x>
+        <y>180</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_ToMEBT3LPS</name>
+        <text>To MEBT 3 LPS</text>
+        <x>246</x>
+        <y>180</y>
+        <width>160</width>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+    </widget>
+  </widget>
+</display>