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>