diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate.bob
index dc21a9ee96aed718ef43e6c2ef13ef463be03542..0952977202f0fce4fc0fbb375fd41ecc174eb5d6 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate.bob
@@ -148,19 +148,15 @@
                 <horizontal_alignment>2</horizontal_alignment>
                 <vertical_alignment>1</vertical_alignment>
               </widget>
-              <widget type="gauge" version="2.0.0">
-                <name>Gauge</name>
+              <widget type="meter" version="3.0.0">
+                <name>Meter_Meas_Val</name>
                 <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:MeasValue</pv_name>
-                <skin>4</skin>
                 <x>8</x>
-                <y>37</y>
-                <width>270</width>
-                <height>172</height>
-                <precision>1</precision>
-                <level_hihi>${SecSub}:${Dis}-${Dev}-${Index}:FB_Limit_HIHI</level_hihi>
-                <level_high>${SecSub}:${Dis}-${Dev}-${Index}:P_Limit_HI</level_high>
-                <level_low>${SecSub}:${Dis}-${Dev}-${Index}:P_Limit_LO</level_low>
-                <level_lolo>${SecSub}:${Dis}-${Dev}-${Index}:P_Limit_LOLO</level_lolo>
+                <y>33</y>
+                <width>280</width>
+                <height>150</height>
+                <precision>2</precision>
+                <show_limits>false</show_limits>
                 <rules>
                   <rule name="HIHI" prop_id="level_hihi" out_exp="true">
                     <exp bool_exp="true">
@@ -168,13 +164,13 @@
                     </exp>
                     <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:FB_Limit_HIHI</pv_name>
                   </rule>
-                  <rule name="HI" prop_id="level_high" out_exp="true">
+                  <rule name="HIGH" prop_id="level_high" out_exp="true">
                     <exp bool_exp="true">
                       <expression>pv0</expression>
                     </exp>
                     <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:FB_Limit_HI</pv_name>
                   </rule>
-                  <rule name="LO" prop_id="level_low" out_exp="true">
+                  <rule name="LOW" prop_id="level_low" out_exp="true">
                     <exp bool_exp="true">
                       <expression>pv0</expression>
                     </exp>
@@ -186,12 +182,44 @@
                     </exp>
                     <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:FB_Limit_LOLO</pv_name>
                   </rule>
+                  <rule name="ScaleLOW" prop_id="minimum" out_exp="true">
+                    <exp bool_exp="true">
+                      <expression>pv0</expression>
+                    </exp>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleLOW</pv_name>
+                  </rule>
+                  <rule name="ScaleHIGH" prop_id="maximum" out_exp="true">
+                    <exp bool_exp="true">
+                      <expression>pv0</expression>
+                    </exp>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleHIGH</pv_name>
+                  </rule>
+                  <rule name="MajorTick" prop_id="major_tick_space" out_exp="true">
+                    <exp bool_exp="true">
+                      <expression>(pv1 - pv0) / 10</expression>
+                    </exp>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleLOW</pv_name>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleHIGH</pv_name>
+                  </rule>
+                  <rule name="MinorTick" prop_id="minor_tick_space" out_exp="true">
+                    <exp bool_exp="true">
+                      <expression>(pv1 - pv0) / 100</expression>
+                    </exp>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleLOW</pv_name>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleHIGH</pv_name>
+                  </rule>
                 </rules>
+                <tooltip>Pressure and limits</tooltip>
                 <border_alarm_sensitive>false</border_alarm_sensitive>
-                <auto_scale>false</auto_scale>
-                <maximum>2000.0</maximum>
-                <major_tick_space>100.0</major_tick_space>
-                <minor_tick_space>15.0</minor_tick_space>
+                <limits_from_pv>false</limits_from_pv>
+                <needle_color>
+                  <color name="PRIMARY-DARK" red="31" green="83" blue="102">
+                  </color>
+                </needle_color>
+                <knob_color>
+                  <color name="Button_Background" red="236" green="236" blue="236">
+                  </color>
+                </knob_color>
               </widget>
             </widget>
             <widget type="group" version="2.0.0">
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate_CABTR_Temperature.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate_CABTR_Temperature.bob
index b56b9e3550c01459f28a8e29d3b2eaf5ee6cac2a..cdf4d469b9b59fc06e7b73e41ef2b73cacb9f540 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate_CABTR_Temperature.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate_CABTR_Temperature.bob
@@ -152,15 +152,15 @@
               <tooltip>Feedback force Value</tooltip>
               <border_alarm_sensitive>false</border_alarm_sensitive>
             </widget>
-            <widget type="gauge" version="2.0.0">
-              <name>Gauge</name>
+            <widget type="meter" version="3.0.0">
+              <name>Meter_Meas_Val</name>
               <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:MeasValue</pv_name>
-              <skin>4</skin>
-              <x>14</x>
-              <y>44</y>
-              <width>270</width>
-              <height>172</height>
-              <precision>1</precision>
+              <x>7</x>
+              <y>36</y>
+              <width>290</width>
+              <height>165</height>
+              <precision>2</precision>
+              <show_limits>false</show_limits>
               <rules>
                 <rule name="HIHI" prop_id="level_hihi" out_exp="true">
                   <exp bool_exp="true">
@@ -168,13 +168,13 @@
                   </exp>
                   <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:FB_Limit_HIHI</pv_name>
                 </rule>
-                <rule name="HI" prop_id="level_high" out_exp="true">
+                <rule name="HIGH" prop_id="level_high" out_exp="true">
                   <exp bool_exp="true">
                     <expression>pv0</expression>
                   </exp>
                   <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:FB_Limit_HI</pv_name>
                 </rule>
-                <rule name="LO" prop_id="level_low" out_exp="true">
+                <rule name="LOW" prop_id="level_low" out_exp="true">
                   <exp bool_exp="true">
                     <expression>pv0</expression>
                   </exp>
@@ -186,13 +186,33 @@
                   </exp>
                   <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:FB_Limit_LOLO</pv_name>
                 </rule>
+                <rule name="MajorTick" prop_id="major_tick_space" out_exp="true">
+                  <exp bool_exp="true">
+                    <expression>(pv1 - pv0) / 10</expression>
+                  </exp>
+                  <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleLOW</pv_name>
+                  <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleHIGH</pv_name>
+                </rule>
+                <rule name="MinorTick" prop_id="minor_tick_space" out_exp="true">
+                  <exp bool_exp="true">
+                    <expression>(pv1 - pv0) / 100</expression>
+                  </exp>
+                  <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleLOW</pv_name>
+                  <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleHIGH</pv_name>
+                </rule>
               </rules>
+              <tooltip>Temperature and limits</tooltip>
               <border_alarm_sensitive>false</border_alarm_sensitive>
-              <auto_scale>false</auto_scale>
-              <maximum>350.0</maximum>
               <limits_from_pv>false</limits_from_pv>
-              <major_tick_space>100.0</major_tick_space>
-              <minor_tick_space>15.0</minor_tick_space>
+              <maximum>300.0</maximum>
+              <needle_color>
+                <color name="PRIMARY-DARK" red="31" green="83" blue="102">
+                </color>
+              </needle_color>
+              <knob_color>
+                <color name="Button_Background" red="236" green="236" blue="236">
+                </color>
+              </knob_color>
             </widget>
           </widget>
           <widget type="group" version="2.0.0">
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate_CernoxTemperature.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate_CernoxTemperature.bob
index f7d7d369d8090764c2340633bb19274781cc5b9c..7dd33a8ecd9cb70b0408861c223c06c6ccefdffc 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate_CernoxTemperature.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate_CernoxTemperature.bob
@@ -152,15 +152,15 @@
               <tooltip>Feedback force Value</tooltip>
               <border_alarm_sensitive>false</border_alarm_sensitive>
             </widget>
-            <widget type="gauge" version="2.0.0">
-              <name>Gauge</name>
+            <widget type="meter" version="3.0.0">
+              <name>Meter_Meas_Val</name>
               <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:MeasValue</pv_name>
-              <skin>4</skin>
-              <x>14</x>
-              <y>44</y>
-              <width>270</width>
-              <height>172</height>
-              <precision>1</precision>
+              <x>6</x>
+              <y>36</y>
+              <width>290</width>
+              <height>165</height>
+              <precision>2</precision>
+              <show_limits>false</show_limits>
               <rules>
                 <rule name="HIHI" prop_id="level_hihi" out_exp="true">
                   <exp bool_exp="true">
@@ -168,13 +168,13 @@
                   </exp>
                   <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:FB_Limit_HIHI</pv_name>
                 </rule>
-                <rule name="HI" prop_id="level_high" out_exp="true">
+                <rule name="HIGH" prop_id="level_high" out_exp="true">
                   <exp bool_exp="true">
                     <expression>pv0</expression>
                   </exp>
                   <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:FB_Limit_HI</pv_name>
                 </rule>
-                <rule name="LO" prop_id="level_low" out_exp="true">
+                <rule name="LOW" prop_id="level_low" out_exp="true">
                   <exp bool_exp="true">
                     <expression>pv0</expression>
                   </exp>
@@ -186,13 +186,44 @@
                   </exp>
                   <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:FB_Limit_LOLO</pv_name>
                 </rule>
+                <rule name="ScaleLOW" prop_id="minimum" out_exp="true">
+                  <exp bool_exp="true">
+                    <expression>pv0</expression>
+                  </exp>
+                  <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleLOW</pv_name>
+                </rule>
+                <rule name="ScaleHIGH" prop_id="maximum" out_exp="true">
+                  <exp bool_exp="true">
+                    <expression>pv0</expression>
+                  </exp>
+                  <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleHIGH</pv_name>
+                </rule>
+                <rule name="MajorTick" prop_id="major_tick_space" out_exp="true">
+                  <exp bool_exp="true">
+                    <expression>(pv1 - pv0) / 10</expression>
+                  </exp>
+                  <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleLOW</pv_name>
+                  <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleHIGH</pv_name>
+                </rule>
+                <rule name="MinorTick" prop_id="minor_tick_space" out_exp="true">
+                  <exp bool_exp="true">
+                    <expression>(pv1 - pv0) / 100</expression>
+                  </exp>
+                  <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleLOW</pv_name>
+                  <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleHIGH</pv_name>
+                </rule>
               </rules>
+              <tooltip>Pressure and limits</tooltip>
               <border_alarm_sensitive>false</border_alarm_sensitive>
-              <auto_scale>false</auto_scale>
-              <maximum>350.0</maximum>
               <limits_from_pv>false</limits_from_pv>
-              <major_tick_space>100.0</major_tick_space>
-              <minor_tick_space>15.0</minor_tick_space>
+              <needle_color>
+                <color name="PRIMARY-DARK" red="31" green="83" blue="102">
+                </color>
+              </needle_color>
+              <knob_color>
+                <color name="Button_Background" red="236" green="236" blue="236">
+                </color>
+              </knob_color>
             </widget>
           </widget>
           <widget type="group" version="2.0.0">
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate_LM510.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate_LM510.bob
index aafb6d55239c4be8dd5b996da6b201bbb8fa79d9..255314aa6f237efd390703dcd46c05b5b1bdac47 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate_LM510.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate_LM510.bob
@@ -151,19 +151,15 @@
                 <horizontal_alignment>2</horizontal_alignment>
                 <vertical_alignment>1</vertical_alignment>
               </widget>
-              <widget type="gauge" version="2.0.0">
-                <name>Gauge</name>
+              <widget type="meter" version="3.0.0">
+                <name>Meter_Meas_Val</name>
                 <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:MeasValue</pv_name>
-                <skin>4</skin>
-                <x>8</x>
-                <y>37</y>
-                <width>270</width>
-                <height>172</height>
-                <precision>1</precision>
-                <level_hihi>${SecSub}:${Dis}-${Dev}-${Index}:FB_Limit_HIHI</level_hihi>
-                <level_high>${SecSub}:${Dis}-${Dev}-${Index}:P_Limit_HI</level_high>
-                <level_low>${SecSub}:${Dis}-${Dev}-${Index}:P_Limit_LO</level_low>
-                <level_lolo>${SecSub}:${Dis}-${Dev}-${Index}:P_Limit_LOLO</level_lolo>
+                <x>5</x>
+                <y>33</y>
+                <width>280</width>
+                <height>165</height>
+                <precision>2</precision>
+                <show_limits>false</show_limits>
                 <rules>
                   <rule name="HIHI" prop_id="level_hihi" out_exp="true">
                     <exp bool_exp="true">
@@ -171,13 +167,13 @@
                     </exp>
                     <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:FB_Limit_HIHI</pv_name>
                   </rule>
-                  <rule name="HI" prop_id="level_high" out_exp="true">
+                  <rule name="HIGH" prop_id="level_high" out_exp="true">
                     <exp bool_exp="true">
                       <expression>pv0</expression>
                     </exp>
                     <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:FB_Limit_HI</pv_name>
                   </rule>
-                  <rule name="LO" prop_id="level_low" out_exp="true">
+                  <rule name="LOW" prop_id="level_low" out_exp="true">
                     <exp bool_exp="true">
                       <expression>pv0</expression>
                     </exp>
@@ -189,12 +185,44 @@
                     </exp>
                     <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:FB_Limit_LOLO</pv_name>
                   </rule>
+                  <rule name="ScaleLOW" prop_id="minimum" out_exp="true">
+                    <exp bool_exp="true">
+                      <expression>pv0</expression>
+                    </exp>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleLOW</pv_name>
+                  </rule>
+                  <rule name="ScaleHIGH" prop_id="maximum" out_exp="true">
+                    <exp bool_exp="true">
+                      <expression>pv0</expression>
+                    </exp>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleHIGH</pv_name>
+                  </rule>
+                  <rule name="MajorTick" prop_id="major_tick_space" out_exp="true">
+                    <exp bool_exp="true">
+                      <expression>(pv1 - pv0) / 10</expression>
+                    </exp>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleLOW</pv_name>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleHIGH</pv_name>
+                  </rule>
+                  <rule name="MinorTick" prop_id="minor_tick_space" out_exp="true">
+                    <exp bool_exp="true">
+                      <expression>(pv1 - pv0) / 100</expression>
+                    </exp>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleLOW</pv_name>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleHIGH</pv_name>
+                  </rule>
                 </rules>
+                <tooltip>Pressure and limits</tooltip>
                 <border_alarm_sensitive>false</border_alarm_sensitive>
-                <auto_scale>false</auto_scale>
-                <maximum>2000.0</maximum>
-                <major_tick_space>100.0</major_tick_space>
-                <minor_tick_space>15.0</minor_tick_space>
+                <limits_from_pv>false</limits_from_pv>
+                <needle_color>
+                  <color name="PRIMARY-DARK" red="31" green="83" blue="102">
+                  </color>
+                </needle_color>
+                <knob_color>
+                  <color name="Button_Background" red="236" green="236" blue="236">
+                  </color>
+                </knob_color>
               </widget>
             </widget>
             <widget type="group" version="2.0.0">
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_Faceplate.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_Faceplate.bob
index f58378a76a873bea194de8f54820a891a1c13898..5ebff0327cb94f0e805a035f5f26d3d6cf1f7142 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_Faceplate.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_Faceplate.bob
@@ -85,68 +85,48 @@
               <tooltip>Valve position in percent</tooltip>
               <border_alarm_sensitive>false</border_alarm_sensitive>
             </widget>
-            <widget type="linear-meter" version="2.0.0">
-              <name>MET_HeaterMV</name>
-              <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:HeaterMV</pv_name>
-              <x>15</x>
-              <y>205</y>
-              <width>270</width>
-              <height>78</height>
-              <precision>2</precision>
-              <level_hihi>0.0</level_hihi>
-              <level_high>0.0</level_high>
-              <level_low>0.0</level_low>
-              <level_lolo>0.0</level_lolo>
-              <show_hihi>false</show_hihi>
-              <show_high>false</show_high>
-              <show_low>false</show_low>
-              <show_lolo>false</show_lolo>
-              <title>Manipulated value (%)</title>
-              <tooltip>Valve manipulated value in percent</tooltip>
-              <border_alarm_sensitive>false</border_alarm_sensitive>
-              <auto_scale>false</auto_scale>
-              <limits_from_pv>false</limits_from_pv>
-              <unit_from_pv>false</unit_from_pv>
-              <minor_tick_space>0.0</minor_tick_space>
-              <lcd_visible>false</lcd_visible>
-              <bar_color>
-                <color name="PRIMARY-LIGHT" red="151" green="188" blue="202">
+            <widget type="label" version="2.0.0">
+              <name>LB_Heater_Power</name>
+              <text>Heater Power</text>
+              <x>20</x>
+              <y>45</y>
+              <width>129</width>
+              <height>30</height>
+              <foreground_color>
+                <color name="TEXT" red="25" green="25" blue="25">
+                </color>
+              </foreground_color>
+              <background_color>
+                <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
                 </color>
-              </bar_color>
+              </background_color>
+              <vertical_alignment>1</vertical_alignment>
             </widget>
-            <widget type="linear-meter" version="2.0.0">
-              <name>MET_HeaterSetpoint</name>
+            <widget type="textupdate" version="2.0.0">
+              <name>MET_ValvePos_2</name>
               <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:HeaterSP</pv_name>
-              <x>15</x>
-              <y>125</y>
-              <width>270</width>
+              <x>42</x>
+              <y>151</y>
+              <width>126</width>
+              <height>50</height>
+              <font>
+                <font family="Source Sans Pro" style="BOLD" size="23.0">
+                </font>
+              </font>
+              <background_color>
+                <color red="255" green="254" blue="253">
+                </color>
+              </background_color>
+              <transparent>true</transparent>
               <precision>2</precision>
-              <level_hihi>0.0</level_hihi>
-              <level_high>0.0</level_high>
-              <level_low>0.0</level_low>
-              <level_lolo>0.0</level_lolo>
-              <show_hihi>false</show_hihi>
-              <show_high>false</show_high>
-              <show_low>false</show_low>
-              <show_lolo>false</show_lolo>
-              <title>Setpoint (%)</title>
-              <tooltip>Valve setpoint in percent</tooltip>
+              <tooltip>Valve position in percent</tooltip>
               <border_alarm_sensitive>false</border_alarm_sensitive>
-              <auto_scale>false</auto_scale>
-              <limits_from_pv>false</limits_from_pv>
-              <unit_from_pv>false</unit_from_pv>
-              <minor_tick_space>0.0</minor_tick_space>
-              <lcd_visible>false</lcd_visible>
-              <bar_color>
-                <color name="PRIMARY-DARK" red="31" green="83" blue="102">
-                </color>
-              </bar_color>
             </widget>
             <widget type="label" version="2.0.0">
-              <name>LB_Heater_Power</name>
-              <text>Heater Power</text>
+              <name>LB_Heater_SP</name>
+              <text>Heater Setpoint</text>
               <x>20</x>
-              <y>45</y>
+              <y>122</y>
               <width>129</width>
               <height>30</height>
               <foreground_color>
@@ -159,6 +139,43 @@
               </background_color>
               <vertical_alignment>1</vertical_alignment>
             </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>MET_ValvePos_3</name>
+              <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:HeaterMV</pv_name>
+              <x>42</x>
+              <y>227</y>
+              <width>126</width>
+              <height>50</height>
+              <font>
+                <font family="Source Sans Pro" style="BOLD" size="23.0">
+                </font>
+              </font>
+              <background_color>
+                <color red="255" green="254" blue="253">
+                </color>
+              </background_color>
+              <transparent>true</transparent>
+              <precision>2</precision>
+              <tooltip>Valve position in percent</tooltip>
+              <border_alarm_sensitive>false</border_alarm_sensitive>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>LB_Heater_MV</name>
+              <text>Heater Manipulated Value</text>
+              <x>20</x>
+              <y>198</y>
+              <width>238</width>
+              <height>30</height>
+              <foreground_color>
+                <color name="TEXT" red="25" green="25" blue="25">
+                </color>
+              </foreground_color>
+              <background_color>
+                <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+                </color>
+              </background_color>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
           </widget>
           <widget type="group" version="2.0.0">
             <name>group.op.modes</name>
@@ -1887,7 +1904,6 @@
     <y>60</y>
     <width>943</width>
     <height>720</height>
-    <active_tab>1</active_tab>
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>Header Bar</name>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_Control_Faceplate.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_Control_Faceplate.bob
index 7559150c3fe534d105aa5f67223b70350e464b2d..f0e6213c2a6388d36ad5d33c6de557e2eeac8688 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_Control_Faceplate.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_Control_Faceplate.bob
@@ -85,35 +85,6 @@
               <tooltip>Mesurement value</tooltip>
               <border_alarm_sensitive>false</border_alarm_sensitive>
             </widget>
-            <widget type="linear-meter" version="2.0.0">
-              <name>MET_ValveMV</name>
-              <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:LMN</pv_name>
-              <x>15</x>
-              <y>192</y>
-              <width>270</width>
-              <height>78</height>
-              <precision>2</precision>
-              <level_hihi>0.0</level_hihi>
-              <level_high>0.0</level_high>
-              <level_low>0.0</level_low>
-              <level_lolo>0.0</level_lolo>
-              <show_hihi>false</show_hihi>
-              <show_high>false</show_high>
-              <show_low>false</show_low>
-              <show_lolo>false</show_lolo>
-              <title>Manipulated value LMN (%)</title>
-              <tooltip>Valve manipulated value in percent</tooltip>
-              <border_alarm_sensitive>false</border_alarm_sensitive>
-              <auto_scale>false</auto_scale>
-              <limits_from_pv>false</limits_from_pv>
-              <unit_from_pv>false</unit_from_pv>
-              <minor_tick_space>0.0</minor_tick_space>
-              <lcd_visible>false</lcd_visible>
-              <bar_color>
-                <color name="PRIMARY-LIGHT" red="151" green="188" blue="202">
-                </color>
-              </bar_color>
-            </widget>
             <widget type="textupdate" version="2.0.0">
               <name>MET_ProcessSetpoint</name>
               <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:MAN_SP</pv_name>
@@ -199,6 +170,44 @@
               </background_color>
               <tooltip>Mesurement value</tooltip>
             </widget>
+            <widget type="label" version="2.0.0">
+              <name>LB_PID_Gain_3</name>
+              <text>Manipulated Value:</text>
+              <x>18</x>
+              <y>191</y>
+              <width>129</width>
+              <height>30</height>
+              <foreground_color>
+                <color name="TEXT" red="25" green="25" blue="25">
+                </color>
+              </foreground_color>
+              <background_color>
+                <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+                </color>
+              </background_color>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>MET_ProcessSetpoint_1</name>
+              <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:LMN</pv_name>
+              <x>18</x>
+              <y>217</y>
+              <width>270</width>
+              <height>46</height>
+              <font>
+                <font family="Source Sans Pro" style="REGULAR" size="25.0">
+                </font>
+              </font>
+              <background_color>
+                <color red="255" green="254" blue="253">
+                </color>
+              </background_color>
+              <transparent>true</transparent>
+              <precision>2</precision>
+              <show_units>false</show_units>
+              <tooltip>Process setpoint</tooltip>
+              <border_alarm_sensitive>false</border_alarm_sensitive>
+            </widget>
           </widget>
           <widget type="group" version="2.0.0">
             <name>group.op.modes</name>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Faceplate.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Faceplate.bob
index aaaf83c04c4ac0f8daa489cfa45733b3abe55967..1cf406eb7847daec02e8e611b452e101852d7077 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Faceplate.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Faceplate.bob
@@ -65,90 +65,116 @@
               <horizontal_alignment>1</horizontal_alignment>
               <vertical_alignment>1</vertical_alignment>
             </widget>
-            <widget type="linear-meter" version="2.0.0">
+            <widget type="label" version="2.0.0">
+              <name>LB_Heater_Power</name>
+              <text>Position</text>
+              <x>28</x>
+              <y>41</y>
+              <width>129</width>
+              <height>30</height>
+              <foreground_color>
+                <color name="TEXT" red="25" green="25" blue="25">
+                </color>
+              </foreground_color>
+              <background_color>
+                <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+                </color>
+              </background_color>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
               <name>MET_ValvePos</name>
               <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ValvePosition</pv_name>
-              <x>15</x>
-              <y>45</y>
-              <width>270</width>
+              <x>50</x>
+              <y>70</y>
+              <width>126</width>
+              <height>50</height>
+              <font>
+                <font family="Source Sans Pro" style="BOLD" size="23.0">
+                </font>
+              </font>
+              <background_color>
+                <color red="255" green="254" blue="253">
+                </color>
+              </background_color>
+              <transparent>true</transparent>
               <precision>2</precision>
-              <level_hihi>0.0</level_hihi>
-              <level_high>0.0</level_high>
-              <level_low>0.0</level_low>
-              <level_lolo>0.0</level_lolo>
-              <show_hihi>false</show_hihi>
-              <show_high>false</show_high>
-              <show_low>false</show_low>
-              <show_lolo>false</show_lolo>
-              <title>Actual position (%)</title>
               <tooltip>Valve position in percent</tooltip>
               <border_alarm_sensitive>false</border_alarm_sensitive>
-              <auto_scale>false</auto_scale>
-              <limits_from_pv>false</limits_from_pv>
-              <unit_from_pv>false</unit_from_pv>
-              <minor_tick_space>0.0</minor_tick_space>
-              <lcd_visible>false</lcd_visible>
-              <bar_color>
-                <color name="PRIMARY" red="0" green="148" blue="202">
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>MET_ValvePos_2</name>
+              <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ValveSP</pv_name>
+              <x>50</x>
+              <y>147</y>
+              <width>126</width>
+              <height>50</height>
+              <font>
+                <font family="Source Sans Pro" style="BOLD" size="23.0">
+                </font>
+              </font>
+              <background_color>
+                <color red="255" green="254" blue="253">
                 </color>
-              </bar_color>
+              </background_color>
+              <transparent>true</transparent>
+              <precision>2</precision>
+              <tooltip>Valve position in percent</tooltip>
+              <border_alarm_sensitive>false</border_alarm_sensitive>
             </widget>
-            <widget type="linear-meter" version="2.0.0">
-              <name>MET_ValveMV</name>
+            <widget type="textupdate" version="2.0.0">
+              <name>MET_ValvePos_3</name>
               <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ValveMV</pv_name>
-              <x>15</x>
-              <y>205</y>
-              <width>270</width>
-              <height>78</height>
+              <x>50</x>
+              <y>223</y>
+              <width>126</width>
+              <height>50</height>
+              <font>
+                <font family="Source Sans Pro" style="BOLD" size="23.0">
+                </font>
+              </font>
+              <background_color>
+                <color red="255" green="254" blue="253">
+                </color>
+              </background_color>
+              <transparent>true</transparent>
               <precision>2</precision>
-              <level_hihi>0.0</level_hihi>
-              <level_high>0.0</level_high>
-              <level_low>0.0</level_low>
-              <level_lolo>0.0</level_lolo>
-              <show_hihi>false</show_hihi>
-              <show_high>false</show_high>
-              <show_low>false</show_low>
-              <show_lolo>false</show_lolo>
-              <title>Manipulated value (%)</title>
-              <tooltip>Valve manipulated value in percent</tooltip>
+              <tooltip>Valve position in percent</tooltip>
               <border_alarm_sensitive>false</border_alarm_sensitive>
-              <auto_scale>false</auto_scale>
-              <limits_from_pv>false</limits_from_pv>
-              <unit_from_pv>false</unit_from_pv>
-              <minor_tick_space>0.0</minor_tick_space>
-              <lcd_visible>false</lcd_visible>
-              <bar_color>
-                <color name="PRIMARY-LIGHT" red="151" green="188" blue="202">
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>LB_Heater_Power_1</name>
+              <text>SetPoint</text>
+              <x>28</x>
+              <y>111</y>
+              <width>129</width>
+              <height>30</height>
+              <foreground_color>
+                <color name="TEXT" red="25" green="25" blue="25">
+                </color>
+              </foreground_color>
+              <background_color>
+                <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
                 </color>
-              </bar_color>
+              </background_color>
+              <vertical_alignment>1</vertical_alignment>
             </widget>
-            <widget type="linear-meter" version="2.0.0">
-              <name>MET_ValveSetpoint</name>
-              <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ValveSP</pv_name>
-              <x>15</x>
-              <y>125</y>
-              <width>270</width>
-              <precision>2</precision>
-              <level_hihi>0.0</level_hihi>
-              <level_high>0.0</level_high>
-              <level_low>0.0</level_low>
-              <level_lolo>0.0</level_lolo>
-              <show_hihi>false</show_hihi>
-              <show_high>false</show_high>
-              <show_low>false</show_low>
-              <show_lolo>false</show_lolo>
-              <title>Setpoint (%)</title>
-              <tooltip>Valve setpoint in percent</tooltip>
-              <border_alarm_sensitive>false</border_alarm_sensitive>
-              <auto_scale>false</auto_scale>
-              <limits_from_pv>false</limits_from_pv>
-              <unit_from_pv>false</unit_from_pv>
-              <minor_tick_space>0.0</minor_tick_space>
-              <lcd_visible>false</lcd_visible>
-              <bar_color>
-                <color name="PRIMARY-DARK" red="31" green="83" blue="102">
+            <widget type="label" version="2.0.0">
+              <name>LB_Heater_Power_2</name>
+              <text>Manipulated Value</text>
+              <x>28</x>
+              <y>191</y>
+              <width>129</width>
+              <height>30</height>
+              <foreground_color>
+                <color name="TEXT" red="25" green="25" blue="25">
                 </color>
-              </bar_color>
+              </foreground_color>
+              <background_color>
+                <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+                </color>
+              </background_color>
+              <vertical_alignment>1</vertical_alignment>
             </widget>
           </widget>
           <widget type="group" version="2.0.0">
@@ -1938,7 +1964,6 @@
     <y>60</y>
     <width>943</width>
     <height>720</height>
-    <active_tab>1</active_tab>
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>Header Bar</name>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_Faceplate.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_Faceplate.bob
index 3c685043f46f51ef6bb58f61014f9f4adfd2f15c..4df05b64d3a8079c07525cb8265359209db0a9b0 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_Faceplate.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_Faceplate.bob
@@ -65,90 +65,116 @@
               <horizontal_alignment>1</horizontal_alignment>
               <vertical_alignment>1</vertical_alignment>
             </widget>
-            <widget type="linear-meter" version="2.0.0">
-              <name>MET_ValvePos</name>
-              <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ValvePosition</pv_name>
-              <x>15</x>
-              <y>45</y>
-              <width>270</width>
+            <widget type="textupdate" version="2.0.0">
+              <name>MET_ValvePos_3</name>
+              <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ValveMV</pv_name>
+              <x>60</x>
+              <y>223</y>
+              <width>126</width>
+              <height>50</height>
+              <font>
+                <font family="Source Sans Pro" style="BOLD" size="23.0">
+                </font>
+              </font>
+              <background_color>
+                <color red="255" green="254" blue="253">
+                </color>
+              </background_color>
+              <transparent>true</transparent>
               <precision>2</precision>
-              <level_hihi>0.0</level_hihi>
-              <level_high>0.0</level_high>
-              <level_low>0.0</level_low>
-              <level_lolo>0.0</level_lolo>
-              <show_hihi>false</show_hihi>
-              <show_high>false</show_high>
-              <show_low>false</show_low>
-              <show_lolo>false</show_lolo>
-              <title>Actual position (%)</title>
               <tooltip>Valve position in percent</tooltip>
               <border_alarm_sensitive>false</border_alarm_sensitive>
-              <auto_scale>false</auto_scale>
-              <limits_from_pv>false</limits_from_pv>
-              <unit_from_pv>false</unit_from_pv>
-              <minor_tick_space>0.0</minor_tick_space>
-              <lcd_visible>false</lcd_visible>
-              <bar_color>
-                <color name="PRIMARY" red="0" green="148" blue="202">
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>LB_Heater_Power_2</name>
+              <text>Manipulated Value</text>
+              <x>38</x>
+              <y>191</y>
+              <width>129</width>
+              <height>30</height>
+              <foreground_color>
+                <color name="TEXT" red="25" green="25" blue="25">
                 </color>
-              </bar_color>
+              </foreground_color>
+              <background_color>
+                <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+                </color>
+              </background_color>
+              <vertical_alignment>1</vertical_alignment>
             </widget>
-            <widget type="linear-meter" version="2.0.0">
-              <name>MET_ValveMV</name>
-              <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ValveMV</pv_name>
-              <x>15</x>
-              <y>205</y>
-              <width>270</width>
-              <height>78</height>
+            <widget type="textupdate" version="2.0.0">
+              <name>MET_ValvePos_4</name>
+              <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ValveSP</pv_name>
+              <x>60</x>
+              <y>147</y>
+              <width>126</width>
+              <height>50</height>
+              <font>
+                <font family="Source Sans Pro" style="BOLD" size="23.0">
+                </font>
+              </font>
+              <background_color>
+                <color red="255" green="254" blue="253">
+                </color>
+              </background_color>
+              <transparent>true</transparent>
               <precision>2</precision>
-              <level_hihi>0.0</level_hihi>
-              <level_high>0.0</level_high>
-              <level_low>0.0</level_low>
-              <level_lolo>0.0</level_lolo>
-              <show_hihi>false</show_hihi>
-              <show_high>false</show_high>
-              <show_low>false</show_low>
-              <show_lolo>false</show_lolo>
-              <title>Manipulated value (%)</title>
-              <tooltip>Valve manipulated value in percent</tooltip>
+              <tooltip>Valve position in percent</tooltip>
               <border_alarm_sensitive>false</border_alarm_sensitive>
-              <auto_scale>false</auto_scale>
-              <limits_from_pv>false</limits_from_pv>
-              <unit_from_pv>false</unit_from_pv>
-              <minor_tick_space>0.0</minor_tick_space>
-              <lcd_visible>false</lcd_visible>
-              <bar_color>
-                <color name="PRIMARY-LIGHT" red="151" green="188" blue="202">
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>LB_Heater_Power_3</name>
+              <text>SetPoint</text>
+              <x>38</x>
+              <y>111</y>
+              <width>129</width>
+              <height>30</height>
+              <foreground_color>
+                <color name="TEXT" red="25" green="25" blue="25">
+                </color>
+              </foreground_color>
+              <background_color>
+                <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
                 </color>
-              </bar_color>
+              </background_color>
+              <vertical_alignment>1</vertical_alignment>
             </widget>
-            <widget type="linear-meter" version="2.0.0">
-              <name>MET_ValveSetpoint</name>
-              <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ValveSP</pv_name>
-              <x>15</x>
-              <y>125</y>
-              <width>270</width>
+            <widget type="textupdate" version="2.0.0">
+              <name>MET_ValvePos_5</name>
+              <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ValvePosition</pv_name>
+              <x>60</x>
+              <y>70</y>
+              <width>126</width>
+              <height>50</height>
+              <font>
+                <font family="Source Sans Pro" style="BOLD" size="23.0">
+                </font>
+              </font>
+              <background_color>
+                <color red="255" green="254" blue="253">
+                </color>
+              </background_color>
+              <transparent>true</transparent>
               <precision>2</precision>
-              <level_hihi>0.0</level_hihi>
-              <level_high>0.0</level_high>
-              <level_low>0.0</level_low>
-              <level_lolo>0.0</level_lolo>
-              <show_hihi>false</show_hihi>
-              <show_high>false</show_high>
-              <show_low>false</show_low>
-              <show_lolo>false</show_lolo>
-              <title>Setpoint (%)</title>
-              <tooltip>Valve setpoint in percent</tooltip>
+              <tooltip>Valve position in percent</tooltip>
               <border_alarm_sensitive>false</border_alarm_sensitive>
-              <auto_scale>false</auto_scale>
-              <limits_from_pv>false</limits_from_pv>
-              <unit_from_pv>false</unit_from_pv>
-              <minor_tick_space>0.0</minor_tick_space>
-              <lcd_visible>false</lcd_visible>
-              <bar_color>
-                <color name="PRIMARY-DARK" red="31" green="83" blue="102">
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>LB_Heater_Power_4</name>
+              <text>Position</text>
+              <x>38</x>
+              <y>41</y>
+              <width>129</width>
+              <height>30</height>
+              <foreground_color>
+                <color name="TEXT" red="25" green="25" blue="25">
                 </color>
-              </bar_color>
+              </foreground_color>
+              <background_color>
+                <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+                </color>
+              </background_color>
+              <vertical_alignment>1</vertical_alignment>
             </widget>
           </widget>
           <widget type="group" version="2.0.0">
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob b/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
index f2c2c952d498755393a596801c285688c9348dd4..05674d4ee437de131a42a01bc5e0dd4cc703f6e2 100644
--- a/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
+++ b/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
@@ -748,6 +748,7 @@
       <WIDDev>TE</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>032</WIDIndex>
+      <WIDLabel>Temperature</WIDLabel>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
     </macros>
     <x>869</x>
@@ -2760,7 +2761,7 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_66</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_CernoxTemperature_OnlyText_Horizontal_Transparent.bob</file>
+    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_Compact.bob</file>
     <macros>
       <WIDDev>TE</WIDDev>
       <WIDDis>WtrC</WIDDis>
@@ -2808,7 +2809,7 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_68</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_CernoxTemperature_OnlyText_Horizontal_Transparent.bob</file>
+    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_Compact.bob</file>
     <macros>
       <WIDDev>TE</WIDDev>
       <WIDDis>Cryo</WIDDis>
@@ -2824,7 +2825,7 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_69</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_CernoxTemperature_OnlyText_Horizontal_Transparent.bob</file>
+    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_LakeShore_OnlyText_Horizontal_Compact.bob</file>
     <macros>
       <WIDDev>TE</WIDDev>
       <WIDDis>Cryo</WIDDis>
@@ -2840,7 +2841,7 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_70</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_CernoxTemperature_OnlyText_Horizontal_Transparent.bob</file>
+    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_Compact.bob</file>
     <macros>
       <WIDDev>TE</WIDDev>
       <WIDDis>Cryo</WIDDis>
@@ -2856,7 +2857,7 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_71</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_CernoxTemperature_OnlyText_Horizontal_Transparent.bob</file>
+    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_Compact.bob</file>
     <macros>
       <WIDDev>TE</WIDDev>
       <WIDDis>Cryo</WIDDis>
@@ -2872,7 +2873,7 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_72</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_CernoxTemperature_OnlyText_Horizontal_Transparent.bob</file>
+    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_Compact.bob</file>
     <macros>
       <WIDDev>TE</WIDDev>
       <WIDDis>Cryo</WIDDis>
@@ -3048,7 +3049,7 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_74</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_CernoxTemperature_OnlyText_Horizontal_Transparent.bob</file>
+    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_Compact.bob</file>
     <macros>
       <WIDDev>TE</WIDDev>
       <WIDDis>WtrC</WIDDis>
@@ -3064,7 +3065,7 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_75</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_CernoxTemperature_OnlyText_Horizontal_Transparent.bob</file>
+    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_Compact.bob</file>
     <macros>
       <WIDDev>TE</WIDDev>
       <WIDDis>WtrC</WIDDis>
@@ -3080,7 +3081,7 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_76</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_CernoxTemperature_OnlyText_Horizontal_Transparent.bob</file>
+    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_Compact.bob</file>
     <macros>
       <WIDDev>TE</WIDDev>
       <WIDDis>WtrC</WIDDis>
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/TS2_modeConfiguration.bob b/NON-APPROVED/TS2/ts2-cryomodule/TS2_modeConfiguration.bob
new file mode 100644
index 0000000000000000000000000000000000000000..617d8f4cab89cbf2c89fa91764202f1a82c09e91
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-cryomodule/TS2_modeConfiguration.bob
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>OP modes configuration</name>
+  <width>1200</width>
+  <height>900</height>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <y>50</y>
+    <width>590</width>
+    <height>420</height>
+    <line_color>
+      <color name="Grid" red="128" green="128" blue="128">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="Read_Background" red="240" green="240" blue="240">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>TitleBar</name>
+    <class>TITLE-BAR</class>
+    <width>590</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <class>TITLE</class>
+    <text>Mode Configurator</text>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>550</width>
+    <height>50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="Text" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>GetData</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>TS2-010:Cryo-Virt-AMCONF:Cmd_Get_Data</pv_name>
+        <value>1</value>
+        <description>Get Data</description>
+      </action>
+    </actions>
+    <x>180</x>
+    <y>400</y>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_1</name>
+    <actions execute_as_one="true">
+      <action type="write_pv">
+        <pv_name>TS2-010:Cryo-Virt-AMCONF:Cmd_Set_Data</pv_name>
+        <value>1</value>
+        <description>Set Data</description>
+      </action>
+      <action type="write_pv">
+        <pv_name>TS2-010:Cryo-Virt-AMCONF:Cmd_Get_Data</pv_name>
+        <value>1</value>
+        <description>Get Data</description>
+      </action>
+    </actions>
+    <text>Set Data</text>
+    <x>310</x>
+    <y>400</y>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="checkbox" version="2.0.0">
+    <name>Check Box</name>
+    <pv_name>TS2-010:Cryo-Virt-AMCONF:P_SS_ON</pv_name>
+    <label></label>
+    <x>310</x>
+    <y>210</y>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_1</name>
+    <text>SS Setpoint</text>
+    <x>40</x>
+    <y>240</y>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_2</name>
+    <text>Low Limit</text>
+    <x>40</x>
+    <y>360</y>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_3</name>
+    <text>High Limit</text>
+    <x>40</x>
+    <y>330</y>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_4</name>
+    <text>INT Setpoint</text>
+    <x>40</x>
+    <y>300</y>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Entry_4</name>
+    <pv_name>TS2-010:Cryo-Virt-AMCONF:P_Controlled_Devie</pv_name>
+    <x>180</x>
+    <y>160</y>
+    <format>1</format>
+    <actions execute_as_one="true">
+      <action type="write_pv">
+        <pv_name>TS2-010:Cryo-Virt-AMCONF:Cmd_Get_Data</pv_name>
+        <value>1</value>
+        <description>Get Data</description>
+      </action>
+    </actions>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Entry_6</name>
+    <pv_name>TS2-010:Cryo-Virt-AMCONF:P_OpMode</pv_name>
+    <x>180</x>
+    <y>130</y>
+    <format>1</format>
+    <actions execute_as_one="true">
+      <action type="write_pv">
+        <pv_name>TS2-010:Cryo-Virt-AMCONF:Cmd_Get_Data</pv_name>
+        <value>1</value>
+        <description>Get Data</description>
+      </action>
+    </actions>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_5</name>
+    <text>OP mode</text>
+    <x>40</x>
+    <y>130</y>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_6</name>
+    <text>Controled Decice</text>
+    <x>40</x>
+    <y>160</y>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_7</name>
+    <text>Measuring Device</text>
+    <x>40</x>
+    <y>270</y>
+    <width>120</width>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_4</name>
+    <pv_name>TS2-010:Cryo-Virt-AMCONF:Measuring_Device</pv_name>
+    <x>180</x>
+    <y>270</y>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_5</name>
+    <pv_name>TS2-010:Cryo-Virt-AMCONF:INT_Setpoint</pv_name>
+    <x>180</x>
+    <y>300</y>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_6</name>
+    <pv_name>TS2-010:Cryo-Virt-AMCONF:HighLimit</pv_name>
+    <x>180</x>
+    <y>330</y>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_7</name>
+    <pv_name>TS2-010:Cryo-Virt-AMCONF:LowLimit</pv_name>
+    <x>180</x>
+    <y>360</y>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_8</name>
+    <pv_name>TS2-010:Cryo-Virt-AMCONF:SS_Setpoint</pv_name>
+    <x>180</x>
+    <y>240</y>
+    <precision>2</precision>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Entry_9</name>
+    <pv_name>TS2-010:Cryo-Virt-AMCONF:P_Measuring_Device</pv_name>
+    <x>310</x>
+    <y>270</y>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Entry_10</name>
+    <pv_name>TS2-010:Cryo-Virt-AMCONF:P_INT_Setpoint</pv_name>
+    <x>310</x>
+    <y>300</y>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Entry_11</name>
+    <pv_name>TS2-010:Cryo-Virt-AMCONF:P_SS_Setpoint</pv_name>
+    <x>310</x>
+    <y>240</y>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED</name>
+    <pv_name>TS2-010:Cryo-Virt-AMCONF:SS_ON</pv_name>
+    <x>220</x>
+    <y>210</y>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_8</name>
+    <text>SS ON</text>
+    <x>40</x>
+    <y>210</y>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Entry_12</name>
+    <pv_name>TS2-010:Cryo-Virt-AMCONF:P_HighLimit</pv_name>
+    <x>310</x>
+    <y>330</y>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Entry_13</name>
+    <pv_name>TS2-010:Cryo-Virt-AMCONF:P_LowLimit</pv_name>
+    <x>310</x>
+    <y>360</y>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_11</name>
+    <pv_name>TS2-010:Cryo-Virt-AMCONF:OpMode_Msg</pv_name>
+    <x>310</x>
+    <y>130</y>
+    <width>140</width>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_12</name>
+    <pv_name>TS2-010:Cryo-Virt-AMCONF:Controlled_Device_Msg</pv_name>
+    <x>310</x>
+    <y>160</y>
+    <width>140</width>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_13</name>
+    <pv_name>TS2-010:Cryo-Virt-AMCONF:Measuring_Device_Msg</pv_name>
+    <x>440</x>
+    <y>270</y>
+    <width>130</width>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_14</name>
+    <pv_name>TS2-010:Cryo-Virt-AMCONF:OpMode_Msg</pv_name>
+    <x>310</x>
+    <y>100</y>
+    <width>140</width>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/TS2_modeSelector.bob b/NON-APPROVED/TS2/ts2-cryomodule/TS2_modeSelector.bob
new file mode 100644
index 0000000000000000000000000000000000000000..bcba97c93e8442e3247643a6e23f53763630606d
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-cryomodule/TS2_modeSelector.bob
@@ -0,0 +1,622 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>modeSelector</name>
+  <width use_class="true">1200</width>
+  <height use_class="true">900</height>
+  <widget type="rectangle" version="2.0.0">
+    <name>TitleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>2555</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>TitleText</name>
+    <class>TITLE</class>
+    <text>Mode Selector</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>330</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="picture" version="2.0.0">
+    <name>Picture</name>
+    <file>opModeArrows.png</file>
+    <y>50</y>
+    <width>2555</width>
+    <height>1150</height>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>Standby300K</name>
+    <pv_name>TS2-010:Cryo-Virt-MODSEL:OpMode_Ready</pv_name>
+    <x>460</x>
+    <y>310</y>
+    <width>180</width>
+    <height>100</height>
+    <off_color>
+      <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+      </color>
+    </on_color>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>Standby80K</name>
+    <pv_name>TS2-010:Cryo-Virt-MODSEL:OpMode_StandBy80K</pv_name>
+    <x>860</x>
+    <y>310</y>
+    <width>180</width>
+    <height>100</height>
+    <off_color>
+      <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+      </color>
+    </on_color>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>Standby4K</name>
+    <pv_name>TS2-010:Cryo-Virt-MODSEL:OpMode_StandBy4K</pv_name>
+    <x>1270</x>
+    <y>310</y>
+    <width>180</width>
+    <height>100</height>
+    <off_color>
+      <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+      </color>
+    </on_color>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>Standby2K</name>
+    <pv_name>TS2-010:Cryo-Virt-MODSEL:OpMode_StandBy2K</pv_name>
+    <x>1730</x>
+    <y>310</y>
+    <width>180</width>
+    <height>100</height>
+    <off_color>
+      <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+      </color>
+    </on_color>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>Nom2K</name>
+    <pv_name>TS2-010:Cryo-Virt-MODSEL:OpMode_Nominal2K_RF</pv_name>
+    <x>2350</x>
+    <y>310</y>
+    <width>180</width>
+    <height>100</height>
+    <off_color>
+      <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+      </color>
+    </on_color>
+    <square>true</square>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_6</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>TS2-010:Cryo-Virt-MODSEL:Cmd_Stand_by_4K</pv_name>
+        <value>1</value>
+        <description>Stan-by at 4K</description>
+      </action>
+    </actions>
+    <text>Stand-by
+4K</text>
+    <x>1280</x>
+    <y>320</y>
+    <width>160</width>
+    <height>80</height>
+    <font>
+      <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="21.0">
+      </font>
+    </font>
+    <tooltip>$(actions)</tooltip>
+    <show_confirm_dialog>true</show_confirm_dialog>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_7</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>TS2-010:Cryo-Virt-MODSEL:Cmd_Stand_by_2K</pv_name>
+        <value>1</value>
+        <description>Stand-by at 2K</description>
+      </action>
+    </actions>
+    <text>Stand-by
+2K</text>
+    <x>1740</x>
+    <y>320</y>
+    <width>160</width>
+    <height>80</height>
+    <font>
+      <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="21.0">
+      </font>
+    </font>
+    <tooltip>$(actions)</tooltip>
+    <show_confirm_dialog>true</show_confirm_dialog>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_8</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>TS2-010:Cryo-Virt-MODSEL:Cmd_Nominal_2K_RF</pv_name>
+        <value>1</value>
+        <description>Nominal at 2K with RF operating</description>
+      </action>
+    </actions>
+    <text>Nominal
+2K + RF</text>
+    <x>2360</x>
+    <y>320</y>
+    <width>160</width>
+    <height>80</height>
+    <font>
+      <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="21.0">
+      </font>
+    </font>
+    <tooltip>$(actions)</tooltip>
+    <show_confirm_dialog>true</show_confirm_dialog>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_9</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>TS2-010:Cryo-Virt-MODSEL:Cmd_Stand_by_300K</pv_name>
+        <value>1</value>
+        <description>Cryomodule Stand-by 300K</description>
+      </action>
+    </actions>
+    <text>Stand-by
+300K</text>
+    <x>470</x>
+    <y>320</y>
+    <width>160</width>
+    <height>80</height>
+    <font>
+      <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="21.0">
+      </font>
+    </font>
+    <tooltip>$(actions)</tooltip>
+    <show_confirm_dialog>true</show_confirm_dialog>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_10</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>TS2-010:Cryo-Virt-MODSEL:Cmd_Stand_by_80K</pv_name>
+        <value>1</value>
+        <description>Stand-by at 80K</description>
+      </action>
+    </actions>
+    <text>Stand-by
+80K</text>
+    <x>870</x>
+    <y>320</y>
+    <width>160</width>
+    <height>80</height>
+    <font>
+      <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="21.0">
+      </font>
+    </font>
+    <tooltip>$(actions)</tooltip>
+    <show_confirm_dialog>true</show_confirm_dialog>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>State</name>
+    <pv_name>TS2-010:Cryo-Virt-MODSEL:OpMode_State</pv_name>
+    <x>330</x>
+    <y>20</y>
+    <width>30</width>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+      </font>
+    </font>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Mode</name>
+    <pv_name>TS2-010:Cryo-Virt-MODSEL:OpMode_Msg</pv_name>
+    <x>430</x>
+    <y>20</y>
+    <width>280</width>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+      </font>
+    </font>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>State:</text>
+    <x>280</x>
+    <y>20</y>
+    <width>50</width>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+      </font>
+    </font>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_1</name>
+    <text>Mode:</text>
+    <x>380</x>
+    <y>20</y>
+    <width>50</width>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+      </font>
+    </font>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>EllapsedTime</name>
+    <pv_name>TS2-010:Cryo-Virt-MODSEL:EllapsedTimeInCurrentMode</pv_name>
+    <x>950</x>
+    <y>20</y>
+    <width>140</width>
+    <format>7</format>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_1</name>
+    <x>250</x>
+    <y>170</y>
+    <width>170</width>
+    <height>60</height>
+    <off_label>Beam Vacuum</off_label>
+    <off_color>
+      <color name="LED-RED-ON" red="255" green="60" blue="46">
+      </color>
+    </off_color>
+    <on_label>Beam Vacuum</on_label>
+    <on_color>
+      <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+      </color>
+    </on_color>
+    <font>
+      <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="20.0">
+      </font>
+    </font>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_2</name>
+    <x>250</x>
+    <y>230</y>
+    <width>170</width>
+    <height>60</height>
+    <off_label>CM Isolation
+Vacuum</off_label>
+    <off_color>
+      <color name="LED-RED-ON" red="255" green="60" blue="46">
+      </color>
+    </off_color>
+    <on_label>CM Isolation
+Vacuum</on_label>
+    <on_color>
+      <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+      </color>
+    </on_color>
+    <font>
+      <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="20.0">
+      </font>
+    </font>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_3</name>
+    <x>250</x>
+    <y>290</y>
+    <width>170</width>
+    <height>60</height>
+    <off_label>CDS Isolation
+Vacuum</off_label>
+    <off_color>
+      <color name="LED-RED-ON" red="255" green="60" blue="46">
+      </color>
+    </off_color>
+    <on_label>CDS Isolation
+Vacuum</on_label>
+    <on_color>
+      <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+      </color>
+    </on_color>
+    <font>
+      <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="20.0">
+      </font>
+    </font>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>WUP80to300</name>
+    <pv_name>TS2-010:Cryo-Virt-MODSEL:OpMode_WarmUp80KTo300K</pv_name>
+    <x>680</x>
+    <y>210</y>
+    <width>170</width>
+    <height>60</height>
+    <off_label>Warm-Up
+80K - 300K</off_label>
+    <off_color>
+      <color name="LED-ORANGE-OFF" red="110" green="105" blue="90">
+      </color>
+    </off_color>
+    <on_label>Warming UP
+80K - 300K</on_label>
+    <on_color>
+      <color name="LED-ORANGE-ON" red="255" green="175" blue="81">
+      </color>
+    </on_color>
+    <font>
+      <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="20.0">
+      </font>
+    </font>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>SystemStopLED</name>
+    <pv_name>TS2-010:Cryo-Virt-MODSEL:OpMode_Stopped</pv_name>
+    <bit>0</bit>
+    <x>40</x>
+    <y>330</y>
+    <width>170</width>
+    <height>60</height>
+    <off_label>System Started</off_label>
+    <off_color>
+      <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+      </color>
+    </off_color>
+    <on_label>System Stop</on_label>
+    <on_color>
+      <color name="LED-RED-ON" red="255" green="60" blue="46">
+      </color>
+    </on_color>
+    <font>
+      <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="20.0">
+      </font>
+    </font>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>WUP300K</name>
+    <pv_name>TS2-010:Cryo-Virt-MODSEL:OpMode_WarmUpTo300K</pv_name>
+    <x>870</x>
+    <y>100</y>
+    <width>170</width>
+    <height>60</height>
+    <off_label>Warming UP
+4K - 300K</off_label>
+    <off_color>
+      <color name="LED-ORANGE-OFF" red="110" green="105" blue="90">
+      </color>
+    </off_color>
+    <on_label>Warming UP
+4K - 300K</on_label>
+    <on_color>
+      <color name="LED-ORANGE-ON" red="255" green="175" blue="81">
+      </color>
+    </on_color>
+    <font>
+      <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="20.0">
+      </font>
+    </font>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>WUP80K</name>
+    <pv_name>TS2-010:Cryo-Virt-MODSEL:OpMode_WarmUpTo80K</pv_name>
+    <x>1070</x>
+    <y>210</y>
+    <width>170</width>
+    <height>60</height>
+    <off_label>Warming UP
+4K - 80K</off_label>
+    <off_color>
+      <color name="LED-ORANGE-OFF" red="110" green="105" blue="90">
+      </color>
+    </off_color>
+    <on_label>Warming UP
+4K - 80K</on_label>
+    <on_color>
+      <color name="LED-ORANGE-ON" red="255" green="175" blue="81">
+      </color>
+    </on_color>
+    <font>
+      <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="20.0">
+      </font>
+    </font>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>WUP4K</name>
+    <pv_name>TS2-010:Cryo-Virt-MODSEL:OpMode_WarmUpTo4K</pv_name>
+    <x>1520</x>
+    <y>110</y>
+    <width>170</width>
+    <height>60</height>
+    <off_label>Warming UP
+2K - 4K</off_label>
+    <off_color>
+      <color name="LED-ORANGE-OFF" red="110" green="105" blue="90">
+      </color>
+    </off_color>
+    <on_label>Warming UP
+2K - 4K</on_label>
+    <on_color>
+      <color name="LED-ORANGE-ON" red="255" green="175" blue="81">
+      </color>
+    </on_color>
+    <font>
+      <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="20.0">
+      </font>
+    </font>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_10</name>
+    <x>1900</x>
+    <y>210</y>
+    <width>170</width>
+    <height>60</height>
+    <off_label>Ready for RF</off_label>
+    <off_color>
+      <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+      </color>
+    </off_color>
+    <on_label>Ready for RF</on_label>
+    <on_color>
+      <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+      </color>
+    </on_color>
+    <font>
+      <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="20.0">
+      </font>
+    </font>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_12</name>
+    <x>2110</x>
+    <y>320</y>
+    <width>170</width>
+    <height>60</height>
+    <off_label>RF OFF</off_label>
+    <off_color>
+      <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+      </color>
+    </off_color>
+    <on_label>RF ON</on_label>
+    <on_color>
+      <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+      </color>
+    </on_color>
+    <font>
+      <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="20.0">
+      </font>
+    </font>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>CD4K</name>
+    <pv_name>TS2-010:Cryo-Virt-MODSEL:OpMode_CoolDownTo4K</pv_name>
+    <x>870</x>
+    <y>520</y>
+    <width>170</width>
+    <height>60</height>
+    <off_label>Cool-Down
+300K - 4K</off_label>
+    <off_color>
+      <color name="LED-BLUE-OFF" red="90" green="110" blue="110">
+      </color>
+    </off_color>
+    <on_label>Cool-Down
+300K - 4K</on_label>
+    <on_color>
+      <color name="LED-BLUE-ON" red="81" green="232" blue="255">
+      </color>
+    </on_color>
+    <font>
+      <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="20.0">
+      </font>
+    </font>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>CD80to4</name>
+    <pv_name>TS2-010:Cryo-Virt-MODSEL:OpMode_CoolDown80KTo4K</pv_name>
+    <x>1070</x>
+    <y>430</y>
+    <width>170</width>
+    <height>60</height>
+    <off_label>Cool-Down
+80K - 4K</off_label>
+    <off_color>
+      <color name="LED-BLUE-OFF" red="90" green="110" blue="110">
+      </color>
+    </off_color>
+    <on_label>Cool-Down
+80K - 4K</on_label>
+    <on_color>
+      <color name="LED-BLUE-ON" red="81" green="232" blue="255">
+      </color>
+    </on_color>
+    <font>
+      <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="20.0">
+      </font>
+    </font>
+    <square>true</square>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>CD2K</name>
+    <pv_name>TS2-010:Cryo-Virt-MODSEL:OpMode_CoolDownTo2K</pv_name>
+    <x>1520</x>
+    <y>520</y>
+    <width>170</width>
+    <height>60</height>
+    <off_label>Cool-Down
+4K - 2K</off_label>
+    <off_color>
+      <color name="LED-BLUE-OFF" red="90" green="110" blue="110">
+      </color>
+    </off_color>
+    <on_label>Cool-Down
+4K - 2K</on_label>
+    <on_color>
+      <color name="LED-BLUE-ON" red="81" green="232" blue="255">
+      </color>
+    </on_color>
+    <font>
+      <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="20.0">
+      </font>
+    </font>
+    <square>true</square>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_2</name>
+    <text>Ellapsed Time in current mode:</text>
+    <x>740</x>
+    <y>20</y>
+    <width>210</width>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/opModeArrows.png b/NON-APPROVED/TS2/ts2-cryomodule/opModeArrows.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b10f6177d923740614728f61776bdc4d002cffd
Binary files /dev/null and b/NON-APPROVED/TS2/ts2-cryomodule/opModeArrows.png differ