diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d0d4cbf8..5c04cdae8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,36 @@
 
 ### Builds after release 0.12.0
 
+#### Build 2105171
+
+-   Always copy MQTT payloads to prevent non-0-terminated strings
+-   Updated ArduinoJson to 6.18.0
+-   Added experimental support for `{"on":"t"}` to toggle on/off state via JSON
+
+#### Build 2105120
+
+-   Fixed possibility of non-0-terminated MQTT payloads
+-   Fixed two warnings regarding integer comparison
+
+#### Build 2105112
+
+-   Usermod settings page no usermods message
+-   Lowered min speed for Drip effect
+
+#### Build 2105111
+
+-   Fixed various Codacy code style and logic issues
+
+#### Build 2105110
+
+-   Added Usermod settings page and configurable usermods (PR #1951)
+-   Added experimental `/json/cfg` endpoint for changing settings from JSON (see #1944, not part of official API)
+
+#### Build 2105070
+
+-   Fixed not turning on after pressing "Off" on IR remote twice (#1950)
+-   Fixed OTA update file selection from Android app (TODO: file type verification in JS, since android can't deal with accept='.bin' attribute)
+
 #### Build 2104220
 
 -   Version bump to 0.12.1-b1 "Hikari"
diff --git a/platformio.ini b/platformio.ini
index 217d90c06..dca72f055 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -114,9 +114,6 @@ build_unflags =
 
 # enables all features for travis CI
 build_flags_all_features =
-  -D WLED_USE_ANALOG_LED
-  -D WLED_USE_H801
-  -D WLED_ENABLE_5CH_LEDS
   -D WLED_ENABLE_ADALIGHT
   -D WLED_ENABLE_DMX
   -D WLED_ENABLE_MQTT
@@ -289,7 +286,7 @@ platform = ${common.platform_wled_default}
 platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_1m128k}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_OTA -D WLED_USE_ANALOG_LEDS
+build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_OTA
 
 [env:esp8285_4CH_H801]
 board = esp8285
@@ -297,7 +294,7 @@ platform = ${common.platform_wled_default}
 platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_1m128k}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_OTA -D WLED_USE_ANALOG_LEDS -D WLED_USE_H801
+build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_OTA
 
 [env:esp8285_5CH_H801]
 board = esp8285
@@ -305,7 +302,7 @@ platform = ${common.platform_wled_default}
 platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_1m128k}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_OTA -D WLED_USE_ANALOG_LEDS -D WLED_USE_H801 -D WLED_ENABLE_5CH_LEDS
+build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_OTA
 
 [env:d1_mini_5CH_Shojo_PCB]
 board = d1_mini
@@ -313,7 +310,7 @@ platform = ${common.platform_wled_default}
 platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp8266} -D WLED_USE_ANALOG_LEDS -D WLED_USE_SHOJO_PCB -D WLED_ENABLE_5CH_LEDS
+build_flags = ${common.build_flags_esp8266} -D WLED_USE_SHOJO_PCB
 
 # ------------------------------------------------------------------------------
 # DEVELOPMENT BOARDS
@@ -405,6 +402,7 @@ build_flags = ${common.build_flags_esp32} ${common.debug_flags} ${common.build_f
 
 # ------------------------------------------------------------------------------
 # codm pixel controller board configurations
+# codm-controller-0.6 can also be used for the TYWE3S controller
 # ------------------------------------------------------------------------------
 
 [env:codm-controller-0.6]
diff --git a/platformio_override.ini.sample b/platformio_override.ini.sample
index c9dab5487..7df8ce8d5 100644
--- a/platformio_override.ini.sample
+++ b/platformio_override.ini.sample
@@ -39,12 +39,8 @@ build_flags = ${common.build_flags_esp8266}
 ; PIN defines for 2 wire LEDs
    -D CLKPIN=0
    -D DATAPIN=2
-; to drive analog LED strips (aka 5050), uncomment the following
-; PWM pins 5,12,13,15 are used with Magic Home LED Controller (default)
-   -D WLED_USE_ANALOG_LEDS
-; for the H801 controller (PINs 15,13,12,14 (W2 = 04)) uncomment this
-;   -D WLED_USE_H801
-; for the BW-LT11 controller (PINs 12,4,14,5 ) uncomment this
-;   -D WLED_USE_BWLT11
-; and to enable channel 5 for RGBW-CT led strips this
-;   -D WLED_USE_5CH_LEDS
+; to drive analog LED strips (aka 5050) hardware configuration is no longer necessary
+; configure the settings in the UI as follows (hard):
+;   for the Magic Home LED Controller use PWM pins 5,12,13,15
+;   for the H801 controller use PINs 15,13,12,14 (W2 = 04)
+;   for the BW-LT11 controller use PINs 12,4,14,5 
diff --git a/tools/cdata.js b/tools/cdata.js
index de6a98f85..8a9048435 100644
--- a/tools/cdata.js
+++ b/tools/cdata.js
@@ -344,6 +344,10 @@ const char PAGE_settings_dmx[] PROGMEM = R"=====()=====";
         str
           .replace(/\<link rel="stylesheet".*\>/gms, "")
           .replace(/\<style\>.*\<\/style\>/gms, "%CSS%%SCSS%")
+          .replace(
+            /function GetV().*\<\/script\>/gms,
+            "function GetV() {var d=document;\n"
+          ),
     }
   ],
   "wled00/html_settings.h"
diff --git a/tools/fps_test.htm b/tools/fps_test.htm
new file mode 100644
index 000000000..5858e8ad5
--- /dev/null
+++ b/tools/fps_test.htm
@@ -0,0 +1,232 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>WLED frame rate test tool</title>
+    <style>
+        body {
+            background-color: #222;
+            color: #fff;
+            font-family: Helvetica, Verdana, sans-serif;
+        }
+        input {
+            background-color: #333;
+            color: #fff;
+        }
+        #ip {
+            width: 100px;
+        }
+        #secs {
+            width: 36px;
+        }
+        #csva {
+            position: absolute;
+            top: -100px; /*gtfo*/
+        }
+        button {
+            background-color: #333;
+            color: #fff;
+        }
+        table, th, td {
+            border: 1px solid #aaa;
+            border-collapse: collapse;
+            text-align: center;
+        }
+        .red {
+            color: #d20;
+        }
+    </style>
+    <script>
+        var gotfx = false, running = false;
+        var pos = 0, prev = 0, min = 999, max = 0, fpslist = [], names = [], names_checked = [];
+        var to;
+        function S() {
+            document.getElementById('ip').value = localStorage.getItem('locIpFps');
+            if (document.getElementById('ip').value) req(false);
+        }
+        function loadC() {
+            hide(false);
+            var list = localStorage.getItem('fpsFxSelection');
+            if (!list) return;
+            list = JSON.parse(list);
+            var chks = document.querySelectorAll('.fxcheck');
+            for (let i = 0; i < chks.length; i++) {
+               if (i < list.length) chks[i].checked = list[i];
+            }
+        }
+        function saveC() {
+            var list = [];
+            var chks = document.querySelectorAll('.fxcheck');
+            for (let i = 0; i < chks.length; i++) {
+                list.push(chks[i].checked);
+            }
+            localStorage.setItem('fpsFxSelection', JSON.stringify(list));
+        }
+        function setC(c) {
+            hide(false);
+            var chks = document.querySelectorAll('.fxcheck');
+            for (let i = 0; i < chks.length; i++) {
+                chks[i].checked = (c == 255);
+            }
+            if (c == 1 && chks.length > 100) {
+                chks[1].checked = true;  //Blink
+                chks[15].checked = true; //Running
+                chks[16].checked = true; //Saw
+                chks[37].checked = true; //Running 2
+                chks[44].checked = true; //Tetrix
+                chks[63].checked = true; //Pride 2015
+                chks[74].checked = true; //Colortwinkles
+                chks[101].checked = true;//Pacifica
+            }
+        }
+        function hide(h) {
+            var trs = document.querySelectorAll('.trs');
+            var chks = document.querySelectorAll('.fxcheck');
+            for (let i = 0; i < trs.length; i++) {
+                trs[i].style.display = (h && !chks[i].checked) ? "none":"table-row";
+            }
+        }
+        function run(init) {
+            if (init) {
+                running = !running;
+                document.getElementById('runbtn').innerText = running ? 'Stop':'Run';
+                if (running) {pos = 0; prev = -1; min = 999; max = 0; fpslist = []; names_checked = []; hide(true);}
+                clearTimeout(to);
+                if (!running) {req({seg:{fx:0},v:true,stop:true}); return;}
+            }
+            if (!gotfx) {req(false); return;}
+            var chks = document.querySelectorAll('.fxcheck');
+            var fpsb = document.querySelectorAll('.fps');
+            if (prev >= 0) {pos++};
+            if (pos >= chks.length) {run(true); return;} //end
+            while (!chks[pos].checked) {
+                fpsb[pos].innerText = "-";
+                pos++;
+                if (pos >= chks.length) {run(true); return;} //end
+            }
+            names_checked.push(names[pos]);
+            var extra = {};
+            try {
+                extra = JSON.parse(document.getElementById('ej').value);
+            } catch (e) {
+
+            }
+            var cmd = {seg:{fx:pos},v:true};
+            Object.assign(cmd, extra);
+            req(cmd);
+        }
+        function req(command) {
+            var ip = document.getElementById('ip').value;
+            if (!ip) {alert("Please enter WLED IP"); return;}
+            if (ip != localStorage.getItem('locIpFps')) localStorage.setItem('locIpFps', document.getElementById('ip').value);
+            var url = command ? `http://${ip}/json/si` : `http://${ip}/json/effects`;
+            var type = command ? 'post':'get';
+            var req = undefined;
+            if (command)
+            {
+                req = JSON.stringify(command);
+            }
+            fetch
+            (url, {
+                method: type,
+                headers: {
+                    "Content-type": "application/json; charset=UTF-8"
+                },
+                body: req
+            })
+            .then(res => {
+                if (!res.ok) {
+                    alert('Data malfunction');
+                }
+                return res.json();
+            })
+            .then(json => {
+                if (!json) {
+                    alert('Empty response'); return;
+                }
+                if (!command) {
+                    names = json;
+                    var tblc = '';
+                    for (let i = 0; i < json.length; i++) {
+		                tblc += `<tr class="trs"><td><input type="checkbox" class="fxcheck" /></td><td>${i}</td><td>${json[i]}</td><td class="fps"></td></tr>`
+	                }
+                    var tbl = `<table>
+                        <tr>
+                            <th>Test?</th><th>ID</th><th>Effect Name</th><th>FPS</th>
+                        </tr>
+                        ${tblc}
+                    </table>`;
+                    document.getElementById('tablecon').innerHTML = tbl;
+                    setC(1);
+                    loadC();
+                    gotfx = true;
+                    document.getElementById('runbtn').innerText = "Run";
+                } else {
+                    if (!json.info) return;
+                    document.getElementById('leds').innerText = json.info.leds.count;
+                    document.getElementById('seg').innerText = json.state.seg[0].len;
+                    document.getElementById('bri').innerText = json.state.bri;
+                    if (prev >= 0) {
+                        var lastfps = parseInt(json.info.leds.fps); //previous FX
+                        if (lastfps < min) min = lastfps;
+                        if (lastfps > max) max = lastfps;
+                        fpslist.push(lastfps);
+                        var sum = 0;
+                        for (let i = 0; i < fpslist.length; i++) {
+                            sum += fpslist[i];
+                        }
+                        sum /= fpslist.length;
+                        document.getElementById('fps_min').innerText = min;
+                        document.getElementById('fps_max').innerText = max;
+                        document.getElementById('fps_avg').innerText = Math.round(sum*10)/10;
+                        var fpsb = document.querySelectorAll('.fps');
+                        fpsb[prev].innerHTML = lastfps;
+                    }
+                    prev = pos;
+                    var delay = parseInt(document.getElementById('secs').value)*1000;
+                    delay = Math.min(Math.max(delay, 2000), 15000)
+                    if (!command.stop) to = setTimeout(run,delay);
+                }
+            })
+            .catch(function (error) {
+		        alert('Comms malfunction');
+		        console.log(error);
+	        });
+        }
+        function csv(n) {
+            var txt = "";
+            for (let i = 0; i < fpslist.length; i++) {
+                if (!n) txt += names_checked[i] + ',';
+                txt += fpslist[i]; txt += "\n";
+            }
+            document.getElementById('csva').value = txt;
+            var copyText = document.getElementById('csva');
+
+            copyText.select();
+            copyText.setSelectionRange(0, 999999);
+            document.execCommand("copy");
+        }
+    </script>
+</head>
+<body onload="S()">
+    <h2>Starship monitoring dashboard</h2>
+    (or rather just a WLED frame rate tester lol)<br><br>
+    IP: <input id="ip" /><br>
+    Time per effect: <input type=number id=secs value=5 max=15 min=2 />s<br>
+    Effects to test:
+    <button type="button" onclick="setC(255)">All</button>
+    <button type="button" onclick="setC(1)">Selection 1</button>
+    <button type="button" onclick="setC(0)">None</button>
+    <button type="button" onclick="loadC()">Get LS</button>
+    <button type="button" class="red" onclick="saveC()">Save to LS</button><br>
+    Extra JSON: <input id="ej" /><br>
+
+    <button type="button" onclick="run(true)" id="runbtn">Fetch FX list</button><br>
+    LEDs: <span id="leds">-</span>, Seg: <span id="seg">-</span>, Bri: <span id="bri">-</span><br>
+    FPS min: <span id="fps_min">-</span>, max: <span id="fps_max">-</span>, avg: <span id="fps_avg">-</span><br><br>
+    <div id="tablecon">
+    </div><br>
+    <button type="button" onclick="csv(false)">Copy csv to clipboard</button>
+    <button type="button" onclick="csv(true)">Copy csv (FPS only)</button>
+    <textarea id=csva></textarea>
+</body>
+</html>
\ No newline at end of file
diff --git a/wled00/data/jsontest.htm b/tools/json_test.htm
similarity index 100%
rename from wled00/data/jsontest.htm
rename to tools/json_test.htm
diff --git a/usermods/PIR_sensor_switch/readme.md b/usermods/PIR_sensor_switch/readme.md
index d6ea0fb0b..9b17c3ad0 100644
--- a/usermods/PIR_sensor_switch/readme.md
+++ b/usermods/PIR_sensor_switch/readme.md
@@ -9,9 +9,7 @@ The LED strip is switched [using a relay](https://github.com/Aircoookie/WLED/wik
 
 ## Webinterface
 
-The info page in the web interface shows the items below
-- the remaining time of the off timer. 
-**I recommend to deactivate the sensor before an OTA update and activate it again afterwards**.
+The info page in the web interface shows the remaining time of the off timer. 
 
 ## Sensor connection
 
@@ -63,7 +61,10 @@ void registerUsermods()
 
 ## API to enable/disable the PIR sensor from outside. For example from another usermod.
 
-To query or change the PIR sensor state the methods `bool PIRsensorEnabled()` and `void EnablePIRsensor(bool enable)` are available. 
+To query or change the PIR sensor state the methods `bool PIRsensorEnabled()` and `void EnablePIRsensor(bool enable)` are available.
+
+When the PIR sensor state changes an MQTT message is broadcasted with topic `wled/deviceMAC/motion` and message `on` or `off`.
+Usermod can also be configured to just send MQTT message and not change WLED state using settings page as well as responding to motion only during nighttime (assuming NTP and lattitude/longitude are set to determine sunrise/sunset times).
 
 ### There are two options to get access to the usermod instance:
 
diff --git a/usermods/Temperature/readme.md b/usermods/Temperature/readme.md
index 8f200662a..ac2823c3f 100644
--- a/usermods/Temperature/readme.md
+++ b/usermods/Temperature/readme.md
@@ -3,7 +3,7 @@
 Based on the excellent `QuinLED_Dig_Uno_Temp_MQTT` by srg74 and 400killer!  
 This usermod will read from an attached DS18B20 temperature sensor (as available on the QuinLED Dig-Uno)  
 The temperature is displayed both in the Info section of the web UI as well as published to the `/temperature` MQTT topic if enabled.  
-This usermod will be expanded with support for different sensor types in the future.
+This usermod may be expanded with support for different sensor types in the future.
 
 If temperature sensor is not detected during boot, this usermod will be disabled.
 
@@ -16,18 +16,19 @@ Copy the example `platformio_override.ini` to the root directory.  This file sho
 * `USERMOD_DALLASTEMPERATURE`                      - define this to have this user mod included wled00\usermods_list.cpp
 * `USERMOD_DALLASTEMPERATURE_FIRST_MEASUREMENT_AT` - the number of milliseconds after boot to take first measurement, defaults to 20 seconds
 
-All parameters can be configured at runtime using Usermods settings page.
+All parameters can be configured at runtime using Usermods settings page, including pin, selection to display temerature in degrees Celsius or Farenheit mand measurement interval.
 
 ## Project link
 
 * [QuinLED-Dig-Uno](https://quinled.info/2018/09/15/quinled-dig-uno/) - Project link
+* [Srg74-WLED-Wemos-shield](https://github.com/srg74/WLED-wemos-shield) - another great DIY WLED board
 
 ### PlatformIO requirements
 
 If you are using `platformio_override.ini`, you should be able to refresh the task list and see your custom task, for example `env:d1_mini_usermod_dallas_temperature_C`.
 
 
-If you are not using `platformio_override.ini`, you might have to uncomment `DallasTemperature@~3.8.0`,`OneWire@~2.3.5 under` `[common]` section in `platformio.ini`:
+If you are not using `platformio_override.ini`, you might have to uncomment `OneWire@~2.3.5 under` `[common]` section in `platformio.ini`:
 
 ```ini
 # platformio.ini
@@ -41,8 +42,7 @@ default_envs = d1_mini
 ...
 lib_deps =
   ...
-  #For Dallas sensor uncomment following 2 lines
-  DallasTemperature@~3.8.0
+  #For Dallas sensor uncomment following line
   OneWire@~2.3.5
 ...
 ```
diff --git a/wled00/.vs/wled00/v15/.suo b/wled00/.vs/wled00/v15/.suo
deleted file mode 100644
index 5bbdedd72..000000000
Binary files a/wled00/.vs/wled00/v15/.suo and /dev/null differ
diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 6b0a0c90b..4d2f2185c 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -34,7 +34,7 @@
  */
 uint16_t WS2812FX::mode_static(void) {
   fill(SEGCOLOR(0));
-  return (SEGMENT.getOption(SEG_OPTION_TRANSITIONAL)) ? FRAMETIME : 380; //update faster if in transition
+  return (SEGMENT.getOption(SEG_OPTION_TRANSITIONAL)) ? FRAMETIME : 350; //update faster if in transition
 }
 
 
@@ -1436,8 +1436,8 @@ uint16_t WS2812FX::mode_tricolor_fade(void)
   }
 
   byte stp = prog; // % 256
-  uint32_t color = 0;
   for(uint16_t i = 0; i < SEGLEN; i++) {
+    uint32_t color;
     if (stage == 2) {
       color = color_blend(color_from_palette(i, true, PALETTE_SOLID_WRAP, 2), color2, stp);
     } else if (stage == 1) {
@@ -3050,7 +3050,7 @@ uint16_t WS2812FX::mode_drip(void)
 
   numDrops = 1 + (SEGMENT.intensity >> 6); // 255>>6 = 3
 
-  float gravity = -0.001 - (SEGMENT.speed/50000.0);
+  float gravity = -0.0005 - (SEGMENT.speed/50000.0);
   gravity *= SEGLEN;
   int sourcedrop = 12;
 
diff --git a/wled00/FX.h b/wled00/FX.h
index ffb8b868c..e8416d5d3 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -612,6 +612,7 @@ class WS2812FX {
 
     bool
       isRgbw = false,
+      isOffRefreshRequred = false, //periodic refresh is required for the strip to remain off.
       gammaCorrectBri = false,
       gammaCorrectCol = true,
       applyToAllSelected = true,
diff --git a/wled00/__vm/.wled00.vsarduino.h b/wled00/__vm/.wled00.vsarduino.h
deleted file mode 100644
index 2a9ef40a4..000000000
--- a/wled00/__vm/.wled00.vsarduino.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* 
-	Editor: https://www.visualmicro.com/
-			This file is for intellisense purpose only.
-			Visual micro (and the arduino ide) ignore this code during compilation. This code is automatically maintained by visualmicro, manual changes to this file will be overwritten
-			The contents of the _vm sub folder can be deleted prior to publishing a project
-			All non-arduino files created by visual micro and all visual studio project or solution files can be freely deleted and are not required to compile a sketch (do not delete your own code!).
-			Note: debugger breakpoints are stored in '.sln' or '.asln' files, knowledge of last uploaded breakpoints is stored in the upload.vmps.xml file. Both files are required to continue a previous debug session without needing to compile and upload again
-	
-	Hardware: ESP32 Dev Module, Platform=esp32, Package=esp32
-*/
-
-#if defined(_VMICRO_INTELLISENSE)
-
-#ifndef _VSARDUINO_H_
-#define _VSARDUINO_H_
-#define __ESP32_esp32__
-#define __ESP32_ESP32__
-#define ESP_PLATFORM
-#define HAVE_CONFIG_H
-#define GCC_NOT_5_2_0 0
-#define WITH_POSIX
-#define F_CPU 240000000L
-#define ARDUINO 108011
-#define ARDUINO_ESP32_DEV
-#define ARDUINO_ARCH_ESP32
-#define ESP32
-#define CORE_DEBUG_LEVEL 0
-#define __cplusplus 201103L
-
-#define _Pragma(x)
-#undef __cplusplus
-#define __cplusplus 201103L
-
-#define __STDC__
-#define __ARM__
-#define __arm__
-#define __inline__
-#define __asm__(...)
-#define __extension__
-#define __ATTR_PURE__
-#define __ATTR_CONST__
-#define __volatile__
-
-#define __ASM
-#define __INLINE
-#define __attribute__(noinline)
-
-//#define _STD_BEGIN
-//#define EMIT
-#define WARNING
-#define _Lockit
-#define __CLR_OR_THIS_CALL
-#define C4005
-#define _NEW
-
-typedef bool _Bool;
-typedef int _read;
-typedef int _seek;
-typedef int _write;
-typedef int _close;
-typedef int __cleanup;
-
-//#define inline 
-
-#define __builtin_clz
-#define __builtin_clzl
-#define __builtin_clzll
-#define __builtin_labs
-#define __builtin_va_list
-typedef int __gnuc_va_list;
-
-#define __ATOMIC_ACQ_REL
-
-#define __CHAR_BIT__
-#define _EXFUN()
-
-typedef unsigned char byte;
-extern "C" void __cxa_pure_virtual() {;}
-
-typedef long __INTPTR_TYPE__ ;
-typedef long __UINTPTR_TYPE__ ;
-typedef long __SIZE_TYPE__ 	;
-typedef long __PTRDIFF_TYPE__;
-
-typedef long pthread_t;
-typedef long pthread_key_t;
-typedef long pthread_once_t;
-typedef long pthread_mutex_t;
-typedef long pthread_mutex_t;
-typedef long pthread_cond_t;
-
-
-
-#include "arduino.h"
-#include <pins_arduino.h> 
-
-#define interrupts() sei()
-#define noInterrupts() cli()
-
-#define ESP_LOGI(tag, ...)
-
-#include "wled00.ino"
-#include "wled01_eeprom.ino"
-#include "wled02_xml.ino"
-#include "wled03_set.ino"
-#include "wled04_file.ino"
-#include "wled05_init.ino"
-#include "wled06_usermod.ino"
-#include "wled07_notify.ino"
-#include "wled08_led.ino"
-#include "wled09_button.ino"
-#include "wled10_ntp.ino"
-#include "wled11_ol.ino"
-#include "wled12_alexa.ino"
-#include "wled13_cronixie.ino"
-#include "wled14_colors.ino"
-#include "wled15_hue.ino"
-#include "wled16_blynk.ino"
-#include "wled17_mqtt.ino"
-#include "wled18_server.ino"
-#include "wled19_json.ino"
-#include "wled20_ir.ino"
-#endif
-#endif
diff --git a/wled00/__vm/Compile.vmps.xml b/wled00/__vm/Compile.vmps.xml
deleted file mode 100644
index 6390398ed..000000000
--- a/wled00/__vm/Compile.vmps.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<VisualMicro>
-  <Program Name="wled00" Ext=".ino" Location="E:\1_Programming\WLED_org\wled00">
-    <Compile IsDebugStart="1" IsGdb="0" CompilerErrors="0" ConfigurationName="Release" UseConfigurationNameInBuildFolder="True" StopOnError="False" OptimiseLibs="True" OptimiseCore="True" ReCompileIfSourceIsNewer="1" BuildPath="C:\Users\thoma\AppData\Local\Temp\VMBuilds\wled00\esp32_esp32\Release" ExportWebDebugger="0" IncludeDebug="0" IncludesDebug="0" SketchName="wled00" IsCompiled="1" />
-    <Platform Name="arduino16x" Package="esp32" Platform="esp32" Architecture="1.22.0-80-g6c4433a-5.2.0">
-      <Board Name="esp32_esp32" Description="ESP32 Dev Module" CoreFolder="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.4\cores\esp32" VariantFullPath="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.4\variants\esp32" McuIdePath="C:\Program Files (x86)\Arduino" McuSketchBookPath="C:\Users\thoma\OneDrive\Dokumente\Arduino" name="ESP32 Dev Module" upload.tool="esptool_py" upload.maximum_size="1310720" upload.maximum_data_size="327680" upload.wait_for_upload_port="true" serial.disableDTR="true" serial.disableRTS="true" build.mcu="esp32" build.core="esp32" build.variant="esp32" build.board="ESP32_DEV" build.f_cpu="240000000L" build.flash_size="4MB" build.flash_freq="80m" build.flash_mode="dio" build.boot="qio" build.partitions="default" build.defines="" menu.PSRAM.disabled="Disabled" menu.PSRAM.disabled.build.defines="" menu.PSRAM.enabled="Enabled" menu.PSRAM.enabled.build.defines="-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue" menu.PartitionScheme.default="Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)" menu.PartitionScheme.default.build.partitions="default" menu.PartitionScheme.defaultffat="Default 4MB with ffat (1.2MB APP/1.5MB FATFS)" menu.PartitionScheme.defaultffat.build.partitions="default_ffat" menu.PartitionScheme.default_8MB="8M Flash (3MB APP/1.5MB FAT)" menu.PartitionScheme.default_8MB.build.partitions="default_8MB" menu.PartitionScheme.default_8MB.upload.maximum_size="3342336" menu.PartitionScheme.minimal="Minimal (1.3MB APP/700KB SPIFFS)" menu.PartitionScheme.minimal.build.partitions="minimal" menu.PartitionScheme.no_ota="No OTA (2MB APP/2MB SPIFFS)" menu.PartitionScheme.no_ota.build.partitions="no_ota" menu.PartitionScheme.no_ota.upload.maximum_size="2097152" menu.PartitionScheme.noota_3g="No OTA (1MB APP/3MB SPIFFS)" menu.PartitionScheme.noota_3g.build.partitions="noota_3g" menu.PartitionScheme.noota_3g.upload.maximum_size="1048576" menu.PartitionScheme.noota_ffat="No OTA (2MB APP/2MB FATFS)" menu.PartitionScheme.noota_ffat.build.partitions="noota_ffat" menu.PartitionScheme.noota_ffat.upload.maximum_size="2097152" menu.PartitionScheme.noota_3gffat="No OTA (1MB APP/3MB FATFS)" menu.PartitionScheme.noota_3gffat.build.partitions="noota_3gffat" menu.PartitionScheme.noota_3gffat.upload.maximum_size="1048576" menu.PartitionScheme.huge_app="Huge APP (3MB No OTA/1MB SPIFFS)" menu.PartitionScheme.huge_app.build.partitions="huge_app" menu.PartitionScheme.huge_app.upload.maximum_size="3145728" menu.PartitionScheme.min_spiffs="Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)" menu.PartitionScheme.min_spiffs.build.partitions="min_spiffs" menu.PartitionScheme.min_spiffs.upload.maximum_size="1966080" menu.PartitionScheme.fatflash="16M Flash (2MB APP/12.5MB FAT)" menu.PartitionScheme.fatflash.build.partitions="ffat" menu.PartitionScheme.fatflash.upload.maximum_size="2097152" menu.PartitionScheme.app3M_fat9M_16MB="16M Flash (3MB APP/9MB FATFS)" menu.PartitionScheme.app3M_fat9M_16MB.build.partitions="app3M_fat9M_16MB" menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size="3145728" menu.CPUFreq.240="240MHz (WiFi/BT)" menu.CPUFreq.240.build.f_cpu="240000000L" menu.CPUFreq.160="160MHz (WiFi/BT)" menu.CPUFreq.160.build.f_cpu="160000000L" menu.CPUFreq.80="80MHz (WiFi/BT)" menu.CPUFreq.80.build.f_cpu="80000000L" menu.CPUFreq.40="40MHz (40MHz XTAL)" menu.CPUFreq.40.build.f_cpu="40000000L" menu.CPUFreq.26="26MHz (26MHz XTAL)" menu.CPUFreq.26.build.f_cpu="26000000L" menu.CPUFreq.20="20MHz (40MHz XTAL)" menu.CPUFreq.20.build.f_cpu="20000000L" menu.CPUFreq.13="13MHz (26MHz XTAL)" menu.CPUFreq.13.build.f_cpu="13000000L" menu.CPUFreq.10="10MHz (40MHz XTAL)" menu.CPUFreq.10.build.f_cpu="10000000L" menu.FlashMode.qio="QIO" menu.FlashMode.qio.build.flash_mode="dio" menu.FlashMode.qio.build.boot="qio" menu.FlashMode.dio="DIO" menu.FlashMode.dio.build.flash_mode="dio" menu.FlashMode.dio.build.boot="dio" menu.FlashMode.qout="QOUT" menu.FlashMode.qout.build.flash_mode="dout" menu.FlashMode.qout.build.boot="qout" menu.FlashMode.dout="DOUT" menu.FlashMode.dout.build.flash_mode="dout" menu.FlashMode.dout.build.boot="dout" menu.FlashFreq.80="80MHz" menu.FlashFreq.80.build.flash_freq="80m" menu.FlashFreq.40="40MHz" menu.FlashFreq.40.build.flash_freq="40m" menu.FlashSize.4M="4MB (32Mb)" menu.FlashSize.4M.build.flash_size="4MB" menu.FlashSize.8M="8MB (64Mb)" menu.FlashSize.8M.build.flash_size="8MB" menu.FlashSize.8M.build.partitions="default_8MB" menu.FlashSize.2M="2MB (16Mb)" menu.FlashSize.2M.build.flash_size="2MB" menu.FlashSize.2M.build.partitions="minimal" menu.FlashSize.16M="16MB (128Mb)" menu.FlashSize.16M.build.flash_size="16MB" menu.UploadSpeed.921600="921600" menu.UploadSpeed.921600.upload.speed="921600" menu.UploadSpeed.115200="115200" menu.UploadSpeed.115200.upload.speed="115200" menu.UploadSpeed.256000.windows="256000" menu.UploadSpeed.256000.upload.speed="256000" menu.UploadSpeed.230400.windows.upload.speed="256000" menu.UploadSpeed.230400="230400" menu.UploadSpeed.230400.upload.speed="230400" menu.UploadSpeed.460800.linux="460800" menu.UploadSpeed.460800.macosx="460800" menu.UploadSpeed.460800.upload.speed="460800" menu.UploadSpeed.512000.windows="512000" menu.UploadSpeed.512000.upload.speed="512000" menu.DebugLevel.none="None" menu.DebugLevel.none.build.code_debug="0" menu.DebugLevel.error="Error" menu.DebugLevel.error.build.code_debug="1" menu.DebugLevel.warn="Warn" menu.DebugLevel.warn.build.code_debug="2" menu.DebugLevel.info="Info" menu.DebugLevel.info.build.code_debug="3" menu.DebugLevel.debug="Debug" menu.DebugLevel.debug.build.code_debug="4" menu.DebugLevel.verbose="Verbose" menu.DebugLevel.verbose.build.code_debug="5" menu.UploadSpeed.256000="256000" menu.UploadSpeed.512000="512000" runtime.ide.path="C:\Program Files (x86)\Arduino" runtime.os="windows" build.system.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.4\system" runtime.ide.version="108011" target_package="esp32" target_platform="esp32" runtime.hardware.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32" originalid="esp32" intellisense.tools.path="{compiler.toolchain.path}" intellisense.include.paths="{runtime.tools.xtensa-esp32-elf-gcc.path}\lib\gcc\xtensa-esp32-elf\5.2.0\include;{runtime.tools.xtensa-esp32-elf-gcc.path}\xtensa-esp32-elf\include\c++\5.2.0\xtensa-esp32-elf;{runtime.tools.xtensa-esp32-elf-gcc.path}\xtensa-esp32-elf\include;{runtime.tools.xtensa-esp32-elf-gcc.path}\xtensa-esp32-elf\include\c++\5.2.0;{runtime.tools.xtensa-esp32-elf-gcc.path}\include\c++\5.2.0;{runtime.tools.xtensa-esp32-elf-gcc.path}\include;{runtime.tools.xtensa-lx106-elf-gcc.path}\xtensa-lx106-elf\include\c++\4.8.2;{runtime.tools.xtensa-lx106-elf-gcc.path}\xtensa-lx106-elf\include\c++\4.8.2\xtensa-lx106-elf;{runtime.tools.xtensa-lx106-elf-gcc.path}\xtensa-lx106-elf\include;{runtime.tools.xtensa-lx106-elf-gcc.path}\lib\gcc\xtensa-lx106-elf\4.8.2\include;{runtime.platform.path}\tools\sdk\include;{vm.intellisense.add-paths}" tools.wwwfiles.name="ESP32 Sketch Data Upload" tools.wwwfiles.ssh="false" tools.wwwfiles.cmd.windows="ESP32FSUpload.exe" recipe.wwwfiles.upload.pattern="&quot;{vm.path}/{tools.wwwfiles.cmd}&quot; -serial.port={serial.port} -build.path=&quot;{build.path}&quot; -target_platform=&quot;{target_platform}&quot; -runtime.tools.mkspiffs.path=&quot;{runtime.tools.mkspiffs.path}&quot; -board.name=&quot;{name}&quot; -upload.verbose={upload.verbose} -upload.resetmethod={upload.resetmethod} -upload.speed={upload.speed}  -platform.path=&quot;{platform.path}&quot; -project.name=&quot;{project.name}&quot; -project.path=&quot;{project.path}&quot; -tools.esptool.cmd=&quot;{tools.esptool.cmd}&quot; -tools.esptool.cmd.windows=&quot;{tools.esptool.cmd.windows}&quot; -runtime.tools.esptool.path=&quot;{runtime.tools.esptool.path}&quot; -compiler.path=&quot;{compiler.path}&quot; -build.spiffs_start=&quot;{build.spiffs_start}&quot; -build.spiffs_end=&quot;{build.spiffs_end}&quot; -build.spiffs_pagesize=&quot;{build.spiffs_pagesize}&quot; -build.spiffs_blocksize=&quot;{build.spiffs_blocksize}&quot; -build.partitions=&quot;{build.partitions}&quot; -network.password={network.password} -network.auth_upload={network.auth_upload} -network.port={network.port} -upload.tool={upload.tool} -tools.esptool_py.cmd=&quot;{tools.esptool_py.cmd}&quot; -tools.esptool_py.cmd.windows=&quot;{tools.esptool_py.cmd.windows}&quot; -runtime.tools.esptool_py.path=&quot;{runtime.tools.esptool_py.path}&quot; -build.flash_mode={build.flash_mode} -build.flash_freq={build.flash_freq}" exceptions.serial.enabled="true" exceptions.serial.messages="{vm.platform.root.path}/hardware/esp32/exceptions.txt" exceptions.serial.regex.exception_number="Exception \(([0-9]*)\):" exceptions.serial.regex.stack_addresses="40[0-2][0-9a-f]{5}\b" exceptions.serial.resolve.addr2line.args="-aipfC -e&quot;{build.path}/{build.project_name}.elf&quot;" exceptions.serial.resolve.addr2line.cmd="xtensa-esp32-elf-addr2line" exceptions.serial.resolve.stack_addresses.pattern="&quot;{compiler.path}{addr2line.cmd}&quot; {addr2line.args} {stack_addresses.list}" upload.8dot3="false" tools.openocd.debug.path="{runtime.tools.openocd-espressif-esp32-10.0.1.path}" tools.openocd.debug.cmd="bin/openocd.exe" tools.openocd.debug.cmd.windows="bin/openocd.exe" tools.openocd.debug.params.verbose="-d2" tools.openocd.debug.openocdscript="esp-wroom-32.cfg" tools.openocd.debug.args="{params.verbose} -l &quot;{{build.path}/{build.project_name}_DebugOpenOCD.log}&quot; -s &quot;{path}/share/openocd/scripts/&quot; -f &quot;{path}/share/openocd/scripts/interface/{build.openocddebugger}&quot; -c &quot;set ESP32_RTOS none&quot; -f &quot;{path}/share/openocd/scripts/board/{openocdscript}&quot; -c &quot;init&quot;" tools.openocd.debug.address="localhost:3333" tools.esp32devkit.server.build.openocddebugger="ftdi/esp32_devkitj_v1.cfg" tools.esp32devkit.args="-ex &quot;set remote hardware-watchpoint-limit 2&quot; -ex &quot;mon reset halt&quot; -ex &quot;flushregs&quot; -ex &quot;thb app_main&quot; -ex &quot;c&quot;" tools.esp32devkit.path="{runtime.tools.xtensa-esp32-elf-gcc.path}/bin" tools.esp32devkit.cmd="xtensa-esp32-elf-gdb.exe" tools.esp32devkit.pattern="&quot;{path}/{cmd}&quot; {args}" tools.esp32devkit.server.tool="openocd" tools.esp32prog.server.build.openocddebugger="ftdi/minimodule-lowcost.cfg" tools.esp32prog.args="-ex &quot;set remote hardware-watchpoint-limit 2&quot; -ex &quot;mon reset halt&quot; -ex &quot;flushregs&quot; -ex &quot;thb app_main&quot; -ex &quot;c&quot;" tools.esp32prog.path="{runtime.tools.xtensa-esp32-elf-gcc.path}/bin" tools.esp32prog.cmd="xtensa-esp32-elf-gdb.exe" tools.esp32prog.pattern="&quot;{path}/{cmd}&quot; {args}" tools.esp32prog.server.tool="openocd" tools.espf2232h.server.build.openocddebugger="ftdi/minimodule-lowcost.cfg" tools.espf2232h.args="-ex &quot;set remote hardware-watchpoint-limit 2&quot; -ex &quot;mon reset halt&quot; -ex &quot;flushregs&quot; -ex &quot;thb app_main&quot; -ex &quot;c&quot;" tools.espf2232h.path="{runtime.tools.xtensa-esp32-elf-gcc.path}/bin" tools.espf2232h.cmd="xtensa-esp32-elf-gdb.exe" tools.espf2232h.pattern="&quot;{path}/{cmd}&quot; {args}" tools.espf2232h.server.tool="openocd" tools.espf2232mm.server.build.openocddebugger="ftdi/minimodule.cfg" tools.espf2232mm.args="-ex &quot;set remote hardware-watchpoint-limit 2&quot; -ex &quot;mon reset halt&quot; -ex &quot;flushregs&quot; -ex &quot;thb app_main&quot; -ex &quot;c&quot;" tools.espf2232mm.path="{runtime.tools.xtensa-esp32-elf-gcc.path}/bin" tools.espf2232mm.cmd="xtensa-esp32-elf-gdb.exe" tools.espf2232mm.pattern="&quot;{path}/{cmd}&quot; {args}" tools.espf2232mm.server.tool="openocd" tools.olimexarmusbtiny.server.build.openocddebugger="ftdi/olimex-jtag-tiny.cfg" tools.olimexarmusbtiny.cmd="xtensa-esp32-elf-gdb.exe" tools.olimexarmusbtiny.path="{runtime.tools.xtensa-esp32-elf-gcc.path}/bin" tools.olimexarmusbtiny.pattern="&quot;{path}/{cmd}&quot;" tools.olimexarmusbtiny.server.tool="openocd" tools.olimexarmusbtiny.server.args="{params.verbose} -s &quot;{path}/share/openocd/scripts/&quot; -c &quot;adapter_khz 1000&quot; -f &quot;{path}/share/openocd/scripts/interface/{build.openocddebugger}&quot; -c &quot;set ESP32_RTOS none&quot; -f &quot;{path}/share/openocd/scripts/board/{openocdscript}&quot; -c &quot;init; reset halt&quot;" tools.olimexarmusbtinyh.server.build.openocddebugger="ftdi/olimex-jtag-tiny-h.cfg" tools.olimexarmusbtinyh.cmd="xtensa-esp32-elf-gdb.exe" tools.olimexarmusbtinyh.path="{runtime.tools.xtensa-esp32-elf-gcc.path}/bin" tools.olimexarmusbtinyh.pattern="&quot;{path}/{cmd}&quot;" tools.olimexarmusbtinyh.server.tool="openocd" tools.olimexarmusbtinyh.server.args="{params.verbose} -s &quot;{path}/share/openocd/scripts/&quot; -c &quot;adapter_khz 1000&quot; -f &quot;{path}/share/openocd/scripts/interface/{build.openocddebugger}&quot; -c &quot;set ESP32_RTOS none&quot; -f &quot;{path}/share/openocd/scripts/board/{openocdscript}&quot; -c &quot;init; reset halt&quot;" tools.espjlink.server.build.openocddebugger="jlink.cfg" tools.espjlink.cmd="xtensa-esp32-elf-gdb.exe" tools.espjlink.args="-ex &quot;set remote hardware-watchpoint-limit 2&quot; -ex &quot;mon reset halt&quot; -ex &quot;flushregs&quot; -ex &quot;thb app_main&quot; -ex &quot;c&quot;" tools.espjlink.path="{runtime.tools.xtensa-esp32-elf-gcc.path}/bin" tools.espjlink.pattern="&quot;{path}/{cmd}&quot; {args}" tools.espjlink.server.tool="openocd" debug_menu.hwdebugger.esp32devkit="ESP32 DEVKIT" debug_menu.hwdebugger.esp32devkit.debug.tool="esp32devkit" meta_esp32devkit.sentence="This debugger will require some the jumper configuration to be set correctly to allow debugging" meta_esp32devkit.comment="Jumper settings can be found at the below link, and the 'https://zadig.akeo.ie/' tool is required to replace the USB Driver on Interface 0 with 'WinUSB'. Set vMicro &gt; Debugger &gt; 'Compiler Optimization' to  &gt; 'No Optimization' to ensure correct debugging (NOTE: This might cause compilation errors with certain code such as HardwareSerial.)" meta_esp32devkit.image.connect="https://docs.espressif.com/projects/esp-idf/en/latest/hw-reference/get-started-wrover-kit.html#setup-options" meta_esp32devkit.image.operation="https://www.visualmicro.com/pics/Debug-Break-ESP32-FT2232H-VSOnly.png" meta_esp32devkit.reference.usage.url="https://www.visualmicro.com/page/User-Guide.aspx?doc=Arduino-gdb-Tutorial.html" debug_menu.hwdebugger.esp32prog="ESP32 PROG" debug_menu.hwdebugger.esp32prog.debug.tool="esp32prog" meta_esp32prog.sentence="This debugger will require some wiring to connect it to your target ESP32 board" meta_esp32prog.comment="Wiring can be found in the below image, and the 'https://zadig.akeo.ie/' tool is required to replace the USB Driver on Interface 0 with 'WinUSB'. Set vMicro &gt; Debugger &gt; 'Compiler Optimization' to  &gt; 'No Optimization' to ensure correct debugging (NOTE: This might cause compilation errors with certain code such as HardwareSerial.)" meta_esp32prog.image.connect="https://www.visualmicro.com/pics/Debug-Help-ESP32-JTAG-Connections.png" meta_esp32prog.image.operation="https://www.visualmicro.com/pics/Debug-Break-ESP32-FT2232H-VSOnly.png" meta_esp32prog.reference.usage.url="https://www.visualmicro.com/page/User-Guide.aspx?doc=Arduino-gdb-Tutorial.html" debug_menu.hwdebugger.f2232h="F2232H Dual RS232" debug_menu.hwdebugger.f2232h.debug.tool="espf2232h" meta_f2232h.sentence="This debugger will require some wiring to connect it to your target ESP32 board" meta_f2232h.comment="Wiring can be found in the below image, and the 'https://zadig.akeo.ie/' tool is required to replace the USB Driver on Interface 0 with 'WinUSB'. Set vMicro &gt; Debugger &gt; 'Compiler Optimization' to  &gt; 'No Optimization' to ensure correct debugging (NOTE: This might cause compilation errors with certain code such as HardwareSerial.)" meta_f2232h.image.connect="https://www.visualmicro.com/pics/Debug-Help-ESP32-FT2232H-Connections.png" meta_f2232h.image.operation="https://www.visualmicro.com/pics/Debug-Break-ESP32-FT2232H-VSOnly.png" meta_f2232h.reference.usage.url="https://www.visualmicro.com/page/User-Guide.aspx?doc=Arduino-gdb-Tutorial.html" debug_menu.hwdebugger.f2232mm="F2232 MiniModule" debug_menu.hwdebugger.f2232mm.debug.tool="espf2232mm" meta_f2232mm.sentence="This debugger will require some wiring to allow it to function, and connect to your target ESP32 board" meta_f2232mm.comment="Wiring can be found in the below image, and the 'https://zadig.akeo.ie/' tool is required to replace the USB Driver on Interface 0 with 'WinUSB'. Set vMicro &gt; Debugger &gt; 'Compiler Optimization' to  &gt; 'No Optimization' to ensure correct debugging (NOTE: This might cause compilation errors with certain code such as HardwareSerial.)" meta_f2232mm.image.operation="https://www.visualmicro.com/pics/Debug-Break-ESP32-FT2232MM-VSOnly.png" meta_f2232mm.image.connect="https://www.visualmicro.com/pics/Debug-Help-ESP32-FT2232MM-Connections.png" meta_f2232mm.reference.usage.url="https://www.visualmicro.com/page/User-Guide.aspx?doc=Arduino-gdb-Tutorial.html" debug_menu.hwdebugger.olimexarmusbtiny="Olimex ARM-USB-TINY" debug_menu.hwdebugger.olimexarmusbtiny.debug.tool="olimexarmusbtiny" meta_olimexarmusbtiny.sentence="This debugger will require some wiring to connect it to your target ESP32 board" meta_olimexarmusbtiny.comment="Wiring can be found in the below image, and the 'https://zadig.akeo.ie/' tool is required to replace the USB Driver on Interface 0 with 'WinUSB'. Set vMicro &gt; Debugger &gt; 'Compiler Optimization' to  &gt; 'No Optimization' to ensure correct debugging (NOTE: This might cause compilation errors with certain code such as HardwareSerial.)" meta_olimexarmusbtiny.image.connect="https://www.visualmicro.com/pics/Debug-Help-ESP32-JTAG-Connections.png" meta_olimexarmusbtiny.image.operation="https://www.visualmicro.com/pics/Debug-Break-ESP32-OlimexARMUSBTiny-VSOnly.png" meta_olimexarmusbtiny.reference.usage.url="https://www.visualmicro.com/page/User-Guide.aspx?doc=Arduino-gdb-Tutorial.html" debug_menu.hwdebugger.olimexarmusbtinyh="Olimex ARM-USB-TINY-H" debug_menu.hwdebugger.olimexarmusbtinyh.debug.tool="olimexarmusbtinyh" meta_olimexarmusbtinyh.sentence="This debugger will require some wiring to connect it to your target ESP32 board" meta_olimexarmusbtinyh.comment="Wiring can be found in the below image, and the 'https://zadig.akeo.ie/' tool is required to replace the USB Driver on Interface 0 with 'WinUSB'. Set vMicro &gt; Debugger &gt; 'Compiler Optimization' to  &gt; 'No Optimization' to ensure correct debugging (NOTE: This might cause compilation errors with certain code such as HardwareSerial.)" meta_olimexarmusbtinyh.image.connect="https://www.visualmicro.com/pics/Debug-Help-ESP32-JTAG-Connections.png" meta_olimexarmusbtinyh.image.operation="https://www.visualmicro.com/pics/Debug-Break-ESP32-OlimexARMUSBTiny-VSOnly.png" meta_olimexarmusbtinyh.reference.usage.url="https://www.visualmicro.com/page/User-Guide.aspx?doc=Arduino-gdb-Tutorial.html" debug_menu.hwdebugger.jlink="Segger J-Link" debug_menu.hwdebugger.jlink.debug.tool="espjlink" meta_jlink.sentence="This debugger will require some wiring to connect it to your target ESP32 board" meta_jlink.comment="Wiring can be found in the below image, and the 'https://zadig.akeo.ie/' tool is required to replace the USB Driver on Interface 0 with 'WinUSB'. Set vMicro &gt; Debugger &gt; 'Compiler Optimization' to  &gt; 'No Optimization' to ensure correct debugging (NOTE: This might cause compilation errors with certain code such as HardwareSerial.)" meta_jlink.image.connect="https://www.visualmicro.com/pics/Debug-Help-ESP32-Jlink-Connections.png" meta_jlink.image.operation="https://www.visualmicro.com/pics/Debug-Break-ESP32-Jlink-VSOnly.png" meta_jlink.reference.usage.url="https://www.visualmicro.com/page/User-Guide.aspx?doc=Arduino-gdb-Tutorial.html" tools.openocd.upload.path="{runtime.tools.openocd-espressif-esp32-10.0.1.path}" tools.openocd.upload.cmd="bin/openocd.exe" tools.openocd.upload.cmd.windows="bin/openocd.exe" tools.openocd.upload.params.verbose="-d2" tools.openocd.upload.params.quiet="-d0" tools.openocd.upload.openocdscript="esp-wroom-32.cfg" tools.openocd.upload.binsector="0x10000" tools.openocd.upload.pattern="&quot;{upload.path}/{upload.cmd}&quot; {upload.verbose} -s &quot;{upload.path}/share/openocd/scripts/&quot; -f &quot;interface/{openocddebugger}&quot; -f &quot;board/{upload.openocdscript}&quot; -c &quot;echo -n {****[vMicro]**** Uploading App :}&quot; -c &quot;telnet_port disabled; program {build.path}/{build.project_name}.bin {upload.binsector} reset; shutdown&quot;" tools.openocd.program.path="{runtime.tools.openocd-espressif-esp32-10.0.1.path}" tools.openocd.program.cmd="bin/openocd.exe" tools.openocd.program.cmd.windows="bin/openocd.exe" tools.openocd.program.params.verbose="-d2" tools.openocd.program.params.quiet="-d0" tools.openocd.program.openocdscript="esp-wroom-32.cfg" tools.openocd.program.pattern="&quot;{program.path}/{program.cmd}&quot; {program.verbose} -s &quot;{program.path}/share/openocd/scripts/&quot; -f &quot;interface/{openocddebugger}&quot; -f &quot;board/{upload.openocdscript}&quot; -c &quot;echo -n {****[vMicro]**** Uploading App :}&quot; -c &quot;telnet_port disabled; program {{runtime.platform.path}/tools/partitions/boot_app0.bin} 0xe000&quot; -c &quot;echo -n {****[vMicro]**** Uploading Bootloader :}&quot; -c &quot;program {{runtime.platform.path}/tools/sdk/bin/bootloader_{build.boot}_{build.flash_freq}.bin} 0x1000&quot;  -c &quot;echo -n {****[vMicro]**** Uploading Sketch :}&quot; -c &quot;program {{build.path}/{build.project_name}.bin} 0x10000&quot;  -c &quot;echo -n {****[vMicro]**** Uploading Partitions :}&quot; -c &quot;program {{build.path}/{build.project_name}.partitions.bin} 0x8000 reset; shutdown&quot;" vmboard.totalpins="16" vmboard.totalanalogpins="16" tools.wwwfiles.cmd="ESP32FSUpload.exe" version="" tools.esptool_py.path="{runtime.tools.esptool_py.path}" tools.esptool_py.cmd="esptool.exe" tools.esptool_py.cmd.linux="esptool.py" tools.esptool_py.cmd.windows="esptool.exe" tools.esptool_py.network_cmd="&quot;{runtime.platform.path}/tools/espota.exe&quot;" tools.esptool_py.network_cmd.windows="&quot;{runtime.platform.path}/tools/espota.exe&quot;" tools.gen_esp32part.cmd="&quot;{runtime.platform.path}/tools/gen_esp32part.exe&quot;" tools.gen_esp32part.cmd.windows="&quot;{runtime.platform.path}/tools/gen_esp32part.exe&quot;" compiler.warning_flags="-w" compiler.warning_flags.none="-w" compiler.warning_flags.default="" compiler.warning_flags.more="-Wall -Werror=all" compiler.warning_flags.all="-Wall -Werror=all -Wextra" compiler.path="{runtime.tools.xtensa-esp32-elf-gcc.path}/bin/" compiler.sdk.path="{runtime.platform.path}/tools/sdk" compiler.cpreprocessor.flags="-DESP_PLATFORM -DMBEDTLS_CONFIG_FILE=&quot;mbedtls/esp_config.h&quot; -DHAVE_CONFIG_H -DGCC_NOT_5_2_0=0 -DWITH_POSIX &quot;-I{compiler.sdk.path}/include/config&quot; &quot;-I{compiler.sdk.path}/include/app_trace&quot; &quot;-I{compiler.sdk.path}/include/app_update&quot; &quot;-I{compiler.sdk.path}/include/asio&quot; &quot;-I{compiler.sdk.path}/include/bootloader_support&quot; &quot;-I{compiler.sdk.path}/include/bt&quot; &quot;-I{compiler.sdk.path}/include/coap&quot; &quot;-I{compiler.sdk.path}/include/console&quot; &quot;-I{compiler.sdk.path}/include/driver&quot; &quot;-I{compiler.sdk.path}/include/esp-tls&quot; &quot;-I{compiler.sdk.path}/include/esp32&quot; &quot;-I{compiler.sdk.path}/include/esp_adc_cal&quot; &quot;-I{compiler.sdk.path}/include/esp_event&quot; &quot;-I{compiler.sdk.path}/include/esp_http_client&quot; &quot;-I{compiler.sdk.path}/include/esp_http_server&quot; &quot;-I{compiler.sdk.path}/include/esp_https_ota&quot; &quot;-I{compiler.sdk.path}/include/esp_ringbuf&quot; &quot;-I{compiler.sdk.path}/include/ethernet&quot; &quot;-I{compiler.sdk.path}/include/expat&quot; &quot;-I{compiler.sdk.path}/include/fatfs&quot; &quot;-I{compiler.sdk.path}/include/freemodbus&quot; &quot;-I{compiler.sdk.path}/include/freertos&quot; &quot;-I{compiler.sdk.path}/include/heap&quot; &quot;-I{compiler.sdk.path}/include/idf_test&quot; &quot;-I{compiler.sdk.path}/include/jsmn&quot; &quot;-I{compiler.sdk.path}/include/json&quot; &quot;-I{compiler.sdk.path}/include/libsodium&quot; &quot;-I{compiler.sdk.path}/include/log&quot; &quot;-I{compiler.sdk.path}/include/lwip&quot; &quot;-I{compiler.sdk.path}/include/mbedtls&quot; &quot;-I{compiler.sdk.path}/include/mdns&quot; &quot;-I{compiler.sdk.path}/include/micro-ecc&quot; &quot;-I{compiler.sdk.path}/include/mqtt&quot; &quot;-I{compiler.sdk.path}/include/newlib&quot; &quot;-I{compiler.sdk.path}/include/nghttp&quot; &quot;-I{compiler.sdk.path}/include/nvs_flash&quot; &quot;-I{compiler.sdk.path}/include/openssl&quot; &quot;-I{compiler.sdk.path}/include/protobuf-c&quot; &quot;-I{compiler.sdk.path}/include/protocomm&quot; &quot;-I{compiler.sdk.path}/include/pthread&quot; &quot;-I{compiler.sdk.path}/include/sdmmc&quot; &quot;-I{compiler.sdk.path}/include/smartconfig_ack&quot; &quot;-I{compiler.sdk.path}/include/soc&quot; &quot;-I{compiler.sdk.path}/include/spi_flash&quot; &quot;-I{compiler.sdk.path}/include/spiffs&quot; &quot;-I{compiler.sdk.path}/include/tcp_transport&quot; &quot;-I{compiler.sdk.path}/include/tcpip_adapter&quot; &quot;-I{compiler.sdk.path}/include/ulp&quot; &quot;-I{compiler.sdk.path}/include/vfs&quot; &quot;-I{compiler.sdk.path}/include/wear_levelling&quot; &quot;-I{compiler.sdk.path}/include/wifi_provisioning&quot; &quot;-I{compiler.sdk.path}/include/wpa_supplicant&quot; &quot;-I{compiler.sdk.path}/include/xtensa-debug-module&quot; &quot;-I{compiler.sdk.path}/include/esp-face&quot; &quot;-I{compiler.sdk.path}/include/esp32-camera&quot; &quot;-I{compiler.sdk.path}/include/esp-face&quot; &quot;-I{compiler.sdk.path}/include/fb_gfx&quot;" compiler.c.cmd="xtensa-esp32-elf-gcc" compiler.c.flags="-std=gnu99 -Os -g3 -fstack-protector -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -mlongcalls -nostdlib -Wpointer-arith {compiler.warning_flags} -Wno-maybe-uninitialized -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-deprecated-declarations -Wno-unused-parameter -Wno-sign-compare -Wno-old-style-declaration -MMD -c" compiler.cpp.cmd="xtensa-esp32-elf-g++" compiler.cpp.flags="-std=gnu++11 -Os -g3 -Wpointer-arith -fexceptions -fstack-protector -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -mlongcalls -nostdlib {compiler.warning_flags} -Wno-error=maybe-uninitialized -Wno-error=unused-function -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-missing-field-initializers -Wno-sign-compare -fno-rtti -MMD -c" compiler.S.cmd="xtensa-esp32-elf-gcc" compiler.S.flags="-c -g3 -x assembler-with-cpp -MMD -mlongcalls" compiler.c.elf.cmd="xtensa-esp32-elf-gcc" compiler.c.elf.flags="-nostdlib &quot;-L{compiler.sdk.path}/lib&quot; &quot;-L{compiler.sdk.path}/ld&quot; -T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld -T esp32.rom.libgcc.ld -T esp32.rom.spiram_incompatible_fns.ld -u ld_include_panic_highint_hdl -u call_user_start_cpu0 -Wl,--gc-sections -Wl,-static -Wl,--undefined=uxTopUsedPriority  -u __cxa_guard_dummy -u __cxx_fatal_exception" compiler.c.elf.libs="-lgcc -lesp32 -lphy -lesp_http_client -lmbedtls -lrtc -lesp_http_server -lbtdm_app -lspiffs -lbootloader_support -lmdns -lnvs_flash -lfatfs -lpp -lnet80211 -ljsmn -lface_detection -llibsodium -lvfs -ldl_lib -llog -lfreertos -lcxx -lsmartconfig_ack -lxtensa-debug-module -lheap -ltcpip_adapter -lmqtt -lulp -lfd -lfb_gfx -lnghttp -lprotocomm -lsmartconfig -lm -lethernet -limage_util -lc_nano -lsoc -ltcp_transport -lc -lmicro-ecc -lface_recognition -ljson -lwpa_supplicant -lmesh -lesp_https_ota -lwpa2 -lexpat -llwip -lwear_levelling -lapp_update -ldriver -lbt -lespnow -lcoap -lasio -lnewlib -lconsole -lapp_trace -lesp32-camera -lhal -lprotobuf-c -lsdmmc -lcore -lpthread -lcoexist -lfreemodbus -lspi_flash -lesp-tls -lwpa -lwifi_provisioning -lwps -lesp_adc_cal -lesp_event -lopenssl -lesp_ringbuf -lfr  -lstdc++" compiler.as.cmd="xtensa-esp32-elf-as" compiler.ar.cmd="xtensa-esp32-elf-ar" compiler.ar.flags="cru" compiler.size.cmd="xtensa-esp32-elf-size" build.code_debug="0" build.extra_flags="-DESP32 -DCORE_DEBUG_LEVEL={build.code_debug} {build.defines}" compiler.c.extra_flags="" compiler.c.elf.extra_flags="" compiler.S.extra_flags="" compiler.cpp.extra_flags="" compiler.ar.extra_flags="" compiler.objcopy.eep.extra_flags="" compiler.elf2hex.extra_flags="" recipe.c.o.pattern="&quot;{compiler.path}{compiler.c.cmd}&quot; {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD=&quot;{build.board}&quot; -DARDUINO_VARIANT=&quot;{build.variant}&quot; {compiler.c.extra_flags} {build.extra_flags} {includes} &quot;{source_file}&quot; -o &quot;{object_file}&quot;" recipe.cpp.o.pattern="&quot;{compiler.path}{compiler.cpp.cmd}&quot; {compiler.cpreprocessor.flags} {compiler.cpp.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD=&quot;{build.board}&quot; -DARDUINO_VARIANT=&quot;{build.variant}&quot; {compiler.cpp.extra_flags} {build.extra_flags} {includes} &quot;{source_file}&quot; -o &quot;{object_file}&quot;" recipe.S.o.pattern="&quot;{compiler.path}{compiler.c.cmd}&quot; {compiler.cpreprocessor.flags} {compiler.S.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD=&quot;{build.board}&quot; -DARDUINO_VARIANT=&quot;{build.variant}&quot; {compiler.S.extra_flags} {build.extra_flags} {includes} &quot;{source_file}&quot; -o &quot;{object_file}&quot;" recipe.ar.pattern="&quot;{compiler.path}{compiler.ar.cmd}&quot; {compiler.ar.flags} {compiler.ar.extra_flags} &quot;{archive_file_path}&quot; &quot;{object_file}&quot;" recipe.c.combine.pattern="&quot;{compiler.path}{compiler.c.elf.cmd}&quot; {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -Wl,--start-group {object_files} &quot;{archive_file_path}&quot; {compiler.c.elf.libs} -Wl,--end-group -Wl,-EL -o &quot;{build.path}/{build.project_name}.elf&quot;" recipe.objcopy.eep.pattern="{tools.gen_esp32part.cmd} -q &quot;{runtime.platform.path}/tools/partitions/{build.partitions}.csv&quot; &quot;{build.path}/{build.project_name}.partitions.bin&quot;" recipe.objcopy.hex.pattern="&quot;{tools.esptool_py.path}/{tools.esptool_py.cmd}&quot; --chip esp32 elf2image --flash_mode &quot;{build.flash_mode}&quot; --flash_freq &quot;{build.flash_freq}&quot; --flash_size &quot;{build.flash_size}&quot; -o &quot;{build.path}/{build.project_name}.bin&quot; &quot;{build.path}/{build.project_name}.elf&quot;" recipe.objcopy.hex.pattern.linux="python &quot;{tools.esptool_py.path}/{tools.esptool_py.cmd}&quot; --chip esp32 elf2image --flash_mode &quot;{build.flash_mode}&quot; --flash_freq &quot;{build.flash_freq}&quot; --flash_size &quot;{build.flash_size}&quot; -o &quot;{build.path}/{build.project_name}.bin&quot; &quot;{build.path}/{build.project_name}.elf&quot;" recipe.output.tmp_file="{build.project_name}.bin" recipe.output.save_file="{build.project_name}.{build.variant}.bin" recipe.size.pattern="&quot;{compiler.path}{compiler.size.cmd}&quot; -A &quot;{build.path}/{build.project_name}.elf&quot;" recipe.size.regex="^(?:\.iram0\.text|\.iram0\.vectors|\.dram0\.data|\.flash\.text|\.flash\.rodata|)\s+([0-9]+).*" recipe.size.regex.data="^(?:\.dram0\.data|\.dram0\.bss|\.noinit)\s+([0-9]+).*" tools.esptool_py.upload.protocol="esp32" tools.esptool_py.upload.params.verbose="" tools.esptool_py.upload.params.quiet="" tools.esptool_py.upload.pattern="&quot;{path}/{cmd}&quot; --chip esp32 --port &quot;{serial.port}&quot; --baud {upload.speed}  --before default_reset --after hard_reset write_flash -z --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size detect 0xe000 &quot;{runtime.platform.path}/tools/partitions/boot_app0.bin&quot; 0x1000 &quot;{runtime.platform.path}/tools/sdk/bin/bootloader_{build.boot}_{build.flash_freq}.bin&quot; 0x10000 &quot;{build.path}/{build.project_name}.bin&quot; 0x8000 &quot;{build.path}/{build.project_name}.partitions.bin&quot;" tools.esptool_py.upload.pattern.linux="python &quot;{path}/{cmd}&quot; --chip esp32 --port &quot;{serial.port}&quot; --baud {upload.speed}  --before default_reset --after hard_reset write_flash -z --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size detect 0xe000 &quot;{runtime.platform.path}/tools/partitions/boot_app0.bin&quot; 0x1000 &quot;{runtime.platform.path}/tools/sdk/bin/bootloader_{build.boot}_{build.flash_freq}.bin&quot; 0x10000 &quot;{build.path}/{build.project_name}.bin&quot; 0x8000 &quot;{build.path}/{build.project_name}.partitions.bin&quot;" tools.esptool_py.upload.network_pattern="{network_cmd} -i &quot;{serial.port}&quot; -p &quot;{network.port}&quot; &quot;--auth={network.password}&quot; -f &quot;{build.path}/{build.project_name}.bin&quot;" vm.platform.root.path="c:\program files (x86)\microsoft visual studio\2019\professional\common7\ide\extensions\hkned0ms.vl1\Micro Platforms\arduino16x" runtime.tools.xtensa-esp32-elf-gcc.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-80-g6c4433a-5.2.0" runtime.tools.xtensa-esp32-elf-gcc-1.22.0-80-g6c4433a-5.2.0.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-80-g6c4433a-5.2.0" runtime.tools.esptool_py.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\esptool_py\2.6.1" runtime.tools.esptool_py-2.6.1.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\esptool_py\2.6.1" runtime.tools.mkspiffs.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\mkspiffs\0.2.3" runtime.tools.mkspiffs-0.2.3.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\mkspiffs\0.2.3" runtime.tools.arduinoOTA.path="C:\Program Files (x86)\Arduino\hardware\tools\avr" runtime.tools.arduinoOTA-1.3.0.path="C:\Program Files (x86)\Arduino\hardware\tools\avr" runtime.tools.avrdude.path="C:\Program Files (x86)\Arduino\hardware\tools\avr" runtime.tools.avrdude-6.3.0-arduino17.path="C:\Program Files (x86)\Arduino\hardware\tools\avr" runtime.tools.avr-gcc.path="C:\Program Files (x86)\Arduino\hardware\tools\avr" runtime.tools.avr-gcc-7.3.0-atmel3.6.1-arduino5.path="C:\Program Files (x86)\Arduino\hardware\tools\avr" runtime.tools.tools-avr.path="C:\Program Files (x86)\Arduino\hardware\tools\avr" runtime.vm.boardinfo.id="esp32_esp32" runtime.vm.boardinfo.name="esp32_esp32" runtime.vm.boardinfo.desc="ESP32 Dev Module" runtime.vm.boardinfo.src_location="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.4" ide.hint="Use installed IDE. Provides built-in hardware, reference/help and libraries." ide.location.key="Arduino16x" ide.location.ide.winreg="Arduino 1.6.x Application" ide.location.sketchbook.winreg="Arduino 1.6.x Sketchbook" ide.location.sketchbook.preferences="sketchbook.path" ide.default.revision_name="1.9.0" ide.default.version="10800" ide.default.package="arduino" ide.default.platform="avr" ide.multiplatform="true" ide.includes="Arduino.h" ide.exe_name="arduino" ide.recipe.preproc.defines.flags="-w -x c++ -E -dM" ide.platformswithoutpackage="false" ide.includes.fallback="wprogram.h" ide.extension="ino" ide.extension.fallback="pde" ide.versionGTEQ="160" ide.exe="arduino.exe" ide.builder.exe="arduinobuilder.exe" ide.builder.name="Arduino Builder" ide.hosts="atmel" ide.url="https://www.visualmicro.com/page/Download-Arduino-Or-Other-Supporting-IDEs.aspx" ide.help.reference.path="reference" ide.help.reference.path2="reference\www.arduino.cc\en\Reference" ide.help.reference.serial="reference\www.arduino.cc\en\Serial" ide.location.preferences.portable="{runtime.ide.path}\portable" ide.location.preferences.arduinoData="{runtime.sketchbook.path}\ArduinoData" ide.location.preferences="%VM_APPDATA_LOCAL%\arduino15\preferences.txt" ide.location.preferences_fallback="%VM_APPDATA_ROAMING%\arduino15\preferences.txt" ide.location.contributions="%VM_APPDATA_LOCAL%\arduino15" ide.location.contributions_fallback="%VM_APPDATA_ROAMING%\arduino15" ide.contributions.boards.allow="true" ide.contributions.boards.ignore_unless_rewrite_found="true" ide.contributions.libraries.allow="true" ide.contributions.boards.support.urls.wiki="https://github.com/arduino/Arduino/wiki/Unofficial-list-of-3rd-party-boards-support-urls" ide.create_platforms_from_boardsTXT.teensy="build.core" vm.debug="true" software="ARDUINO" ssh.user.name="root" ssh.user.default.password="arduino" ssh.host.wwwfiles.path="/www/sd" build.working_directory="{runtime.ide.path}\java\bin" runtime.tools.vm_web_debugger.path="{vm.platform.root.path}/../../Micro Debuggers/WebDebugger" recipe.hooks.vmdeploy.vm_web_debugger_postupload.1.pattern="&quot;{runtime.tools.vm_web_debugger.path}/DeployMicroWebserver.exe&quot; &quot;{sketch_path}&quot; &quot;{serial.port}&quot; &quot;{runtime.hardware.path}\..&quot;" recipe.hooks.vmlaunch.vm_web_debugger_preopen.1.pattern="notepad.exe &quot;{sketch_path}\__vm\vmWebDebugger\Start-WebServer.bat&quot;" recipe.hooks.vmlaunch.vm_web_debugger_preopen.2.pattern="{sketch_path}\__vm\vmWebDebugger\Start-WebServer.bat" ide.tools.vmopenocd.cmd="bin/openocd.exe" ide.tools.vmopenocd.cmd.windows="bin/openocd.exe" ide.tools.vmopenocd.debug.params.verbose="-d2" ide.tools.vmopenocd.debug.params.quiet="-d0" ide.tools.vmopenocd.debug.address="localhost:3333" ide.tools.vmopenocd.path="{runtime.tools.openocd-0.10.0.20200213.path}" ide.tools.vmopenocd.scriptPath="-s &quot;{path}/scripts/&quot;" ide.tools.vmopenocd.logging="-l &quot;{{build.path}/{build.project_name}_DebugOpenOCD.log}&quot;" ide.tools.vmopenocd.boardCmd="" ide.tools.vmopenocd.targetCmd="" ide.tools.vmopenocd.initCmd="" ide.tools.vmopenocd.debug.pattern="&quot;{path}/{cmd}&quot; {debug.verbose} {logging} {scriptPath} {boardCmd} {targetCmd} {initCmd}" ide.tools.vmopenocd.program.cmd="bin/openocd.exe" ide.tools.vmopenocd.program.cmd.windows="bin/openocd.exe" ide.tools.vmopenocd.program.path="{runtime.tools.openocd-0.10.0.20200213.path}" ide.tools.vmopenocd.program.address="localhost:3333" ide.tools.vmopenocd.program.params.verbose="-d2" ide.tools.vmopenocd.program.params.quiet="-d0" ide.tools.vmopenocd.program.elf.message="****[vMicro]**** Uploading ELF :" ide.tools.vmopenocd.program.pattern="&quot;{path}/{cmd}&quot; {program.verbose} {scriptPath} {boardCmd} {targetCmd} -c &quot;echo -n {{program.elf.message}}&quot; {programCmd}" ide.tools.atmelICE.protocol="" ide.tools.atmelICE.debug.cmd="arm-none-eabi-gdb.exe" ide.tools.atmelICE.debug.path="{runtime.tools.arm-none-eabi-gcc.path}/bin" ide.tools.atmelICE.debug.pattern="&quot;{path}/{cmd}&quot;" ide.tools.atmelICE.server.boardCmd="-c &quot;adapter driver cmsis-dap&quot; -c &quot;cmsis_dap_vid_pid 0x03eb 0x2141&quot;" ide.tools.atmelICE.server.initCmd="-c &quot;init&quot;" ide.tools.atmelICE.server.tool="vmopenocd" ide.tools.atmelICE.program.scriptPath="-s &quot;{program.path}/scripts/&quot;" ide.tools.atmelICE.program.boardCmd="-c &quot;adapter driver cmsis-dap&quot; -c &quot;cmsis_dap_vid_pid 0x03eb 0x2141&quot;" ide.tools.atmelICE.program.cmd="bin/openocd.exe" ide.tools.atmelICE.program.cmd.windows="bin/openocd.exe" ide.tools.atmelICE.program.path="{runtime.tools.openocd-0.10.0.20200213.path}" ide.tools.atmelICE.program.address="localhost:3333" ide.tools.atmelICE.program.params.verbose="-d2" ide.tools.atmelICE.program.params.quiet="-d0" ide.tools.atmelICE.program.elf.message="****[vMicro]**** Uploading ELF :" ide.tools.atmelICE.program.pattern="&quot;{program.path}/{program.cmd}&quot; {program.verbose} {program.scriptPath} {program.boardCmd} {program.targetCmd} -c &quot;echo -n {{program.elf.message}}&quot; {program.programCmd}" ide.tools.atmelICE.program.extra_params="" ide.tools.atmelICE.program.protocol="" ide.tools.atmelICE.erase.params.verbose="-d3" ide.tools.atmelICE.erase.params.quiet="-d0" ide.tools.atmelICE.erase.pattern="" ide.tools.jlink.cmd="arm-none-eabi-gdb.exe" ide.tools.jlink.path="{runtime.tools.arm-none-eabi-gcc.path}/bin" ide.tools.jlink.pattern="&quot;{path}/{cmd}&quot;" ide.tools.jlink.server.tool="vmopenocd" ide.tools.jlink.server.boardCmd="-f &quot;interface/jlink.cfg&quot;" ide.tools.jlink.program.scriptPath="-s &quot;{program.path}/scripts/&quot;" ide.tools.jlink.program.boardCmd="-f &quot;interface/jlink.cfg&quot;" ide.tools.jlink.program.cmd="bin/openocd.exe" ide.tools.jlink.program.cmd.windows="bin/openocd.exe" ide.tools.jlink.program.path="{runtime.tools.openocd-0.10.0.20200213.path}" ide.tools.jlink.program.address="localhost:3333" ide.tools.jlink.program.params.verbose="-d2" ide.tools.jlink.program.params.quiet="-d0" ide.tools.jlink.program.elf.message="****[vMicro]**** Uploading ELF :" ide.tools.jlink.program.pattern="&quot;{program.path}/{program.cmd}&quot; {program.verbose} {program.scriptPath} {program.boardCmd} {program.targetCmd} -c &quot;echo -n {{program.elf.message}}&quot; {program.programCmd}" ide.tools.jlink.upload.scriptPath="-s &quot;{upload.path}/scripts/&quot;" ide.tools.jlink.upload.boardCmd="-f &quot;interface/jlink.cfg&quot;" ide.tools.jlink.upload.cmd="bin/openocd.exe" ide.tools.jlink.upload.cmd.windows="bin/openocd.exe" ide.tools.jlink.upload.path="{runtime.tools.openocd-0.10.0.20200213.path}" ide.tools.jlink.upload.address="localhost:3333" ide.tools.jlink.upload.params.verbose="-d2" ide.tools.jlink.upload.params.quiet="-d0" ide.tools.jlink.upload.elf.message="****[vMicro]**** Uploading ELF :" ide.tools.jlink.upload.pattern="&quot;{upload.path}/{upload.cmd}&quot; {upload.verbose} {upload.scriptPath} {upload.boardCmd} {upload.targetCmd} -c &quot;echo -n {{upload.elf.message}}&quot; {upload.programCmd}" ide.tools.bmp_upload.cmd="arm-none-eabi-gdb.exe" ide.tools.bmp_upload.debug.path="{runtime.tools.arm-none-eabi-gcc.path}/bin/" ide.tools.bmp_upload.program.cmd="bin/arm-none-eabi-gdb.exe" ide.tools.bmp_upload.program.cmd.windows="bin/arm-none-eabi-gdb.exe" ide.tools.bmp_upload.program.path="{runtime.tools.arm-none-eabi-gcc.path}" ide.tools.bmp_upload.upload.cmd="bin/arm-none-eabi-gdb.exe" ide.tools.bmp_upload.upload.cmd.windows="bin/arm-none-eabi-gdb.exe" ide.tools.bmp_upload.upload.path="{runtime.tools.arm-none-eabi-gcc.path}" ide.tools.stlinkv2.description="" ide.tools.stlinkv2.cmd="arm-none-eabi-gdb.exe" ide.tools.stlinkv2.path="{runtime.tools.arm-none-eabi-gcc.path}/bin" ide.tools.stlinkv2.pattern="&quot;{path}/{cmd}&quot;" ide.tools.stlinkv2.server.tool="vmopenocd" ide.tools.stlinkv2.server.boardCmd="-f &quot;interface/stlink.cfg&quot;" ide.tools.stlinkv2.upload.scriptPath="-s &quot;{upload.path}/scripts/&quot;" ide.tools.stlinkv2.upload.boardCmd="-f &quot;interface/stlink.cfg&quot;" ide.tools.stlinkv2.upload.cmd="bin/openocd.exe" ide.tools.stlinkv2.upload.cmd.windows="bin/openocd.exe" ide.tools.stlinkv2.upload.path="{runtime.tools.openocd-0.10.0.20200213.path}" ide.tools.stlinkv2.upload.address="localhost:3333" ide.tools.stlinkv2.upload.params.verbose="-d2" ide.tools.stlinkv2.upload.params.quiet="-d0" ide.tools.stlinkv2.upload.elf.message="****[vMicro]**** Uploading ELF :" ide.tools.stlinkv2.upload.pattern="&quot;{upload.path}/{upload.cmd}&quot; {upload.verbose} {upload.scriptPath} {upload.boardCmd} {upload.targetCmd} -c &quot;echo -n {{upload.elf.message}}&quot; {upload.programCmd}" ide.tools.stlinkv2.upload.extra_params="" ide.tools.stlinkv2.upload.protocol="" ide.tools.stlinkv2.protocol="" ide.tools.f2232mm.cmd="arm-none-eabi-gdb.exe" ide.tools.f2232mm.path="{runtime.tools.arm-none-eabi-gcc.path}/bin" ide.tools.f2232mm.pattern="&quot;{path}/{cmd}&quot; {args}" ide.tools.f2232mm.server.tool="vmopenocd" ide.tools.f2232mm.server.boardCmd="-f &quot;interface/ftdi/minimodule.cfg&quot;" ide.tools.f2232mm.upload.scriptPath="-s &quot;{upload.path}/scripts/&quot;" ide.tools.f2232mm.upload.boardCmd="-f &quot;interface/ftdi/minimodule.cfg&quot;" ide.tools.f2232mm.upload.cmd="bin/openocd.exe" ide.tools.f2232mm.upload.cmd.windows="bin/openocd.exe" ide.tools.f2232mm.upload.path="{runtime.tools.openocd-0.10.0.20200213.path}" ide.tools.f2232mm.upload.address="localhost:3333" ide.tools.f2232mm.upload.params.verbose="-d2" ide.tools.f2232mm.upload.params.quiet="-d0" ide.tools.f2232mm.upload.elf.message="****[vMicro]**** Uploading ELF :" ide.tools.f2232mm.upload.pattern="&quot;{upload.path}/{upload.cmd}&quot; {upload.verbose} {upload.scriptPath} {upload.boardCmd} {upload.targetCmd} -c &quot;echo -n {{upload.elf.message}}&quot; {upload.programCmd}" ide.tools.f2232mm.upload.extra_params="" ide.tools.f2232mm.upload.protocol="" ide.tools.f2232mm.protocol="" ide.tools.f2232h.server.boardCmd="-f &quot;interface/ftdi/minimodule-lowcost.cfg&quot;" ide.tools.f2232h.cmd="arm-none-eabi-gdb.exe" ide.tools.f2232h.path="{runtime.tools.arm-none-eabi-gcc.path}/bin" ide.tools.f2232h.pattern="&quot;{path}/{cmd}&quot;" ide.tools.f2232h.server.tool="vmopenocd" ide.tools.f2232h.upload.scriptPath="-s &quot;{upload.path}/scripts/&quot;" ide.tools.f2232h.upload.boardCmd="-f &quot;interface/ftdi/minimodule-lowcost.cfg&quot;" ide.tools.f2232h.upload.cmd="bin/openocd.exe" ide.tools.f2232h.upload.cmd.windows="bin/openocd.exe" ide.tools.f2232h.upload.path="{runtime.tools.openocd-0.10.0.20200213.path}" ide.tools.f2232h.upload.address="localhost:3333" ide.tools.f2232h.upload.params.verbose="-d2" ide.tools.f2232h.upload.params.quiet="-d0" ide.tools.f2232h.upload.elf.message="****[vMicro]**** Uploading ELF :" ide.tools.f2232h.upload.pattern="&quot;{upload.path}/{upload.cmd}&quot; {upload.verbose} {upload.scriptPath} {upload.boardCmd} {upload.targetCmd} -c &quot;echo -n {{upload.elf.message}}&quot; {upload.programCmd}" ide.tools.f2232h.upload.extra_params="" ide.tools.f2232h.upload.protocol="" ide.tools.f2232h.protocol="" ide.debug_menu.debugger_type="Debug" ide.debug_menu.debugger_type.none="Off" ide.debug_menu.none.debug.tool="no_debug" ide.debug_menu.debugger_type.universal="Serial" ide.debug_menu.universal.debug.tool="auto" ide.debug_menu.debugger_type.hwdebugger="Hardware" ide.debug_menu.hwdebugger="Debugger" ide.debug_menu.hwdebugger.custom_debugger="Manual/Custom" ide.debug_menu.hwdebugger.custom_debugger.debug.tool="dbg_external" ide.meta_custom_debugger.sentence="Provides a build that includes debug defines and will launch a custom debugger if one is provided." ide.meta_custom_debugger.paragraph="This is option is for advanced use. It is recommended that a pre-configured debugger be selected when available in this list. Usage: Optionally add a customer debugger to the project. A 'debugger_launch.json' file shares the same command syntax that is used by the VsCode debugger. Custom debuggers can be targeted at a board and/or variant and/or configuration name. IE: [variant].[configuration_name][.]debugger_launch.json" ide.meta_custom_debugger.reference.usage.url="https://github.com/Microsoft/vscode-cpptools/blob/master/launch.md#customlaunchsetupcommands" ide.meta_custom_debugger.reference.connect.url="https://docs.microsoft.com/en-us/visualstudio/debugger/create-custom-views-of-native-objects?view=vs-2019" ide.compiler_flags_no_opt="-O0" ide.debug_menu.vm_disable_optimization="Disable Optimization" ide.debug_menu.vm_disable_optimization.vm_disable_opt_default="Default Optimization" ide.debug_menu.vm_disable_optimization.vm_disable_opt_proj="No Project  Optimization" ide.debug_menu.vm_disable_opt_proj.vm_disable_opt_project="{ide.compiler_flags_no_opt}" ide.debug_menu.vm_disable_optimization.vm_disable_opt_proj_libs="No Project + Libraries Optimization" ide.debug_menu.vm_disable_opt_proj_libs.vm_disable_opt_project="{ide.compiler_flags_no_opt}" ide.debug_menu.vm_disable_opt_proj_libs.vm_disable_opt_libraries="{ide.compiler_flags_no_opt}" ide.debug_menu.vm_disable_optimization.vm_disable_opt_all="No Optimization" ide.meta_vm_disable_opt_all.sentence="Disable compiler optimization for all sources:- Project, Library and Platform." ide.meta_vm_disable_opt_all.comment="After switching between 'No Optimization' and other optimization values, please click &quot;Solution Clean&quot; or switch off (or cycle) 'vMicro&gt;Compiler&gt;Shared Cache For Cores'. NOTE: Changing optimization settings can cause build errors or result in overly large programs." ide.debug_menu.vm_disable_opt_all.vm_disable_opt_project="{ide.compiler_flags_no_opt}" ide.debug_menu.vm_disable_opt_all.vm_disable_opt_libraries="{ide.compiler_flags_no_opt}" ide.debug_menu.vm_disable_opt_all.vm_disable_opt_core="{ide.compiler_flags_no_opt}" ide.appid="arduino16x" location.sketchbook="C:\Users\thoma\OneDrive\Dokumente\Arduino" build.core.vmresolved="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.4\cores\esp32" build.core.parentfolder.vmresolved="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.4\cores" build.core.coresparentfolder.vmresolved="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.4" build.core.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.4\cores\esp32" vm.core.include="arduino.h" vm.boardsource.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.4" runtime.platform.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.4" vm.platformname.name="esp32" build.arch="ESP32" vm.runtime.compiler.cached_cores_path="C:\Users\thoma\AppData\Local\Temp\VMBCore\arduino16x" vm.runtime.compiler.showwarnings="false" vm.runtime.compiler.showwarnings_core="false" vm.runtime.compiler.showwarnings_library="false" vm.runtime.upload.verbose="false" vm.runtime.upload.verify="false" runtime.vm.ide.platforms.path="c:\program files (x86)\microsoft visual studio\2019\professional\common7\ide\extensions\hkned0ms.vl1\Micro Platforms" runtime.vm.ide.tools.openocd.path="{runtime.tools.openocd-0.9.0.path}" runtime.vm.openocd.path="{runtime.tools.openocd-0.9.0.path}" vm.runtime.build.intermediate_output_path="E:\1_Programming\WLED_org\wled00\Release\" vm.runtime.build.final_output_path="E:\1_Programming\WLED_org\Release\" compiler.always_include_sketchfolder="true" compiler.always_include_sharedprojectfolders="true" vm.runtime.compiler.auto_discover_includes="true" vm.runtime.compiler.allow_library_debugging="false" vm.sketch_ino_cpp_name="wled00.cpp" extra.time.local="1584813439" extra.time.utc="1584809839" extra.time.dst="3600" extra.time.zone="-3600" build.project_name="wled00.ino" build.project_path="E:\1_Programming\WLED_org\wled00" sketch_path="E:\1_Programming\WLED_org\wled00" ProjectDir="E:\1_Programming\WLED_org\wled00\" build.path="C:\Users\thoma\AppData\Local\Temp\VMBuilds\wled00\esp32_esp32\Release" debug.tool="no_debug" upload.speed="921600" vm.runtime.compile.skip_library_file_if_exists_in_project="false" vm.runtime.compiler.auto_discover_includes_cache="true" build.vm.build.vmdebug="0" build.vm.build.isgdb="0" build.vm.build.optimised="1" vm.last.buildpath="C:\Users\thoma\AppData\Local\Temp\VMBuilds\wled00\esp32_esp32\Release" build.architecture="1.22.0-80-g6c4433a-5.2.0" vmresolved.compiler.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-80-g6c4433a-5.2.0\bin\" vmresolved.tools.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-80-g6c4433a-5.2.0" build.variant.vmresolved.name="esp32" build.variant.vmresolved.full_path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.4\variants\esp32" />
-    </Platform>
-    <Debug DebugEnabled="0" EnableBreak="1" InBreakLiveView="1" PerfStats="1" />
-    <VCCodeModel>
-      <VCCodeMacros />
-    </VCCodeModel>
-  </Program>
-</VisualMicro>
\ No newline at end of file
diff --git a/wled00/__vm/Configuration.Release.vmps.xml b/wled00/__vm/Configuration.Release.vmps.xml
deleted file mode 100644
index bcbca636a..000000000
--- a/wled00/__vm/Configuration.Release.vmps.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<VisualMicro>
-  <Program Name="wled00" Ext=".ino" Location="D:\WLED New\WLED\wled00">
-    <Compile IsDebugStart="1" IsGdb="0" IsCompiled="0" CompilerErrors="0" ConfigurationName="Release" UseConfigurationNameInBuildFolder="True" StopOnError="False" OptimiseLibs="True" OptimiseCore="True" ReCompileIfSourceIsNewer="1" BuildPath="C:\Users\thoma\AppData\Local\Temp\VMBuilds\wled00\esp32_esp32\Release" />
-    <Platform Name="arduino16x" Package="esp32" Platform="esp32" Architecture="1.22.0-80-g6c4433a-5.2.0">
-      <Board Name="esp32_esp32" Description="ESP32 Dev Module" CoreFolder="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\cores\esp32" VariantFullPath="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\variants\esp32" McuIdePath="C:\Program Files (x86)\Arduino" McuSketchBookPath="D:\User\Thomas\Documents\Arduino" name="ESP32 Dev Module" upload.tool="esptool_py" upload.maximum_size="1310720" upload.maximum_data_size="327680" upload.wait_for_upload_port="true" serial.disableDTR="true" serial.disableRTS="true" build.mcu="esp32" build.core="esp32" build.variant="esp32" build.board="ESP32_DEV" build.f_cpu="240000000L" build.flash_size="4MB" build.flash_freq="80m" build.flash_mode="dio" build.boot="qio" build.partitions="default" build.defines="" menu.PSRAM.disabled="Disabled" menu.PSRAM.disabled.build.defines="" menu.PSRAM.enabled="Enabled" menu.PSRAM.enabled.build.defines="-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue" menu.PartitionScheme.default="Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)" menu.PartitionScheme.default.build.partitions="default" menu.PartitionScheme.defaultffat="Default 4MB with ffat (1.2MB APP/1.5MB FATFS)" menu.PartitionScheme.defaultffat.build.partitions="default_ffat" menu.PartitionScheme.minimal="Minimal (1.3MB APP/700KB SPIFFS)" menu.PartitionScheme.minimal.build.partitions="minimal" menu.PartitionScheme.no_ota="No OTA (2MB APP/2MB SPIFFS)" menu.PartitionScheme.no_ota.build.partitions="no_ota" menu.PartitionScheme.no_ota.upload.maximum_size="2097152" menu.PartitionScheme.noota_3g="No OTA (1MB APP/3MB SPIFFS)" menu.PartitionScheme.noota_3g.build.partitions="noota_3g" menu.PartitionScheme.noota_3g.upload.maximum_size="1048576" menu.PartitionScheme.noota_ffat="No OTA (2MB APP/2MB FATFS)" menu.PartitionScheme.noota_ffat.build.partitions="noota_ffat" menu.PartitionScheme.noota_ffat.upload.maximum_size="2097152" menu.PartitionScheme.noota_3gffat="No OTA (1MB APP/3MB FATFS)" menu.PartitionScheme.noota_3gffat.build.partitions="noota_3gffat" menu.PartitionScheme.noota_3gffat.upload.maximum_size="1048576" menu.PartitionScheme.huge_app="Huge APP (3MB No OTA/1MB SPIFFS)" menu.PartitionScheme.huge_app.build.partitions="huge_app" menu.PartitionScheme.huge_app.upload.maximum_size="3145728" menu.PartitionScheme.min_spiffs="Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)" menu.PartitionScheme.min_spiffs.build.partitions="min_spiffs" menu.PartitionScheme.min_spiffs.upload.maximum_size="1966080" menu.PartitionScheme.fatflash="16M Flash (2MB APP/12.5MB FAT)" menu.PartitionScheme.fatflash.build.partitions="ffat" menu.CPUFreq.240="240MHz (WiFi/BT)" menu.CPUFreq.240.build.f_cpu="240000000L" menu.CPUFreq.160="160MHz (WiFi/BT)" menu.CPUFreq.160.build.f_cpu="160000000L" menu.CPUFreq.80="80MHz (WiFi/BT)" menu.CPUFreq.80.build.f_cpu="80000000L" menu.CPUFreq.40="40MHz (40MHz XTAL)" menu.CPUFreq.40.build.f_cpu="40000000L" menu.CPUFreq.26="26MHz (26MHz XTAL)" menu.CPUFreq.26.build.f_cpu="26000000L" menu.CPUFreq.20="20MHz (40MHz XTAL)" menu.CPUFreq.20.build.f_cpu="20000000L" menu.CPUFreq.13="13MHz (26MHz XTAL)" menu.CPUFreq.13.build.f_cpu="13000000L" menu.CPUFreq.10="10MHz (40MHz XTAL)" menu.CPUFreq.10.build.f_cpu="10000000L" menu.FlashMode.qio="QIO" menu.FlashMode.qio.build.flash_mode="dio" menu.FlashMode.qio.build.boot="qio" menu.FlashMode.dio="DIO" menu.FlashMode.dio.build.flash_mode="dio" menu.FlashMode.dio.build.boot="dio" menu.FlashMode.qout="QOUT" menu.FlashMode.qout.build.flash_mode="dout" menu.FlashMode.qout.build.boot="qout" menu.FlashMode.dout="DOUT" menu.FlashMode.dout.build.flash_mode="dout" menu.FlashMode.dout.build.boot="dout" menu.FlashFreq.80="80MHz" menu.FlashFreq.80.build.flash_freq="80m" menu.FlashFreq.40="40MHz" menu.FlashFreq.40.build.flash_freq="40m" menu.FlashSize.4M="4MB (32Mb)" menu.FlashSize.4M.build.flash_size="4MB" menu.FlashSize.2M="2MB (16Mb)" menu.FlashSize.2M.build.flash_size="2MB" menu.FlashSize.2M.build.partitions="minimal" menu.FlashSize.16M="16MB (128Mb)" menu.FlashSize.16M.build.flash_size="16MB" menu.FlashSize.16M.build.partitions="ffat" menu.UploadSpeed.921600="921600" menu.UploadSpeed.921600.upload.speed="921600" menu.UploadSpeed.115200="115200" menu.UploadSpeed.115200.upload.speed="115200" menu.UploadSpeed.256000.windows="256000" menu.UploadSpeed.256000.upload.speed="256000" menu.UploadSpeed.230400.windows.upload.speed="256000" menu.UploadSpeed.230400="230400" menu.UploadSpeed.230400.upload.speed="230400" menu.UploadSpeed.460800.linux="460800" menu.UploadSpeed.460800.macosx="460800" menu.UploadSpeed.460800.upload.speed="460800" menu.UploadSpeed.512000.windows="512000" menu.UploadSpeed.512000.upload.speed="512000" menu.DebugLevel.none="None" menu.DebugLevel.none.build.code_debug="0" menu.DebugLevel.error="Error" menu.DebugLevel.error.build.code_debug="1" menu.DebugLevel.warn="Warn" menu.DebugLevel.warn.build.code_debug="2" menu.DebugLevel.info="Info" menu.DebugLevel.info.build.code_debug="3" menu.DebugLevel.debug="Debug" menu.DebugLevel.debug.build.code_debug="4" menu.DebugLevel.verbose="Verbose" menu.DebugLevel.verbose.build.code_debug="5" menu.UploadSpeed.256000="256000" menu.UploadSpeed.512000="512000" runtime.ide.path="C:\Program Files (x86)\Arduino" runtime.os="windows" build.system.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\system" runtime.ide.version="10809" target_package="esp32" target_platform="esp32" runtime.hardware.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32" originalid="esp32" intellisense.tools.path="{compiler.toolchain.path}" intellisense.include.paths="{runtime.tools.xtensa-esp32-elf-gcc.path}\lib\gcc\xtensa-esp32-elf\5.2.0\include;{runtime.tools.xtensa-esp32-elf-gcc.path}\xtensa-esp32-elf\include\c++\5.2.0\xtensa-esp32-elf;{runtime.tools.xtensa-esp32-elf-gcc.path}\xtensa-esp32-elf\include;{runtime.tools.xtensa-esp32-elf-gcc.path}\xtensa-esp32-elf\include\c++\5.2.0;{runtime.tools.xtensa-esp32-elf-gcc.path}\include\c++\5.2.0;{runtime.tools.xtensa-esp32-elf-gcc.path}\include;{runtime.tools.xtensa-esp32-elf-gcc.path}\include\include;" tools.wwwfiles.name="ESP32 Sketch Data Upload" tools.wwwfiles.ssh="false" tools.wwwfiles.cmd.windows="ESP32FSUpload.exe" recipe.wwwfiles.upload.pattern="&quot;{vm.path}/{tools.wwwfiles.cmd}&quot; -serial.port={serial.port} -build.path=&quot;{build.path}&quot; -target_platform=&quot;{target_platform}&quot; -runtime.tools.mkspiffs.path=&quot;{runtime.tools.mkspiffs.path}&quot; -board.name=&quot;{name}&quot; -upload.verbose={upload.verbose} -upload.resetmethod={upload.resetmethod} -upload.speed={upload.speed}  -platform.path=&quot;{platform.path}&quot; -project.name=&quot;{project.name}&quot; -project.path=&quot;{project.path}&quot; -tools.esptool.cmd=&quot;{tools.esptool.cmd}&quot; -tools.esptool.cmd.windows=&quot;{tools.esptool.cmd.windows}&quot; -runtime.tools.esptool.path=&quot;{runtime.tools.esptool.path}&quot; -compiler.path=&quot;{compiler.path}&quot; -build.spiffs_start=&quot;{build.spiffs_start}&quot; -build.spiffs_end=&quot;{build.spiffs_end}&quot; -build.spiffs_pagesize=&quot;{build.spiffs_pagesize}&quot; -build.spiffs_blocksize=&quot;{build.spiffs_blocksize}&quot; -build.partitions=&quot;{build.partitions}&quot; -network.password={network.password} -network.auth_upload={network.auth_upload} -network.port={network.port} -upload.tool={upload.tool} -tools.esptool_py.cmd=&quot;{tools.esptool_py.cmd}&quot; -tools.esptool_py.cmd.windows=&quot;{tools.esptool_py.cmd.windows}&quot; -runtime.tools.esptool_py.path=&quot;{runtime.tools.esptool_py.path}&quot; -build.flash_mode={build.flash_mode} -build.flash_freq={build.flash_freq}" exceptions.serial.enabled="true" exceptions.serial.messages="{vm.platform.root.path}/hardware/esp32/exceptions.txt" exceptions.serial.regex.exception_number="Exception \(([0-9]*)\):" exceptions.serial.regex.stack_addresses="40[0-2][0-9a-f]{5}\b" exceptions.serial.resolve.addr2line.args="-aipfC -e&quot;{build.path}/{build.project_name}.elf&quot;" exceptions.serial.resolve.addr2line.cmd="xtensa-esp32-elf-addr2line" exceptions.serial.resolve.stack_addresses.pattern="&quot;{compiler.path}{addr2line.cmd}&quot; {addr2line.args} {stack_addresses.list}" upload.8dot3="false" tools.openocd.debug.path="{runtime.tools.openocd-espressif-esp32-10.0.1.path}" tools.openocd.debug.cmd="bin/openocd.exe" tools.openocd.debug.cmd.windows="bin/openocd.exe" tools.openocd.debug.params.verbose="-d2" tools.openocd.debug.openocdscript="esp-wroom-32.cfg" tools.openocd.debug.args="{params.verbose} -s &quot;{path}/share/openocd/scripts/&quot; -f &quot;{path}/share/openocd/scripts/interface/{build.openocddebugger}&quot; -c &quot;set ESP32_RTOS none&quot; -f &quot;{path}/share/openocd/scripts/board/{openocdscript}&quot; -c &quot;init&quot;" tools.openocd.debug.address="localhost:3333" tools.f2232h.server.build.openocddebugger="ftdi/minimodule-lowcost.cfg" tools.f2232h.args="-ex &quot;set remote hardware-watchpoint-limit 2&quot; -ex &quot;mon reset halt&quot; -ex &quot;flushregs&quot; -ex &quot;thb app_main&quot; -ex &quot;c&quot;" tools.f2232h.path="{runtime.tools.xtensa-esp32-elf-gcc.path}/bin" tools.f2232h.cmd="xtensa-esp32-elf-gdb.exe" tools.f2232h.pattern="&quot;{path}/{cmd}&quot; {args}" tools.f2232h.server.tool="openocd" tools.f2232mm.server.build.openocddebugger="ftdi/minimodule.cfg" tools.f2232mm.args="-ex &quot;set remote hardware-watchpoint-limit 2&quot; -ex &quot;mon reset halt&quot; -ex &quot;flushregs&quot; -ex &quot;thb app_main&quot; -ex &quot;c&quot;" tools.f2232mm.path="{runtime.tools.xtensa-esp32-elf-gcc.path}/bin" tools.f2232mm.cmd="xtensa-esp32-elf-gdb.exe" tools.f2232mm.pattern="&quot;{path}/{cmd}&quot; {args}" tools.f2232mm.server.tool="openocd" tools.olimexarmusbtiny.server.build.openocddebugger="ftdi/olimex-jtag-tiny.cfg" tools.olimexarmusbtiny.cmd="xtensa-esp32-elf-gdb.exe" tools.olimexarmusbtiny.path="{runtime.tools.xtensa-esp32-elf-gcc.path}/bin" tools.olimexarmusbtiny.pattern="&quot;{path}/{cmd}&quot;" tools.olimexarmusbtiny.server.tool="openocd" tools.olimexarmusbtiny.server.args="{params.verbose} -s &quot;{path}/share/openocd/scripts/&quot; -c &quot;adapter_khz 1000&quot; -f &quot;{path}/share/openocd/scripts/interface/{build.openocddebugger}&quot; -c &quot;set ESP32_RTOS none&quot; -f &quot;{path}/share/openocd/scripts/board/{openocdscript}&quot; -c &quot;init; reset halt&quot;" tools.jlink.server.build.openocddebugger="jlink.cfg" tools.jlink.cmd="xtensa-esp32-elf-gdb.exe" tools.jlink.args="-ex &quot;set remote hardware-watchpoint-limit 2&quot; -ex &quot;mon reset halt&quot; -ex &quot;flushregs&quot; -ex &quot;thb app_main&quot; -ex &quot;c&quot;" tools.jlink.path="{runtime.tools.xtensa-esp32-elf-gcc.path}/bin" tools.jlink.pattern="&quot;{path}/{cmd}&quot; {args}" tools.jlink.server.tool="openocd" debug_menu.hwdebugger.f2232h="F2232H Dual RS232" debug_menu.hwdebugger.f2232h.debug.tool="f2232h" meta_f2232h.sentence="This debugger will require some wiring to connect it to your target ESP32 board" meta_f2232h.comment="Wiring can be found in the below image, and the 'https://zadig.akeo.ie/' tool is required to replace the USB Driver on Interface 0 with 'WinUSB'. Set vMicro &gt; Debugger &gt; 'Compiler Optimization' to  &gt; 'No Optimization' to ensure correct debugging (NOTE: This might cause compilation errors with certain code such as HardwareSerial.)" meta_f2232h.image.connect="https://www.visualmicro.com/pics/Debug-Help-ESP32-FT2232H-Connections.png" meta_f2232h.image.operation="https://www.visualmicro.com/pics/Debug-Break-ESP32-FT2232H-VSOnly.png" meta_f2232h.reference.usage.url="https://www.visualmicro.com/page/User-Guide.aspx?doc=Arduino-gdb-Tutorial.html" debug_menu.hwdebugger.f2232mm="F2232 MiniModule" debug_menu.hwdebugger.f2232mm.debug.tool="f2232mm" meta_f2232mm.sentence="This debugger will require some wiring to allow it to function, and connect to your target ESP32 board" meta_f2232mm.comment="Wiring can be found in the below image, and the 'https://zadig.akeo.ie/' tool is required to replace the USB Driver on Interface 0 with 'WinUSB'. Set vMicro &gt; Debugger &gt; 'Compiler Optimization' to  &gt; 'No Optimization' to ensure correct debugging (NOTE: This might cause compilation errors with certain code such as HardwareSerial.)" meta_f2232mm.image.operation="https://www.visualmicro.com/pics/Debug-Break-ESP32-FT2232MM-VSOnly.png" meta_f2232mm.image.connect="https://www.visualmicro.com/pics/Debug-Help-ESP32-FT2232MM-Connections.png" meta_f2232mm.reference.usage.url="https://www.visualmicro.com/page/User-Guide.aspx?doc=Arduino-gdb-Tutorial.html" debug_menu.hwdebugger.olimexarmusbtiny="Olimex ARM-USB-TINY" debug_menu.hwdebugger.olimexarmusbtiny.debug.tool="olimexarmusbtiny" meta_olimexarmusbtiny.sentence="This debugger will require some wiring to connect it to your target ESP32 board" meta_olimexarmusbtiny.comment="Wiring can be found in the below image, and the 'https://zadig.akeo.ie/' tool is required to replace the USB Driver on Interface 0 with 'WinUSB'. Set vMicro &gt; Debugger &gt; 'Compiler Optimization' to  &gt; 'No Optimization' to ensure correct debugging (NOTE: This might cause compilation errors with certain code such as HardwareSerial.)" meta_olimexarmusbtiny.image.connect="https://www.visualmicro.com/pics/Debug-Help-ESP32-JTAG-Connections.png" meta_olimexarmusbtiny.image.operation="https://www.visualmicro.com/pics/Debug-Break-ESP32-OlimexARMUSBTiny-VSOnly.png" meta_olimexarmusbtiny.reference.usage.url="https://www.visualmicro.com/page/User-Guide.aspx?doc=Arduino-gdb-Tutorial.html" debug_menu.hwdebugger.jlink="Segger J-Link" debug_menu.hwdebugger.jlink.debug.tool="jlink" meta_jlink.sentence="This debugger will require some wiring to connect it to your target ESP32 board" meta_jlink.comment="Wiring can be found in the below image, and the 'https://zadig.akeo.ie/' tool is required to replace the USB Driver on Interface 0 with 'WinUSB'. Set vMicro &gt; Debugger &gt; 'Compiler Optimization' to  &gt; 'No Optimization' to ensure correct debugging (NOTE: This might cause compilation errors with certain code such as HardwareSerial.)" meta_jlink.image.connect="https://www.visualmicro.com/pics/Debug-Help-ESP32-Jlink-Connections.png" meta_jlink.image.operation="https://www.visualmicro.com/pics/Debug-Break-ESP32-Jlink-VSOnly.png" meta_jlink.reference.usage.url="https://www.visualmicro.com/page/User-Guide.aspx?doc=Arduino-gdb-Tutorial.html" tools.wwwfiles.cmd="ESP32FSUpload.exe" version="1.0.2" tools.esptool_py.path="{runtime.tools.esptool_py.path}" tools.esptool_py.cmd="esptool.exe" tools.esptool_py.cmd.linux="esptool.py" tools.esptool_py.cmd.windows="esptool.exe" tools.esptool_py.network_cmd="&quot;{runtime.platform.path}/tools/espota.exe&quot;" tools.esptool_py.network_cmd.windows="&quot;{runtime.platform.path}/tools/espota.exe&quot;" tools.gen_esp32part.cmd="&quot;{runtime.platform.path}/tools/gen_esp32part.exe&quot;" tools.gen_esp32part.cmd.windows="&quot;{runtime.platform.path}/tools/gen_esp32part.exe&quot;" compiler.warning_flags="-w" compiler.warning_flags.none="-w" compiler.warning_flags.default="" compiler.warning_flags.more="-Wall -Werror=all" compiler.warning_flags.all="-Wall -Werror=all -Wextra" compiler.path="{runtime.tools.xtensa-esp32-elf-gcc.path}/bin/" compiler.sdk.path="{runtime.platform.path}/tools/sdk" compiler.cpreprocessor.flags="-DESP_PLATFORM -DMBEDTLS_CONFIG_FILE=&quot;mbedtls/esp_config.h&quot; -DHAVE_CONFIG_H &quot;-I{compiler.sdk.path}/include/config&quot; &quot;-I{compiler.sdk.path}/include/app_trace&quot; &quot;-I{compiler.sdk.path}/include/app_update&quot; &quot;-I{compiler.sdk.path}/include/asio&quot; &quot;-I{compiler.sdk.path}/include/bootloader_support&quot; &quot;-I{compiler.sdk.path}/include/bt&quot; &quot;-I{compiler.sdk.path}/include/coap&quot; &quot;-I{compiler.sdk.path}/include/console&quot; &quot;-I{compiler.sdk.path}/include/driver&quot; &quot;-I{compiler.sdk.path}/include/esp-tls&quot; &quot;-I{compiler.sdk.path}/include/esp32&quot; &quot;-I{compiler.sdk.path}/include/esp_adc_cal&quot; &quot;-I{compiler.sdk.path}/include/esp_event&quot; &quot;-I{compiler.sdk.path}/include/esp_http_client&quot; &quot;-I{compiler.sdk.path}/include/esp_http_server&quot; &quot;-I{compiler.sdk.path}/include/esp_https_ota&quot; &quot;-I{compiler.sdk.path}/include/esp_ringbuf&quot; &quot;-I{compiler.sdk.path}/include/ethernet&quot; &quot;-I{compiler.sdk.path}/include/expat&quot; &quot;-I{compiler.sdk.path}/include/fatfs&quot; &quot;-I{compiler.sdk.path}/include/freemodbus&quot; &quot;-I{compiler.sdk.path}/include/freertos&quot; &quot;-I{compiler.sdk.path}/include/heap&quot; &quot;-I{compiler.sdk.path}/include/idf_test&quot; &quot;-I{compiler.sdk.path}/include/jsmn&quot; &quot;-I{compiler.sdk.path}/include/json&quot; &quot;-I{compiler.sdk.path}/include/libsodium&quot; &quot;-I{compiler.sdk.path}/include/log&quot; &quot;-I{compiler.sdk.path}/include/lwip&quot; &quot;-I{compiler.sdk.path}/include/mbedtls&quot; &quot;-I{compiler.sdk.path}/include/mdns&quot; &quot;-I{compiler.sdk.path}/include/micro-ecc&quot; &quot;-I{compiler.sdk.path}/include/mqtt&quot; &quot;-I{compiler.sdk.path}/include/newlib&quot; &quot;-I{compiler.sdk.path}/include/nghttp&quot; &quot;-I{compiler.sdk.path}/include/nvs_flash&quot; &quot;-I{compiler.sdk.path}/include/openssl&quot; &quot;-I{compiler.sdk.path}/include/protobuf-c&quot; &quot;-I{compiler.sdk.path}/include/protocomm&quot; &quot;-I{compiler.sdk.path}/include/pthread&quot; &quot;-I{compiler.sdk.path}/include/sdmmc&quot; &quot;-I{compiler.sdk.path}/include/smartconfig_ack&quot; &quot;-I{compiler.sdk.path}/include/soc&quot; &quot;-I{compiler.sdk.path}/include/spi_flash&quot; &quot;-I{compiler.sdk.path}/include/spiffs&quot; &quot;-I{compiler.sdk.path}/include/tcp_transport&quot; &quot;-I{compiler.sdk.path}/include/tcpip_adapter&quot; &quot;-I{compiler.sdk.path}/include/ulp&quot; &quot;-I{compiler.sdk.path}/include/vfs&quot; &quot;-I{compiler.sdk.path}/include/wear_levelling&quot; &quot;-I{compiler.sdk.path}/include/wifi_provisioning&quot; &quot;-I{compiler.sdk.path}/include/wpa_supplicant&quot; &quot;-I{compiler.sdk.path}/include/xtensa-debug-module&quot; &quot;-I{compiler.sdk.path}/include/esp32-camera&quot; &quot;-I{compiler.sdk.path}/include/esp-face&quot; &quot;-I{compiler.sdk.path}/include/fb_gfx&quot;" compiler.c.cmd="xtensa-esp32-elf-gcc" compiler.c.flags="-std=gnu99 -Os -g3 -fstack-protector -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -mlongcalls -nostdlib -Wpointer-arith {compiler.warning_flags} -Wno-error=unused-function -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-sign-compare -Wno-old-style-declaration -MMD -c" compiler.cpp.cmd="xtensa-esp32-elf-g++" compiler.cpp.flags="-std=gnu++11 -fno-exceptions -Os -g3 -Wpointer-arith -fexceptions -fstack-protector -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -mlongcalls -nostdlib {compiler.warning_flags} -Wno-error=unused-function -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-sign-compare -fno-rtti -MMD -c" compiler.S.cmd="xtensa-esp32-elf-gcc" compiler.S.flags="-c -g3 -x assembler-with-cpp -MMD -mlongcalls" compiler.c.elf.cmd="xtensa-esp32-elf-gcc" compiler.c.elf.flags="-nostdlib &quot;-L{compiler.sdk.path}/lib&quot; &quot;-L{compiler.sdk.path}/ld&quot; -T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld -T esp32.rom.spiram_incompatible_fns.ld -u ld_include_panic_highint_hdl -u call_user_start_cpu0 -Wl,--gc-sections -Wl,-static -Wl,--undefined=uxTopUsedPriority  -u __cxa_guard_dummy -u __cxx_fatal_exception" compiler.c.elf.libs="-lgcc -lopenssl -lbtdm_app -lfatfs -lwps -lcoexist -lwear_levelling -lesp_http_client -lprotobuf-c -lhal -lnewlib -ldriver -lbootloader_support -lpp -lfreemodbus -lmesh -lsmartconfig -ljsmn -lwpa -lethernet -lphy -lfrmn -lapp_trace -lfr_coefficients -lconsole -lulp -lwpa_supplicant -lfreertos -lbt -lmicro-ecc -lesp32-camera -lcxx -lxtensa-debug-module -ltcp_transport -lmdns -lvfs -lmtmn -lesp_ringbuf -lsoc -lcore -lfb_gfx -lsdmmc -llibsodium -lcoap -ltcpip_adapter -lprotocomm -lesp_event -limage_util -lc_nano -lesp-tls -lasio -lrtc -lspi_flash -lwpa2 -lwifi_provisioning -lesp32 -lface_recognition -lapp_update -lnghttp -lspiffs -lface_detection -lespnow -lnvs_flash -lesp_adc_cal -llog -ldl_lib -lsmartconfig_ack -lexpat -lfd_coefficients -lm -lmqtt -lc -lheap -lmbedtls -llwip -lnet80211 -lesp_http_server -lpthread -ljson -lesp_https_ota  -lstdc++" compiler.as.cmd="xtensa-esp32-elf-as" compiler.ar.cmd="xtensa-esp32-elf-ar" compiler.ar.flags="cru" compiler.size.cmd="xtensa-esp32-elf-size" build.code_debug="0" build.extra_flags="-DESP32 -DCORE_DEBUG_LEVEL={build.code_debug} {build.defines}" compiler.c.extra_flags="" compiler.c.elf.extra_flags="" compiler.S.extra_flags="" compiler.cpp.extra_flags="" compiler.ar.extra_flags="" compiler.objcopy.eep.extra_flags="" compiler.elf2hex.extra_flags="" recipe.c.o.pattern="&quot;{compiler.path}{compiler.c.cmd}&quot; {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD=&quot;{build.board}&quot; -DARDUINO_VARIANT=&quot;{build.variant}&quot; {compiler.c.extra_flags} {build.extra_flags} {includes} &quot;{source_file}&quot; -o &quot;{object_file}&quot;" recipe.cpp.o.pattern="&quot;{compiler.path}{compiler.cpp.cmd}&quot; {compiler.cpreprocessor.flags} {compiler.cpp.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD=&quot;{build.board}&quot; -DARDUINO_VARIANT=&quot;{build.variant}&quot; {compiler.cpp.extra_flags} {build.extra_flags} {includes} &quot;{source_file}&quot; -o &quot;{object_file}&quot;" recipe.S.o.pattern="&quot;{compiler.path}{compiler.c.cmd}&quot; {compiler.cpreprocessor.flags} {compiler.S.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD=&quot;{build.board}&quot; -DARDUINO_VARIANT=&quot;{build.variant}&quot; {compiler.S.extra_flags} {build.extra_flags} {includes} &quot;{source_file}&quot; -o &quot;{object_file}&quot;" recipe.ar.pattern="&quot;{compiler.path}{compiler.ar.cmd}&quot; {compiler.ar.flags} {compiler.ar.extra_flags} &quot;{archive_file_path}&quot; &quot;{object_file}&quot;" recipe.c.combine.pattern="&quot;{compiler.path}{compiler.c.elf.cmd}&quot; {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -Wl,--start-group {object_files} &quot;{archive_file_path}&quot; {compiler.c.elf.libs} -Wl,--end-group -Wl,-EL -o &quot;{build.path}/{build.project_name}.elf&quot;" recipe.objcopy.eep.pattern="{tools.gen_esp32part.cmd} -q &quot;{runtime.platform.path}/tools/partitions/{build.partitions}.csv&quot; &quot;{build.path}/{build.project_name}.partitions.bin&quot;" recipe.objcopy.hex.pattern="&quot;{tools.esptool_py.path}/{tools.esptool_py.cmd}&quot; --chip esp32 elf2image --flash_mode &quot;{build.flash_mode}&quot; --flash_freq &quot;{build.flash_freq}&quot; --flash_size &quot;{build.flash_size}&quot; -o &quot;{build.path}/{build.project_name}.bin&quot; &quot;{build.path}/{build.project_name}.elf&quot;" recipe.objcopy.hex.pattern.linux="python &quot;{tools.esptool_py.path}/{tools.esptool_py.cmd}&quot; --chip esp32 elf2image --flash_mode &quot;{build.flash_mode}&quot; --flash_freq &quot;{build.flash_freq}&quot; --flash_size &quot;{build.flash_size}&quot; -o &quot;{build.path}/{build.project_name}.bin&quot; &quot;{build.path}/{build.project_name}.elf&quot;" recipe.output.tmp_file="{build.project_name}.bin" recipe.output.save_file="{build.project_name}.{build.variant}.bin" recipe.size.pattern="&quot;{compiler.path}{compiler.size.cmd}&quot; -A &quot;{build.path}/{build.project_name}.elf&quot;" recipe.size.regex="^(?:\.iram0\.text|\.iram0\.vectors|\.dram0\.data|\.flash\.text|\.flash\.rodata|)\s+([0-9]+).*" recipe.size.regex.data="^(?:\.dram0\.data|\.dram0\.bss|\.noinit)\s+([0-9]+).*" tools.esptool_py.upload.protocol="esp32" tools.esptool_py.upload.params.verbose="" tools.esptool_py.upload.params.quiet="" tools.esptool_py.upload.pattern="&quot;{path}/{cmd}&quot; --chip esp32 --port &quot;{serial.port}&quot; --baud {upload.speed}  --before default_reset --after hard_reset write_flash -z --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size detect 0xe000 &quot;{runtime.platform.path}/tools/partitions/boot_app0.bin&quot; 0x1000 &quot;{runtime.platform.path}/tools/sdk/bin/bootloader_{build.boot}_{build.flash_freq}.bin&quot; 0x10000 &quot;{build.path}/{build.project_name}.bin&quot; 0x8000 &quot;{build.path}/{build.project_name}.partitions.bin&quot;" tools.esptool_py.upload.pattern.linux="python &quot;{path}/{cmd}&quot; --chip esp32 --port &quot;{serial.port}&quot; --baud {upload.speed}  --before default_reset --after hard_reset write_flash -z --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size detect 0xe000 &quot;{runtime.platform.path}/tools/partitions/boot_app0.bin&quot; 0x1000 &quot;{runtime.platform.path}/tools/sdk/bin/bootloader_{build.boot}_{build.flash_freq}.bin&quot; 0x10000 &quot;{build.path}/{build.project_name}.bin&quot; 0x8000 &quot;{build.path}/{build.project_name}.partitions.bin&quot;" tools.esptool_py.upload.network_pattern="{network_cmd} -i &quot;{serial.port}&quot; -p &quot;{network.port}&quot; &quot;--auth={network.password}&quot; -f &quot;{build.path}/{build.project_name}.bin&quot;" vm.platform.root.path="c:\program files (x86)\microsoft visual studio\2019\professional\common7\ide\extensions\fgermkql.t3l\Micro Platforms\arduino16x" runtime.tools.xtensa-esp32-elf-gcc.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-80-g6c4433a-5.2.0" runtime.tools.xtensa-esp32-elf-gcc-1.22.0-80-g6c4433a-5.2.0.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-80-g6c4433a-5.2.0" runtime.tools.esptool_py.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\esptool_py\2.6.1" runtime.tools.esptool_py-2.6.1.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\esptool_py\2.6.1" runtime.tools.mkspiffs.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\mkspiffs\0.2.3" runtime.tools.mkspiffs-0.2.3.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\mkspiffs\0.2.3" runtime.tools.arduinoOTA.path="C:\Program Files (x86)\Arduino\hardware\tools\avr" runtime.tools.arduinoOTA-1.2.1.path="C:\Program Files (x86)\Arduino\hardware\tools\avr" runtime.tools.avrdude.path="C:\Program Files (x86)\Arduino\hardware\tools\avr" runtime.tools.avrdude-6.3.0-arduino14.path="C:\Program Files (x86)\Arduino\hardware\tools\avr" runtime.tools.avr-gcc.path="C:\Program Files (x86)\Arduino\hardware\tools\avr" runtime.tools.avr-gcc-5.4.0-atmel3.6.1-arduino2.path="C:\Program Files (x86)\Arduino\hardware\tools\avr" runtime.tools.esptool.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp8266\tools\esptool\0.4.13" runtime.tools.esptool-0.4.13.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp8266\tools\esptool\0.4.13" runtime.tools.mkspiffs-0.2.0.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp8266\tools\mkspiffs\0.2.0" runtime.tools.tools-avr.path="C:\Program Files (x86)\Arduino\hardware\tools\avr" runtime.tools.xtensa-lx106-elf-gcc.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp8266\tools\xtensa-lx106-elf-gcc\1.20.0-26-gb404fb9-2" runtime.tools.xtensa-lx106-elf-gcc-1.20.0-26-gb404fb9-2.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp8266\tools\xtensa-lx106-elf-gcc\1.20.0-26-gb404fb9-2" runtime.vm.boardinfo.id="esp32_esp32" runtime.vm.boardinfo.name="esp32_esp32" runtime.vm.boardinfo.desc="ESP32 Dev Module" runtime.vm.boardinfo.src_location="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2" ide.hint="Use installed IDE. Provides built-in hardware, reference/help and libraries." ide.location.key="Arduino16x" ide.location.ide.winreg="Arduino 1.6.x Application" ide.location.sketchbook.winreg="Arduino 1.6.x Sketchbook" ide.location.sketchbook.preferences="sketchbook.path" ide.default.revision_name="1.9.0" ide.default.version="10800" ide.default.package="arduino" ide.default.platform="avr" ide.multiplatform="true" ide.includes="Arduino.h" ide.exe_name="arduino" ide.recipe.preproc.defines.flags="-w -x c++ -E -dM" ide.platformswithoutpackage="false" ide.includes.fallback="wprogram.h" ide.extension="ino" ide.extension.fallback="pde" ide.versionGTEQ="160" ide.exe="arduino.exe" ide.builder.exe="arduinobuilder.exe" ide.builder.name="Arduino Builder" ide.hosts="atmel" ide.url="http://arduino.cc/en/Main/Software" ide.help.reference.path="reference" ide.help.reference.path2="reference\www.arduino.cc\en\Reference" ide.help.reference.serial="reference\www.arduino.cc\en\Serial" ide.location.preferences.portable="{runtime.ide.path}\portable" ide.location.preferences.arduinoData="{runtime.sketchbook.path}\ArduinoData" ide.location.preferences="%VM_APPDATA_LOCAL%\arduino15\preferences.txt" ide.location.preferences_fallback="%VM_APPDATA_ROAMING%\arduino15\preferences.txt" ide.location.contributions="%VM_APPDATA_LOCAL%\arduino15" ide.location.contributions_fallback="%VM_APPDATA_ROAMING%\arduino15" ide.contributions.boards.allow="true" ide.contributions.boards.ignore_unless_rewrite_found="true" ide.contributions.libraries.allow="true" ide.contributions.boards.support.urls.wiki="https://github.com/arduino/Arduino/wiki/Unofficial-list-of-3rd-party-boards-support-urls" ide.create_platforms_from_boardsTXT.teensy="build.core" vm.debug="true" software="ARDUINO" ssh.user.name="root" ssh.user.default.password="arduino" ssh.host.wwwfiles.path="/www/sd" build.working_directory="{runtime.ide.path}\java\bin" ide.debug_menu.debugger_type="Debug" ide.debug_menu.debugger_type.none="Off" ide.debug_menu.none.debug.tool="no_debug" ide.debug_menu.debugger_type.universal="Serial" ide.debug_menu.universal.debug.tool="auto" ide.debug_menu.debugger_type.hwdebugger="Hardware" ide.debug_menu.hwdebugger="Debugger" ide.debug_menu.hwdebugger.custom_debugger="Manual/Custom" ide.debug_menu.hwdebugger.custom_debugger.debug.tool="dbg_external" ide.meta_custom_debugger.sentence="Provides a build that includes debug defines and will launch a custom debugger if one is provided." ide.meta_custom_debugger.paragraph="This is option is for advanced use. It is recommended that a pre-configured debugger be selected when available in this list. Usage: Optionally add a customer debugger to the project. A 'debugger_launch.json' file shares the same command syntax that is used by the VsCode debugger. Custom debuggers can be targeted at a board and/or variant and/or configuration name. IE: [variant].[configuration_name][.]debugger_launch.json" ide.meta_custom_debugger.reference.usage.url="https://github.com/Microsoft/vscode-cpptools/blob/master/launch.md#customlaunchsetupcommands" ide.meta_custom_debugger.reference.connect.url="https://docs.microsoft.com/en-us/visualstudio/debugger/create-custom-views-of-native-objects?view=vs-2019" ide.compiler_flags_no_opt="-O0" ide.debug_menu.vm_disable_optimization="Disable Optimization" ide.debug_menu.vm_disable_optimization.vm_disable_opt_default="Default Optimization" ide.debug_menu.vm_disable_optimization.vm_disable_opt_proj="No Project  Optimization" ide.debug_menu.vm_disable_opt_proj.vm_disable_opt_project="{ide.compiler_flags_no_opt}" ide.debug_menu.vm_disable_optimization.vm_disable_opt_proj_libs="No Project + Libraries Optimization" ide.debug_menu.vm_disable_opt_proj_libs.vm_disable_opt_project="{ide.compiler_flags_no_opt}" ide.debug_menu.vm_disable_opt_proj_libs.vm_disable_opt_libraries="{ide.compiler_flags_no_opt}" ide.debug_menu.vm_disable_optimization.vm_disable_opt_all="No Optimization" ide.meta_vm_disable_opt_all.sentence="Disable compiler optimization for all sources:- Project, Library and Platform." ide.meta_vm_disable_opt_all.comment="After switching between 'No Optimization' and other optimization values, please click &quot;Solution Clean&quot; or switch off (or cycle) 'vMicro&gt;Compiler&gt;Shared Cache For Cores'. NOTE: Changing optimization settings can cause build errors or result in overly large programs." ide.debug_menu.vm_disable_opt_all.vm_disable_opt_project="{ide.compiler_flags_no_opt}" ide.debug_menu.vm_disable_opt_all.vm_disable_opt_libraries="{ide.compiler_flags_no_opt}" ide.debug_menu.vm_disable_opt_all.vm_disable_opt_core="{ide.compiler_flags_no_opt}" ide.appid="arduino16x" location.sketchbook="D:\User\Thomas\Documents\Arduino" build.core.vmresolved="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\cores\esp32" build.core.parentfolder.vmresolved="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\cores" build.core.coresparentfolder.vmresolved="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2" build.core.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\cores\esp32" vm.core.include="arduino.h" vm.boardsource.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2" runtime.platform.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2" vm.platformname.name="esp32" build.arch="ESP32" vm.runtime.compiler.cached_cores_path="C:\Users\thoma\AppData\Local\Temp\VMBCore\arduino16x" vm.runtime.compiler.showwarnings="false" vm.runtime.compiler.showwarnings_core="false" vm.runtime.compiler.showwarnings_library="false" vm.runtime.upload.verbose="false" vm.runtime.upload.verify="false" runtime.vm.ide.platforms.path="c:\program files (x86)\microsoft visual studio\2019\professional\common7\ide\extensions\fgermkql.t3l\Micro Platforms" runtime.vm.ide.tools.openocd.path="{runtime.tools.openocd-0.9.0.path}" runtime.vm.openocd.path="{runtime.tools.openocd-0.9.0.path}" vm.runtime.build.intermediate_output_path="D:\WLED New\WLED\wled00\Release\" vm.runtime.build.final_output_path="D:\WLED New\WLED\Release\" compiler.always_include_sketchfolder="true" vm.runtime.compiler.auto_discover_includes="true" vm.runtime.compiler.allow_library_debugging="false" serial.port.file="COM8" serial.port="COM8" serial.port.num="8" extra.time.local="1574448974" extra.time.utc="1574445374" extra.time.dst="3600" extra.time.zone="-3600" build.project_name="wled00.ino" build.project_path="D:\WLED New\WLED\wled00" sketch_path="D:\WLED New\WLED\wled00" ProjectDir="D:\WLED New\WLED\wled00\" build.path="C:\Users\thoma\AppData\Local\Temp\VMBuilds\wled00\esp32_esp32\Release" upload.speed="921600" vm.runtime.compile.skip_library_file_if_exists_in_project="false" vm.runtime.compiler.auto_discover_includes_cache="true" build.vm.build.vmdebug="0" build.vm.build.isgdb="0" build.vm.build.optimised="1" vm.last.buildpath="C:\Users\thoma\AppData\Local\Temp\VMBuilds\wled00\esp32_esp32\Release" build.architecture="1.22.0-80-g6c4433a-5.2.0" vmresolved.compiler.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-80-g6c4433a-5.2.0\bin\" vmresolved.tools.path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-80-g6c4433a-5.2.0" build.variant.vmresolved.name="esp32" build.variant.vmresolved.full_path="C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\variants\esp32" />
-    </Platform>
-    <Debug DebugEnabled="0" EnableBreak="1" />
-  </Program>
-</VisualMicro>
\ No newline at end of file
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 070121f2b..cfc3b5bf9 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -63,7 +63,7 @@ class Bus {
     return _start;
   }
 
-  void setStart(uint16_t start) {
+  inline void setStart(uint16_t start) {
     _start = start;
   }
 
@@ -81,7 +81,7 @@ class Bus {
     return false;
   }
 
-  virtual uint8_t skipFirstLed() {
+  virtual uint8_t skippedLeds() {
     return 0;
   }
 
@@ -184,10 +184,10 @@ class BusDigital : public Bus {
   }
 
   inline bool isRgbw() {
-    return _rgbw;
+    return (_rgbw || _type == TYPE_SK6812_RGBW || _type == TYPE_TM1814);
   }
 
-  inline uint8_t skipFirstLed() {
+  inline uint8_t skippedLeds() {
     return _skip;
   }
 
@@ -451,6 +451,11 @@ class BusManager {
     return Bus::isRgbw(type);
   }
 
+  //Return true if the strip requires a refresh to stay off.
+  static bool isOffRefreshRequred(uint8_t type) {
+    return type == TYPE_TM1814;
+  }
+
   private:
   uint8_t numBusses = 0;
   Bus* busses[WLED_MAX_BUSSES];
diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index 6af7a86e4..39a9b177b 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -12,24 +12,7 @@ void getStringFromJson(char* dest, const char* src, size_t len) {
   if (src != nullptr) strlcpy(dest, src, len);
 }
 
-void deserializeConfig() {
-  bool fromeep = false;
-  bool success = deserializeConfigSec();
-  if (!success) { //if file does not exist, try reading from EEPROM
-    deEEPSettings();
-    fromeep = true;
-  }
-
-  DynamicJsonDocument doc(JSON_BUFFER_SIZE);
-
-  DEBUG_PRINTLN(F("Reading settings from /cfg.json..."));
-
-  success = readObjectFromFile("/cfg.json", nullptr, &doc);
-  if (!success) { //if file does not exist, try reading from EEPROM
-    if (!fromeep) deEEPSettings();
-    return;
-  }
-
+bool deserializeConfig(JsonObject doc, bool fromFS) {
   //int rev_major = doc["rev"][0]; // 1
   //int rev_minor = doc["rev"][1]; // 0
 
@@ -103,52 +86,61 @@ void deserializeConfig() {
   CJSON(strip.rgbwMode, hw_led[F("rgbwm")]);
 
   JsonArray ins = hw_led["ins"];
-  uint8_t s = 0;  // bus iterator
-  strip.isRgbw = false;
-  busses.removeAll();
-  uint32_t mem = 0;
-  for (JsonObject elm : ins) {
-    if (s >= WLED_MAX_BUSSES) break;
-    uint8_t pins[5] = {255, 255, 255, 255, 255};
-    JsonArray pinArr = elm["pin"];
-    if (pinArr.size() == 0) continue;
-    uint8_t i = 0;
-    for (int p : pinArr) {
-      pins[i++] = p;
-      if (i>4) break;
-    }
 
-    uint16_t length = elm[F("len")];
-    if (length==0 || length+lC > MAX_LEDS) continue;  // zero length or we reached max. number of LEDs, just stop
-    uint16_t start = elm[F("start")] | 0;
-    if (start >= lC+length) continue; // something is very wrong :)
-    uint8_t colorOrder = elm[F("order")];
-    uint8_t skipFirst = elm[F("skip")];
-    uint8_t ledType = elm["type"] | TYPE_WS2812_RGB;
-    bool reversed = elm["rev"];
-    //RGBW mode is enabled if at least one of the strips is RGBW
-//    if ((bool)elm[F("rgbw")]) SET_BIT(ledType,7); else UNSET_BIT(ledType,7);  // hack bit 7 to indicate RGBW (as an override if necessary)
-//    strip.isRgbw |= (bool)elm[F("rgbw")];
-    strip.isRgbw = (strip.isRgbw || Bus::isRgbw(ledType));
-    s++;
-    lC += length;
-    BusConfig bc = BusConfig(ledType, pins, start, length, colorOrder, reversed, skipFirst);
-    mem += BusManager::memUsage(bc);
-    DEBUG_PRINT(F("  Adding bus no. "));
-    DEBUG_PRINTLN(busses.getNumBusses());
-    if (mem <= MAX_LED_MEMORY && busses.getNumBusses() <= WLED_MAX_BUSSES) busses.add(bc);  // finalization will be done in WLED::beginStrip()
+  if (fromFS || !ins.isNull()) {
+    uint8_t s = 0;  // bus iterator
+    strip.isRgbw = false;
+    busses.removeAll();
+    uint32_t mem = 0;
+    for (JsonObject elm : ins) {
+      if (s >= WLED_MAX_BUSSES) break;
+      uint8_t pins[5] = {255, 255, 255, 255, 255};
+      JsonArray pinArr = elm["pin"];
+      if (pinArr.size() == 0) continue;
+      pins[0] = pinArr[0];
+      uint8_t i = 0;
+      for (int p : pinArr) {
+        pins[i++] = p;
+        if (i>4) break;
+      }
+
+      uint16_t length = elm[F("len")];
+      if (length==0 || length+lC > MAX_LEDS) continue;  // zero length or we reached max. number of LEDs, just stop
+      uint16_t start = elm[F("start")] | 0;
+      if (start >= lC+length) continue; // something is very wrong :)
+      uint8_t colorOrder = elm[F("order")];
+      uint8_t skipFirst = elm[F("skip")];
+      uint8_t ledType = elm["type"] | TYPE_WS2812_RGB;
+      bool reversed = elm["rev"];
+      //RGBW mode is enabled if at least one of the strips is RGBW
+  //    if ((bool)elm[F("rgbw")]) SET_BIT(ledType,7); else UNSET_BIT(ledType,7);  // hack bit 7 to indicate RGBW (as an override if necessary)
+  //    strip.isRgbw |= (bool)elm[F("rgbw")];
+      strip.isRgbw = (strip.isRgbw || BusManager::isRgbw(ledType));
+      //refresh is required to remain off if at least one of the strips requires the refresh.
+      strip.isOffRefreshRequred |= BusManager::isOffRefreshRequred(ledType);
+      s++;
+      lC += length;
+      BusConfig bc = BusConfig(ledType, pins, start, length, colorOrder, reversed, skipFirst);
+      mem += BusManager::memUsage(bc);
+      DEBUG_PRINT(F("  Adding bus no. "));
+      DEBUG_PRINTLN(busses.getNumBusses());
+      if (mem <= MAX_LED_MEMORY && busses.getNumBusses() <= WLED_MAX_BUSSES) busses.add(bc);  // finalization will be done in WLED::beginStrip()
+    }
+    //strip.finalizeInit();
   }
   if (lC > ledCount) ledCount = lC; // fix incorrect total length (honour analog setup)
   DEBUG_PRINTLN(F("  Done LEDs."));
 
   JsonObject hw_btn_ins_0 = hw[F("btn")][F("ins")][0];
   CJSON(buttonType, hw_btn_ins_0["type"]);
-  int hw_btn_pin = hw_btn_ins_0["pin"][0];
-  if (pinManager.allocatePin(hw_btn_pin,false)) {
-    btnPin = hw_btn_pin;
-    pinMode(btnPin, INPUT_PULLUP);
-  } else {
-    btnPin = -1;
+  int hw_btn_pin = hw_btn_ins_0[F("pin")][0] | -2; //-2 = not present in doc, keep current. -1 = disable
+  if (hw_btn_pin > -2) {
+    if (pinManager.allocatePin(hw_btn_pin,false)) {
+      btnPin = hw_btn_pin;
+      pinMode(btnPin, INPUT_PULLUP);
+    } else {
+      btnPin = -1;
+    }
   }
 
   JsonArray hw_btn_ins_0_macros = hw_btn_ins_0[F("macros")];
@@ -156,25 +148,27 @@ void deserializeConfig() {
   CJSON(macroLongPress,hw_btn_ins_0_macros[1]);
   CJSON(macroDoublePress, hw_btn_ins_0_macros[2]);
 
-  //int hw_btn_ins_0_type = hw_btn_ins_0["type"]; // 0
-
   #ifndef WLED_DISABLE_INFRARED
-  int hw_ir_pin = hw["ir"]["pin"] | -1; // 4
-  if (pinManager.allocatePin(hw_ir_pin,false)) {
-    irPin = hw_ir_pin;
-  } else {
-    irPin = -1;
+  int hw_ir_pin = hw["ir"]["pin"] | -2; // 4
+  if (hw_ir_pin > -2) {
+    if (pinManager.allocatePin(hw_ir_pin,false)) {
+      irPin = hw_ir_pin;
+    } else {
+      irPin = -1;
+    }
   }
   #endif
   CJSON(irEnabled, hw["ir"]["type"]);
 
   JsonObject relay = hw[F("relay")];
-  int hw_relay_pin = relay["pin"] | -1;
-  if (hw_relay_pin>=0 && pinManager.allocatePin(hw_relay_pin,true)) {
-    rlyPin = hw_relay_pin;
-    pinMode(rlyPin, OUTPUT);
-  } else {
-    rlyPin = -1;
+  int hw_relay_pin = relay["pin"] | -2;
+  if (hw_relay_pin > -2) {
+    if (pinManager.allocatePin(hw_relay_pin,true)) {
+      rlyPin = hw_relay_pin;
+      pinMode(rlyPin, OUTPUT);
+    } else {
+      rlyPin = -1;
+    }
   }
   if (relay.containsKey("rev")) {
     rlyMde = !relay["rev"];
@@ -202,8 +196,9 @@ void deserializeConfig() {
 
   JsonObject light_nl = light["nl"];
   CJSON(nightlightMode, light_nl[F("mode")]);
-  CJSON(nightlightDelayMinsDefault, light_nl["dur"]);
-  nightlightDelayMins = nightlightDelayMinsDefault;
+  byte prev = nightlightDelayMinsDefault;
+  CJSON(nightlightDelayMinsDefault, light_nl[F("dur")]);
+  if (nightlightDelayMinsDefault != prev) nightlightDelayMins = nightlightDelayMinsDefault;
 
   CJSON(nightlightTargetBri, light_nl[F("tbri")]);
   CJSON(macroNl, light_nl[F("macro")]);
@@ -231,12 +226,14 @@ void deserializeConfig() {
   JsonObject if_sync_recv = if_sync["recv"];
   CJSON(receiveNotificationBrightness, if_sync_recv["bri"]);
   CJSON(receiveNotificationColor, if_sync_recv["col"]);
-  CJSON(receiveNotificationEffects, if_sync_recv["fx"]);
+  CJSON(receiveNotificationEffects, if_sync_recv[F("fx")]);
+  //! following line might be a problem if called after boot
   receiveNotifications = (receiveNotificationBrightness || receiveNotificationColor || receiveNotificationEffects);
 
   JsonObject if_sync_send = if_sync["send"];
+  prev = notifyDirectDefault;
   CJSON(notifyDirectDefault, if_sync_send[F("dir")]);
-  notifyDirect = notifyDirectDefault;
+  if (notifyDirectDefault != prev) notifyDirect = notifyDirectDefault;
   CJSON(notifyButton, if_sync_send[F("btn")]);
   CJSON(notifyAlexa, if_sync_send[F("va")]);
   CJSON(notifyHue, if_sync_send[F("hue")]);
@@ -321,9 +318,10 @@ void deserializeConfig() {
   CJSON(latitude, if_ntp[F("lt")]);
 
   JsonObject ol = doc[F("ol")];
+  prev = overlayDefault;
   CJSON(overlayDefault ,ol[F("clock")]); // 0
   CJSON(countdownMode, ol[F("cntdwn")]);
-  overlayCurrent = overlayDefault;
+  if (prev != overlayDefault) overlayCurrent = overlayDefault;
 
   CJSON(overlayMin, ol["min"]);
   CJSON(overlayMax, ol[F("max")]);
@@ -398,7 +396,32 @@ void deserializeConfig() {
 
   DEBUG_PRINTLN(F("Starting usermod config."));
   JsonObject usermods_settings = doc["um"];
-  usermods.readFromConfig(usermods_settings);
+  if (!usermods_settings.isNull()) usermods.readFromConfig(usermods_settings);
+
+  if (fromFS) return false;
+  doReboot = doc[F("rb")] | doReboot;
+  return (doc["sv"] | true);
+}
+
+void deserializeConfigFromFS() {
+  bool fromeep = false;
+  bool success = deserializeConfigSec();
+  if (!success) { //if file does not exist, try reading from EEPROM
+    deEEPSettings();
+    fromeep = true;
+  }
+
+  DynamicJsonDocument doc(JSON_BUFFER_SIZE);
+
+  DEBUG_PRINTLN(F("Reading settings from /cfg.json..."));
+
+  success = readObjectFromFile("/cfg.json", nullptr, &doc);
+  if (!success) { //if file does not exist, try reading from EEPROM
+    if (!fromeep) deEEPSettings();
+    return;
+  }
+
+  deserializeConfig(doc.as<JsonObject>(), true);  
 }
 
 void serializeConfig() {
@@ -480,8 +503,8 @@ void serializeConfig() {
     uint8_t nPins = bus->getPins(pins);
     for (uint8_t i = 0; i < nPins; i++) ins_pin.add(pins[i]);
     ins[F("order")] = bus->getColorOrder();
-    ins["rev"]  = bus->reversed;
-    ins[F("skip")] = bus->skipFirstLed();
+    ins["rev"] = bus->reversed;
+    ins[F("skip")] = bus->skippedLeds();
     ins["type"] = bus->getType();
     ins[F("rgbw")] = bus->isRgbw();
   }
diff --git a/wled00/data/settings.htm b/wled00/data/settings.htm
index b17648375..516a63afa 100644
--- a/wled00/data/settings.htm
+++ b/wled00/data/settings.htm
@@ -10,18 +10,18 @@
 			margin: 0;
 		}
 		html {
-			--h: 10.55vh;
+			--h: 10.2vh;
 		}
 		button {
 			background: #333;
 			color: #fff;
 			font-family: Verdana, Helvetica, sans-serif;
-			border: 0.3ch solid #333;
 			display: inline-block;
+			border: 1px solid #333;
 			font-size: 6vmin;
 			height: var(--h);
 			width: 95%;
-			margin-top: 2.4vh;
+			margin-top: 2vh;
 		}
 	</style>
 	<script>
diff --git a/wled00/data/settings_ui.htm b/wled00/data/settings_ui.htm
index a38e6cd4f..0dcadb155 100644
--- a/wled00/data/settings_ui.htm
+++ b/wled00/data/settings_ui.htm
@@ -181,9 +181,7 @@
 			}
 		}
 
-		function GetV()
-		{
-		}
+		function GetV(){var d=document;}
 	</script>
 	<style>
 		@import url("style.css");
diff --git a/wled00/data/settings_um.htm b/wled00/data/settings_um.htm
index d9b02c90f..58e22e0f1 100644
--- a/wled00/data/settings_um.htm
+++ b/wled00/data/settings_um.htm
@@ -3,14 +3,15 @@
 <head lang="en">
     <meta charset="utf-8">
     <meta name="viewport" content="width=500">
-    <title>UI Settings</title>
+    <title>Usermod Settings</title>
     <script>
     var d = document;
     var umCfg = {};
     var pins = [6,7,8,9,10,11];
-    var pinO = ["reserved","reserved","reserved","reserved","reserved","reserved"], owner;
+    var pinO = ["rsvd","rsvd","rsvd","rsvd","rsvd","rsvd"], owner;
     var loc = false, locip;
     var urows;
+    var numM = 0;
     function gId(s) { return d.getElementById(s); }
     function isO(i) { return (i && typeof i === 'object' && !Array.isArray(i)); }
     function H() { window.open("https://github.com/Aircoookie/WLED/wiki/Settings#usermod-settings"); }
@@ -24,7 +25,9 @@
                 localStorage.setItem('locIp', locip);
             }
         }
-        ldS();
+        GetV();
+        if (numM > 0 || locip) ldS();
+        else gId("um").innerHTML = "No Usermods installed.";
     }
     function check(o,k) {
         var n = o.name.replace("[]","").substr(-3);
@@ -99,11 +102,8 @@
                     urows += `<hr><h3>${k}</h3>`;
                     addField(k,'unknown',o);
                 }
-                if (urows==="")
-                    urows = "No Usermods configuration found.<br>Press <i>Save</i> to initialize defaults if usermods were compiled in.";
-            } else {
-                urows = "Usermods configuration not found.<br>Most likely no Usermods exist.<br>Press <i>Save</i> to try to initialize defaults.";
             }
+            if (urows==="") urows = "Usermods configuration not found.<br>Press <i>Save</i> to initialize defaults.";
             gId("um").innerHTML = urows;
         })
         .catch(function (error) {
diff --git a/wled00/data/update.htm b/wled00/data/update.htm
index f3a0a2211..16dede5cb 100644
--- a/wled00/data/update.htm
+++ b/wled00/data/update.htm
@@ -43,7 +43,7 @@
       Installed version: ##VERSION##<br>
       Download the latest binary: <a href="https://github.com/Aircoookie/WLED/releases" target="_blank">
       <img src="https://img.shields.io/github/release/Aircoookie/WLED.svg?style=flat-square"></a><br>
-      <input type='file' class="bt" name='update' accept=".bin" required><br>
+      <input type='file' class="bt" name='update' required><br> <!--should have accept='.bin', but it prevents file upload from android app-->
       <input type='submit' class="bt" value='Update!' ><br>
       <button type="button" class="bt" onclick="B()">Back</button></form>
     <div id="msg"><b>Updating...</b><br>Please do not close or refresh the page :)</div>
diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index e5ebb710c..d02c0b662 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -26,7 +26,8 @@ void handleButton();
 void handleIO();
 
 //cfg.cpp
-void deserializeConfig();
+bool deserializeConfig(JsonObject doc, bool fromFS = false);
+void deserializeConfigFromFS();
 bool deserializeConfigSec();
 void serializeConfig();
 void serializeConfigSec();
diff --git a/wled00/file.cpp b/wled00/file.cpp
index 073afe448..0d0f59ca5 100644
--- a/wled00/file.cpp
+++ b/wled00/file.cpp
@@ -55,13 +55,12 @@ bool bufferedFind(const char *target, bool fromStart = true) {
   size_t targetLen = strlen(target);
 
   size_t index = 0;
-  uint16_t bufsize = 0, count = 0;
   byte buf[FS_BUFSIZE];
   if (fromStart) f.seek(0);
 
   while (f.position() < f.size() -1) {
-    bufsize = f.read(buf, FS_BUFSIZE);
-    count = 0;
+    uint16_t bufsize = f.read(buf, FS_BUFSIZE);
+    uint16_t count = 0;
     while (count < bufsize) {
       if(buf[count] != target[index])
       index = 0; // reset index if any char does not match
@@ -97,13 +96,12 @@ bool bufferedFindSpace(uint16_t targetLen, bool fromStart = true) {
   if (!f || !f.size()) return false;
 
   uint16_t index = 0;
-  uint16_t bufsize = 0, count = 0;
   byte buf[FS_BUFSIZE];
   if (fromStart) f.seek(0);
 
   while (f.position() < f.size() -1) {
-    bufsize = f.read(buf, FS_BUFSIZE);
-    count = 0;
+    uint16_t bufsize = f.read(buf, FS_BUFSIZE);
+    uint16_t count = 0;
     
     while (count < bufsize) {
       if(buf[count] == ' ') {
@@ -140,13 +138,12 @@ bool bufferedFindObjectEnd() {
   if (!f || !f.size()) return false;
 
   uint16_t objDepth = 0; //num of '{' minus num of '}'. return once 0
-  uint16_t bufsize = 0, count = 0;
   //size_t start = f.position();
   byte buf[FS_BUFSIZE];
 
   while (f.position() < f.size() -1) {
-    bufsize = f.read(buf, FS_BUFSIZE);
-    count = 0;
+    uint16_t bufsize = f.read(buf, FS_BUFSIZE);
+    uint16_t count = 0;
     
     while (count < bufsize) {
       if (buf[count] == '{') objDepth++;
diff --git a/wled00/html_other.h b/wled00/html_other.h
index 0144fad5d..5e14cc355 100644
--- a/wled00/html_other.h
+++ b/wled00/html_other.h
@@ -45,10 +45,10 @@ action="/update" id="uf" enctype="multipart/form-data" onsubmit="U()">
 Installed version: 0.12.2-bl3<br>Download the latest binary: <a 
 href="https://github.com/Aircoookie/WLED/releases" target="_blank"><img 
 src="https://img.shields.io/github/release/Aircoookie/WLED.svg?style=flat-square">
-</a><br><input type="file" class="bt" name="update" accept=".bin" required><br>
-<input type="submit" class="bt" value="Update!"><br><button type="button" 
-class="bt" onclick="B()">Back</button></form><div id="msg"><b>Updating...</b>
-<br>Please do not close or refresh the page :)</div></body></html>)=====";
+</a><br><input type="file" class="bt" name="update" required><br><input 
+type="submit" class="bt" value="Update!"><br><button type="button" class="bt" 
+onclick="B()">Back</button></form><div id="msg"><b>Updating...</b><br>
+Please do not close or refresh the page :)</div></body></html>)=====";
 
 
 // Autogenerated from wled00/data/welcome.htm, do not edit!!
diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index 1cd303c44..160d89e5c 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -12,7 +12,7 @@ const char PAGE_settingsCss[] PROGMEM = R"=====(<style>body{font-family:Verdana,
 // Autogenerated from wled00/data/settings.htm, do not edit!!
 const char PAGE_settings[] PROGMEM = R"=====(<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><title>WLED Settings
 </title><style>
-body{text-align:center;background:#222;height:100px;margin:0}html{--h:10.55vh}button{background:#333;color:#fff;font-family:Verdana,Helvetica,sans-serif;border:.3ch solid #333;display:inline-block;font-size:6vmin;height:var(--h);width:95%%;margin-top:2.4vh}
+body{text-align:center;background:#222;height:100px;margin:0}html{--h:10.2vh}button{background:#333;color:#fff;font-family:Verdana,Helvetica,sans-serif;display:inline-block;border:1px solid #333;font-size:6vmin;height:var(--h);width:95%%;margin-top:2vh}
 </style><script>
 function BB(){window.frameElement&&(document.getElementById("b").style.display="none",document.documentElement.style.setProperty("--h","13.86vh"))}
 </script></head><body onload="BB()"><form action="/"><button type="submit" 
@@ -395,9 +395,9 @@ type="submit">Save & Reboot</button></form></body></html>)=====";
 
 // Autogenerated from wled00/data/settings_um.htm, do not edit!!
 const char PAGE_settings_um[] PROGMEM = R"=====(<!DOCTYPE html><html><head lang="en"><meta charset="utf-8"><meta 
-name="viewport" content="width=500"><title>UI Settings</title><script>
-var owner,locip,urows,d=document,umCfg={},pins=[6,7,8,9,10,11],pinO=["reserved","reserved","reserved","reserved","reserved","reserved"],loc=!1;function gId(e){return d.getElementById(e)}function isO(e){return e&&"object"==typeof e&&!Array.isArray(e)}function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#usermod-settings")}function B(){window.open("/settings","_self")}function S(){"file:"==window.location.protocol&&(loc=!0,(locip=localStorage.getItem("locIp"))||(locip=prompt("File Mode. Please enter WLED IP!"),localStorage.setItem("locIp",locip))),ldS()}function check(e,o){var i=e.name.replace("[]","").substr(-3);if("number"==e.type&&"pin"==i.substr(0,3))for(var n=0;n<pins.length;n++)if(o!=pinO[n]){if(e.value==pins[n]||e.value<-1||e.value>39){e.style.color="red";break}e.style.color=e.value>33?"orange":"#fff"}}function getPins(e){if(isO(e))for(const[i,n]of Object.entries(e))if(isO(n))owner=i,getPins(n);else if("pin"==i.replace("[]","").substr(-3))if(Array.isArray(n))for(var o=0;o<n.length;o++)n[o]>=0&&(pins.push(n[o]),pinO.push(owner));else n>=0&&(pins.push(n),pinO.push(owner));else if(Array.isArray(n))for(o=0;o<n.length;o++)getPins(n[o])}function addField(e,o,i,n=!1){if(isO(i))for(const[o,n]of Object.entries(i))addField(e,o,n);else if(Array.isArray(i))for(var r=0;r<i.length;r++)addField(e,o,i[r],!0);else{var s,t;switch(typeof i){case"boolean":s="checkbox",t=i?'checked value="on"':"";break;case"number":s="number",t=`value="${parseInt(i,10)}"`;break;case"string":default:s="text",t=`value="${i}"`}"checkbox"==s&&(urows+=`<input type="hidden" name="${e}_${o}${n?"[]":""}" value="off">`),urows+=`${o}: <input type="${s}" name="${e}_${o}${n?"[]":""}" ${t} oninput="check(this,'${e}')"><br>`}}function ldS(){fetch((loc?"http://"+locip:"")+"/cfg.json",{method:"get"}).then(e=>(e.ok||(gId("lserr").style.display="inline"),e.json())).then(e=>{if(umCfg=e.um,getPins(e),urows="",isO(umCfg)){for(const[e,o]of Object.entries(umCfg))urows+=`<hr><h3>${e}</h3>`,addField(e,"unknown",o);""===urows&&(urows="No Usermods configuration found.<br>Press <i>Save</i> to initialize defaults if usermods were compiled in.")}else urows="Usermods configuration not found.<br>Most likely no Usermods exist.<br>Press <i>Save</i> to try to initialize defaults.";gId("um").innerHTML=urows}).catch((function(e){gId("lserr").style.display="inline",console.log(e)}))}function svS(e){e.preventDefault(),console.log(d.Sf),d.Sf.checkValidity()&&d.Sf.submit()}function GetV(){}
-</script>%CSS%%SCSS%</head><body onload="S()"><form
+name="viewport" content="width=500"><title>Usermod Settings</title><script>
+var owner,locip,urows,d=document,umCfg={},pins=[6,7,8,9,10,11],pinO=["rsvd","rsvd","rsvd","rsvd","rsvd","rsvd"],loc=!1,numM=0;function gId(e){return d.getElementById(e)}function isO(e){return e&&"object"==typeof e&&!Array.isArray(e)}function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#usermod-settings")}function B(){window.open("/settings","_self")}function S(){"file:"==window.location.protocol&&(loc=!0,(locip=localStorage.getItem("locIp"))||(locip=prompt("File Mode. Please enter WLED IP!"),localStorage.setItem("locIp",locip))),GetV(),numM>0||locip?ldS():gId("um").innerHTML="No Usermods installed."}function check(e,n){var o=e.name.replace("[]","").substr(-3);if("number"==e.type&&"pin"==o.substr(0,3))for(var i=0;i<pins.length;i++)if(n!=pinO[i]){if(e.value==pins[i]||e.value<-1||e.value>39){e.style.color="red";break}e.style.color=e.value>33?"orange":"#fff"}}function getPins(e){if(isO(e))for(const[o,i]of Object.entries(e))if(isO(i))owner=o,getPins(i);else if("pin"==o.replace("[]","").substr(-3))if(Array.isArray(i))for(var n=0;n<i.length;n++)i[n]>=0&&(pins.push(i[n]),pinO.push(owner));else i>=0&&(pins.push(i),pinO.push(owner));else if(Array.isArray(i))for(n=0;n<i.length;n++)getPins(i[n])}function addField(e,n,o,i=!1){if(isO(o))for(const[n,i]of Object.entries(o))addField(e,n,i);else if(Array.isArray(o))for(var t=0;t<o.length;t++)addField(e,n,o[t],!0);else{var r,s;switch(typeof o){case"boolean":r="checkbox",s=o?'checked value="on"':"";break;case"number":r="number",s=`value="${parseInt(o,10)}"`;break;case"string":default:r="text",s=`value="${o}"`}"checkbox"==r&&(urows+=`<input type="hidden" name="${e}_${n}${i?"[]":""}" value="off">`),urows+=`${n}: <input type="${r}" name="${e}_${n}${i?"[]":""}" ${s} oninput="check(this,'${e}')"><br>`}}function ldS(){fetch((loc?"http://"+locip:"")+"/cfg.json",{method:"get"}).then(e=>(e.ok||(gId("lserr").style.display="inline"),e.json())).then(e=>{if(umCfg=e.um,getPins(e),urows="",isO(umCfg))for(const[e,n]of Object.entries(umCfg))urows+=`<hr><h3>${e}</h3>`,addField(e,"unknown",n);""===urows&&(urows="Usermods configuration not found.<br>Press <i>Save</i> to initialize defaults."),gId("um").innerHTML=urows}).catch((function(e){gId("lserr").style.display="inline",console.log(e)}))}function svS(e){e.preventDefault(),console.log(d.Sf),d.Sf.checkValidity()&&d.Sf.submit()}function GetV() {var d=document;
+%CSS%%SCSS%</head><body onload="S()"><form
  id="form_s" name="Sf" method="post" onsubmit="svS(event)"><div class="toprow">
 <div class="helpB"><button type="button" onclick="H()">?</button></div><button 
 type="button" onclick="B()">Back</button><button type="submit">Save</button><br>
diff --git a/wled00/ir.cpp b/wled00/ir.cpp
index 73c1b0450..0f0a77ee5 100644
--- a/wled00/ir.cpp
+++ b/wled00/ir.cpp
@@ -227,7 +227,7 @@ void decodeIR24(uint32_t code)
   switch (code) {
     case IR24_BRIGHTER  : incBrightness();                  break;
     case IR24_DARKER    : decBrightness();                  break;
-    case IR24_OFF       : briLast = bri; bri = 0;           break;
+    case IR24_OFF    : if (bri > 0) briLast = bri; bri = 0; break;
     case IR24_ON        : bri = briLast;                    break;
     case IR24_RED       : colorFromUint32(COLOR_RED);       break;
     case IR24_REDDISH   : colorFromUint32(COLOR_REDDISH);   break;
@@ -259,7 +259,7 @@ void decodeIR24OLD(uint32_t code)
   switch (code) {
     case IR24_OLD_BRIGHTER  : incBrightness();                     break;
     case IR24_OLD_DARKER    : decBrightness();                     break;
-    case IR24_OLD_OFF       : briLast = bri; bri = 0;              break;
+    case IR24_OLD_OFF       : if (bri > 0) briLast = bri; bri = 0; break;
     case IR24_OLD_ON        : bri = briLast;                       break;
     case IR24_OLD_RED       : colorFromUint32(COLOR_RED);          break;
     case IR24_OLD_REDDISH   : colorFromUint32(COLOR_REDDISH);      break;
@@ -292,7 +292,7 @@ void decodeIR24CT(uint32_t code)
   switch (code) {
     case IR24_CT_BRIGHTER   : incBrightness();                     break;
     case IR24_CT_DARKER     : decBrightness();                     break;
-    case IR24_CT_OFF        : briLast = bri; bri = 0;              break;
+    case IR24_CT_OFF        : if (bri > 0) briLast = bri; bri = 0; break;
     case IR24_CT_ON         : bri = briLast;                       break;
     case IR24_CT_RED        : colorFromUint32(COLOR_RED);          break;
     case IR24_CT_REDDISH    : colorFromUint32(COLOR_REDDISH);      break;
@@ -327,7 +327,7 @@ void decodeIR40(uint32_t code)
   switch (code) {
     case IR40_BPLUS        : incBrightness();                                            break;
     case IR40_BMINUS       : decBrightness();                                            break;
-    case IR40_OFF          : briLast = bri; bri = 0;                                     break;
+    case IR40_OFF          : if (bri > 0) briLast = bri; bri = 0;                        break;
     case IR40_ON           : bri = briLast;                                              break;
     case IR40_RED          : colorFromUint24(COLOR_RED);                                 break;
     case IR40_REDDISH      : colorFromUint24(COLOR_REDDISH);                             break;
@@ -384,7 +384,7 @@ void decodeIR44(uint32_t code)
   switch (code) {
     case IR44_BPLUS       : incBrightness();                                            break;
     case IR44_BMINUS      : decBrightness();                                            break;
-    case IR44_OFF         : briLast = bri; bri = 0;                                     break;
+    case IR44_OFF         : if (bri > 0) briLast = bri; bri = 0;                        break;
     case IR44_ON          : bri = briLast;                                              break;
     case IR44_RED         : colorFromUint24(COLOR_RED);                                 break;
     case IR44_REDDISH     : colorFromUint24(COLOR_REDDISH);                             break;
@@ -447,7 +447,7 @@ void decodeIR21(uint32_t code)
     switch (code) {
     case IR21_BRIGHTER:  incBrightness();                  break;
     case IR21_DARKER:    decBrightness();                  break;
-    case IR21_OFF:       briLast = bri; bri = 0;           break;
+    case IR21_OFF:    if (bri > 0) briLast = bri; bri = 0; break;
     case IR21_ON:        bri = briLast;                    break;
     case IR21_RED:       colorFromUint32(COLOR_RED);       break;
     case IR21_REDDISH:   colorFromUint32(COLOR_REDDISH);   break;
diff --git a/wled00/json.cpp b/wled00/json.cpp
index 5707e2304..c6df7ed49 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -166,7 +166,7 @@ void deserializeSegment(JsonObject elem, byte it)
           if (icol.isNull()) break;
 
           byte sz = icol.size();
-          if (sz == 0 && sz > 4) break;
+          if (sz == 0 || sz > 4) break;
 
           int rgbw[] = {0,0,0,0};
           copyArray(icol, rgbw);
@@ -198,6 +198,8 @@ bool deserializeState(JsonObject root)
   bool on = root["on"] | (bri > 0);
   if (!on != !bri) toggleOnOff();
 
+  if (root["on"].is<const char*>() && root["on"].as<const char*>()[0] == 't') toggleOnOff();
+
   int tr = root[F("transition")] | -1;
   if (tr >= 0)
   {
@@ -798,21 +800,24 @@ void serveJson(AsyncWebServerRequest* request, uint8_t versionAPI)
   const String& url = request->url();
   if      (url.indexOf("state") > 0) subJson = 1;
   else if (url.indexOf("info")  > 0) subJson = 2;
-  else if (url.indexOf("si") > 0)    subJson = 3;
+  else if (url.indexOf("si")    > 0) subJson = 3;
   else if (url.indexOf("nodes") > 0) subJson = 4;
-  else if (url.indexOf("palx") > 0)  subJson = 5;
+  else if (url.indexOf("palx")  > 0) subJson = 5;
   else if (url.indexOf("live")  > 0) {
     serveLiveLeds(request);
     return;
   }
-  else if (url.indexOf(F("eff"))   > 0) {
+  else if (url.indexOf(F("eff")) > 0) {
     request->send_P(200, "application/json", JSON_mode_names);
     return;
   }
-  else if (url.indexOf("pal")   > 0) {
+  else if (url.indexOf("pal") > 0) {
     request->send_P(200, "application/json", JSON_palette_names);
     return;
   }
+  else if (url.indexOf("cfg") > 0 && handleFileRead(request, "/cfg.json")) {
+    return;
+  }
   else if (url.length() > 6) { //not just /json
     request->send(  501, "application/json", F("{\"error\":\"Not implemented\"}"));
     return;
diff --git a/wled00/mqtt.cpp b/wled00/mqtt.cpp
index 3dd003c4d..a6104b1c9 100644
--- a/wled00/mqtt.cpp
+++ b/wled00/mqtt.cpp
@@ -52,23 +52,22 @@ void onMqttConnect(bool sessionPresent)
 }
 
 
-void onMqttMessage(char* topic, char* payload0, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total) {
+void onMqttMessage(char* topic, char* payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total) {
 
   DEBUG_PRINT(F("MQTT msg: "));
   DEBUG_PRINTLN(topic);
 
   // paranoia check to avoid npe if no payload
-  if (payload0==nullptr) {
+  if (payload==nullptr) {
     DEBUG_PRINTLN(F("no payload -> leave"));
     return;
   }
-
-  // payload is not always null terminated
-  char *payload = new char[len+1];
-  if (payload==nullptr) return;  // out of memory
-  strncpy(payload,payload0,len);
-  payload[len] = '\0';
-  DEBUG_PRINTLN(payload);
+  //make a copy of the payload to 0-terminate it
+  char* payloadStr = new char[len+1];
+  if (payloadStr == nullptr) return; //no mem
+  strncpy(payloadStr, payload, len);
+  payloadStr[len] = '\0';
+  DEBUG_PRINTLN(payloadStr);
 
   size_t topicPrefixLen = strlen(mqttDeviceTopic);
   if (strncmp(topic, mqttDeviceTopic, topicPrefixLen) == 0) {
@@ -79,8 +78,8 @@ void onMqttMessage(char* topic, char* payload0, AsyncMqttClientMessageProperties
       topic += topicPrefixLen;
     } else {
       // Non-Wled Topic used here. Probably a usermod subscribed to this topic.
-      usermods.onMqttMessage(topic, payload);
-      delete[] payload;
+      usermods.onMqttMessage(topic, payloadStr);
+      delete[] payloadStr;
       return;
     }
   }
@@ -88,26 +87,26 @@ void onMqttMessage(char* topic, char* payload0, AsyncMqttClientMessageProperties
   //Prefix is stripped from the topic at this point
 
   if (strcmp_P(topic, PSTR("/col")) == 0) {
-    colorFromDecOrHexString(col, payload);
+    colorFromDecOrHexString(col, (char*)payloadStr);
     colorUpdated(NOTIFIER_CALL_MODE_DIRECT_CHANGE);
   } else if (strcmp_P(topic, PSTR("/api")) == 0) {
     if (payload[0] == '{') { //JSON API
       DynamicJsonDocument doc(JSON_BUFFER_SIZE);
-      deserializeJson(doc, payload);
+      deserializeJson(doc, payloadStr);
       deserializeState(doc.as<JsonObject>());
     } else { //HTTP API
       String apireq = "win&";
-      apireq += payload;
+      apireq += (char*)payloadStr;
       handleSet(nullptr, apireq);
     }
   } else if (strlen(topic) != 0) {
     // non standard topic, check with usermods
-    usermods.onMqttMessage(topic, payload);
+    usermods.onMqttMessage(topic, payloadStr);
   } else {
     // topmost topic (just wled/MAC)
-    parseMQTTBriPayload(payload);
+    parseMQTTBriPayload(payloadStr);
   }
-  delete[] payload;
+  delete[] payloadStr;
 }
 
 
@@ -132,7 +131,7 @@ void publishMqtt()
 
   strcpy(subuf, mqttDeviceTopic);
   strcat_P(subuf, PSTR("/status"));
-  mqtt->publish(subuf, 0, true, "online"); // do not retain message
+  mqtt->publish(subuf, 0, false, "online"); // do not retain message
 
   char apires[1024];
   XML_response(nullptr, apires);
diff --git a/wled00/ntp.cpp b/wled00/ntp.cpp
index 3a3d8310e..449ad044b 100644
--- a/wled00/ntp.cpp
+++ b/wled00/ntp.cpp
@@ -112,7 +112,7 @@ void updateTimezone() {
       break;
     }
     case TZ_AUSTRALIA_NORTHERN : {
-      tcrStandard = {First, Sun, Apr, 3, 570};   //ACST = UTC + 9.5 hours
+      tcrDaylight = {First, Sun, Apr, 3, 570};   //ACST = UTC + 9.5 hours
       tcrStandard = tcrDaylight;
       break;
     }
diff --git a/wled00/overlay.cpp b/wled00/overlay.cpp
index b427de407..bff2d11f0 100644
--- a/wled00/overlay.cpp
+++ b/wled00/overlay.cpp
@@ -63,10 +63,9 @@ void _overlayAnalogClock()
   }
   if (analogClock5MinuteMarks)
   {
-    int pix;
-    for (int i = 0; i <= 12; i++)
+    for (byte i = 0; i <= 12; i++)
     {
-      pix = analogClock12pixel + round((overlaySize / 12.0) *i);
+      int pix = analogClock12pixel + round((overlaySize / 12.0) *i);
       if (pix > overlayMax) pix -= overlaySize;
       strip.setPixelColor(pix, 0x00FFAA);
     }
diff --git a/wled00/playlist.cpp b/wled00/playlist.cpp
index f466f8497..a1127164f 100644
--- a/wled00/playlist.cpp
+++ b/wled00/playlist.cpp
@@ -19,14 +19,14 @@ uint16_t playlistEntryDur = 0;
 
 
 void shufflePlaylist() {
-  int currentIndex = playlistLen, randomIndex;
+  int currentIndex = playlistLen;
 
   PlaylistEntry temporaryValue, *entries = reinterpret_cast<PlaylistEntry*>(playlistEntries);
 
   // While there remain elements to shuffle...
   while (currentIndex--) {
     // Pick a random element...
-    randomIndex = random(0, currentIndex);
+    int randomIndex = random(0, currentIndex);
     // And swap it with the current element.
     temporaryValue = entries[currentIndex];
     entries[currentIndex] = entries[randomIndex];
diff --git a/wled00/set.cpp b/wled00/set.cpp
index 94559e1b1..5214ce495 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -31,7 +31,7 @@ bool isAsterisksOnly(const char* str, byte maxLen)
 void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
 {
 
-  //0: menu 1: wifi 2: leds 3: ui 4: sync 5: time 6: sec 7: DMX
+  //0: menu 1: wifi 2: leds 3: ui 4: sync 5: time 6: sec 7: DMX 8: usermods
   if (subPage <1 || subPage >8) return;
 
   //WIFI SETTINGS
@@ -84,7 +84,6 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
     if (btnPin>=0 && pinManager.isPinAllocated(btnPin)) pinManager.deallocatePin(btnPin);
 
     strip.isRgbw = false;
-
     uint8_t colorOrder, type, skip;
     uint16_t length, start;
     uint8_t pins[5] = {255, 255, 255, 255, 255};
diff --git a/wled00/src/dependencies/json/ArduinoJson-v6.h b/wled00/src/dependencies/json/ArduinoJson-v6.h
index 3913d7110..0dd590af4 100644
--- a/wled00/src/dependencies/json/ArduinoJson-v6.h
+++ b/wled00/src/dependencies/json/ArduinoJson-v6.h
@@ -1,5 +1,5 @@
-// ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2020
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
 // MIT License
 
 #pragma once
@@ -64,6 +64,13 @@
 #ifndef ARDUINOJSON_DEFAULT_NESTING_LIMIT
 #define ARDUINOJSON_DEFAULT_NESTING_LIMIT 10
 #endif
+#ifndef ARDUINOJSON_SLOT_OFFSET_SIZE
+#if defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ == 2
+#define ARDUINOJSON_SLOT_OFFSET_SIZE 1
+#else
+#define ARDUINOJSON_SLOT_OFFSET_SIZE 2
+#endif
+#endif
 #else  // ARDUINOJSON_EMBEDDED_MODE
 #ifndef ARDUINOJSON_USE_DOUBLE
 #define ARDUINOJSON_USE_DOUBLE 1
@@ -84,6 +91,9 @@
 #ifndef ARDUINOJSON_DEFAULT_NESTING_LIMIT
 #define ARDUINOJSON_DEFAULT_NESTING_LIMIT 50
 #endif
+#ifndef ARDUINOJSON_SLOT_OFFSET_SIZE
+#define ARDUINOJSON_SLOT_OFFSET_SIZE 4
+#endif
 #endif  // ARDUINOJSON_EMBEDDED_MODE
 #ifdef ARDUINO
 #include <Arduino.h>
@@ -108,7 +118,8 @@
 #endif
 #endif  // ARDUINO
 #ifndef ARDUINOJSON_ENABLE_PROGMEM
-#ifdef PROGMEM
+#if defined(PROGMEM) && defined(pgm_read_byte) && defined(pgm_read_dword) && \
+    defined(pgm_read_ptr) && defined(pgm_read_float)
 #define ARDUINOJSON_ENABLE_PROGMEM 1
 #else
 #define ARDUINOJSON_ENABLE_PROGMEM 0
@@ -175,7 +186,6 @@
 #endif
 #endif
 #define ARDUINOJSON_EXPAND6(a, b, c, d, e, f) a, b, c, d, e, f
-#define ARDUINOJSON_EXPAND7(a, b, c, d, e, f, g) a, b, c, d, e, f, g
 #define ARDUINOJSON_EXPAND9(a, b, c, d, e, f, g, h, i) a, b, c, d, e, f, g, h, i
 #define ARDUINOJSON_EXPAND18(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, \
                              q, r)                                           \
@@ -202,9 +212,9 @@
 #define ARDUINOJSON_HEX_DIGIT_1111() F
 #define ARDUINOJSON_HEX_DIGIT_(A, B, C, D) ARDUINOJSON_HEX_DIGIT_##A##B##C##D()
 #define ARDUINOJSON_HEX_DIGIT(A, B, C, D) ARDUINOJSON_HEX_DIGIT_(A, B, C, D)
-#define ARDUINOJSON_VERSION "6.17.0"
+#define ARDUINOJSON_VERSION "6.18.0"
 #define ARDUINOJSON_VERSION_MAJOR 6
-#define ARDUINOJSON_VERSION_MINOR 17
+#define ARDUINOJSON_VERSION_MINOR 18
 #define ARDUINOJSON_VERSION_REVISION 0
 #ifndef ARDUINOJSON_NAMESPACE
 #define ARDUINOJSON_NAMESPACE                                                  \
@@ -337,6 +347,20 @@ struct Max<X, Y, false> {
 }  // namespace ARDUINOJSON_NAMESPACE
 #include <stdint.h>
 namespace ARDUINOJSON_NAMESPACE {
+template <int Bits>
+struct int_t;
+template <>
+struct int_t<8> {
+  typedef int8_t type;
+};
+template <>
+struct int_t<16> {
+  typedef int16_t type;
+};
+template <>
+struct int_t<32> {
+  typedef int32_t type;
+};
 template <bool Condition, class TrueType, class FalseType>
 struct conditional {
   typedef TrueType type;
@@ -554,6 +578,38 @@ template <typename T>
 struct remove_reference<T&> {
   typedef T type;
 };
+}  // namespace ARDUINOJSON_NAMESPACE
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4310)
+#endif
+namespace ARDUINOJSON_NAMESPACE {
+template <typename T, typename Enable = void>
+struct numeric_limits;
+template <typename T>
+struct numeric_limits<T, typename enable_if<is_unsigned<T>::value>::type> {
+  static T lowest() {
+    return 0;
+  }
+  static T highest() {
+    return T(-1);
+  }
+};
+template <typename T>
+struct numeric_limits<
+    T, typename enable_if<is_integral<T>::value && is_signed<T>::value>::type> {
+  static T lowest() {
+    return T(T(1) << (sizeof(T) * 8 - 1));
+  }
+  static T highest() {
+    return T(~lowest());
+  }
+};
+}  // namespace ARDUINOJSON_NAMESPACE
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+namespace ARDUINOJSON_NAMESPACE {
 namespace storage_policies {
 struct store_by_address {};
 struct store_by_copy {};
@@ -584,20 +640,21 @@ typedef unsigned long UInt;
 namespace ARDUINOJSON_NAMESPACE {
 enum {
   VALUE_MASK = 0x7F,
-  VALUE_IS_OWNED = 0x01,
+  OWNED_VALUE_BIT = 0x01,
   VALUE_IS_NULL = 0,
   VALUE_IS_LINKED_RAW = 0x02,
   VALUE_IS_OWNED_RAW = 0x03,
   VALUE_IS_LINKED_STRING = 0x04,
   VALUE_IS_OWNED_STRING = 0x05,
   VALUE_IS_BOOLEAN = 0x06,
-  VALUE_IS_POSITIVE_INTEGER = 0x08,
-  VALUE_IS_NEGATIVE_INTEGER = 0x0A,
+  NUMBER_BIT = 0x08,
+  VALUE_IS_UNSIGNED_INTEGER = 0x08,
+  VALUE_IS_SIGNED_INTEGER = 0x0A,
   VALUE_IS_FLOAT = 0x0C,
   COLLECTION_MASK = 0x60,
   VALUE_IS_OBJECT = 0x20,
   VALUE_IS_ARRAY = 0x40,
-  KEY_IS_OWNED = 0x80
+  OWNED_KEY_BIT = 0x80
 };
 struct RawData {
   const char *data;
@@ -605,7 +662,9 @@ struct RawData {
 };
 union VariantContent {
   Float asFloat;
-  UInt asInteger;
+  bool asBoolean;
+  UInt asUnsignedInteger;
+  Integer asSignedInteger;
   CollectionData asCollection;
   const char *asString;
   struct {
@@ -613,7 +672,7 @@ union VariantContent {
     size_t size;
   } asRaw;
 };
-typedef conditional<sizeof(void*) <= 2, int8_t, int16_t>::type VariantSlotDiff;
+typedef int_t<ARDUINOJSON_SLOT_OFFSET_SIZE * 8>::type VariantSlotDiff;
 class VariantSlot {
   VariantContent _content;
   uint8_t _flags;
@@ -645,15 +704,23 @@ class VariantSlot {
     return const_cast<VariantSlot*>(this)->next(distance);
   }
   void setNext(VariantSlot* slot) {
+    ARDUINOJSON_ASSERT(!slot || slot - this >=
+                                    numeric_limits<VariantSlotDiff>::lowest());
+    ARDUINOJSON_ASSERT(!slot || slot - this <=
+                                    numeric_limits<VariantSlotDiff>::highest());
     _next = VariantSlotDiff(slot ? slot - this : 0);
   }
   void setNextNotNull(VariantSlot* slot) {
     ARDUINOJSON_ASSERT(slot != 0);
+    ARDUINOJSON_ASSERT(slot - this >=
+                       numeric_limits<VariantSlotDiff>::lowest());
+    ARDUINOJSON_ASSERT(slot - this <=
+                       numeric_limits<VariantSlotDiff>::highest());
     _next = VariantSlotDiff(slot - this);
   }
   void setKey(const char* k, storage_policies::store_by_copy) {
     ARDUINOJSON_ASSERT(k != NULL);
-    _flags |= KEY_IS_OWNED;
+    _flags |= OWNED_KEY_BIT;
     _key = k;
   }
   void setKey(const char* k, storage_policies::store_by_address) {
@@ -665,7 +732,7 @@ class VariantSlot {
     return _key;
   }
   bool ownsKey() const {
-    return (_flags & KEY_IS_OWNED) != 0;
+    return (_flags & OWNED_KEY_BIT) != 0;
   }
   void clear() {
     _next = 0;
@@ -673,9 +740,9 @@ class VariantSlot {
     _key = 0;
   }
   void movePointers(ptrdiff_t stringDistance, ptrdiff_t variantDistance) {
-    if (_flags & KEY_IS_OWNED)
+    if (_flags & OWNED_KEY_BIT)
       _key += stringDistance;
-    if (_flags & VALUE_IS_OWNED)
+    if (_flags & OWNED_VALUE_BIT)
       _content.asString += stringDistance;
     if (_flags & COLLECTION_MASK)
       _content.asCollection.movePointers(stringDistance, variantDistance);
@@ -1241,323 +1308,64 @@ inline SerializedValue<TChar*> serialized(TChar* p, size_t n) {
 #endif
 #pragma GCC diagnostic ignored "-Wconversion"
 #endif
-#include <stdlib.h>
-namespace ARDUINOJSON_NAMESPACE {
-#ifndef isnan
-template <typename T>
-bool isnan(T x) {
-  return x != x;
-}
-#endif
-#ifndef isinf
-template <typename T>
-bool isinf(T x) {
-  return x != 0.0 && x * 2 == x;
-}
-#endif
-template <typename T, typename F>
-struct alias_cast_t {
-  union {
-    F raw;
-    T data;
-  };
-};
-template <typename T, typename F>
-T alias_cast(F raw_data) {
-  alias_cast_t<T, F> ac;
-  ac.raw = raw_data;
-  return ac.data;
-}
-}  // namespace ARDUINOJSON_NAMESPACE
-#if ARDUINOJSON_ENABLE_PROGMEM
-namespace ARDUINOJSON_NAMESPACE {
-template <typename T>
-typename enable_if<is_pointer<T>::value, T>::type pgm_read(const void* p) {
-  return reinterpret_cast<T>(pgm_read_ptr(p));
-}
-template <typename T>
-typename enable_if<is_floating_point<T>::value &&
-                       sizeof(T) == sizeof(float),  // on AVR sizeof(double) ==
-                   T>::type
-pgm_read(const void* p) {
-  return pgm_read_float(p);
-}
-template <typename T>
-typename enable_if<is_same<T, uint32_t>::value, T>::type pgm_read(
-    const void* p) {
-  return pgm_read_dword(p);
-}
-}  // namespace ARDUINOJSON_NAMESPACE
-#ifndef ARDUINOJSON_DEFINE_STATIC_ARRAY
-#define ARDUINOJSON_DEFINE_STATIC_ARRAY(type, name, value) \
-  static type const name[] PROGMEM = value;
-#endif
-#ifndef ARDUINOJSON_READ_STATIC_ARRAY
-#define ARDUINOJSON_READ_STATIC_ARRAY(type, name, index) \
-  pgm_read<type>(name + index)
-#endif
-#else  // i.e. ARDUINOJSON_ENABLE_PROGMEM == 0
-#ifndef ARDUINOJSON_DEFINE_STATIC_ARRAY
-#define ARDUINOJSON_DEFINE_STATIC_ARRAY(type, name, value) \
-  static type const name[] = value;
-#endif
-#ifndef ARDUINOJSON_READ_STATIC_ARRAY
-#define ARDUINOJSON_READ_STATIC_ARRAY(type, name, index) name[index]
-#endif
-#endif
-namespace ARDUINOJSON_NAMESPACE {
-template <typename T, size_t = sizeof(T)>
-struct FloatTraits {};
-template <typename T>
-struct FloatTraits<T, 8 /*64bits*/> {
-  typedef uint64_t mantissa_type;
-  static const short mantissa_bits = 52;
-  static const mantissa_type mantissa_max =
-      (mantissa_type(1) << mantissa_bits) - 1;
-  typedef int16_t exponent_type;
-  static const exponent_type exponent_max = 308;
-  template <typename TExponent>
-  static T make_float(T m, TExponent e) {
-    if (e > 0) {
-      for (uint8_t index = 0; e != 0; index++) {
-        if (e & 1)
-          m *= positiveBinaryPowerOfTen(index);
-        e >>= 1;
-      }
-    } else {
-      e = TExponent(-e);
-      for (uint8_t index = 0; e != 0; index++) {
-        if (e & 1)
-          m *= negativeBinaryPowerOfTen(index);
-        e >>= 1;
-      }
-    }
-    return m;
-  }
-  static T positiveBinaryPowerOfTen(int index) {
-    ARDUINOJSON_DEFINE_STATIC_ARRAY(  //
-        uint32_t, factors,
-        ARDUINOJSON_EXPAND18({
-            0x40240000, 0x00000000,  // 1e1
-            0x40590000, 0x00000000,  // 1e2
-            0x40C38800, 0x00000000,  // 1e4
-            0x4197D784, 0x00000000,  // 1e8
-            0x4341C379, 0x37E08000,  // 1e16
-            0x4693B8B5, 0xB5056E17,  // 1e32
-            0x4D384F03, 0xE93FF9F5,  // 1e64
-            0x5A827748, 0xF9301D32,  // 1e128
-            0x75154FDD, 0x7F73BF3C   // 1e256
-        }));
-    return forge(
-        ARDUINOJSON_READ_STATIC_ARRAY(uint32_t, factors, 2 * index),
-        ARDUINOJSON_READ_STATIC_ARRAY(uint32_t, factors, 2 * index + 1));
-  }
-  static T negativeBinaryPowerOfTen(int index) {
-    ARDUINOJSON_DEFINE_STATIC_ARRAY(  //
-        uint32_t, factors,
-        ARDUINOJSON_EXPAND18({
-            0x3FB99999, 0x9999999A,  // 1e-1
-            0x3F847AE1, 0x47AE147B,  // 1e-2
-            0x3F1A36E2, 0xEB1C432D,  // 1e-4
-            0x3E45798E, 0xE2308C3A,  // 1e-8
-            0x3C9CD2B2, 0x97D889BC,  // 1e-16
-            0x3949F623, 0xD5A8A733,  // 1e-32
-            0x32A50FFD, 0x44F4A73D,  // 1e-64
-            0x255BBA08, 0xCF8C979D,  // 1e-128
-            0x0AC80628, 0x64AC6F43   // 1e-256
-        }));
-    return forge(
-        ARDUINOJSON_READ_STATIC_ARRAY(uint32_t, factors, 2 * index),
-        ARDUINOJSON_READ_STATIC_ARRAY(uint32_t, factors, 2 * index + 1));
-  }
-  static T negativeBinaryPowerOfTenPlusOne(int index) {
-    ARDUINOJSON_DEFINE_STATIC_ARRAY(  //
-        uint32_t, factors,
-        ARDUINOJSON_EXPAND18({
-            0x3FF00000, 0x00000000,  // 1e0
-            0x3FB99999, 0x9999999A,  // 1e-1
-            0x3F50624D, 0xD2F1A9FC,  // 1e-3
-            0x3E7AD7F2, 0x9ABCAF48,  // 1e-7
-            0x3CD203AF, 0x9EE75616,  // 1e-15
-            0x398039D6, 0x65896880,  // 1e-31
-            0x32DA53FC, 0x9631D10D,  // 1e-63
-            0x25915445, 0x81B7DEC2,  // 1e-127
-            0x0AFE07B2, 0x7DD78B14   // 1e-255
-        }));
-    return forge(
-        ARDUINOJSON_READ_STATIC_ARRAY(uint32_t, factors, 2 * index),
-        ARDUINOJSON_READ_STATIC_ARRAY(uint32_t, factors, 2 * index + 1));
-  }
-  static T nan() {
-    return forge(0x7ff80000, 0x00000000);
-  }
-  static T inf() {
-    return forge(0x7ff00000, 0x00000000);
-  }
-  static T highest() {
-    return forge(0x7FEFFFFF, 0xFFFFFFFF);
-  }
-  static T lowest() {
-    return forge(0xFFEFFFFF, 0xFFFFFFFF);
-  }
-  static T forge(uint32_t msb, uint32_t lsb) {
-    return alias_cast<T>((uint64_t(msb) << 32) | lsb);
-  }
-};
-template <typename T>
-struct FloatTraits<T, 4 /*32bits*/> {
-  typedef uint32_t mantissa_type;
-  static const short mantissa_bits = 23;
-  static const mantissa_type mantissa_max =
-      (mantissa_type(1) << mantissa_bits) - 1;
-  typedef int8_t exponent_type;
-  static const exponent_type exponent_max = 38;
-  template <typename TExponent>
-  static T make_float(T m, TExponent e) {
-    if (e > 0) {
-      for (uint8_t index = 0; e != 0; index++) {
-        if (e & 1)
-          m *= positiveBinaryPowerOfTen(index);
-        e >>= 1;
-      }
-    } else {
-      e = -e;
-      for (uint8_t index = 0; e != 0; index++) {
-        if (e & 1)
-          m *= negativeBinaryPowerOfTen(index);
-        e >>= 1;
-      }
-    }
-    return m;
-  }
-  static T positiveBinaryPowerOfTen(int index) {
-    ARDUINOJSON_DEFINE_STATIC_ARRAY(
-        T, factors,
-        ARDUINOJSON_EXPAND6({1e1f, 1e2f, 1e4f, 1e8f, 1e16f, 1e32f}));
-    return ARDUINOJSON_READ_STATIC_ARRAY(T, factors, index);
-  }
-  static T negativeBinaryPowerOfTen(int index) {
-    ARDUINOJSON_DEFINE_STATIC_ARRAY(
-        T, factors,
-        ARDUINOJSON_EXPAND6({1e-1f, 1e-2f, 1e-4f, 1e-8f, 1e-16f, 1e-32f}));
-    return ARDUINOJSON_READ_STATIC_ARRAY(T, factors, index);
-  }
-  static T negativeBinaryPowerOfTenPlusOne(int index) {
-    ARDUINOJSON_DEFINE_STATIC_ARRAY(
-        T, factors,
-        ARDUINOJSON_EXPAND6({1e0f, 1e-1f, 1e-3f, 1e-7f, 1e-15f, 1e-31f}));
-    return ARDUINOJSON_READ_STATIC_ARRAY(T, factors, index);
-  }
-  static T forge(uint32_t bits) {
-    return alias_cast<T>(bits);
-  }
-  static T nan() {
-    return forge(0x7fc00000);
-  }
-  static T inf() {
-    return forge(0x7f800000);
-  }
-  static T highest() {
-    return forge(0x7f7fffff);
-  }
-  static T lowest() {
-    return forge(0xFf7fffff);
-  }
-};
-}  // namespace ARDUINOJSON_NAMESPACE
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4310)
-#endif
-namespace ARDUINOJSON_NAMESPACE {
-template <typename T, typename Enable = void>
-struct numeric_limits;
-template <typename T>
-struct numeric_limits<T, typename enable_if<is_unsigned<T>::value>::type> {
-  static T lowest() {
-    return 0;
-  }
-  static T highest() {
-    return T(-1);
-  }
-};
-template <typename T>
-struct numeric_limits<
-    T, typename enable_if<is_integral<T>::value && is_signed<T>::value>::type> {
-  static T lowest() {
-    return T(T(1) << (sizeof(T) * 8 - 1));
-  }
-  static T highest() {
-    return T(~lowest());
-  }
-};
-}  // namespace ARDUINOJSON_NAMESPACE
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 namespace ARDUINOJSON_NAMESPACE {
 template <typename TOut, typename TIn>
-typename enable_if<is_integral<TOut>::value && sizeof(TOut) <= sizeof(TIn),
+typename enable_if<is_integral<TIn>::value && is_unsigned<TIn>::value &&
+                       is_integral<TOut>::value && sizeof(TOut) <= sizeof(TIn),
                    bool>::type
-canStorePositiveInteger(TIn value) {
+canConvertNumber(TIn value) {
   return value <= TIn(numeric_limits<TOut>::highest());
 }
 template <typename TOut, typename TIn>
-typename enable_if<is_integral<TOut>::value && sizeof(TIn) < sizeof(TOut),
+typename enable_if<is_integral<TIn>::value && is_unsigned<TIn>::value &&
+                       is_integral<TOut>::value && sizeof(TIn) < sizeof(TOut),
                    bool>::type
-canStorePositiveInteger(TIn) {
+canConvertNumber(TIn) {
   return true;
 }
 template <typename TOut, typename TIn>
-typename enable_if<is_floating_point<TOut>::value, bool>::type
-canStorePositiveInteger(TIn) {
+typename enable_if<is_integral<TIn>::value && is_floating_point<TOut>::value,
+                   bool>::type
+canConvertNumber(TIn) {
   return true;
 }
 template <typename TOut, typename TIn>
-typename enable_if<is_floating_point<TOut>::value, bool>::type
-canStoreNegativeInteger(TIn) {
+typename enable_if<is_integral<TIn>::value && is_signed<TIn>::value &&
+                       is_integral<TOut>::value && is_signed<TOut>::value &&
+                       sizeof(TOut) < sizeof(TIn),
+                   bool>::type
+canConvertNumber(TIn value) {
+  return value >= TIn(numeric_limits<TOut>::lowest()) &&
+         value <= TIn(numeric_limits<TOut>::highest());
+}
+template <typename TOut, typename TIn>
+typename enable_if<is_integral<TIn>::value && is_signed<TIn>::value &&
+                       is_integral<TOut>::value && is_signed<TOut>::value &&
+                       sizeof(TIn) <= sizeof(TOut),
+                   bool>::type
+canConvertNumber(TIn) {
   return true;
 }
 template <typename TOut, typename TIn>
-typename enable_if<is_integral<TOut>::value && is_signed<TOut>::value &&
-                       sizeof(TOut) <= sizeof(TIn),
+typename enable_if<is_integral<TIn>::value && is_signed<TIn>::value &&
+                       is_integral<TOut>::value && is_unsigned<TOut>::value,
                    bool>::type
-canStoreNegativeInteger(TIn value) {
-  return value <= TIn(numeric_limits<TOut>::highest()) + 1;
+canConvertNumber(TIn value) {
+  if (value < 0)
+    return false;
+  return value <= TIn(numeric_limits<TOut>::highest());
 }
 template <typename TOut, typename TIn>
-typename enable_if<is_integral<TOut>::value && is_signed<TOut>::value &&
-                       sizeof(TIn) < sizeof(TOut),
+typename enable_if<is_floating_point<TIn>::value &&
+                       !is_floating_point<TOut>::value,
                    bool>::type
-canStoreNegativeInteger(TIn) {
-  return true;
-}
-template <typename TOut, typename TIn>
-typename enable_if<is_integral<TOut>::value && is_unsigned<TOut>::value,
-                   bool>::type
-canStoreNegativeInteger(TIn) {
-  return false;
-}
-template <typename TOut, typename TIn>
-TOut convertPositiveInteger(TIn value) {
-  return canStorePositiveInteger<TOut>(value) ? TOut(value) : 0;
-}
-template <typename TOut, typename TIn>
-TOut convertNegativeInteger(TIn value) {
-  return canStoreNegativeInteger<TOut>(value) ? TOut(~value + 1) : 0;
-}
-template <typename TOut, typename TIn>
-typename enable_if<is_floating_point<TOut>::value, TOut>::type convertFloat(
-    TIn value) {
-  return TOut(value);
-}
-template <typename TOut, typename TIn>
-typename enable_if<!is_floating_point<TOut>::value, TOut>::type convertFloat(
-    TIn value) {
+canConvertNumber(TIn value) {
   return value >= numeric_limits<TOut>::lowest() &&
-                 value <= numeric_limits<TOut>::highest()
-             ? TOut(value)
-             : 0;
+         value <= numeric_limits<TOut>::highest();
+}
+template <typename TOut, typename TIn>
+TOut convertNumber(TIn value) {
+  return canConvertNumber<TOut>(value) ? TOut(value) : 0;
 }
 }  // namespace ARDUINOJSON_NAMESPACE
 #if defined(__clang__)
@@ -1597,12 +1405,12 @@ class VariantData {
       case VALUE_IS_OWNED_RAW:
       case VALUE_IS_LINKED_RAW:
         return visitor.visitRawJson(_content.asRaw.data, _content.asRaw.size);
-      case VALUE_IS_NEGATIVE_INTEGER:
-        return visitor.visitNegativeInteger(_content.asInteger);
-      case VALUE_IS_POSITIVE_INTEGER:
-        return visitor.visitPositiveInteger(_content.asInteger);
+      case VALUE_IS_SIGNED_INTEGER:
+        return visitor.visitSignedInteger(_content.asSignedInteger);
+      case VALUE_IS_UNSIGNED_INTEGER:
+        return visitor.visitUnsignedInteger(_content.asUnsignedInteger);
       case VALUE_IS_BOOLEAN:
-        return visitor.visitBoolean(_content.asInteger != 0);
+        return visitor.visitBoolean(_content.asBoolean != 0);
       default:
         return visitor.visitNull();
     }
@@ -1654,17 +1462,16 @@ class VariantData {
   template <typename T>
   bool isInteger() const {
     switch (type()) {
-      case VALUE_IS_POSITIVE_INTEGER:
-        return canStorePositiveInteger<T>(_content.asInteger);
-      case VALUE_IS_NEGATIVE_INTEGER:
-        return canStoreNegativeInteger<T>(_content.asInteger);
+      case VALUE_IS_UNSIGNED_INTEGER:
+        return canConvertNumber<T>(_content.asUnsignedInteger);
+      case VALUE_IS_SIGNED_INTEGER:
+        return canConvertNumber<T>(_content.asSignedInteger);
       default:
         return false;
     }
   }
   bool isFloat() const {
-    return type() == VALUE_IS_FLOAT || type() == VALUE_IS_POSITIVE_INTEGER ||
-           type() == VALUE_IS_NEGATIVE_INTEGER;
+    return (_flags & NUMBER_BIT) != 0;
   }
   bool isString() const {
     return type() == VALUE_IS_LINKED_STRING || type() == VALUE_IS_OWNED_STRING;
@@ -1689,7 +1496,7 @@ class VariantData {
   }
   void setBoolean(bool value) {
     setType(VALUE_IS_BOOLEAN);
-    _content.asInteger = static_cast<UInt>(value);
+    _content.asBoolean = value;
   }
   void setFloat(Float value) {
     setType(VALUE_IS_FLOAT);
@@ -1719,78 +1526,30 @@ class VariantData {
   }
   template <typename T>
   typename enable_if<is_unsigned<T>::value>::type setInteger(T value) {
-    setUnsignedInteger(value);
+    setType(VALUE_IS_UNSIGNED_INTEGER);
+    _content.asUnsignedInteger = static_cast<UInt>(value);
   }
   template <typename T>
   typename enable_if<is_signed<T>::value>::type setInteger(T value) {
-    setSignedInteger(value);
-  }
-  template <typename T>
-  void setSignedInteger(T value) {
-    if (value >= 0) {
-      setPositiveInteger(static_cast<UInt>(value));
-    } else {
-      setNegativeInteger(~static_cast<UInt>(value) + 1);
-    }
-  }
-  void setUnsignedInteger(UInt value) {
-    setType(VALUE_IS_POSITIVE_INTEGER);
-    _content.asInteger = static_cast<UInt>(value);
-  }
-  void setPositiveInteger(UInt value) {
-    setType(VALUE_IS_POSITIVE_INTEGER);
-    _content.asInteger = value;
-  }
-  void setNegativeInteger(UInt value) {
-    setType(VALUE_IS_NEGATIVE_INTEGER);
-    _content.asInteger = value;
+    setType(VALUE_IS_SIGNED_INTEGER);
+    _content.asSignedInteger = value;
   }
   void setNull() {
     setType(VALUE_IS_NULL);
   }
   void setStringPointer(const char *s, storage_policies::store_by_copy) {
+    ARDUINOJSON_ASSERT(s != 0);
     setType(VALUE_IS_OWNED_STRING);
     _content.asString = s;
   }
   void setStringPointer(const char *s, storage_policies::store_by_address) {
+    ARDUINOJSON_ASSERT(s != 0);
     setType(VALUE_IS_LINKED_STRING);
     _content.asString = s;
   }
   template <typename TAdaptedString>
   bool setString(TAdaptedString value, MemoryPool *pool) {
-    return setString(value, pool, typename TAdaptedString::storage_policy());
-  }
-  template <typename TAdaptedString>
-  inline bool setString(TAdaptedString value, MemoryPool *pool,
-                        storage_policies::decide_at_runtime) {
-    if (value.isStatic())
-      return setString(value, pool, storage_policies::store_by_address());
-    else
-      return setString(value, pool, storage_policies::store_by_copy());
-  }
-  template <typename TAdaptedString>
-  inline bool setString(TAdaptedString value, MemoryPool *,
-                        storage_policies::store_by_address) {
-    if (value.isNull())
-      setNull();
-    else
-      setStringPointer(value.data(), storage_policies::store_by_address());
-    return true;
-  }
-  template <typename TAdaptedString>
-  inline bool setString(TAdaptedString value, MemoryPool *pool,
-                        storage_policies::store_by_copy) {
-    if (value.isNull()) {
-      setNull();
-      return true;
-    }
-    const char *copy = pool->saveString(value);
-    if (!copy) {
-      setNull();
-      return false;
-    }
-    setStringPointer(copy, storage_policies::store_by_copy());
-    return true;
+    return storeString(value, pool, typename TAdaptedString::storage_policy());
   }
   CollectionData &toArray() {
     setType(VALUE_IS_ARRAY);
@@ -1851,7 +1610,7 @@ class VariantData {
     return _content.asCollection.getOrAddMember(key, pool);
   }
   void movePointers(ptrdiff_t stringDistance, ptrdiff_t variantDistance) {
-    if (_flags & VALUE_IS_OWNED)
+    if (_flags & OWNED_VALUE_BIT)
       _content.asString += stringDistance;
     if (_flags & COLLECTION_MASK)
       _content.asCollection.movePointers(stringDistance, variantDistance);
@@ -1861,9 +1620,41 @@ class VariantData {
   }
  private:
   void setType(uint8_t t) {
-    _flags &= KEY_IS_OWNED;
+    _flags &= OWNED_KEY_BIT;
     _flags |= t;
   }
+  template <typename TAdaptedString>
+  inline bool storeString(TAdaptedString value, MemoryPool *pool,
+                          storage_policies::decide_at_runtime) {
+    if (value.isStatic())
+      return storeString(value, pool, storage_policies::store_by_address());
+    else
+      return storeString(value, pool, storage_policies::store_by_copy());
+  }
+  template <typename TAdaptedString>
+  inline bool storeString(TAdaptedString value, MemoryPool *,
+                          storage_policies::store_by_address) {
+    if (value.isNull())
+      setNull();
+    else
+      setStringPointer(value.data(), storage_policies::store_by_address());
+    return true;
+  }
+  template <typename TAdaptedString>
+  inline bool storeString(TAdaptedString value, MemoryPool *pool,
+                          storage_policies::store_by_copy) {
+    if (value.isNull()) {
+      setNull();
+      return true;
+    }
+    const char *copy = pool->saveString(value);
+    if (!copy) {
+      setNull();
+      return false;
+    }
+    setStringPointer(copy, storage_policies::store_by_copy());
+    return true;
+  }
 };
 }  // namespace ARDUINOJSON_NAMESPACE
 #if defined(__GNUC__)
@@ -1915,125 +1706,37 @@ inline size_t slotSize(const VariantSlot* var) {
 inline VariantData* slotData(VariantSlot* slot) {
   return reinterpret_cast<VariantData*>(slot);
 }
-template <typename TResult>
-struct Visitor {
-  typedef TResult result_type;
-};
 struct Visitable {
 };
 template <typename T>
 struct IsVisitable : is_base_of<Visitable, T> {};
 template <typename T>
-struct IsVisitable<T&> : IsVisitable<T> {};
-}  // namespace ARDUINOJSON_NAMESPACE
-#if ARDUINOJSON_ENABLE_ARDUINO_STRING
-#endif
-#if ARDUINOJSON_ENABLE_STD_STRING
-#endif
-namespace ARDUINOJSON_NAMESPACE {
-template <typename>
-struct IsWriteableString : false_type {};
-#if ARDUINOJSON_ENABLE_ARDUINO_STRING
-template <>
-struct IsWriteableString< ::String> : true_type {};
-#endif
-#if ARDUINOJSON_ENABLE_STD_STRING
-template <typename TCharTraits, typename TAllocator>
-struct IsWriteableString<std::basic_string<char, TCharTraits, TAllocator> >
-    : true_type {};
-#endif
-class ArrayRef;
-class ArrayConstRef;
-class ObjectRef;
-class ObjectConstRef;
-class VariantRef;
-class VariantConstRef;
-template <typename T>
-struct VariantAs {
-  typedef T type;
-};
-template <>
-struct VariantAs<char*> {
-  typedef const char* type;
-};
-template <typename T>
-struct VariantConstAs {
-  typedef typename VariantAs<T>::type type;
-};
-template <>
-struct VariantConstAs<VariantRef> {
-  typedef VariantConstRef type;
-};
-template <>
-struct VariantConstAs<ObjectRef> {
-  typedef ObjectConstRef type;
-};
-template <>
-struct VariantConstAs<ArrayRef> {
-  typedef ArrayConstRef type;
-};
-template <typename T>
-inline typename enable_if<is_integral<T>::value && !is_same<bool, T>::value,
-                          T>::type
-variantAs(const VariantData* data) {
-  ARDUINOJSON_ASSERT_INTEGER_TYPE_IS_SUPPORTED(T);
-  return data != 0 ? data->asIntegral<T>() : T(0);
-}
-template <typename T>
-inline typename enable_if<is_enum<T>::value, T>::type variantAs(
-    const VariantData* data) {
-  return data != 0 ? static_cast<T>(data->asIntegral<int>()) : T();
-}
-template <typename T>
-inline typename enable_if<is_same<T, bool>::value, T>::type variantAs(
-    const VariantData* data) {
-  return data != 0 ? data->asBoolean() : false;
-}
-template <typename T>
-inline typename enable_if<is_floating_point<T>::value, T>::type variantAs(
-    const VariantData* data) {
-  return data != 0 ? data->asFloat<T>() : T(0);
-}
-template <typename T>
-inline typename enable_if<is_same<T, const char*>::value ||
-                              is_same<T, char*>::value,
-                          const char*>::type
-variantAs(const VariantData* data) {
-  return data != 0 ? data->asString() : 0;
-}
-template <typename T>
-T variantAs(VariantData* data, MemoryPool*) {
-  return variantAs<T>(data);
-}
-template <typename T>
-inline typename enable_if<is_same<ArrayConstRef, T>::value, T>::type variantAs(
-    const VariantData* data);
-template <typename T>
-inline typename enable_if<is_same<ObjectConstRef, T>::value, T>::type variantAs(
-    const VariantData* data);
-template <typename T>
-inline typename enable_if<is_same<VariantConstRef, T>::value, T>::type
-variantAs(const VariantData* data);
-template <typename T>
-inline typename enable_if<IsWriteableString<T>::value, T>::type variantAs(
-    const VariantData* data);
+struct IsVisitable<T &> : IsVisitable<T> {};
+template <typename T, typename Enable = void>
+struct Converter;
 }  // namespace ARDUINOJSON_NAMESPACE
 #ifdef _MSC_VER  // Visual Studio
 #define FORCE_INLINE  // __forceinline causes C4714 when returning std::string
 #define NO_INLINE __declspec(noinline)
-#define DEPRECATED(msg) __declspec(deprecated(msg))
+#ifndef ARDUINOJSON_DEPRECATED
+#define ARDUINOJSON_DEPRECATED(msg) __declspec(deprecated(msg))
+#endif
 #elif defined(__GNUC__)  // GCC or Clang
 #define FORCE_INLINE __attribute__((always_inline))
 #define NO_INLINE __attribute__((noinline))
+#ifndef ARDUINOJSON_DEPRECATED
 #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-#define DEPRECATED(msg) __attribute__((deprecated(msg)))
+#define ARDUINOJSON_DEPRECATED(msg) __attribute__((deprecated(msg)))
 #else
-#define DEPRECATED(msg) __attribute__((deprecated))
+#define ARDUINOJSON_DEPRECATED(msg) __attribute__((deprecated))
+#endif
 #endif
 #else  // Other compilers
 #define FORCE_INLINE
 #define NO_INLINE
-#define DEPRECATED(msg)
+#ifndef ARDUINOJSON_DEPRECATED
+#define ARDUINOJSON_DEPRECATED(msg)
+#endif
 #endif
 #if __cplusplus >= 201103L
 #define NOEXCEPT noexcept
@@ -2078,52 +1781,6 @@ inline bool variantCopyFrom(VariantData *dst, const VariantData *src,
   return dst->copyFrom(*src, pool);
 }
 inline int variantCompare(const VariantData *a, const VariantData *b);
-inline bool variantIsArray(const VariantData *var) {
-  return var && var->isArray();
-}
-inline bool variantIsBoolean(const VariantData *var) {
-  return var && var->isBoolean();
-}
-template <typename T>
-inline bool variantIsInteger(const VariantData *var) {
-  return var && var->isInteger<T>();
-}
-inline bool variantIsFloat(const VariantData *var) {
-  return var && var->isFloat();
-}
-inline bool variantIsString(const VariantData *var) {
-  return var && var->isString();
-}
-inline bool variantIsObject(const VariantData *var) {
-  return var && var->isObject();
-}
-inline bool variantIsNull(const VariantData *var) {
-  return var == 0 || var->isNull();
-}
-inline bool variantSetBoolean(VariantData *var, bool value) {
-  if (!var)
-    return false;
-  var->setBoolean(value);
-  return true;
-}
-inline bool variantSetFloat(VariantData *var, Float value) {
-  if (!var)
-    return false;
-  var->setFloat(value);
-  return true;
-}
-inline bool variantSetLinkedRaw(VariantData *var,
-                                SerializedValue<const char *> value) {
-  if (!var)
-    return false;
-  var->setLinkedRaw(value);
-  return true;
-}
-template <typename T>
-inline bool variantSetOwnedRaw(VariantData *var, SerializedValue<T> value,
-                               MemoryPool *pool) {
-  return var != 0 && var->setOwnedRaw(value, pool);
-}
 inline void variantSetNull(VariantData *var) {
   if (!var)
     return;
@@ -2136,14 +1793,6 @@ inline bool variantSetString(VariantData *var, TAdaptedString value,
     return false;
   return var->setString(value, pool);
 }
-template <typename T>
-inline bool variantSetInteger(VariantData *var, T value) {
-  ARDUINOJSON_ASSERT_INTEGER_TYPE_IS_SUPPORTED(T);
-  if (!var)
-    return false;
-  var->setInteger(value);
-  return true;
-}
 inline size_t variantSize(const VariantData *var) {
   return var != 0 ? var->size() : 0;
 }
@@ -2177,6 +1826,9 @@ NO_INLINE VariantData *variantGetOrAddMember(VariantData *var,
                                              MemoryPool *pool) {
   return var != 0 ? var->getOrAddMember(adaptString(key), pool) : 0;
 }
+inline bool variantIsNull(const VariantData *var) {
+  return var == 0 || var->isNull();
+}
 enum CompareResult {
   COMPARE_RESULT_DIFFER = 0,
   COMPARE_RESULT_EQUAL = 1,
@@ -2272,23 +1924,36 @@ CompareResult arithmeticCompareNegateRight(
     return COMPARE_RESULT_GREATER;
   return arithmeticCompare(static_cast<T1>(rhs), -lhs);
 }
+struct VariantTag {};
+template <typename T>
+struct IsVariant : is_base_of<VariantTag, T> {};
 template <typename T1, typename T2>
 CompareResult compare(const T1 &lhs, const T2 &rhs);  // VariantCompare.cpp
 template <typename TVariant>
 struct VariantOperators {
   template <typename T>
-  friend typename enable_if<!IsVisitable<T>::value, T>::type operator|(
-      const TVariant &variant, const T &defaultValue) {
+  friend
+      typename enable_if<!IsVariant<T>::value && !is_array<T>::value, T>::type
+      operator|(const TVariant &variant, const T &defaultValue) {
     if (variant.template is<T>())
       return variant.template as<T>();
     else
       return defaultValue;
   }
+  friend const char *operator|(const TVariant &variant,
+                               const char *defaultValue) {
+    if (variant.template is<const char *>())
+      return variant.template as<const char *>();
+    else
+      return defaultValue;
+  }
   template <typename T>
-  friend typename enable_if<is_same<T, const char *>::value, T>::type operator|(
-      const TVariant &variant, T defaultValue) {
-    const char *value = variant.template as<const char *>();
-    return value ? value : defaultValue;
+  friend typename enable_if<IsVariant<T>::value, typename T::variant_type>::type
+  operator|(const TVariant &variant, T defaultValue) {
+    if (variant)
+      return variant;
+    else
+      return defaultValue;
   }
   template <typename T>
   friend bool operator==(T *lhs, TVariant rhs) {
@@ -2393,6 +2058,8 @@ struct VariantOperators {
     return (compare(lhs, rhs) & COMPARE_RESULT_GREATER_OR_EQUAL) != 0;
   }
 };
+class ArrayRef;
+class ObjectRef;
 template <typename>
 class ElementProxy;
 template <typename TArray>
@@ -2459,60 +2126,9 @@ class VariantShortcuts : public ObjectShortcuts<TVariant>,
 };
 class ArrayRef;
 class ObjectRef;
-template <typename, typename>
-class MemberProxy;
 template <typename TData>
-class VariantRefBase {
+class VariantRefBase : public VariantTag {
  public:
-  template <typename T>
-  FORCE_INLINE
-      typename enable_if<is_integral<T>::value && !is_same<bool, T>::value,
-                         bool>::type
-      is() const {
-    return variantIsInteger<T>(_data);
-  }
-  template <typename T>
-  FORCE_INLINE typename enable_if<is_floating_point<T>::value, bool>::type is()
-      const {
-    return variantIsFloat(_data);
-  }
-  template <typename T>
-  FORCE_INLINE typename enable_if<is_same<T, bool>::value, bool>::type is()
-      const {
-    return variantIsBoolean(_data);
-  }
-  template <typename T>
-  FORCE_INLINE typename enable_if<is_same<T, const char *>::value ||
-                                      is_same<T, char *>::value ||
-                                      IsWriteableString<T>::value,
-                                  bool>::type
-  is() const {
-    return variantIsString(_data);
-  }
-  template <typename T>
-  FORCE_INLINE typename enable_if<
-      is_same<typename remove_const<T>::type, ArrayRef>::value, bool>::type
-  is() const {
-    return variantIsArray(_data);
-  }
-  template <typename T>
-  FORCE_INLINE typename enable_if<
-      is_same<typename remove_const<T>::type, ObjectRef>::value, bool>::type
-  is() const {
-    return variantIsObject(_data);
-  }
-#if ARDUINOJSON_HAS_NULLPTR
-  template <typename T>
-  FORCE_INLINE
-      typename enable_if<is_same<T, decltype(nullptr)>::value, bool>::type
-      is() const {
-    return variantIsNull(_data);
-  }
-#endif
-  template <typename T>
-  FORCE_INLINE typename enable_if<is_enum<T>::value, bool>::type is() const {
-    return variantIsInteger<int>(_data);
-  }
   FORCE_INLINE bool isNull() const {
     return variantIsNull(_data);
   }
@@ -2531,6 +2147,9 @@ class VariantRefBase {
  protected:
   VariantRefBase(TData *data) : _data(data) {}
   TData *_data;
+  friend TData *getData(const VariantRefBase &variant) {
+    return variant._data;
+  }
 };
 class VariantRef : public VariantRefBase<VariantData>,
                    public VariantOperators<VariantRef>,
@@ -2546,63 +2165,61 @@ class VariantRef : public VariantRefBase<VariantData>,
     return variantSetNull(_data);
   }
   template <typename T>
-  FORCE_INLINE bool set(
-      T value, typename enable_if<is_same<T, bool>::value>::type * = 0) const {
-    return variantSetBoolean(_data, value);
+  FORCE_INLINE bool set(const T &value) const {
+    return Converter<T>::toJson(value, *this);
+  }
+  FORCE_INLINE bool ARDUINOJSON_DEPRECATED(
+      "Support for char is deprecated, use int8_t or uint8_t instead")
+      set(char value) const {
+    return set<signed char>(value);
   }
   template <typename T>
-  FORCE_INLINE bool set(
-      T value,
-      typename enable_if<is_floating_point<T>::value>::type * = 0) const {
-    return variantSetFloat(_data, static_cast<Float>(value));
+  FORCE_INLINE bool set(T *value) const {
+    return Converter<T *>::toJson(value, *this);
   }
   template <typename T>
-  FORCE_INLINE bool set(
-      T value, typename enable_if<is_integral<T>::value &&
-                                  !is_same<bool, T>::value>::type * = 0) const {
-    return variantSetInteger<T>(_data, value);
-  }
-  FORCE_INLINE bool set(SerializedValue<const char *> value) const {
-    return variantSetLinkedRaw(_data, value);
+  FORCE_INLINE
+      typename enable_if<!is_same<T, char *>::value && !is_same<T, char>::value,
+                         T>::type
+      as() const {
+    return Converter<T>::fromJson(*this);
   }
   template <typename T>
-  FORCE_INLINE bool set(
-      SerializedValue<T> value,
-      typename enable_if<!is_same<const char *, T>::value>::type * = 0) const {
-    return variantSetOwnedRaw(_data, value, _pool);
+  FORCE_INLINE typename enable_if<is_same<T, char *>::value, const char *>::type
+  ARDUINOJSON_DEPRECATED("Replace as<char*>() with as<const char*>()")
+      as() const {
+    return as<const char *>();
   }
   template <typename T>
-  FORCE_INLINE bool set(
-      const T &value,
-      typename enable_if<IsString<T>::value>::type * = 0) const {
-    return variantSetString(_data, adaptString(value), _pool);
+  FORCE_INLINE typename enable_if<is_same<T, char>::value, char>::type
+  ARDUINOJSON_DEPRECATED(
+      "Support for char is deprecated, use int8_t or uint8_t instead")
+      as() const {
+    return as<signed char>();
   }
   template <typename T>
-  FORCE_INLINE bool set(
-      T *value, typename enable_if<IsString<T *>::value>::type * = 0) const {
-    return variantSetString(_data, adaptString(value), _pool);
+  FORCE_INLINE
+      typename enable_if<!is_same<T, char *>::value && !is_same<T, char>::value,
+                         bool>::type
+      is() const {
+    return Converter<T>::checkJson(*this);
   }
-  template <typename TVariant>
-  typename enable_if<IsVisitable<TVariant>::value, bool>::type set(
-      const TVariant &value) const;
   template <typename T>
-  FORCE_INLINE bool set(
-      T value, typename enable_if<is_enum<T>::value>::type * = 0) const {
-    return variantSetInteger(_data, static_cast<Integer>(value));
+  FORCE_INLINE typename enable_if<is_same<T, char *>::value, bool>::type
+  ARDUINOJSON_DEPRECATED("Replace is<char*>() with is<const char*>()")
+      is() const {
+    return is<const char *>();
   }
-#if ARDUINOJSON_HAS_NULLPTR
-  FORCE_INLINE bool set(decltype(nullptr)) const {
-    variantSetNull(_data);
-    return true;
-  }
-#endif
   template <typename T>
-  FORCE_INLINE typename VariantAs<T>::type as() const {
-    return variantAs<typename VariantAs<T>::type>(_data, _pool);
+  FORCE_INLINE typename enable_if<is_same<T, char>::value, bool>::type
+  ARDUINOJSON_DEPRECATED(
+      "Support for char is deprecated, use int8_t or uint8_t instead")
+      is() const {
+    return is<signed char>();
   }
   template <typename T>
   FORCE_INLINE operator T() const {
-    return variantAs<T>(_data, _pool);
+    return as<T>();
   }
   template <typename TVisitor>
   typename TVisitor::result_type accept(TVisitor &visitor) const {
@@ -2645,7 +2262,10 @@ class VariantRef : public VariantRefBase<VariantData>,
   }
  private:
   MemoryPool *_pool;
-};  // namespace ARDUINOJSON_NAMESPACE
+  friend MemoryPool *getPool(const VariantRef &variant) {
+    return variant._pool;
+  }
+};
 class VariantConstRef : public VariantRefBase<const VariantData>,
                         public VariantOperators<VariantConstRef>,
                         public VariantShortcuts<VariantConstRef>,
@@ -2661,12 +2281,48 @@ class VariantConstRef : public VariantRefBase<const VariantData>,
     return variantAccept(_data, visitor);
   }
   template <typename T>
-  FORCE_INLINE typename VariantConstAs<T>::type as() const {
-    return variantAs<typename VariantConstAs<T>::type>(_data);
+  FORCE_INLINE
+      typename enable_if<!is_same<T, char *>::value && !is_same<T, char>::value,
+                         T>::type
+      as() const {
+    return Converter<T>::fromJson(*this);
+  }
+  template <typename T>
+  FORCE_INLINE typename enable_if<is_same<T, char *>::value, const char *>::type
+  ARDUINOJSON_DEPRECATED("Replace as<char*>() with as<const char*>()")
+      as() const {
+    return as<const char *>();
+  }
+  template <typename T>
+  FORCE_INLINE typename enable_if<is_same<T, char>::value, char>::type
+  ARDUINOJSON_DEPRECATED(
+      "Support for char is deprecated, use int8_t or uint8_t instead")
+      as() const {
+    return as<signed char>();
+  }
+  template <typename T>
+  FORCE_INLINE
+      typename enable_if<!is_same<T, char *>::value && !is_same<T, char>::value,
+                         bool>::type
+      is() const {
+    return Converter<T>::checkJson(*this);
+  }
+  template <typename T>
+  FORCE_INLINE typename enable_if<is_same<T, char *>::value, bool>::type
+  ARDUINOJSON_DEPRECATED("Replace is<char*>() with is<const char*>()")
+      is() const {
+    return is<const char *>();
+  }
+  template <typename T>
+  FORCE_INLINE typename enable_if<is_same<T, char>::value, bool>::type
+  ARDUINOJSON_DEPRECATED(
+      "Support for char is deprecated, use int8_t or uint8_t instead")
+      is() const {
+    return is<signed char>();
   }
   template <typename T>
   FORCE_INLINE operator T() const {
-    return variantAs<T>(_data);
+    return as<T>();
   }
   FORCE_INLINE VariantConstRef getElement(size_t) const;
   FORCE_INLINE VariantConstRef operator[](size_t index) const {
@@ -2695,6 +2351,35 @@ class VariantConstRef : public VariantRefBase<const VariantData>,
     return getMember(key);
   }
 };
+template <>
+struct Converter<VariantRef> {
+  static bool toJson(VariantRef src, VariantRef dst) {
+    return variantCopyFrom(getData(dst), getData(src), getPool(dst));
+  }
+  static VariantRef fromJson(VariantRef src) {
+    return src;
+  }
+  static bool checkJson(VariantRef src) {
+    VariantData *data = getData(src);
+    return !!data;
+  }
+  static bool checkJson(VariantConstRef) {
+    return false;
+  }
+};
+template <>
+struct Converter<VariantConstRef> {
+  static bool toJson(VariantConstRef src, VariantRef dst) {
+    return variantCopyFrom(getData(dst), getData(src), getPool(dst));
+  }
+  static VariantConstRef fromJson(VariantConstRef src) {
+    return VariantConstRef(getData(src));
+  }
+  static bool checkJson(VariantConstRef src) {
+    const VariantData *data = getData(src);
+    return !!data;
+  }
+};
 class VariantPtr {
  public:
   VariantPtr(MemoryPool *pool, VariantData *data) : _variant(pool, data) {}
@@ -2898,6 +2583,37 @@ class ArrayRef : public ArrayRefBase<CollectionData>,
  private:
   MemoryPool* _pool;
 };
+template <>
+struct Converter<ArrayConstRef> {
+  static bool toJson(VariantConstRef src, VariantRef dst) {
+    return variantCopyFrom(getData(dst), getData(src), getPool(dst));
+  }
+  static ArrayConstRef fromJson(VariantConstRef src) {
+    return ArrayConstRef(variantAsArray(getData(src)));
+  }
+  static bool checkJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data && data->isArray();
+  }
+};
+template <>
+struct Converter<ArrayRef> {
+  static bool toJson(VariantConstRef src, VariantRef dst) {
+    return variantCopyFrom(getData(dst), getData(src), getPool(dst));
+  }
+  static ArrayRef fromJson(VariantRef src) {
+    VariantData* data = getData(src);
+    MemoryPool* pool = getPool(src);
+    return ArrayRef(pool, data != 0 ? data->asArray() : 0);
+  }
+  static bool checkJson(VariantConstRef) {
+    return false;
+  }
+  static bool checkJson(VariantRef src) {
+    VariantData* data = getData(src);
+    return data && data->isArray();
+  }
+};
 template <typename TVisitor>
 typename TVisitor::result_type objectAccept(const CollectionData *obj,
                                             TVisitor &visitor) {
@@ -3265,6 +2981,37 @@ class ObjectRef : public ObjectRefBase<CollectionData>,
  private:
   MemoryPool* _pool;
 };
+template <>
+struct Converter<ObjectConstRef> {
+  static bool toJson(VariantConstRef src, VariantRef dst) {
+    return variantCopyFrom(getData(dst), getData(src), getPool(dst));
+  }
+  static ObjectConstRef fromJson(VariantConstRef src) {
+    return ObjectConstRef(variantAsObject(getData(src)));
+  }
+  static bool checkJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data && data->isObject();
+  }
+};
+template <>
+struct Converter<ObjectRef> {
+  static bool toJson(VariantConstRef src, VariantRef dst) {
+    return variantCopyFrom(getData(dst), getData(src), getPool(dst));
+  }
+  static ObjectRef fromJson(VariantRef src) {
+    VariantData* data = getData(src);
+    MemoryPool* pool = getPool(src);
+    return ObjectRef(pool, data != 0 ? data->asObject() : 0);
+  }
+  static bool checkJson(VariantConstRef) {
+    return false;
+  }
+  static bool checkJson(VariantRef src) {
+    VariantData* data = getData(src);
+    return data && data->isObject();
+  }
+};
 class ArrayRef;
 class ObjectRef;
 class VariantRef;
@@ -3291,9 +3038,11 @@ namespace ARDUINOJSON_NAMESPACE {
 template <typename TArray>
 class ElementProxy : public VariantOperators<ElementProxy<TArray> >,
                      public VariantShortcuts<ElementProxy<TArray> >,
-                     public Visitable {
+                     public Visitable,
+                     public VariantTag {
   typedef ElementProxy<TArray> this_type;
  public:
+  typedef VariantRef variant_type;
   FORCE_INLINE ElementProxy(TArray array, size_t index)
       : _array(array), _index(index) {}
   FORCE_INLINE ElementProxy(const ElementProxy& src)
@@ -3319,10 +3068,17 @@ class ElementProxy : public VariantOperators<ElementProxy<TArray> >,
     return getUpstreamElement().isNull();
   }
   template <typename T>
-  FORCE_INLINE typename VariantAs<T>::type as() const {
+  FORCE_INLINE typename enable_if<!is_same<T, char*>::value, T>::type as()
+      const {
     return getUpstreamElement().template as<T>();
   }
   template <typename T>
+  FORCE_INLINE typename enable_if<is_same<T, char*>::value, const char*>::type
+  ARDUINOJSON_DEPRECATED("Replace as<char*>() with as<const char*>()")
+      as() const {
+    return as<const char*>();
+  }
+  template <typename T>
   FORCE_INLINE operator T() const {
     return getUpstreamElement();
   }
@@ -3394,6 +3150,9 @@ class ElementProxy : public VariantOperators<ElementProxy<TArray> >,
   FORCE_INLINE VariantRef getOrAddUpstreamElement() const {
     return _array.getOrAddElement(_index);
   }
+  friend bool convertToJson(const this_type& src, VariantRef dst) {
+    return dst.set(src.getUpstreamElement());
+  }
   TArray _array;
   const size_t _index;
 };
@@ -3409,9 +3168,11 @@ namespace ARDUINOJSON_NAMESPACE {
 template <typename TObject, typename TStringRef>
 class MemberProxy : public VariantOperators<MemberProxy<TObject, TStringRef> >,
                     public VariantShortcuts<MemberProxy<TObject, TStringRef> >,
-                    public Visitable {
+                    public Visitable,
+                    public VariantTag {
   typedef MemberProxy<TObject, TStringRef> this_type;
  public:
+  typedef VariantRef variant_type;
   FORCE_INLINE MemberProxy(TObject variant, TStringRef key)
       : _object(variant), _key(key) {}
   FORCE_INLINE MemberProxy(const MemberProxy &src)
@@ -3440,9 +3201,16 @@ class MemberProxy : public VariantOperators<MemberProxy<TObject, TStringRef> >,
   FORCE_INLINE bool isNull() const {
     return getUpstreamMember().isNull();
   }
-  template <typename TValue>
-  FORCE_INLINE typename VariantAs<TValue>::type as() const {
-    return getUpstreamMember().template as<TValue>();
+  template <typename T>
+  FORCE_INLINE typename enable_if<!is_same<T, char *>::value, T>::type as()
+      const {
+    return getUpstreamMember().template as<T>();
+  }
+  template <typename T>
+  FORCE_INLINE typename enable_if<is_same<T, char *>::value, const char *>::type
+  ARDUINOJSON_DEPRECATED("Replace as<char*>() with as<const char*>()")
+      as() const {
+    return as<const char *>();
   }
   template <typename T>
   FORCE_INLINE operator T() const {
@@ -3516,6 +3284,9 @@ class MemberProxy : public VariantOperators<MemberProxy<TObject, TStringRef> >,
   FORCE_INLINE VariantRef getOrAddUpstreamMember() const {
     return _object.getOrAddMember(_key);
   }
+  friend bool convertToJson(const this_type &src, VariantRef dst) {
+    return dst.set(src.getUpstreamMember());
+  }
   TObject _object;
   TStringRef _key;
 };
@@ -3531,11 +3302,11 @@ class JsonDocument : public Visitable {
     return getVariant().accept(visitor);
   }
   template <typename T>
-  typename VariantAs<T>::type as() {
+  T as() {
     return getVariant().template as<T>();
   }
   template <typename T>
-  typename VariantConstAs<T>::type as() const {
+  T as() const {
     return getVariant().template as<T>();
   }
   void clear() {
@@ -3543,6 +3314,10 @@ class JsonDocument : public Visitable {
     _data.setNull();
   }
   template <typename T>
+  bool is() {
+    return getVariant().template is<T>();
+  }
+  template <typename T>
   bool is() const {
     return getVariant().template is<T>();
   }
@@ -3565,7 +3340,7 @@ class JsonDocument : public Visitable {
     return _data.size();
   }
   bool set(const JsonDocument& src) {
-    return to<VariantRef>().set(src.as<VariantRef>());
+    return to<VariantRef>().set(src.as<VariantConstRef>());
   }
   template <typename T>
   typename enable_if<!is_base_of<JsonDocument, T>::value, bool>::type set(
@@ -3722,6 +3497,7 @@ class JsonDocument : public Visitable {
   JsonDocument(char* buf, size_t capa) : _pool(buf, capa) {
     _data.setNull();
   }
+  ~JsonDocument() {}
   void replacePool(MemoryPool pool) {
     _pool = pool;
   }
@@ -3737,6 +3513,9 @@ class JsonDocument : public Visitable {
   JsonDocument(const JsonDocument&);
   JsonDocument& operator=(const JsonDocument&);
 };
+inline bool convertToJson(const JsonDocument& src, VariantRef dst) {
+  return dst.set(src.as<VariantConstRef>());
+}
 template <typename TAllocator>
 class AllocatorOwner {
  public:
@@ -3856,6 +3635,9 @@ class BasicJsonDocument : AllocatorOwner<TAllocator>, public JsonDocument {
     src._pool = MemoryPool(0, 0);
   }
 };
+}  // namespace ARDUINOJSON_NAMESPACE
+#include <stdlib.h>
+namespace ARDUINOJSON_NAMESPACE {
 struct DefaultAllocator {
   void* allocate(size_t size) {
     return malloc(size);
@@ -3916,6 +3698,37 @@ inline ElementProxy<TArray> ArrayShortcuts<TArray>::operator[](
     size_t index) const {
   return ElementProxy<TArray>(*impl(), index);
 }
+template <typename TResult>
+struct Visitor {
+  typedef TResult result_type;
+  TResult visitArray(const CollectionData &) {
+    return TResult();
+  }
+  TResult visitBoolean(bool) {
+    return TResult();
+  }
+  TResult visitFloat(Float) {
+    return TResult();
+  }
+  TResult visitSignedInteger(Integer) {
+    return TResult();
+  }
+  TResult visitNull() {
+    return TResult();
+  }
+  TResult visitObject(const CollectionData &) {
+    return TResult();
+  }
+  TResult visitUnsignedInteger(UInt) {
+    return TResult();
+  }
+  TResult visitRawJson(const char *, size_t) {
+    return TResult();
+  }
+  TResult visitString(const char *) {
+    return TResult();
+  }
+};
 template <typename T, size_t N, typename TDestination>
 inline typename enable_if<!is_array<T>::value &&
                               !is_base_of<JsonDocument, TDestination>::value,
@@ -3968,35 +3781,12 @@ class ArrayCopier1D : public Visitor<size_t> {
     size_t size = 0;
     VariantSlot* slot = array.head();
     while (slot != 0 && size < _capacity) {
-      _destination[size++] = variantAs<T>(slot->data());
+      _destination[size++] =
+          Converter<T>::fromJson(VariantConstRef(slot->data()));
       slot = slot->next();
     }
     return size;
   }
-  size_t visitObject(const CollectionData&) {
-    return 0;
-  }
-  size_t visitFloat(Float) {
-    return 0;
-  }
-  size_t visitString(const char*) {
-    return 0;
-  }
-  size_t visitRawJson(const char*, size_t) {
-    return 0;
-  }
-  size_t visitNegativeInteger(UInt) {
-    return 0;
-  }
-  size_t visitPositiveInteger(UInt) {
-    return 0;
-  }
-  size_t visitBoolean(bool) {
-    return 0;
-  }
-  size_t visitNull() {
-    return 0;
-  }
  private:
   T* _destination;
   size_t _capacity;
@@ -4014,14 +3804,6 @@ class ArrayCopier2D : public Visitor<void> {
       slot = slot->next();
     }
   }
-  void visitObject(const CollectionData&) {}
-  void visitFloat(Float) {}
-  void visitString(const char*) {}
-  void visitRawJson(const char*, size_t) {}
-  void visitNegativeInteger(UInt) {}
-  void visitPositiveInteger(UInt) {}
-  void visitBoolean(bool) {}
-  void visitNull() {}
  private:
   T (*_destination)[N1][N2];
   size_t _capacity1, _capacity2;
@@ -4135,6 +3917,8 @@ inline VariantSlot* CollectionData::getSlot(TAdaptedString key) const {
   return slot;
 }
 inline VariantSlot* CollectionData::getSlot(size_t index) const {
+  if (!_head)
+    return 0;
   return _head->next(index);
 }
 inline VariantSlot* CollectionData::getPreviousSlot(VariantSlot* target) const {
@@ -4271,83 +4055,245 @@ template <typename TObject>
 template <typename TString>
 inline typename enable_if<IsString<TString*>::value,
                           MemberProxy<TObject, TString*> >::type
-    ObjectShortcuts<TObject>::operator[](TString* key) const {
+ObjectShortcuts<TObject>::operator[](TString* key) const {
   return MemberProxy<TObject, TString*>(*impl(), key);
 }
 template <typename TObject>
 template <typename TString>
 inline typename enable_if<IsString<TString>::value,
                           MemberProxy<TObject, TString> >::type
-    ObjectShortcuts<TObject>::operator[](const TString& key) const {
+ObjectShortcuts<TObject>::operator[](const TString& key) const {
   return MemberProxy<TObject, TString>(*impl(), key);
 }
-template <typename T>
-inline typename enable_if<is_same<ArrayConstRef, T>::value, T>::type variantAs(
-    const VariantData* _data) {
-  return ArrayConstRef(variantAsArray(_data));
-}
-template <typename T>
-inline typename enable_if<is_same<ObjectConstRef, T>::value, T>::type variantAs(
-    const VariantData* _data) {
-  return ObjectConstRef(variantAsObject(_data));
-}
-template <typename T>
-inline typename enable_if<is_same<VariantConstRef, T>::value, T>::type
-variantAs(const VariantData* _data) {
-  return VariantConstRef(_data);
-}
-template <typename T>
-inline typename enable_if<IsWriteableString<T>::value, T>::type variantAs(
-    const VariantData* _data) {
-  const char* cstr = _data != 0 ? _data->asString() : 0;
-  if (cstr)
-    return T(cstr);
-  T s;
-  serializeJson(VariantConstRef(_data), s);
-  return s;
-}
+}  // namespace ARDUINOJSON_NAMESPACE
+#if ARDUINOJSON_ENABLE_ARDUINO_STRING
+#endif
+#if ARDUINOJSON_ENABLE_STD_STRING
+#endif
+namespace ARDUINOJSON_NAMESPACE {
+template <typename>
+struct IsWriteableString : false_type {};
+#if ARDUINOJSON_ENABLE_ARDUINO_STRING
 template <>
-inline ArrayRef variantAs<ArrayRef>(VariantData* data, MemoryPool* pool) {
-  return ArrayRef(pool, data != 0 ? data->asArray() : 0);
-}
-template <>
-inline ObjectRef variantAs<ObjectRef>(VariantData* data, MemoryPool* pool) {
-  return ObjectRef(pool, data != 0 ? data->asObject() : 0);
-}
-template <>
-inline VariantRef variantAs<VariantRef>(VariantData* data, MemoryPool* pool) {
-  return VariantRef(pool, data);
-}
-class CollectionData;
-struct ComparerBase : Visitor<CompareResult> {
-  CompareResult visitArray(const CollectionData &) {
-    return COMPARE_RESULT_DIFFER;
+struct IsWriteableString< ::String> : true_type {};
+#endif
+#if ARDUINOJSON_ENABLE_STD_STRING
+template <typename TCharTraits, typename TAllocator>
+struct IsWriteableString<std::basic_string<char, TCharTraits, TAllocator> >
+    : true_type {};
+#endif
+template <typename T, typename Enable>
+struct Converter {
+  static bool toJson(const T& src, VariantRef dst) {
+    return convertToJson(src, dst); // Error here? See https://arduinojson.org/v6/unsupported-set/
   }
-  CompareResult visitBoolean(bool) {
-    return COMPARE_RESULT_DIFFER;
+  static T fromJson(VariantConstRef src) {
+    T result; // Error here? See https://arduinojson.org/v6/non-default-constructible/
+    convertFromJson(src, result);  // Error here? See https://arduinojson.org/v6/unsupported-as/
+    return result;
   }
-  CompareResult visitFloat(Float) {
-    return COMPARE_RESULT_DIFFER;
-  }
-  CompareResult visitNegativeInteger(UInt) {
-    return COMPARE_RESULT_DIFFER;
-  }
-  CompareResult visitNull() {
-    return COMPARE_RESULT_DIFFER;
-  }
-  CompareResult visitObject(const CollectionData &) {
-    return COMPARE_RESULT_DIFFER;
-  }
-  CompareResult visitPositiveInteger(UInt) {
-    return COMPARE_RESULT_DIFFER;
-  }
-  CompareResult visitRawJson(const char *, size_t) {
-    return COMPARE_RESULT_DIFFER;
-  }
-  CompareResult visitString(const char *) {
-    return COMPARE_RESULT_DIFFER;
+  static bool checkJson(VariantConstRef src) {
+    T dummy;
+    return canConvertFromJson(src, dummy);  // Error here? See https://arduinojson.org/v6/unsupported-is/
   }
 };
+template <typename T>
+struct Converter<
+    T, typename enable_if<is_integral<T>::value && !is_same<bool, T>::value &&
+                          !is_same<char, T>::value>::type> {
+  static bool toJson(T src, VariantRef dst) {
+    VariantData* data = getData(dst);
+    ARDUINOJSON_ASSERT_INTEGER_TYPE_IS_SUPPORTED(T);
+    if (!data)
+      return false;
+    data->setInteger(src);
+    return true;
+  }
+  static T fromJson(VariantConstRef src) {
+    ARDUINOJSON_ASSERT_INTEGER_TYPE_IS_SUPPORTED(T);
+    const VariantData* data = getData(src);
+    return data ? data->asIntegral<T>() : T();
+  }
+  static bool checkJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data && data->isInteger<T>();
+  }
+};
+template <typename T>
+struct Converter<T, typename enable_if<is_enum<T>::value>::type> {
+  static bool toJson(T src, VariantRef dst) {
+    return dst.set(static_cast<Integer>(src));
+  }
+  static T fromJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data ? static_cast<T>(data->asIntegral<int>()) : T();
+  }
+  static bool checkJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data && data->isInteger<int>();
+  }
+};
+template <>
+struct Converter<bool> {
+  static bool toJson(bool src, VariantRef dst) {
+    VariantData* data = getData(dst);
+    if (!data)
+      return false;
+    data->setBoolean(src);
+    return true;
+  }
+  static bool fromJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data ? data->asBoolean() : false;
+  }
+  static bool checkJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data && data->isBoolean();
+  }
+};
+template <typename T>
+struct Converter<T, typename enable_if<is_floating_point<T>::value>::type> {
+  static bool toJson(T src, VariantRef dst) {
+    VariantData* data = getData(dst);
+    if (!data)
+      return false;
+    data->setFloat(static_cast<Float>(src));
+    return true;
+  }
+  static T fromJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data ? data->asFloat<T>() : false;
+  }
+  static bool checkJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data && data->isFloat();
+  }
+};
+template <>
+struct Converter<const char*> {
+  static bool toJson(const char* src, VariantRef dst) {
+    return variantSetString(getData(dst), adaptString(src), getPool(dst));
+  }
+  static const char* fromJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data ? data->asString() : 0;
+  }
+  static bool checkJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data && data->isString();
+  }
+};
+template <typename T>
+inline typename enable_if<IsString<T>::value, bool>::type convertToJson(
+    const T& src, VariantRef dst) {
+  VariantData* data = getData(dst);
+  MemoryPool* pool = getPool(dst);
+  return variantSetString(data, adaptString(src), pool);
+}
+template <typename T>
+inline typename enable_if<IsWriteableString<T>::value>::type convertFromJson(
+    VariantConstRef src, T& dst) {
+  const VariantData* data = getData(src);
+  const char* cstr = data != 0 ? data->asString() : 0;
+  if (cstr)
+    dst = cstr;
+  else
+    serializeJson(src, dst);
+}
+template <typename T>
+inline typename enable_if<IsWriteableString<T>::value, bool>::type
+canConvertFromJson(VariantConstRef src, const T&) {
+  const VariantData* data = getData(src);
+  return data && data->isString();
+}
+template <>
+struct Converter<SerializedValue<const char*> > {
+  static bool toJson(SerializedValue<const char*> src, VariantRef dst) {
+    VariantData* data = getData(dst);
+    if (!data)
+      return false;
+    data->setLinkedRaw(src);
+    return true;
+  }
+};
+template <typename T>
+struct Converter<SerializedValue<T>,
+                 typename enable_if<!is_same<const char*, T>::value>::type> {
+  static bool toJson(SerializedValue<T> src, VariantRef dst) {
+    VariantData* data = getData(dst);
+    MemoryPool* pool = getPool(dst);
+    return data != 0 && data->setOwnedRaw(src, pool);
+  }
+};
+#if ARDUINOJSON_HAS_NULLPTR
+template <>
+struct Converter<decltype(nullptr)> {
+  static bool toJson(decltype(nullptr), VariantRef dst) {
+    variantSetNull(getData(dst));
+    return true;
+  }
+  static decltype(nullptr) fromJson(VariantConstRef) {
+    return nullptr;
+  }
+  static bool checkJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data == 0 || data->isNull();
+  }
+};
+#endif
+#if ARDUINOJSON_ENABLE_ARDUINO_STREAM
+class MemoryPoolPrint : public Print {
+ public:
+  MemoryPoolPrint(MemoryPool* pool) : _pool(pool), _size(0) {
+    pool->getFreeZone(&_string, &_capacity);
+  }
+  const char* c_str() {
+    _string[_size++] = 0;
+    ARDUINOJSON_ASSERT(_size <= _capacity);
+    return _pool->saveStringFromFreeZone(_size);
+  }
+  size_t write(uint8_t c) {
+    if (_size >= _capacity)
+      return 0;
+    _string[_size++] = char(c);
+    return 1;
+  }
+  size_t write(const uint8_t* buffer, size_t size) {
+    if (_size + size >= _capacity) {
+      _size = _capacity;  // mark as overflowed
+      return 0;
+    }
+    memcpy(&_string[_size], buffer, size);
+    _size += size;
+    return size;
+  }
+  bool overflowed() const {
+    return _size >= _capacity;
+  }
+ private:
+  MemoryPool* _pool;
+  size_t _size;
+  char* _string;
+  size_t _capacity;
+};
+inline bool convertToJson(const ::Printable& src, VariantRef dst) {
+  MemoryPool* pool = getPool(dst);
+  VariantData* data = getData(dst);
+  if (!pool || !data)
+    return false;
+  MemoryPoolPrint print(pool);
+  src.printTo(print);
+  if (print.overflowed()) {
+    pool->markAsOverflowed();
+    data->setNull();
+    return false;
+  }
+  data->setStringPointer(print.c_str(), storage_policies::store_by_copy());
+  return true;
+}
+#endif
+class CollectionData;
+struct ComparerBase : Visitor<CompareResult> {};
 template <typename T, typename Enable = void>
 struct Comparer;
 template <typename T>
@@ -4380,14 +4326,14 @@ struct Comparer<T, typename enable_if<is_integral<T>::value ||
   CompareResult visitFloat(Float lhs) {
     return arithmeticCompare(lhs, rhs);
   }
-  CompareResult visitNegativeInteger(UInt lhs) {
-    return arithmeticCompareNegateLeft(lhs, rhs);
+  CompareResult visitSignedInteger(Integer lhs) {
+    return arithmeticCompare(lhs, rhs);
   }
-  CompareResult visitPositiveInteger(UInt lhs) {
+  CompareResult visitUnsignedInteger(UInt lhs) {
     return arithmeticCompare(lhs, rhs);
   }
   CompareResult visitBoolean(bool lhs) {
-    return visitPositiveInteger(static_cast<UInt>(lhs));
+    return visitUnsignedInteger(static_cast<UInt>(lhs));
   }
 };
 struct NullComparer : ComparerBase {
@@ -4411,22 +4357,6 @@ struct ArrayComparer : ComparerBase {
       return COMPARE_RESULT_DIFFER;
   }
 };
-struct NegativeIntegerComparer : ComparerBase {
-  UInt _rhs;
-  explicit NegativeIntegerComparer(UInt rhs) : _rhs(rhs) {}
-  CompareResult visitFloat(Float lhs) {
-    return arithmeticCompareNegateRight(lhs, _rhs);
-  }
-  CompareResult visitNegativeInteger(UInt lhs) {
-    return arithmeticCompare(_rhs, lhs);
-  }
-  CompareResult visitPositiveInteger(UInt) {
-    return COMPARE_RESULT_GREATER;
-  }
-  CompareResult visitBoolean(bool) {
-    return COMPARE_RESULT_GREATER;
-  }
-};
 struct ObjectComparer : ComparerBase {
   const CollectionData *_rhs;
   explicit ObjectComparer(const CollectionData &rhs) : _rhs(&rhs) {}
@@ -4478,11 +4408,11 @@ struct Comparer<T, typename enable_if<IsVisitable<T>::value>::type>
     RawComparer comparer(lhsData, lhsSize);
     return accept(comparer);
   }
-  CompareResult visitNegativeInteger(UInt lhs) {
-    NegativeIntegerComparer comparer(lhs);
+  CompareResult visitSignedInteger(Integer lhs) {
+    Comparer<Integer> comparer(lhs);
     return accept(comparer);
   }
-  CompareResult visitPositiveInteger(UInt lhs) {
+  CompareResult visitUnsignedInteger(UInt lhs) {
     Comparer<UInt> comparer(lhs);
     return accept(comparer);
   }
@@ -4516,9 +4446,232 @@ CompareResult compare(const T1 &lhs, const T2 &rhs) {
 inline int variantCompare(const VariantData *a, const VariantData *b) {
   return compare(VariantConstRef(a), VariantConstRef(b));
 }
+#ifndef isnan
+template <typename T>
+bool isnan(T x) {
+  return x != x;
+}
+#endif
+#ifndef isinf
+template <typename T>
+bool isinf(T x) {
+  return x != 0.0 && x * 2 == x;
+}
+#endif
+template <typename T, typename F>
+struct alias_cast_t {
+  union {
+    F raw;
+    T data;
+  };
+};
+template <typename T, typename F>
+T alias_cast(F raw_data) {
+  alias_cast_t<T, F> ac;
+  ac.raw = raw_data;
+  return ac.data;
+}
+}  // namespace ARDUINOJSON_NAMESPACE
+#if ARDUINOJSON_ENABLE_PROGMEM
+namespace ARDUINOJSON_NAMESPACE {
+template <typename T>
+typename enable_if<is_pointer<T>::value, T>::type pgm_read(const void* p) {
+  return reinterpret_cast<T>(pgm_read_ptr(p));
+}
+template <typename T>
+typename enable_if<is_floating_point<T>::value &&
+                       sizeof(T) == sizeof(float),  // on AVR sizeof(double) ==
+                   T>::type
+pgm_read(const void* p) {
+  return pgm_read_float(p);
+}
+template <typename T>
+typename enable_if<is_same<T, uint32_t>::value, T>::type pgm_read(
+    const void* p) {
+  return pgm_read_dword(p);
+}
+}  // namespace ARDUINOJSON_NAMESPACE
+#ifndef ARDUINOJSON_DEFINE_STATIC_ARRAY
+#define ARDUINOJSON_DEFINE_STATIC_ARRAY(type, name, value) \
+  static type const name[] PROGMEM = value;
+#endif
+#ifndef ARDUINOJSON_READ_STATIC_ARRAY
+#define ARDUINOJSON_READ_STATIC_ARRAY(type, name, index) \
+  pgm_read<type>(name + index)
+#endif
+#else  // i.e. ARDUINOJSON_ENABLE_PROGMEM == 0
+#ifndef ARDUINOJSON_DEFINE_STATIC_ARRAY
+#define ARDUINOJSON_DEFINE_STATIC_ARRAY(type, name, value) \
+  static type const name[] = value;
+#endif
+#ifndef ARDUINOJSON_READ_STATIC_ARRAY
+#define ARDUINOJSON_READ_STATIC_ARRAY(type, name, index) name[index]
+#endif
+#endif
+namespace ARDUINOJSON_NAMESPACE {
+template <typename T, size_t = sizeof(T)>
+struct FloatTraits {};
+template <typename T>
+struct FloatTraits<T, 8 /*64bits*/> {
+  typedef uint64_t mantissa_type;
+  static const short mantissa_bits = 52;
+  static const mantissa_type mantissa_max =
+      (mantissa_type(1) << mantissa_bits) - 1;
+  typedef int16_t exponent_type;
+  static const exponent_type exponent_max = 308;
+  template <typename TExponent>
+  static T make_float(T m, TExponent e) {
+    if (e > 0) {
+      for (uint8_t index = 0; e != 0; index++) {
+        if (e & 1)
+          m *= positiveBinaryPowerOfTen(index);
+        e >>= 1;
+      }
+    } else {
+      e = TExponent(-e);
+      for (uint8_t index = 0; e != 0; index++) {
+        if (e & 1)
+          m *= negativeBinaryPowerOfTen(index);
+        e >>= 1;
+      }
+    }
+    return m;
+  }
+  static T positiveBinaryPowerOfTen(int index) {
+    ARDUINOJSON_DEFINE_STATIC_ARRAY(  //
+        uint32_t, factors,
+        ARDUINOJSON_EXPAND18({
+            0x40240000, 0x00000000,  // 1e1
+            0x40590000, 0x00000000,  // 1e2
+            0x40C38800, 0x00000000,  // 1e4
+            0x4197D784, 0x00000000,  // 1e8
+            0x4341C379, 0x37E08000,  // 1e16
+            0x4693B8B5, 0xB5056E17,  // 1e32
+            0x4D384F03, 0xE93FF9F5,  // 1e64
+            0x5A827748, 0xF9301D32,  // 1e128
+            0x75154FDD, 0x7F73BF3C   // 1e256
+        }));
+    return forge(
+        ARDUINOJSON_READ_STATIC_ARRAY(uint32_t, factors, 2 * index),
+        ARDUINOJSON_READ_STATIC_ARRAY(uint32_t, factors, 2 * index + 1));
+  }
+  static T negativeBinaryPowerOfTen(int index) {
+    ARDUINOJSON_DEFINE_STATIC_ARRAY(  //
+        uint32_t, factors,
+        ARDUINOJSON_EXPAND18({
+            0x3FB99999, 0x9999999A,  // 1e-1
+            0x3F847AE1, 0x47AE147B,  // 1e-2
+            0x3F1A36E2, 0xEB1C432D,  // 1e-4
+            0x3E45798E, 0xE2308C3A,  // 1e-8
+            0x3C9CD2B2, 0x97D889BC,  // 1e-16
+            0x3949F623, 0xD5A8A733,  // 1e-32
+            0x32A50FFD, 0x44F4A73D,  // 1e-64
+            0x255BBA08, 0xCF8C979D,  // 1e-128
+            0x0AC80628, 0x64AC6F43   // 1e-256
+        }));
+    return forge(
+        ARDUINOJSON_READ_STATIC_ARRAY(uint32_t, factors, 2 * index),
+        ARDUINOJSON_READ_STATIC_ARRAY(uint32_t, factors, 2 * index + 1));
+  }
+  static T negativeBinaryPowerOfTenPlusOne(int index) {
+    ARDUINOJSON_DEFINE_STATIC_ARRAY(  //
+        uint32_t, factors,
+        ARDUINOJSON_EXPAND18({
+            0x3FF00000, 0x00000000,  // 1e0
+            0x3FB99999, 0x9999999A,  // 1e-1
+            0x3F50624D, 0xD2F1A9FC,  // 1e-3
+            0x3E7AD7F2, 0x9ABCAF48,  // 1e-7
+            0x3CD203AF, 0x9EE75616,  // 1e-15
+            0x398039D6, 0x65896880,  // 1e-31
+            0x32DA53FC, 0x9631D10D,  // 1e-63
+            0x25915445, 0x81B7DEC2,  // 1e-127
+            0x0AFE07B2, 0x7DD78B14   // 1e-255
+        }));
+    return forge(
+        ARDUINOJSON_READ_STATIC_ARRAY(uint32_t, factors, 2 * index),
+        ARDUINOJSON_READ_STATIC_ARRAY(uint32_t, factors, 2 * index + 1));
+  }
+  static T nan() {
+    return forge(0x7ff80000, 0x00000000);
+  }
+  static T inf() {
+    return forge(0x7ff00000, 0x00000000);
+  }
+  static T highest() {
+    return forge(0x7FEFFFFF, 0xFFFFFFFF);
+  }
+  static T lowest() {
+    return forge(0xFFEFFFFF, 0xFFFFFFFF);
+  }
+  static T forge(uint32_t msb, uint32_t lsb) {
+    return alias_cast<T>((uint64_t(msb) << 32) | lsb);
+  }
+};
+template <typename T>
+struct FloatTraits<T, 4 /*32bits*/> {
+  typedef uint32_t mantissa_type;
+  static const short mantissa_bits = 23;
+  static const mantissa_type mantissa_max =
+      (mantissa_type(1) << mantissa_bits) - 1;
+  typedef int8_t exponent_type;
+  static const exponent_type exponent_max = 38;
+  template <typename TExponent>
+  static T make_float(T m, TExponent e) {
+    if (e > 0) {
+      for (uint8_t index = 0; e != 0; index++) {
+        if (e & 1)
+          m *= positiveBinaryPowerOfTen(index);
+        e >>= 1;
+      }
+    } else {
+      e = -e;
+      for (uint8_t index = 0; e != 0; index++) {
+        if (e & 1)
+          m *= negativeBinaryPowerOfTen(index);
+        e >>= 1;
+      }
+    }
+    return m;
+  }
+  static T positiveBinaryPowerOfTen(int index) {
+    ARDUINOJSON_DEFINE_STATIC_ARRAY(
+        T, factors,
+        ARDUINOJSON_EXPAND6({1e1f, 1e2f, 1e4f, 1e8f, 1e16f, 1e32f}));
+    return ARDUINOJSON_READ_STATIC_ARRAY(T, factors, index);
+  }
+  static T negativeBinaryPowerOfTen(int index) {
+    ARDUINOJSON_DEFINE_STATIC_ARRAY(
+        T, factors,
+        ARDUINOJSON_EXPAND6({1e-1f, 1e-2f, 1e-4f, 1e-8f, 1e-16f, 1e-32f}));
+    return ARDUINOJSON_READ_STATIC_ARRAY(T, factors, index);
+  }
+  static T negativeBinaryPowerOfTenPlusOne(int index) {
+    ARDUINOJSON_DEFINE_STATIC_ARRAY(
+        T, factors,
+        ARDUINOJSON_EXPAND6({1e0f, 1e-1f, 1e-3f, 1e-7f, 1e-15f, 1e-31f}));
+    return ARDUINOJSON_READ_STATIC_ARRAY(T, factors, index);
+  }
+  static T forge(uint32_t bits) {
+    return alias_cast<T>(bits);
+  }
+  static T nan() {
+    return forge(0x7fc00000);
+  }
+  static T inf() {
+    return forge(0x7f800000);
+  }
+  static T highest() {
+    return forge(0x7f7fffff);
+  }
+  static T lowest() {
+    return forge(0xFf7fffff);
+  }
+};
+#ifndef isdigit
 inline bool isdigit(char c) {
   return '0' <= c && c <= '9';
 }
+#endif
 inline bool issign(char c) {
   return '-' == c || c == '+';
 }
@@ -4567,11 +4720,17 @@ inline bool parseNumber(const char* s, VariantData& result) {
     s++;
   }
   if (*s == '\0') {
-    if (is_negative)
-      result.setNegativeInteger(UInt(mantissa));
-    else
-      result.setPositiveInteger(UInt(mantissa));
-    return true;
+    if (is_negative) {
+      const mantissa_t sintMantissaMax = mantissa_t(1)
+                                         << (sizeof(Integer) * 8 - 1);
+      if (mantissa <= sintMantissaMax) {
+        result.setInteger(Integer(~mantissa + 1));
+        return true;
+      }
+    } else {
+      result.setInteger(UInt(mantissa));
+      return true;
+    }
   }
   while (mantissa > traits::mantissa_max) {
     mantissa /= 10;
@@ -4628,31 +4787,33 @@ inline T parseNumber(const char* s) {
   VariantData value;
   value.init();  // VariantData is a POD, so it has no constructor
   parseNumber(s, value);
-  return variantAs<T>(&value);
+  return Converter<T>::fromJson(VariantConstRef(&value));
 }
 template <typename T>
 inline T VariantData::asIntegral() const {
   switch (type()) {
-    case VALUE_IS_POSITIVE_INTEGER:
     case VALUE_IS_BOOLEAN:
-      return convertPositiveInteger<T>(_content.asInteger);
-    case VALUE_IS_NEGATIVE_INTEGER:
-      return convertNegativeInteger<T>(_content.asInteger);
+      return _content.asBoolean;
+    case VALUE_IS_UNSIGNED_INTEGER:
+      return convertNumber<T>(_content.asUnsignedInteger);
+    case VALUE_IS_SIGNED_INTEGER:
+      return convertNumber<T>(_content.asSignedInteger);
     case VALUE_IS_LINKED_STRING:
     case VALUE_IS_OWNED_STRING:
       return parseNumber<T>(_content.asString);
     case VALUE_IS_FLOAT:
-      return convertFloat<T>(_content.asFloat);
+      return convertNumber<T>(_content.asFloat);
     default:
       return 0;
   }
 }
 inline bool VariantData::asBoolean() const {
   switch (type()) {
-    case VALUE_IS_POSITIVE_INTEGER:
     case VALUE_IS_BOOLEAN:
-    case VALUE_IS_NEGATIVE_INTEGER:
-      return _content.asInteger != 0;
+      return _content.asBoolean;
+    case VALUE_IS_SIGNED_INTEGER:
+    case VALUE_IS_UNSIGNED_INTEGER:
+      return _content.asUnsignedInteger != 0;
     case VALUE_IS_FLOAT:
       return _content.asFloat != 0;
     case VALUE_IS_NULL:
@@ -4664,11 +4825,12 @@ inline bool VariantData::asBoolean() const {
 template <typename T>
 inline T VariantData::asFloat() const {
   switch (type()) {
-    case VALUE_IS_POSITIVE_INTEGER:
     case VALUE_IS_BOOLEAN:
-      return static_cast<T>(_content.asInteger);
-    case VALUE_IS_NEGATIVE_INTEGER:
-      return -static_cast<T>(_content.asInteger);
+      return static_cast<T>(_content.asBoolean);
+    case VALUE_IS_UNSIGNED_INTEGER:
+      return static_cast<T>(_content.asUnsignedInteger);
+    case VALUE_IS_SIGNED_INTEGER:
+      return static_cast<T>(_content.asSignedInteger);
     case VALUE_IS_LINKED_STRING:
     case VALUE_IS_OWNED_STRING:
       return parseNumber<T>(_content.asString);
@@ -4687,12 +4849,6 @@ inline const char *VariantData::asString() const {
       return 0;
   }
 }
-template <typename TVariant>
-typename enable_if<IsVisitable<TVariant>::value, bool>::type VariantRef::set(
-    const TVariant &value) const {
-  VariantConstRef v = value;
-  return variantCopyFrom(_data, v._data, _pool);
-}
 template <typename T>
 inline typename enable_if<is_same<T, ArrayRef>::value, ArrayRef>::type
 VariantRef::to() const {
@@ -4757,7 +4913,6 @@ class DeserializationError {
     IncompleteInput,
     InvalidInput,
     NoMemory,
-    NotSupported,
     TooDeep
   };
   DeserializationError() {}
@@ -4802,8 +4957,8 @@ class DeserializationError {
   }
   const char* c_str() const {
     static const char* messages[] = {
-        "Ok",       "EmptyInput",   "IncompleteInput", "InvalidInput",
-        "NoMemory", "NotSupported", "TooDeep"};
+        "Ok",           "EmptyInput", "IncompleteInput",
+        "InvalidInput", "NoMemory",   "TooDeep"};
     ARDUINOJSON_ASSERT(static_cast<size_t>(_code) <
                        sizeof(messages) / sizeof(messages[0]));
     return messages[_code];
@@ -4815,11 +4970,9 @@ class DeserializationError {
     ARDUINOJSON_DEFINE_STATIC_ARRAY(char, s2, "IncompleteInput");
     ARDUINOJSON_DEFINE_STATIC_ARRAY(char, s3, "InvalidInput");
     ARDUINOJSON_DEFINE_STATIC_ARRAY(char, s4, "NoMemory");
-    ARDUINOJSON_DEFINE_STATIC_ARRAY(char, s5, "NotSupported");
-    ARDUINOJSON_DEFINE_STATIC_ARRAY(char, s6, "TooDeep");
+    ARDUINOJSON_DEFINE_STATIC_ARRAY(char, s5, "TooDeep");
     ARDUINOJSON_DEFINE_STATIC_ARRAY(
-        const char*, messages,
-        ARDUINOJSON_EXPAND7({s0, s1, s2, s3, s4, s5, s6}));
+        const char*, messages, ARDUINOJSON_EXPAND6({s0, s1, s2, s3, s4, s5}));
     return ARDUINOJSON_READ_STATIC_ARRAY(const __FlashStringHelper*, messages,
                                          _code);
   }
@@ -4845,10 +4998,10 @@ class Filter {
     return _variant;
   }
   bool allowArray() const {
-    return _variant == true || _variant.is<ArrayRef>();
+    return _variant == true || _variant.is<ArrayConstRef>();
   }
   bool allowObject() const {
-    return _variant == true || _variant.is<ObjectRef>();
+    return _variant == true || _variant.is<ObjectConstRef>();
   }
   bool allowValue() const {
     return _variant == true;
@@ -5357,7 +5510,6 @@ class JsonDeserializer {
     return _error;
   }
  private:
-  JsonDeserializer &operator=(const JsonDeserializer &);  // non-copiable
   char current() {
     return _latch.current();
   }
@@ -5602,11 +5754,10 @@ class JsonDeserializer {
             return false;
           if (codepoint.append(codeunit))
             Utf8::encodeCodepoint(codepoint.value(), _stringStorage);
-          continue;
 #else
-          _error = DeserializationError::NotSupported;
-          return false;
+          _stringStorage.append('\\');
 #endif
+          continue;
         }
         c = EscapeSequence::unescapeChar(c);
         if (c == '\0') {
@@ -6008,24 +6159,28 @@ class TextFormatter {
     }
 #endif
     FloatParts<T> parts(value);
-    writePositiveInteger(parts.integral);
+    writeInteger(parts.integral);
     if (parts.decimalPlaces)
       writeDecimals(parts.decimal, parts.decimalPlaces);
-    if (parts.exponent < 0) {
-      writeRaw("e-");
-      writePositiveInteger(-parts.exponent);
-    }
-    if (parts.exponent > 0) {
+    if (parts.exponent) {
       writeRaw('e');
-      writePositiveInteger(parts.exponent);
+      writeInteger(parts.exponent);
     }
   }
-  void writeNegativeInteger(UInt value) {
-    writeRaw('-');
-    writePositiveInteger(value);
-  }
   template <typename T>
-  void writePositiveInteger(T value) {
+  typename enable_if<is_signed<T>::value>::type writeInteger(T value) {
+    typedef typename make_unsigned<T>::type unsigned_type;
+    unsigned_type unsigned_value;
+    if (value < 0) {
+      writeRaw('-');
+      unsigned_value = unsigned_type(unsigned_type(~value) + 1);
+    } else {
+      unsigned_value = unsigned_type(value);
+    }
+    writeInteger(unsigned_value);
+  }
+  template <typename T>
+  typename enable_if<is_unsigned<T>::value>::type writeInteger(T value) {
     char buffer[22];
     char *end = buffer + sizeof(buffer);
     char *begin = end;
@@ -6099,14 +6254,11 @@ class Writer {
 };
 class StaticStringWriter {
  public:
-  StaticStringWriter(char *buf, size_t size) : end(buf + size - 1), p(buf) {
-    *p = '\0';
-  }
+  StaticStringWriter(char *buf, size_t size) : end(buf + size), p(buf) {}
   size_t write(uint8_t c) {
     if (p >= end)
       return 0;
     *p++ = static_cast<char>(c);
-    *p = '\0';
     return 1;
   }
   size_t write(const uint8_t *s, size_t n) {
@@ -6115,7 +6267,6 @@ class StaticStringWriter {
       *p++ = static_cast<char>(*s++);
       n--;
     }
-    *p = '\0';
     return size_t(p - begin);
   }
  private:
@@ -6241,10 +6392,20 @@ size_t serialize(const TSource &source, TDestination &destination) {
   return doSerialize<TSerializer>(source, writer);
 }
 template <template <typename> class TSerializer, typename TSource>
-size_t serialize(const TSource &source, void *buffer, size_t bufferSize) {
+typename enable_if<!TSerializer<StaticStringWriter>::producesText, size_t>::type
+serialize(const TSource &source, void *buffer, size_t bufferSize) {
   StaticStringWriter writer(reinterpret_cast<char *>(buffer), bufferSize);
   return doSerialize<TSerializer>(source, writer);
 }
+template <template <typename> class TSerializer, typename TSource>
+typename enable_if<TSerializer<StaticStringWriter>::producesText, size_t>::type
+serialize(const TSource &source, void *buffer, size_t bufferSize) {
+  StaticStringWriter writer(reinterpret_cast<char *>(buffer), bufferSize);
+  size_t n = doSerialize<TSerializer>(source, writer);
+  if (n < bufferSize)
+    reinterpret_cast<char *>(buffer)[n] = 0;
+  return n;
+}
 template <template <typename> class TSerializer, typename TSource,
           typename TChar, size_t N>
 #if defined _MSC_VER && _MSC_VER < 1900
@@ -6253,12 +6414,12 @@ typename enable_if<sizeof(remove_reference<TChar>::type) == 1, size_t>::type
 typename enable_if<sizeof(TChar) == 1, size_t>::type
 #endif
 serialize(const TSource &source, TChar (&buffer)[N]) {
-  StaticStringWriter writer(reinterpret_cast<char *>(buffer), N);
-  return doSerialize<TSerializer>(source, writer);
+  return serialize<TSerializer>(source, buffer, N);
 }
 template <typename TWriter>
 class JsonSerializer : public Visitor<size_t> {
  public:
+  static const bool producesText = true;
   JsonSerializer(TWriter writer) : _formatter(writer) {}
   FORCE_INLINE size_t visitArray(const CollectionData &array) {
     write('[');
@@ -6300,12 +6461,12 @@ class JsonSerializer : public Visitor<size_t> {
     _formatter.writeRaw(data, n);
     return bytesWritten();
   }
-  size_t visitNegativeInteger(UInt value) {
-    _formatter.writeNegativeInteger(value);
+  size_t visitSignedInteger(Integer value) {
+    _formatter.writeInteger(value);
     return bytesWritten();
   }
-  size_t visitPositiveInteger(UInt value) {
-    _formatter.writePositiveInteger(value);
+  size_t visitUnsignedInteger(UInt value) {
+    _formatter.writeInteger(value);
     return bytesWritten();
   }
   size_t visitBoolean(bool value) {
@@ -6353,7 +6514,7 @@ template <typename TWriter>
 class PrettyJsonSerializer : public JsonSerializer<TWriter> {
   typedef JsonSerializer<TWriter> base;
  public:
-  PrettyJsonSerializer(TWriter &writer) : base(writer), _nesting(0) {}
+  PrettyJsonSerializer(TWriter writer) : base(writer), _nesting(0) {}
   size_t visitArray(const CollectionData &array) {
     VariantSlot *slot = array.head();
     if (slot) {
@@ -6473,7 +6634,7 @@ class MsgPackDeserializer {
   template <typename TFilter>
   DeserializationError parse(VariantData &variant, TFilter filter,
                              NestingLimit nestingLimit) {
-    parseVariant(variant, filter, nestingLimit);
+    parseVariant(&variant, filter, nestingLimit);
     return _foundSomething ? _error : DeserializationError::EmptyInput;
   }
  private:
@@ -6482,12 +6643,8 @@ class MsgPackDeserializer {
     _error = DeserializationError::InvalidInput;
     return false;
   }
-  bool notSupported() {
-    _error = DeserializationError::NotSupported;
-    return false;
-  }
   template <typename TFilter>
-  bool parseVariant(VariantData &variant, TFilter filter,
+  bool parseVariant(VariantData *variant, TFilter filter,
                     NestingLimit nestingLimit) {
     uint8_t code = 0;  // TODO: why do we need to initialize this variable?
     if (!readByte(code))
@@ -6501,42 +6658,24 @@ class MsgPackDeserializer {
         return invalidInput();
       case 0xc2:
         if (allowValue)
-          variant.setBoolean(false);
+          variant->setBoolean(false);
         return true;
       case 0xc3:
         if (allowValue)
-          variant.setBoolean(true);
+          variant->setBoolean(true);
         return true;
-      case 0xc4:  // bin 8
-        if (allowValue)
-          return notSupported();
-        else
-          return skipString<uint8_t>();
-      case 0xc5:  // bin 16
-        if (allowValue)
-          return notSupported();
-        else
-          return skipString<uint16_t>();
-      case 0xc6:  // bin 32
-        if (allowValue)
-          return notSupported();
-        else
-          return skipString<uint32_t>();
-      case 0xc7:  // ext 8
-        if (allowValue)
-          return notSupported();
-        else
-          return skipExt<uint8_t>();
-      case 0xc8:  // ext 16
-        if (allowValue)
-          return notSupported();
-        else
-          return skipExt<uint16_t>();
-      case 0xc9:  // ext 32
-        if (allowValue)
-          return notSupported();
-        else
-          return skipExt<uint32_t>();
+      case 0xc4:  // bin 8 (not supported)
+        return skipString<uint8_t>();
+      case 0xc5:  // bin 16 (not supported)
+        return skipString<uint16_t>();
+      case 0xc6:  // bin 32 (not supported)
+        return skipString<uint32_t>();
+      case 0xc7:  // ext 8 (not supported)
+        return skipExt<uint8_t>();
+      case 0xc8:  // ext 16 (not supported)
+        return skipExt<uint16_t>();
+      case 0xc9:  // ext 32 (not supported)
+        return skipExt<uint32_t>();
       case 0xca:
         if (allowValue)
           return readFloat<float>(variant);
@@ -6563,14 +6702,14 @@ class MsgPackDeserializer {
         else
           return skipBytes(4);
       case 0xcf:
-        if (allowValue)
 #if ARDUINOJSON_USE_LONG_LONG
+        if (allowValue)
           return readInteger<uint64_t>(variant);
-#else
-          return notSupported();
-#endif
         else
           return skipBytes(8);
+#else
+        return skipBytes(8);  // not supported
+#endif
       case 0xd0:
         if (allowValue)
           return readInteger<int8_t>(variant);
@@ -6587,39 +6726,24 @@ class MsgPackDeserializer {
         else
           return skipBytes(4);
       case 0xd3:
-        if (allowValue)
 #if ARDUINOJSON_USE_LONG_LONG
+        if (allowValue)
           return readInteger<int64_t>(variant);
+        else
+          return skipBytes(8);  // not supported
 #else
-          return notSupported();
+        return skipBytes(8);
 #endif
-        else
-          return skipBytes(8);
-      case 0xd4:  // fixext 1
-        if (allowValue)
-          return notSupported();
-        else
-          return skipBytes(2);
-      case 0xd5:  // fixext 2
-        if (allowValue)
-          return notSupported();
-        else
-          return skipBytes(3);
-      case 0xd6:  // fixext 4
-        if (allowValue)
-          return notSupported();
-        else
-          return skipBytes(5);
-      case 0xd7:  // fixext 8
-        if (allowValue)
-          return notSupported();
-        else
-          return skipBytes(9);
-      case 0xd8:  // fixext 16
-        if (allowValue)
-          return notSupported();
-        else
-          return skipBytes(17);
+      case 0xd4:  // fixext 1 (not supported)
+        return skipBytes(2);
+      case 0xd5:  // fixext 2 (not supported)
+        return skipBytes(3);
+      case 0xd6:  // fixext 4 (not supported)
+        return skipBytes(5);
+      case 0xd7:  // fixext 8 (not supported)
+        return skipBytes(9);
+      case 0xd8:  // fixext 16 (not supported)
+        return skipBytes(17);
       case 0xd9:
         if (allowValue)
           return readString<uint8_t>(variant);
@@ -6657,7 +6781,7 @@ class MsgPackDeserializer {
         return skipBytes(code & 0x1f);
     }
     if (allowValue)
-      variant.setInteger(static_cast<int8_t>(code));
+      variant->setInteger(static_cast<int8_t>(code));
     return true;
   }
   bool readByte(uint8_t &value) {
@@ -6696,36 +6820,36 @@ class MsgPackDeserializer {
     return true;
   }
   template <typename T>
-  bool readInteger(VariantData &variant) {
+  bool readInteger(VariantData *variant) {
     T value;
     if (!readInteger(value))
       return false;
-    variant.setInteger(value);
+    variant->setInteger(value);
     return true;
   }
   template <typename T>
   typename enable_if<sizeof(T) == 4, bool>::type readFloat(
-      VariantData &variant) {
+      VariantData *variant) {
     T value;
     if (!readBytes(value))
       return false;
     fixEndianess(value);
-    variant.setFloat(value);
+    variant->setFloat(value);
     return true;
   }
   template <typename T>
   typename enable_if<sizeof(T) == 8, bool>::type readDouble(
-      VariantData &variant) {
+      VariantData *variant) {
     T value;
     if (!readBytes(value))
       return false;
     fixEndianess(value);
-    variant.setFloat(value);
+    variant->setFloat(value);
     return true;
   }
   template <typename T>
   typename enable_if<sizeof(T) == 4, bool>::type readDouble(
-      VariantData &variant) {
+      VariantData *variant) {
     uint8_t i[8];  // input is 8 bytes
     T value;       // output is 4 bytes
     uint8_t *o = reinterpret_cast<uint8_t *>(&value);
@@ -6733,11 +6857,11 @@ class MsgPackDeserializer {
       return false;
     doubleToFloat(i, o);
     fixEndianess(value);
-    variant.setFloat(value);
+    variant->setFloat(value);
     return true;
   }
   template <typename T>
-  bool readString(VariantData &variant) {
+  bool readString(VariantData *variant) {
     T size;
     if (!readInteger(size))
       return false;
@@ -6757,11 +6881,11 @@ class MsgPackDeserializer {
       return false;
     return skipBytes(size);
   }
-  bool readString(VariantData &variant, size_t n) {
+  bool readString(VariantData *variant, size_t n) {
     if (!readString(n))
       return false;
-    variant.setStringPointer(_stringStorage.save(),
-                             typename TStringStorage::storage_policy());
+    variant->setStringPointer(_stringStorage.save(),
+                              typename TStringStorage::storage_policy());
     return true;
   }
   bool readString(size_t n) {
@@ -6780,7 +6904,7 @@ class MsgPackDeserializer {
     return true;
   }
   template <typename TSize, typename TFilter>
-  bool readArray(VariantData &variant, TFilter filter,
+  bool readArray(VariantData *variant, TFilter filter,
                  NestingLimit nestingLimit) {
     TSize size;
     if (!readInteger(size))
@@ -6788,14 +6912,14 @@ class MsgPackDeserializer {
     return readArray(variant, size, filter, nestingLimit);
   }
   template <typename TFilter>
-  bool readArray(VariantData &variant, size_t n, TFilter filter,
+  bool readArray(VariantData *variant, size_t n, TFilter filter,
                  NestingLimit nestingLimit) {
     if (nestingLimit.reached()) {
       _error = DeserializationError::TooDeep;
       return false;
     }
     bool allowArray = filter.allowArray();
-    CollectionData *array = allowArray ? &variant.toArray() : 0;
+    CollectionData *array = allowArray ? &variant->toArray() : 0;
     TFilter memberFilter = filter[0U];
     for (; n; --n) {
       VariantData *value;
@@ -6808,13 +6932,13 @@ class MsgPackDeserializer {
       } else {
         value = 0;
       }
-      if (!parseVariant(*value, memberFilter, nestingLimit.decrement()))
+      if (!parseVariant(value, memberFilter, nestingLimit.decrement()))
         return false;
     }
     return true;
   }
   template <typename TSize, typename TFilter>
-  bool readObject(VariantData &variant, TFilter filter,
+  bool readObject(VariantData *variant, TFilter filter,
                   NestingLimit nestingLimit) {
     TSize size;
     if (!readInteger(size))
@@ -6822,13 +6946,13 @@ class MsgPackDeserializer {
     return readObject(variant, size, filter, nestingLimit);
   }
   template <typename TFilter>
-  bool readObject(VariantData &variant, size_t n, TFilter filter,
+  bool readObject(VariantData *variant, size_t n, TFilter filter,
                   NestingLimit nestingLimit) {
     if (nestingLimit.reached()) {
       _error = DeserializationError::TooDeep;
       return false;
     }
-    CollectionData *object = filter.allowObject() ? &variant.toObject() : 0;
+    CollectionData *object = filter.allowObject() ? &variant->toObject() : 0;
     for (; n; --n) {
       if (!readKey())
         return false;
@@ -6847,7 +6971,7 @@ class MsgPackDeserializer {
       } else {
         member = 0;
       }
-      if (!parseVariant(*member, memberFilter, nestingLimit.decrement()))
+      if (!parseVariant(member, memberFilter, nestingLimit.decrement()))
         return false;
     }
     return true;
@@ -6866,7 +6990,7 @@ class MsgPackDeserializer {
       case 0xdb:
         return readString<uint32_t>();
       default:
-        return notSupported();
+        return invalidInput();
     }
   }
   template <typename T>
@@ -6964,6 +7088,7 @@ DeserializationError deserializeMsgPack(JsonDocument &doc, TChar *input,
 template <typename TWriter>
 class MsgPackSerializer : public Visitor<size_t> {
  public:
+  static const bool producesText = false;
   MsgPackSerializer(TWriter writer) : _writer(writer) {}
   template <typename T>
   typename enable_if<sizeof(T) == 4, size_t>::type visitFloat(T value32) {
@@ -7039,29 +7164,36 @@ class MsgPackSerializer : public Visitor<size_t> {
     writeBytes(reinterpret_cast<const uint8_t*>(data), size);
     return bytesWritten();
   }
-  size_t visitNegativeInteger(UInt value) {
-    UInt negated = UInt(~value + 1);
-    if (value <= 0x20) {
-      writeInteger(int8_t(negated));
-    } else if (value <= 0x80) {
+  size_t visitSignedInteger(Integer value) {
+    if (value > 0) {
+      visitUnsignedInteger(static_cast<UInt>(value));
+    } else if (value >= -0x20) {
+      writeInteger(int8_t(value));
+    } else if (value >= -0x80) {
       writeByte(0xD0);
-      writeInteger(int8_t(negated));
-    } else if (value <= 0x8000) {
+      writeInteger(int8_t(value));
+    } else if (value >= -0x8000) {
       writeByte(0xD1);
-      writeInteger(int16_t(negated));
-    } else if (value <= 0x80000000) {
+      writeInteger(int16_t(value));
+    }
+#if ARDUINOJSON_USE_LONG_LONG
+    else if (value >= -0x80000000LL)
+#else
+    else
+#endif
+    {
       writeByte(0xD2);
-      writeInteger(int32_t(negated));
+      writeInteger(int32_t(value));
     }
 #if ARDUINOJSON_USE_LONG_LONG
     else {
       writeByte(0xD3);
-      writeInteger(int64_t(negated));
+      writeInteger(int64_t(value));
     }
 #endif
     return bytesWritten();
   }
-  size_t visitPositiveInteger(UInt value) {
+  size_t visitUnsignedInteger(UInt value) {
     if (value <= 0x7F) {
       writeInteger(uint8_t(value));
     } else if (value <= 0xFF) {
@@ -7132,7 +7264,7 @@ inline size_t measureMsgPack(const TSource& source) {
 #define ARDUINOJSON_COMPILE_ERROR(msg) ARDUINOJSON_PRAGMA(GCC error msg)
 #define ARDUINOJSON_STRINGIFY(S) #S
 #define ARDUINOJSON_DEPRECATION_ERROR(X, Y) \
-  ARDUINOJSON_COMPILE_ERROR(ARDUINOJSON_STRINGIFY(X is a Y from ArduinoJson 5. Please see arduinojson.org/upgrade to learn how to upgrade your program to ArduinoJson version 6))
+  ARDUINOJSON_COMPILE_ERROR(ARDUINOJSON_STRINGIFY(X is a Y from ArduinoJson 5. Please see https:/\/arduinojson.org/upgrade to learn how to upgrade your program to ArduinoJson version 6))
 #define StaticJsonBuffer ARDUINOJSON_DEPRECATION_ERROR(StaticJsonBuffer, class)
 #define DynamicJsonBuffer ARDUINOJSON_DEPRECATION_ERROR(DynamicJsonBuffer, class)
 #define JsonBuffer ARDUINOJSON_DEPRECATION_ERROR(JsonBuffer, class)
diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index e2ddf3d3c..5ca529881 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -220,7 +220,7 @@ void WLED::loop()
 
     yield();
 
-    if (!offMode)
+    if (!offMode || strip.isOffRefreshRequred)
       strip.service();
 #ifdef ESP8266
     else if (!noWifiSleep)
@@ -370,7 +370,7 @@ void WLED::setup()
   updateFSInfo();
 
   DEBUG_PRINTLN(F("Reading config"));
-  deserializeConfig();
+  deserializeConfigFromFS();
 /*
 #if STATUSLED
   bool lStatusLed = false;
diff --git a/wled00/wled.h b/wled00/wled.h
index 35a9e1aca..5bd15cd74 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2105161
+#define VERSION 2105171
 
 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG
diff --git a/wled00/wled_eeprom.cpp b/wled00/wled_eeprom.cpp
index 576793a15..3f66a11d6 100644
--- a/wled00/wled_eeprom.cpp
+++ b/wled00/wled_eeprom.cpp
@@ -321,7 +321,7 @@ void loadSettingsFromEEPROM()
   notifyMacro = EEPROM.read(2201);
 
   strip.rgbwMode = EEPROM.read(2203);
-  //was skipFirstLed = EEPROM.read(2204);
+  //skipFirstLed = EEPROM.read(2204);
 
   if (EEPROM.read(2210) || EEPROM.read(2211) || EEPROM.read(2212))
   {
diff --git a/wled00/wled_server.cpp b/wled00/wled_server.cpp
index a076a6748..cb24c77f5 100644
--- a/wled00/wled_server.cpp
+++ b/wled00/wled_server.cpp
@@ -85,6 +85,7 @@ void initServer()
   AsyncCallbackJsonWebHandler* handler = new AsyncCallbackJsonWebHandler("/json", [](AsyncWebServerRequest *request) {
     bool verboseResponse = false;
     uint8_t vAPI = 1;
+    bool isConfig = false;
     { //scope JsonDocument so it releases its buffer
       DynamicJsonDocument jsonBuffer(JSON_BUFFER_SIZE);
       DeserializationError error = deserializeJson(jsonBuffer, (uint8_t*)(request->_tempObject));
@@ -92,16 +93,26 @@ void initServer()
       if (error || root.isNull()) {
         request->send(400, "application/json", F("{\"error\":9}")); return;
       }
+      const String& url = request->url();
+      isConfig = url.indexOf("cfg") > -1;
+      if (!isConfig) {
         if (root.containsKey("rev"))
         {
           vAPI = root["rev"] | 1;
         }
-      fileDoc = &jsonBuffer;  // used for applying presets (presets.cpp)
-      verboseResponse = deserializeState(root);
-      fileDoc = nullptr;
+        fileDoc = &jsonBuffer;  // used for applying presets (presets.cpp)
+        verboseResponse = deserializeState(root);
+        fileDoc = nullptr;
+      } else {
+        verboseResponse = deserializeConfig(root); //use verboseResponse to determine whether cfg change should be saved immediately
+      }
     }
-    if (verboseResponse) { //if JSON contains "v"
-      serveJson(request,vAPI); return; 
+    if (verboseResponse) {
+      if (!isConfig) {
+        serveJson(request,vAPI); return; //if JSON contains "v"
+      } else {
+        serializeConfig(); //Save new settings to FS
+      }
     } 
     request->send(200, "application/json", F("{\"success\":true}"));
   });
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index fb2df3cfb..0322fcde3 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -185,7 +185,7 @@ void getSettingsJS(byte subPage, char* dest)
   obuf = dest;
   olen = 0;
 
-  if (subPage <1 || subPage >7) return;
+  if (subPage <1 || subPage >8) return;
 
   if (subPage == 1)
   {
@@ -361,7 +361,7 @@ void getSettingsJS(byte subPage, char* dest)
       sappend('v',co,bus->getColorOrder());
       sappend('v',ls,bus->getStart());
       sappend('c',cv,bus->reversed);
-      sappend('c',sl,bus->skipFirstLed());
+      sappend('c',sl,bus->skippedLeds());
 //      sappend('c',ew,bus->isRgbw());
     }
     sappend('v',SET_F("MA"),strip.ablMilliampsMax);
@@ -577,7 +577,15 @@ void getSettingsJS(byte subPage, char* dest)
     sappend('i',SET_F("CH13"),DMXFixtureMap[12]);
     sappend('i',SET_F("CH14"),DMXFixtureMap[13]);
     sappend('i',SET_F("CH15"),DMXFixtureMap[14]);
-    }
+  }
   #endif
+
+  if (subPage == 8) //usermods
+  {
+    oappend(SET_F("numM="));
+    oappendi(usermods.getModCount());
+    oappend(";");
+  }
+
   oappend(SET_F("}</script>"));
 }