Index: sources/gui/qml/main.qml
===================================================================
diff -u -rbf5b9b7cb86aaf3c4ec85e4ef0b92cba0e836634 -r4fb6a5fb521604e29160115ff3b4b0623301e663
--- sources/gui/qml/main.qml	(.../main.qml)	(revision bf5b9b7cb86aaf3c4ec85e4ef0b92cba0e836634)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 4fb6a5fb521604e29160115ff3b4b0623301e663)
@@ -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
@@ -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
@@ -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                                        }
Index: sources/model/MModel.h
===================================================================
diff -u -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 -r4fb6a5fb521604e29160115ff3b4b0623301e663
--- sources/model/MModel.h	(.../MModel.h)	(revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 4fb6a5fb521604e29160115ff3b4b0623301e663)
@@ -311,6 +311,10 @@
     REGISTER_METATYPE(                                             DeviceUSBMountResponseData ) \
     REGISTER_METATYPE(                                             DeviceWifiListRequestData  ) \
     REGISTER_METATYPE(                                             DeviceWifiListResponseData ) \
+    REGISTER_METATYPE(                                             DeviceWifiInfoRequestData  ) \
+    REGISTER_METATYPE(                                             DeviceWifiInfoResponseData ) \
+    REGISTER_METATYPE(                                          DeviceConnectWifiRequestData  ) \
+    REGISTER_METATYPE(                                          DeviceConnectWifiResponseData ) \
     /*                                      Settings                                         */ \
     REGISTER_METATYPE(                                                           SettingsData ) \
     REGISTER_METATYPE(                                                          BluetoothData ) \