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 60e902f76ffe22001cefe52db0298459a85fcdc9..40618e1f9ac6bc0bcde19f9ab78f98efd427b76e 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate.bob
@@ -372,22 +372,10 @@
                 <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>
+                <maximum>2000.0</maximum>
+                <limits_from_pv>false</limits_from_pv>
               </widget>
               <widget type="spinner" version="2.0.0">
                 <name>INP_LOLO</name>
@@ -414,6 +402,8 @@
                 </rules>
                 <tooltip>Alarm LOLO</tooltip>
                 <border_alarm_sensitive>false</border_alarm_sensitive>
+                <maximum>2000.0</maximum>
+                <limits_from_pv>false</limits_from_pv>
               </widget>
               <widget type="label" version="2.0.0">
                 <name>LB_HIHI</name>
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 41e4930b26a55662840be8e409f70e7ecba7e923..39c0dbad4d23a4ba302490a4692cca17c71b1fd7 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
@@ -847,7 +847,8 @@
               <precision>2</precision>
               <tooltip>Alarm HIHI</tooltip>
               <border_alarm_sensitive>false</border_alarm_sensitive>
-              <maximum>500.0</maximum>
+              <maximum>2000.0</maximum>
+              <limits_from_pv>false</limits_from_pv>
             </widget>
             <widget type="spinner" version="2.0.0">
               <name>INP_HIGH</name>
@@ -859,7 +860,8 @@
               <precision>2</precision>
               <tooltip>Warning HIGH</tooltip>
               <border_alarm_sensitive>false</border_alarm_sensitive>
-              <maximum>500.0</maximum>
+              <maximum>2000.0</maximum>
+              <limits_from_pv>false</limits_from_pv>
             </widget>
             <widget type="label" version="2.0.0">
               <name>LB_HIGH</name>
@@ -919,7 +921,8 @@
               <precision>2</precision>
               <tooltip>Warning LOW</tooltip>
               <border_alarm_sensitive>false</border_alarm_sensitive>
-              <maximum>500.0</maximum>
+              <maximum>2000.0</maximum>
+              <limits_from_pv>false</limits_from_pv>
             </widget>
             <widget type="textupdate" version="2.0.0">
               <name>TU_FB_LOW</name>
@@ -961,7 +964,8 @@
               <precision>2</precision>
               <tooltip>Alarm LOLO</tooltip>
               <border_alarm_sensitive>false</border_alarm_sensitive>
-              <maximum>500.0</maximum>
+              <maximum>2000.0</maximum>
+              <limits_from_pv>false</limits_from_pv>
             </widget>
             <widget type="textupdate" version="2.0.0">
               <name>TU_FB_LOLO</name>
@@ -1346,7 +1350,6 @@
     <y>60</y>
     <width>920</width>
     <height>707</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/AnalogMeasure/AnalogTransmitter_Faceplate_CernoxTemperature.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_Faceplate_CernoxTemperature.bob
index 4068a93129f71f4ad409469413558c701d2c9408..a0300d1fa15587ec4f00b07c25a9290201bfc5db 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
@@ -926,22 +926,10 @@
               <height>30</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>Alarm HIHI</tooltip>
               <border_alarm_sensitive>false</border_alarm_sensitive>
+              <maximum>2000.0</maximum>
+              <limits_from_pv>false</limits_from_pv>
             </widget>
             <widget type="spinner" version="2.0.0">
               <name>INP_HIGH</name>
@@ -951,22 +939,10 @@
               <height>30</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 HIGH</tooltip>
               <border_alarm_sensitive>false</border_alarm_sensitive>
+              <maximum>2000.0</maximum>
+              <limits_from_pv>false</limits_from_pv>
             </widget>
             <widget type="label" version="2.0.0">
               <name>LB_HIGH</name>
@@ -1024,22 +1000,10 @@
               <height>30</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>
+              <maximum>2000.0</maximum>
+              <limits_from_pv>false</limits_from_pv>
             </widget>
             <widget type="textupdate" version="2.0.0">
               <name>TU_FB_LOW</name>
@@ -1079,22 +1043,10 @@
               <height>30</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>Alarm LOLO</tooltip>
               <border_alarm_sensitive>false</border_alarm_sensitive>
+              <maximum>2000.0</maximum>
+              <limits_from_pv>false</limits_from_pv>
             </widget>
             <widget type="textupdate" version="2.0.0">
               <name>TU_FB_LOLO</name>
@@ -1547,7 +1499,6 @@
     <y>60</y>
     <width>920</width>
     <height>707</height>
-    <active_tab>1</active_tab>
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>Header Bar</name>