Index: denali.pro.user
===================================================================
diff -u -raacab152859bb82a439a0a01e951e0ced2aac76e -rfde18b0e9684a491bdef054b9057159ca36afad7
--- denali.pro.user	(.../denali.pro.user)	(revision aacab152859bb82a439a0a01e951e0ced2aac76e)
+++ denali.pro.user	(.../denali.pro.user)	(revision fde18b0e9684a491bdef054b9057159ca36afad7)
@@ -1258,7 +1258,7 @@
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">staging</value>
+      <value type="QString" key="ProjectExplorer.ProcessStep.Arguments"></value>
       <value type="QString" key="ProjectExplorer.ProcessStep.Command">/home/denali/Projects/application/alarmMapping.sh</value>
       <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{sourceDir}</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Custom Process Step</value>
Index: en_US.udic
===================================================================
diff -u -r5e03d3f26ea0c88562e430c4b8192dd745fa1011 -rfde18b0e9684a491bdef054b9057159ca36afad7
--- en_US.udic	(.../en_US.udic)	(revision 5e03d3f26ea0c88562e430c4b8192dd745fa1011)
+++ en_US.udic	(.../en_US.udic)	(revision fde18b0e9684a491bdef054b9057159ca36afad7)
@@ -210,4 +210,5 @@
 MVC
 Jahnavi
 txr
+nd
 pre
Index: sources/gui/qml/pages/settings/SettingsExportLogs.qml
===================================================================
diff -u -r6ea69a2a47988ea141091f6fffae5673f5937f62 -rfde18b0e9684a491bdef054b9057159ca36afad7
--- sources/gui/qml/pages/settings/SettingsExportLogs.qml	(.../SettingsExportLogs.qml)	(revision 6ea69a2a47988ea141091f6fffae5673f5937f62)
+++ sources/gui/qml/pages/settings/SettingsExportLogs.qml	(.../SettingsExportLogs.qml)	(revision fde18b0e9684a491bdef054b9057159ca36afad7)
@@ -41,7 +41,7 @@
 
     ////////////////////////////////////////////////////////////////////////////////
     // FIXME: The model being used here is the QML FileListModel.                 //
-    //        This model is so limited and not updated well.                      //
+    //        This model is so limited and do not update well.                    //
     //        This model definitely has to be replaced with a C++ one,            //
     //        like the other MVC classes we have.                                 //
     ////////////////////////////////////////////////////////////////////////////////
Index: sources/model/hd/alarm/MAlarmMapping.cpp
===================================================================
diff -u -raacab152859bb82a439a0a01e951e0ced2aac76e -rfde18b0e9684a491bdef054b9057159ca36afad7
--- sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision aacab152859bb82a439a0a01e951e0ced2aac76e)
+++ sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision fde18b0e9684a491bdef054b9057159ca36afad7)
@@ -135,7 +135,7 @@
 /*0099*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_STALL                                : { result = QObject::tr("HD syringe pump stall alarm."                                                                                                                ); break; } /*  99*/
 /*0100*/case GuiAlarmID::ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT                         : { result = QObject::tr("HD no cartridge self-test timeout."                                                                                                          ); break; } /* 100*/
 /*0101*/case GuiAlarmID::ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT                             : { result = QObject::tr("HD dry self-test timeout."                                                                                                                   ); break; } /* 101*/
-/*0102*/case GuiAlarmID::ALARM_ID_DG_HEAT_DISINFECT_TEMP_GRAD_OUT_OF_RANAGE            : { result = QObject::tr("DG heat disinfect temperature gradient out of range."                                                                                        ); break; } /* 102*/
+/*0102*/case GuiAlarmID::ALARM_ID_DG_HEAT_DISINFECT_TEMP_GRAD_OUT_OF_RANGE             : { result = QObject::tr("DG heat disinfect temperature gradient out of range."                                                                                        ); break; } /* 102*/
 /*0103*/case GuiAlarmID::ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID           : { result = QObject::tr("HD invalid calibration CRC."                                                                                                                 ); break; } /* 103*/
 /*0104*/case GuiAlarmID::ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS                              : { result = QObject::tr("Air trap level sensors reporting illegal combination of air/fluid."                                                                          ); break; } /* 104*/
 /*0105*/case GuiAlarmID::ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID           : { result = QObject::tr("DG invalid calibration CRC."                                                                                                                 ); break; } /* 105*/
@@ -336,7 +336,7 @@
 /*0300*/case GuiAlarmID::ALARM_ID_HD_INVALID_SERIAL_NUMBER                             : { result = QObject::tr("HD invalid serial number."                                                                                                                   ); break; } /* 300*/
 /*0301*/case GuiAlarmID::ALARM_ID_DG_PRIMARY_HEATER_POWER_VOLTAGE_OUT_OF_RANGE         : { result = QObject::tr("DG primary heater power voltage out of range."                                                                                               ); break; } /* 301*/
 /*0302*/case GuiAlarmID::ALARM_ID_DG_CPU_RAM_ERROR                                     : { result = QObject::tr("DG processor RAM error."                                                                                                                     ); break; } /* 302*/
-/*0303*/case GuiAlarmID::ALARM_ID__AVAILABLE_4                                         : { result = QObject::tr("Alarm ID available for use."                                                                                                                 ); break; } /* 303*/
+/*0303*/case GuiAlarmID::ALARM_ID_DG_DRAIN_PUMP_DIRECTION_FPGA_FAULT                   : { result = QObject::tr("DG drain pump direction FPGA fault."                                                                                                         ); break; } /* 303*/
 /*0304*/case GuiAlarmID::ALARM_ID_HD_INVALID_USAGE_RECORD_CRC                          : { result = QObject::tr("HD invalid usage record."                                                                                                                    ); break; } /* 304*/
 /*0305*/case GuiAlarmID::ALARM_ID_HD_CPU_RAM_ERROR                                     : { result = QObject::tr("HD processor RAM error."                                                                                                                     ); break; } /* 305*/
 /*0306*/case GuiAlarmID::ALARM_ID_HD_AIR_TRAP_OVERFILL                                 : { result = QObject::tr("HD air trap over-fill alarm."                                                                                                                ); break; } /* 306*/
Index: sources/view/settings/VSettings.cpp
===================================================================
diff -u -raacab152859bb82a439a0a01e951e0ced2aac76e -rfde18b0e9684a491bdef054b9057159ca36afad7
--- sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision aacab152859bb82a439a0a01e951e0ced2aac76e)
+++ sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision fde18b0e9684a491bdef054b9057159ca36afad7)
@@ -25,7 +25,7 @@
 VIEW_DEF_CLASS(VSettings)
 
 void VSettings::initConnections() {
-    ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController, SettingsData);
+    ACTION_VIEW_CONNECTION  (SettingsData           );
     PROPERTY_POST_CONNECTION(VSettings, servicePass );
     PROPERTY_POST_CONNECTION(VSettings, alarmVolume );
     PROPERTY_POST_CONNECTION(VSettings, noCANBus    );
@@ -67,7 +67,7 @@
             }
             else { //TODO: Since it is global system settings, move this to the settings controller so the C++ backend can also use it. like Date/Time formats.
                 for (const auto &key : keys) {
-                    // DEBUG: qDebug() << " ~~~~~~~~~~ " << key << _Settings.value(group, key).toString  ();
+                    // DEBUG: qDebug() << " ~~~~~~~~~~ " << category << group << key << _Settings.value(category, group, key).toString  ();
                     QVariantMap           keyValue;
                     if ( isservicePass      (category, group, key) ) {
                         QString mServicePass;