diff --git a/.gitignore b/.gitignore
index 620fc39..35f273e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@
 .vscode/launch.json
 .vscode/ipch
 .vscode
+/firmware_binaries
+/copy_firmware_binaries
+/merge_bin_esp.py
diff --git a/platformio.ini b/platformio.ini
index bad2414..3046248 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -25,7 +25,7 @@ lib_deps_external =
 	adafruit/Adafruit ST7735 and ST7789 Library@^1.7.5
 	paulstoffregen/OneWire @ 2.3.6
 
-[env:NodeMCU]
+[env:NodeMCU-4M]
 platform = espressif8266@2.6.2
 board = nodemcuv2
 framework = arduino
@@ -35,17 +35,27 @@ build_flags =
 lib_deps = 
 	${common_env_data.lib_deps_external}
 
-[env:ESP01_1M]
+[env:ESP8266-4M]
+platform = espressif8266@2.6.2
+board = esp12e
+framework = arduino
+build_flags = 
+	-D ESP8266_BOARD
+	-D ESP8266_Generic
+lib_deps = 
+	${common_env_data.lib_deps_external}
+
+[env:ESP8266-1M]
 platform = espressif8266@2.6.2
 board = esp01_1m
 framework = arduino
 build_flags = 
 	-D ESP8266_BOARD
-	-D ESP01_1M
+	-D ESP8266_1M
 lib_deps = 
 	${common_env_data.lib_deps_external}
 
-[env:ESP07]
+[env:ESP07-4M]
 platform = espressif8266@2.6.2
 board = esp07
 framework = arduino
@@ -55,17 +65,17 @@ build_flags =
 lib_deps = 
 	${common_env_data.lib_deps_external}
 
-[env:ESP12s]
+[env:ESP12-4M]
 platform = espressif8266@2.6.2
 board = esp12e
 framework = arduino
 build_flags = 
 	-D ESP8266_BOARD
-	-D ESP12s
+	-D ESP12
 lib_deps = 
 	${common_env_data.lib_deps_external}
 
-[env:D1_Mini]
+[env:D1_Mini-4M]
 platform = espressif8266@2.6.2
 board = d1_mini
 framework = arduino
@@ -76,7 +86,7 @@ lib_deps =
 	${common_env_data.lib_deps_external}
 
 [env:ESP32_DevKitC]
-platform = espressif32@1.11.0
+platform = espressif32@1.12.4
 board = esp32dev
 framework = arduino
 build_flags = 
@@ -85,8 +95,38 @@ build_flags =
 lib_deps = 
 	${common_env_data.lib_deps_external}
 
+[env:ESP32S]
+platform = espressif32@1.12.4
+board = esp32dev
+framework = arduino
+build_flags = 
+	-D ESP32_BOARD
+	-D ESP32S
+lib_deps = 
+	${common_env_data.lib_deps_external}
+
+[env:ESP32_Generic]
+platform = espressif32@1.12.4
+board = esp32dev
+framework = arduino
+build_flags = 
+	-D ESP32_BOARD
+	-D ESP32_Generic
+lib_deps = 
+	${common_env_data.lib_deps_external}
+
+[env:ESP32_WROOM]
+platform = espressif32@1.12.4
+board = esp32dev
+framework = arduino
+build_flags = 
+	-D ESP32_BOARD
+	-D ESP32_WROOM
+lib_deps = 
+	${common_env_data.lib_deps_external}
+
 [env:M5StickC]
-platform = espressif32@1.11.0
+platform = espressif32@1.12.4
 board = m5stick-c
 framework = arduino
 build_flags = 
diff --git a/src/SensatioFirmware.cpp b/src/SensatioFirmware.cpp
index 0b0f7b1..a680c66 100644
--- a/src/SensatioFirmware.cpp
+++ b/src/SensatioFirmware.cpp
@@ -38,24 +38,36 @@ Display *display = NULL;
 int currentVersion = 46;
 boolean printMemory = false;
 
-#ifdef NodeMCU
+#ifdef ESP8266_Generic
+  String board = "Generic";
+  char firmwareType[] = "ESP8266";
+#elif NodeMCU
   String board = "NodeMCU";
   char firmwareType[] = "ESP8266-NodeMCU";
-#elif ESP01_1M
+#elif ESP8266_1M
   String board = "Generic";
   char firmwareType[] = "ESP8266-1M";
 #elif ESP07
   String board = "ESP07";
   char firmwareType[] = "ESP8266-ESP07";
-#elif ESP12s
-  String board = "ESP12s";
-  char firmwareType[] = "ESP8266-ESP12s";
+#elif ESP12
+  String board = "ESP12";
+  char firmwareType[] = "ESP8266-ESP12";
 #elif D1_Mini
   String board = "D1Mini";
   char firmwareType[] = "ESP8266-D1Mini";
+#elif ESP32_Generic
+  String board = "Generic";
+  char firmwareType[] = "ESP32";
 #elif ESP32_DevKitC
   String board = "DevKitC";
   char firmwareType[] = "ESP32-DevKitC";
+#elif ESP32S
+  String board = "ESP32S";
+  char firmwareType[] = "ESP32-S";
+#elif ESP32_WROOM
+  String board = "ESP-WROOM-32";
+  char firmwareType[] = "ESP32-WROOM";
 #elif M5StickC
   String board = "M5StickC";
   char firmwareType[] = "ESP32-M5StickC";