Index: sources/gui/qml/main.qml
===================================================================
diff -u -rf0c8b8720a2e314268445a4a20fe701292026f6f -r53491f18249d31cec365d69e37355ceb61131e56
--- sources/gui/qml/main.qml	(.../main.qml)	(revision f0c8b8720a2e314268445a4a20fe701292026f6f)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 53491f18249d31cec365d69e37355ceb61131e56)
@@ -29,7 +29,6 @@
 import VHDAirBubble                                         0.1
 import VTDAirTrap                                           0.1
 import VTDVoltage                                           0.1
-import VTDBloodPump                                         0.1
 import VTDValves                                            0.1
 import VTDBattery                                           0.1
 import VTDSwitches                                          0.1
@@ -58,7 +57,7 @@
 // States views
 import VTDOpMode                                            0.1 //// ----- @LEAHIZED
 import VPreTreatmentStates                                  0.1
-import VHDTreatmentStates                                   0.1
+import VTDTreatmentStates                                   0.1
 import VPostTreatmentStates                                 0.1
 
 // Treatment - Common
@@ -69,6 +68,7 @@
 import VTreatmentPressureOcclusion                          0.1
 import VTreatmentUltrafiltration                            0.1
 import VTreatmentTime                                       0.1
+import VTreatmentSetPoint                                   0.1
 import VTreatmentRinseback                                  0.1
 import VTreatmentRecirculate                                0.1
 import VTreatmentBloodPrime                                 0.1
@@ -100,7 +100,8 @@
 import VDGValvesStates                                      0.1
 import VTreatmentCreate                                     0.1
 import VDGAccelerometer                                     0.1
-import VDGConductivity                                      0.1
+import VDDConductivity                                      0.1
+import VDDGenDialysate                                      0.1
 // In-Treatment - Adjustemnt
 import VTreatmentAdjustmentDuration                         0.1
 import VTreatmentAdjustmentFlows                            0.1
@@ -166,13 +167,13 @@
         }
     }
     VPreTreatmentStates                                 { id: vPreTreatmentStates                                   }
-    VHDTreatmentStates                                  { id: vHDTreatmentStates                                    }
+    VTDTreatmentStates                                  { id: vTDTreatmentStates                                    }
     VPostTreatmentStates                                { id: vPostTreatmentStates                                  }
 
     VTreatmentBloodFlow                                 { id: vTreatmentBloodFlow                                   }
     VTreatmentVitals                                    { id: vTreatmentVitals
         interval    : vTreatmentCreate.bloodPressureMeasureInterval
-        enableDialog:  vTDOpMode.inTreatment && vHDTreatmentStates.txTreatment
+        enableDialog:  vTDOpMode.inTreatment && vTDTreatmentStates.txTreatment
         // As long as UI is in In-Tx BP/HR is updated and the dialog will pop up on interval.
         onEnableDialogChanged : {
             if ( vTreatmentVitals.enableDialog ) {
@@ -191,7 +192,6 @@
     VHDBloodLeak                                        { id: vHDBloodLeak                                          }
     VTDAirTrap                                          { id: vTDAirTrap                                            }
     VTDVoltage                                          { id: vTDVoltage                                            }
-    VTDBloodPump                                        { id: vTDBloodPump                                          }
     VTDValves                                           { id: vTDValves                                             }
     VTDBattery                                          { id: vTDBattery                                            }
     VTDSwitches                                         { id: vTDSwitches                                           }
@@ -202,6 +202,7 @@
     VTreatmentPressureOcclusion                         { id: vTreatmentPressureOcclusion                           }
     VTreatmentUltrafiltration                           { id: vTreatmentUltrafiltration                             }
     VTreatmentTime                                      { id: vTreatmentTime                                        }
+    VTreatmentSetPoint                                  { id: vTreatmentSetPoint                                    }
     VTreatmentBloodPrime                                { id: vTreatmentBloodPrime                                  }
     VTreatmentRinseback                                 { id: vTreatmentRinseback                                   }
     VTreatmentRecirculate                               { id: vTreatmentRecirculate                                 }
@@ -217,7 +218,8 @@
     VDGTemperatures                                     { id: vDGTemperatures                                       }
     VDGValvesStates                                     { id: vDGValvesStates                                       }
     VDGAccelerometer                                    { id: vDGAccelerometer                                      }
-    VDGConductivity                                     { id: vDGConductivity                                       }
+    VDDConductivity                                     { id: vDDConductivity                                       }
+    VDDGenDialysate                                     { id: vDDGenDialysate                                       }
     // --- Pre-Treatment Progress Data
     VPreTreatmentAdjustmentInitTreatment                { id: vPreTreatmentAdjustmentInitTreatment                  }
     VDGFilterFlush                                      { id: vDGFilterFlush                                        }