Index: firmware/App/Modes/ModeChemicalDisinfect.h
===================================================================
diff -u -rbbf1e3736be03a4f041ace57e0f95e23caf472dd -r4efb2d1786c717ca6cf4b1bc992cec8e16820bff
--- firmware/App/Modes/ModeChemicalDisinfect.h	(.../ModeChemicalDisinfect.h)	(revision bbf1e3736be03a4f041ace57e0f95e23caf472dd)
+++ firmware/App/Modes/ModeChemicalDisinfect.h	(.../ModeChemicalDisinfect.h)	(revision 4efb2d1786c717ca6cf4b1bc992cec8e16820bff)
@@ -18,7 +18,7 @@
 #define __MODE_CHEMICAL_DISINFECT_H__
 
 #include "DGCommon.h"
-#include "DGModes.h"
+#include "DGDefs.h"
 
 /**
  *  @defgroup DGChemicalDisinfectMode DGChemicalDisinfectMode
Index: firmware/App/Modes/ModeDrain.h
===================================================================
diff -u -rbbf1e3736be03a4f041ace57e0f95e23caf472dd -r4efb2d1786c717ca6cf4b1bc992cec8e16820bff
--- firmware/App/Modes/ModeDrain.h	(.../ModeDrain.h)	(revision bbf1e3736be03a4f041ace57e0f95e23caf472dd)
+++ firmware/App/Modes/ModeDrain.h	(.../ModeDrain.h)	(revision 4efb2d1786c717ca6cf4b1bc992cec8e16820bff)
@@ -18,7 +18,7 @@
 #define __MODE_DRAIN_H__
 
 #include "DGCommon.h"
-#include "DGModes.h"
+#include "DGDefs.h"
 
 /**
  *  @defgroup DGDrainMode DGDrainMode
Index: firmware/App/Modes/ModeFault.h
===================================================================
diff -u -rbbf1e3736be03a4f041ace57e0f95e23caf472dd -r4efb2d1786c717ca6cf4b1bc992cec8e16820bff
--- firmware/App/Modes/ModeFault.h	(.../ModeFault.h)	(revision bbf1e3736be03a4f041ace57e0f95e23caf472dd)
+++ firmware/App/Modes/ModeFault.h	(.../ModeFault.h)	(revision 4efb2d1786c717ca6cf4b1bc992cec8e16820bff)
@@ -18,7 +18,7 @@
 #define __MODE_FAULT_H__
 
 #include "DGCommon.h"
-#include "DGModes.h"
+#include "DGDefs.h"
 
 /**
  *  @defgroup DGFaultMode DGFaultMode
Index: firmware/App/Modes/ModeFill.h
===================================================================
diff -u -rbbf1e3736be03a4f041ace57e0f95e23caf472dd -r4efb2d1786c717ca6cf4b1bc992cec8e16820bff
--- firmware/App/Modes/ModeFill.h	(.../ModeFill.h)	(revision bbf1e3736be03a4f041ace57e0f95e23caf472dd)
+++ firmware/App/Modes/ModeFill.h	(.../ModeFill.h)	(revision 4efb2d1786c717ca6cf4b1bc992cec8e16820bff)
@@ -18,7 +18,7 @@
 #define __MODE_FILl_H__
 
 #include "DGCommon.h"
-#include "DGModes.h"
+#include "DGDefs.h"
 
 /**
  *  @defgroup DGFillMode DGFillMode
Index: firmware/App/Modes/ModeFlush.h
===================================================================
diff -u -rbbf1e3736be03a4f041ace57e0f95e23caf472dd -r4efb2d1786c717ca6cf4b1bc992cec8e16820bff
--- firmware/App/Modes/ModeFlush.h	(.../ModeFlush.h)	(revision bbf1e3736be03a4f041ace57e0f95e23caf472dd)
+++ firmware/App/Modes/ModeFlush.h	(.../ModeFlush.h)	(revision 4efb2d1786c717ca6cf4b1bc992cec8e16820bff)
@@ -18,7 +18,7 @@
 #define __MODE_FLUSH_H__
 
 #include "DGCommon.h"
-#include "DGModes.h"
+#include "DGDefs.h"
 
 /**
  *  @defgroup DGFlushMode DGFlushMode
Index: firmware/App/Modes/ModeHeatDisinfect.h
===================================================================
diff -u -rbbf1e3736be03a4f041ace57e0f95e23caf472dd -r4efb2d1786c717ca6cf4b1bc992cec8e16820bff
--- firmware/App/Modes/ModeHeatDisinfect.h	(.../ModeHeatDisinfect.h)	(revision bbf1e3736be03a4f041ace57e0f95e23caf472dd)
+++ firmware/App/Modes/ModeHeatDisinfect.h	(.../ModeHeatDisinfect.h)	(revision 4efb2d1786c717ca6cf4b1bc992cec8e16820bff)
@@ -18,7 +18,7 @@
 #define __MODE_HEAT_DISINFECT_H__
 
 #include "DGCommon.h"
-#include "DGModes.h"
+#include "DGDefs.h"
 
 /**
  *  @defgroup DGHeatDisinfectMode DGHeatDisinfectMode
Index: firmware/App/Modes/ModeInitPOST.h
===================================================================
diff -u -rbbf1e3736be03a4f041ace57e0f95e23caf472dd -r4efb2d1786c717ca6cf4b1bc992cec8e16820bff
--- firmware/App/Modes/ModeInitPOST.h	(.../ModeInitPOST.h)	(revision bbf1e3736be03a4f041ace57e0f95e23caf472dd)
+++ firmware/App/Modes/ModeInitPOST.h	(.../ModeInitPOST.h)	(revision 4efb2d1786c717ca6cf4b1bc992cec8e16820bff)
@@ -18,7 +18,7 @@
 #define __MODE_INIT_POST_H__
 
 #include "DGCommon.h"
-#include "DGModes.h"
+#include "DGDefs.h"
 
 /**
  *  @defgroup DGInitAndPOSTMode DGInitAndPOSTMode
Index: firmware/App/Modes/ModeRecirculate.h
===================================================================
diff -u -rbbf1e3736be03a4f041ace57e0f95e23caf472dd -r4efb2d1786c717ca6cf4b1bc992cec8e16820bff
--- firmware/App/Modes/ModeRecirculate.h	(.../ModeRecirculate.h)	(revision bbf1e3736be03a4f041ace57e0f95e23caf472dd)
+++ firmware/App/Modes/ModeRecirculate.h	(.../ModeRecirculate.h)	(revision 4efb2d1786c717ca6cf4b1bc992cec8e16820bff)
@@ -18,7 +18,7 @@
 #define __MODE_RECIRCULATION_H__
 
 #include "DGCommon.h"
-#include "DGModes.h"
+#include "DGDefs.h"
 
 /**
  *  @defgroup DGRecirculateMode DGRecirculateMode
Index: firmware/App/Modes/ModeService.h
===================================================================
diff -u -rbbf1e3736be03a4f041ace57e0f95e23caf472dd -r4efb2d1786c717ca6cf4b1bc992cec8e16820bff
--- firmware/App/Modes/ModeService.h	(.../ModeService.h)	(revision bbf1e3736be03a4f041ace57e0f95e23caf472dd)
+++ firmware/App/Modes/ModeService.h	(.../ModeService.h)	(revision 4efb2d1786c717ca6cf4b1bc992cec8e16820bff)
@@ -18,7 +18,7 @@
 #define __MODE_SERVICE_H__
 
 #include "DGCommon.h"
-#include "DGModes.h"
+#include "DGDefs.h"
 
 /**
  *  @defgroup DGServiceMode DGServiceMode
Index: firmware/App/Modes/ModeSolo.h
===================================================================
diff -u -rbbf1e3736be03a4f041ace57e0f95e23caf472dd -r4efb2d1786c717ca6cf4b1bc992cec8e16820bff
--- firmware/App/Modes/ModeSolo.h	(.../ModeSolo.h)	(revision bbf1e3736be03a4f041ace57e0f95e23caf472dd)
+++ firmware/App/Modes/ModeSolo.h	(.../ModeSolo.h)	(revision 4efb2d1786c717ca6cf4b1bc992cec8e16820bff)
@@ -18,7 +18,7 @@
 #define __MODE_SOLO_H__
 
 #include "DGCommon.h"
-#include "DGModes.h"
+#include "DGDefs.h"
 
 /**
  *  @defgroup DGSoloStandbyMode DGSoloStandbyMode
Index: firmware/App/Modes/ModeStandby.h
===================================================================
diff -u -rbbf1e3736be03a4f041ace57e0f95e23caf472dd -r4efb2d1786c717ca6cf4b1bc992cec8e16820bff
--- firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision bbf1e3736be03a4f041ace57e0f95e23caf472dd)
+++ firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision 4efb2d1786c717ca6cf4b1bc992cec8e16820bff)
@@ -18,7 +18,7 @@
 #define __MODE_STANDBY_H__
 
 #include "DGCommon.h"
-#include "DGModes.h"
+#include "DGDefs.h"
 
 /**
  *  @defgroup DGStandbyMode DGStandbyMode
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -rbbf1e3736be03a4f041ace57e0f95e23caf472dd -r4efb2d1786c717ca6cf4b1bc992cec8e16820bff
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision bbf1e3736be03a4f041ace57e0f95e23caf472dd)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 4efb2d1786c717ca6cf4b1bc992cec8e16820bff)
@@ -96,6 +96,7 @@
 #else
     currentMode = DG_MODE_FAUL;
 #endif
+    currentSubMode = 0;
     transitionToNewOperationMode( DG_MODE_INIT );
 
     // call initializers for the individual modes
Index: firmware/App/Modes/OperationModes.h
===================================================================
diff -u -rbbf1e3736be03a4f041ace57e0f95e23caf472dd -r4efb2d1786c717ca6cf4b1bc992cec8e16820bff
--- firmware/App/Modes/OperationModes.h	(.../OperationModes.h)	(revision bbf1e3736be03a4f041ace57e0f95e23caf472dd)
+++ firmware/App/Modes/OperationModes.h	(.../OperationModes.h)	(revision 4efb2d1786c717ca6cf4b1bc992cec8e16820bff)
@@ -18,7 +18,7 @@
 #define __OP_MODES_H__
 
 #include "DGCommon.h"
-#include "DGModes.h"
+#include "DGDefs.h"
 
 /**
  *  @defgroup DGOperationModes DGOperationModes
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -rbbf1e3736be03a4f041ace57e0f95e23caf472dd -r4efb2d1786c717ca6cf4b1bc992cec8e16820bff
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision bbf1e3736be03a4f041ace57e0f95e23caf472dd)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 4efb2d1786c717ca6cf4b1bc992cec8e16820bff)
@@ -33,7 +33,7 @@
 
 #define MIN_RESERVOIR_VOLUME_ML                     0                                       ///< Minimum reservoir volume in mL.
 #define MAX_RESERVOIR_VOLUME_ML                     2500                                    ///< Maximum reservoir volume in mL.
-#define DEFAULT_FILL_VOLUME_ML                      1500                                    ///< Default fill volume for treatment in mL.
+#define DEFAULT_FILL_VOLUME_ML                      1700                                    ///< Default fill volume for treatment in mL.
 #define DISINFECT_FILL_VOLUME_ML                    2400                                    ///> Fill volume for disinfection in mL.
 #define MAX_FILL_VOLUME_ML                          MAX_RESERVOIR_VOLUME_ML                 ///> Maximum fill volume in mL.
 #define DEFAULT_DRAIN_VOLUME_ML                     100                                     ///> Default drain volume in mL.