diff --git a/bins/BrewPiLess.v4.2.4m2m.bin b/bins/BrewPiLess.v4.2.1.4m2m.bin
similarity index 60%
rename from bins/BrewPiLess.v4.2.4m2m.bin
rename to bins/BrewPiLess.v4.2.1.4m2m.bin
index 4356c45b8..248484f2e 100644
Binary files a/bins/BrewPiLess.v4.2.4m2m.bin and b/bins/BrewPiLess.v4.2.1.4m2m.bin differ
diff --git a/bins/BrewPiLess.v4.2.4m2m.italian.bin b/bins/BrewPiLess.v4.2.1.4m2m.italian.bin
similarity index 59%
rename from bins/BrewPiLess.v4.2.4m2m.italian.bin
rename to bins/BrewPiLess.v4.2.1.4m2m.italian.bin
index 686de8d11..0ecf4541b 100644
Binary files a/bins/BrewPiLess.v4.2.4m2m.italian.bin and b/bins/BrewPiLess.v4.2.1.4m2m.italian.bin differ
diff --git a/bins/BrewPiLess.v4.2.4m2m.norwegian.bin b/bins/BrewPiLess.v4.2.1.4m2m.norwegian.bin
similarity index 60%
rename from bins/BrewPiLess.v4.2.4m2m.norwegian.bin
rename to bins/BrewPiLess.v4.2.1.4m2m.norwegian.bin
index 9df0c1898..3ce3ec187 100644
Binary files a/bins/BrewPiLess.v4.2.4m2m.norwegian.bin and b/bins/BrewPiLess.v4.2.1.4m2m.norwegian.bin differ
diff --git a/bins/BrewPiLess.v4.2.4m2m.portuguese-br.bin b/bins/BrewPiLess.v4.2.1.4m2m.portuguese-br.bin
similarity index 59%
rename from bins/BrewPiLess.v4.2.4m2m.portuguese-br.bin
rename to bins/BrewPiLess.v4.2.1.4m2m.portuguese-br.bin
index 94c315caf..880d68c1a 100644
Binary files a/bins/BrewPiLess.v4.2.4m2m.portuguese-br.bin and b/bins/BrewPiLess.v4.2.1.4m2m.portuguese-br.bin differ
diff --git a/bins/BrewPiLess.v4.2.4m2m.slovak.bin b/bins/BrewPiLess.v4.2.1.4m2m.slovak.bin
similarity index 60%
rename from bins/BrewPiLess.v4.2.4m2m.slovak.bin
rename to bins/BrewPiLess.v4.2.1.4m2m.slovak.bin
index f692f9ef1..d923516ff 100644
Binary files a/bins/BrewPiLess.v4.2.4m2m.slovak.bin and b/bins/BrewPiLess.v4.2.1.4m2m.slovak.bin differ
diff --git a/bins/BrewPiLess.v4.2.4m2m.spanish.bin b/bins/BrewPiLess.v4.2.1.4m2m.spanish.bin
similarity index 60%
rename from bins/BrewPiLess.v4.2.4m2m.spanish.bin
rename to bins/BrewPiLess.v4.2.1.4m2m.spanish.bin
index 9a467dd5e..ec071c826 100644
Binary files a/bins/BrewPiLess.v4.2.4m2m.spanish.bin and b/bins/BrewPiLess.v4.2.1.4m2m.spanish.bin differ
diff --git a/bins/BrewPiLess.v4.2.4m2m.zhtw.bin b/bins/BrewPiLess.v4.2.1.4m2m.zhtw.bin
similarity index 59%
rename from bins/BrewPiLess.v4.2.4m2m.zhtw.bin
rename to bins/BrewPiLess.v4.2.1.4m2m.zhtw.bin
index 87d09b00a..2ebc74cf1 100644
Binary files a/bins/BrewPiLess.v4.2.4m2m.zhtw.bin and b/bins/BrewPiLess.v4.2.1.4m2m.zhtw.bin differ
diff --git a/bins/BrewPiLess.v4.2.d1pro.esp8266.16m14m.bin b/bins/BrewPiLess.v4.2.1.d1pro.esp8266.16m14m.bin
similarity index 60%
rename from bins/BrewPiLess.v4.2.d1pro.esp8266.16m14m.bin
rename to bins/BrewPiLess.v4.2.1.d1pro.esp8266.16m14m.bin
index 919c7f95f..52b004e7f 100644
Binary files a/bins/BrewPiLess.v4.2.d1pro.esp8266.16m14m.bin and b/bins/BrewPiLess.v4.2.1.d1pro.esp8266.16m14m.bin differ
diff --git a/bins/BrewPiLess.v4.2.esp32.bin b/bins/BrewPiLess.v4.2.1.esp32.bin
similarity index 74%
rename from bins/BrewPiLess.v4.2.esp32.bin
rename to bins/BrewPiLess.v4.2.1.esp32.bin
index d6478cfe7..7469539b2 100644
Binary files a/bins/BrewPiLess.v4.2.esp32.bin and b/bins/BrewPiLess.v4.2.1.esp32.bin differ
diff --git a/bins/BrewPiLess.v4.2.esp32.spiffs.bin b/bins/BrewPiLess.v4.2.1.esp32.spiffs.bin
similarity index 73%
rename from bins/BrewPiLess.v4.2.esp32.spiffs.bin
rename to bins/BrewPiLess.v4.2.1.esp32.spiffs.bin
index f591aa6c0..5c803cbfb 100644
Binary files a/bins/BrewPiLess.v4.2.esp32.spiffs.bin and b/bins/BrewPiLess.v4.2.1.esp32.spiffs.bin differ
diff --git a/bins/BrewPiLess.v4.2.oled.esp8266.4m2m.bin b/bins/BrewPiLess.v4.2.1.oled.esp8266.4m2m.bin
similarity index 69%
rename from bins/BrewPiLess.v4.2.oled.esp8266.4m2m.bin
rename to bins/BrewPiLess.v4.2.1.oled.esp8266.4m2m.bin
index a4c48ae28..0ced7965d 100644
Binary files a/bins/BrewPiLess.v4.2.oled.esp8266.4m2m.bin and b/bins/BrewPiLess.v4.2.1.oled.esp8266.4m2m.bin differ
diff --git a/bins/BrewPiLess.v4.2.oled.ispindel.bin b/bins/BrewPiLess.v4.2.1.oled.ispindel.bin
similarity index 69%
rename from bins/BrewPiLess.v4.2.oled.ispindel.bin
rename to bins/BrewPiLess.v4.2.1.oled.ispindel.bin
index 19cc59521..bdb7594ff 100644
Binary files a/bins/BrewPiLess.v4.2.oled.ispindel.bin and b/bins/BrewPiLess.v4.2.1.oled.ispindel.bin differ
diff --git a/bins/BrewPiLess.v4.2.sonoff.am2301.1m64.bin b/bins/BrewPiLess.v4.2.1.sonoff.am2301.1m64.bin
similarity index 87%
rename from bins/BrewPiLess.v4.2.sonoff.am2301.1m64.bin
rename to bins/BrewPiLess.v4.2.1.sonoff.am2301.1m64.bin
index 7fc9d3e42..cee5f7c76 100644
Binary files a/bins/BrewPiLess.v4.2.sonoff.am2301.1m64.bin and b/bins/BrewPiLess.v4.2.1.sonoff.am2301.1m64.bin differ
diff --git a/bins/BrewPiLess.v4.2.sonoff.classic.1m64.bin b/bins/BrewPiLess.v4.2.1.sonoff.classic.1m64.bin
similarity index 87%
rename from bins/BrewPiLess.v4.2.sonoff.classic.1m64.bin
rename to bins/BrewPiLess.v4.2.1.sonoff.classic.1m64.bin
index b830ff354..b27724bc8 100644
Binary files a/bins/BrewPiLess.v4.2.sonoff.classic.1m64.bin and b/bins/BrewPiLess.v4.2.1.sonoff.classic.1m64.bin differ
diff --git a/bins/BrewPiLess.v4.2.sonoff.esp8285.1m64.bin b/bins/BrewPiLess.v4.2.1.sonoff.esp8285.1m64.bin
similarity index 87%
rename from bins/BrewPiLess.v4.2.sonoff.esp8285.1m64.bin
rename to bins/BrewPiLess.v4.2.1.sonoff.esp8285.1m64.bin
index a18f5b20b..70c2a12a2 100644
Binary files a/bins/BrewPiLess.v4.2.sonoff.esp8285.1m64.bin and b/bins/BrewPiLess.v4.2.1.sonoff.esp8285.1m64.bin differ
diff --git a/bins/BrewPiLess.v4.2.thorrax.esp8266.4m2m.bin b/bins/BrewPiLess.v4.2.1.thorrax.esp8266.4m2m.bin
similarity index 60%
rename from bins/BrewPiLess.v4.2.thorrax.esp8266.4m2m.bin
rename to bins/BrewPiLess.v4.2.1.thorrax.esp8266.4m2m.bin
index 96dbd1f9f..134555f1d 100644
Binary files a/bins/BrewPiLess.v4.2.thorrax.esp8266.4m2m.bin and b/bins/BrewPiLess.v4.2.1.thorrax.esp8266.4m2m.bin differ
diff --git a/platformio.ini b/platformio.ini
index 215b40404..e7f898e54 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -11,7 +11,7 @@
 [platformio]
 #sonoff OTA no longer supported, classic interface no longer supported
 default_envs = esp32-spiffs, esp8266, esp8266-tw, esp8266-spanish, esp8266-portuguese-br, esp8266-slovak,  esp8266-oled, esp8266-ispindel, esp8266-it, esp8266-norwegian, thorrax, sonoff, sonoff-esp8285 , esp32, d1pro, sonoff-am2301
-#default_envs = esp32
+#default_envs = esp32-dev
 #default_envs = esp8266-dev
 #default_envs = esp8266
 
diff --git a/src/BPLSettings.cpp b/src/BPLSettings.cpp
index 48c96ce6f..d438658c0 100644
--- a/src/BPLSettings.cpp
+++ b/src/BPLSettings.cpp
@@ -20,8 +20,6 @@
 #include "BPLSettings.h"
 #include "BrewLogger.h"
 
-
-
 BPLSettings theSettings;
 
 #define BPLSettingFileName "/bpl.cfg"
@@ -1241,7 +1239,7 @@ String BPLSettings::jsonMqttRemoteControlSettings(void){
 	}
 #endif
 
-#if Auto_CAP
+#if AUTO_CAP
 	if(settings->capControlPathOffset){
 		root[CapPathKey] = settings->_strings + settings->capControlPathOffset;
 	}
@@ -1355,7 +1353,7 @@ bool BPLSettings::dejsonMqttRemoteControlSettings(String json){
 	if(!(ptr=copyIfExist(root,PtcPathKey,settings->ptcPathOffset,ptr,base))) return false;
 	#endif
 
-	#if Auto_CAP
+	#if AUTO_CAP
 	if(!(ptr=copyIfExist(root,CapPathKey,settings->capControlPathOffset,ptr,base))) return false;
 	#endif
 
diff --git a/src/MqttRemoteControl.cpp b/src/MqttRemoteControl.cpp
index f5798dd44..7126551d1 100644
--- a/src/MqttRemoteControl.cpp
+++ b/src/MqttRemoteControl.cpp
@@ -23,8 +23,8 @@ extern BrewPiProxy brewpi;
 #include "ParasiteTempController.h"
 #endif
 
-#if Auto_CAP
-#include "AutoCapContro.h"
+#if AUTO_CAP
+#include "AutoCapControl.h"
 #endif
 
 
@@ -265,7 +265,7 @@ void MqttRemoteControl::_loadConfig()
         _ptcPath = settings->ptcPathOffset? (char*)settings->_strings + settings->ptcPathOffset:NULL;
 #endif
 
-#if Auto_CAP
+#if AUTO_CAP
         _capPath = settings->capControlPathOffset? (char*)settings->_strings + settings->capControlPathOffset:NULL;
 #endif
 
@@ -280,7 +280,7 @@ void MqttRemoteControl::_loadConfig()
         if(_ptcPath) DBG_PRINTF("_ptcPath:%s\n",_ptcPath);
         #endif
 
-        #if Auto_CAP
+        #if AUTO_CAP
         if(_capPath) DBG_PRINTF("_capPath:%s\n",_capPath);
         #endif        
         #endif
@@ -349,7 +349,7 @@ void MqttRemoteControl::_onConnect(void){
     }
     #endif
 
-    #if Auto_CAP
+    #if AUTO_CAP
     if(_capPath){
         if(_client.subscribe(_capPath, 1)){
             DBG_PRINTF("MQTT:Subscribing %s\n",_capPath);
@@ -382,7 +382,7 @@ void MqttRemoteControl::_onMessage(char* topic, uint8_t* payload, size_t len) {
         this->_onPtcChange((char*)payload,len);
     }
 #endif 
-#if Auto_CAP
+#if AUTO_CAP
     else if(strcmp(topic, _capPath) ==0){
         this->_onCapChange((char*)payload,len);
     }
@@ -464,7 +464,7 @@ void MqttRemoteControl::_onPtcChange(char* payload, size_t len){
 #endif
 
 
-#if Auto_CAP
+#if AUTO_CAP
 void MqttRemoteControl::_onCapChange(char* payload,size_t len){
     bool mode;
 
diff --git a/src/MqttRemoteControl.h b/src/MqttRemoteControl.h
index be13f35ee..6f79dd096 100644
--- a/src/MqttRemoteControl.h
+++ b/src/MqttRemoteControl.h
@@ -63,7 +63,7 @@ class MqttRemoteControl{
     char* _ptcPath;
     #endif
 
-    #if Auto_CAP
+    #if AUTO_CAP
     char* _capPath;
     #endif
 
@@ -81,7 +81,7 @@ class MqttRemoteControl{
     void _onPtcChange(char* payload,size_t len);
 #endif
 
-#if Auto_CAP
+#if AUTO_CAP
     void _onCapChange(char* payload,size_t len);
 #endif
     void _loadConfig();