Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -ra7719c04d88da7ba4046e5c24c3ba22d632bedad -r707f492165e583964b1840c72f2d668b18525631
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision a7719c04d88da7ba4046e5c24c3ba22d632bedad)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 707f492165e583964b1840c72f2d668b18525631)
@@ -201,7 +201,7 @@
             ID_DDOperationModeData                      = 0x1300,
             ID_DGReservoirData                          = 0x280F, // ??   //// ----- @CRAPIZED: had to change to avoid duplication
             ID_DGLoadCellReadingsData                   = 0x0C00, // 12
-            ID_DGAccelerometerData                      = 0x340F, // 52
+            ID_DGAccelerometerData                      = 0x340F, // 52   //// ----- @CRAPIZED: had to change to avoid duplication
             ID_DDValvesStatesData                       = 0x1B00, // 27     //// ----- @LEAHIZED
             ID_DDPressuresData                          = 0x1C00, // 28     //// ----- @LEAHIZED
             ID_DDConductivityData                       = 0x1F00, // 31     //// ----- @LEAHIZED
Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
===================================================================
diff -u -ra7719c04d88da7ba4046e5c24c3ba22d632bedad -r707f492165e583964b1840c72f2d668b18525631
--- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml	(.../DiagnosticsDD.qml)	(revision a7719c04d88da7ba4046e5c24c3ba22d632bedad)
+++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml	(.../DiagnosticsDD.qml)	(revision 707f492165e583964b1840c72f2d668b18525631)
@@ -33,7 +33,7 @@
 
         DebugDataColumn { id: _DDConcentratePumpColumn
             textObjectName  :"_DDConcentratePumpData"
-            title           : qsTr("[0x25] Conc Pump ")
+            title           : "[0x25]" + qsTr(" Conc Pump ")
             anchors {
                 top     : parent.top
                 left    : parent.left
@@ -96,7 +96,7 @@
 
         DebugDataColumn { id: _DDDialysatePumpColumn
             textObjectName  :"_DDDialysatePumpData"
-            title           : qsTr("[0x27] Dialysate Pump ")
+            title           : "[0x27]" + qsTr(" Dialysate Pump ")
             anchors {
                 top         : parent.top
                 left        : _DDConcentratePumpColumn.right
@@ -150,7 +150,7 @@
 
         DebugDataColumn { id: _DDHeatersColumn
             textObjectName  :"_DDHeatersData"
-            title           : qsTr("[0x28] Heaters ")
+            title           : "[0x28]" + qsTr(" Heaters ")
             anchors {
                 top         : parent.top
                 left        : _DDDialysatePumpColumn.right
@@ -198,7 +198,7 @@
 
         DebugDataColumn { id: _DDTemperatureColumn
             textObjectName  :"_DDTemperatureData"
-            title           : qsTr("[0x26] Temperature ")
+            title           : "[0x26]" + qsTr(" Temperature ")
             anchors {
                 top         : parent.top
                 left        : _DDHeatersColumn.right
@@ -258,7 +258,7 @@
 
         DebugDataColumn { id: _DDPressureColumn
             textObjectName  :"_DDPressureData"
-            title           : qsTr("[0x1C] Pressure ")
+            title           : "[0x1C]" + qsTr(" Pressure ")
             anchors {
                 top         : parent.top
                 left        : _DDTemperatureColumn.right
@@ -284,7 +284,7 @@
 
         DebugDataColumn { id: _DDOpModeColumn
             textObjectName  :"_DDOpModeColumn"
-            title           : qsTr("[0x13] OpMode ")
+            title           : "[0x13]" + qsTr(" OpMode ")
             anchors {
                 top         : parent.top
                 left        : _DDPressureColumn.right
@@ -302,7 +302,7 @@
 
         DebugDataColumn { id: _DDGenDialColumn
             textObjectName  :"_DDGenDialData"
-            title           : qsTr("[0x2F] GenDial ")
+            title           : "[0x2F]" + qsTr(" GenDial ")
             anchors {
                 top         : _DDOpModeColumn.bottom
                 topMargin   : verticalSpacing
@@ -324,7 +324,7 @@
 
         DebugDataColumn { id: _DDHydraulicsValveColumn
             textObjectName  :"_DDHydraulicValveData"
-            title           : qsTr("[0x1B] Hyd Valve ")
+            title           : "[0x1B]" + qsTr(" Hyd Valve ")
             anchors {
                 top         : _DDGenDialColumn.bottom
                 topMargin   : verticalSpacing
@@ -369,7 +369,7 @@
 
         DebugDataColumn { id: _DDCondColumn
             textObjectName  :"_DDCondlData"
-            title           : qsTr("[0x1F] Conductivity ")
+            title           : "[0x1F]" + qsTr(" Conductivity ")
             anchors {
                 top         : _DDDialysatePumpColumn.bottom
                 topMargin   : verticalSpacing
@@ -393,7 +393,7 @@
 
         DebugDataColumn { id: _DDLevelColumn
             textObjectName  :"_DDLevelData"
-            title           : qsTr("[0x29] Levels ")
+            title           : "[0x29]" + qsTr(" Levels ")
             anchors {
                 top         : _DDTemperatureColumn.bottom
                 topMargin   : verticalSpacing
@@ -417,7 +417,7 @@
 
         DebugDataColumn { id: _DDBCValvesColumn
             textObjectName  :"_DDBCValvesData"
-            title           : qsTr("[0x1B] BC Valves ")
+            title           : "[0x1B]" + qsTr(" BC Valves ")
             anchors {
                 top         : _DDBloodLeakColumn.bottom
                 topMargin   : verticalSpacing
@@ -447,7 +447,7 @@
 
         DebugDataColumn { id: _DDIOValvesColumn
             textObjectName  :"_DDIOValvesColumn"
-            title           : qsTr("[0x1B] IO Valves ")
+            title           : "[0x1B]" + qsTr(" IO Valves ")
             anchors {
                 top         : _DDCondColumn.bottom
                 topMargin   : verticalSpacing
@@ -465,7 +465,7 @@
 
         DebugDataColumn { id: _DDSpareValvesColumn
             textObjectName  :"_DDSpareValvesColumn"
-            title           : qsTr("[0x1B] Spare Valves ")
+            title           : "[0x1B]" + qsTr(" Spare Valves ")
             anchors {
                 top         : _DDHeatersColumn.bottom
                 topMargin   : verticalSpacing
@@ -495,7 +495,7 @@
 
         DebugDataColumn { id: _DDFPValvesColumn
             textObjectName  :"_DDFPValvesColumn"
-            title           : qsTr("[0x1B] FP Valves ")
+            title           : "[0x1B]" + qsTr(" FP Valves ")
             anchors {
                 top         : _DDConcentratePumpColumn.bottom
                 topMargin   : verticalSpacing
@@ -521,7 +521,7 @@
 
         DebugDataColumn { id: _DDBloodLeakColumn
             textObjectName  :"_DDBloodLeakData"
-            title           : qsTr("[0x61] Blood Leak ")
+            title           : "[0x61]" + qsTr(" Blood Leak ")
             anchors {
                 top         : _DDPressureColumn.bottom
                 topMargin   : verticalSpacing
Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml
===================================================================
diff -u -ra7719c04d88da7ba4046e5c24c3ba22d632bedad -r707f492165e583964b1840c72f2d668b18525631
--- sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml	(.../DiagnosticsFP.qml)	(revision a7719c04d88da7ba4046e5c24c3ba22d632bedad)
+++ sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml	(.../DiagnosticsFP.qml)	(revision 707f492165e583964b1840c72f2d668b18525631)
@@ -31,8 +31,8 @@
     contentItem : Item { id: _content
 
         DebugDataColumn { id: _FPPressureColumn
-            textObjectName  :"_FPPressureData"
-            title           : qsTr("[0x34] Pressure ")
+            textObjectName  : "_FPPressureData"
+            title           : "[0x34]" + qsTr(" Pressure ")
             anchors {
                 top     : parent.top
                 left    : parent.left
@@ -55,8 +55,8 @@
         }
 
         DebugDataColumn { id: _FPROPumpColumn
-            textObjectName  :"_FPROPumpData"
-            title           : qsTr("[0x32] RO Pump ")
+            textObjectName  : "_FPROPumpData"
+            title           : "[0x32]" + qsTr(" RO Pump ")
             anchors {
                 top         : parent.top
                 left        : _FPPressureColumn.right
@@ -88,7 +88,7 @@
 
         DebugDataColumn { id: _FPRoRejectionPercentageColumn
             textObjectName  :"_FPRoRejectionPercentageColumn"
-            title           : qsTr("[0x71] RO Rejection Ratio ")
+            title           : "[0x71]" + qsTr(" RO Rejection Ratio ")
             anchors {
                 top         : _FPROPumpColumn.bottom
                 topMargin   : spacing
@@ -112,7 +112,7 @@
 
         DebugDataColumn { id: _FPBoostPumpColumn
             textObjectName  :"_FPBoostPumpData"
-            title           : qsTr("[0x50] Boost Pump ")
+            title           : "[0x50]" + qsTr(" Boost Pump ")
             anchors {
                 top         : parent.top
                 left        : _FPROPumpColumn.right
@@ -144,7 +144,7 @@
 
         DebugDataColumn { id: _FPTemperatureColumn
             textObjectName  :"_FPTemperatureData"
-            title           : qsTr("[0x39] Temperature ")
+            title           : "[0x39]" + qsTr(" Temperature ")
             anchors {
                 top         : parent.top
                 left        : _FPBoostPumpColumn.right
@@ -180,7 +180,7 @@
 
         DebugDataColumn { id: _FPFlowColumn
             textObjectName  :"_FPFlowData"
-            title           : qsTr("[0x36] Flow ")
+            title           :"[0x36]" + qsTr(" Flow ")
             anchors {
                 top         : parent.top
                 left        : _FPTemperatureColumn.right
@@ -198,7 +198,7 @@
 
         DebugDataColumn { id: _FPLevelColumn
             textObjectName  :"_FPLevelData"
-            title           : qsTr("[0x35] Level ")
+            title           : "[0x35]" + qsTr(" Level ")
             anchors {
                 top         : parent.top
                 left        : _FPFlowColumn.right
@@ -214,7 +214,7 @@
 
         DebugDataColumn { id: _FPConductivityColumn
             textObjectName  :"_FPConductivityData"
-            title           : qsTr("[0x37] Conductivity ")
+            title           : "[0x37]" + qsTr(" Conductivity ")
             anchors {
                 top         : _FPPressureColumn.bottom
                 topMargin   : spacing
Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
===================================================================
diff -u -r4a751578dd768d849e6ee6dfa1521f5f1597090d -r707f492165e583964b1840c72f2d668b18525631
--- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml	(.../DiagnosticsTD.qml)	(revision 4a751578dd768d849e6ee6dfa1521f5f1597090d)
+++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml	(.../DiagnosticsTD.qml)	(revision 707f492165e583964b1840c72f2d668b18525631)
@@ -32,7 +32,7 @@
 
         DebugDataColumn { id: _TDBloodFlowColumn
             textObjectName  :"_TDBloodFlowData"
-            title           : qsTr("[0x11] Blood Flow)")
+            title           : "[0x11]" + qsTr(" Blood Flow ")
             anchors {
                 top     : parent.top
                 left    : parent.left
@@ -65,7 +65,7 @@
 
         DebugDataColumn { id: _TDAirTrapCoulumn
             textObjectName  :"_TDAirTrapData"
-            title           : qsTr("[0x2A] Air Trap ")
+            title           : "[0x2A]" + qsTr(" Air Trap ")
             anchors {
                 top         : parent.top
                 left        : _TDPressureOcclusionColumn.right
@@ -100,7 +100,7 @@
 
         DebugDataColumn { id: _TDAirPumpColumn
             textObjectName  :"_TDAirPumpData"
-            title           : qsTr("[0x20] Air Pumps ")
+            title           : "[0x20]" + qsTr(" Air Pumps ")
             anchors {
                 top         : _TDAirTrapCoulumn.bottom
                 topMargin   : spacing
@@ -126,7 +126,7 @@
 
         DebugDataColumn { id: _TDAirBubblesColumn
             textObjectName  :"_TDAirBubblesData"
-            title           : qsTr("[0x1E] Bubbles ")
+            title           : "[0x1E]" + qsTr(" Bubbles ")
             anchors {
                 top         : _TDPressureOcclusionColumn.bottom
                 topMargin   : spacing
@@ -146,7 +146,7 @@
 
         DebugDataColumn { id: _TDValvesColumn
             textObjectName  :"_TDValvesData"
-            title           : qsTr("[0X2B] Valves ")
+            title           : "[0X2B]" + qsTr(" Valves ")
             anchors {
                 top         : parent.top
                 left        : _TDAirTrapCoulumn.right
@@ -181,7 +181,7 @@
 
         DebugDataColumn { id: _TDEjectorColumn
             textObjectName  :"_TDEjectorData"
-            title           : qsTr("[0x4E] Ejector ")
+            title           : "[0x4E]" + qsTr(" Ejector ")
             anchors {
                 top         : parent.top
                 left        : _TDValvesColumn.right
@@ -204,7 +204,7 @@
 
         DebugDataColumn { id: _TDSwitchesColumn
             textObjectName  :"_TDSwitchesData"
-            title           : qsTr("[0x21] Switches ")
+            title           : "[0x21]" + qsTr(" Switches ")
             anchors {
                 top         : _TDVoltageCoulumn.bottom
                 topMargin   : spacing
@@ -220,7 +220,7 @@
 
         DebugDataColumn { id: _TDOpModeColumn
             textObjectName  :"_TDOpmodeData"
-            title           : qsTr("[0x12] Opmode ")
+            title           : "[0x12]" + qsTr(" Opmode ")
             anchors {
                 top         : parent.top
                 left        : _TDEjectorColumn.right
@@ -238,7 +238,7 @@
 
         DebugDataColumn { id: _TDTXStatesColumn
             textObjectName  :"_TDTxStatesData"
-            title           : qsTr("[0x3C] TXStates ")
+            title           : "[0x3C]" + qsTr(" TXStates ")
 
             anchors {
                 top         : _TDOpModeColumn.bottom
@@ -274,7 +274,7 @@
 
         DebugDataColumn { id: _TDVoltageCoulumn
             textObjectName  :"_TDVoltageData"
-            title           : qsTr("[0x1D] Voltage ")
+            title           : "[0x1D]" + qsTr(" Voltage ")
             anchors {
                 top         : _TDBloodFlowColumn.bottom
                 topMargin   : spacing
@@ -304,7 +304,7 @@
 
         DebugDataColumn { id: _TDPressureOcclusionColumn
             textObjectName  :"_TDPressureData"
-            title           : qsTr("[0x24] Pressure ")
+            title           : "[0x24]" + qsTr(" Pressure ")
 
             anchors {
                 top         : parent.top
@@ -347,7 +347,7 @@
 
         DebugDataColumn { id: _TDTemperatureCoulumn
             textObjectName  :"_TDTemperatureData"
-            title           : qsTr("[0x53] Temperature ")
+            title           : "[0x53]" + qsTr(" Temperature ")
             anchors {
                 top         : _TDValvesColumn.bottom
                 topMargin   : spacing