diff --git a/boards/esp32-fix.json b/boards/esp32-fix.json
index 73cf149fa..fc0db8027 100644
--- a/boards/esp32-fix.json
+++ b/boards/esp32-fix.json
@@ -4,7 +4,7 @@
       "ldscript": "esp32_out.ld"
     },
     "core": "esp32",
-    "extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DHAS_PSRAM_FIX -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw -DESP32_4M",
+    "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DHAS_PSRAM_FIX -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw -DESP32_4M",
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "dio",
diff --git a/boards/esp32.json b/boards/esp32.json
index 10c117cd7..983483a46 100644
--- a/boards/esp32.json
+++ b/boards/esp32.json
@@ -4,7 +4,7 @@
         "ldscript": "esp32_out.ld"
       },
       "core": "esp32",
-      "extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DESP32_4M",
+      "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DESP32_4M",
       "f_cpu": "160000000L",
       "f_flash": "40000000L",
       "flash_mode": "dio",
diff --git a/boards/esp32_solo1.json b/boards/esp32_solo1.json
index b80a58156..783e12194 100644
--- a/boards/esp32_solo1.json
+++ b/boards/esp32_solo1.json
@@ -4,7 +4,7 @@
       "ldscript": "esp32_out.ld"
     },
     "core": "esp32",
-    "extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DESP32_4M -DCORE32SOLO1",
+    "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DESP32_4M -DCORE32SOLO1",
     "f_cpu": "240000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
diff --git a/boards/esp32c2.json b/boards/esp32c2.json
index ea5cbae2c..644c3f2ed 100644
--- a/boards/esp32c2.json
+++ b/boards/esp32c2.json
@@ -4,7 +4,7 @@
         "ldscript": "esp32c2_out.ld"
       },
       "core": "esp32",
-      "extra_flags": "-DESP32_4M -DESP32C2",
+      "extra_flags": "-DARDUINO_TASMOTA -DESP32_4M -DESP32C2",
       "f_cpu": "120000000L",
       "f_flash": "60000000L",
       "flash_mode": "qio",
diff --git a/boards/esp32c2_2M.json b/boards/esp32c2_2M.json
index fbffa167c..e3818ef4a 100644
--- a/boards/esp32c2_2M.json
+++ b/boards/esp32c2_2M.json
@@ -4,7 +4,7 @@
         "ldscript": "esp32c2_out.ld"
       },
       "core": "esp32",
-      "extra_flags": "-DESP32_2M -DESP32C2",
+      "extra_flags": "-DARDUINO_TASMOTA -DESP32_2M -DESP32C2",
       "f_cpu": "120000000L",
       "f_flash": "60000000L",
       "flash_mode": "qio",
diff --git a/boards/esp32c3.json b/boards/esp32c3.json
index 6a49ba922..2a17128e3 100644
--- a/boards/esp32c3.json
+++ b/boards/esp32c3.json
@@ -4,7 +4,7 @@
         "ldscript": "esp32c3_out.ld"
       },
       "core": "esp32",
-      "extra_flags": "-DESP32_4M -DESP32C3",
+      "extra_flags": "-DARDUINO_TASMOTA -DESP32_4M -DESP32C3",
       "f_cpu": "160000000L",
       "f_flash": "80000000L",
       "flash_mode": "dio",
diff --git a/boards/esp32c3cdc.json b/boards/esp32c3cdc.json
index 7ee0326f0..86f7f365e 100644
--- a/boards/esp32c3cdc.json
+++ b/boards/esp32c3cdc.json
@@ -4,7 +4,7 @@
         "ldscript": "esp32c3_out.ld"
       },
       "core": "esp32",
-      "extra_flags": "-DARDUINO_USB_MODE=1 -DESP32_4M -DESP32C3 -DUSE_USB_CDC_CONSOLE",
+      "extra_flags": "-DARDUINO_TASMOTA -DARDUINO_USB_MODE=1 -DESP32_4M -DESP32C3 -DUSE_USB_CDC_CONSOLE",
       "f_cpu": "160000000L",
       "f_flash": "80000000L",
       "flash_mode": "dio",
diff --git a/boards/esp32c6.json b/boards/esp32c6.json
index 68feaec6e..797b8f9a5 100644
--- a/boards/esp32c6.json
+++ b/boards/esp32c6.json
@@ -4,7 +4,7 @@
         "ldscript": "esp32c6_out.ld"
       },
       "core": "esp32",
-      "extra_flags": "-DESP32_4M -DESP32C6",
+      "extra_flags": "-DARDUINO_TASMOTA -DESP32_4M -DESP32C6",
       "f_cpu": "160000000L",
       "f_flash": "80000000L",
       "flash_mode": "qio",
diff --git a/boards/esp32c6cdc.json b/boards/esp32c6cdc.json
index 9cde9e62b..e5cd0aad9 100644
--- a/boards/esp32c6cdc.json
+++ b/boards/esp32c6cdc.json
@@ -4,7 +4,7 @@
         "ldscript": "esp32c6_out.ld"
       },
       "core": "esp32",
-      "extra_flags": "-DARDUINO_USB_MODE=1 -DESP32_4M -DESP32C6 -DUSE_USB_CDC_CONSOLE",
+      "extra_flags": "-DARDUINO_TASMOTA -DARDUINO_USB_MODE=1 -DESP32_4M -DESP32C6 -DUSE_USB_CDC_CONSOLE",
       "f_cpu": "160000000L",
       "f_flash": "80000000L",
       "flash_mode": "qio",
diff --git a/boards/esp32s2.json b/boards/esp32s2.json
index 18bd9200a..276dbcab1 100644
--- a/boards/esp32s2.json
+++ b/boards/esp32s2.json
@@ -4,7 +4,7 @@
       "ldscript": "esp32s2_out.ld"
     },
     "core": "esp32",
-    "extra_flags": "-DBOARD_HAS_PSRAM -DESP32_4M -DESP32S2",
+    "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DESP32_4M -DESP32S2",
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "dio",
diff --git a/boards/esp32s2cdc.json b/boards/esp32s2cdc.json
index c379be423..57a8ed56d 100644
--- a/boards/esp32s2cdc.json
+++ b/boards/esp32s2cdc.json
@@ -4,7 +4,7 @@
       "ldscript": "esp32s2_out.ld"
     },
     "core": "esp32",
-    "extra_flags": "-DBOARD_HAS_PSRAM -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S2",
+    "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S2",
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "dio",
diff --git a/boards/esp32s3-opi_opi.json b/boards/esp32s3-opi_opi.json
index 92803a838..7b78b04da 100644
--- a/boards/esp32s3-opi_opi.json
+++ b/boards/esp32s3-opi_opi.json
@@ -5,7 +5,7 @@
         "memory_type": "opi_opi"
       },
       "core": "esp32",
-      "extra_flags": "-DBOARD_HAS_PSRAM -DESP32_4M -DESP32S3",
+      "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DESP32_4M -DESP32S3",
       "f_cpu": "240000000L",
       "f_flash": "80000000L",
       "flash_mode": "dout",
@@ -46,4 +46,4 @@
     },
     "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/",
     "vendor": "Espressif"
-  }
\ No newline at end of file
+  }
diff --git a/boards/esp32s3-qio_opi.json b/boards/esp32s3-qio_opi.json
index 614831574..7f5d73a00 100644
--- a/boards/esp32s3-qio_opi.json
+++ b/boards/esp32s3-qio_opi.json
@@ -5,7 +5,7 @@
       "memory_type": "qio_opi"
     },
     "core": "esp32",
-    "extra_flags": "-DBOARD_HAS_PSRAM -DESP32_4M -DESP32S3",
+    "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DESP32_4M -DESP32S3",
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
diff --git a/boards/esp32s3-qio_qspi.json b/boards/esp32s3-qio_qspi.json
index 9b11a31b0..4733507f2 100644
--- a/boards/esp32s3-qio_qspi.json
+++ b/boards/esp32s3-qio_qspi.json
@@ -5,7 +5,7 @@
       "memory_type": "qio_qspi"
     },
     "core": "esp32",
-    "extra_flags": "-DBOARD_HAS_PSRAM -DESP32_4M -DESP32S3",
+    "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DESP32_4M -DESP32S3",
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
diff --git a/boards/esp32s3cdc-opi_opi.json b/boards/esp32s3cdc-opi_opi.json
index 684cba031..b155cc364 100644
--- a/boards/esp32s3cdc-opi_opi.json
+++ b/boards/esp32s3cdc-opi_opi.json
@@ -5,7 +5,7 @@
         "memory_type": "opi_opi"
       },
       "core": "esp32",
-      "extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3",
+      "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3",
       "f_cpu": "240000000L",
       "f_flash": "80000000L",
       "flash_mode": "dout",
@@ -56,4 +56,4 @@
     },
     "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/",
     "vendor": "Espressif"
-  }
\ No newline at end of file
+  }
diff --git a/boards/esp32s3cdc-qio_opi.json b/boards/esp32s3cdc-qio_opi.json
index 46b363266..e22511e12 100644
--- a/boards/esp32s3cdc-qio_opi.json
+++ b/boards/esp32s3cdc-qio_opi.json
@@ -5,7 +5,7 @@
       "memory_type": "qio_opi"
     },
     "core": "esp32",
-    "extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3",
+    "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3",
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
diff --git a/boards/esp32s3cdc-qio_qspi.json b/boards/esp32s3cdc-qio_qspi.json
index fa90e8509..16ce983ac 100644
--- a/boards/esp32s3cdc-qio_qspi.json
+++ b/boards/esp32s3cdc-qio_qspi.json
@@ -5,7 +5,7 @@
       "memory_type": "qio_qspi"
     },
     "core": "esp32",
-    "extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3",
+    "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3",
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
diff --git a/boards/esp8266_1M.json b/boards/esp8266_1M.json
index 6c3327ae7..f07889d94 100644
--- a/boards/esp8266_1M.json
+++ b/boards/esp8266_1M.json
@@ -4,7 +4,7 @@
       "ldscript": "eagle.flash.1m.ld"
     },
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_1M",
+    "extra_flags": "-DARDUINO_TASMOTA -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_1M",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dout",
diff --git a/boards/esp8266_2M1M.json b/boards/esp8266_2M1M.json
index 3f34da721..8ad59eee5 100644
--- a/boards/esp8266_2M1M.json
+++ b/boards/esp8266_2M1M.json
@@ -4,7 +4,7 @@
       "ldscript": "eagle.flash.2m1m.ld"
     },
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_2M -DESP8266_2M1M",
+    "extra_flags": "-DARDUINO_TASMOTA -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_2M -DESP8266_2M1M",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dout",
diff --git a/boards/esp8266_2M256.json b/boards/esp8266_2M256.json
index 5ef9e86ae..473553fa7 100644
--- a/boards/esp8266_2M256.json
+++ b/boards/esp8266_2M256.json
@@ -4,7 +4,7 @@
       "ldscript": "eagle.flash.2m256.ld"
     },
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_2M -DESP8266_2M256",
+    "extra_flags": "-DARDUINO_TASMOTA -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_2M -DESP8266_2M256",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dout",
diff --git a/boards/esp8266_4M2M.json b/boards/esp8266_4M2M.json
index 9708b2621..747679b16 100644
--- a/boards/esp8266_4M2M.json
+++ b/boards/esp8266_4M2M.json
@@ -4,7 +4,7 @@
       "ldscript": "eagle.flash.4m2m.ld"
     },
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_4M -DESP8266_4M2M",
+    "extra_flags": "-DARDUINO_TASMOTA -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_4M -DESP8266_4M2M",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dout",
diff --git a/boards/esp8266_4M3M.json b/boards/esp8266_4M3M.json
index d1fe7e459..ee1dd4faf 100644
--- a/boards/esp8266_4M3M.json
+++ b/boards/esp8266_4M3M.json
@@ -4,7 +4,7 @@
       "ldscript": "eagle.flash.4m3m.ld"
     },
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_4M -DESP8266_4M3M",
+    "extra_flags": "-DARDUINO_TASMOTA -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_4M -DESP8266_4M3M",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dout",
diff --git a/boards/esp8266_zbbridge.json b/boards/esp8266_zbbridge.json
index 726b71de3..54d4fcdef 100644
--- a/boards/esp8266_zbbridge.json
+++ b/boards/esp8266_zbbridge.json
@@ -4,7 +4,7 @@
       "ldscript": "eagle.flash.2m256.ld"
     },
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_2M -DESP8266_2M256",
+    "extra_flags": "-DARDUINO_TASMOTA -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_2M -DESP8266_2M256",
     "f_cpu": "160000000L",
     "f_flash": "40000000L",
     "flash_mode": "dout",