From 96efaee9601337cb96a43c23f8597dadcf2ace23 Mon Sep 17 00:00:00 2001
From: Saeed Haghtalab <saeed.haghtalab@esss.se>
Date: Tue, 20 Nov 2018 09:20:56 +0100
Subject: [PATCH] Update NPM OPI

---
 NON-APPROVED/lebt-010-pbi-npm/npm.opi         |   8 +-
 .../lebt-010-pbi-npm/user/npmPipeline.opi     | 274 +++++++++---------
 .../lebt-010-pbi-npm/user/npmUserCamera.opi   |  32 +-
 .../lebt-010-pbi-npm/user/npmUserGaussFit.opi | 108 +++----
 .../user/npmUserLensMotor.opi                 | 131 +++++----
 .../lebt-010-pbi-npm/user/npmUserObjPos.opi   |  16 +-
 .../lebt-010-pbi-npm/user/npmUserOverview.opi |  44 +--
 .../user/npmUserPreProcessing.opi             |  16 +-
 .../user/npmUserRollingBuffers.opi            | 150 +++++-----
 .../lebt-010-pbi-npm/user/npmUserStats.opi    |  42 +--
 10 files changed, 418 insertions(+), 403 deletions(-)

diff --git a/NON-APPROVED/lebt-010-pbi-npm/npm.opi b/NON-APPROVED/lebt-010-pbi-npm/npm.opi
index 8789af7..0f0af4c 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 d419fcb..d95331b 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 8f8978a..2ef9166 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 af2037d..5cdc024 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 71f2115..2b94403 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 1ba5898..b7ffc4d 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 5555c29..273cff5 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 f637ace..dce16a4 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 39fc792..eddd36c 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 f325c1f..7e9d35c 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>
-- 
GitLab