diff --git a/NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Area.bob b/NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Area.bob
deleted file mode 100644
index 1d47b83561452e7b9b685c6ce774b4488921c73e..0000000000000000000000000000000000000000
--- a/NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Area.bob
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<display version="2.0.0">
-  <name>ODH Area</name>
-  <width>300</width>
-  <height>210</height>
-  <widget type="group" version="2.0.0">
-    <name>Area Panel</name>
-    <x>10</x>
-    <y>10</y>
-    <width>280</width>
-    <height>190</height>
-    <style>3</style>
-    <background_color>
-      <color name="BACKGROUND" red="220" green="225" blue="221">
-      </color>
-    </background_color>
-    <widget type="rectangle" version="2.0.0">
-      <name>BGGrey03-titlebar_1</name>
-      <width>280</width>
-      <height>190</height>
-      <line_width>0</line_width>
-      <background_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="group" version="2.0.0">
-      <name>Area</name>
-      <x>10</x>
-      <y>50</y>
-      <width>260</width>
-      <height>130</height>
-      <style>3</style>
-      <transparent>true</transparent>
-      <widget type="rectangle" version="2.0.0">
-        <name>BGGrey03-background_1</name>
-        <width>260</width>
-        <height>130</height>
-        <line_width>0</line_width>
-        <background_color>
-          <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-          </color>
-        </background_color>
-        <corner_width>5</corner_width>
-        <corner_height>5</corner_height>
-      </widget>
-      <widget type="group" version="2.0.0">
-        <name>Signals</name>
-        <x>10</x>
-        <y>10</y>
-        <width>240</width>
-        <height>110</height>
-        <style>3</style>
-        <widget type="led" version="2.0.0">
-          <name>LED_LA</name>
-          <pv_name>$(P):Alarm</pv_name>
-          <x>20</x>
-          <y>20</y>
-          <off_color>
-            <color name="GRAY" red="169" green="169" blue="169">
-            </color>
-          </off_color>
-          <on_color>
-            <color name="LED-RED-ON" red="255" green="60" blue="46">
-            </color>
-          </on_color>
-        </widget>
-        <widget type="led" version="2.0.0">
-          <name>LED_LB</name>
-          <pv_name>$(P):WarmUp</pv_name>
-          <x>20</x>
-          <y>47</y>
-          <off_color>
-            <color name="LED-RED-ON" red="255" green="60" blue="46">
-            </color>
-          </off_color>
-          <on_color>
-            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
-            </color>
-          </on_color>
-        </widget>
-        <widget type="led" version="2.0.0">
-          <name>LED_OK</name>
-          <pv_name>$(P):ConnLost</pv_name>
-          <x>20</x>
-          <y>74</y>
-          <off_color>
-            <color name="GRAY" red="169" green="169" blue="169">
-            </color>
-          </off_color>
-          <on_color>
-            <color name="LED-RED-ON" red="255" green="60" blue="46">
-            </color>
-          </on_color>
-        </widget>
-        <widget type="label" version="2.0.0">
-          <name>LB_LA</name>
-          <text>Alarms On</text>
-          <x>71</x>
-          <y>20</y>
-          <vertical_alignment>1</vertical_alignment>
-        </widget>
-        <widget type="label" version="2.0.0">
-          <name>LB_LB</name>
-          <text>Warmed Up</text>
-          <x>71</x>
-          <y>47</y>
-          <vertical_alignment>1</vertical_alignment>
-        </widget>
-        <widget type="label" version="2.0.0">
-          <name>LB_OK</name>
-          <text>Lost Communication</text>
-          <x>71</x>
-          <y>74</y>
-          <width>140</width>
-          <height>21</height>
-          <vertical_alignment>1</vertical_alignment>
-          <auto_size>true</auto_size>
-        </widget>
-      </widget>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>BGGrey03-title</name>
-      <text>$(LOC)</text>
-      <width>280</width>
-      <height>50</height>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="20.0">
-        </font>
-      </font>
-      <foreground_color>
-        <color name="TEXT-LIGHT" red="230" green="230" blue="230">
-        </color>
-      </foreground_color>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-  </widget>
-</display>
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/e3-ODH.info b/NON-APPROVED/kg-gt_odh-plc-01/e3-ODH.info
deleted file mode 100644
index 4c16d644ea1495e15c5af10282039182b10108ad..0000000000000000000000000000000000000000
--- a/NON-APPROVED/kg-gt_odh-plc-01/e3-ODH.info
+++ /dev/null
@@ -1,7 +0,0 @@
-
-* Thursday, November  1 10:00:56 CET 2018
-* Jeong Han Lee
-* from e3-ODH/opi folder
-  at 3baab8d2d7ff567dc6b27dd1b3c05587aa5b72e9
-  https://github.com/icshwi/e3-ODH/tree/master/opi
-  
diff --git a/NON-APPROVED/lebt-010-pbi-npm/singlemotion_npm.opi b/NON-APPROVED/lebt-010-pbi-npm/singlemotion_npm.opi
deleted file mode 100644
index d91298b3cae6a85e9b08026f45c9d3bcf19e13ff..0000000000000000000000000000000000000000
--- a/NON-APPROVED/lebt-010-pbi-npm/singlemotion_npm.opi
+++ /dev/null
@@ -1,556 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<display typeId="org.csstudio.opibuilder.Display" version="1.0.0">
-  <show_close_button>true</show_close_button>
-  <rules />
-  <wuid>-14a921ec:134b2495e46:-7f53</wuid>
-  <show_grid>true</show_grid>
-  <auto_zoom_to_fit_all>false</auto_zoom_to_fit_all>
-  <scripts />
-  <height>600</height>
-  <macros>
-    <include_parent_macros>false</include_parent_macros>
-  </macros>
-  <boy_version>4.0.103.201506251634</boy_version>
-  <show_edit_range>true</show_edit_range>
-  <widget_type>Display</widget_type>
-  <auto_scale_widgets>
-    <auto_scale_widgets>false</auto_scale_widgets>
-    <min_width>-1</min_width>
-    <min_height>-1</min_height>
-  </auto_scale_widgets>
-  <background_color>
-    <color name="IO Grid" red="215" green="215" blue="215" />
-  </background_color>
-  <width>800</width>
-  <x>0</x>
-  <name></name>
-  <grid_space>5</grid_space>
-  <show_ruler>true</show_ruler>
-  <y>0</y>
-  <snap_to_geometry>true</snap_to_geometry>
-  <foreground_color>
-    <color name="IO Shape Fill" red="188" green="188" blue="188" />
-  </foreground_color>
-  <actions hook="false" hook_all="false" />
-  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-    <border_style>0</border_style>
-    <tooltip></tooltip>
-    <horizontal_alignment>1</horizontal_alignment>
-    <rules />
-    <enabled>true</enabled>
-    <wuid>1d8e4c26:13f0d8f9d78:-7cd7</wuid>
-    <transparent>false</transparent>
-    <auto_size>false</auto_size>
-    <text></text>
-    <scripts />
-    <height>50</height>
-    <border_width>2</border_width>
-    <scale_options>
-      <width_scalable>true</width_scalable>
-      <height_scalable>true</height_scalable>
-      <keep_wh_ratio>false</keep_wh_ratio>
-    </scale_options>
-    <visible>true</visible>
-    <vertical_alignment>1</vertical_alignment>
-    <border_color>
-      <color red="10" green="37" blue="73" />
-    </border_color>
-    <widget_type>Label</widget_type>
-    <wrap_words>true</wrap_words>
-    <background_color>
-      <color name="IO OutputPV Bg" red="121" green="123" blue="126" />
-    </background_color>
-    <width>802</width>
-    <x>0</x>
-    <name>Label_94</name>
-    <y>0</y>
-    <foreground_color>
-      <color name="IO InputPV Bg" red="255" green="255" blue="255" />
-    </foreground_color>
-    <actions hook="false" hook_all="false" />
-    <show_scrollbar>false</show_scrollbar>
-    <font>
-      <fontdata fontName="Arial" height="20" style="0" />
-    </font>
-  </widget>
-  <widget typeId="org.csstudio.opibuilder.widgets.linkingContainer" version="1.0.0">
-    <opi_file>/opt/epics/modules/singlemotion/1.4.4/opi/singlemotion-support/singlemotion-main.opi</opi_file>
-    <border_style>0</border_style>
-    <tooltip></tooltip>
-    <rules>
-      <rule name="ClearOPIRule" prop_id="opi_file" out_exp="false">
-        <exp bool_exp="true">
-          <value></value>
-        </exp>
-        <exp bool_exp="false">
-          <value></value>
-        </exp>
-        <pv trig="true">loc://$(DID)singlemotionMotorName</pv>
-        <pv trig="true">loc://$(DID)singlemotionPrefix</pv>
-      </rule>
-      <rule name="SetOPIRule" prop_id="opi_file" out_exp="false">
-        <exp bool_exp="true">
-          <value>/opt/epics/modules/singlemotion/1.4.4/opi/singlemotion-support/singlemotion-main.opi</value>
-        </exp>
-        <pv trig="true">loc://$(DID)singlemotionMotorName</pv>
-        <pv trig="true">loc://$(DID)singlemotionPrefix</pv>
-      </rule>
-    </rules>
-    <enabled>true</enabled>
-    <wuid>1d8e4c26:13f0d8f9d78:-7d9b</wuid>
-    <scripts>
-      <path pathString="/opt/epics/modules/singlemotion/1.4.4/opi/singlemotion-support/scripts/PV2Macro.js" checkConnect="true" sfe="false" seoe="false">
-        <pv trig="true">loc://$(DID)singlemotionPrefix</pv>
-        <pv trig="true">loc://$(DID)singlemotionMotorName</pv>
-      </path>
-    </scripts>
-    <height>751</height>
-    <border_width>2</border_width>
-    <scale_options>
-      <width_scalable>true</width_scalable>
-      <height_scalable>true</height_scalable>
-      <keep_wh_ratio>false</keep_wh_ratio>
-    </scale_options>
-    <macros>
-      <include_parent_macros>true</include_parent_macros>
-    </macros>
-    <resize_behaviour>1</resize_behaviour>
-    <visible>true</visible>
-    <group_name></group_name>
-    <border_color>
-      <color name="IO Border" red="215" green="215" blue="215" />
-    </border_color>
-    <widget_type>Linking Container</widget_type>
-    <background_color>
-      <color red="215" green="215" blue="215" />
-    </background_color>
-    <width>802</width>
-    <x>0</x>
-    <name>Linking Container Template</name>
-    <y>55</y>
-    <foreground_color>
-      <color name="IO Foreground" red="0" green="0" blue="0" />
-    </foreground_color>
-    <actions hook="false" hook_all="false" />
-    <font>
-      <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
-    </font>
-  </widget>
-  <widget typeId="org.csstudio.opibuilder.widgets.combo" version="1.0.0">
-    <border_style>6</border_style>
-    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-    <alarm_pulsing>false</alarm_pulsing>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-    <rules />
-    <enabled>true</enabled>
-    <wuid>6da11315:1426181286f:-7a2c</wuid>
-    <pv_value />
-    <scripts />
-    <border_alarm_sensitive>true</border_alarm_sensitive>
-    <height>27</height>
-    <border_width>1</border_width>
-    <scale_options>
-      <width_scalable>true</width_scalable>
-      <height_scalable>false</height_scalable>
-      <keep_wh_ratio>false</keep_wh_ratio>
-    </scale_options>
-    <items_from_pv>false</items_from_pv>
-    <visible>true</visible>
-    <pv_name>loc://$(DID)singlemotionMotorName("HMTR")</pv_name>
-    <border_color>
-      <color name="IO Border" red="215" green="215" blue="215" />
-    </border_color>
-    <widget_type>Combo Box</widget_type>
-    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-    <background_color>
-      <color name="IO OutputPV Bg" red="121" green="123" blue="126" />
-    </background_color>
-    <width>120</width>
-    <x>535</x>
-    <name>Device prefix combo</name>
-    <y>12</y>
-    <foreground_color>
-      <color name="IO OutputPV Fg" red="255" green="255" blue="255" />
-    </foreground_color>
-    <actions hook="false" hook_all="false" />
-    <items>
-      <s>HMTR</s>
-      <s>VMTR</s>
-      <s>HOBJMTR</s>
-      <s>VOBJMTR</s>
-    </items>
-    <font>
-      <opifont.name fontName="arial" height="10" style="1">IO Input 1</opifont.name>
-    </font>
-  </widget>
-  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-    <border_style>0</border_style>
-    <tooltip></tooltip>
-    <horizontal_alignment>0</horizontal_alignment>
-    <rules />
-    <enabled>true</enabled>
-    <wuid>6da11315:1426181286f:-7a2b</wuid>
-    <transparent>true</transparent>
-    <auto_size>false</auto_size>
-    <text>Motor</text>
-    <scripts />
-    <height>30</height>
-    <border_width>1</border_width>
-    <scale_options>
-      <width_scalable>true</width_scalable>
-      <height_scalable>true</height_scalable>
-      <keep_wh_ratio>false</keep_wh_ratio>
-    </scale_options>
-    <visible>true</visible>
-    <vertical_alignment>1</vertical_alignment>
-    <border_color>
-      <color red="0" green="128" blue="255" />
-    </border_color>
-    <widget_type>Label</widget_type>
-    <wrap_words>true</wrap_words>
-    <background_color>
-      <color red="255" green="255" blue="255" />
-    </background_color>
-    <width>95</width>
-    <x>441</x>
-    <name>Label_85</name>
-    <y>10</y>
-    <foreground_color>
-      <color name="IO InputPV Bg" red="255" green="255" blue="255" />
-    </foreground_color>
-    <actions hook="false" hook_all="false" />
-    <show_scrollbar>true</show_scrollbar>
-    <font>
-      <opifont.name fontName="Sans" height="18" style="1">Header 1</opifont.name>
-    </font>
-  </widget>
-  <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
-    <alarm_pulsing>false</alarm_pulsing>
-    <precision>0</precision>
-    <tooltip>$(pv_name)</tooltip>
-    <horizontal_alignment>1</horizontal_alignment>
-    <rules />
-    <pv_value />
-    <auto_size>false</auto_size>
-    <text>Motor name</text>
-    <rotation_angle>0.0</rotation_angle>
-    <show_units>true</show_units>
-    <height>25</height>
-    <multiline_input>false</multiline_input>
-    <border_width>2</border_width>
-    <visible>true</visible>
-    <pv_name>loc://$(DID)singlemotionMotorName("HMTR")</pv_name>
-    <selector_type>0</selector_type>
-    <border_color>
-      <color name="IO Border" red="215" green="215" blue="215" />
-    </border_color>
-    <precision_from_pv>true</precision_from_pv>
-    <widget_type>Text Input</widget_type>
-    <confirm_message></confirm_message>
-    <name>Motor Name</name>
-    <style>0</style>
-    <actions hook="false" hook_all="false" />
-    <border_style>4</border_style>
-    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-    <enabled>true</enabled>
-    <wuid>6da11315:1426181286f:-7a2a</wuid>
-    <transparent>false</transparent>
-    <scripts />
-    <border_alarm_sensitive>true</border_alarm_sensitive>
-    <scale_options>
-      <width_scalable>true</width_scalable>
-      <height_scalable>true</height_scalable>
-      <keep_wh_ratio>false</keep_wh_ratio>
-    </scale_options>
-    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-    <format_type>4</format_type>
-    <limits_from_pv>false</limits_from_pv>
-    <background_color>
-      <color name="IO Grid" red="215" green="215" blue="215" />
-    </background_color>
-    <width>110</width>
-    <x>670</x>
-    <y>12</y>
-    <maximum>1.7976931348623157E308</maximum>
-    <foreground_color>
-      <color name="IO Foreground" red="0" green="0" blue="0" />
-    </foreground_color>
-    <minimum>-1.7976931348623157E308</minimum>
-    <font>
-      <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
-    </font>
-  </widget>
-  <widget typeId="org.csstudio.opibuilder.widgets.linkingContainer" version="1.0.0">
-    <opi_file>/opt/epics/modules/singlemotion/1.4.4/opi/singlemotion-support/singlemotion-homing.opi</opi_file>
-    <border_style>0</border_style>
-    <tooltip></tooltip>
-    <rules>
-      <rule name="ClearOPIRule" prop_id="opi_file" out_exp="false">
-        <exp bool_exp="true">
-          <value></value>
-        </exp>
-        <exp bool_exp="false">
-          <value></value>
-        </exp>
-        <pv trig="true">loc://$(DID)singlemotionMotorName</pv>
-        <pv trig="true">loc://$(DID)singlemotionPrefix</pv>
-      </rule>
-      <rule name="SetOPIRule" prop_id="opi_file" out_exp="false">
-        <exp bool_exp="true">
-          <value>/opt/epics/modules/singlemotion/1.4.4/opi/singlemotion-support/singlemotion-homing.opi</value>
-        </exp>
-        <pv trig="true">loc://$(DID)singlemotionMotorName</pv>
-        <pv trig="true">loc://$(DID)singlemotionPrefix</pv>
-      </rule>
-    </rules>
-    <enabled>true</enabled>
-    <wuid>-63a80081:14d67b9e9bc:-71a7</wuid>
-    <scripts>
-      <path pathString="/opt/epics/modules/singlemotion/1.4.4/opi/singlemotion-support/scripts/PV2Macro.js" checkConnect="true" sfe="false" seoe="false">
-        <pv trig="true">loc://$(DID)singlemotionPrefix</pv>
-        <pv trig="true">loc://$(DID)singlemotionMotorName</pv>
-      </path>
-    </scripts>
-    <height>101</height>
-    <border_width>0</border_width>
-    <scale_options>
-      <width_scalable>true</width_scalable>
-      <height_scalable>true</height_scalable>
-      <keep_wh_ratio>false</keep_wh_ratio>
-    </scale_options>
-    <macros>
-      <include_parent_macros>true</include_parent_macros>
-    </macros>
-    <resize_behaviour>1</resize_behaviour>
-    <visible>true</visible>
-    <group_name></group_name>
-    <border_color>
-      <color name="IO Border" red="215" green="215" blue="215" />
-    </border_color>
-    <widget_type>Linking Container</widget_type>
-    <background_color>
-      <color red="215" green="215" blue="215" />
-    </background_color>
-    <width>551</width>
-    <x>0</x>
-    <name>Linking Container Template_1</name>
-    <y>810</y>
-    <foreground_color>
-      <color name="IO Foreground" red="0" green="0" blue="0" />
-    </foreground_color>
-    <actions hook="false" hook_all="false" />
-    <font>
-      <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
-    </font>
-  </widget>
-  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-    <border_style>0</border_style>
-    <tooltip></tooltip>
-    <horizontal_alignment>0</horizontal_alignment>
-    <rules />
-    <enabled>true</enabled>
-    <wuid>3f0e4b8f:1503c5c5edb:-7b6a</wuid>
-    <transparent>true</transparent>
-    <auto_size>false</auto_size>
-    <text>Prefix</text>
-    <scripts />
-    <height>30</height>
-    <border_width>1</border_width>
-    <scale_options>
-      <width_scalable>true</width_scalable>
-      <height_scalable>true</height_scalable>
-      <keep_wh_ratio>false</keep_wh_ratio>
-    </scale_options>
-    <visible>true</visible>
-    <vertical_alignment>1</vertical_alignment>
-    <border_color>
-      <color red="0" green="128" blue="255" />
-    </border_color>
-    <widget_type>Label</widget_type>
-    <wrap_words>true</wrap_words>
-    <background_color>
-      <color red="255" green="255" blue="255" />
-    </background_color>
-    <width>100</width>
-    <x>10</x>
-    <name>Label_86</name>
-    <y>10</y>
-    <foreground_color>
-      <color name="IO InputPV Bg" red="255" green="255" blue="255" />
-    </foreground_color>
-    <actions hook="false" hook_all="false" />
-    <show_scrollbar>true</show_scrollbar>
-    <font>
-      <opifont.name fontName="Sans" height="18" style="1">Header 1</opifont.name>
-    </font>
-  </widget>
-  <widget typeId="org.csstudio.opibuilder.widgets.combo" version="1.0.0">
-    <border_style>6</border_style>
-    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-    <alarm_pulsing>false</alarm_pulsing>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-    <rules />
-    <enabled>true</enabled>
-    <wuid>3f0e4b8f:1503c5c5edb:-7b51</wuid>
-    <pv_value />
-    <scripts />
-    <border_alarm_sensitive>true</border_alarm_sensitive>
-    <height>27</height>
-    <border_width>1</border_width>
-    <scale_options>
-      <width_scalable>true</width_scalable>
-      <height_scalable>false</height_scalable>
-      <keep_wh_ratio>false</keep_wh_ratio>
-    </scale_options>
-    <items_from_pv>false</items_from_pv>
-    <visible>true</visible>
-    <pv_name>loc://$(DID)singlemotionPrefix("NPMGB")</pv_name>
-    <border_color>
-      <color name="IO Border" red="215" green="215" blue="215" />
-    </border_color>
-    <widget_type>Combo Box</widget_type>
-    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-    <background_color>
-      <color name="IO OutputPV Bg" red="121" green="123" blue="126" />
-    </background_color>
-    <width>160</width>
-    <x>100</x>
-    <name>Device prefix combo_1</name>
-    <y>12</y>
-    <foreground_color>
-      <color name="IO OutputPV Fg" red="255" green="255" blue="255" />
-    </foreground_color>
-    <actions hook="false" hook_all="false" />
-    <items>
-      <s>PMAC</s>
-      <s>ESSPMAC</s>
-      <s>FREIAPMAC</s>
-      <s>MOTIONTRAINING</s>
-      <s>NPMGB</s>
-    </items>
-    <font>
-      <opifont.name fontName="arial" height="10" style="1">IO Input 1</opifont.name>
-    </font>
-  </widget>
-  <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
-    <alarm_pulsing>false</alarm_pulsing>
-    <precision>0</precision>
-    <tooltip>$(pv_name)</tooltip>
-    <horizontal_alignment>1</horizontal_alignment>
-    <rules />
-    <pv_value />
-    <auto_size>false</auto_size>
-    <text>PREFIX</text>
-    <rotation_angle>0.0</rotation_angle>
-    <show_units>true</show_units>
-    <height>25</height>
-    <multiline_input>false</multiline_input>
-    <border_width>2</border_width>
-    <visible>true</visible>
-    <pv_name>loc://$(DID)singlemotionPrefix("NPMGB")</pv_name>
-    <selector_type>0</selector_type>
-    <border_color>
-      <color name="IO Border" red="215" green="215" blue="215" />
-    </border_color>
-    <precision_from_pv>true</precision_from_pv>
-    <widget_type>Text Input</widget_type>
-    <confirm_message></confirm_message>
-    <name>Motor Name_1</name>
-    <style>0</style>
-    <actions hook="false" hook_all="false" />
-    <border_style>4</border_style>
-    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-    <enabled>true</enabled>
-    <wuid>3f0e4b8f:1503c5c5edb:-7b50</wuid>
-    <transparent>false</transparent>
-    <scripts />
-    <border_alarm_sensitive>true</border_alarm_sensitive>
-    <scale_options>
-      <width_scalable>true</width_scalable>
-      <height_scalable>true</height_scalable>
-      <keep_wh_ratio>false</keep_wh_ratio>
-    </scale_options>
-    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-    <format_type>4</format_type>
-    <limits_from_pv>false</limits_from_pv>
-    <background_color>
-      <color name="IO Grid" red="215" green="215" blue="215" />
-    </background_color>
-    <width>150</width>
-    <x>275</x>
-    <y>13</y>
-    <maximum>1.7976931348623157E308</maximum>
-    <foreground_color>
-      <color name="IO Foreground" red="0" green="0" blue="0" />
-    </foreground_color>
-    <minimum>-1.7976931348623157E308</minimum>
-    <font>
-      <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
-    </font>
-  </widget>
-  <widget typeId="org.csstudio.opibuilder.widgets.linkingContainer" version="1.0.0">
-    <opi_file>/opt/epics/modules/singlemotion/1.4.4/opi/singlemotion-support/singlemotion-statuslinks.opi</opi_file>
-    <border_style>0</border_style>
-    <tooltip></tooltip>
-    <rules>
-      <rule name="ClearOPIRule" prop_id="opi_file" out_exp="false">
-        <exp bool_exp="true">
-          <value></value>
-        </exp>
-        <exp bool_exp="false">
-          <value></value>
-        </exp>
-        <pv trig="true">loc://$(DID)singlemotionMotorName</pv>
-        <pv trig="true">loc://$(DID)singlemotionPrefix</pv>
-      </rule>
-      <rule name="SetOPIRule" prop_id="opi_file" out_exp="false">
-        <exp bool_exp="true">
-          <value>/opt/epics/modules/singlemotion/1.4.4/opi/singlemotion-support/singlemotion-statuslinks.opi</value>
-        </exp>
-        <pv trig="true">loc://$(DID)singlemotionMotorName</pv>
-        <pv trig="true">loc://$(DID)singlemotionPrefix</pv>
-      </rule>
-    </rules>
-    <enabled>true</enabled>
-    <wuid>1a307b5a:150d6ea68c8:-5be0</wuid>
-    <scripts>
-      <path pathString="/opt/epics/modules/singlemotion/1.4.4/opi/singlemotion-support/scripts/PV2Macro.js" checkConnect="true" sfe="false" seoe="false">
-        <pv trig="true">loc://$(DID)singlemotionPrefix</pv>
-        <pv trig="true">loc://$(DID)singlemotionMotorName</pv>
-      </path>
-    </scripts>
-    <height>101</height>
-    <border_width>0</border_width>
-    <scale_options>
-      <width_scalable>true</width_scalable>
-      <height_scalable>true</height_scalable>
-      <keep_wh_ratio>false</keep_wh_ratio>
-    </scale_options>
-    <macros>
-      <include_parent_macros>true</include_parent_macros>
-    </macros>
-    <resize_behaviour>1</resize_behaviour>
-    <visible>true</visible>
-    <group_name></group_name>
-    <border_color>
-      <color name="IO Border" red="215" green="215" blue="215" />
-    </border_color>
-    <widget_type>Linking Container</widget_type>
-    <background_color>
-      <color red="215" green="215" blue="215" />
-    </background_color>
-    <width>248</width>
-    <x>554</x>
-    <name>Linking Container Template_2</name>
-    <y>810</y>
-    <foreground_color>
-      <color name="IO Foreground" red="0" green="0" blue="0" />
-    </foreground_color>
-    <actions hook="false" hook_all="false" />
-    <font>
-      <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
-    </font>
-  </widget>
-</display>
\ No newline at end of file
diff --git a/NON-APPROVED/lebt-010-pbi-npm/user/npmPipeline.opi b/NON-APPROVED/lebt-010-pbi-npm/user/npmPipeline.opi
index d95331b985b5f71807ddefb6bb274242072449d7..d419fcb40f7565ff1752d7cbd05a0b22a3445344 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+      <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+      <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="1" pixels="false">Default Bold</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1" pixels="false">Default Bold</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>39</width>
+        <width>46</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>77</width>
+        <width>92</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>25</width>
+        <width>30</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>38</width>
+        <width>47</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>77</width>
+        <width>92</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>44</width>
+        <width>52</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>25</width>
+        <width>30</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>81</width>
+        <width>97</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="1" pixels="false">Default Bold</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1" pixels="false">Default Bold</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>62</width>
+        <width>77</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>77</width>
+        <width>92</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>25</width>
+        <width>30</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>38</width>
+        <width>47</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="1" pixels="false">Default Bold</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1" pixels="false">Default Bold</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>60</width>
+        <width>74</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="1" pixels="false">Default Bold</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1" pixels="false">Default Bold</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>39</width>
+        <width>46</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>77</width>
+        <width>92</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>25</width>
+        <width>30</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>38</width>
+        <width>47</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="1" pixels="false">Default Bold</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1" pixels="false">Default Bold</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>38</width>
+        <width>45</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>77</width>
+        <width>92</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>25</width>
+        <width>30</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>38</width>
+        <width>47</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="1" pixels="false">Default Bold</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1" pixels="false">Default Bold</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>67</width>
+        <width>83</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>77</width>
+        <width>92</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>25</width>
+        <width>30</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>38</width>
+        <width>47</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="1" pixels="false">Default Bold</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1" pixels="false">Default Bold</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>46</width>
+        <width>57</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>77</width>
+        <width>92</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>25</width>
+        <width>30</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>38</width>
+        <width>47</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="1" pixels="false">Default Bold</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1" pixels="false">Default Bold</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>37</width>
+        <width>47</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>77</width>
+        <width>92</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>25</width>
+        <width>30</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>15</height>
+        <height>20</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>38</width>
+        <width>47</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" 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 2ef9166ada3cd51e361a1354e54e2aa90cc5bdd7..08500997d2b7b44c135ca4d21556917a409bf550 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+      <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
     </font>
     <foreground_color>
       <color red="192" green="192" blue="192" />
@@ -126,7 +126,7 @@
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -751,13 +751,13 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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>25</height>
+        <height>34</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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>25</height>
+        <height>34</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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>25</height>
+        <height>34</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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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>25</height>
+        <height>34</height>
         <items_from_pv>true</items_from_pv>
         <name>Combo</name>
         <pv_name>$(secsub):$(disdevid):$(ORIENT)CAM-TriggerMode</pv_name>
@@ -1576,41 +1576,27 @@ $(pv_value)</tooltip>
         <x>258</x>
         <y>182</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>0</value>
-            <timeout>10</timeout>
-            <confirm_message></confirm_message>
-            <description></description>
-          </action>
-        </actions>
-        <alarm_pulsing>false</alarm_pulsing>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <actions hook="false" hook_all="false" />
+        <auto_size>false</auto_size>
         <background_color>
-          <color red="200" green="200" blue="200" />
+          <color name="IO Background" red="235" green="235" blue="235" />
         </background_color>
-        <border_alarm_sensitive>true</border_alarm_sensitive>
         <border_color>
-          <color red="150" green="150" blue="150" />
+          <color name="IO Border" red="0" green="0" blue="0" />
         </border_color>
-        <border_style>14</border_style>
-        <border_width>0</border_width>
-        <enabled>true</enabled>
+        <border_style>0</border_style>
+        <border_width>2</border_width>
+        <enabled>false</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" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
-        <height>27</height>
-        <image></image>
-        <name>Action Button Template_3</name>
-        <push_action_index>0</push_action_index>
-        <pv_name>$(secsub):$(disdevid):ec0-s3-EL2819-BO3</pv_name>
-        <pv_value />
+        <height>24</height>
+        <horizontal_alignment>0</horizontal_alignment>
+        <name>Label Template_29</name>
         <rules />
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -1618,112 +1604,138 @@ $(pv_value)</tooltip>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <scripts />
-        <style>0</style>
-        <text>ON</text>
-        <toggle_button>false</toggle_button>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+        <show_scrollbar>false</show_scrollbar>
+        <text>Power</text>
+        <tooltip></tooltip>
+        <transparent>true</transparent>
+        <vertical_alignment>1</vertical_alignment>
         <visible>true</visible>
-        <widget_type>Action Button</widget_type>
-        <width>90</width>
-        <wuid>703fdb41:164d317de67:-7e9a</wuid>
-        <x>150</x>
-        <y>30</y>
+        <widget_type>Label</widget_type>
+        <width>132</width>
+        <wrap_words>true</wrap_words>
+        <wuid>703fdb41:164d317de67:-7e92</wuid>
+        <x>6</x>
+        <y>31</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>
+      <widget typeId="org.csstudio.opibuilder.widgets.LED" 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 red="200" green="200" blue="200" />
+          <color red="240" green="240" blue="240" />
         </background_color>
+        <bit>-1</bit>
         <border_alarm_sensitive>true</border_alarm_sensitive>
         <border_color>
-          <color red="150" green="150" blue="150" />
+          <color red="0" green="128" blue="255" />
         </border_color>
-        <border_style>14</border_style>
-        <border_width>0</border_width>
+        <border_style>0</border_style>
+        <border_width>1</border_width>
+        <bulb_border>3</bulb_border>
+        <bulb_border_color>
+          <color red="150" green="150" blue="150" />
+        </bulb_border_color>
+        <data_type>0</data_type>
+        <effect_3d>true</effect_3d>
         <enabled>true</enabled>
         <font>
-          <fontdata fontName="Open Sans" height="12" style="0" pixels="false" />
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color red="192" green="192" blue="192" />
         </foreground_color>
         <height>27</height>
-        <image></image>
-        <name>Action Button Template_4</name>
-        <push_action_index>0</push_action_index>
-        <pv_name>$(secsub):$(disdevid):ec0-s3-EL2819-BO3</pv_name>
+        <name>LED</name>
+        <off_color>
+          <color red="0" green="255" blue="0" />
+        </off_color>
+        <off_label>OFF</off_label>
+        <on_color>
+          <color red="0" green="100" blue="0" />
+        </on_color>
+        <on_label>ON</on_label>
+        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAM-PwrRB</pv_name>
         <pv_value />
         <rules />
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
+          <keep_wh_ratio>true</keep_wh_ratio>
         </scale_options>
         <scripts />
-        <style>0</style>
-        <text>OFF</text>
-        <toggle_button>false</toggle_button>
+        <show_boolean_label>false</show_boolean_label>
+        <square_led>false</square_led>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
         <visible>true</visible>
-        <widget_type>Action Button</widget_type>
-        <width>90</width>
-        <wuid>703fdb41:164d317de67:-7e96</wuid>
-        <x>258</x>
+        <widget_type>LED</widget_type>
+        <width>27</width>
+        <wuid>11f6f584:1672ccdf274:-71ff</wuid>
+        <x>240</x>
         <y>30</y>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.BoolButton" version="1.0.0">
         <actions hook="false" hook_all="false" />
-        <auto_size>false</auto_size>
+        <alarm_pulsing>false</alarm_pulsing>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <background_color>
-          <color name="IO Background" red="235" green="235" blue="235" />
+          <color red="200" green="200" blue="200" />
         </background_color>
+        <bit>-1</bit>
+        <border_alarm_sensitive>true</border_alarm_sensitive>
         <border_color>
-          <color name="IO Border" red="0" green="0" blue="0" />
+          <color red="0" green="128" blue="255" />
         </border_color>
         <border_style>0</border_style>
-        <border_width>2</border_width>
-        <enabled>false</enabled>
+        <border_width>1</border_width>
+        <confirm_message>Are you sure you want to do this?</confirm_message>
+        <data_type>0</data_type>
+        <effect_3d>true</effect_3d>
+        <enabled>true</enabled>
         <font>
-          <fontdata fontName="Open Sans" height="12" style="0" pixels="false" />
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color red="0" green="0" blue="0" />
         </foreground_color>
-        <height>24</height>
-        <horizontal_alignment>0</horizontal_alignment>
-        <name>Label Template_29</name>
+        <height>27</height>
+        <labels_from_pv>false</labels_from_pv>
+        <name>Boolean Button</name>
+        <off_color>
+          <color red="0" green="100" blue="0" />
+        </off_color>
+        <off_label>ON</off_label>
+        <on_color>
+          <color red="0" green="255" blue="0" />
+        </on_color>
+        <on_label>OFF</on_label>
+        <password></password>
+        <push_action_index>0</push_action_index>
+        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAM-Pwr</pv_name>
+        <pv_value />
+        <released_action_index>0</released_action_index>
         <rules />
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
+          <keep_wh_ratio>true</keep_wh_ratio>
         </scale_options>
         <scripts />
-        <show_scrollbar>false</show_scrollbar>
-        <text>Power</text>
-        <tooltip></tooltip>
-        <transparent>true</transparent>
-        <vertical_alignment>1</vertical_alignment>
+        <show_boolean_label>true</show_boolean_label>
+        <show_confirm_dialog>0</show_confirm_dialog>
+        <show_led>false</show_led>
+        <square_button>true</square_button>
+        <toggle_button>true</toggle_button>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
         <visible>true</visible>
-        <widget_type>Label</widget_type>
-        <width>132</width>
-        <wrap_words>true</wrap_words>
-        <wuid>703fdb41:164d317de67:-7e92</wuid>
-        <x>6</x>
-        <y>31</y>
+        <widget_type>Boolean Button</widget_type>
+        <width>90</width>
+        <wuid>7989e406:16756edfe90:-751f</wuid>
+        <x>150</x>
+        <y>30</y>
       </widget>
     </widget>
     <widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
@@ -1739,7 +1751,7 @@ $(pv_value)</tooltip>
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -3176,7 +3188,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/0.2.0.0/evr-pcie-300dc.opi</path>
+          <path>../ess-opi-common/modules/mrf/ess/stable/evr-pcie-300dc.opi</path>
           <macros>
             <include_parent_macros>true</include_parent_macros>
             <SYS>FEB-030Row:PBI</SYS>
@@ -3199,7 +3211,7 @@ $(pv_value)</tooltip>
       <border_width>1</border_width>
       <enabled>true</enabled>
       <font>
-        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" 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 5cdc0242ba39846689126bf4249a87c927284ffd..1a4f23b7a71b12471296c60d39a111e85c632d0a 100644
--- a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserGaussFit.opi
+++ b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserGaussFit.opi
@@ -45,7 +45,7 @@
     <enabled>true</enabled>
     <fc>false</fc>
     <font>
-      <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+      <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
     </font>
     <foreground_color>
       <color red="192" green="192" blue="192" />
@@ -126,7 +126,7 @@
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -263,7 +263,7 @@
         <name>Text Update Template_27</name>
         <precision>0</precision>
         <precision_from_pv>true</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 />
@@ -356,7 +356,7 @@ $(pv_value)</tooltip>
         <name>Text Update Template_28</name>
         <precision>0</precision>
         <precision_from_pv>true</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 />
@@ -449,7 +449,7 @@ $(pv_value)</tooltip>
         <name>Text Update Template_35</name>
         <precision>0</precision>
         <precision_from_pv>true</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 />
@@ -542,7 +542,7 @@ $(pv_value)</tooltip>
         <name>Text Update Template_36</name>
         <precision>0</precision>
         <precision_from_pv>true</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 />
@@ -899,7 +899,7 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
         </font>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <foreground_color>
@@ -1147,7 +1147,7 @@ $(pv_value)</tooltip>
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -1787,12 +1787,12 @@ $(pv_value)</tooltip>
       <enabled>true</enabled>
       <fc>false</fc>
       <font>
-        <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" style="0" pixels="false">Default</opifont.name>
       </font>
       <foreground_color>
         <color red="192" green="192" blue="192" />
       </foreground_color>
-      <height>246</height>
+      <height>250</height>
       <lock_children>false</lock_children>
       <macros>
         <include_parent_macros>true</include_parent_macros>
@@ -1810,7 +1810,7 @@ $(pv_value)</tooltip>
       <transparent>true</transparent>
       <visible>true</visible>
       <widget_type>Grouping Container</widget_type>
-      <width>522</width>
+      <width>530</width>
       <wuid>47c2b75b:15a12b1271b:-5fde</wuid>
       <x>138</x>
       <y>216</y>
@@ -2863,13 +2863,13 @@ $(pv_value)</tooltip>
         <border_width>1</border_width>
         <enabled>true</enabled>
         <font>
-          <opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" 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>25</height>
+        <height>34</height>
         <items_from_pv>true</items_from_pv>
         <name>Combo</name>
         <pv_name>$(secsub):$(disdevid):$(ORIENT)CAMFITS-ScaleDiag</pv_name>
diff --git a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserLensMotor.opi b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserLensMotor.opi
index 2b944036b811f4c1ae056637ffee9fe0198c6e74..48fd81658611894a57764588f96dedc26b03c69d 100644
--- a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserLensMotor.opi
+++ b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserLensMotor.opi
@@ -232,7 +232,7 @@
           <color red="0" green="255" blue="0" />
         </on_color>
         <on_label>AMP</on_label>
-        <pv_name>$(secsub):$(disdevid).MSTA</pv_name>
+        <pv_name>$(secsub):$(disdevid):Mtr.MSTA</pv_name>
         <pv_value />
         <rules>
           <rule name="BorderRule" prop_id="border_style" out_exp="false">
@@ -297,7 +297,7 @@ $(pv_value)</tooltip>
         <on_label>ErrRst</on_label>
         <password></password>
         <push_action_index>1</push_action_index>
-        <pv_name>$(secsub):$(disdevid)-ErrRst</pv_name>
+        <pv_name>$(secsub):$(disdevid):Mtr-ErrRst</pv_name>
         <pv_value />
         <released_action_index>0</released_action_index>
         <rules>
@@ -404,7 +404,7 @@ $(pv_value)</tooltip>
         <name>Text Input Template_30</name>
         <precision>0</precision>
         <precision_from_pv>true</precision_from_pv>
-        <pv_name>$(secsub):$(disdevid)-MsgTxt</pv_name>
+        <pv_name>$(secsub):$(disdevid):Mtr-MsgTxt</pv_name>
         <pv_value />
         <rotation_angle>0.0</rotation_angle>
         <rules>
@@ -514,7 +514,7 @@ $(pv_value)</tooltip>
         <on_label>CNEN</on_label>
         <password></password>
         <push_action_index>0</push_action_index>
-        <pv_name>$(secsub):$(disdevid).CNEN</pv_name>
+        <pv_name>$(secsub):$(disdevid):Mtr.CNEN</pv_name>
         <pv_value />
         <released_action_index>0</released_action_index>
         <rules>
@@ -824,7 +824,7 @@ $(pv_value)</tooltip>
         <name>Text Input</name>
         <precision>0</precision>
         <precision_from_pv>true</precision_from_pv>
-        <pv_name>$(secsub):$(disdevid).VAL</pv_name>
+        <pv_name>$(secsub):$(disdevid):Mtr.VAL</pv_name>
         <pv_value />
         <rotation_angle>0.0</rotation_angle>
         <rules />
@@ -876,7 +876,7 @@ $(pv_value)</tooltip>
         <name>Text Update Template_27</name>
         <precision>0</precision>
         <precision_from_pv>true</precision_from_pv>
-        <pv_name>$(secsub):$(disdevid).RBV</pv_name>
+        <pv_name>$(secsub):$(disdevid):Mtr.RBV</pv_name>
         <pv_value />
         <rotation_angle>0.0</rotation_angle>
         <rules />
@@ -933,7 +933,7 @@ $(pv_value)</tooltip>
         <name>Text Input</name>
         <precision>0</precision>
         <precision_from_pv>true</precision_from_pv>
-        <pv_name>$(secsub):$(disdevid).TWV</pv_name>
+        <pv_name>$(secsub):$(disdevid):Mtr.TWV</pv_name>
         <pv_value />
         <rotation_angle>0.0</rotation_angle>
         <rules />
@@ -990,7 +990,7 @@ $(pv_value)</tooltip>
         <image></image>
         <name>Action Button Template</name>
         <push_action_index>0</push_action_index>
-        <pv_name>$(secsub):$(disdevid).TWR</pv_name>
+        <pv_name>$(secsub):$(disdevid):Mtr.TWR</pv_name>
         <pv_value />
         <rules />
         <scale_options>
@@ -1044,7 +1044,7 @@ $(pv_value)</tooltip>
         <image></image>
         <name>Action Button Template_1</name>
         <push_action_index>0</push_action_index>
-        <pv_name>$(secsub):$(disdevid).TWF</pv_name>
+        <pv_name>$(secsub):$(disdevid):Mtr.TWF</pv_name>
         <pv_value />
         <rules />
         <scale_options>
@@ -1221,7 +1221,7 @@ $(pv_value)</tooltip>
         <image></image>
         <name>Action Button Template_2</name>
         <push_action_index>0</push_action_index>
-        <pv_name>$(secsub):$(disdevid).STOP</pv_name>
+        <pv_name>$(secsub):$(disdevid):Mtr.STOP</pv_name>
         <pv_value />
         <rules />
         <scale_options>
@@ -1280,7 +1280,7 @@ $(pv_value)</tooltip>
           <color name="IO onGoing" red="255" green="255" blue="0" />
         </on_color>
         <on_label>MOVN</on_label>
-        <pv_name>$(secsub):$(disdevid).MOVN</pv_name>
+        <pv_name>$(secsub):$(disdevid):Mtr.MOVN</pv_name>
         <pv_value />
         <rules>
           <rule name="BorderRule" prop_id="border_style" out_exp="false">
@@ -1345,7 +1345,7 @@ $(pv_value)</tooltip>
           <color name="IO OK" red="0" green="255" blue="0" />
         </on_color>
         <on_label>DMOV</on_label>
-        <pv_name>$(secsub):$(disdevid).DMOV</pv_name>
+        <pv_name>$(secsub):$(disdevid):Mtr.DMOV</pv_name>
         <pv_value />
         <rules>
           <rule name="BorderRule" prop_id="border_style" out_exp="false">
@@ -1410,7 +1410,7 @@ $(pv_value)</tooltip>
           <color name="Major" red="250" green="12" blue="14" />
         </on_color>
         <on_label>LLS</on_label>
-        <pv_name>$(secsub):$(disdevid).LLS</pv_name>
+        <pv_name>$(secsub):$(disdevid):Mtr.LLS</pv_name>
         <pv_value />
         <rules>
           <rule name="BorderRule" prop_id="border_style" out_exp="false">
@@ -1475,7 +1475,7 @@ $(pv_value)</tooltip>
           <color name="Major" red="250" green="12" blue="14" />
         </on_color>
         <on_label>HLS</on_label>
-        <pv_name>$(secsub):$(disdevid).HLS</pv_name>
+        <pv_name>$(secsub):$(disdevid):Mtr.HLS</pv_name>
         <pv_value />
         <rules>
           <rule name="BorderRule" prop_id="border_style" out_exp="false">
@@ -1694,7 +1694,7 @@ $(pv_value)</tooltip>
         <name>Text Update Template_27</name>
         <precision>0</precision>
         <precision_from_pv>true</precision_from_pv>
-        <pv_name>$(secsub):$(disdevid).RRBV</pv_name>
+        <pv_name>$(secsub):$(disdevid):Mtr.RRBV</pv_name>
         <pv_value />
         <rotation_angle>0.0</rotation_angle>
         <rules />
@@ -1751,7 +1751,7 @@ $(pv_value)</tooltip>
         <name>Text Input</name>
         <precision>0</precision>
         <precision_from_pv>true</precision_from_pv>
-        <pv_name>$(secsub):$(disdevid).MRES</pv_name>
+        <pv_name>$(secsub):$(disdevid):Mtr.MRES</pv_name>
         <pv_value />
         <rotation_angle>0.0</rotation_angle>
         <rules />
@@ -1803,7 +1803,7 @@ $(pv_value)</tooltip>
         <name>Text Update Template_27</name>
         <precision>0</precision>
         <precision_from_pv>true</precision_from_pv>
-        <pv_name>$(secsub):$(disdevid).MRES</pv_name>
+        <pv_name>$(secsub):$(disdevid):Mtr.MRES</pv_name>
         <pv_value />
         <rotation_angle>0.0</rotation_angle>
         <rules />
@@ -1828,69 +1828,6 @@ $(pv_value)</tooltip>
         <y>60</y>
       </widget>
     </widget>
-    <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
-      <actions hook="false" hook_all="false" />
-      <alarm_pulsing>false</alarm_pulsing>
-      <auto_size>false</auto_size>
-      <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-      <background_color>
-        <color name="IO OutputPV Bg" red="255" green="255" blue="255" />
-      </background_color>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
-      <border_color>
-        <color name="IO Border" red="0" green="0" blue="0" />
-      </border_color>
-      <border_style>6</border_style>
-      <border_width>2</border_width>
-      <confirm_message></confirm_message>
-      <enabled>true</enabled>
-      <font>
-        <opifont.name fontName="DejaVu Sans Mono" height="12" style="0" pixels="false">IO Output 1</opifont.name>
-      </font>
-      <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-      <foreground_color>
-        <color name="IO OutputPV Fg" red="0" green="0" blue="0" />
-      </foreground_color>
-      <format_type>1</format_type>
-      <height>31</height>
-      <horizontal_alignment>0</horizontal_alignment>
-      <limits_from_pv>true</limits_from_pv>
-      <multiline_input>false</multiline_input>
-      <name>Text Input Template_29</name>
-      <next_focus>0</next_focus>
-      <password_input>false</password_input>
-      <precision>0</precision>
-      <precision_from_pv>true</precision_from_pv>
-      <pv_name>$(secsub):$(disdevid).DESC</pv_name>
-      <pv_value />
-      <read_only>false</read_only>
-      <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>false</keep_wh_ratio>
-      </scale_options>
-      <scripts />
-      <show_native_border>true</show_native_border>
-      <show_units>false</show_units>
-      <style>1</style>
-      <text>#####</text>
-      <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-      <visible>true</visible>
-      <widget_type>Text Input</widget_type>
-      <width>397</width>
-      <wuid>5396ca25:165673b267c:-3d46</wuid>
-      <x>192</x>
-      <y>0</y>
-    </widget>
     <widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
       <actions hook="false" hook_all="false" />
       <background_color>
@@ -2051,7 +1988,7 @@ $(pv_value)</tooltip>
         <on_label>HOMF</on_label>
         <password></password>
         <push_action_index>0</push_action_index>
-        <pv_name>$(secsub):$(disdevid).HOMF</pv_name>
+        <pv_name>$(secsub):$(disdevid):Mtr.HOMF</pv_name>
         <pv_value />
         <released_action_index>0</released_action_index>
         <rules>
@@ -2083,5 +2020,68 @@ $(pv_value)</tooltip>
         <y>36</y>
       </widget>
     </widget>
+    <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+      <actions hook="false" hook_all="false" />
+      <alarm_pulsing>false</alarm_pulsing>
+      <auto_size>false</auto_size>
+      <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+      <background_color>
+        <color name="IO OutputPV Bg" red="255" green="255" blue="255" />
+      </background_color>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color name="IO Border" red="0" green="0" blue="0" />
+      </border_color>
+      <border_style>6</border_style>
+      <border_width>2</border_width>
+      <confirm_message></confirm_message>
+      <enabled>true</enabled>
+      <font>
+        <opifont.name fontName="DejaVu Sans Mono" height="12" style="0" pixels="false">IO Output 1</opifont.name>
+      </font>
+      <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+      <foreground_color>
+        <color name="IO OutputPV Fg" red="0" green="0" blue="0" />
+      </foreground_color>
+      <format_type>1</format_type>
+      <height>31</height>
+      <horizontal_alignment>1</horizontal_alignment>
+      <limits_from_pv>true</limits_from_pv>
+      <multiline_input>false</multiline_input>
+      <name>Text Input Template_29</name>
+      <next_focus>0</next_focus>
+      <password_input>false</password_input>
+      <precision>0</precision>
+      <precision_from_pv>true</precision_from_pv>
+      <pv_name>$(secsub):$(disdevid):Mtr.DESC</pv_name>
+      <pv_value />
+      <read_only>true</read_only>
+      <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>false</keep_wh_ratio>
+      </scale_options>
+      <scripts />
+      <show_native_border>true</show_native_border>
+      <show_units>false</show_units>
+      <style>1</style>
+      <text>#####</text>
+      <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+      <visible>true</visible>
+      <widget_type>Text Input</widget_type>
+      <width>583</width>
+      <wuid>5396ca25:165673b267c:-3d46</wuid>
+      <x>6</x>
+      <y>0</y>
+    </widget>
   </widget>
 </display>
\ No newline at end of file
diff --git a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserOverview.opi b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserOverview.opi
index 273cff5c905e835b7a6921083da76e5a99885206..70f83c149b035cceebcc7c3c4c1340df190bc455 100644
--- a/NON-APPROVED/lebt-010-pbi-npm/user/npmUserOverview.opi
+++ b/NON-APPROVED/lebt-010-pbi-npm/user/npmUserOverview.opi
@@ -92,7 +92,7 @@
       <foreground_color>
         <color red="192" green="192" blue="192" />
       </foreground_color>
-      <height>246</height>
+      <height>223</height>
       <lock_children>false</lock_children>
       <macros>
         <include_parent_macros>true</include_parent_macros>
@@ -689,7 +689,7 @@ $(pv_value)</tooltip>
         <name>Text Update Template_36</name>
         <precision>0</precision>
         <precision_from_pv>true</precision_from_pv>
-        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAM-TemperatureActual</pv_name>
+        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAM-Temperature_RBV</pv_name>
         <pv_value />
         <rotation_angle>0.0</rotation_angle>
         <rules />
@@ -713,99 +713,6 @@ $(pv_value)</tooltip>
         <x>150</x>
         <y>180</y>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-        <actions hook="false" hook_all="false" />
-        <auto_size>false</auto_size>
-        <background_color>
-          <color name="IO Background" red="235" green="235" blue="235" />
-        </background_color>
-        <border_color>
-          <color name="IO Border" red="0" green="0" blue="0" />
-        </border_color>
-        <border_style>0</border_style>
-        <border_width>2</border_width>
-        <enabled>false</enabled>
-        <font>
-          <fontdata fontName="Open Sans" height="12" style="0" pixels="false" />
-        </font>
-        <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
-        </foreground_color>
-        <height>24</height>
-        <horizontal_alignment>0</horizontal_alignment>
-        <name>Label Template_29</name>
-        <rules />
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <scripts />
-        <show_scrollbar>false</show_scrollbar>
-        <text>Mainboard temp.</text>
-        <tooltip></tooltip>
-        <transparent>true</transparent>
-        <vertical_alignment>1</vertical_alignment>
-        <visible>true</visible>
-        <widget_type>Label</widget_type>
-        <width>132</width>
-        <wrap_words>true</wrap_words>
-        <wuid>168fa846:159db2879d4:-782b</wuid>
-        <x>6</x>
-        <y>210</y>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
-        <actions hook="false" hook_all="false" />
-        <alarm_pulsing>false</alarm_pulsing>
-        <auto_size>false</auto_size>
-        <backcolor_alarm_sensitive>true</backcolor_alarm_sensitive>
-        <background_color>
-          <color red="230" green="230" blue="230" />
-        </background_color>
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <border_color>
-          <color red="100" green="100" blue="100" />
-        </border_color>
-        <border_style>1</border_style>
-        <border_width>1</border_width>
-        <enabled>true</enabled>
-        <font>
-          <fontdata fontName="Open Sans" height="10" style="0" pixels="false" />
-        </font>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
-        </foreground_color>
-        <format_type>0</format_type>
-        <height>24</height>
-        <horizontal_alignment>1</horizontal_alignment>
-        <name>Text Update Template_36</name>
-        <precision>0</precision>
-        <precision_from_pv>true</precision_from_pv>
-        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAM-PSMainboardTemp</pv_name>
-        <pv_value />
-        <rotation_angle>0.0</rotation_angle>
-        <rules />
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <scripts />
-        <show_units>true</show_units>
-        <text></text>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <transparent>false</transparent>
-        <vertical_alignment>1</vertical_alignment>
-        <visible>true</visible>
-        <widget_type>Text Update</widget_type>
-        <width>102</width>
-        <wrap_words>false</wrap_words>
-        <wuid>168fa846:159db2879d4:-782a</wuid>
-        <x>150</x>
-        <y>210</y>
-      </widget>
     </widget>
     <widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
       <actions hook="false" hook_all="false" />
@@ -825,7 +732,7 @@ $(pv_value)</tooltip>
       <foreground_color>
         <color red="192" green="192" blue="192" />
       </foreground_color>
-      <height>91</height>
+      <height>96</height>
       <lock_children>false</lock_children>
       <macros>
         <include_parent_macros>true</include_parent_macros>
@@ -846,7 +753,7 @@ $(pv_value)</tooltip>
       <width>264</width>
       <wuid>168fa846:159db2879d4:-768f</wuid>
       <x>6</x>
-      <y>291</y>
+      <y>274</y>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
@@ -3083,7 +2990,7 @@ $(pv_value)</tooltip>
       <width>265</width>
       <wuid>-4e98fb9f:162f7a24601:-4196</wuid>
       <x>6</x>
-      <y>385</y>
+      <y>380</y>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
@@ -3123,7 +3030,7 @@ $(pv_value)</tooltip>
         <wrap_words>true</wrap_words>
         <wuid>-4e98fb9f:162f7a24601:-4195</wuid>
         <x>6</x>
-        <y>6</y>
+        <y>12</y>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.combo" version="1.0.0">
         <actions hook="false" hook_all="false" />
@@ -3165,7 +3072,7 @@ $(pv_value)</tooltip>
         <width>115</width>
         <wuid>-4e98fb9f:162f7a24601:-4194</wuid>
         <x>138</x>
-        <y>0</y>
+        <y>6</y>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <actions hook="false" hook_all="false" />
@@ -3206,7 +3113,7 @@ $(pv_value)</tooltip>
         <wrap_words>true</wrap_words>
         <wuid>-4e98fb9f:162f7a24601:-4193</wuid>
         <x>84</x>
-        <y>36</y>
+        <y>42</y>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
         <actions hook="false" hook_all="false" />
@@ -3263,7 +3170,7 @@ $(pv_value)</tooltip>
         <width>67</width>
         <wuid>-4e98fb9f:162f7a24601:-4192</wuid>
         <x>12</x>
-        <y>36</y>
+        <y>42</y>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <actions hook="false" hook_all="false" />
@@ -3304,7 +3211,7 @@ $(pv_value)</tooltip>
         <wrap_words>true</wrap_words>
         <wuid>-4e98fb9f:162f7a24601:-4191</wuid>
         <x>210</x>
-        <y>36</y>
+        <y>42</y>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
         <actions hook="false" hook_all="false" />
@@ -3361,7 +3268,7 @@ $(pv_value)</tooltip>
         <width>67</width>
         <wuid>-4e98fb9f:162f7a24601:-4190</wuid>
         <x>138</x>
-        <y>36</y>
+        <y>42</y>
       </widget>
     </widget>
   </widget>
@@ -4393,7 +4300,7 @@ $(pv_value)</tooltip>
       <foreground_color>
         <color red="192" green="192" blue="192" />
       </foreground_color>
-      <height>246</height>
+      <height>223</height>
       <lock_children>false</lock_children>
       <macros>
         <include_parent_macros>true</include_parent_macros>
@@ -4990,7 +4897,7 @@ $(pv_value)</tooltip>
         <name>Text Update Template_36</name>
         <precision>0</precision>
         <precision_from_pv>true</precision_from_pv>
-        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAM-TemperatureActual</pv_name>
+        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAM-Temperature_RBV</pv_name>
         <pv_value />
         <rotation_angle>0.0</rotation_angle>
         <rules />
@@ -5014,99 +4921,6 @@ $(pv_value)</tooltip>
         <x>150</x>
         <y>180</y>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-        <actions hook="false" hook_all="false" />
-        <auto_size>false</auto_size>
-        <background_color>
-          <color name="IO Background" red="235" green="235" blue="235" />
-        </background_color>
-        <border_color>
-          <color name="IO Border" red="0" green="0" blue="0" />
-        </border_color>
-        <border_style>0</border_style>
-        <border_width>2</border_width>
-        <enabled>false</enabled>
-        <font>
-          <fontdata fontName="Open Sans" height="12" style="0" pixels="false" />
-        </font>
-        <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
-        </foreground_color>
-        <height>24</height>
-        <horizontal_alignment>0</horizontal_alignment>
-        <name>Label Template_29</name>
-        <rules />
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <scripts />
-        <show_scrollbar>false</show_scrollbar>
-        <text>Mainboard temp.</text>
-        <tooltip></tooltip>
-        <transparent>true</transparent>
-        <vertical_alignment>1</vertical_alignment>
-        <visible>true</visible>
-        <widget_type>Label</widget_type>
-        <width>132</width>
-        <wrap_words>true</wrap_words>
-        <wuid>47c2b75b:15a12b1271b:-58de</wuid>
-        <x>6</x>
-        <y>210</y>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
-        <actions hook="false" hook_all="false" />
-        <alarm_pulsing>false</alarm_pulsing>
-        <auto_size>false</auto_size>
-        <backcolor_alarm_sensitive>true</backcolor_alarm_sensitive>
-        <background_color>
-          <color red="230" green="230" blue="230" />
-        </background_color>
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <border_color>
-          <color red="100" green="100" blue="100" />
-        </border_color>
-        <border_style>1</border_style>
-        <border_width>1</border_width>
-        <enabled>true</enabled>
-        <font>
-          <fontdata fontName="Open Sans" height="10" style="0" pixels="false" />
-        </font>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
-        </foreground_color>
-        <format_type>0</format_type>
-        <height>24</height>
-        <horizontal_alignment>1</horizontal_alignment>
-        <name>Text Update Template_36</name>
-        <precision>0</precision>
-        <precision_from_pv>true</precision_from_pv>
-        <pv_name>$(secsub):$(disdevid):$(ORIENT)CAM-PSMainboardTemp</pv_name>
-        <pv_value />
-        <rotation_angle>0.0</rotation_angle>
-        <rules />
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <scripts />
-        <show_units>true</show_units>
-        <text></text>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <transparent>false</transparent>
-        <vertical_alignment>1</vertical_alignment>
-        <visible>true</visible>
-        <widget_type>Text Update</widget_type>
-        <width>102</width>
-        <wrap_words>false</wrap_words>
-        <wuid>47c2b75b:15a12b1271b:-58dd</wuid>
-        <x>150</x>
-        <y>210</y>
-      </widget>
     </widget>
     <widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
       <actions hook="false" hook_all="false" />
@@ -5126,7 +4940,7 @@ $(pv_value)</tooltip>
       <foreground_color>
         <color red="192" green="192" blue="192" />
       </foreground_color>
-      <height>91</height>
+      <height>96</height>
       <lock_children>false</lock_children>
       <macros>
         <include_parent_macros>true</include_parent_macros>
@@ -5147,7 +4961,7 @@ $(pv_value)</tooltip>
       <width>264</width>
       <wuid>-6fd2f951:15aad635960:9a1</wuid>
       <x>510</x>
-      <y>291</y>
+      <y>274</y>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
@@ -6416,7 +6230,7 @@ $(pv_value)</tooltip>
       <width>265</width>
       <wuid>-7c696c3e:162f1bafe0b:-9ef</wuid>
       <x>510</x>
-      <y>385</y>
+      <y>380</y>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <actions hook="false" hook_all="false" />
         <auto_size>false</auto_size>
@@ -6456,7 +6270,7 @@ $(pv_value)</tooltip>
         <wrap_words>true</wrap_words>
         <wuid>-7c696c3e:162f1bafe0b:-9ee</wuid>
         <x>6</x>
-        <y>6</y>
+        <y>12</y>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.combo" version="1.0.0">
         <actions hook="false" hook_all="false" />
@@ -6498,7 +6312,7 @@ $(pv_value)</tooltip>
         <width>115</width>
         <wuid>-7c696c3e:162f1bafe0b:-9ed</wuid>
         <x>138</x>
-        <y>0</y>
+        <y>6</y>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <actions hook="false" hook_all="false" />
@@ -6539,7 +6353,7 @@ $(pv_value)</tooltip>
         <wrap_words>true</wrap_words>
         <wuid>-7c696c3e:162f1bafe0b:-9ec</wuid>
         <x>84</x>
-        <y>36</y>
+        <y>42</y>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
         <actions hook="false" hook_all="false" />
@@ -6596,7 +6410,7 @@ $(pv_value)</tooltip>
         <width>67</width>
         <wuid>-7c696c3e:162f1bafe0b:-9ea</wuid>
         <x>12</x>
-        <y>36</y>
+        <y>42</y>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <actions hook="false" hook_all="false" />
@@ -6637,7 +6451,7 @@ $(pv_value)</tooltip>
         <wrap_words>true</wrap_words>
         <wuid>-7c696c3e:162f1bafe0b:-9eb</wuid>
         <x>210</x>
-        <y>36</y>
+        <y>42</y>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
         <actions hook="false" hook_all="false" />
@@ -6694,7 +6508,7 @@ $(pv_value)</tooltip>
         <width>67</width>
         <wuid>-4e98fb9f:162f7a24601:-7342</wuid>
         <x>138</x>
-        <y>36</y>
+        <y>42</y>
       </widget>
     </widget>
   </widget>
diff --git a/NON-APPROVED/odh/ODH_Area_Layout_CTL.bob b/NON-APPROVED/odh/ODH_Area_Layout_CTL.bob
new file mode 100644
index 0000000000000000000000000000000000000000..b56dfdbf3a165cf0762ff3d64401f802b7656f1d
--- /dev/null
+++ b/NON-APPROVED/odh/ODH_Area_Layout_CTL.bob
@@ -0,0 +1,499 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Display</name>
+  <width>630</width>
+  <height>830</height>
+  <widget type="group" version="2.0.0">
+    <name>Area Panel</name>
+    <x>10</x>
+    <y>10</y>
+    <width>600</width>
+    <height>800</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey03-titlebar_1</name>
+      <width>600</width>
+      <height>800</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="group" version="2.0.0">
+      <name>Area</name>
+      <x>10</x>
+      <y>50</y>
+      <width>580</width>
+      <height>740</height>
+      <style>3</style>
+      <transparent>true</transparent>
+      <widget type="rectangle" version="2.0.0">
+        <name>BGGrey03-background_1</name>
+        <width>580</width>
+        <height>740</height>
+        <line_width>0</line_width>
+        <background_color>
+          <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+          </color>
+        </background_color>
+        <corner_width>5</corner_width>
+        <corner_height>5</corner_height>
+      </widget>
+      <widget type="group" version="2.0.0">
+        <name>Signals</name>
+        <x>330</x>
+        <y>10</y>
+        <width>240</width>
+        <height>110</height>
+        <style>3</style>
+        <widget type="led" version="2.0.0">
+          <name>LED_LA</name>
+          <pv_name>$(P):Alarm</pv_name>
+          <x>20</x>
+          <y>20</y>
+          <off_color>
+            <color name="GRAY" red="169" green="169" blue="169">
+            </color>
+          </off_color>
+          <on_color>
+            <color name="LED-RED-ON" red="255" green="60" blue="46">
+            </color>
+          </on_color>
+        </widget>
+        <widget type="led" version="2.0.0">
+          <name>LED_LB</name>
+          <pv_name>$(P):WarmUp</pv_name>
+          <x>20</x>
+          <y>47</y>
+          <off_color>
+            <color name="LED-RED-ON" red="255" green="60" blue="46">
+            </color>
+          </off_color>
+          <on_color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </on_color>
+        </widget>
+        <widget type="led" version="2.0.0">
+          <name>LED_OK</name>
+          <pv_name>$(P):ConnLost</pv_name>
+          <x>20</x>
+          <y>74</y>
+          <off_color>
+            <color name="GRAY" red="169" green="169" blue="169">
+            </color>
+          </off_color>
+          <on_color>
+            <color name="LED-RED-ON" red="255" green="60" blue="46">
+            </color>
+          </on_color>
+        </widget>
+        <widget type="label" version="2.0.0">
+          <name>LB_LA</name>
+          <text>Alarms On</text>
+          <x>71</x>
+          <y>20</y>
+          <vertical_alignment>1</vertical_alignment>
+        </widget>
+        <widget type="label" version="2.0.0">
+          <name>LB_LB</name>
+          <text>Warmed Up</text>
+          <x>71</x>
+          <y>47</y>
+          <vertical_alignment>1</vertical_alignment>
+        </widget>
+        <widget type="label" version="2.0.0">
+          <name>LB_OK</name>
+          <text>Lost Communication</text>
+          <x>71</x>
+          <y>74</y>
+          <width>140</width>
+          <height>21</height>
+          <vertical_alignment>1</vertical_alignment>
+          <auto_size>true</auto_size>
+        </widget>
+      </widget>
+      <widget type="group" version="2.0.0">
+        <name>Signals_1</name>
+        <x>10</x>
+        <y>130</y>
+        <width>560</width>
+        <height>590</height>
+        <style>3</style>
+        <widget type="picture" version="2.0.0">
+          <name>Picture_2</name>
+          <file>symbols/AreaLayout_CTL.png</file>
+          <x>10</x>
+          <y>10</y>
+          <width>540</width>
+          <height>570</height>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_20</name>
+          <macros>
+            <P>CTLG-CS:ODH-O2iM-$(R)</P>
+            <R>20</R>
+          </macros>
+          <x>396</x>
+          <y>422</y>
+          <width>84</width>
+          <height>55</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_22</name>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_22</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_22</name>
+            <file>symbols/custom/error.svg</file>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_22</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <x>29</x>
+            <width>55</width>
+            <height>55</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_21</name>
+          <macros>
+            <P>CTLG-CS:ODH-O2iM-$(R)</P>
+            <R>21</R>
+          </macros>
+          <x>396</x>
+          <y>249</y>
+          <width>84</width>
+          <height>55</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_23</name>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_23</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_23</name>
+            <file>symbols/custom/error.svg</file>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_23</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <x>29</x>
+            <width>55</width>
+            <height>55</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_22</name>
+          <macros>
+            <P>CTLG-CS:ODH-O2iM-$(R)</P>
+            <R>22</R>
+          </macros>
+          <x>395</x>
+          <y>80</y>
+          <width>84</width>
+          <height>55</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_24</name>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_24</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_24</name>
+            <file>symbols/custom/error.svg</file>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_24</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <x>29</x>
+            <width>55</width>
+            <height>55</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+        </widget>
+      </widget>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>BGGrey03-title</name>
+      <text>$(LOC)</text>
+      <width>600</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD_ITALIC" size="20.0">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+  </widget>
+</display>
diff --git a/NON-APPROVED/odh/ODH_Area_Layout_CXB.bob b/NON-APPROVED/odh/ODH_Area_Layout_CXB.bob
new file mode 100644
index 0000000000000000000000000000000000000000..5c97e70d7f29913707fac7f05753ad3520b430ca
--- /dev/null
+++ b/NON-APPROVED/odh/ODH_Area_Layout_CXB.bob
@@ -0,0 +1,958 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Display</name>
+  <width>1040</width>
+  <height>830</height>
+  <widget type="group" version="2.0.0">
+    <name>Area Panel</name>
+    <x>10</x>
+    <y>10</y>
+    <width>1010</width>
+    <height>800</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey03-titlebar_1</name>
+      <width>1010</width>
+      <height>800</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="group" version="2.0.0">
+      <name>Area</name>
+      <x>10</x>
+      <y>50</y>
+      <width>990</width>
+      <height>740</height>
+      <style>3</style>
+      <transparent>true</transparent>
+      <widget type="rectangle" version="2.0.0">
+        <name>BGGrey03-background_1</name>
+        <width>990</width>
+        <height>740</height>
+        <line_width>0</line_width>
+        <background_color>
+          <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+          </color>
+        </background_color>
+        <corner_width>5</corner_width>
+        <corner_height>5</corner_height>
+      </widget>
+      <widget type="group" version="2.0.0">
+        <name>Signals</name>
+        <x>740</x>
+        <y>10</y>
+        <width>240</width>
+        <height>110</height>
+        <style>3</style>
+        <widget type="led" version="2.0.0">
+          <name>LED_LA</name>
+          <pv_name>$(P):Alarm</pv_name>
+          <x>20</x>
+          <y>20</y>
+          <off_color>
+            <color name="GRAY" red="169" green="169" blue="169">
+            </color>
+          </off_color>
+          <on_color>
+            <color name="LED-RED-ON" red="255" green="60" blue="46">
+            </color>
+          </on_color>
+        </widget>
+        <widget type="led" version="2.0.0">
+          <name>LED_LB</name>
+          <pv_name>$(P):WarmUp</pv_name>
+          <x>20</x>
+          <y>47</y>
+          <off_color>
+            <color name="LED-RED-ON" red="255" green="60" blue="46">
+            </color>
+          </off_color>
+          <on_color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </on_color>
+        </widget>
+        <widget type="led" version="2.0.0">
+          <name>LED_OK</name>
+          <pv_name>$(P):ConnLost</pv_name>
+          <x>20</x>
+          <y>74</y>
+          <off_color>
+            <color name="GRAY" red="169" green="169" blue="169">
+            </color>
+          </off_color>
+          <on_color>
+            <color name="LED-RED-ON" red="255" green="60" blue="46">
+            </color>
+          </on_color>
+        </widget>
+        <widget type="label" version="2.0.0">
+          <name>LB_LA</name>
+          <text>Alarms On</text>
+          <x>71</x>
+          <y>20</y>
+          <vertical_alignment>1</vertical_alignment>
+        </widget>
+        <widget type="label" version="2.0.0">
+          <name>LB_LB</name>
+          <text>Warmed Up</text>
+          <x>71</x>
+          <y>47</y>
+          <vertical_alignment>1</vertical_alignment>
+        </widget>
+        <widget type="label" version="2.0.0">
+          <name>LB_OK</name>
+          <text>Lost Communication</text>
+          <x>71</x>
+          <y>74</y>
+          <width>140</width>
+          <height>21</height>
+          <vertical_alignment>1</vertical_alignment>
+          <auto_size>true</auto_size>
+        </widget>
+      </widget>
+      <widget type="group" version="2.0.0">
+        <name>Signals_1</name>
+        <x>10</x>
+        <y>130</y>
+        <width>970</width>
+        <height>600</height>
+        <style>3</style>
+        <widget type="picture" version="2.0.0">
+          <name>Picture_2</name>
+          <file>symbols/AreaLayout_CXH.png</file>
+          <x>10</x>
+          <y>10</y>
+          <width>950</width>
+          <height>570</height>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_13</name>
+          <macros>
+            <P>CXB-CXH:ODH-O2iM-$(R)</P>
+            <R>13</R>
+          </macros>
+          <x>350</x>
+          <y>76</y>
+          <width>85</width>
+          <height>54</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_15</name>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_15</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <x>-2</x>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_15</name>
+            <file>symbols/custom/error.svg</file>
+            <x>-1</x>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_15</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <x>29</x>
+            <width>55</width>
+            <height>55</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_14</name>
+          <macros>
+            <P>CXB-CXH:ODH-O2iM-$(R)</P>
+            <R>14</R>
+          </macros>
+          <x>797</x>
+          <y>464</y>
+          <width>84</width>
+          <height>55</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_16</name>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_16</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_16</name>
+            <file>symbols/custom/error.svg</file>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_16</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <x>29</x>
+            <width>55</width>
+            <height>55</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_15</name>
+          <macros>
+            <P>CXB-CXH:ODH-O2iM-$(R)</P>
+            <R>15</R>
+          </macros>
+          <x>609</x>
+          <y>464</y>
+          <width>84</width>
+          <height>55</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_17</name>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_17</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_17</name>
+            <file>symbols/custom/error.svg</file>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_17</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <x>29</x>
+            <width>55</width>
+            <height>55</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_16</name>
+          <macros>
+            <P>CXB-CXH:ODH-O2iM-$(R)</P>
+            <R>16</R>
+          </macros>
+          <x>251</x>
+          <y>464</y>
+          <width>84</width>
+          <height>55</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_18</name>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_18</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_18</name>
+            <file>symbols/custom/error.svg</file>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_18</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <x>29</x>
+            <width>55</width>
+            <height>55</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_17</name>
+          <macros>
+            <P>CXB-CXH:ODH-O2iM-$(R)</P>
+            <R>17</R>
+          </macros>
+          <x>65</x>
+          <y>464</y>
+          <width>84</width>
+          <height>55</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_19</name>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_19</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_19</name>
+            <file>symbols/custom/error.svg</file>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_19</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <x>29</x>
+            <width>55</width>
+            <height>55</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_18</name>
+          <macros>
+            <P>CXB-CXH:ODH-O2iM-$(R)</P>
+            <R>18</R>
+          </macros>
+          <x>458</x>
+          <y>193</y>
+          <width>84</width>
+          <height>56</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_20</name>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_20</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_20</name>
+            <file>symbols/custom/error.svg</file>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_20</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <x>29</x>
+            <y>1</y>
+            <width>55</width>
+            <height>55</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_19</name>
+          <macros>
+            <P>CXB-CXH:ODH-O2iM-$(R)</P>
+            <R>19</R>
+          </macros>
+          <x>460</x>
+          <y>325</y>
+          <width>84</width>
+          <height>55</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_21</name>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_21</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_21</name>
+            <file>symbols/custom/error.svg</file>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_21</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <x>29</x>
+            <width>55</width>
+            <height>55</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+        </widget>
+      </widget>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>BGGrey03-title</name>
+      <text>$(LOC)</text>
+      <width>1010</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD_ITALIC" size="20.0">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+  </widget>
+</display>
diff --git a/NON-APPROVED/odh/ODH_Area_Layout_HCB.bob b/NON-APPROVED/odh/ODH_Area_Layout_HCB.bob
new file mode 100644
index 0000000000000000000000000000000000000000..2125cd228b1050acb8768e690da5ca90a991b212
--- /dev/null
+++ b/NON-APPROVED/odh/ODH_Area_Layout_HCB.bob
@@ -0,0 +1,1539 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Display</name>
+  <width>1040</width>
+  <height>830</height>
+  <widget type="group" version="2.0.0">
+    <name>Area Panel</name>
+    <x>10</x>
+    <y>10</y>
+    <width>1010</width>
+    <height>800</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey03-titlebar_1</name>
+      <width>1010</width>
+      <height>800</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="group" version="2.0.0">
+      <name>Area</name>
+      <x>10</x>
+      <y>50</y>
+      <width>990</width>
+      <height>740</height>
+      <style>3</style>
+      <transparent>true</transparent>
+      <widget type="rectangle" version="2.0.0">
+        <name>BGGrey03-background_1</name>
+        <width>990</width>
+        <height>740</height>
+        <line_width>0</line_width>
+        <background_color>
+          <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+          </color>
+        </background_color>
+        <corner_width>5</corner_width>
+        <corner_height>5</corner_height>
+      </widget>
+      <widget type="group" version="2.0.0">
+        <name>Signals</name>
+        <x>740</x>
+        <y>10</y>
+        <width>240</width>
+        <height>110</height>
+        <style>3</style>
+        <widget type="led" version="2.0.0">
+          <name>LED_LA</name>
+          <pv_name>$(P):Alarm</pv_name>
+          <x>20</x>
+          <y>20</y>
+          <off_color>
+            <color name="GRAY" red="169" green="169" blue="169">
+            </color>
+          </off_color>
+          <on_color>
+            <color name="LED-RED-ON" red="255" green="60" blue="46">
+            </color>
+          </on_color>
+        </widget>
+        <widget type="led" version="2.0.0">
+          <name>LED_LB</name>
+          <pv_name>$(P):WarmUp</pv_name>
+          <x>20</x>
+          <y>47</y>
+          <off_color>
+            <color name="LED-RED-ON" red="255" green="60" blue="46">
+            </color>
+          </off_color>
+          <on_color>
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            </color>
+          </on_color>
+        </widget>
+        <widget type="led" version="2.0.0">
+          <name>LED_OK</name>
+          <pv_name>$(P):ConnLost</pv_name>
+          <x>20</x>
+          <y>74</y>
+          <off_color>
+            <color name="GRAY" red="169" green="169" blue="169">
+            </color>
+          </off_color>
+          <on_color>
+            <color name="LED-RED-ON" red="255" green="60" blue="46">
+            </color>
+          </on_color>
+        </widget>
+        <widget type="label" version="2.0.0">
+          <name>LB_LA</name>
+          <text>Alarms On</text>
+          <x>71</x>
+          <y>20</y>
+          <vertical_alignment>1</vertical_alignment>
+        </widget>
+        <widget type="label" version="2.0.0">
+          <name>LB_LB</name>
+          <text>Warmed Up</text>
+          <x>71</x>
+          <y>47</y>
+          <vertical_alignment>1</vertical_alignment>
+        </widget>
+        <widget type="label" version="2.0.0">
+          <name>LB_OK</name>
+          <text>Lost Communication</text>
+          <x>71</x>
+          <y>74</y>
+          <width>140</width>
+          <height>21</height>
+          <vertical_alignment>1</vertical_alignment>
+          <auto_size>true</auto_size>
+        </widget>
+      </widget>
+      <widget type="group" version="2.0.0">
+        <name>Signals_1</name>
+        <x>10</x>
+        <y>130</y>
+        <width>970</width>
+        <height>600</height>
+        <style>3</style>
+        <widget type="picture" version="2.0.0">
+          <name>Picture_2</name>
+          <file>symbols/AreaLayout_HCB.png</file>
+          <x>10</x>
+          <y>10</y>
+          <width>950</width>
+          <height>570</height>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_2</name>
+          <macros>
+            <P>HCB-ACH:ODH-O2iM-$(R)</P>
+            <R>2</R>
+          </macros>
+          <x>366</x>
+          <y>422</y>
+          <width>83</width>
+          <height>54</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_4</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <width>52</width>
+            <height>52</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_4</name>
+            <x>60</x>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_4</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <x>58</x>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_4</name>
+            <file>symbols/custom/error.svg</file>
+            <x>59</x>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_3</name>
+          <macros>
+            <P>HCB-ACH:ODH-O2iM-$(R)</P>
+            <R>3</R>
+          </macros>
+          <x>366</x>
+          <y>273</y>
+          <width>83</width>
+          <height>54</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_12</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <width>52</width>
+            <height>52</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_12</name>
+            <x>60</x>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_12</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <x>58</x>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_12</name>
+            <file>symbols/custom/error.svg</file>
+            <x>59</x>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_4</name>
+          <macros>
+            <P>HCB-ACH:ODH-O2iM-$(R)</P>
+            <R>4</R>
+          </macros>
+          <x>366</x>
+          <y>89</y>
+          <width>83</width>
+          <height>54</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_13</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <width>52</width>
+            <height>52</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_13</name>
+            <x>60</x>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_13</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <x>58</x>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_13</name>
+            <file>symbols/custom/error.svg</file>
+            <x>59</x>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_9</name>
+          <macros>
+            <P>HCB-TCH:ODH-O2iM-$(R)</P>
+            <R>9</R>
+          </macros>
+          <x>34</x>
+          <y>217</y>
+          <width>83</width>
+          <height>54</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_8</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <width>52</width>
+            <height>52</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_8</name>
+            <x>60</x>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_8</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <x>58</x>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_8</name>
+            <file>symbols/custom/error.svg</file>
+            <x>59</x>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_11</name>
+          <macros>
+            <P>HCB-HPGS:ODH-O2iM-$(R)</P>
+            <R>11</R>
+          </macros>
+          <x>80</x>
+          <y>65</y>
+          <width>83</width>
+          <height>54</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_10</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <width>52</width>
+            <height>52</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_10</name>
+            <x>60</x>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_10</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <x>58</x>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_10</name>
+            <file>symbols/custom/error.svg</file>
+            <x>59</x>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_7</name>
+          <macros>
+            <P>HCB-TCH:ODH-O2iM-$(R)</P>
+            <R>7</R>
+          </macros>
+          <x>34</x>
+          <y>463</y>
+          <width>83</width>
+          <height>54</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_6</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <width>52</width>
+            <height>52</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_6</name>
+            <x>60</x>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_6</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <x>58</x>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_6</name>
+            <file>symbols/custom/error.svg</file>
+            <x>59</x>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_8</name>
+          <macros>
+            <P>HCB-TCH:ODH-O2iM-$(R)</P>
+            <R>8</R>
+          </macros>
+          <x>33</x>
+          <y>328</y>
+          <width>83</width>
+          <height>54</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_7</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <width>52</width>
+            <height>52</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_7</name>
+            <x>60</x>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_7</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <x>58</x>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_7</name>
+            <file>symbols/custom/error.svg</file>
+            <x>59</x>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_6</name>
+          <macros>
+            <P>HCB-TCH:ODH-O2iM-$(R)</P>
+            <R>6</R>
+          </macros>
+          <x>256</x>
+          <y>422</y>
+          <width>83</width>
+          <height>54</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_5</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <x>30</x>
+            <width>52</width>
+            <height>52</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_5</name>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_5</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_5</name>
+            <file>symbols/custom/error.svg</file>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_10</name>
+          <macros>
+            <P>HCB-HPGS:ODH-O2iM-$(R)</P>
+            <R>10</R>
+          </macros>
+          <x>211</x>
+          <y>66</y>
+          <width>83</width>
+          <height>54</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_9</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <x>30</x>
+            <width>52</width>
+            <height>52</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_9</name>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_9</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_9</name>
+            <file>symbols/custom/error.svg</file>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_1</name>
+          <macros>
+            <P>HCB-ACH:ODH-O2iM-$(R)</P>
+            <R>1</R>
+          </macros>
+          <x>755</x>
+          <y>337</y>
+          <width>83</width>
+          <height>54</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <x>30</x>
+            <width>52</width>
+            <height>52</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning</name>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err</name>
+            <file>symbols/custom/error.svg</file>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_12</name>
+          <macros>
+            <P>HCB-DogSh:ODH-O2iM-$(R)</P>
+            <R>12</R>
+          </macros>
+          <x>858</x>
+          <y>442</y>
+          <width>83</width>
+          <height>54</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_11</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <x>30</x>
+            <width>52</width>
+            <height>52</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_11</name>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_11</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_11</name>
+            <file>symbols/custom/error.svg</file>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+        </widget>
+        <widget type="group" version="2.0.0">
+          <name>O2iM_5</name>
+          <macros>
+            <P>HCB-ACH:ODH-O2iM-$(R)</P>
+            <R>5</R>
+          </macros>
+          <x>755</x>
+          <y>164</y>
+          <width>83</width>
+          <height>54</height>
+          <style>3</style>
+          <transparent>true</transparent>
+          <widget type="action_button" version="3.0.0">
+            <name>OpenExpert_14</name>
+            <actions>
+              <action type="open_display">
+                <file>ODH_Expert_Monit.bob</file>
+                <target>standalone</target>
+                <description>O2iM  $(R)</description>
+              </action>
+            </actions>
+            <x>30</x>
+            <width>52</width>
+            <height>52</height>
+            <tooltip>Open Monitor Panel</tooltip>
+          </widget>
+          <widget type="led" version="2.0.0">
+            <name>ODH Alarm_Warning_14</name>
+            <y>2</y>
+            <off_color>
+              <color name="GRAY" red="169" green="169" blue="169">
+              </color>
+            </off_color>
+            <on_color>
+              <color name="LED-RED-ON" red="255" green="60" blue="46">
+              </color>
+            </on_color>
+            <rules>
+              <rule name="Color" prop_id="off_color" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>
+                    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>
+                    <color name="MAJOR" red="252" green="13" blue="27">
+                    </color>
+                  </value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>
+                    <color name="WARNING" red="252" green="242" blue="17">
+                    </color>
+                  </value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+              <rule name="ToolTip" prop_id="tooltip" out_exp="false">
+                <exp bool_exp="pv0 == false &amp;&amp; pv1 == false">
+                  <value>Monitor OK</value>
+                </exp>
+                <exp bool_exp="pv0 == true">
+                  <value>Monitor Alarm!</value>
+                </exp>
+                <exp bool_exp="pv1 == true">
+                  <value>Monitor Warning</value>
+                </exp>
+                <pv_name>$(P):ODHAlarm</pv_name>
+                <pv_name>$(P):ODHWarning</pv_name>
+              </rule>
+            </rules>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_OK_14</name>
+            <file>symbols/custom/ConnectedPNG.png</file>
+            <y>28</y>
+            <width>25</width>
+            <height>25</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>true</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy OK</tooltip>
+          </widget>
+          <widget type="picture" version="2.0.0">
+            <name>MonitHealthy_Err_14</name>
+            <file>symbols/custom/error.svg</file>
+            <y>29</y>
+            <width>22</width>
+            <height>22</height>
+            <rules>
+              <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                <exp bool_exp="pv0 == true">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0 == false">
+                  <value>false</value>
+                </exp>
+                <pv_name>$(P):MonitHealthyErr</pv_name>
+              </rule>
+            </rules>
+            <tooltip>Monitor Healthy Error!</tooltip>
+          </widget>
+        </widget>
+      </widget>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>BGGrey03-title</name>
+      <text>$(LOC)</text>
+      <width>1010</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD_ITALIC" size="20.0">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+  </widget>
+</display>
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Diag.bob b/NON-APPROVED/odh/ODH_Expert_Diag.bob
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Diag.bob
rename to NON-APPROVED/odh/ODH_Expert_Diag.bob
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Monit.bob b/NON-APPROVED/odh/ODH_Expert_Monit.bob
similarity index 99%
rename from NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Monit.bob
rename to NON-APPROVED/odh/ODH_Expert_Monit.bob
index eceeb1a99fbbf8fc5b22a12851b32682297c6abb..d5685df536db6b835a1440dba22d9e5c493c2429 100644
--- a/NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Monit.bob
+++ b/NON-APPROVED/odh/ODH_Expert_Monit.bob
@@ -83,15 +83,15 @@
         </widget>
         <widget type="led" version="2.0.0">
           <name>LED_OK</name>
-          <pv_name>$(P):MonitHealthy</pv_name>
+          <pv_name>$(P):MonitHealthyErr</pv_name>
           <x>24</x>
           <y>132</y>
           <off_color>
-            <color name="LED-RED-ON" red="255" green="60" blue="46">
+            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
             </color>
           </off_color>
           <on_color>
-            <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+            <color name="LED-RED-ON" red="255" green="60" blue="46">
             </color>
           </on_color>
         </widget>
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Racks.bob b/NON-APPROVED/odh/ODH_Expert_Racks.bob
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/ODH_Expert_Racks.bob
rename to NON-APPROVED/odh/ODH_Expert_Racks.bob
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/ODH_Main.bob b/NON-APPROVED/odh/ODH_Main.bob
similarity index 94%
rename from NON-APPROVED/kg-gt_odh-plc-01/ODH_Main.bob
rename to NON-APPROVED/odh/ODH_Main.bob
index 137f51cd6f9963c2be09e902c4ccc2eaf15b729d..9807a3d1d4da603e913c950e6ee23a6c5bbfb3da 100644
--- a/NON-APPROVED/kg-gt_odh-plc-01/ODH_Main.bob
+++ b/NON-APPROVED/odh/ODH_Main.bob
@@ -2,7 +2,7 @@
 <display version="2.0.0">
   <name>ODH Main</name>
   <width>635</width>
-  <height>835</height>
+  <height>870</height>
   <widget type="group" version="2.0.0">
     <name>group.HeCompBuilding</name>
     <macros>
@@ -471,9 +471,9 @@ Healthy</text>
       <name>Action Button</name>
       <actions>
         <action type="open_display">
-          <file>ODH_Expert_Area.bob</file>
+          <file>ODH_Area_Layout_CTL.bob</file>
           <macros>
-            <LOC>CTLG</LOC>
+            <LOC>CTL Gallery (CTLG)</LOC>
             <P>CTLG-CS:ODH-Area</P>
           </macros>
           <target>standalone</target>
@@ -495,9 +495,9 @@ Healthy</text>
       <name>Action Button_1</name>
       <actions>
         <action type="open_display">
-          <file>ODH_Expert_Area.bob</file>
+          <file>ODH_Area_Layout_CXB.bob</file>
           <macros>
-            <LOC>CXB</LOC>
+            <LOC>ColdBox Building (CXB)</LOC>
             <P>CXB-CXH:ODH-Area</P>
           </macros>
           <target>standalone</target>
@@ -519,9 +519,9 @@ Healthy</text>
       <name>Action Button_2</name>
       <actions>
         <action type="open_display">
-          <file>ODH_Expert_Area.bob</file>
+          <file>ODH_Area_Layout_HCB.bob</file>
           <macros>
-            <LOC>Helium Compressor Building</LOC>
+            <LOC>Helium Compressor Building (HCB)</LOC>
             <P>HCB-ACH:ODH-Area</P>
           </macros>
           <target>standalone</target>
@@ -564,9 +564,26 @@ Healthy</text>
         </action>
       </actions>
       <x>12</x>
-      <y>18</y>
+      <y>10</y>
       <width>130</width>
-      <height>25</height>
+      <height>40</height>
+      <rules>
+        <rule name="Color" prop_id="background_color" out_exp="false">
+          <exp bool_exp="pv0 == false">
+            <value>
+              <color name="ERROR" red="252" green="13" blue="27">
+              </color>
+            </value>
+          </exp>
+          <exp bool_exp="pv0 == true">
+            <value>
+              <color name="Button_Background" red="236" green="236" blue="236">
+              </color>
+            </value>
+          </exp>
+          <pv_name>KG-GTA:ODH-PLC-01:CPU_Status</pv_name>
+        </rule>
+      </rules>
       <tooltip>$(actions)</tooltip>
     </widget>
     <widget type="led" version="2.0.0">
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/ODH_Monit_Sub.bob b/NON-APPROVED/odh/ODH_Monit_Sub.bob
similarity index 95%
rename from NON-APPROVED/kg-gt_odh-plc-01/ODH_Monit_Sub.bob
rename to NON-APPROVED/odh/ODH_Monit_Sub.bob
index 60f662e887b8381246699df722ae08c2a3d717dd..b2b2250a1419d2a37e3de68e5822897413053358 100644
--- a/NON-APPROVED/kg-gt_odh-plc-01/ODH_Monit_Sub.bob
+++ b/NON-APPROVED/odh/ODH_Monit_Sub.bob
@@ -44,15 +44,15 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_OK</name>
-    <pv_name>$(P)-$(R):MonitHealthy</pv_name>
+    <pv_name>$(P)-$(R):MonitHealthyErr</pv_name>
     <x>374</x>
     <y>4</y>
     <off_color>
-      <color name="LED-RED-ON" red="255" green="60" blue="46">
+      <color name="LED-GREEN-ON" red="70" green="255" blue="70">
       </color>
     </off_color>
     <on_color>
-      <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+      <color name="MAJOR" red="252" green="13" blue="27">
       </color>
     </on_color>
   </widget>
diff --git a/NON-APPROVED/odh/symbols/AreaLayout_CTL.png b/NON-APPROVED/odh/symbols/AreaLayout_CTL.png
new file mode 100644
index 0000000000000000000000000000000000000000..57c12dfdf9a3df8e82bb4d7b4372d73a8bd3d264
Binary files /dev/null and b/NON-APPROVED/odh/symbols/AreaLayout_CTL.png differ
diff --git a/NON-APPROVED/odh/symbols/AreaLayout_CXH.png b/NON-APPROVED/odh/symbols/AreaLayout_CXH.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b16c8d36362adc9ae58ecacd8ebba7f856034f1
Binary files /dev/null and b/NON-APPROVED/odh/symbols/AreaLayout_CXH.png differ
diff --git a/NON-APPROVED/odh/symbols/AreaLayout_HCB.png b/NON-APPROVED/odh/symbols/AreaLayout_HCB.png
new file mode 100644
index 0000000000000000000000000000000000000000..694a516b17e85187977a451f2621fbeaab1c362f
Binary files /dev/null and b/NON-APPROVED/odh/symbols/AreaLayout_HCB.png differ
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/Connected.png b/NON-APPROVED/odh/symbols/custom/Connected.png
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/Connected.png
rename to NON-APPROVED/odh/symbols/custom/Connected.png
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/ConnectedNew.png b/NON-APPROVED/odh/symbols/custom/ConnectedNew.png
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/ConnectedNew.png
rename to NON-APPROVED/odh/symbols/custom/ConnectedNew.png
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/ConnectedPNG.png b/NON-APPROVED/odh/symbols/custom/ConnectedPNG.png
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/ConnectedPNG.png
rename to NON-APPROVED/odh/symbols/custom/ConnectedPNG.png
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/Disconnected.png b/NON-APPROVED/odh/symbols/custom/Disconnected.png
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/Disconnected.png
rename to NON-APPROVED/odh/symbols/custom/Disconnected.png
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/Disconnected.svg b/NON-APPROVED/odh/symbols/custom/Disconnected.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/Disconnected.svg
rename to NON-APPROVED/odh/symbols/custom/Disconnected.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/Disconnected2.svg b/NON-APPROVED/odh/symbols/custom/Disconnected2.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/Disconnected2.svg
rename to NON-APPROVED/odh/symbols/custom/Disconnected2.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/DisconnectedPNG.png b/NON-APPROVED/odh/symbols/custom/DisconnectedPNG.png
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/DisconnectedPNG.png
rename to NON-APPROVED/odh/symbols/custom/DisconnectedPNG.png
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/PressureTransmitter_ERROR.svg b/NON-APPROVED/odh/symbols/custom/PressureTransmitter_ERROR.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/PressureTransmitter_ERROR.svg
rename to NON-APPROVED/odh/symbols/custom/PressureTransmitter_ERROR.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/PressureTransmitter_OK.svg b/NON-APPROVED/odh/symbols/custom/PressureTransmitter_OK.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/PressureTransmitter_OK.svg
rename to NON-APPROVED/odh/symbols/custom/PressureTransmitter_OK.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/PressureTransmitter_WARNING.svg b/NON-APPROVED/odh/symbols/custom/PressureTransmitter_WARNING.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/PressureTransmitter_WARNING.svg
rename to NON-APPROVED/odh/symbols/custom/PressureTransmitter_WARNING.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/closing.svg b/NON-APPROVED/odh/symbols/custom/closing.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/closing.svg
rename to NON-APPROVED/odh/symbols/custom/closing.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/conn_disc.jpg b/NON-APPROVED/odh/symbols/custom/conn_disc.jpg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/conn_disc.jpg
rename to NON-APPROVED/odh/symbols/custom/conn_disc.jpg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/error.svg b/NON-APPROVED/odh/symbols/custom/error.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/error.svg
rename to NON-APPROVED/odh/symbols/custom/error.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/gas cylinder.svg b/NON-APPROVED/odh/symbols/custom/gas cylinder.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/gas cylinder.svg
rename to NON-APPROVED/odh/symbols/custom/gas cylinder.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/interlock healthy.svg b/NON-APPROVED/odh/symbols/custom/interlock healthy.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/interlock healthy.svg
rename to NON-APPROVED/odh/symbols/custom/interlock healthy.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/interlock off.svg b/NON-APPROVED/odh/symbols/custom/interlock off.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/interlock off.svg
rename to NON-APPROVED/odh/symbols/custom/interlock off.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/interlock overridden disabled.svg b/NON-APPROVED/odh/symbols/custom/interlock overridden disabled.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/interlock overridden disabled.svg
rename to NON-APPROVED/odh/symbols/custom/interlock overridden disabled.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/interlock tripped.svg b/NON-APPROVED/odh/symbols/custom/interlock tripped.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/interlock tripped.svg
rename to NON-APPROVED/odh/symbols/custom/interlock tripped.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/lock.svg b/NON-APPROVED/odh/symbols/custom/lock.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/lock.svg
rename to NON-APPROVED/odh/symbols/custom/lock.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/lock_open.svg b/NON-APPROVED/odh/symbols/custom/lock_open.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/lock_open.svg
rename to NON-APPROVED/odh/symbols/custom/lock_open.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/opening.svg b/NON-APPROVED/odh/symbols/custom/opening.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/opening.svg
rename to NON-APPROVED/odh/symbols/custom/opening.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/pump_default.svg b/NON-APPROVED/odh/symbols/custom/pump_default.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/pump_default.svg
rename to NON-APPROVED/odh/symbols/custom/pump_default.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/pump_disabled.svg b/NON-APPROVED/odh/symbols/custom/pump_disabled.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/pump_disabled.svg
rename to NON-APPROVED/odh/symbols/custom/pump_disabled.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/pump_error.svg b/NON-APPROVED/odh/symbols/custom/pump_error.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/pump_error.svg
rename to NON-APPROVED/odh/symbols/custom/pump_error.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/pump_notcontrolled.svg b/NON-APPROVED/odh/symbols/custom/pump_notcontrolled.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/pump_notcontrolled.svg
rename to NON-APPROVED/odh/symbols/custom/pump_notcontrolled.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/ramp.svg b/NON-APPROVED/odh/symbols/custom/ramp.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/ramp.svg
rename to NON-APPROVED/odh/symbols/custom/ramp.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/start.svg b/NON-APPROVED/odh/symbols/custom/start.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/start.svg
rename to NON-APPROVED/odh/symbols/custom/start.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/stop.svg b/NON-APPROVED/odh/symbols/custom/stop.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/stop.svg
rename to NON-APPROVED/odh/symbols/custom/stop.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/valve (opened).svg b/NON-APPROVED/odh/symbols/custom/valve (opened).svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/valve (opened).svg
rename to NON-APPROVED/odh/symbols/custom/valve (opened).svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/valve_analog.svg b/NON-APPROVED/odh/symbols/custom/valve_analog.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/valve_analog.svg
rename to NON-APPROVED/odh/symbols/custom/valve_analog.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/valve_closed.svg b/NON-APPROVED/odh/symbols/custom/valve_closed.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/valve_closed.svg
rename to NON-APPROVED/odh/symbols/custom/valve_closed.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/valve_error.svg b/NON-APPROVED/odh/symbols/custom/valve_error.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/valve_error.svg
rename to NON-APPROVED/odh/symbols/custom/valve_error.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/valve_general.svg b/NON-APPROVED/odh/symbols/custom/valve_general.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/valve_general.svg
rename to NON-APPROVED/odh/symbols/custom/valve_general.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/valve_opened.svg b/NON-APPROVED/odh/symbols/custom/valve_opened.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/valve_opened.svg
rename to NON-APPROVED/odh/symbols/custom/valve_opened.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/valve_solenoid_OFF.svg b/NON-APPROVED/odh/symbols/custom/valve_solenoid_OFF.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/valve_solenoid_OFF.svg
rename to NON-APPROVED/odh/symbols/custom/valve_solenoid_OFF.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/valve_solenoid_ON.svg b/NON-APPROVED/odh/symbols/custom/valve_solenoid_ON.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/valve_solenoid_ON.svg
rename to NON-APPROVED/odh/symbols/custom/valve_solenoid_ON.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/valve_undefined.svg b/NON-APPROVED/odh/symbols/custom/valve_undefined.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/valve_undefined.svg
rename to NON-APPROVED/odh/symbols/custom/valve_undefined.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/warning.svg b/NON-APPROVED/odh/symbols/custom/warning.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/warning.svg
rename to NON-APPROVED/odh/symbols/custom/warning.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/wrench.svg b/NON-APPROVED/odh/symbols/custom/wrench.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/wrench.svg
rename to NON-APPROVED/odh/symbols/custom/wrench.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/wrenchred.svg b/NON-APPROVED/odh/symbols/custom/wrenchred.svg
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/custom/wrenchred.svg
rename to NON-APPROVED/odh/symbols/custom/wrenchred.svg
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/diagnostics/ODH_CPU.PNG b/NON-APPROVED/odh/symbols/diagnostics/ODH_CPU.PNG
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/diagnostics/ODH_CPU.PNG
rename to NON-APPROVED/odh/symbols/diagnostics/ODH_CPU.PNG
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/diagnostics/ODH_RIO1.PNG b/NON-APPROVED/odh/symbols/diagnostics/ODH_RIO1.PNG
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/diagnostics/ODH_RIO1.PNG
rename to NON-APPROVED/odh/symbols/diagnostics/ODH_RIO1.PNG
diff --git a/NON-APPROVED/kg-gt_odh-plc-01/symbols/diagnostics/ODH_Switch.PNG b/NON-APPROVED/odh/symbols/diagnostics/ODH_Switch.PNG
similarity index 100%
rename from NON-APPROVED/kg-gt_odh-plc-01/symbols/diagnostics/ODH_Switch.PNG
rename to NON-APPROVED/odh/symbols/diagnostics/ODH_Switch.PNG