Index: sources/gui/qml/main.qml
===================================================================
diff -u -r542fb3ef6b4ffcf407d45f8872d0f98ec1f0f7ce -r6d75606a09a42cd8477aaadbc652171a6623b520
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 542fb3ef6b4ffcf407d45f8872d0f98ec1f0f7ce)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 6d75606a09a42cd8477aaadbc652171a6623b520)
@@ -26,7 +26,8 @@
 import VHDAccelerometer                                     0.1
 import VHDSyringePump                                       0.1
 import VHDBloodLeak                                         0.1
-import VHDAirBubble                                         0.1
+import VTDAirBubble                                         0.1
+import VTDAirPump                                           0.1
 import VTDAirTrap                                           0.1
 import VTDVoltage                                           0.1
 import VTDValves                                            0.1
@@ -96,13 +97,16 @@
 import VDDPressures                                         0.1
 import VDGROPump                                            0.1
 import VDGReservoir                                         0.1
+import VDDConcentratePump                                   0.1
 import VDDTemperatures                                      0.1
-import VDGValvesStates                                      0.1
+import VDDDialysatePump                                     0.1
+import VDDValvesStates                                      0.1
 import VTreatmentCreate                                     0.1
 import VDGAccelerometer                                     0.1
 import VDDConductivity                                      0.1
 import VDDGenDialysate                                      0.1
 import VDDLevel                                             0.1
+import VDDBloodLeak                                         0.1
 // In-Treatment - Adjustemnt
 import VTreatmentAdjustmentDuration                         0.1
 import VTreatmentAdjustmentFlows                            0.1
@@ -133,6 +137,7 @@
 import "qrc:/components"
 import "qrc:/dialogs"
 import "qrc:/dialogs/diagnostics"
+import "qrc:/dialogs/headerbar"
 
 /*!
  * \brief   Initialization and start point of the QML
@@ -190,7 +195,8 @@
     VGeneralEvent                                       { id: vGeneralEvent                                         }
     VHDAccelerometer                                    { id: vHDAccelerometer                                      }
     VHDSyringePump                                      { id: vHDSyringePump                                        }
-    VHDAirBubble                                        { id: vHDAirBubble                                          }
+    VTDAirBubble                                        { id: vTDAirBubble                                          }
+    VTDAirPump                                          { id: vTDAirPump                                            }
     VHDBloodLeak                                        { id: vHDBloodLeak                                          }
     VTDAirTrap                                          { id: vTDAirTrap                                            }
     VTDVoltage                                          { id: vTDVoltage                                            }
@@ -217,12 +223,15 @@
     VDDPressures                                        { id: vDDPressures                                          }
     VDGROPump                                           { id: vDGROPump                                             }
     VDGReservoir                                        { id: vDGReservoir                                          }
+    VDDConcentratePump                                  { id: vDDConcentratePump                                    }
     VDDTemperatures                                     { id: vDDTemperatures                                       }
-    VDGValvesStates                                     { id: vDGValvesStates                                       }
+    VDDDialysatePump                                    { id: vDDDialysatePump                                      }
+    VDDValvesStates                                     { id: vDDValvesStates                                       }
     VDGAccelerometer                                    { id: vDGAccelerometer                                      }
     VDDConductivity                                     { id: vDDConductivity                                       }
     VDDGenDialysate                                     { id: vDDGenDialysate                                       }
     VDDLevel                                            { id: vDDLevel                                              }
+    VDDBloodLeak                                        { id: vDDBloodLeak                                          }
     // --- Pre-Treatment Progress Data
     VPreTreatmentAdjustmentInitTreatment                { id: vPreTreatmentAdjustmentInitTreatment                  }
     VDGFilterFlush                                      { id: vDGFilterFlush                                        }
@@ -315,25 +324,13 @@
         anchors.top: parent.top
     }
 
-    SDCProgressItem              { id: _sdcProgressItem
-        // TODO: disable this later. this is only for diagnostic purpose.
-        onDoubleClicked : {
-            if ( _GuiView.dryDemoMode ) {
-                let dryDemoTempID = 99
-                let id = vConfirm.id
-                vConfirm.id = dryDemoTempID
-                vConfirm.doConfirm( true  )
-                vConfirm.id = id
-            }
-            else {
-                _diagnosticsDialog.open()
-            }
-        }
-    }
-
     // keyboard should always be before AlarmItem to not to covet it.
     KeyboardItem        { id: _keyboard                    }
 
+    WiFiDialog          { id: _wifiDialog                  }
+    StorageDialog       { id: _storageDialog               }
+    SettingsDialog      { id: _settingsDialog              }
+    InformationDialog   { id: _informationDialog           }
     LockDialog          { id: _lockDialog                  }
     AlarmItem           { id: _alarmItem        ;   z: 996 }
     PowerItem           { id: _powerItem        ;   z: 997 }
@@ -344,20 +341,13 @@
     //       then cannot be anchored.
     NotificationBar     { id: _alarmBar
         anchors.bottom      : _mainMenu.top
-        backgroundColor     : _alarmItem.backgroundColor
+        color               : _alarmItem.backgroundColor
         textColor           : _alarmItem.textColor
         alarmID             : _alarmItem.alarm_AlarmID
         text                : _alarmItem.title
         textPixelSize       : Fonts.fontPixelAlarmBarTitle
         isSilenced          : _alarmItem.isSilenced
         timeout             : _alarmItem.timeout
-        backgroundFading    : vTDOpMode.fault
         z                   : 995
     }
-
-    GuiView { id: _GuiView
-        //        Component.onCompleted: {
-        //            console.debug("GuiView - complete")
-        //        }
-    }
 }