diff --git a/NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Area.bob b/NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Area.bob
index 97a7933db9c8fa9d3a0dfe5a8881a76b0d29062c..1d47b83561452e7b9b685c6ce774b4488921c73e 100644
--- a/NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Area.bob
+++ b/NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Area.bob
@@ -59,7 +59,7 @@
           <x>20</x>
           <y>20</y>
           <off_color>
-            <color name="LED-RED-OFF" red="110" green="101" blue="90">
+            <color name="GRAY" red="169" green="169" blue="169">
             </color>
           </off_color>
           <on_color>
@@ -87,7 +87,7 @@
           <x>20</x>
           <y>74</y>
           <off_color>
-            <color name="LED-RED-OFF" red="110" green="101" blue="90">
+            <color name="GRAY" red="169" green="169" blue="169">
             </color>
           </off_color>
           <on_color>
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Diag.bob b/NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Diag.bob
index e71aeb7ca16691c757b0b87b1746a6e56c90ff03..a772d7c0053e64bda895331e2e0e130141b14c5e 100644
--- a/NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Diag.bob
+++ b/NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Diag.bob
@@ -104,7 +104,7 @@ $(pv_value)</tooltip>
   <widget type="group" version="2.0.0">
     <name>Group</name>
     <macros>
-      <P>$(PLC):RIO1</P>
+      <RIO>$(PLC):RIO1</RIO>
     </macros>
     <x>67</x>
     <y>770</y>
@@ -115,7 +115,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_20</name>
       <macros>
-        <P>$(P)_IM</P>
+        <Mod>$(RIO)_IM</Mod>
       </macros>
       <x>44</x>
       <width>30</width>
@@ -135,7 +135,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -154,7 +154,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -172,7 +172,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -181,7 +181,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_21</name>
       <macros>
-        <P>$(P)_DI1</P>
+        <Mod>$(RIO)_DI1</Mod>
       </macros>
       <x>85</x>
       <width>30</width>
@@ -201,7 +201,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -220,7 +220,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -238,7 +238,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -247,7 +247,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_22</name>
       <macros>
-        <P>$(P)_DI2</P>
+        <Mod>$(RIO)_DI2</Mod>
       </macros>
       <x>123</x>
       <width>30</width>
@@ -267,7 +267,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -286,7 +286,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -304,7 +304,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -313,7 +313,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_23</name>
       <macros>
-        <P>$(P)_DI3</P>
+        <Mod>$(RIO)_DI3</Mod>
       </macros>
       <x>161</x>
       <width>30</width>
@@ -333,7 +333,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -352,7 +352,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -370,7 +370,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -379,7 +379,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_24</name>
       <macros>
-        <P>$(P)_DI4</P>
+        <Mod>$(RIO)_DI4</Mod>
       </macros>
       <x>199</x>
       <width>30</width>
@@ -399,7 +399,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -418,7 +418,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -436,7 +436,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -445,7 +445,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_25</name>
       <macros>
-        <P>$(P)_DI5</P>
+        <Mod>$(RIO)_DI5</Mod>
       </macros>
       <x>238</x>
       <width>30</width>
@@ -465,7 +465,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -484,7 +484,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -502,7 +502,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -511,7 +511,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_26</name>
       <macros>
-        <P>$(P)_AI1</P>
+        <Mod>$(RIO)_AI1</Mod>
       </macros>
       <x>276</x>
       <width>30</width>
@@ -531,7 +531,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -550,7 +550,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -568,7 +568,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -577,7 +577,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_27</name>
       <macros>
-        <P>$(P)_AI2</P>
+        <Mod>$(RIO)_AI2</Mod>
       </macros>
       <x>314</x>
       <width>30</width>
@@ -597,7 +597,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -616,7 +616,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -634,7 +634,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -643,7 +643,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_28</name>
       <macros>
-        <P>$(P)_AI3</P>
+        <Mod>$(RIO)_AI3</Mod>
       </macros>
       <x>352</x>
       <width>30</width>
@@ -663,7 +663,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -682,7 +682,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -700,7 +700,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -709,7 +709,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_29</name>
       <macros>
-        <P>$(P)_AI4</P>
+        <Mod>$(RIO)_AI4</Mod>
       </macros>
       <x>391</x>
       <width>30</width>
@@ -729,7 +729,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -748,7 +748,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -766,7 +766,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -775,7 +775,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_30</name>
       <macros>
-        <P>$(P)_DO1</P>
+        <Mod>$(RIO)_DO1</Mod>
       </macros>
       <x>429</x>
       <width>30</width>
@@ -795,7 +795,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -814,7 +814,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -832,7 +832,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -841,7 +841,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_31</name>
       <macros>
-        <P>$(P)_DO2</P>
+        <Mod>$(RIO)_DO2</Mod>
       </macros>
       <x>467</x>
       <width>30</width>
@@ -861,7 +861,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -880,7 +880,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -898,7 +898,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -907,7 +907,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_32</name>
       <macros>
-        <P>$(P)_DO3</P>
+        <Mod>$(RIO)_DO3</Mod>
       </macros>
       <x>506</x>
       <width>30</width>
@@ -927,7 +927,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -946,7 +946,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -964,7 +964,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -974,7 +974,7 @@ $(pv_value)</tooltip>
   <widget type="group" version="2.0.0">
     <name>Group_63</name>
     <macros>
-      <P>$(PLC):RIO2</P>
+      <RIO>$(PLC):RIO2</RIO>
     </macros>
     <x>677</x>
     <y>770</y>
@@ -985,7 +985,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_64</name>
       <macros>
-        <P>$(P)_IM</P>
+        <Mod>$(RIO)_IM</Mod>
       </macros>
       <x>44</x>
       <width>30</width>
@@ -1005,7 +1005,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -1024,7 +1024,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -1042,7 +1042,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -1051,7 +1051,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_65</name>
       <macros>
-        <P>$(P)_DI1</P>
+        <Mod>$(RIO)_DI1</Mod>
       </macros>
       <x>85</x>
       <width>30</width>
@@ -1071,7 +1071,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -1090,7 +1090,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -1108,7 +1108,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -1117,7 +1117,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_66</name>
       <macros>
-        <P>$(P)_DI2</P>
+        <Mod>$(RIO)_DI2</Mod>
       </macros>
       <x>123</x>
       <width>30</width>
@@ -1137,7 +1137,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -1156,7 +1156,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -1174,7 +1174,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -1183,7 +1183,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_67</name>
       <macros>
-        <P>$(P)_DI3</P>
+        <Mod>$(RIO)_DI3</Mod>
       </macros>
       <x>161</x>
       <width>30</width>
@@ -1203,7 +1203,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -1222,7 +1222,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -1240,7 +1240,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -1249,7 +1249,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_68</name>
       <macros>
-        <P>$(P)_DI4</P>
+        <Mod>$(RIO)_DI4</Mod>
       </macros>
       <x>199</x>
       <width>30</width>
@@ -1269,7 +1269,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -1288,7 +1288,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -1306,7 +1306,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -1315,7 +1315,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_69</name>
       <macros>
-        <P>$(P)_DI5</P>
+        <Mod>$(RIO)_DI5</Mod>
       </macros>
       <x>238</x>
       <width>30</width>
@@ -1335,7 +1335,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -1354,7 +1354,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -1372,7 +1372,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -1381,7 +1381,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_70</name>
       <macros>
-        <P>$(P)_AI1</P>
+        <Mod>$(RIO)_AI1</Mod>
       </macros>
       <x>276</x>
       <width>30</width>
@@ -1401,7 +1401,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -1420,7 +1420,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -1438,7 +1438,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -1447,7 +1447,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_71</name>
       <macros>
-        <P>$(P)_AI2</P>
+        <Mod>$(RIO)_AI2</Mod>
       </macros>
       <x>314</x>
       <width>30</width>
@@ -1467,7 +1467,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -1486,7 +1486,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -1504,7 +1504,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -1513,7 +1513,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_72</name>
       <macros>
-        <P>$(P)_AI3</P>
+        <Mod>$(RIO)_AI3</Mod>
       </macros>
       <x>352</x>
       <width>30</width>
@@ -1533,7 +1533,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -1552,7 +1552,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -1570,7 +1570,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -1579,7 +1579,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_73</name>
       <macros>
-        <P>$(P)_AI4</P>
+        <Mod>$(RIO)_AI4</Mod>
       </macros>
       <x>391</x>
       <width>30</width>
@@ -1599,7 +1599,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -1618,7 +1618,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -1636,7 +1636,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -1645,7 +1645,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_74</name>
       <macros>
-        <P>$(P)_DO1</P>
+        <Mod>$(RIO)_DO1</Mod>
       </macros>
       <x>429</x>
       <width>30</width>
@@ -1665,7 +1665,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -1684,7 +1684,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -1702,7 +1702,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -1711,7 +1711,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_75</name>
       <macros>
-        <P>$(P)_DO2</P>
+        <Mod>$(RIO)_DO2</Mod>
       </macros>
       <x>467</x>
       <width>30</width>
@@ -1731,7 +1731,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -1750,7 +1750,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -1768,7 +1768,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -1777,7 +1777,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_76</name>
       <macros>
-        <P>$(P)_DO3</P>
+        <Mod>$(RIO)_DO3</Mod>
       </macros>
       <x>506</x>
       <width>30</width>
@@ -1797,7 +1797,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -1816,7 +1816,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -1834,7 +1834,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -1844,7 +1844,7 @@ $(pv_value)</tooltip>
   <widget type="group" version="2.0.0">
     <name>Group_77</name>
     <macros>
-      <P>$(PLC):RIO3</P>
+      <RIO>$(PLC):RIO3</RIO>
     </macros>
     <x>1297</x>
     <y>770</y>
@@ -1855,7 +1855,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_78</name>
       <macros>
-        <P>$(P)_IM</P>
+        <Mod>$(RIO)_IM</Mod>
       </macros>
       <x>44</x>
       <width>30</width>
@@ -1875,7 +1875,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -1894,7 +1894,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -1912,7 +1912,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -1921,7 +1921,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_79</name>
       <macros>
-        <P>$(P)_DI1</P>
+        <Mod>$(RIO)_DI1</Mod>
       </macros>
       <x>85</x>
       <width>30</width>
@@ -1941,7 +1941,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -1960,7 +1960,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -1978,7 +1978,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -1987,7 +1987,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_80</name>
       <macros>
-        <P>$(P)_DI2</P>
+        <Mod>$(RIO)_DI2</Mod>
       </macros>
       <x>123</x>
       <width>30</width>
@@ -2007,7 +2007,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -2026,7 +2026,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -2044,7 +2044,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -2053,7 +2053,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_81</name>
       <macros>
-        <P>$(P)_DI3</P>
+        <Mod>$(RIO)_DI3</Mod>
       </macros>
       <x>161</x>
       <width>30</width>
@@ -2073,7 +2073,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -2092,7 +2092,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -2110,7 +2110,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -2119,7 +2119,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_82</name>
       <macros>
-        <P>$(P)_DI4</P>
+        <Mod>$(RIO)_DI4</Mod>
       </macros>
       <x>199</x>
       <width>30</width>
@@ -2139,7 +2139,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -2158,7 +2158,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -2176,7 +2176,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -2185,7 +2185,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_83</name>
       <macros>
-        <P>$(P)_DI5</P>
+        <Mod>$(RIO)_DI5</Mod>
       </macros>
       <x>238</x>
       <width>30</width>
@@ -2205,7 +2205,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -2224,7 +2224,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -2242,7 +2242,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -2251,7 +2251,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_84</name>
       <macros>
-        <P>$(P)_AI1</P>
+        <Mod>$(RIO)_AI1</Mod>
       </macros>
       <x>276</x>
       <width>30</width>
@@ -2271,7 +2271,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -2290,7 +2290,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -2308,7 +2308,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -2317,7 +2317,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_85</name>
       <macros>
-        <P>$(P)_AI2</P>
+        <Mod>$(RIO)_AI2</Mod>
       </macros>
       <x>314</x>
       <width>30</width>
@@ -2337,7 +2337,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -2356,7 +2356,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -2374,7 +2374,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -2383,7 +2383,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_86</name>
       <macros>
-        <P>$(P)_AI3</P>
+        <Mod>$(RIO)_AI3</Mod>
       </macros>
       <x>352</x>
       <width>30</width>
@@ -2403,7 +2403,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -2422,7 +2422,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -2440,7 +2440,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -2449,7 +2449,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_87</name>
       <macros>
-        <P>$(P)_AI4</P>
+        <Mod>$(RIO)_AI4</Mod>
       </macros>
       <x>391</x>
       <width>30</width>
@@ -2469,7 +2469,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -2488,7 +2488,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -2506,7 +2506,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -2515,7 +2515,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_88</name>
       <macros>
-        <P>$(P)_DO1</P>
+        <Mod>$(RIO)_DO1</Mod>
       </macros>
       <x>429</x>
       <width>30</width>
@@ -2535,7 +2535,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -2554,7 +2554,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -2572,7 +2572,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -2581,7 +2581,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_89</name>
       <macros>
-        <P>$(P)_DO2</P>
+        <Mod>$(RIO)_DO2</Mod>
       </macros>
       <x>467</x>
       <width>30</width>
@@ -2601,7 +2601,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -2620,7 +2620,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -2638,7 +2638,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -2647,7 +2647,7 @@ $(pv_value)</tooltip>
     <widget type="group" version="2.0.0">
       <name>Group_90</name>
       <macros>
-        <P>$(P)_DO3</P>
+        <Mod>$(RIO)_DO3</Mod>
       </macros>
       <x>506</x>
       <width>30</width>
@@ -2667,7 +2667,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>false</value>
             </exp>
-            <pv_name>${PVConnected}</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is connected</tooltip>
@@ -2686,7 +2686,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Status</pv_name>
+            <pv_name>$(Mod)_Status</pv_name>
           </rule>
         </rules>
         <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -2704,7 +2704,7 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0 == false">
               <value>true</value>
             </exp>
-            <pv_name>$(P)_Connected</pv_name>
+            <pv_name>$(Mod)_Connected</pv_name>
           </rule>
         </rules>
         <tooltip>Module is not connected!</tooltip>
@@ -2714,7 +2714,7 @@ $(pv_value)</tooltip>
   <widget type="group" version="2.0.0">
     <name>Group_91</name>
     <macros>
-      <P>$(PLC):SCL1</P>
+      <Mod>$(PLC):SCL1</Mod>
     </macros>
     <x>1113</x>
     <y>150</y>
@@ -2735,7 +2735,7 @@ $(pv_value)</tooltip>
           <exp bool_exp="pv0 == false">
             <value>false</value>
           </exp>
-          <pv_name>${PVConnected}</pv_name>
+          <pv_name>$(Mod)_Connected</pv_name>
         </rule>
       </rules>
       <tooltip>Module is connected</tooltip>
@@ -2754,7 +2754,7 @@ $(pv_value)</tooltip>
           <exp bool_exp="pv0 == false">
             <value>true</value>
           </exp>
-          <pv_name>$(P)_Status</pv_name>
+          <pv_name>$(Mod)_Status</pv_name>
         </rule>
       </rules>
       <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -2772,7 +2772,7 @@ $(pv_value)</tooltip>
           <exp bool_exp="pv0 == false">
             <value>true</value>
           </exp>
-          <pv_name>$(P)_Connected</pv_name>
+          <pv_name>$(Mod)_Connected</pv_name>
         </rule>
       </rules>
       <tooltip>Module is not connected!</tooltip>
@@ -2781,7 +2781,7 @@ $(pv_value)</tooltip>
   <widget type="group" version="2.0.0">
     <name>Group_92</name>
     <macros>
-      <P>$(PLC):SCL2</P>
+      <Mod>$(PLC):SCL2</Mod>
     </macros>
     <x>1273</x>
     <y>150</y>
@@ -2802,7 +2802,7 @@ $(pv_value)</tooltip>
           <exp bool_exp="pv0 == false">
             <value>false</value>
           </exp>
-          <pv_name>${PVConnected}</pv_name>
+          <pv_name>$(Mod)_Connected</pv_name>
         </rule>
       </rules>
       <tooltip>Module is connected</tooltip>
@@ -2821,7 +2821,7 @@ $(pv_value)</tooltip>
           <exp bool_exp="pv0 == false">
             <value>true</value>
           </exp>
-          <pv_name>$(P)_Status</pv_name>
+          <pv_name>$(Mod)_Status</pv_name>
         </rule>
       </rules>
       <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -2839,7 +2839,7 @@ $(pv_value)</tooltip>
           <exp bool_exp="pv0 == false">
             <value>true</value>
           </exp>
-          <pv_name>$(P)_Connected</pv_name>
+          <pv_name>$(Mod)_Connected</pv_name>
         </rule>
       </rules>
       <tooltip>Module is not connected!</tooltip>
@@ -2848,7 +2848,7 @@ $(pv_value)</tooltip>
   <widget type="group" version="2.0.0">
     <name>Group_93</name>
     <macros>
-      <P>$(PLC):SCL3</P>
+      <Mod>$(PLC):SCL3</Mod>
     </macros>
     <x>1423</x>
     <y>150</y>
@@ -2869,7 +2869,7 @@ $(pv_value)</tooltip>
           <exp bool_exp="pv0 == false">
             <value>false</value>
           </exp>
-          <pv_name>${PVConnected}</pv_name>
+          <pv_name>$(Mod)_Connected</pv_name>
         </rule>
       </rules>
       <tooltip>Module is connected</tooltip>
@@ -2888,7 +2888,7 @@ $(pv_value)</tooltip>
           <exp bool_exp="pv0 == false">
             <value>true</value>
           </exp>
-          <pv_name>$(P)_Status</pv_name>
+          <pv_name>$(Mod)_Status</pv_name>
         </rule>
       </rules>
       <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -2906,7 +2906,7 @@ $(pv_value)</tooltip>
           <exp bool_exp="pv0 == false">
             <value>true</value>
           </exp>
-          <pv_name>$(P)_Connected</pv_name>
+          <pv_name>$(Mod)_Connected</pv_name>
         </rule>
       </rules>
       <tooltip>Module is not connected!</tooltip>
@@ -2915,7 +2915,7 @@ $(pv_value)</tooltip>
   <widget type="group" version="2.0.0">
     <name>Group_94</name>
     <macros>
-      <P>$(PLC):CPU</P>
+      <Mod>$(PLC):CPU</Mod>
     </macros>
     <x>676</x>
     <y>164</y>
@@ -2936,7 +2936,7 @@ $(pv_value)</tooltip>
           <exp bool_exp="pv0 == false">
             <value>false</value>
           </exp>
-          <pv_name>${PVConnected}</pv_name>
+          <pv_name>$(Mod)_Connected</pv_name>
         </rule>
       </rules>
       <tooltip>Module is connected</tooltip>
@@ -2955,7 +2955,7 @@ $(pv_value)</tooltip>
           <exp bool_exp="pv0 == false">
             <value>true</value>
           </exp>
-          <pv_name>$(P)_Status</pv_name>
+          <pv_name>$(Mod)_Status</pv_name>
         </rule>
       </rules>
       <tooltip>Siemens card error! Open TIA Portal!</tooltip>
@@ -2973,7 +2973,7 @@ $(pv_value)</tooltip>
           <exp bool_exp="pv0 == false">
             <value>true</value>
           </exp>
-          <pv_name>$(P)_Connected</pv_name>
+          <pv_name>$(Mod)_Connected</pv_name>
         </rule>
       </rules>
       <tooltip>Module is not connected!</tooltip>
@@ -3237,7 +3237,7 @@ $(pv_value)</tooltip>
         <name>Text Update_9</name>
         <pv_name>$(PLC):AliveR</pv_name>
         <x>190</x>
-        <y>96</y>
+        <y>91</y>
         <width>140</width>
         <height>18</height>
         <foreground_color>
@@ -3250,7 +3250,7 @@ $(pv_value)</tooltip>
         <name>Text Update_10</name>
         <pv_name>$(PLC):PLCHashCorrectR</pv_name>
         <x>190</x>
-        <y>76</y>
+        <y>71</y>
         <width>140</width>
         <height>18</height>
         <foreground_color>
@@ -3263,7 +3263,7 @@ $(pv_value)</tooltip>
         <name>Text Update_11</name>
         <pv_name>$(PLC):ConnectedR</pv_name>
         <x>190</x>
-        <y>56</y>
+        <y>50</y>
         <width>140</width>
         <height>18</height>
         <foreground_color>
@@ -3276,7 +3276,7 @@ $(pv_value)</tooltip>
         <name>Text Update_12</name>
         <pv_name>$(PLC):S7ConnectedR</pv_name>
         <x>190</x>
-        <y>36</y>
+        <y>30</y>
         <width>140</width>
         <height>18</height>
         <foreground_color>
@@ -3289,7 +3289,7 @@ $(pv_value)</tooltip>
         <name>Text Update_13</name>
         <pv_name>$(PLC):ModbusConnectedR</pv_name>
         <x>190</x>
-        <y>16</y>
+        <y>10</y>
         <width>140</width>
         <height>18</height>
         <foreground_color>
@@ -3348,7 +3348,7 @@ $(pv_value)</tooltip>
         <name>Text Update_14</name>
         <pv_name>$(PLC):SW_Checksum</pv_name>
         <x>190</x>
-        <y>16</y>
+        <y>11</y>
         <width>140</width>
         <height>18</height>
         <foreground_color>
@@ -3378,7 +3378,7 @@ $(pv_value)</tooltip>
         <name>Text Update_15</name>
         <pv_name>$(PLC):Text_Checksum</pv_name>
         <x>190</x>
-        <y>39</y>
+        <y>34</y>
         <width>140</width>
         <height>18</height>
         <foreground_color>
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Racks.bob b/NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Racks.bob
index d84dd4681265412bfd6783378d29c0181709a586..df531ed1c646a6fe1d20a4e60339b66c03a4af34 100644
--- a/NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Racks.bob
+++ b/NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Racks.bob
@@ -72,7 +72,7 @@
           <x>25</x>
           <y>17</y>
           <off_color>
-            <color name="LED-RED-OFF" red="110" green="101" blue="90">
+            <color name="Grid" red="169" green="169" blue="169">
             </color>
           </off_color>
           <on_color>
@@ -310,7 +310,7 @@
           <x>25</x>
           <y>17</y>
           <off_color>
-            <color name="LED-RED-OFF" red="110" green="101" blue="90">
+            <color name="Grid" red="169" green="169" blue="169">
             </color>
           </off_color>
           <on_color>
@@ -531,7 +531,7 @@
           <x>25</x>
           <y>17</y>
           <off_color>
-            <color name="LED-RED-OFF" red="110" green="101" blue="90">
+            <color name="Grid" red="169" green="169" blue="169">
             </color>
           </off_color>
           <on_color>
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/ODH_Main.bob b/NON-APPROVED/kg-gt_odh-plc-01/ODH_Main.bob
index 1abad13c5fed0bfb067e28f271395f3797540a06..137f51cd6f9963c2be09e902c4ccc2eaf15b729d 100644
--- a/NON-APPROVED/kg-gt_odh-plc-01/ODH_Main.bob
+++ b/NON-APPROVED/kg-gt_odh-plc-01/ODH_Main.bob
@@ -11,7 +11,7 @@
     <x>10</x>
     <y>10</y>
     <width>610</width>
-    <height>810</height>
+    <height>850</height>
     <style>3</style>
     <font>
       <font family="Source Sans Pro" style="BOLD" size="16.0">
@@ -20,7 +20,7 @@
     <widget type="rectangle" version="2.0.0">
       <name>group.HeCompBuilding.border</name>
       <width>610</width>
-      <height>810</height>
+      <height>850</height>
       <line_width>0</line_width>
       <line_color>
         <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -35,7 +35,7 @@
       <name>Label_1</name>
       <text>O2 Level</text>
       <x>162</x>
-      <y>37</y>
+      <y>70</y>
       <width>61</width>
       <height>21</height>
       <font>
@@ -56,7 +56,7 @@
       <text>ODH 19.5%
 Warning</text>
       <x>244</x>
-      <y>27</y>
+      <y>60</y>
       <width>79</width>
       <height>42</height>
       <font>
@@ -77,7 +77,7 @@ Warning</text>
       <text>ODH 18%
 Alarm</text>
       <x>337</x>
-      <y>27</y>
+      <y>60</y>
       <width>66</width>
       <height>42</height>
       <font>
@@ -98,7 +98,7 @@ Alarm</text>
       <text>Monitor
 Healthy</text>
       <x>427</x>
-      <y>27</y>
+      <y>60</y>
       <width>57</width>
       <height>42</height>
       <font>
@@ -118,7 +118,7 @@ Healthy</text>
       <name>Label_5</name>
       <text>Maintenance</text>
       <x>503</x>
-      <y>37</y>
+      <y>70</y>
       <width>92</width>
       <height>21</height>
       <font>
@@ -137,7 +137,7 @@ Healthy</text>
     <widget type="group" version="2.0.0">
       <name>Group</name>
       <x>62</x>
-      <y>78</y>
+      <y>111</y>
       <width>535</width>
       <height>380</height>
       <style>3</style>
@@ -304,7 +304,7 @@ Healthy</text>
     <widget type="group" version="2.0.0">
       <name>Group_2</name>
       <x>62</x>
-      <y>464</y>
+      <y>497</y>
       <width>535</width>
       <height>227</height>
       <style>3</style>
@@ -411,7 +411,7 @@ Healthy</text>
     <widget type="group" version="2.0.0">
       <name>Group_3</name>
       <x>62</x>
-      <y>697</y>
+      <y>730</y>
       <width>535</width>
       <height>105</height>
       <style>3</style>
@@ -481,7 +481,7 @@ Healthy</text>
         </action>
       </actions>
       <x>12</x>
-      <y>697</y>
+      <y>730</y>
       <width>40</width>
       <height>105</height>
       <font>
@@ -505,7 +505,7 @@ Healthy</text>
         </action>
       </actions>
       <x>12</x>
-      <y>464</y>
+      <y>497</y>
       <width>40</width>
       <height>227</height>
       <font>
@@ -529,7 +529,7 @@ Healthy</text>
         </action>
       </actions>
       <x>12</x>
-      <y>78</y>
+      <y>111</y>
       <width>40</width>
       <height>381</height>
       <font>
@@ -548,8 +548,8 @@ Healthy</text>
           <description>Electrical Racks</description>
         </action>
       </actions>
-      <x>10</x>
-      <y>11</y>
+      <x>12</x>
+      <y>68</y>
       <width>130</width>
       <height>25</height>
       <tooltip>$(actions)</tooltip>
@@ -563,11 +563,30 @@ Healthy</text>
           <description>PLC Diagnostic</description>
         </action>
       </actions>
-      <x>10</x>
-      <y>40</y>
+      <x>12</x>
+      <y>18</y>
       <width>130</width>
       <height>25</height>
       <tooltip>$(actions)</tooltip>
     </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED</name>
+      <pv_name>KG-GTA:ODH-PLC-01:AliveR</pv_name>
+      <x>162</x>
+      <y>10</y>
+      <width>161</width>
+      <height>40</height>
+      <off_label>Lost PLC Connection</off_label>
+      <off_color>
+        <color name="MAJOR" red="252" green="13" blue="27">
+        </color>
+      </off_color>
+      <on_label>PLC Connection</on_label>
+      <on_color>
+        <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+        </color>
+      </on_color>
+      <square>true</square>
+    </widget>
   </widget>
 </display>
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/ODH_Monit_Sub.bob b/NON-APPROVED/kg-gt_odh-plc-01/ODH_Monit_Sub.bob
index 9b342a6c510d559bf7f547645161c1d412576a9c..60f662e887b8381246699df722ae08c2a3d717dd 100644
--- a/NON-APPROVED/kg-gt_odh-plc-01/ODH_Monit_Sub.bob
+++ b/NON-APPROVED/kg-gt_odh-plc-01/ODH_Monit_Sub.bob
@@ -10,6 +10,8 @@
     <y>4</y>
     <width>55</width>
     <precision>2</precision>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
   </widget>
   <widget type="led" version="2.0.0">
diff --git a/NON-APPROVED/lebt-010-pbi-npm/npm.opi b/NON-APPROVED/lebt-010-pbi-npm/npm.opi
index 8789af7d3cbaa516ed8afe885769db50ea11dc02..0f0af4c0ac27c98703cf83a20c9c774e16f5e937 100644
--- a/NON-APPROVED/lebt-010-pbi-npm/npm.opi
+++ b/NON-APPROVED/lebt-010-pbi-npm/npm.opi
@@ -49,7 +49,7 @@
     <border_width>1</border_width>
     <enabled>false</enabled>
     <font>
-      <fontdata fontName="Titillium" height="25" style="0" pixels="false" />
+      <opifont.name fontName="Source Sans Pro" height="36" style="1" pixels="false">HUGE-SANS-BOLD</opifont.name>
     </font>
     <foreground_color>
       <color name="IO OutputPV Fg" red="0" green="0" blue="0" />
@@ -191,7 +191,7 @@ $(pv_value)</tooltip>
     <border_width>2</border_width>
     <enabled>false</enabled>
     <font>
-      <fontdata fontName="Titillium" height="20" style="0" pixels="false" />
+      <opifont.name fontName="Source Sans Pro" height="18" style="0" pixels="false">MEDIUM-SANS-PLAIN</opifont.name>
     </font>
     <foreground_color>
       <color name="IO OutputPV Fg" red="0" green="0" blue="0" />
@@ -237,7 +237,7 @@ $(pv_value)</tooltip>
       <color red="192" green="192" blue="192" />
     </foreground_color>
     <group_name></group_name>
-    <height>1</height>
+    <height>937</height>
     <macros>
       <include_parent_macros>true</include_parent_macros>
     </macros>
@@ -277,7 +277,7 @@ $(pv_value)</tooltip>
     <tooltip></tooltip>
     <visible>true</visible>
     <widget_type>Linking Container</widget_type>
-    <width>1</width>
+    <width>1579</width>
     <wuid>168fa846:159db2879d4:-70e3</wuid>
     <x>0</x>
     <y>41</y>
diff --git a/NON-APPROVED/lebt-010-pbi-npm/user/npmPipeline.opi b/NON-APPROVED/lebt-010-pbi-npm/user/npmPipeline.opi
index d419fcb40f7565ff1752d7cbd05a0b22a3445344..d95331b985b5f71807ddefb6bb274242072449d7 100644
--- a/NON-APPROVED/lebt-010-pbi-npm/user/npmPipeline.opi
+++ b/NON-APPROVED/lebt-010-pbi-npm/user/npmPipeline.opi
@@ -50,7 +50,7 @@
     <enabled>true</enabled>
     <fill_level>0.0</fill_level>
     <font>
-      <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+      <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
     </font>
     <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
     <foreground_color>
@@ -98,7 +98,7 @@ $(pv_value)</tooltip>
     <enabled>true</enabled>
     <fc>false</fc>
     <font>
-      <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+      <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
     </font>
     <foreground_color>
       <color red="192" green="192" blue="192" />
@@ -107,7 +107,7 @@ $(pv_value)</tooltip>
     <lock_children>false</lock_children>
     <macros>
       <include_parent_macros>true</include_parent_macros>
-      <AD_OPI_LOC>../../ess-opi-common/modules/AD/</AD_OPI_LOC>
+      <AD_OPI_LOC>../ess-opi-common/modules/AD</AD_OPI_LOC>
     </macros>
     <name>Grouping Container_8</name>
     <rules />
@@ -147,7 +147,7 @@ $(pv_value)</tooltip>
       <fill_arrow>true</fill_arrow>
       <fill_level>0.0</fill_level>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
       <foreground_color>
@@ -221,7 +221,7 @@ $(pv_value)</tooltip>
       <fill_arrow>true</fill_arrow>
       <fill_level>0.0</fill_level>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
       <foreground_color>
@@ -296,7 +296,7 @@ $(pv_value)</tooltip>
       <fill_arrow>true</fill_arrow>
       <fill_level>0.0</fill_level>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
       <foreground_color>
@@ -370,7 +370,7 @@ $(pv_value)</tooltip>
       <fill_arrow>true</fill_arrow>
       <fill_level>0.0</fill_level>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
       <foreground_color>
@@ -446,7 +446,7 @@ $(pv_value)</tooltip>
       <fill_arrow>true</fill_arrow>
       <fill_level>0.0</fill_level>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
       <foreground_color>
@@ -520,7 +520,7 @@ $(pv_value)</tooltip>
       <fill_arrow>true</fill_arrow>
       <fill_level>0.0</fill_level>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
       <foreground_color>
@@ -594,7 +594,7 @@ $(pv_value)</tooltip>
       <fill_arrow>true</fill_arrow>
       <fill_level>0.0</fill_level>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
       <foreground_color>
@@ -661,7 +661,7 @@ $(pv_value)</tooltip>
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -702,12 +702,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="1" pixels="false">Default Bold</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="1" pixels="false">Default Bold</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label</name>
         <rules />
@@ -723,7 +723,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>46</width>
+        <width>39</width>
         <wrap_words>false</wrap_words>
         <wuid>-819d6f3:164c73118c5:-6f73</wuid>
         <x>120</x>
@@ -742,12 +742,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_4</name>
         <rules />
@@ -763,7 +763,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>92</width>
+        <width>77</width>
         <wrap_words>false</wrap_words>
         <wuid>6be98e43:164cb50327e:-6e25</wuid>
         <x>14</x>
@@ -782,12 +782,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_1</name>
         <rules />
@@ -803,7 +803,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>30</width>
+        <width>25</width>
         <wrap_words>false</wrap_words>
         <wuid>6be98e43:164cb50327e:-6e24</wuid>
         <x>78</x>
@@ -822,12 +822,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_3</name>
         <rules />
@@ -843,7 +843,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>47</width>
+        <width>38</width>
         <wrap_words>false</wrap_words>
         <wuid>6be98e43:164cb50327e:-6e23</wuid>
         <x>63</x>
@@ -868,7 +868,7 @@ $(pv_value)</tooltip>
         <effect_3d>true</effect_3d>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -1093,7 +1093,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -1146,7 +1146,7 @@ $(pv_value)</tooltip>
       <fill_arrow>true</fill_arrow>
       <fill_level>0.0</fill_level>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
       <foreground_color>
@@ -1211,7 +1211,7 @@ $(pv_value)</tooltip>
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -1252,12 +1252,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_4</name>
         <rules />
@@ -1273,7 +1273,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>92</width>
+        <width>77</width>
         <wrap_words>false</wrap_words>
         <wuid>-819d6f3:164c73118c5:-75c7</wuid>
         <x>14</x>
@@ -1292,12 +1292,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_2</name>
         <rules />
@@ -1313,7 +1313,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>52</width>
+        <width>44</width>
         <wrap_words>false</wrap_words>
         <wuid>-819d6f3:164c73118c5:-76e2</wuid>
         <x>56</x>
@@ -1332,12 +1332,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_1</name>
         <rules />
@@ -1353,7 +1353,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>30</width>
+        <width>25</width>
         <wrap_words>false</wrap_words>
         <wuid>-819d6f3:164c73118c5:-76ec</wuid>
         <x>78</x>
@@ -1372,12 +1372,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_3</name>
         <rules />
@@ -1393,7 +1393,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>97</width>
+        <width>81</width>
         <wrap_words>false</wrap_words>
         <wuid>-819d6f3:164c73118c5:-75fc</wuid>
         <x>7</x>
@@ -1418,7 +1418,7 @@ $(pv_value)</tooltip>
         <effect_3d>true</effect_3d>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -1480,7 +1480,7 @@ $(pv_value)</tooltip>
         <effect_3d>true</effect_3d>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -1536,12 +1536,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="1" pixels="false">Default Bold</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="1" pixels="false">Default Bold</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label</name>
         <rules />
@@ -1557,7 +1557,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>77</width>
+        <width>62</width>
         <wrap_words>false</wrap_words>
         <wuid>-819d6f3:164c73118c5:-76f0</wuid>
         <x>102</x>
@@ -1796,7 +1796,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -1849,7 +1849,7 @@ $(pv_value)</tooltip>
       <fill_arrow>true</fill_arrow>
       <fill_level>0.0</fill_level>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
       <foreground_color>
@@ -1916,7 +1916,7 @@ $(pv_value)</tooltip>
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -1957,12 +1957,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_4</name>
         <rules />
@@ -1978,7 +1978,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>92</width>
+        <width>77</width>
         <wrap_words>false</wrap_words>
         <wuid>-819d6f3:164c73118c5:-70fb</wuid>
         <x>14</x>
@@ -1997,12 +1997,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_1</name>
         <rules />
@@ -2018,7 +2018,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>30</width>
+        <width>25</width>
         <wrap_words>false</wrap_words>
         <wuid>-819d6f3:164c73118c5:-70f9</wuid>
         <x>78</x>
@@ -2037,12 +2037,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_3</name>
         <rules />
@@ -2058,7 +2058,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>47</width>
+        <width>38</width>
         <wrap_words>false</wrap_words>
         <wuid>-819d6f3:164c73118c5:-70f7</wuid>
         <x>63</x>
@@ -2083,7 +2083,7 @@ $(pv_value)</tooltip>
         <effect_3d>true</effect_3d>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -2139,12 +2139,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="1" pixels="false">Default Bold</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="1" pixels="false">Default Bold</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label</name>
         <rules />
@@ -2160,7 +2160,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>74</width>
+        <width>60</width>
         <wrap_words>false</wrap_words>
         <wuid>-819d6f3:164c73118c5:-70f2</wuid>
         <x>102</x>
@@ -2348,7 +2348,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -2393,7 +2393,7 @@ $(pv_value)</tooltip>
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -2434,12 +2434,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="1" pixels="false">Default Bold</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="1" pixels="false">Default Bold</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label</name>
         <rules />
@@ -2455,7 +2455,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>46</width>
+        <width>39</width>
         <wrap_words>false</wrap_words>
         <wuid>-819d6f3:164c73118c5:-7065</wuid>
         <x>120</x>
@@ -2474,12 +2474,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_4</name>
         <rules />
@@ -2495,7 +2495,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>92</width>
+        <width>77</width>
         <wrap_words>false</wrap_words>
         <wuid>6be98e43:164cb50327e:-6ee1</wuid>
         <x>14</x>
@@ -2514,12 +2514,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_1</name>
         <rules />
@@ -2535,7 +2535,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>30</width>
+        <width>25</width>
         <wrap_words>false</wrap_words>
         <wuid>6be98e43:164cb50327e:-6ee0</wuid>
         <x>78</x>
@@ -2554,12 +2554,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_3</name>
         <rules />
@@ -2575,7 +2575,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>47</width>
+        <width>38</width>
         <wrap_words>false</wrap_words>
         <wuid>6be98e43:164cb50327e:-6edf</wuid>
         <x>63</x>
@@ -2600,7 +2600,7 @@ $(pv_value)</tooltip>
         <effect_3d>true</effect_3d>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -2825,7 +2825,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -2870,7 +2870,7 @@ $(pv_value)</tooltip>
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -2911,12 +2911,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="1" pixels="false">Default Bold</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="1" pixels="false">Default Bold</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label</name>
         <rules />
@@ -2932,7 +2932,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>45</width>
+        <width>38</width>
         <wrap_words>false</wrap_words>
         <wuid>-819d6f3:164c73118c5:-6f37</wuid>
         <x>120</x>
@@ -2951,12 +2951,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_4</name>
         <rules />
@@ -2972,7 +2972,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>92</width>
+        <width>77</width>
         <wrap_words>false</wrap_words>
         <wuid>6be98e43:164cb50327e:-6e35</wuid>
         <x>14</x>
@@ -2991,12 +2991,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_1</name>
         <rules />
@@ -3012,7 +3012,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>30</width>
+        <width>25</width>
         <wrap_words>false</wrap_words>
         <wuid>6be98e43:164cb50327e:-6e34</wuid>
         <x>78</x>
@@ -3031,12 +3031,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_3</name>
         <rules />
@@ -3052,7 +3052,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>47</width>
+        <width>38</width>
         <wrap_words>false</wrap_words>
         <wuid>6be98e43:164cb50327e:-6e33</wuid>
         <x>63</x>
@@ -3077,7 +3077,7 @@ $(pv_value)</tooltip>
         <effect_3d>true</effect_3d>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -3302,7 +3302,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -3355,7 +3355,7 @@ $(pv_value)</tooltip>
       <fill_arrow>true</fill_arrow>
       <fill_level>0.0</fill_level>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
       <foreground_color>
@@ -3422,7 +3422,7 @@ $(pv_value)</tooltip>
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -3463,12 +3463,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="1" pixels="false">Default Bold</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="1" pixels="false">Default Bold</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label</name>
         <rules />
@@ -3484,7 +3484,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>83</width>
+        <width>67</width>
         <wrap_words>false</wrap_words>
         <wuid>-819d6f3:164c73118c5:-6f87</wuid>
         <x>102</x>
@@ -3503,12 +3503,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_4</name>
         <rules />
@@ -3524,7 +3524,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>92</width>
+        <width>77</width>
         <wrap_words>false</wrap_words>
         <wuid>6be98e43:164cb50327e:-6e45</wuid>
         <x>14</x>
@@ -3543,12 +3543,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_1</name>
         <rules />
@@ -3564,7 +3564,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>30</width>
+        <width>25</width>
         <wrap_words>false</wrap_words>
         <wuid>6be98e43:164cb50327e:-6e44</wuid>
         <x>78</x>
@@ -3583,12 +3583,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_3</name>
         <rules />
@@ -3604,7 +3604,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>47</width>
+        <width>38</width>
         <wrap_words>false</wrap_words>
         <wuid>6be98e43:164cb50327e:-6e43</wuid>
         <x>63</x>
@@ -3629,7 +3629,7 @@ $(pv_value)</tooltip>
         <effect_3d>true</effect_3d>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -3854,7 +3854,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -3899,7 +3899,7 @@ $(pv_value)</tooltip>
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -3940,12 +3940,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="1" pixels="false">Default Bold</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="1" pixels="false">Default Bold</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label</name>
         <rules />
@@ -3961,7 +3961,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>57</width>
+        <width>46</width>
         <wrap_words>false</wrap_words>
         <wuid>-819d6f3:164c73118c5:-6fd7</wuid>
         <x>111</x>
@@ -3980,12 +3980,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_4</name>
         <rules />
@@ -4001,7 +4001,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>92</width>
+        <width>77</width>
         <wrap_words>false</wrap_words>
         <wuid>6be98e43:164cb50327e:-6e65</wuid>
         <x>14</x>
@@ -4020,12 +4020,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_1</name>
         <rules />
@@ -4041,7 +4041,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>30</width>
+        <width>25</width>
         <wrap_words>false</wrap_words>
         <wuid>6be98e43:164cb50327e:-6e64</wuid>
         <x>78</x>
@@ -4060,12 +4060,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_3</name>
         <rules />
@@ -4081,7 +4081,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>47</width>
+        <width>38</width>
         <wrap_words>false</wrap_words>
         <wuid>6be98e43:164cb50327e:-6e63</wuid>
         <x>63</x>
@@ -4106,7 +4106,7 @@ $(pv_value)</tooltip>
         <effect_3d>true</effect_3d>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -4331,7 +4331,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -4376,7 +4376,7 @@ $(pv_value)</tooltip>
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -4417,12 +4417,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="1" pixels="false">Default Bold</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="1" pixels="false">Default Bold</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label</name>
         <rules />
@@ -4438,7 +4438,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>47</width>
+        <width>37</width>
         <wrap_words>false</wrap_words>
         <wuid>-819d6f3:164c73118c5:-6faf</wuid>
         <x>120</x>
@@ -4457,12 +4457,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_4</name>
         <rules />
@@ -4478,7 +4478,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>92</width>
+        <width>77</width>
         <wrap_words>false</wrap_words>
         <wuid>6be98e43:164cb50327e:-6e55</wuid>
         <x>14</x>
@@ -4497,12 +4497,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_1</name>
         <rules />
@@ -4518,7 +4518,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>30</width>
+        <width>25</width>
         <wrap_words>false</wrap_words>
         <wuid>6be98e43:164cb50327e:-6e54</wuid>
         <x>78</x>
@@ -4537,12 +4537,12 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>20</height>
+        <height>15</height>
         <horizontal_alignment>1</horizontal_alignment>
         <name>Label_3</name>
         <rules />
@@ -4558,7 +4558,7 @@ $(pv_value)</tooltip>
         <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
         <widget_type>Label</widget_type>
-        <width>47</width>
+        <width>38</width>
         <wrap_words>false</wrap_words>
         <wuid>6be98e43:164cb50327e:-6e53</wuid>
         <x>63</x>
@@ -4583,7 +4583,7 @@ $(pv_value)</tooltip>
         <effect_3d>true</effect_3d>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -4854,7 +4854,7 @@ $(pv_value)</tooltip>
       <border_width>1</border_width>
       <enabled>true</enabled>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
       <foreground_color>
diff --git a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserCamera.opi b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserCamera.opi
index 8f8978a909038a5fa3666dc5b9ca473423e31ce8..2ef9166ada3cd51e361a1354e54e2aa90cc5bdd7 100644
--- a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserCamera.opi
+++ b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserCamera.opi
@@ -45,7 +45,7 @@
     <enabled>true</enabled>
     <fc>false</fc>
     <font>
-      <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+      <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
     </font>
     <foreground_color>
       <color red="192" green="192" blue="192" />
@@ -85,7 +85,7 @@
       <border_width>1</border_width>
       <enabled>true</enabled>
       <font>
-        <fontdata fontName="Titillium" height="20" style="0" pixels="false" />
+        <opifont.name fontName="Source Sans Pro" height="18" style="0" pixels="false">MEDIUM-SANS-PLAIN</opifont.name>
       </font>
       <foreground_color>
         <color name="IO Label" red="0" green="0" blue="0" />
@@ -126,7 +126,7 @@
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -166,7 +166,7 @@
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
@@ -751,13 +751,13 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>34</height>
+        <height>25</height>
         <items_from_pv>true</items_from_pv>
         <name>Combo</name>
         <pv_name>$(secsub):$(disdevid):$(ORIENT)CAMOBSIMAGE-EnableCallbacks</pv_name>
@@ -886,13 +886,13 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>34</height>
+        <height>25</height>
         <items_from_pv>true</items_from_pv>
         <name>Combo</name>
         <pv_name>$(secsub):$(disdevid):$(ORIENT)CAM-DataType</pv_name>
@@ -1171,13 +1171,13 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>34</height>
+        <height>25</height>
         <items_from_pv>true</items_from_pv>
         <name>Combo</name>
         <pv_name>$(secsub):$(disdevid):$(ORIENT)CAM-ImageMode</pv_name>
@@ -1306,13 +1306,13 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>34</height>
+        <height>25</height>
         <items_from_pv>true</items_from_pv>
         <name>Combo</name>
         <pv_name>$(secsub):$(disdevid):$(ORIENT)CAM-TriggerMode</pv_name>
@@ -1739,7 +1739,7 @@ $(pv_value)</tooltip>
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -1779,7 +1779,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
@@ -3176,7 +3176,7 @@ $(pv_value)</tooltip>
     <widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
       <actions hook="false" hook_all="false">
         <action type="OPEN_DISPLAY">
-          <path>../ess-opi-common/modules/mrf/ess/stable/evr-pcie-300dc.opi</path>
+          <path>../ess-opi-common/modules/mrf/ess/0.2.0.0/evr-pcie-300dc.opi</path>
           <macros>
             <include_parent_macros>true</include_parent_macros>
             <SYS>FEB-030Row:PBI</SYS>
@@ -3199,7 +3199,7 @@ $(pv_value)</tooltip>
       <border_width>1</border_width>
       <enabled>true</enabled>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
       <foreground_color>
diff --git a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserGaussFit.opi b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserGaussFit.opi
index af2037d4133d84a2f45f0a4bb322c4b2261de0d0..5cdc0242ba39846689126bf4249a87c927284ffd 100644
--- a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserGaussFit.opi
+++ b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserGaussFit.opi
@@ -10,7 +10,7 @@
   <background_color>
     <color red="220" green="220" blue="220" />
   </background_color>
-  <boy_version>5.1.0.201701251229</boy_version>
+  <boy_version>5.1.0</boy_version>
   <foreground_color>
     <color red="192" green="192" blue="192" />
   </foreground_color>
@@ -45,7 +45,7 @@
     <enabled>true</enabled>
     <fc>false</fc>
     <font>
-      <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+      <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
     </font>
     <foreground_color>
       <color red="192" green="192" blue="192" />
@@ -85,7 +85,7 @@
       <border_width>1</border_width>
       <enabled>true</enabled>
       <font>
-        <fontdata fontName="Titillium" height="20" style="0" pixels="false" />
+        <opifont.name fontName="Source Sans Pro" height="18" style="0" pixels="false">MEDIUM-SANS-PLAIN</opifont.name>
       </font>
       <foreground_color>
         <color name="IO Label" red="0" green="0" blue="0" />
@@ -126,7 +126,7 @@
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -166,7 +166,7 @@
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
@@ -198,10 +198,10 @@
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -291,10 +291,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -384,10 +384,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -477,10 +477,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -570,10 +570,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -839,10 +839,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -899,7 +899,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -953,7 +953,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -1007,7 +1007,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -1061,7 +1061,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -1096,10 +1096,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -1147,7 +1147,7 @@ $(pv_value)</tooltip>
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -1187,7 +1187,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
@@ -1219,10 +1219,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -1312,10 +1312,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -1405,10 +1405,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -1498,10 +1498,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -1591,10 +1591,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -1684,10 +1684,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -1787,7 +1787,7 @@ $(pv_value)</tooltip>
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -1827,7 +1827,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
@@ -1859,10 +1859,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -1952,10 +1952,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -1993,10 +1993,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -2034,10 +2034,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -2075,10 +2075,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -2334,10 +2334,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -2759,10 +2759,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -2863,7 +2863,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
diff --git a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserLensMotor.opi b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserLensMotor.opi
index 71f2115b4e582958cee7f167dc32c6044ebbb73f..2b944036b811f4c1ae056637ffee9fe0198c6e74 100644
--- a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserLensMotor.opi
+++ b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserLensMotor.opi
@@ -125,7 +125,7 @@
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
@@ -194,60 +194,6 @@
         <x>12</x>
         <y>108</y>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
-        <actions hook="false" hook_all="true">
-          <action type="WRITE_PV">
-            <pv_name>$(pv_name)</pv_name>
-            <value>1</value>
-            <timeout>10</timeout>
-            <confirm_message></confirm_message>
-            <description></description>
-          </action>
-        </actions>
-        <alarm_pulsing>false</alarm_pulsing>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <background_color>
-          <color red="200" green="200" blue="200" />
-        </background_color>
-        <border_alarm_sensitive>true</border_alarm_sensitive>
-        <border_color>
-          <color red="100" green="100" blue="100" />
-        </border_color>
-        <border_style>1</border_style>
-        <border_width>0</border_width>
-        <enabled>true</enabled>
-        <font>
-          <fontdata fontName="Open Sans" height="12" style="0" pixels="false" />
-        </font>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <foreground_color>
-          <color red="0" green="0" blue="0" />
-        </foreground_color>
-        <height>24</height>
-        <image></image>
-        <name>Action Button Template_2</name>
-        <push_action_index>0</push_action_index>
-        <pv_name>$(secsub):$(disdevid).CNEN</pv_name>
-        <pv_value />
-        <rules />
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <scripts />
-        <style>0</style>
-        <text>Enable</text>
-        <toggle_button>false</toggle_button>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <visible>true</visible>
-        <widget_type>Action Button</widget_type>
-        <width>102</width>
-        <wuid>5cf23d14:164d1bb6b50:-7734</wuid>
-        <x>150</x>
-        <y>108</y>
-      </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.LED" version="1.0.0">
         <actions hook="false" hook_all="false" />
         <alarm_pulsing>false</alarm_pulsing>
@@ -530,6 +476,75 @@ $(pv_value)</tooltip>
         <x>18</x>
         <y>150</y>
       </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.BoolButton" version="1.0.0">
+        <actions hook="false" hook_all="false" />
+        <alarm_pulsing>false</alarm_pulsing>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <background_color>
+          <color name="IO Button" red="178" green="178" blue="178" />
+        </background_color>
+        <bit>0</bit>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <border_color>
+          <color name="IO Border" red="0" green="0" blue="0" />
+        </border_color>
+        <border_style>0</border_style>
+        <border_width>2</border_width>
+        <confirm_message>Are your sure you want to do this?</confirm_message>
+        <data_type>0</data_type>
+        <effect_3d>true</effect_3d>
+        <enabled>true</enabled>
+        <font>
+          <opifont.name fontName="DejaVu Sans Mono" height="12" style="0" pixels="false">IO Normal</opifont.name>
+        </font>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <foreground_color>
+          <color name="IO InputPV Fg" red="0" green="0" blue="0" />
+        </foreground_color>
+        <height>43</height>
+        <labels_from_pv>false</labels_from_pv>
+        <name>Boolean Button Template_12</name>
+        <off_color>
+          <color red="127" green="127" blue="127" />
+        </off_color>
+        <off_label>CNEN</off_label>
+        <on_color>
+          <color red="0" green="255" blue="0" />
+        </on_color>
+        <on_label>CNEN</on_label>
+        <password></password>
+        <push_action_index>0</push_action_index>
+        <pv_name>$(secsub):$(disdevid).CNEN</pv_name>
+        <pv_value />
+        <released_action_index>0</released_action_index>
+        <rules>
+          <rule name="BorderRule" prop_id="border_style" out_exp="false">
+            <exp bool_exp="pv0==1">
+              <value>9</value>
+            </exp>
+            <pv trig="true">$(pv_name)</pv>
+          </rule>
+        </rules>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>true</keep_wh_ratio>
+        </scale_options>
+        <scripts />
+        <show_boolean_label>true</show_boolean_label>
+        <show_confirm_dialog>0</show_confirm_dialog>
+        <show_led>true</show_led>
+        <square_button>false</square_button>
+        <toggle_button>true</toggle_button>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <visible>true</visible>
+        <widget_type>Boolean Button</widget_type>
+        <width>40</width>
+        <wuid>5e156c67:166c9896f50:-74d5</wuid>
+        <x>168</x>
+        <y>102</y>
+      </widget>
     </widget>
     <widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
       <actions hook="false" hook_all="false" />
@@ -584,7 +599,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
@@ -1541,7 +1556,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
@@ -1929,7 +1944,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
diff --git a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserObjPos.opi b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserObjPos.opi
index 1ba5898fc7d7f8bddb6f06e28df751359e40114b..b7ffc4d1e0e589030d051fb528a046713d02049b 100644
--- a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserObjPos.opi
+++ b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserObjPos.opi
@@ -45,7 +45,7 @@
     <enabled>true</enabled>
     <fc>false</fc>
     <font>
-      <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+      <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
     </font>
     <foreground_color>
       <color red="192" green="192" blue="192" />
@@ -85,7 +85,7 @@
       <border_width>1</border_width>
       <enabled>true</enabled>
       <font>
-        <fontdata fontName="Titillium" height="20" style="0" pixels="false" />
+        <opifont.name fontName="Source Sans Pro" height="18" style="0" pixels="false">MEDIUM-SANS-PLAIN</opifont.name>
       </font>
       <foreground_color>
         <color name="IO Label" red="0" green="0" blue="0" />
@@ -126,7 +126,7 @@
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -166,7 +166,7 @@
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
@@ -859,7 +859,7 @@ $(pv_value)</tooltip>
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -899,7 +899,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
@@ -1236,13 +1236,13 @@ $(pv_value)</tooltip>
         <border_width>0</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>32</height>
+        <height>23</height>
         <items_from_pv>true</items_from_pv>
         <name>Combo</name>
         <pv_name>$(secsub):$(disdevid):$(ORIENT)CAM-SCALEDIM</pv_name>
diff --git a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserOverview.opi b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserOverview.opi
index 5555c29d9b46d6006c915b1c45bc7e587340dcc1..273cff5c905e835b7a6921083da76e5a99885206 100644
--- a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserOverview.opi
+++ b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserOverview.opi
@@ -127,7 +127,7 @@
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
@@ -860,7 +860,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
@@ -1429,7 +1429,7 @@ $(trace_0_y_pv_value)</tooltip>
       <border_width>1</border_width>
       <enabled>true</enabled>
       <font>
-        <fontdata fontName="Titillium" height="20" style="0" pixels="false" />
+        <opifont.name fontName="Source Sans Pro" height="18" style="0" pixels="false">MEDIUM-SANS-PLAIN</opifont.name>
       </font>
       <foreground_color>
         <color name="IO Label" red="0" green="0" blue="0" />
@@ -1510,7 +1510,7 @@ $(trace_0_y_pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
@@ -2096,7 +2096,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
@@ -2379,7 +2379,7 @@ $(pv_value)</tooltip>
         <name>Text Update Template_36</name>
         <precision>4</precision>
         <precision_from_pv>false</precision_from_pv>
-        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAMFITS-PeakAmplitude_RBV</pv_name>
+        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAMFITS-PeakAmplitudeActual</pv_name>
         <pv_value />
         <rotation_angle>0.0</rotation_angle>
         <rules />
@@ -2472,7 +2472,7 @@ $(pv_value)</tooltip>
         <name>Text Update Template_35</name>
         <precision>4</precision>
         <precision_from_pv>false</precision_from_pv>
-        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAMFITS-Background_RBV</pv_name>
+        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAMFITS-BackgroundActual</pv_name>
         <pv_value />
         <rotation_angle>0.0</rotation_angle>
         <rules />
@@ -2565,7 +2565,7 @@ $(pv_value)</tooltip>
         <name>Text Update Template_36</name>
         <precision>4</precision>
         <precision_from_pv>false</precision_from_pv>
-        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAMFITS-PeakMu_RBV</pv_name>
+        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAMFITS-PeakMuActual</pv_name>
         <pv_value />
         <rotation_angle>0.0</rotation_angle>
         <rules />
@@ -2658,7 +2658,7 @@ $(pv_value)</tooltip>
         <name>Text Update Template_36</name>
         <precision>4</precision>
         <precision_from_pv>false</precision_from_pv>
-        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAMFITS-PeakSigma_RBV</pv_name>
+        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAMFITS-PeakSigmaActual</pv_name>
         <pv_value />
         <rotation_angle>0.0</rotation_angle>
         <rules />
@@ -2695,7 +2695,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
@@ -3015,7 +3015,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
@@ -3761,7 +3761,7 @@ $(trace_0_y_pv_value)</tooltip>
       <border_width>1</border_width>
       <enabled>true</enabled>
       <font>
-        <fontdata fontName="Titillium" height="20" style="0" pixels="false" />
+        <opifont.name fontName="Source Sans Pro" height="18" style="0" pixels="false">MEDIUM-SANS-PLAIN</opifont.name>
       </font>
       <foreground_color>
         <color name="IO Label" red="0" green="0" blue="0" />
@@ -3842,7 +3842,7 @@ $(trace_0_y_pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
@@ -4428,7 +4428,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
@@ -5161,7 +5161,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
@@ -5429,7 +5429,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
@@ -5712,7 +5712,7 @@ $(pv_value)</tooltip>
         <name>Text Update Template_36</name>
         <precision>4</precision>
         <precision_from_pv>false</precision_from_pv>
-        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAMFITS-PeakAmplitude_RBV</pv_name>
+        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAMFITS-PeakAmplitudeActual</pv_name>
         <pv_value />
         <rotation_angle>0.0</rotation_angle>
         <rules />
@@ -5805,7 +5805,7 @@ $(pv_value)</tooltip>
         <name>Text Update Template_35</name>
         <precision>4</precision>
         <precision_from_pv>false</precision_from_pv>
-        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAMFITS-Background_RBV</pv_name>
+        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAMFITS-BackgroundActual</pv_name>
         <pv_value />
         <rotation_angle>0.0</rotation_angle>
         <rules />
@@ -5898,7 +5898,7 @@ $(pv_value)</tooltip>
         <name>Text Update Template_36</name>
         <precision>4</precision>
         <precision_from_pv>false</precision_from_pv>
-        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAMFITS-PeakMu_RBV</pv_name>
+        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAMFITS-PeakMuActual</pv_name>
         <pv_value />
         <rotation_angle>0.0</rotation_angle>
         <rules />
@@ -5991,7 +5991,7 @@ $(pv_value)</tooltip>
         <name>Text Update Template_36</name>
         <precision>4</precision>
         <precision_from_pv>false</precision_from_pv>
-        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAMFITS-PeakSigma_RBV</pv_name>
+        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAMFITS-PeakSigmaActual</pv_name>
         <pv_value />
         <rotation_angle>0.0</rotation_angle>
         <rules />
@@ -6028,7 +6028,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
@@ -6348,7 +6348,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
diff --git a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserPreProcessing.opi b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserPreProcessing.opi
index f637ace22dacdbb5e17f29c993f5ebd52a81d2ed..dce16a40268402ac25fcaae2e60f9962d06db553 100644
--- a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserPreProcessing.opi
+++ b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserPreProcessing.opi
@@ -45,7 +45,7 @@
     <enabled>true</enabled>
     <fc>false</fc>
     <font>
-      <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+      <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
     </font>
     <foreground_color>
       <color red="192" green="192" blue="192" />
@@ -85,7 +85,7 @@
       <border_width>1</border_width>
       <enabled>true</enabled>
       <font>
-        <fontdata fontName="Titillium" height="20" style="0" pixels="false" />
+        <opifont.name fontName="Source Sans Pro" height="18" style="0" pixels="false">MEDIUM-SANS-PLAIN</opifont.name>
       </font>
       <foreground_color>
         <color name="IO Label" red="0" green="0" blue="0" />
@@ -126,7 +126,7 @@
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -166,7 +166,7 @@
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
@@ -397,13 +397,13 @@ $(pv_value)</tooltip>
         <border_width>0</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>32</height>
+        <height>23</height>
         <items_from_pv>true</items_from_pv>
         <name>Combo</name>
         <pv_name>$(secsub):$(disdevid):$(ORIENT)CAMPROC-EnableBackground</pv_name>
@@ -490,7 +490,7 @@ $(pv_value)</tooltip>
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -530,7 +530,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
diff --git a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserRollingBuffers.opi b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserRollingBuffers.opi
index 39fc7920d5f5628dd91dc6374dea63e17ff8fecb..eddd36cdb529e043c7306d12955764d1e1d252bb 100644
--- a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserRollingBuffers.opi
+++ b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserRollingBuffers.opi
@@ -10,7 +10,7 @@
   <background_color>
     <color red="220" green="220" blue="220" />
   </background_color>
-  <boy_version>5.1.0.201701251229</boy_version>
+  <boy_version>5.1.0</boy_version>
   <foreground_color>
     <color red="192" green="192" blue="192" />
   </foreground_color>
@@ -78,7 +78,7 @@
     </tab_1_background_color>
     <tab_1_enabled>true</tab_1_enabled>
     <tab_1_font>
-      <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+      <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
     </tab_1_font>
     <tab_1_foreground_color>
       <color red="0" green="0" blue="0" />
@@ -90,7 +90,7 @@
     </tab_2_background_color>
     <tab_2_enabled>true</tab_2_enabled>
     <tab_2_font>
-      <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+      <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
     </tab_2_font>
     <tab_2_foreground_color>
       <color red="0" green="0" blue="0" />
@@ -118,7 +118,7 @@
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -158,7 +158,7 @@
         <enabled>true</enabled>
         <fc>false</fc>
         <font>
-          <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="192" green="192" blue="192" />
@@ -198,7 +198,7 @@
           <border_width>1</border_width>
           <enabled>true</enabled>
           <font>
-            <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+            <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
           </font>
           <foreground_color>
             <color red="0" green="0" blue="0" />
@@ -230,10 +230,10 @@
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -323,10 +323,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -416,10 +416,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -509,10 +509,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -550,10 +550,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -906,7 +906,7 @@ $(trace_0_y_pv_value)</tooltip>
         <enabled>true</enabled>
         <fc>false</fc>
         <font>
-          <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="192" green="192" blue="192" />
@@ -946,7 +946,7 @@ $(trace_0_y_pv_value)</tooltip>
           <border_width>1</border_width>
           <enabled>true</enabled>
           <font>
-            <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+            <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
           </font>
           <foreground_color>
             <color red="0" green="0" blue="0" />
@@ -978,10 +978,10 @@ $(trace_0_y_pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -1071,10 +1071,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -1164,10 +1164,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -1257,10 +1257,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -1298,10 +1298,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -1464,7 +1464,7 @@ $(pv_value)</tooltip>
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -1504,7 +1504,7 @@ $(pv_value)</tooltip>
         <enabled>true</enabled>
         <fc>false</fc>
         <font>
-          <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="192" green="192" blue="192" />
@@ -1576,10 +1576,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -1669,10 +1669,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -1762,10 +1762,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -1855,10 +1855,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -1896,10 +1896,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -2252,7 +2252,7 @@ $(trace_0_y_pv_value)</tooltip>
         <enabled>true</enabled>
         <fc>false</fc>
         <font>
-          <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="192" green="192" blue="192" />
@@ -2324,10 +2324,10 @@ $(trace_0_y_pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -2417,10 +2417,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -2510,10 +2510,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -2603,10 +2603,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -2644,10 +2644,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -2810,7 +2810,7 @@ $(pv_value)</tooltip>
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -2850,7 +2850,7 @@ $(pv_value)</tooltip>
         <enabled>true</enabled>
         <fc>false</fc>
         <font>
-          <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="192" green="192" blue="192" />
@@ -2922,10 +2922,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -3015,10 +3015,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -3108,10 +3108,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -3201,10 +3201,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -3242,10 +3242,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -3598,7 +3598,7 @@ $(trace_0_y_pv_value)</tooltip>
         <enabled>true</enabled>
         <fc>false</fc>
         <font>
-          <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="192" green="192" blue="192" />
@@ -3670,10 +3670,10 @@ $(trace_0_y_pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -3763,10 +3763,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -3856,10 +3856,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -3949,10 +3949,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -3990,10 +3990,10 @@ $(pv_value)</tooltip>
           <actions hook="false" hook_all="false" />
           <auto_size>false</auto_size>
           <background_color>
-            <color name="IO Background" red="255" green="255" blue="205" />
+            <color name="IO Background" red="235" green="235" blue="235" />
           </background_color>
           <border_color>
-            <color name="IO Border" red="215" green="215" blue="215" />
+            <color name="IO Border" red="0" green="0" blue="0" />
           </border_color>
           <border_style>0</border_style>
           <border_width>2</border_width>
@@ -4157,7 +4157,7 @@ $(pv_value)</tooltip>
     <border_width>1</border_width>
     <enabled>true</enabled>
     <font>
-      <fontdata fontName="Titillium" height="20" style="0" pixels="false" />
+      <opifont.name fontName="Source Sans Pro" height="18" style="0" pixels="false">MEDIUM-SANS-PLAIN</opifont.name>
     </font>
     <foreground_color>
       <color name="IO Label" red="0" green="0" blue="0" />
diff --git a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserStats.opi b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserStats.opi
index f325c1fc23fcf4eddc491654841a001ef8c89d6e..7e9d35c4a5e1319c018d9d7ac6aad6ff6c0ad0ac 100644
--- a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserStats.opi
+++ b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserStats.opi
@@ -10,7 +10,7 @@
   <background_color>
     <color red="220" green="220" blue="220" />
   </background_color>
-  <boy_version>5.1.0.201701251229</boy_version>
+  <boy_version>5.1.0</boy_version>
   <foreground_color>
     <color red="192" green="192" blue="192" />
   </foreground_color>
@@ -45,7 +45,7 @@
     <enabled>true</enabled>
     <fc>false</fc>
     <font>
-      <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+      <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
     </font>
     <foreground_color>
       <color red="192" green="192" blue="192" />
@@ -85,7 +85,7 @@
       <border_width>1</border_width>
       <enabled>true</enabled>
       <font>
-        <fontdata fontName="Titillium" height="20" style="0" pixels="false" />
+        <opifont.name fontName="Source Sans Pro" height="18" style="0" pixels="false">MEDIUM-SANS-PLAIN</opifont.name>
       </font>
       <foreground_color>
         <color name="IO Label" red="0" green="0" blue="0" />
@@ -126,7 +126,7 @@
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Sans" height="10" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -166,7 +166,7 @@
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Titillium" height="16" style="0" pixels="false" />
+          <opifont.name fontName="Source Sans Pro" height="16" style="0" pixels="false">NORMAL-SANS-PLAIN</opifont.name>
         </font>
         <foreground_color>
           <color name="IO Label" red="0" green="0" blue="0" />
@@ -198,10 +198,10 @@
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -400,10 +400,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -493,10 +493,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -586,10 +586,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -679,10 +679,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -772,10 +772,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -969,10 +969,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>
@@ -1062,10 +1062,10 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
         <border_style>0</border_style>
         <border_width>2</border_width>