Index: TD_TreatmentStates/interface.ui
===================================================================
diff -u -rc6aa11b8a4a60886c17e4d3d2c0166c6160f1053 -re4825b7c7360ad8bb7e32713ea25c93ff9b08ada
--- TD_TreatmentStates/interface.ui	(.../interface.ui)	(revision c6aa11b8a4a60886c17e4d3d2c0166c6160f1053)
+++ TD_TreatmentStates/interface.ui	(.../interface.ui)	(revision e4825b7c7360ad8bb7e32713ea25c93ff9b08ada)
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>628</width>
-    <height>673</height>
+    <height>772</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -33,7 +33,7 @@
 background-color:rgb(55, 179, 119)</string>
          </property>
          <property name="text">
-          <string>Treatment Mode Data</string>
+          <string>0x3C: Treatment Mode Data</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -67,7 +67,7 @@
        <property name="minimumSize">
         <size>
          <width>300</width>
-         <height>231</height>
+         <height>240</height>
         </size>
        </property>
        <property name="font">
@@ -233,7 +233,7 @@
        <property name="minimumSize">
         <size>
          <width>250</width>
-         <height>90</height>
+         <height>110</height>
         </size>
        </property>
        <property name="maximumSize">
@@ -292,6 +292,11 @@
          <string>2</string>
         </property>
        </row>
+       <row>
+        <property name="text">
+         <string>3</string>
+        </property>
+       </row>
        <column>
         <property name="text">
          <string>1 : Blood Prime States</string>
@@ -315,6 +320,11 @@
          <string>BLOOD_PRIME_PAUSED_STATE</string>
         </property>
        </item>
+       <item row="3" column="0">
+        <property name="text">
+         <string>BLOOD_PRIME_FLUID_BOLUS_STATE</string>
+        </property>
+       </item>
       </widget>
      </item>
      <item>
@@ -328,7 +338,7 @@
        <property name="minimumSize">
         <size>
          <width>250</width>
-         <height>70</height>
+         <height>90</height>
         </size>
        </property>
        <property name="maximumSize">
@@ -382,6 +392,11 @@
          <string>1</string>
         </property>
        </row>
+       <row>
+        <property name="text">
+         <string>2</string>
+        </property>
+       </row>
        <column>
         <property name="text">
          <string>2: Dialysis States</string>
@@ -400,6 +415,11 @@
          <string>DIALYSIS_UF_PAUSED_STATE</string>
         </property>
        </item>
+       <item row="2" column="0">
+        <property name="text">
+         <string>DIALYSIS_UF_FLUID_BOLUS_STATE</string>
+        </property>
+       </item>
       </widget>
      </item>
      <item>
@@ -499,7 +519,7 @@
        <property name="minimumSize">
         <size>
          <width>250</width>
-         <height>110</height>
+         <height>150</height>
         </size>
        </property>
        <property name="maximumSize">
@@ -563,34 +583,54 @@
          <string>3</string>
         </property>
        </row>
+       <row>
+        <property name="text">
+         <string>4</string>
+        </property>
+       </row>
+       <row>
+        <property name="text">
+         <string>5</string>
+        </property>
+       </row>
        <column>
         <property name="text">
-         <string>4 : Treatment Stop States</string>
+         <string>4 : Treatment Paused States</string>
         </property>
        </column>
        <item row="0" column="0">
         <property name="text">
-         <string>TREATMENT_STOP_RECIRC_STATE</string>
+         <string>TREATMENT_PAUSED_RECIRC_STATE</string>
         </property>
         <property name="flags">
          <set>ItemIsSelectable|ItemIsEnabled</set>
         </property>
        </item>
        <item row="1" column="0">
         <property name="text">
-         <string>TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE</string>
+         <string>TREATMENT_PAUSED_RECIRC_DIALYSATE_ONLY_STATE</string>
         </property>
        </item>
        <item row="2" column="0">
         <property name="text">
-         <string>TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE</string>
+         <string>TREATMENT_PAUSED_RECIRC_BLOOD_ONLY_STATE</string>
         </property>
        </item>
        <item row="3" column="0">
         <property name="text">
-         <string>TREATMENT_STOP_NO_RECIRC_STATE</string>
+         <string>TREATMENT_PAUSED_NO_RECIRC_STATE</string>
         </property>
        </item>
+       <item row="4" column="0">
+        <property name="text">
+         <string>TREATMENT_PAUSED_RECOVER_BLOOD_DETECT_STATE</string>
+        </property>
+       </item>
+       <item row="5" column="0">
+        <property name="text">
+         <string>TREATMENT_PAUSED_FLUID_BOLUS_STATE</string>
+        </property>
+       </item>
       </widget>
      </item>
      <item>
@@ -883,6 +923,11 @@
          <string>1</string>
         </property>
        </row>
+       <row>
+        <property name="text">
+         <string>2</string>
+        </property>
+       </row>
        <column>
         <property name="text">
          <string>7 : Treatment End States</string>
@@ -901,6 +946,11 @@
          <string>TREATMENT_END_PAUSED_STATE</string>
         </property>
        </item>
+       <item row="2" column="0">
+        <property name="text">
+         <string>TREATMENT_END_FLUID_BOLUS_STATE</string>
+        </property>
+       </item>
       </widget>
      </item>
      <item>
@@ -967,29 +1017,39 @@
          <string>2</string>
         </property>
        </row>
+       <row>
+        <property name="text">
+         <string>3</string>
+        </property>
+       </row>
        <column>
         <property name="text">
-         <string>8 : Saline States</string>
+         <string>8 : Fluid Bolus States</string>
         </property>
        </column>
        <item row="0" column="0">
         <property name="text">
-         <string>SALINE_BOLUS_STATE_IDLE</string>
+         <string>FLUID_BOLUS_IDLE_STATE</string>
         </property>
         <property name="flags">
          <set>ItemIsSelectable|ItemIsEnabled</set>
         </property>
        </item>
        <item row="1" column="0">
         <property name="text">
-         <string>SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP</string>
+         <string>FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE</string>
         </property>
        </item>
        <item row="2" column="0">
         <property name="text">
-         <string>SALINE_BOLUS_STATE_IN_PROGRESS</string>
+         <string>FLUID_BOLUS_SALINE_IN_PROGRESS_STATE</string>
         </property>
        </item>
+       <item row="3" column="0">
+        <property name="text">
+         <string>FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE</string>
+        </property>
+       </item>
       </widget>
      </item>
      <item>