diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_Compact.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_Compact.bob
index e3b7cdfbc4b1839dc1a70d170cc607557a4b3ae5..025771779c9cdb58df233f6cab82f7553f03c371 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_Compact.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_Compact.bob
@@ -70,7 +70,6 @@ if (WIDDev == "FT")
     <pv_name>${WIDSecSub}:${WIDDis}-${WIDDev}-${WIDIndex}:MeasValue</pv_name>
     <x>142</x>
     <y>2</y>
-    <width>108</width>
     <height>30</height>
     <font>
       <font family="Source Sans Pro" style="REGULAR" size="24.0">
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_TICP.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_TICP.bob
index b40ac42e8d36e91b9b4f7c6c5fb2deda0709f58a..952024060a47df41b2cb5050b6a39bd3f7690c37 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_TICP.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_TICP.bob
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <name>AnalogTransmitter_BlockIcon_OnlyText_Horizontal_Compact</name>
+  <name>AnalogTransmitter_BlockIcon_OnlyText_Horizontal_TICP</name>
   <width>310</width>
   <height>32</height>
   <background_color>
@@ -57,12 +57,7 @@
     <actions>
       <action type="execute">
         <script file="EmbeddedJs">
-          <text><![CDATA[/* Embedded javascript */
-/* Author: Miklos Boros*/
-/* Function: check if locking is allowed is yes then generate the LockID, after that it opens the Faceplate*/
-
-
-PVUtil = org.csstudio.display.builder.runtime.script.PVUtil;
+          <text><![CDATA[PVUtil = org.csstudio.display.builder.runtime.script.PVUtil;
 logger = org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger();
 PVFactory = org.csstudio.display.builder.runtime.pv.PVFactory;
 
@@ -73,99 +68,13 @@ WIDSecSub = macros.getValue("WIDSecSub");
 WIDDis = macros.getValue("WIDDis");
 WIDDev = macros.getValue("WIDDev");
 
-
-
-try
-{
-P_BlockIcon_LockID = PVUtil.createPV( WIDSecSub+":"+WIDDis+"-"+WIDDev+"-"+WIDIndex+":P_BlockIcon_LockID",3000);
-DevLocked          = PVUtil.createPV( WIDSecSub+":"+WIDDis+"-"+WIDDev+"-"+WIDIndex+":DevLocked",3000);
-Inhibit_Lock       = PVUtil.createPV( WIDSecSub+":"+WIDDis+"-"+WIDDev+"-"+WIDIndex+":Inhibit_Lock",3000);
-}
-catch (e) {   logger.info(" Cant open Faceplate, IOC is disconnected"); }
-
-
-
-
- var patience = 500;
- while (true)
- {
-    try
-    {
-	if (PVUtil.getLong(Inhibit_Lock)!=null)
-	{break;}
-	
-    }
-    catch (e) {}
-    patience -=1;
-    if (patience <= 0)
-	{
- 		throw "Timeout connecting to PV";
-	}	
-  }
-
-
-
-  if (PVUtil.getLong(Inhibit_Lock)==0) {      /*Inibit_Lock, check if the locking is not inhibited*/
-     if (PVUtil.getLong(DevLocked)==1) {      /*DevLocked, check if the faceplate is locked*/
- 
-
-	/*Generate Unique ID for the machine*/
-       	var UniqueText = "";
-       	var en = java.net.NetworkInterface.getNetworkInterfaces();
-       	var inf;
-  	var enumIpAddr;
-        var Data1 = "";
-	var Data2 = "";
-    	for (en = java.net.NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();) {
-      	   intf = en.nextElement();
-	   Data1 = intf.getName() + intf.getDisplayName();
-           UniqueText = UniqueText + Data1;
-          for (enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements(); ) {
-	        Data2 = enumIpAddr.nextElement().toString();
-        	UniqueText = UniqueText + Data2;
-      	   }
-        }
-
-        var a_table = "00000000 77073096 EE0E612C 990951BA 076DC419 706AF48F E963A535 9E6495A3 0EDB8832 79DCB8A4 E0D5E91E 97D2D988 09B64C2B 7EB17CBD E7B82D07 90BF1D91 1DB71064 6AB020F2 F3B97148 84BE41DE 1ADAD47D 6DDDE4EB F4D4B551 83D385C7 136C9856 646BA8C0 FD62F97A 8A65C9EC 14015C4F 63066CD9 FA0F3D63 8D080DF5 3B6E20C8 4C69105E D56041E4 A2677172 3C03E4D1 4B04D447 D20D85FD A50AB56B 35B5A8FA 42B2986C DBBBC9D6 ACBCF940 32D86CE3 45DF5C75 DCD60DCF ABD13D59 26D930AC 51DE003A C8D75180 BFD06116 21B4F4B5 56B3C423 CFBA9599 B8BDA50F 2802B89E 5F058808 C60CD9B2 B10BE924 2F6F7C87 58684C11 C1611DAB B6662D3D 76DC4190 01DB7106 98D220BC EFD5102A 71B18589 06B6B51F 9FBFE4A5 E8B8D433 7807C9A2 0F00F934 9609A88E E10E9818 7F6A0DBB 086D3D2D 91646C97 E6635C01 6B6B51F4 1C6C6162 856530D8 F262004E 6C0695ED 1B01A57B 8208F4C1 F50FC457 65B0D9C6 12B7E950 8BBEB8EA FCB9887C 62DD1DDF 15DA2D49 8CD37CF3 FBD44C65 4DB26158 3AB551CE A3BC0074 D4BB30E2 4ADFA541 3DD895D7 A4D1C46D D3D6F4FB 4369E96A 346ED9FC AD678846 DA60B8D0 44042D73 33031DE5 AA0A4C5F DD0D7CC9 5005713C 270241AA BE0B1010 C90C2086 5768B525 206F85B3 B966D409 CE61E49F 5EDEF90E 29D9C998 B0D09822 C7D7A8B4 59B33D17 2EB40D81 B7BD5C3B C0BA6CAD EDB88320 9ABFB3B6 03B6E20C 74B1D29A EAD54739 9DD277AF 04DB2615 73DC1683 E3630B12 94643B84 0D6D6A3E 7A6A5AA8 E40ECF0B 9309FF9D 0A00AE27 7D079EB1 F00F9344 8708A3D2 1E01F268 6906C2FE F762575D 806567CB 196C3671 6E6B06E7 FED41B76 89D32BE0 10DA7A5A 67DD4ACC F9B9DF6F 8EBEEFF9 17B7BE43 60B08ED5 D6D6A3E8 A1D1937E 38D8C2C4 4FDFF252 D1BB67F1 A6BC5767 3FB506DD 48B2364B D80D2BDA AF0A1B4C 36034AF6 41047A60 DF60EFC3 A867DF55 316E8EEF 4669BE79 CB61B38C BC66831A 256FD2A0 5268E236 CC0C7795 BB0B4703 220216B9 5505262F C5BA3BBE B2BD0B28 2BB45A92 5CB36A04 C2D7FFA7 B5D0CF31 2CD99E8B 5BDEAE1D 9B64C2B0 EC63F226 756AA39C 026D930A 9C0906A9 EB0E363F 72076785 05005713 95BF4A82 E2B87A14 7BB12BAE 0CB61B38 92D28E9B E5D5BE0D 7CDCEFB7 0BDBDF21 86D3D2D4 F1D4E242 68DDB3F8 1FDA836E 81BE16CD F6B9265B 6FB077E1 18B74777 88085AE6 FF0F6A70 66063BCA 11010B5C 8F659EFF F862AE69 616BFFD3 166CCF45 A00AE278 D70DD2EE 4E048354 3903B3C2 A7672661 D06016F7 4969474D 3E6E77DB AED16A4A D9D65ADC 40DF0B66 37D83BF0 A9BCAE53 DEBB9EC5 47B2CF7F 30B5FFE9 BDBDF21C CABAC28A 53B39330 24B4A3A6 BAD03605 CDD70693 54DE5729 23D967BF B3667A2E C4614AB8 5D681B02 2A6F2B94 B40BBE37 C30C8EA1 5A05DF1B 2D02EF8D";
-        var b_table = a_table.split(' ').map(function(s){ return parseInt(s,16) });
-  
-        function b_crc32 (str) {
-        var crc = -1;
-          for(var i=0, iTop=str.length; i<iTop; i++) {
-             crc = ( crc >>> 8 ) ^ b_table[( crc ^ str.charCodeAt( i ) ) & 0xFF];
-          }
-        return (crc ^ (-1)) >>> 0;
-        };
-
-        var crc = b_crc32(UniqueText) ;
-	if (crc >=2147483647){ crc = crc - 2147483647;}
-        logger.info("   BlockIcon machine ID: "+crc);
-	/*Write Block Icon ID to the PV*/
-	try
-        {
-		P_BlockIcon_LockID.setValue(crc);
-	}
-	
-	catch (e) {   logger.info(" Locked ID cannot write pv"); }
-
-    } //Check if device is Locked
-
-  } // Locking inhibited
-
   /* OPEN FACEPLATE*/
   var map = new Object(); 
   map["Dev"] = WIDDev;
   map["Dis"] = WIDDis;
   map["Index"] = WIDIndex;
   map["SecSub"] = WIDSecSub;
-  org.csstudio.display.builder.runtime.script.ScriptUtil.openDisplay(widget, "AnalogTransmitter_Faceplate.bob", "STANDALONE", map);
-
-
-
-
-PVFactory.releasePV(P_BlockIcon_LockID);
-PVFactory.releasePV(DevLocked);
-PVFactory.releasePV(Inhibit_Lock);
+  org.csstudio.display.builder.runtime.script.ScriptUtil.openDisplay(widget, "AnalogTransmitter_Faceplate_TICP_TS2.bob", "STANDALONE", map);
 ]]></text>
         </script>
         <description>Open Faceplate</description>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_Transparent.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_Transparent.bob
index 956dc26227f58b62cb03ad26778cc29c7b909df6..50fd8f70675c16ffce8279a270e5b2f7df0f1be5 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_Transparent.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_Transparent.bob
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>AnalogTransmitter_BlockIcon_OnlyText_Horizontal_Transparent</name>
-  <width>240</width>
+  <width>250</width>
   <height>32</height>
   <widget type="label" version="2.0.0">
     <name>WID_TitleLBL</name>
     <text>${WIDDev}-${WIDIndex}</text>
     <x>27</x>
     <y>1</y>
-    <width>102</width>
+    <width>115</width>
     <height>29</height>
     <font>
       <font family="Source Sans Pro" style="BOLD" size="25.0">
@@ -28,10 +28,9 @@
   <widget type="textupdate" version="2.0.0">
     <name>WID_MeasValue</name>
     <pv_name>${WIDSecSub}:${WIDDis}-${WIDDev}-${WIDIndex}:MeasValue</pv_name>
-    <x>130</x>
+    <x>142</x>
     <y>1</y>
-    <width>110</width>
-    <height>29</height>
+    <height>30</height>
     <font>
       <font family="Source Sans Pro" style="REGULAR" size="25.0">
       </font>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate_TICP_TS2.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate_TICP_TS2.bob
new file mode 100644
index 0000000000000000000000000000000000000000..09a058211836a9a6a86696adab905c15af5484be
--- /dev/null
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate_TICP_TS2.bob
@@ -0,0 +1,902 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Analog_TRANSMITTER_Faceplate_TICP_TS2</name>
+  <width>834</width>
+  <height>697</height>
+  <grid_visible>false</grid_visible>
+  <widget type="tabs" version="2.0.0">
+    <name>Tabs</name>
+    <tabs>
+      <tab>
+        <name> Status</name>
+        <children>
+          <widget type="group" version="2.0.0">
+            <name>Device_Status_Group</name>
+            <width>810</width>
+            <height>600</height>
+            <style>3</style>
+            <transparent>true</transparent>
+            <widget type="group" version="2.0.0">
+              <name>Status</name>
+              <x>10</x>
+              <y>10</y>
+              <width>290</width>
+              <height>270</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>Rect_Meas_Title</name>
+                <width>290</width>
+                <height>59</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="rectangle" version="2.0.0">
+                <name>Rect_Meas_Back</name>
+                <y>30</y>
+                <width>290</width>
+                <height>240</height>
+                <line_width>2</line_width>
+                <line_color>
+                  <color name="GROUP-BORDER" red="150" green="155" blue="151">
+                  </color>
+                </line_color>
+                <background_color>
+                  <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+                  </color>
+                </background_color>
+                <corner_height>10</corner_height>
+              </widget>
+              <widget type="label" version="2.0.0">
+                <name>LB_Meas_Title</name>
+                <class>HEADER2</class>
+                <text>Status</text>
+                <width>290</width>
+                <height>31</height>
+                <font use_class="true">
+                  <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.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 type="label" version="2.0.0">
+                <name>LB_Meas_Label</name>
+                <text>${WIDLabel}</text>
+                <x>5</x>
+                <y>186</y>
+                <width>280</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>
+                <horizontal_alignment>1</horizontal_alignment>
+                <vertical_alignment>1</vertical_alignment>
+              </widget>
+              <widget type="textupdate" version="2.0.0">
+                <name>TU_FeedbackForceVal</name>
+                <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:Val</pv_name>
+                <x>176</x>
+                <y>228</y>
+                <width>90</width>
+                <height>25</height>
+                <precision>2</precision>
+                <vertical_alignment>1</vertical_alignment>
+                <tooltip>Feedback force Value</tooltip>
+                <border_alarm_sensitive>false</border_alarm_sensitive>
+              </widget>
+              <widget type="label" version="2.0.0">
+                <name>LB_ForceText</name>
+                <text>Value:</text>
+                <x>16</x>
+                <y>230</y>
+                <width>82</width>
+                <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>
+                <horizontal_alignment>2</horizontal_alignment>
+                <vertical_alignment>1</vertical_alignment>
+              </widget>
+              <widget type="meter" version="3.0.0">
+                <name>Meter_Meas_Val</name>
+                <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:Val</pv_name>
+                <x>8</x>
+                <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">
+                      <expression>pv0</expression>
+                    </exp>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:Val_Max</pv_name>
+                  </rule>
+                  <rule name="LOLO" prop_id="level_lolo" out_exp="true">
+                    <exp bool_exp="true">
+                      <expression>pv0</expression>
+                    </exp>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:Val_Min</pv_name>
+                  </rule>
+                </rules>
+                <tooltip>Pressure and limits</tooltip>
+                <border_alarm_sensitive>false</border_alarm_sensitive>
+                <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">
+              <name>Limits</name>
+              <x>12</x>
+              <y>300</y>
+              <width>290</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>Rect_Limits_Ttile</name>
+                <width>290</width>
+                <height>59</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="rectangle" version="2.0.0">
+                <name>Rect_Limits_Back</name>
+                <y>30</y>
+                <width>290</width>
+                <height>160</height>
+                <line_width>2</line_width>
+                <line_color>
+                  <color name="GROUP-BORDER" red="150" green="155" blue="151">
+                  </color>
+                </line_color>
+                <background_color>
+                  <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+                  </color>
+                </background_color>
+                <corner_height>10</corner_height>
+              </widget>
+              <widget type="label" version="2.0.0">
+                <name>LB_Limits_title</name>
+                <class>HEADER2</class>
+                <text>Limits</text>
+                <width>290</width>
+                <height>31</height>
+                <font use_class="true">
+                  <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.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 type="textupdate" version="2.0.0">
+                <name>TU_FB_HIGH</name>
+                <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:Val_Max</pv_name>
+                <x>180</x>
+                <y>83</y>
+                <width>80</width>
+                <height>25</height>
+                <precision>2</precision>
+                <vertical_alignment>1</vertical_alignment>
+                <tooltip>Feedback value HIGH</tooltip>
+                <border_alarm_sensitive>false</border_alarm_sensitive>
+              </widget>
+              <widget type="textupdate" version="2.0.0">
+                <name>TU_FB_LOW</name>
+                <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:Val_Min</pv_name>
+                <x>180</x>
+                <y>113</y>
+                <width>80</width>
+                <height>25</height>
+                <precision>2</precision>
+                <vertical_alignment>1</vertical_alignment>
+                <tooltip>Feedback value LOW</tooltip>
+                <border_alarm_sensitive>false</border_alarm_sensitive>
+              </widget>
+              <widget type="spinner" version="2.0.0">
+                <name>INP_HIGH</name>
+                <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:Val_Max</pv_name>
+                <x>80</x>
+                <y>83</y>
+                <width>90</width>
+                <height>25</height>
+                <format>0</format>
+                <precision>2</precision>
+                <rules>
+                  <rule name="MinimumRule" prop_id="minimum" out_exp="true">
+                    <exp bool_exp="true">
+                      <expression>pv0</expression>
+                    </exp>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleLOW</pv_name>
+                  </rule>
+                </rules>
+                <tooltip>Warning HIGH</tooltip>
+                <border_alarm_sensitive>false</border_alarm_sensitive>
+                <maximum>500.0</maximum>
+              </widget>
+              <widget type="spinner" version="2.0.0">
+                <name>INP_LOW</name>
+                <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:Val_Min</pv_name>
+                <x>80</x>
+                <y>113</y>
+                <width>90</width>
+                <height>25</height>
+                <format>0</format>
+                <precision>2</precision>
+                <rules>
+                  <rule name="MinimumRule" 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="MaximumRule" prop_id="maximum" out_exp="true">
+                    <exp bool_exp="true">
+                      <expression>pv0</expression>
+                    </exp>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:ScaleHIGH</pv_name>
+                  </rule>
+                </rules>
+                <tooltip>Warning LOW</tooltip>
+                <border_alarm_sensitive>false</border_alarm_sensitive>
+              </widget>
+              <widget type="label" version="2.0.0">
+                <name>LB_HIGH</name>
+                <text>HIGH:</text>
+                <x>20</x>
+                <y>85</y>
+                <width>50</width>
+                <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>
+                <horizontal_alignment>2</horizontal_alignment>
+                <vertical_alignment>1</vertical_alignment>
+              </widget>
+              <widget type="label" version="2.0.0">
+                <name>LB_LOW</name>
+                <text>LOW:</text>
+                <x>20</x>
+                <y>115</y>
+                <width>50</width>
+                <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>
+                <horizontal_alignment>2</horizontal_alignment>
+                <vertical_alignment>1</vertical_alignment>
+              </widget>
+            </widget>
+            <widget type="group" version="2.0.0">
+              <name>OP Modes</name>
+              <x>320</x>
+              <y>10</y>
+              <width>230</width>
+              <height>170</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>Rect_Mode_Title</name>
+                <width>230</width>
+                <height>59</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="label" version="2.0.0">
+                <name>Rect_LB_Title</name>
+                <class>HEADER2</class>
+                <text>OP Modes</text>
+                <width>230</width>
+                <height>31</height>
+                <font use_class="true">
+                  <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.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 type="rectangle" version="2.0.0">
+                <name>Rect_Mode_Back</name>
+                <y>30</y>
+                <width>230</width>
+                <height>140</height>
+                <line_width>2</line_width>
+                <line_color>
+                  <color name="GROUP-BORDER" red="150" green="155" blue="151">
+                  </color>
+                </line_color>
+                <background_color>
+                  <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+                  </color>
+                </background_color>
+                <corner_height>10</corner_height>
+              </widget>
+              <widget type="led" version="2.0.0">
+                <name>LED_Mode_Auto</name>
+                <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:Sts</pv_name>
+                <x>63</x>
+                <y>61</y>
+                <off_color>
+                  <color name="Grid" red="169" green="169" blue="169">
+                  </color>
+                </off_color>
+                <tooltip>Operation mode Freerun</tooltip>
+              </widget>
+              <widget type="label" version="2.0.0">
+                <name>LB_Mode_Auto</name>
+                <text>Auto</text>
+                <x>93</x>
+                <y>60</y>
+                <width>79</width>
+                <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>Messages</name>
+              <x>320</x>
+              <y>200</y>
+              <width>230</width>
+              <height>132</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>Rect_Msg_Title</name>
+                <width>230</width>
+                <height>59</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="label" version="2.0.0">
+                <name>LB_Msg_Title</name>
+                <class>HEADER2</class>
+                <text>Messages</text>
+                <width>230</width>
+                <height>31</height>
+                <font use_class="true">
+                  <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.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 type="rectangle" version="2.0.0">
+                <name>Rect_Msg_Back</name>
+                <y>30</y>
+                <width>230</width>
+                <height>102</height>
+                <line_width>2</line_width>
+                <line_color>
+                  <color name="GROUP-BORDER" red="150" green="155" blue="151">
+                  </color>
+                </line_color>
+                <background_color>
+                  <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+                  </color>
+                </background_color>
+                <corner_height>10</corner_height>
+              </widget>
+              <widget type="label" version="2.0.0">
+                <name>MSG_LatchAlarm</name>
+                <text>- Alarms Act disabled</text>
+                <x>20</x>
+                <y>80</y>
+                <width>190</width>
+                <background_color>
+                  <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+                  </color>
+                </background_color>
+                <vertical_alignment>1</vertical_alignment>
+                <rules>
+                  <rule name="Visibility rule" prop_id="visible" out_exp="false">
+                    <exp bool_exp="pv0 == 0">
+                      <value>true</value>
+                    </exp>
+                    <exp bool_exp="pv0 == 1">
+                      <value>false</value>
+                    </exp>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:Alm_Act</pv_name>
+                  </rule>
+                </rules>
+              </widget>
+              <widget type="label" version="2.0.0">
+                <name>MSG_InhibitForce</name>
+                <text>- Alarms Sens disabled</text>
+                <x>20</x>
+                <y>50</y>
+                <width>190</width>
+                <background_color>
+                  <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+                  </color>
+                </background_color>
+                <vertical_alignment>1</vertical_alignment>
+                <rules>
+                  <rule name="Visibility rule" prop_id="visible" out_exp="false">
+                    <exp bool_exp="pv0 == 0">
+                      <value>false</value>
+                    </exp>
+                    <exp bool_exp="pv0 == 1">
+                      <value>true</value>
+                    </exp>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:Alm_Sens</pv_name>
+                  </rule>
+                </rules>
+              </widget>
+            </widget>
+            <widget type="group" version="2.0.0">
+              <name>Alarms</name>
+              <x>570</x>
+              <y>10</y>
+              <width>230</width>
+              <height>480</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>Rect_ALM_Title</name>
+                <width>230</width>
+                <height>59</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>
+                <rules>
+                  <rule name="BackColor" prop_id="background_color" out_exp="false">
+                    <exp bool_exp="pv0==0">
+                      <value>
+                        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+                        </color>
+                      </value>
+                    </exp>
+                    <exp bool_exp="pv0 == 1">
+                      <value>
+                        <color name="RED-GROUP-BORDER" red="167" green="134" blue="130">
+                        </color>
+                      </value>
+                    </exp>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:GroupAlarm</pv_name>
+                  </rule>
+                </rules>
+              </widget>
+              <widget type="label" version="2.0.0">
+                <name>LB_ALM_Title</name>
+                <class>HEADER2</class>
+                <text>Alarms</text>
+                <width>230</width>
+                <height>31</height>
+                <font use_class="true">
+                  <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.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 type="rectangle" version="2.0.0">
+                <name>Rect_ALM_Back</name>
+                <y>30</y>
+                <width>230</width>
+                <height>450</height>
+                <line_width>2</line_width>
+                <line_color>
+                  <color name="GROUP-BORDER" red="150" green="155" blue="151">
+                  </color>
+                </line_color>
+                <background_color>
+                  <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+                  </color>
+                </background_color>
+                <corner_height>10</corner_height>
+                <rules>
+                  <rule name="Linecolor" prop_id="line_color" out_exp="false">
+                    <exp bool_exp="pv0==0">
+                      <value>
+                        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+                        </color>
+                      </value>
+                    </exp>
+                    <exp bool_exp="pv0==1">
+                      <value>
+                        <color name="RED-GROUP-BORDER" red="167" green="134" blue="130">
+                        </color>
+                      </value>
+                    </exp>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:GroupAlarm</pv_name>
+                  </rule>
+                  <rule name="Backcolor" prop_id="background_color" out_exp="false">
+                    <exp bool_exp="pv0==0">
+                      <value>
+                        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+                        </color>
+                      </value>
+                    </exp>
+                    <exp bool_exp="pv0==1">
+                      <value>
+                        <color name="RED-GROUP-BACKGROUND" red="208" green="175" blue="172">
+                        </color>
+                      </value>
+                    </exp>
+                    <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:GroupAlarm</pv_name>
+                  </rule>
+                </rules>
+              </widget>
+              <widget type="led" version="2.0.0">
+                <name>LED_ALM_IO_error</name>
+                <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:Alm_Sens</pv_name>
+                <x>18</x>
+                <y>52</y>
+                <off_color>
+                  <color name="Grid" red="169" green="169" blue="169">
+                  </color>
+                </off_color>
+                <on_color>
+                  <color name="MAJOR" red="252" green="13" blue="27">
+                  </color>
+                </on_color>
+                <tooltip>I/O Error</tooltip>
+                <border_alarm_sensitive>false</border_alarm_sensitive>
+              </widget>
+              <widget type="led" version="2.0.0">
+                <name>LED_ALM_Module_Error</name>
+                <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:Alm_Act</pv_name>
+                <x>18</x>
+                <y>107</y>
+                <off_color>
+                  <color name="Grid" red="169" green="169" blue="169">
+                  </color>
+                </off_color>
+                <on_color>
+                  <color name="MAJOR" red="252" green="13" blue="27">
+                  </color>
+                </on_color>
+                <tooltip>Siemens Module Error</tooltip>
+                <border_alarm_sensitive>false</border_alarm_sensitive>
+              </widget>
+              <widget type="label" version="2.0.0">
+                <name>LB_ALM_IO_Error</name>
+                <text>Alarm Sensor</text>
+                <x>58</x>
+                <y>52</y>
+                <width>160</width>
+                <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="label" version="2.0.0">
+                <name>LB_ALM_Module_Error</name>
+                <text>Alarm Act</text>
+                <x>58</x>
+                <y>107</y>
+                <width>160</width>
+                <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="action_button" version="3.0.0">
+              <name>BTN_FORCE_UNLOCK</name>
+              <actions execute_as_one="true">
+                <action type="write_pv">
+                  <pv_name>loc://${SecSub}:${Dis}-${Dev}-${Index}:EnaForceUnlock</pv_name>
+                  <value>0</value>
+                  <description>Write EnaForceUnlock</description>
+                </action>
+              </actions>
+              <text>Forced Unlock</text>
+              <x>570</x>
+              <y>504</y>
+              <width>230</width>
+              <height>35</height>
+              <rules>
+                <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+                  <exp bool_exp="(pv0 == 0)">
+                    <value>true</value>
+                  </exp>
+                  <exp bool_exp="(pv0 == 1)">
+                    <value>false</value>
+                  </exp>
+                  <pv_name>loc://${SecSub}:${Dis}-${Dev}-${Index}:EnaForceUnlock</pv_name>
+                </rule>
+              </rules>
+              <tooltip>Force unlock device</tooltip>
+            </widget>
+            <widget type="action_button" version="3.0.0">
+              <name>BTN_ACK</name>
+              <actions>
+                <action type="write_pv">
+                  <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:Cmd_AckAlarm</pv_name>
+                  <value>1</value>
+                  <description>Acknowledge alarms</description>
+                </action>
+              </actions>
+              <text>Acknowledge Alarm</text>
+              <x>570</x>
+              <y>554</y>
+              <width>230</width>
+              <height>35</height>
+              <background_color>
+                <color name="ORANGE" red="254" green="194" blue="81">
+                </color>
+              </background_color>
+              <rules>
+                <rule name="EnableRule" prop_id="enabled" out_exp="false">
+                  <exp bool_exp="(pv0 == 0) || (pv1 == 1) || (pv2 == 0)">
+                    <value>false</value>
+                  </exp>
+                  <exp bool_exp="(pv0 == 1) &amp;&amp; (pv1 == 0) &amp;&amp; (pv2 == 1)">
+                    <value>true</value>
+                  </exp>
+                  <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:Alm_Sens</pv_name>
+                  <pv_name>loc://${SecSub}:${Dis}-${Dev}-${Index}:EnaForceUnlock</pv_name>
+                  <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:Alm_Act</pv_name>
+                </rule>
+              </rules>
+              <tooltip>Acknowledge alarms</tooltip>
+            </widget>
+          </widget>
+        </children>
+      </tab>
+      <tab>
+        <name> Trend</name>
+        <children>
+          <widget type="databrowser" version="2.0.0">
+            <name>DataBrowser</name>
+            <file>AnalogTransmitter_Faceplate_Trend_TS2_TICP.plt</file>
+            <x>3</x>
+            <width>778</width>
+            <height>597</height>
+          </widget>
+        </children>
+      </tab>
+    </tabs>
+    <x>10</x>
+    <y>55</y>
+    <width>814</width>
+    <height>633</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <tab_height>40</tab_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Header Bar</name>
+    <width>834</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color red="0" green="0" blue="255" alpha="0">
+      </color>
+    </line_color>
+    <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>LB_HeaderPVName</name>
+    <text>${SecSub}:${Dis}-${Dev}-${Index}</text>
+    <x>20</x>
+    <width>580</width>
+    <height>50</height>
+    <font>
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>ICON_Locked</name>
+    <actions execute_as_one="true">
+      <action type="write_pv">
+        <pv_name>loc://${SecSub}:${Dis}-${Dev}-${Index}:Lock(99)</pv_name>
+        <value>1</value>
+        <description>Run Lock script</description>
+      </action>
+    </actions>
+    <text>Lock</text>
+    <x>725</x>
+    <y>10</y>
+    <width>90</width>
+    <rules>
+      <rule name="VisibilityRule" prop_id="visible" out_exp="false">
+        <exp bool_exp="(pv0 == 0) &amp;&amp; (pv1 == 0)">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="(pv0 == 1) || (pv1 == 1)">
+          <value>false</value>
+        </exp>
+        <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:DevLocked</pv_name>
+        <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:Inhibit_Lock</pv_name>
+      </rule>
+    </rules>
+    <scripts>
+      <script file="EmbeddedJs">
+        <text><![CDATA[/* Embedded javascript */
+/* Author: Miklos Boros*/
+/* Function: generate unique Machine ID from the network adapters to use it for locking mechanism*/
+
+PVUtil = org.csstudio.display.builder.runtime.script.PVUtil;
+logger = org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger();
+
+var Lock = pvs[0];/*loc://${SecSub}:${Dis}-${Dev}-${Index}:Lock*/
+var Cmd_DevLock = pvs[1];/*${SecSub}:${Dis}-${Dev}-${Index}:Cmd_DevLock*/
+var P_Faceplate_LockID = pvs[2];/*${SecSub}:${Dis}-${Dev}-${Index}:P_Faceplate_LockID*/
+var Inhibit_Lock = pvs[3];/*${SecSub}:${Dis}-${Dev}-${Index}:Inhibit_Lock*/
+var Faceplate_LockID = pvs[4];/*${SecSub}:${Dis}-${Dev}-${Index}:Faceplate_LockID*/
+var BlockIcon_LockID = pvs[5];/*${SecSub}:${Dis}-${Dev}-${Index}:BlockIcon_LockID*/
+var EnaForceUnlock = pvs[6];/*loc://${SecSub}:${Dis}-${Dev}-${Index}:EnaForceUnlock*/
+var DevLocked = pvs[7];/*${SecSub}:${Dis}-${Dev}-${Index}:DevLocked*/
+
+
+
+
+var PV1 = PVUtil.getLong(Faceplate_LockID); /*Faceplate_LockID*/
+var PV2 = PVUtil.getLong(BlockIcon_LockID); /*BlockIcon_LockID*/
+
+//OnShow
+if (PVUtil.getLong(DevLocked) == 1) {  /*DevLocked*/
+  
+  if (PV1.toString() == PV2.toString()){ /*FaceplateLockID != BlockIconeLockID*/
+	
+     logger.info("    Owner");
+     EnaForceUnlock.setValue(0);     /*Write EnaForceUnlock*/
+ 
+  } else
+  {
+     logger.info("    Faceplate FaceplateLockID "+ PV1);
+     logger.info("    Faceplate BlockIconeLockID "+ PV2);  
+   
+     logger.info("    Guest");
+     EnaForceUnlock.setValue(1);     /*Write EnaForceUnlock*/
+ }
+
+
+
+}
+// OnClick
+if (PVUtil.getLong(Lock) != 99) {  /*loc://Lock, check if the script was triggered because of a button press or initilization*/
+ if (PVUtil.getLong(Inhibit_Lock) == 0) {  /*Inhibit_lock, check if locking is inhibited*/
+
+   var UniqueText = "";
+   var en = java.net.NetworkInterface.getNetworkInterfaces();
+   var inf;
+   var enumIpAddr;
+      for (en = java.net.NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();) {
+         intf = en.nextElement();
+         UniqueText = UniqueText + intf.getName() + intf.getDisplayName();
+           for (enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements(); ) {
+             UniqueText = UniqueText + enumIpAddr.nextElement().toString();
+           }
+      }
+
+
+   var a_table = "00000000 77073096 EE0E612C 990951BA 076DC419 706AF48F E963A535 9E6495A3 0EDB8832 79DCB8A4 E0D5E91E 97D2D988 09B64C2B 7EB17CBD E7B82D07 90BF1D91 1DB71064 6AB020F2 F3B97148 84BE41DE 1ADAD47D 6DDDE4EB F4D4B551 83D385C7 136C9856 646BA8C0 FD62F97A 8A65C9EC 14015C4F 63066CD9 FA0F3D63 8D080DF5 3B6E20C8 4C69105E D56041E4 A2677172 3C03E4D1 4B04D447 D20D85FD A50AB56B 35B5A8FA 42B2986C DBBBC9D6 ACBCF940 32D86CE3 45DF5C75 DCD60DCF ABD13D59 26D930AC 51DE003A C8D75180 BFD06116 21B4F4B5 56B3C423 CFBA9599 B8BDA50F 2802B89E 5F058808 C60CD9B2 B10BE924 2F6F7C87 58684C11 C1611DAB B6662D3D 76DC4190 01DB7106 98D220BC EFD5102A 71B18589 06B6B51F 9FBFE4A5 E8B8D433 7807C9A2 0F00F934 9609A88E E10E9818 7F6A0DBB 086D3D2D 91646C97 E6635C01 6B6B51F4 1C6C6162 856530D8 F262004E 6C0695ED 1B01A57B 8208F4C1 F50FC457 65B0D9C6 12B7E950 8BBEB8EA FCB9887C 62DD1DDF 15DA2D49 8CD37CF3 FBD44C65 4DB26158 3AB551CE A3BC0074 D4BB30E2 4ADFA541 3DD895D7 A4D1C46D D3D6F4FB 4369E96A 346ED9FC AD678846 DA60B8D0 44042D73 33031DE5 AA0A4C5F DD0D7CC9 5005713C 270241AA BE0B1010 C90C2086 5768B525 206F85B3 B966D409 CE61E49F 5EDEF90E 29D9C998 B0D09822 C7D7A8B4 59B33D17 2EB40D81 B7BD5C3B C0BA6CAD EDB88320 9ABFB3B6 03B6E20C 74B1D29A EAD54739 9DD277AF 04DB2615 73DC1683 E3630B12 94643B84 0D6D6A3E 7A6A5AA8 E40ECF0B 9309FF9D 0A00AE27 7D079EB1 F00F9344 8708A3D2 1E01F268 6906C2FE F762575D 806567CB 196C3671 6E6B06E7 FED41B76 89D32BE0 10DA7A5A 67DD4ACC F9B9DF6F 8EBEEFF9 17B7BE43 60B08ED5 D6D6A3E8 A1D1937E 38D8C2C4 4FDFF252 D1BB67F1 A6BC5767 3FB506DD 48B2364B D80D2BDA AF0A1B4C 36034AF6 41047A60 DF60EFC3 A867DF55 316E8EEF 4669BE79 CB61B38C BC66831A 256FD2A0 5268E236 CC0C7795 BB0B4703 220216B9 5505262F C5BA3BBE B2BD0B28 2BB45A92 5CB36A04 C2D7FFA7 B5D0CF31 2CD99E8B 5BDEAE1D 9B64C2B0 EC63F226 756AA39C 026D930A 9C0906A9 EB0E363F 72076785 05005713 95BF4A82 E2B87A14 7BB12BAE 0CB61B38 92D28E9B E5D5BE0D 7CDCEFB7 0BDBDF21 86D3D2D4 F1D4E242 68DDB3F8 1FDA836E 81BE16CD F6B9265B 6FB077E1 18B74777 88085AE6 FF0F6A70 66063BCA 11010B5C 8F659EFF F862AE69 616BFFD3 166CCF45 A00AE278 D70DD2EE 4E048354 3903B3C2 A7672661 D06016F7 4969474D 3E6E77DB AED16A4A D9D65ADC 40DF0B66 37D83BF0 A9BCAE53 DEBB9EC5 47B2CF7F 30B5FFE9 BDBDF21C CABAC28A 53B39330 24B4A3A6 BAD03605 CDD70693 54DE5729 23D967BF B3667A2E C4614AB8 5D681B02 2A6F2B94 B40BBE37 C30C8EA1 5A05DF1B 2D02EF8D";
+   var b_table = a_table.split(' ').map(function(s){ return parseInt(s,16) });
+   function b_crc32 (str) {
+      var crc = -1;
+      for(var i=0, iTop=str.length; i<iTop; i++) {
+          crc = ( crc >>> 8 ) ^ b_table[( crc ^ str.charCodeAt( i ) ) & 0xFF];
+      }
+     return (crc ^ (-1)) >>> 0;
+   };
+
+   var crc = b_crc32(UniqueText);
+   logger.info("    Faceplate machine ID: "+crc);
+   P_Faceplate_LockID.setValue(crc);   /*Write P_Faceplate_LockID*/
+   Cmd_DevLock.setValue(1);     /*Write Lock*/
+
+ } /*Lock inhibit*/
+} /*onshow*/
+
+]]></text>
+        <pv_name>loc://${SecSub}:${Dis}-${Dev}-${Index}:Lock</pv_name>
+        <pv_name trigger="false">${SecSub}:${Dis}-${Dev}-${Index}:Cmd_DevLock</pv_name>
+        <pv_name trigger="false">${SecSub}:${Dis}-${Dev}-${Index}:P_Faceplate_LockID</pv_name>
+        <pv_name trigger="false">${SecSub}:${Dis}-${Dev}-${Index}:Inhibit_Lock</pv_name>
+        <pv_name trigger="false">${SecSub}:${Dis}-${Dev}-${Index}:Faceplate_LockID</pv_name>
+        <pv_name trigger="false">${SecSub}:${Dis}-${Dev}-${Index}:BlockIcon_LockID</pv_name>
+        <pv_name trigger="false">loc://${SecSub}:${Dis}-${Dev}-${Index}:EnaForceUnlock</pv_name>
+        <pv_name trigger="false">${SecSub}:${Dis}-${Dev}-${Index}:DevLocked</pv_name>
+      </script>
+    </scripts>
+    <tooltip>Lock this device</tooltip>
+  </widget>
+</display>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate_Trend_TS2_TICP.plt b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate_Trend_TS2_TICP.plt
new file mode 100644
index 0000000000000000000000000000000000000000..012fb48632cfde10a1ddc2fd3c7c722226b985ea
--- /dev/null
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate_Trend_TS2_TICP.plt
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databrowser>
+  <title></title>
+  <show_toolbar>true</show_toolbar>
+  <update_period>3.0</update_period>
+  <scroll_step>5</scroll_step>
+  <scroll>true</scroll>
+  <start>-10 minutes</start>
+  <end>now</end>
+  <archive_rescale>NONE</archive_rescale>
+  <foreground>
+    <red>229</red>
+    <green>229</green>
+    <blue>229</blue>
+  </foreground>
+  <background>
+    <red>77</red>
+    <green>77</green>
+    <blue>77</blue>
+  </background>
+  <title_font>System|16|1</title_font>
+  <label_font>System|11|1</label_font>
+  <scale_font>System|10|0</scale_font>
+  <legend_font>System|10|0</legend_font>
+  <axes>
+    <axis>
+      <visible>true</visible>
+      <name>Value Axis</name>
+      <use_axis_name>true</use_axis_name>
+      <use_trace_names>true</use_trace_names>
+      <right>false</right>
+      <color>
+        <red>255</red>
+        <green>165</green>
+        <blue>0</blue>
+      </color>
+      <min>8.36645</min>
+      <max>8.64255</max>
+      <grid>true</grid>
+      <autoscale>true</autoscale>
+      <log_scale>false</log_scale>
+    </axis>
+    <axis>
+      <visible>false</visible>
+      <name>Value 1</name>
+      <use_axis_name>false</use_axis_name>
+      <use_trace_names>true</use_trace_names>
+      <right>false</right>
+      <color>
+        <red>0</red>
+        <green>0</green>
+        <blue>0</blue>
+      </color>
+      <min>7.243775</min>
+      <max>7.3279250000000005</max>
+      <grid>false</grid>
+      <autoscale>true</autoscale>
+      <log_scale>false</log_scale>
+    </axis>
+    <axis>
+      <visible>true</visible>
+      <name>Value 2</name>
+      <use_axis_name>false</use_axis_name>
+      <use_trace_names>true</use_trace_names>
+      <right>false</right>
+      <color>
+        <red>0</red>
+        <green>0</green>
+        <blue>0</blue>
+      </color>
+      <min>810.94</min>
+      <max>832.0600000000001</max>
+      <grid>false</grid>
+      <autoscale>true</autoscale>
+      <log_scale>false</log_scale>
+    </axis>
+    <axis>
+      <visible>true</visible>
+      <name>Value 3</name>
+      <use_axis_name>false</use_axis_name>
+      <use_trace_names>true</use_trace_names>
+      <right>false</right>
+      <color>
+        <red>0</red>
+        <green>0</green>
+        <blue>0</blue>
+      </color>
+      <min>0.9</min>
+      <max>3.1</max>
+      <grid>false</grid>
+      <autoscale>true</autoscale>
+      <log_scale>false</log_scale>
+    </axis>
+  </axes>
+  <annotations>
+  </annotations>
+  <pvlist>
+    <pv>
+      <display_name>${SecSub}:${Dis}-${Dev}-${Index}:Val</display_name>
+      <visible>true</visible>
+      <name>${SecSub}:${Dis}-${Dev}-${Index}:Val</name>
+      <axis>0</axis>
+      <color>
+        <red>255</red>
+        <green>0</green>
+        <blue>0</blue>
+      </color>
+      <trace_type>AREA</trace_type>
+      <linewidth>3</linewidth>
+      <line_style>SOLID</line_style>
+      <point_type>NONE</point_type>
+      <point_size>2</point_size>
+      <waveform_index>0</waveform_index>
+      <period>0.0</period>
+      <ring_size>5000</ring_size>
+      <request>RAW</request>
+      <archive>
+        <name>pbraw://archiver-01.tn.esss.lu.se:17668/retrieval</name>
+        <url>pbraw://archiver-01.tn.esss.lu.se:17668/retrieval</url>
+        <key>1</key>
+      </archive>
+    </pv>
+  </pvlist>
+</databrowser>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Vacuum_Faceplate.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Vacuum_Faceplate.bob
index 60ca87c54a34b34abdacf4c656a34f4333583d35..52fa9c1ca4fb8ccfec26af258c67a0041427c010 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Vacuum_Faceplate.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Vacuum_Faceplate.bob
@@ -69,47 +69,18 @@
                   <color name="TEXT-LIGHT" red="230" green="230" blue="230">
                   </color>
                 </foreground_color>
-                <background_color use_class="true">
-                  <color name="Background" red="220" green="225" blue="221">
-                  </color>
-                </background_color>
-                <transparent use_class="true">true</transparent>
                 <horizontal_alignment>1</horizontal_alignment>
                 <vertical_alignment>1</vertical_alignment>
               </widget>
-              <widget type="label" version="2.0.0">
-                <name>LB_Meas_Label</name>
-                <text>${WIDLabel}</text>
-                <x>5</x>
-                <y>186</y>
-                <width>280</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>
-                <horizontal_alignment>1</horizontal_alignment>
-                <vertical_alignment>1</vertical_alignment>
-              </widget>
-              <widget type="meter" version="2.0.0">
+              <widget type="meter" version="3.0.0">
                 <name>Meter_Meas_Val</name>
                 <pv_name>${SecSub}:${Dis}-${Dev}-${Index}:MeasValue</pv_name>
-                <y>31</y>
-                <width>290</width>
+                <x>1</x>
+                <y>30</y>
+                <width>287</width>
                 <height>165</height>
                 <precision>9</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>
+                <show_limits>false</show_limits>
                 <rules>
                   <rule name="HIHI" prop_id="level_hihi" out_exp="true">
                     <exp bool_exp="true">
@@ -165,16 +136,14 @@
                 <tooltip>Pressure and limits</tooltip>
                 <border_alarm_sensitive>false</border_alarm_sensitive>
                 <limits_from_pv>false</limits_from_pv>
-                <lcd_font>4</lcd_font>
-                <knob_color>
-                  <color name="Button_Background" red="236" green="236" blue="236">
-                  </color>
-                </knob_color>
-                <medium_tick_visible>false</medium_tick_visible>
                 <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 type="textupdate" version="2.0.0">
                 <name>TU_FeedbackForceVal</name>
@@ -229,6 +198,24 @@
                 <horizontal_alignment>2</horizontal_alignment>
                 <vertical_alignment>1</vertical_alignment>
               </widget>
+              <widget type="label" version="2.0.0">
+                <name>LB_Meas_Label</name>
+                <text>${WIDLabel}</text>
+                <x>8</x>
+                <y>192</y>
+                <width>270</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>
+                <horizontal_alignment>1</horizontal_alignment>
+                <vertical_alignment>1</vertical_alignment>
+              </widget>
             </widget>
             <widget type="group" version="2.0.0">
               <name>Limits</name>
@@ -283,11 +270,6 @@
                   <color name="TEXT-LIGHT" red="230" green="230" blue="230">
                   </color>
                 </foreground_color>
-                <background_color use_class="true">
-                  <color name="Background" red="220" green="225" blue="221">
-                  </color>
-                </background_color>
-                <transparent use_class="true">true</transparent>
                 <horizontal_alignment>1</horizontal_alignment>
                 <vertical_alignment>1</vertical_alignment>
               </widget>
@@ -545,11 +527,6 @@
                   <color name="TEXT-LIGHT" red="230" green="230" blue="230">
                   </color>
                 </foreground_color>
-                <background_color use_class="true">
-                  <color name="Background" red="220" green="225" blue="221">
-                  </color>
-                </background_color>
-                <transparent use_class="true">true</transparent>
                 <horizontal_alignment>1</horizontal_alignment>
                 <vertical_alignment>1</vertical_alignment>
               </widget>
@@ -653,11 +630,6 @@
                   <color name="TEXT-LIGHT" red="230" green="230" blue="230">
                   </color>
                 </foreground_color>
-                <background_color use_class="true">
-                  <color name="Background" red="220" green="225" blue="221">
-                  </color>
-                </background_color>
-                <transparent use_class="true">true</transparent>
                 <horizontal_alignment>1</horizontal_alignment>
                 <vertical_alignment>1</vertical_alignment>
               </widget>
@@ -778,11 +750,6 @@
                   <color name="TEXT-LIGHT" red="230" green="230" blue="230">
                   </color>
                 </foreground_color>
-                <background_color use_class="true">
-                  <color name="Background" red="220" green="225" blue="221">
-                  </color>
-                </background_color>
-                <transparent use_class="true">true</transparent>
                 <horizontal_alignment>1</horizontal_alignment>
                 <vertical_alignment>1</vertical_alignment>
               </widget>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Controllers/CV_FlowController_BlockIcon_Vertical_Right.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Controllers/CV_FlowController_BlockIcon_Vertical_Right.bob
index 02ad4d79d58f10f3427904edcca6c6dc48aca946..8067834fb2b0652c501f3631568849dc4c037a05 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Controllers/CV_FlowController_BlockIcon_Vertical_Right.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Controllers/CV_FlowController_BlockIcon_Vertical_Right.bob
@@ -84,7 +84,7 @@
     <rules>
       <rule name="TextRule" prop_id="text" out_exp="false">
         <exp bool_exp="pv0 == true">
-          <value> </value>
+          <value>A </value>
         </exp>
         <exp bool_exp="pv1 == true">
           <value>M</value>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Horizontal.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Horizontal.bob
index 17dcaf60a438672feb72e231ba497c10a394570d..80ebfd9d87d2c4d73877fba0d5cee0e7ab12360b 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Horizontal.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Horizontal.bob
@@ -33,7 +33,7 @@
     <width>18</width>
     <height>30</height>
     <font>
-      <font family="Source Sans Pro" style="BOLD" size="13.0">
+      <font family="Source Sans Pro" style="BOLD" size="15.0">
       </font>
     </font>
     <horizontal_alignment>1</horizontal_alignment>
@@ -41,7 +41,7 @@
     <rules>
       <rule name="TextRule" prop_id="text" out_exp="false">
         <exp bool_exp="pv0 == true">
-          <value> </value>
+          <value>A</value>
         </exp>
         <exp bool_exp="pv1 == true">
           <value>M</value>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Vertical.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Vertical.bob
index 498e803bef416564987769830337db084c22010d..11213e2b7c1634756a6e2fdb55b87bd5336c03e9 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Vertical.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Vertical.bob
@@ -19,7 +19,7 @@
     <rules>
       <rule name="TextRule" prop_id="text" out_exp="false">
         <exp bool_exp="pv0 == true">
-          <value> </value>
+          <value>A</value>
         </exp>
         <exp bool_exp="pv1 == true">
           <value>M</value>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob
index 12d4ed58962590733f8cc59886c4851bc4132aaa..8354f46036479ffd1ddc0fe04667272a4ef8d3c8 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob
@@ -290,7 +290,7 @@
             </widget>
             <widget type="label" version="2.0.0">
               <name>LB_OP_MODES</name>
-              <text>OP MODES</text>
+              <text>MANAGE</text>
               <width>300</width>
               <height>35</height>
               <font>
@@ -323,10 +323,10 @@
             </widget>
             <widget type="label" version="2.0.0">
               <name>LB_STAT_AUTO</name>
-              <text>AUTO</text>
+              <text>STATES MACHINE</text>
               <x>110</x>
               <y>50</y>
-              <width>60</width>
+              <width>148</width>
               <height>25</height>
               <background_color>
                 <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
@@ -349,10 +349,10 @@
             </widget>
             <widget type="label" version="2.0.0">
               <name>LB_STAT_MANUAL</name>
-              <text>MANUAL</text>
+              <text>OPERATOR</text>
               <x>110</x>
               <y>85</y>
-              <width>60</width>
+              <width>128</width>
               <height>25</height>
               <background_color>
                 <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
@@ -1717,7 +1717,7 @@
               </action>
             </actions>
             <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Cmd_Auto</pv_name>
-            <text>AUTO</text>
+            <text>STATES MACHINE</text>
             <x>15</x>
             <y>631</y>
             <width>214</width>
@@ -1746,7 +1746,7 @@
               </action>
             </actions>
             <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Cmd_Manual</pv_name>
-            <text>MANUAL</text>
+            <text>OPERATOR</text>
             <x>234</x>
             <y>631</y>
             <width>251</width>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Horizontal_Compact.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Horizontal_Compact.bob
index 8e49d86317ae4c9b525bd4d0ab3f45ac2a770107..2ad4edf1fd72a64e233c361ba5c6408ef6ce8074 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Horizontal_Compact.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Horizontal_Compact.bob
@@ -115,7 +115,7 @@
     <rules>
       <rule name="TextRule" prop_id="text" out_exp="false">
         <exp bool_exp="pv0 == true">
-          <value> </value>
+          <value> A</value>
         </exp>
         <exp bool_exp="pv1 == true">
           <value>M</value>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_BlockIcon_Horizontal.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_BlockIcon_Horizontal.bob
index 2bcec0cac53d897d98a7aa71968cdb10bd48ae28..a977fd1423210ff4ee3b3a0953e28fd2a0fd6175 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_BlockIcon_Horizontal.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_BlockIcon_Horizontal.bob
@@ -83,7 +83,7 @@
     <rules>
       <rule name="TextRule" prop_id="text" out_exp="false">
         <exp bool_exp="pv0 == true">
-          <value> </value>
+          <value>A </value>
         </exp>
         <exp bool_exp="pv1 == true">
           <value>M</value>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_BlockIcon_Vertical_Right.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_BlockIcon_Vertical_Right.bob
index b2d930d36dd2e254583f2eb1613ee54bd495bffd..4991ff0ea0bea8c5e35626efb21731fb7d56b891 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_BlockIcon_Vertical_Right.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_BlockIcon_Vertical_Right.bob
@@ -84,7 +84,7 @@
     <rules>
       <rule name="TextRule" prop_id="text" out_exp="false">
         <exp bool_exp="pv0 == true">
-          <value> </value>
+          <value>A</value>
         </exp>
         <exp bool_exp="pv1 == true">
           <value>M</value>
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob b/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
index 147183fb4f15247a413bbd6041a2519063a152d7..93f01e333589679a9e78c63b18df85b3451dbeca 100755
--- a/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
+++ b/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
@@ -1584,7 +1584,7 @@
       <WIDLabel>Pt100 temperature</WIDLabel>
       <WIDSecSub>TS2-010CDL</WIDSecSub>
     </macros>
-    <x>240</x>
+    <x>235</x>
     <y>87</y>
     <width>237</width>
     <height>22</height>
@@ -1601,7 +1601,7 @@
       <WIDLabel>Pt100 teperature</WIDLabel>
       <WIDSecSub>TS2-010CDL</WIDSecSub>
     </macros>
-    <x>240</x>
+    <x>235</x>
     <y>117</y>
     <width>237</width>
     <height>22</height>
@@ -1618,7 +1618,7 @@
       <WIDLabel>CERNOX temperature</WIDLabel>
       <WIDSecSub>TS2-010CDL</WIDSecSub>
     </macros>
-    <x>240</x>
+    <x>235</x>
     <y>148</y>
     <width>237</width>
     <height>22</height>
@@ -1635,7 +1635,7 @@
       <WIDLabel>CERNOX temperature</WIDLabel>
       <WIDSecSub>TS2-010CDL</WIDSecSub>
     </macros>
-    <x>240</x>
+    <x>235</x>
     <y>177</y>
     <width>237</width>
     <height>22</height>
@@ -1673,6 +1673,7 @@
       <WIDDev>PT</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>82370</WIDIndex>
+      <WIDLabel>CDS Vacuum</WIDLabel>
       <WIDSecSub>TS2-010CDL</WIDSecSub>
     </macros>
     <x>110</x>
@@ -1688,6 +1689,7 @@
       <WIDDev>PT</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>82360</WIDIndex>
+      <WIDLabel>PT-82360</WIDLabel>
       <WIDSecSub>TS2-010CDL</WIDSecSub>
     </macros>
     <x>280</x>
@@ -3405,7 +3407,7 @@
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_20</name>
-    <text>version 2020-07-27 09:00</text>
+    <text>version 2020-07-30 17:00</text>
     <x>2287</x>
     <y>1303</y>
     <width>197</width>
@@ -3482,6 +3484,7 @@
       <WIDDev>TE</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>VBEXT</WIDIndex>
+      <WIDLabel>PT100 Temperature</WIDLabel>
       <WIDSecSub>TS2-010CDL</WIDSecSub>
     </macros>
     <x>135</x>
@@ -3514,4 +3517,76 @@
     <tooltip></tooltip>
     <confirm_message></confirm_message>
   </widget>
+  <widget type="group" version="2.0.0">
+    <name>TICP Flow</name>
+    <x>73</x>
+    <y>274</y>
+    <width>188</width>
+    <height>74</height>
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <transparent>true</transparent>
+    <widget type="embedded" version="2.0.0">
+      <name>Analog_TRANSMITTER_OnlyText_Vertical_BlockIcon_77</name>
+      <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Horizontal_TICP.bob</file>
+      <macros>
+        <WIDDev>FT</WIDDev>
+        <WIDDis>Cryo</WIDDis>
+        <WIDIndex>23920</WIDIndex>
+        <WIDSecSub>CrS-TICP</WIDSecSub>
+        <WIDUnit>g/s</WIDUnit>
+      </macros>
+      <y>11</y>
+      <width>173</width>
+      <height>22</height>
+      <resize>1</resize>
+      <transparent>true</transparent>
+    </widget>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Analog_TRANSMITTER_OnlyText_Vertical_BlockIcon_46</name>
+    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <macros>
+      <WIDDev>TE</WIDDev>
+      <WIDDis>Cryo</WIDDis>
+      <WIDIndex>062</WIDIndex>
+      <WIDSecSub>TS2-010CRM</WIDSecSub>
+    </macros>
+    <x>1438</x>
+    <y>579</y>
+    <width>115</width>
+    <height>45</height>
+    <resize>1</resize>
+    <transparent>true</transparent>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>WID_TitleLBL</name>
+    <text>TC-004</text>
+    <x>1459</x>
+    <y>579</y>
+    <width>86</width>
+    <height>18</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="17.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="TEXT" red="25" green="25" blue="25">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <transparent>false</transparent>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <tooltip>Device name</tooltip>
+  </widget>
 </display>
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/TS2_modeSelector.bob b/NON-APPROVED/TS2/ts2-cryomodule/TS2_modeSelector.bob
index e3eb31c5d17cb3d8f9bbee4fd9a1f74ed0ec16ed..89e514ee3cba7cea390a7967468b64a5a45e6e31 100644
--- a/NON-APPROVED/TS2/ts2-cryomodule/TS2_modeSelector.bob
+++ b/NON-APPROVED/TS2/ts2-cryomodule/TS2_modeSelector.bob
@@ -147,7 +147,7 @@ else:
     <square>true</square>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_6</name>
+    <name>Standby4K</name>
     <actions>
       <action type="write_pv">
         <pv_name>TS2-010:Cryo-Virt-MODSEL:Cmd_Stand_by_4K</pv_name>
@@ -169,7 +169,7 @@ else:
     <show_confirm_dialog>true</show_confirm_dialog>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_7</name>
+    <name>Standby2K</name>
     <actions>
       <action type="write_pv">
         <pv_name>TS2-010:Cryo-Virt-MODSEL:Cmd_Stand_by_2K</pv_name>
@@ -191,7 +191,7 @@ else:
     <show_confirm_dialog>true</show_confirm_dialog>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_8</name>
+    <name>2KRF</name>
     <actions>
       <action type="write_pv">
         <pv_name>TS2-010:Cryo-Virt-MODSEL:Cmd_Nominal_2K_RF</pv_name>
@@ -213,7 +213,7 @@ else:
     <show_confirm_dialog>true</show_confirm_dialog>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_9</name>
+    <name>Standby300K</name>
     <actions>
       <action type="write_pv">
         <pv_name>TS2-010:Cryo-Virt-MODSEL:Cmd_Stand_by_300K</pv_name>
@@ -236,7 +236,7 @@ else:
     <show_confirm_dialog>true</show_confirm_dialog>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_10</name>
+    <name>Standby80K</name>
     <actions>
       <action type="write_pv">
         <pv_name>TS2-010:Cryo-Virt-MODSEL:Cmd_Stand_by_80K</pv_name>
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/controllers_overview.bob b/NON-APPROVED/TS2/ts2-cryomodule/controllers_overview.bob
index 365d8d6a39461ca2a0872dd091db721437bde72a..b73e78751e128904e7f73cf4f7dc7b4e95334b41 100644
--- a/NON-APPROVED/TS2/ts2-cryomodule/controllers_overview.bob
+++ b/NON-APPROVED/TS2/ts2-cryomodule/controllers_overview.bob
@@ -26,10 +26,10 @@
   </widget>
   <widget type="label" version="2.0.0">
     <name>AUTO_LABEL</name>
-    <text>AUTO</text>
-    <x>350</x>
+    <text>MODES</text>
+    <x>345</x>
     <y>70</y>
-    <width>50</width>
+    <width>70</width>
     <font>
       <font family="Source Sans Pro" style="BOLD" size="16.0">
       </font>
@@ -37,8 +37,8 @@
   </widget>
   <widget type="label" version="2.0.0">
     <name>MANUAL_LABEL</name>
-    <text>MANUAL</text>
-    <x>520</x>
+    <text>OPERATOR</text>
+    <x>511</x>
     <y>70</y>
     <width>80</width>
     <font>