Index: sources/gui/qml/main.qml
===================================================================
diff -u -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 -re2b8925fd32e359b3c440acd61e921f0be825a65
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision e2b8925fd32e359b3c440acd61e921f0be825a65)
@@ -29,14 +29,17 @@
 import VTDOPMode                                            0.1
 
 // Device
-//import VDevice                                              0.1
+import VDevice                                              0.1
+import VLocalization                                        0.1
+import VSettings                                            0.1
+import VConfirm                                             0.1
+import VDateTime                                            0.1
 
 // Settings
 
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/pages"
-import "qrc:/pages/treatment"
 import "qrc:/pages/settings"
 import "qrc:/components"
 import "qrc:/dialogs"
@@ -48,6 +51,15 @@
     width : Variables.applicationWidth
     height: Variables.applicationHeight
 
+    VConfirm                                            { id: vConfirm                                              }
+
+    VDevice                                             { id: vDevice                                               }
+    VSettings                                           { id: vSettings                                             }
+    VLocalization                                       { id: vLocalization                                         }
+    VDateTime                                           { id: vDateTime                                         }
+    VTDAirTrap                                          { id: vTDAirTrap                                               }
+
+
     Background {}
 
     // ----- Follow the below Z order -----
@@ -59,6 +71,7 @@
     // 1 - 3
     MainStack     { id: _mainStack     }
 
+
     // 3 - Footer
     MainMenu { id: _mainMenu
         function isTreatment  () { _mainMenu.itemPressed(0) }
@@ -87,9 +100,9 @@
     }
 
 
-    Connections { target: vTDOpMode
-        function onStandbyWaitDisinfectChanged  ( vValue ) { _mainMenu.isTreatment() }
-    }
+//    Connections { target: vTDOpMode
+//        function onStandbyWaitDisinfectChanged  ( vValue ) { _mainMenu.isTreatment() }
+//    }
 
     // 9 - Others
     Rectangle { //TODO:@LEAHI: make this the statusbar/headerbar component.
@@ -179,21 +192,6 @@
             font.pixelSize: 15
         }
 
-        Text { // TEST : BluetoothStatus
-            color   : Colors.textMain
-            anchors {
-                top         : parent.top
-                left        : parent.left
-                leftMargin  : 615
-            }
-            horizontalAlignment : Text.Alignleft
-            verticalAlignment   : Text.AlignBottom
-
-            height  : 15
-            text    : "B:" + vBluetooth.pairedAddr
-            font.pixelSize: 14
-        }
-
         Text { // TEST : The treatment vital dialog countdown time
             color   : Colors.textMain
             anchors {
@@ -244,7 +242,7 @@
     // keyboard should always be before AlarmItem to not to covet it.
     KeyboardItem        { id: _keyboard                    }
 
-    //AlarmItem           { id: _alarmItem        ;   z: 996 }
+    AlarmItem           { id: _alarmItem        ;   z: 996 }
     PowerItem           { id: _powerItem        ;   z: 997 }
     ConfirmDialog       { id: _confirmDialog    ;   z: 998 }
     DiagnosticsDialog   { id: _diagnosticsDialog;   z: 999 }
@@ -260,7 +258,7 @@
         textPixelSize       : Fonts.fontPixelAlarmBarTitle
         isSilenced          : _alarmItem.isSilenced
         timeout             : _alarmItem.timeout
-        backgroundFading    : vTDOpMode.fault
+        backgroundFading    : false //vTDOpMode.fault
     }
 
     GuiView { id: _GuiView