Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -rf91baac9704a90ab0fea1dd05e11833ffc5a5a4e -raa2517012c7b26de27143c135a5f284ca6721fa1
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision f91baac9704a90ab0fea1dd05e11833ffc5a5a4e)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision aa2517012c7b26de27143c135a5f284ca6721fa1)
@@ -36,6 +36,7 @@
 #include "Timers.h"
 #include "UVReactors.h"
 #include "Valves.h"
+#include "CPLD.h"
 
 /**
  *  @addtogroup DGChemicalDisinfectMode
@@ -235,6 +236,8 @@
 
     initChemicalDisinfectMode();
 
+    setCPLDCleanLEDColor( CPLD_CLEAN_LED_YELLOW );
+
     return chemDisinfectState;
 }
 
Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -rf91baac9704a90ab0fea1dd05e11833ffc5a5a4e -raa2517012c7b26de27143c135a5f284ca6721fa1
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision f91baac9704a90ab0fea1dd05e11833ffc5a5a4e)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision aa2517012c7b26de27143c135a5f284ca6721fa1)
@@ -30,6 +30,7 @@
 #include "TemperatureSensors.h"
 #include "Timers.h"
 #include "Valves.h"
+#include "CPLD.h"
 
 /**
  *  @addtogroup DGDrainMode
@@ -127,6 +128,8 @@
     setHeaterTargetTemperature( DG_PRIMARY_HEATER, getPrimaryHeaterTargetTemperature() );
     startHeater( DG_PRIMARY_HEATER );
 
+    setCPLDCleanLEDColor( CPLD_CLEAN_LED_OFF );
+
     return drainState;
 }
 
Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -r544e9782a1b8d444224f41efef38a5204c262722 -raa2517012c7b26de27143c135a5f284ca6721fa1
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 544e9782a1b8d444224f41efef38a5204c262722)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision aa2517012c7b26de27143c135a5f284ca6721fa1)
@@ -26,6 +26,7 @@
 #include "SystemCommMessages.h"
 #include "UVReactors.h"
 #include "Valves.h"
+#include "CPLD.h"
 
 /**
  *  @addtogroup DGFaultMode
@@ -85,6 +86,8 @@
     resetNVDataMgmtPostState();
     resetRTCPostState();
 
+    setCPLDCleanLEDColor( CPLD_CLEAN_LED_OFF );
+
     return faultState;
 }
 
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rd0c73712d9a955b8189e2d45b22f36af71806c03 -raa2517012c7b26de27143c135a5f284ca6721fa1
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision d0c73712d9a955b8189e2d45b22f36af71806c03)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision aa2517012c7b26de27143c135a5f284ca6721fa1)
@@ -20,6 +20,7 @@
 #include "ConcentratePumps.h"
 #include "ConductivitySensors.h"
 #include "FPGA.h"
+#include "CPLD.h"
 #include "Heaters.h"
 #include "LoadCell.h"
 #include "ModeFill.h"
@@ -215,6 +216,8 @@
     setHeaterTargetTemperature( DG_PRIMARY_HEATER, getPrimaryHeaterTargetTemperature() );
     startHeater( DG_PRIMARY_HEATER );
 
+    setCPLDCleanLEDColor( CPLD_CLEAN_LED_OFF );
+
     return fillState;
 }
 
Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -rf91baac9704a90ab0fea1dd05e11833ffc5a5a4e -raa2517012c7b26de27143c135a5f284ca6721fa1
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision f91baac9704a90ab0fea1dd05e11833ffc5a5a4e)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision aa2517012c7b26de27143c135a5f284ca6721fa1)
@@ -31,6 +31,7 @@
 #include "Timers.h"
 #include "UVReactors.h"
 #include "Valves.h"
+#include "CPLD.h"
 
 /**
  *  @addtogroup DGFlushMode
@@ -161,6 +162,8 @@
 
     initFlushMode();
 
+    setCPLDCleanLEDColor( CPLD_CLEAN_LED_BLUE );
+
     return flushState;
 }
 
Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -ra7a7874f47ccddc122af67273851881477880ff9 -raa2517012c7b26de27143c135a5f284ca6721fa1
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision a7a7874f47ccddc122af67273851881477880ff9)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision aa2517012c7b26de27143c135a5f284ca6721fa1)
@@ -20,6 +20,7 @@
 #include "ConductivitySensors.h"
 #include "DrainPump.h"
 #include "FPGA.h"
+#include "CPLD.h"
 #include "HDDefs.h"
 #include "Heaters.h"
 #include "ModeFill.h"
@@ -135,6 +136,8 @@
     setHeaterTargetTemperature( DG_PRIMARY_HEATER, getPrimaryHeaterTargetTemperature() );
     startHeater( DG_PRIMARY_HEATER );
 
+    setCPLDCleanLEDColor( CPLD_CLEAN_LED_OFF );
+
     return genIdleState;
 }
 
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -rf91baac9704a90ab0fea1dd05e11833ffc5a5a4e -raa2517012c7b26de27143c135a5f284ca6721fa1
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision f91baac9704a90ab0fea1dd05e11833ffc5a5a4e)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision aa2517012c7b26de27143c135a5f284ca6721fa1)
@@ -38,6 +38,7 @@
 #include "Timers.h"
 #include "UVReactors.h"
 #include "Valves.h"
+#include "CPLD.h"
 
 /**
  *  @addtogroup DGHeatDisinfectMode
@@ -260,6 +261,8 @@
 
     initHeatDisinfectMode();
 
+    setCPLDCleanLEDColor( CPLD_CLEAN_LED_ORANGE );
+
     return heatDisinfectState;
 }
 
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r224b86c0847207c168d38fa1713a1e9116642267 -raa2517012c7b26de27143c135a5f284ca6721fa1
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 224b86c0847207c168d38fa1713a1e9116642267)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision aa2517012c7b26de27143c135a5f284ca6721fa1)
@@ -92,6 +92,7 @@
 U32 transitionToInitAndPOSTMode( void )
 {
     initInitAndPOSTMode();
+    setCPLDCleanLEDColor( CPLD_CLEAN_LED_OFF );
 
     return postState;
 }
Index: firmware/App/Modes/ModeService.c
===================================================================
diff -u -r224b86c0847207c168d38fa1713a1e9116642267 -raa2517012c7b26de27143c135a5f284ca6721fa1
--- firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision 224b86c0847207c168d38fa1713a1e9116642267)
+++ firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision aa2517012c7b26de27143c135a5f284ca6721fa1)
@@ -17,6 +17,7 @@
 
 #include "OperationModes.h"
 #include "ModeService.h"
+#include "CPLD.h"
 
 /**
  *  @addtogroup DGServiceMode
@@ -53,6 +54,8 @@
 U32 transitionToServiceMode( void )
 {
     // Deenergize all the actuators
+
+    setCPLDCleanLEDColor( CPLD_CLEAN_LED_OFF );
     return 0;
 }
 
Index: firmware/App/Modes/ModeSolo.c
===================================================================
diff -u -ra9315539f527b92523b1598ff91e47db4d71dae2 -raa2517012c7b26de27143c135a5f284ca6721fa1
--- firmware/App/Modes/ModeSolo.c	(.../ModeSolo.c)	(revision a9315539f527b92523b1598ff91e47db4d71dae2)
+++ firmware/App/Modes/ModeSolo.c	(.../ModeSolo.c)	(revision aa2517012c7b26de27143c135a5f284ca6721fa1)
@@ -58,6 +58,8 @@
 {
     initSoloMode();
 
+    setCPLDCleanLEDColor( CPLD_CLEAN_LED_OFF );
+
     return soloState;
 }
 
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r3d413ac026e89a1324c4b0e99516735ec382fed8 -raa2517012c7b26de27143c135a5f284ca6721fa1
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 3d413ac026e89a1324c4b0e99516735ec382fed8)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision aa2517012c7b26de27143c135a5f284ca6721fa1)
@@ -116,6 +116,8 @@
 
     deenergizeActuators();
 
+    setCPLDCleanLEDColor( CPLD_CLEAN_LED_OFF );
+
     return standbyState;
 }