From 8ebc01229e0e32a0b87bf0e9dc7a692a9558b96b Mon Sep 17 00:00:00 2001
From: Clayton Sims <csims@dimagi.com>
Date: Wed, 7 Jun 2023 16:38:35 -0500
Subject: [PATCH 1/9] Initial checkin for ESP-NOW remote feature

---
 wled00/cfg.cpp                |  14 ++
 wled00/data/settings_wifi.htm |  11 ++
 wled00/fcn_declare.h          |   4 +
 wled00/html_settings.h        | 278 +++++++++++++++++-----------------
 wled00/ir.cpp                 |   9 --
 wled00/presets.cpp            |   9 ++
 wled00/remote.cpp             | 174 +++++++++++++++++++++
 wled00/remote_codes.h         |  17 +++
 wled00/set.cpp                |   8 +
 wled00/wled.cpp               |   1 +
 wled00/wled.h                 |   9 ++
 wled00/xml.cpp                |  23 +++
 12 files changed, 413 insertions(+), 144 deletions(-)
 create mode 100644 wled00/remote.cpp
 create mode 100644 wled00/remote_codes.h

diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index 16daac68d1..6e68581d54 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -441,6 +441,13 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
   CJSON(retainMqttMsg, if_mqtt[F("rtn")]);
 #endif
 
+#ifndef WLED_DISABLE_REMOTE
+  JsonObject remote = doc["remote"];
+  CJSON(enable_espnow_remote, remote[F("remote_enabled")]);
+  getStringFromJson(linked_remote, remote[F("linked_remote")], 13); // "wled/test"
+#endif
+
+
 #ifndef WLED_DISABLE_HUESYNC
   JsonObject if_hue = interfaces["hue"];
   CJSON(huePollingEnabled, if_hue["en"]);
@@ -893,6 +900,13 @@ void serializeConfig() {
   if_mqtt_topics[F("group")] = mqttGroupTopic;
 #endif
 
+#ifndef WLED_DISABLE_REMOTE
+  JsonObject remote = doc.createNestedObject(F("remote"));
+  remote[F("remote_enabled")] = enable_espnow_remote;
+  remote[F("linked_remote")] = linked_remote;
+#endif
+
+
 #ifndef WLED_DISABLE_HUESYNC
   JsonObject if_hue = interfaces.createNestedObject("hue");
   if_hue["en"] = huePollingEnabled;
diff --git a/wled00/data/settings_wifi.htm b/wled00/data/settings_wifi.htm
index 96971feadb..a8d9d6b8a8 100644
--- a/wled00/data/settings_wifi.htm
+++ b/wled00/data/settings_wifi.htm
@@ -182,6 +182,17 @@ <h3>Experimental</h3>
 		Disable WiFi sleep: <input type="checkbox" name="WS"><br>
 		<i>Can help with connectivity issues.<br>
 		Do not enable if WiFi is working correctly, increases power consumption.</i>
+
+		<div id="remd">
+			<h3>Wireless Remote</h3>
+			<i>Listen for events over ESP-NOW<br>
+			Keep disabled if not using a remote, increases power consumption.<br></i>
+		
+			Enable Remote: <input type="checkbox" name="RE"><br>
+			Hardware MAC: <input type="text" name="RMAC"><br>
+			Last Seen: <span class="rlid">None</span> <br>
+		</div>
+
 		<div id="ethd">
 			<h3>Ethernet Type</h3>
 			<select name="ETH">
diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index 0b5974f843..85d247638a 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -189,6 +189,7 @@ void serializePlaylist(JsonObject obj);
 //presets.cpp
 void initPresetsFile();
 void handlePresets();
+void presetFallback(uint8_t presetID, uint8_t effectID, uint8_t paletteID);
 bool applyPreset(byte index, byte callMode = CALL_MODE_DIRECT_CHANGE);
 inline bool applyTemporaryPreset() {return applyPreset(255);};
 void savePreset(byte index, const char* pname = nullptr, JsonObject saveobj = JsonObject());
@@ -196,6 +197,9 @@ inline void saveTemporaryPreset() {savePreset(255);};
 void deletePreset(byte index);
 bool getPresetName(byte index, String& name);
 
+//remote.cpp
+void handleRemote();
+
 //set.cpp
 bool isAsterisksOnly(const char* str, byte maxLen);
 void handleSettingsSet(AsyncWebServerRequest *request, byte subPage);
diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index c3dd24b9dc..c8d9ba9646 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -133,142 +133,150 @@ const uint8_t PAGE_settings[] PROGMEM = {
 
 
 // Autogenerated from wled00/data/settings_wifi.htm, do not edit!!
-const uint16_t PAGE_settings_wifi_length = 2143;
+const uint16_t PAGE_settings_wifi_length = 2263;
 const uint8_t PAGE_settings_wifi[] PROGMEM = {
-  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xb5, 0x58, 0x7b, 0x6f, 0xdb, 0xba,
-  0x15, 0xff, 0xdf, 0x9f, 0x82, 0xe1, 0x86, 0x40, 0x42, 0x14, 0xd9, 0x8e, 0xdb, 0xde, 0x2e, 0xb1,
-  0x7c, 0x97, 0x87, 0x6f, 0x93, 0x2d, 0x4d, 0x3d, 0x38, 0x68, 0x30, 0x74, 0xc5, 0xbd, 0x8a, 0x74,
-  0x6c, 0xb3, 0x91, 0x48, 0x4d, 0xa4, 0xec, 0x04, 0xa9, 0xbf, 0xfb, 0xce, 0x21, 0xe5, 0x67, 0x92,
-  0x6e, 0x28, 0x32, 0x14, 0x6d, 0x45, 0xf2, 0xf0, 0x3c, 0x7f, 0xe7, 0x41, 0x77, 0x77, 0xce, 0x3e,
-  0x9d, 0x5e, 0xff, 0x73, 0xd0, 0x67, 0x13, 0x93, 0x67, 0xbd, 0x2e, 0xfd, 0xcb, 0xb2, 0x58, 0x8e,
-  0x23, 0x0e, 0x92, 0xe3, 0x1a, 0xe2, 0xb4, 0xd7, 0xcd, 0xc1, 0xc4, 0x2c, 0x99, 0xc4, 0xa5, 0x06,
-  0x13, 0xf1, 0xca, 0x8c, 0xf6, 0xdf, 0xf3, 0x7a, 0xb7, 0x21, 0xe3, 0x1c, 0x22, 0x3e, 0x15, 0x30,
-  0x2b, 0x54, 0x69, 0x38, 0x4b, 0x94, 0x34, 0x20, 0x91, 0x6c, 0x26, 0x52, 0x33, 0x89, 0xde, 0xb6,
-  0x5a, 0x4b, 0xd2, 0xad, 0xa3, 0x14, 0xa6, 0x22, 0x81, 0x7d, 0xbb, 0x08, 0x84, 0x14, 0x46, 0xc4,
-  0xd9, 0xbe, 0x4e, 0xe2, 0x0c, 0xa2, 0x76, 0x90, 0xc7, 0xf7, 0x22, 0xaf, 0xf2, 0xe5, 0xba, 0xd2,
-  0x50, 0xda, 0x45, 0x7c, 0x8b, 0x6b, 0xa9, 0xf8, 0x13, 0xc9, 0xbd, 0xae, 0x11, 0x26, 0x83, 0xde,
-  0x8d, 0xf8, 0x4d, 0xb0, 0x21, 0x18, 0x23, 0xe4, 0x58, 0x77, 0x9b, 0x6e, 0xb3, 0xab, 0x93, 0x52,
-  0x14, 0xa6, 0xd7, 0x98, 0xc6, 0x25, 0xcb, 0x54, 0x22, 0x8a, 0x20, 0x8d, 0x52, 0x95, 0x54, 0x39,
-  0x2a, 0x14, 0xe0, 0x46, 0xb4, 0xd3, 0x0e, 0x90, 0xbd, 0xbc, 0x54, 0xaa, 0xd0, 0x51, 0x2b, 0x28,
-  0x4a, 0x18, 0xe2, 0x72, 0x38, 0xbc, 0x38, 0x8b, 0x38, 0x3f, 0x1a, 0x55, 0x32, 0x31, 0x42, 0x49,
-  0x36, 0xbe, 0x48, 0x3d, 0xf0, 0x1f, 0x4b, 0x30, 0x55, 0x29, 0x59, 0x1a, 0x8e, 0xc1, 0xf4, 0x33,
-  0x20, 0x2e, 0x27, 0x0f, 0xf6, 0x68, 0xbe, 0x24, 0x4d, 0xfa, 0x1b, 0x94, 0x49, 0x09, 0xb1, 0x81,
-  0x9a, 0x78, 0x83, 0xf0, 0xdc, 0xf3, 0x1f, 0x67, 0x42, 0xa6, 0x6a, 0x16, 0xaa, 0x02, 0xa4, 0xc7,
-  0x27, 0xc6, 0x14, 0xfa, 0xb0, 0xd9, 0xbc, 0x93, 0x2a, 0x9c, 0x65, 0x40, 0x52, 0x9a, 0x23, 0xbc,
-  0x5d, 0x95, 0xa0, 0x9b, 0xba, 0x36, 0xad, 0xf9, 0xa7, 0x99, 0x18, 0x89, 0xfd, 0xc5, 0x92, 0xaf,
-  0x31, 0x3c, 0xd9, 0x66, 0xb8, 0xbc, 0xc4, 0x03, 0xfe, 0xbb, 0x86, 0x6c, 0xb4, 0x4e, 0x7d, 0x85,
-  0xd4, 0x18, 0x1a, 0x6d, 0x18, 0x44, 0x1e, 0xba, 0xe2, 0x57, 0x2b, 0x1f, 0xc5, 0xf3, 0x3d, 0xeb,
-  0xa9, 0x43, 0xce, 0xfd, 0x3d, 0xde, 0xfc, 0xa6, 0x95, 0x6c, 0x4a, 0x30, 0x3c, 0x30, 0x11, 0x79,
-  0x81, 0x93, 0xbb, 0xb8, 0x7f, 0x64, 0xc2, 0x54, 0x68, 0x8a, 0x4a, 0x1a, 0xed, 0xb4, 0x02, 0x13,
-  0x0a, 0x29, 0xa1, 0x3c, 0xbf, 0xfe, 0x78, 0x19, 0x71, 0xf2, 0xa0, 0x44, 0xb1, 0x61, 0x18, 0xf2,
-  0x60, 0x04, 0x26, 0x99, 0xa0, 0xdd, 0xa1, 0x99, 0xa0, 0x4a, 0x10, 0xf5, 0x20, 0x24, 0x96, 0x9e,
-  0xbf, 0xda, 0xf9, 0x74, 0xfb, 0x0d, 0x12, 0x13, 0xc6, 0x5a, 0x8b, 0xb1, 0xf4, 0x1e, 0xe7, 0xc1,
-  0x23, 0xca, 0x9b, 0xa9, 0xf2, 0x4e, 0x1f, 0x7e, 0xf9, 0x3a, 0x0f, 0xf0, 0xee, 0x62, 0x1d, 0x6a,
-  0x0c, 0xb9, 0xe7, 0x41, 0x60, 0xfc, 0xa8, 0x67, 0xc2, 0x12, 0x6f, 0xec, 0x83, 0xfd, 0xcf, 0x0f,
-  0x4b, 0x48, 0xab, 0x04, 0x16, 0x87, 0x1e, 0x20, 0x6d, 0x0e, 0x4e, 0x20, 0x9e, 0xa7, 0x51, 0x14,
-  0x19, 0xfb, 0xe1, 0x7f, 0xff, 0x0e, 0x61, 0x51, 0xe9, 0x89, 0x67, 0x7c, 0xe4, 0x1d, 0x7c, 0xf9,
-  0xba, 0xa6, 0xca, 0xa3, 0x18, 0x79, 0x2d, 0x24, 0x85, 0x30, 0x03, 0x39, 0x36, 0x93, 0xdd, 0xdd,
-  0x25, 0x3a, 0xba, 0xed, 0x96, 0x5f, 0x47, 0x75, 0xb9, 0xb7, 0xb7, 0x17, 0x4c, 0x95, 0x48, 0x19,
-  0xfa, 0xf9, 0x5a, 0xe4, 0xa0, 0x2a, 0xe3, 0x5d, 0x05, 0x6d, 0xe8, 0xf8, 0x47, 0x6b, 0xa0, 0x3a,
-  0xca, 0xc0, 0x30, 0xe9, 0x9c, 0x77, 0x3a, 0x44, 0xd7, 0xa1, 0x0c, 0xe9, 0x3f, 0xd2, 0xae, 0x89,
-  0x10, 0x2d, 0x1c, 0x23, 0x83, 0xf6, 0x5b, 0x9f, 0x22, 0xa3, 0x63, 0x63, 0x4a, 0x71, 0x5b, 0x19,
-  0xf0, 0xb8, 0x48, 0x31, 0x70, 0x74, 0x25, 0xd8, 0x3e, 0xa1, 0x24, 0x78, 0xe9, 0x4c, 0x49, 0xcc,
-  0x59, 0x39, 0xa6, 0xf3, 0x6b, 0xcf, 0x47, 0x82, 0x75, 0x50, 0xcb, 0x70, 0x1a, 0x67, 0x15, 0x1c,
-  0x8d, 0x54, 0xe9, 0x91, 0x06, 0x80, 0xfa, 0x41, 0xd7, 0x84, 0xc9, 0x44, 0x64, 0x69, 0x09, 0xb2,
-  0xb6, 0xfb, 0x08, 0xf6, 0xf6, 0x7c, 0x74, 0x30, 0xe4, 0x6a, 0x0a, 0xa7, 0x74, 0xe6, 0xad, 0x68,
-  0xbe, 0xc0, 0x57, 0x7f, 0xc9, 0x40, 0x21, 0x03, 0xd5, 0x5d, 0xf8, 0xeb, 0x48, 0xe1, 0xbd, 0x1a,
-  0x56, 0xc2, 0x1a, 0xa7, 0x0a, 0x42, 0x1b, 0x59, 0xbd, 0xa5, 0xa6, 0xd5, 0x83, 0x07, 0xf0, 0x45,
-  0x7d, 0x75, 0x71, 0x09, 0xc4, 0x1a, 0x88, 0xfe, 0xf8, 0xf3, 0xe3, 0xf2, 0x64, 0xce, 0xbc, 0x7a,
-  0x45, 0x91, 0x9e, 0xb3, 0xf4, 0x24, 0xf7, 0xff, 0x58, 0x5d, 0xc4, 0x70, 0xd5, 0x56, 0xed, 0xee,
-  0x6e, 0x0b, 0x71, 0xae, 0x05, 0xf2, 0xe3, 0xf2, 0x93, 0x3c, 0x16, 0x17, 0x98, 0x20, 0xa9, 0x33,
-  0x4c, 0xf8, 0x73, 0xa7, 0xb0, 0xda, 0x54, 0x58, 0x3d, 0xaf, 0x30, 0xdf, 0x39, 0xc5, 0xac, 0x0b,
-  0xd4, 0x3a, 0xe2, 0x3f, 0x21, 0x7e, 0x4a, 0x56, 0xa3, 0xd4, 0xc2, 0x7e, 0x53, 0x84, 0xf2, 0x03,
-  0x89, 0xce, 0x2c, 0xb2, 0x38, 0x81, 0x1b, 0x61, 0x08, 0x7a, 0xf3, 0xf5, 0x04, 0x6a, 0x3f, 0x4d,
-  0x20, 0x3e, 0x5f, 0xcb, 0x55, 0x8c, 0xe3, 0xa3, 0x8b, 0xd6, 0x06, 0x8a, 0x76, 0xe0, 0xfb, 0x77,
-  0xab, 0xce, 0x0e, 0x02, 0xd6, 0xaa, 0x57, 0x23, 0xf4, 0x68, 0x05, 0x2e, 0x21, 0x8b, 0xca, 0x61,
-  0xcb, 0x3c, 0x14, 0x58, 0x38, 0x0d, 0xdc, 0x53, 0x2e, 0x87, 0xe8, 0x37, 0xe2, 0x83, 0x5f, 0xae,
-  0xa0, 0xba, 0xef, 0x4d, 0x8b, 0xb1, 0x1a, 0xbb, 0xb0, 0xf2, 0xa0, 0x73, 0x40, 0x6e, 0xb3, 0x32,
-  0xa2, 0x35, 0x3c, 0x05, 0xb0, 0x6d, 0xd6, 0x52, 0xe7, 0x4c, 0xc5, 0xe9, 0xdf, 0x86, 0x94, 0x8e,
-  0x58, 0x20, 0x9c, 0xfa, 0xd2, 0xc1, 0xdd, 0xd6, 0x64, 0x54, 0x49, 0x6e, 0x07, 0xab, 0x4c, 0x38,
-  0x65, 0xe4, 0xf6, 0x3e, 0x29, 0x8e, 0x7e, 0x27, 0xcd, 0x9b, 0xdf, 0xe2, 0x69, 0xbc, 0x60, 0xf0,
-  0x84, 0x30, 0xd6, 0x0f, 0x12, 0x59, 0x60, 0x5e, 0xa7, 0xe1, 0xad, 0x4a, 0x1f, 0x36, 0x62, 0x20,
-  0x89, 0x3e, 0x4e, 0xd3, 0xfe, 0x14, 0x0b, 0xf1, 0xa5, 0xd0, 0xd8, 0x93, 0xa0, 0xf4, 0x38, 0xa9,
-  0xc9, 0x03, 0x0f, 0x4b, 0xc6, 0xe3, 0x07, 0x30, 0x9f, 0x3d, 0x7f, 0xfe, 0x3c, 0x1d, 0x94, 0xa5,
-  0x2a, 0x51, 0x3d, 0xa4, 0x23, 0xb4, 0xa8, 0x0c, 0x21, 0xaf, 0xc6, 0x1e, 0xef, 0xd3, 0x3e, 0xab,
-  0xed, 0xc5, 0xa2, 0xc7, 0x46, 0x22, 0x03, 0x6b, 0x06, 0x76, 0x30, 0x2c, 0x56, 0xfc, 0xb2, 0xde,
-  0x57, 0x23, 0x6a, 0x92, 0x23, 0x31, 0xae, 0xca, 0xd8, 0x3a, 0xc8, 0x99, 0xc1, 0x46, 0xb1, 0xa0,
-  0x5a, 0xff, 0x2f, 0x79, 0x21, 0x13, 0x95, 0x17, 0xe8, 0x27, 0x60, 0x45, 0x3c, 0x06, 0x96, 0xc6,
-  0x26, 0xde, 0xc1, 0x8a, 0xbd, 0xe6, 0xd3, 0x21, 0xe2, 0x80, 0x93, 0x80, 0x43, 0x1e, 0x45, 0x75,
-  0xa9, 0xc7, 0x62, 0x6d, 0xf9, 0x85, 0x45, 0xa9, 0x8c, 0x4a, 0x54, 0xb6, 0xbb, 0xeb, 0xd9, 0xce,
-  0xd6, 0x0a, 0x3c, 0x5b, 0xc8, 0x23, 0xa2, 0xc8, 0x86, 0x46, 0x95, 0xc8, 0x95, 0x3a, 0xd7, 0x85,
-  0x81, 0x9c, 0x0c, 0x4f, 0x2e, 0x0a, 0xee, 0x63, 0x39, 0xac, 0xc9, 0xf0, 0x7e, 0x5e, 0xa0, 0xc2,
-  0xbf, 0x21, 0x7f, 0xf6, 0x51, 0xa5, 0x10, 0xb2, 0x41, 0x06, 0xb1, 0x06, 0x86, 0x8e, 0x40, 0x78,
-  0xdf, 0x5c, 0xf6, 0xcf, 0xd8, 0xc5, 0x00, 0x55, 0x0a, 0x36, 0x38, 0xea, 0x4d, 0x8e, 0x81, 0xe5,
-  0xe6, 0xfb, 0x44, 0x65, 0x11, 0xf0, 0x83, 0xe6, 0xb2, 0x6c, 0x6a, 0x1a, 0x9b, 0xc2, 0xaf, 0x45,
-  0xd4, 0xe6, 0xc1, 0x4e, 0xdb, 0x9f, 0x37, 0xba, 0xcd, 0xba, 0x71, 0x77, 0xb5, 0x79, 0xc0, 0x3e,
-  0xfe, 0x57, 0x91, 0x53, 0xb3, 0x67, 0x55, 0x99, 0x21, 0x4c, 0x68, 0x2b, 0x4c, 0x34, 0x66, 0xe1,
-  0x11, 0x12, 0x5a, 0x82, 0x6e, 0xd3, 0x8d, 0x2c, 0x14, 0x75, 0x0c, 0x06, 0x49, 0xc6, 0x34, 0xc2,
-  0xea, 0xd7, 0xeb, 0x62, 0xa1, 0xca, 0x1b, 0x8c, 0xe0, 0x4e, 0x5f, 0xbf, 0x6b, 0xce, 0x1c, 0xe0,
-  0x87, 0x23, 0xce, 0x70, 0x40, 0x99, 0x28, 0x3c, 0x29, 0x94, 0xa6, 0x49, 0x22, 0x15, 0x53, 0x96,
-  0x64, 0xd8, 0x87, 0x30, 0x4d, 0x14, 0xba, 0x63, 0xb6, 0xb9, 0x37, 0x81, 0xac, 0x38, 0xe1, 0xbd,
-  0x46, 0x17, 0xd1, 0x66, 0x30, 0x1a, 0x2e, 0xa1, 0xdc, 0x82, 0xa3, 0xd4, 0x24, 0x13, 0xc9, 0x5d,
-  0xc4, 0xcf, 0x49, 0xec, 0xaf, 0xdd, 0xa6, 0x3b, 0x40, 0xd5, 0x90, 0x45, 0xef, 0xf9, 0x3b, 0x8d,
-  0xe5, 0xa5, 0x13, 0xba, 0x74, 0x12, 0x27, 0x77, 0xab, 0x7b, 0x1b, 0x37, 0x74, 0x75, 0x9b, 0x0b,
-  0xd4, 0x71, 0x18, 0x4f, 0x81, 0xed, 0xb2, 0x53, 0x85, 0xd5, 0x22, 0x31, 0x2b, 0xe2, 0x49, 0x89,
-  0x7a, 0x39, 0x49, 0x93, 0x03, 0x37, 0x0c, 0xa1, 0x73, 0xab, 0x02, 0x1d, 0x73, 0x80, 0x5b, 0x9d,
-  0x5e, 0x7d, 0x83, 0x19, 0xc5, 0xe0, 0x1e, 0x51, 0x4d, 0x90, 0xac, 0x0b, 0x16, 0xd2, 0x74, 0x96,
-  0xe2, 0x1a, 0x9b, 0x1a, 0x92, 0xdf, 0x6c, 0xc7, 0x5f, 0xd9, 0x77, 0x45, 0xaa, 0x52, 0x01, 0x58,
-  0x53, 0x15, 0xa5, 0x5f, 0x39, 0x66, 0xd6, 0xbb, 0xcc, 0xb3, 0xc5, 0x81, 0x01, 0x02, 0xea, 0x81,
-  0x44, 0x4a, 0x65, 0x08, 0xfd, 0xa4, 0x81, 0x7f, 0x48, 0xe4, 0x5d, 0x5b, 0x97, 0xd8, 0x5a, 0x4d,
-  0x62, 0x75, 0x45, 0x5a, 0x4c, 0x78, 0xf4, 0xb9, 0x2c, 0x40, 0x11, 0xef, 0x1c, 0x70, 0x2b, 0x67,
-  0x21, 0xa6, 0xc0, 0x90, 0xe0, 0x47, 0xfa, 0x94, 0xdb, 0xe2, 0x64, 0xc5, 0x69, 0xb0, 0xc1, 0xe9,
-  0x5d, 0xc7, 0x71, 0x1a, 0x1a, 0xcc, 0x9b, 0x04, 0x11, 0xcd, 0xb0, 0x91, 0x91, 0x5b, 0x63, 0xc3,
-  0x5a, 0xa1, 0xfd, 0xc3, 0x10, 0x2a, 0xec, 0xec, 0xfc, 0x74, 0xb0, 0xa1, 0x6c, 0xcd, 0xee, 0xa2,
-  0xc5, 0x6b, 0x49, 0xb2, 0xca, 0x6f, 0xa1, 0xe4, 0x0b, 0x7c, 0x20, 0xb4, 0x72, 0x21, 0x23, 0xde,
-  0xb2, 0xe2, 0x22, 0x7e, 0xf0, 0xf6, 0x2d, 0x67, 0x25, 0xfc, 0xbb, 0x12, 0x38, 0x9b, 0xf4, 0x58,
-  0xc8, 0xb6, 0xf8, 0xb4, 0x5f, 0x89, 0xcf, 0xc1, 0x2b, 0xf1, 0xe9, 0xfc, 0x14, 0x9f, 0x35, 0x57,
-  0x8e, 0x71, 0xd2, 0x9d, 0xc5, 0x0f, 0x87, 0x8d, 0x35, 0xa7, 0x39, 0xde, 0x1f, 0x7e, 0xda, 0x67,
-  0x8d, 0x4d, 0x3e, 0xaf, 0xe4, 0xb3, 0x0f, 0xaf, 0xe4, 0xb3, 0x0f, 0x3f, 0xef, 0xb3, 0x46, 0xed,
-  0x34, 0xcc, 0x6c, 0xcc, 0x43, 0xa4, 0xd2, 0x77, 0x87, 0x4f, 0xfc, 0x36, 0xfc, 0x1f, 0xfc, 0xd6,
-  0xf8, 0xa1, 0xa2, 0x35, 0x9f, 0xf6, 0x2b, 0xf1, 0x39, 0x78, 0x25, 0x3e, 0x9d, 0x9f, 0xe3, 0x43,
-  0x0e, 0xca, 0xcf, 0xae, 0x86, 0x0c, 0x1b, 0x34, 0xbe, 0x8a, 0xf4, 0x22, 0x75, 0x5d, 0xa1, 0xa1,
-  0xac, 0x95, 0x8a, 0x11, 0x81, 0x4b, 0xdc, 0xba, 0xe9, 0xd4, 0xb2, 0x1b, 0x1b, 0xe5, 0xa6, 0xae,
-  0x0d, 0x1f, 0x9f, 0x54, 0x19, 0x66, 0x5b, 0x6a, 0x46, 0xf7, 0x4f, 0x33, 0x81, 0xbd, 0x0f, 0x4b,
-  0xc4, 0x21, 0xeb, 0xea, 0x22, 0x96, 0x4b, 0x2d, 0x45, 0x81, 0x7d, 0xe0, 0x6a, 0x55, 0xd4, 0x20,
-  0xc5, 0x4e, 0x84, 0x04, 0x56, 0xc1, 0xba, 0xdc, 0xda, 0x56, 0x0f, 0xec, 0x38, 0x49, 0x48, 0xd1,
-  0x81, 0x12, 0xd2, 0xd8, 0x4a, 0xdb, 0x38, 0x1e, 0x30, 0x2a, 0x8f, 0xcf, 0xea, 0x7e, 0x3c, 0x78,
-  0xb1, 0x3e, 0x3a, 0x85, 0x8f, 0x9f, 0x96, 0x45, 0x9b, 0x6e, 0xe7, 0x22, 0x45, 0x59, 0x03, 0x4b,
-  0x75, 0xc8, 0x36, 0xae, 0x27, 0x13, 0x48, 0xee, 0x6e, 0xd5, 0xfd, 0x92, 0xc5, 0xb9, 0x2b, 0x80,
-  0xa4, 0xc8, 0xa2, 0x58, 0x3e, 0x55, 0x86, 0x9e, 0x90, 0xfe, 0x8f, 0xaa, 0x6b, 0xcd, 0x6c, 0xe0,
-  0x22, 0xb5, 0x56, 0x5d, 0x91, 0xa9, 0xc1, 0x81, 0x01, 0xa3, 0xe8, 0x85, 0x8f, 0xef, 0x83, 0x77,
-  0x9d, 0xb9, 0xff, 0x1d, 0x7b, 0x06, 0xb3, 0x6f, 0xf2, 0x88, 0xf7, 0xad, 0x08, 0x94, 0x80, 0x81,
-  0x0e, 0xd9, 0x7b, 0xfb, 0x0b, 0x43, 0x8c, 0x2e, 0x2c, 0xf5, 0x42, 0xad, 0x35, 0x8f, 0x31, 0xdb,
-  0xca, 0xe8, 0x41, 0x23, 0x21, 0x3b, 0xdc, 0x04, 0xd1, 0xf1, 0xe9, 0x0b, 0x20, 0xba, 0x5f, 0xa0,
-  0xa8, 0xbd, 0x40, 0x51, 0xbb, 0xb3, 0x05, 0x22, 0x34, 0x9d, 0x0c, 0xd4, 0x14, 0x58, 0xfb, 0x30,
-  0x58, 0xf0, 0xc4, 0x06, 0xdf, 0x75, 0x4f, 0x00, 0xe6, 0xa6, 0x5d, 0x84, 0x22, 0x85, 0x7a, 0x11,
-  0x69, 0x3a, 0x88, 0x47, 0x34, 0x0f, 0xdd, 0x2a, 0x85, 0x01, 0x75, 0xb4, 0xdb, 0x77, 0xda, 0xbc,
-  0x77, 0x26, 0xf4, 0x1a, 0x38, 0xb6, 0xc8, 0x1a, 0x35, 0x1d, 0x46, 0xef, 0x38, 0xc3, 0x92, 0xa9,
-  0x5f, 0x62, 0x84, 0xbd, 0xea, 0x0a, 0xa6, 0x28, 0xcd, 0xa3, 0x16, 0x5a, 0x02, 0x8e, 0x88, 0x39,
-  0x8e, 0xb4, 0x90, 0xfa, 0xcb, 0x1b, 0x34, 0x2d, 0x59, 0x13, 0x16, 0x86, 0x3d, 0x0f, 0x57, 0x42,
-  0x2b, 0xba, 0x59, 0x4c, 0x61, 0x0b, 0xaa, 0xfd, 0xfb, 0x02, 0x4a, 0x41, 0x3f, 0x4f, 0x20, 0xe8,
-  0x2d, 0x40, 0xcf, 0xdc, 0xc3, 0xc4, 0xf9, 0x5e, 0x67, 0x00, 0xc5, 0x7f, 0x41, 0xd4, 0xcd, 0xd0,
-  0x85, 0xae, 0x2b, 0x7a, 0x8d, 0x53, 0x94, 0x4b, 0x93, 0x12, 0x9b, 0xe1, 0x8b, 0x60, 0xe9, 0xb5,
-  0xa9, 0xc0, 0x98, 0x0b, 0xad, 0x2b, 0xd0, 0xa1, 0x0d, 0xf2, 0x99, 0x1b, 0x0a, 0x40, 0x5a, 0x49,
-  0x62, 0xe4, 0x84, 0x09, 0xcd, 0xa8, 0xbb, 0xd3, 0x70, 0x92, 0xa8, 0x12, 0xcd, 0x35, 0xd9, 0x43,
-  0xc0, 0x84, 0xa4, 0x5f, 0x51, 0x34, 0x68, 0x56, 0xa8, 0x19, 0xfa, 0x82, 0x06, 0xf0, 0x2a, 0xb7,
-  0xd6, 0x87, 0xdd, 0xa6, 0xb0, 0x43, 0x9a, 0x1b, 0xf1, 0x70, 0x9e, 0x4b, 0xb9, 0xb3, 0x8a, 0x9e,
-  0x64, 0x54, 0x58, 0xaf, 0x51, 0x63, 0x37, 0xe1, 0x6c, 0x04, 0xba, 0x7f, 0x7d, 0xfe, 0x5c, 0xa4,
-  0xaf, 0x94, 0x84, 0xc6, 0x4b, 0xc1, 0xf8, 0x0b, 0x46, 0xeb, 0xe4, 0x74, 0xc7, 0x4d, 0xc2, 0x9f,
-  0xdf, 0x74, 0x70, 0x10, 0xa3, 0x91, 0x1d, 0xcb, 0x38, 0xda, 0xf0, 0xd2, 0x25, 0x4a, 0xd0, 0xfe,
-  0x70, 0xd0, 0x39, 0xd8, 0x1f, 0x7c, 0xea, 0xbf, 0x44, 0xf4, 0x8e, 0xf7, 0x2c, 0xcd, 0x19, 0x54,
-  0xf7, 0x2f, 0xd1, 0xfc, 0xc2, 0x7b, 0x7f, 0xbf, 0xb8, 0xde, 0xff, 0xdc, 0x7f, 0x51, 0xbf, 0xf7,
-  0xbc, 0xf7, 0x8f, 0x4a, 0x48, 0xd4, 0x6e, 0xff, 0x4c, 0x8c, 0xf7, 0x3f, 0x25, 0x26, 0x46, 0x15,
-  0xaf, 0xf7, 0xd1, 0xd6, 0x67, 0x85, 0x2f, 0x50, 0xf8, 0x66, 0x75, 0xcf, 0x6a, 0xf1, 0x22, 0xaa,
-  0xd1, 0x41, 0x43, 0x28, 0xc7, 0xbf, 0xbc, 0x21, 0x96, 0xcf, 0xd0, 0x2d, 0x18, 0xbe, 0xe5, 0xbd,
-  0xeb, 0x99, 0xc8, 0xc4, 0x78, 0x62, 0x2e, 0xb1, 0x56, 0xfc, 0x98, 0x2b, 0x42, 0xfc, 0xe6, 0x79,
-  0x82, 0xc6, 0x2a, 0x9b, 0x6e, 0xae, 0xd1, 0x81, 0x28, 0xb4, 0xd5, 0x5e, 0x51, 0xad, 0xc3, 0xde,
-  0xfe, 0xad, 0xe7, 0xdf, 0xf2, 0xff, 0x3e, 0x6d, 0x37, 0xe9, 0x29, 0x41, 0x89, 0x47, 0xef, 0x0d,
-  0x7a, 0x7c, 0xd0, 0xaf, 0xa8, 0xff, 0x01, 0xf6, 0x31, 0xb5, 0x95, 0x55, 0x15, 0x00, 0x00
+  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xb5, 0x58, 0x6d, 0x53, 0xdb, 0x48,
+  0x12, 0xfe, 0xee, 0x5f, 0x31, 0xcc, 0x5e, 0x51, 0x52, 0x21, 0xcb, 0x36, 0x4e, 0xb2, 0x39, 0xb0,
+  0x9c, 0x03, 0xe3, 0x0d, 0xdc, 0x12, 0xf0, 0xc5, 0x54, 0xa8, 0xab, 0x5c, 0x6a, 0x57, 0x48, 0x6d,
+  0x7b, 0x82, 0x34, 0xa3, 0x93, 0x46, 0x36, 0x14, 0xf1, 0x7f, 0xdf, 0xee, 0x19, 0xf9, 0x15, 0x48,
+  0xae, 0x52, 0x5c, 0xa5, 0x8a, 0x48, 0x9a, 0x9e, 0xee, 0x9e, 0xa7, 0x9f, 0x7e, 0x19, 0x77, 0x76,
+  0x4e, 0x2e, 0x7b, 0x57, 0xff, 0x1e, 0xf4, 0xd9, 0x44, 0xa7, 0x49, 0xb7, 0x43, 0x7f, 0x59, 0x12,
+  0xca, 0x71, 0xc0, 0x41, 0x72, 0x7c, 0x87, 0x30, 0xee, 0x76, 0x52, 0xd0, 0x21, 0x8b, 0x26, 0x61,
+  0x5e, 0x80, 0x0e, 0x78, 0xa9, 0x47, 0xf5, 0xb7, 0xbc, 0xfa, 0x5a, 0x93, 0x61, 0x0a, 0x01, 0x9f,
+  0x0a, 0x98, 0x65, 0x2a, 0xd7, 0x9c, 0x45, 0x4a, 0x6a, 0x90, 0x28, 0x36, 0x13, 0xb1, 0x9e, 0x04,
+  0xaf, 0x9b, 0xcd, 0xa5, 0xe8, 0xd6, 0x52, 0x0c, 0x53, 0x11, 0x41, 0xdd, 0xbc, 0x78, 0x42, 0x0a,
+  0x2d, 0xc2, 0xa4, 0x5e, 0x44, 0x61, 0x02, 0x41, 0xcb, 0x4b, 0xc3, 0x3b, 0x91, 0x96, 0xe9, 0xf2,
+  0xbd, 0x2c, 0x20, 0x37, 0x2f, 0xe1, 0x0d, 0xbe, 0x4b, 0xc5, 0x1f, 0x59, 0xee, 0x76, 0xb4, 0xd0,
+  0x09, 0x74, 0xaf, 0xc5, 0x6f, 0x82, 0x0d, 0x41, 0x6b, 0x21, 0xc7, 0x45, 0xa7, 0x61, 0x3f, 0x76,
+  0x8a, 0x28, 0x17, 0x99, 0xee, 0xd6, 0xa6, 0x61, 0xce, 0x12, 0x15, 0x89, 0xcc, 0x8b, 0x83, 0x58,
+  0x45, 0x65, 0x8a, 0x0e, 0x79, 0xf8, 0x21, 0xd8, 0x69, 0x79, 0xa8, 0x5e, 0x9e, 0x2b, 0x95, 0x15,
+  0x41, 0xd3, 0xcb, 0x72, 0x18, 0xe2, 0xeb, 0x70, 0x78, 0x76, 0x12, 0x70, 0x7e, 0x38, 0x2a, 0x65,
+  0xa4, 0x85, 0x92, 0x6c, 0x7c, 0x16, 0x3b, 0xe0, 0x3e, 0xe4, 0xa0, 0xcb, 0x5c, 0xb2, 0xd8, 0x1f,
+  0x83, 0xee, 0x27, 0x40, 0x5a, 0x8e, 0xef, 0xcd, 0xd2, 0x7c, 0x29, 0x1a, 0xf5, 0x37, 0x24, 0xa3,
+  0x1c, 0x42, 0x0d, 0x95, 0xf0, 0x86, 0xe0, 0xa9, 0xe3, 0x3e, 0xcc, 0x84, 0x8c, 0xd5, 0xcc, 0x57,
+  0x19, 0x48, 0x87, 0x4f, 0xb4, 0xce, 0x8a, 0x83, 0x46, 0xe3, 0x56, 0x2a, 0x7f, 0x96, 0x00, 0x59,
+  0x69, 0x8c, 0x70, 0x77, 0x99, 0x43, 0xd1, 0x28, 0xaa, 0xa3, 0x35, 0x7e, 0x99, 0x89, 0x91, 0xa8,
+  0x2f, 0x5e, 0xf9, 0x9a, 0xc2, 0xe3, 0x6d, 0x85, 0xcb, 0x4d, 0xdc, 0xe3, 0x7f, 0x14, 0x90, 0x8c,
+  0xd6, 0xa5, 0x2f, 0x50, 0x1a, 0x43, 0x53, 0x68, 0x06, 0x81, 0x83, 0x50, 0xbc, 0x33, 0xf6, 0xd1,
+  0x3c, 0xdf, 0x33, 0x48, 0x1d, 0x70, 0xee, 0xee, 0xf1, 0xc6, 0xd7, 0x42, 0xc9, 0x86, 0x04, 0xcd,
+  0x3d, 0x1d, 0x10, 0x0a, 0x9c, 0xe0, 0xe2, 0xee, 0xa1, 0xf6, 0x63, 0x51, 0x50, 0x54, 0xe2, 0x60,
+  0xa7, 0xe9, 0x69, 0x5f, 0x48, 0x09, 0xf9, 0xe9, 0xd5, 0x87, 0xf3, 0x80, 0x13, 0x82, 0x12, 0xcd,
+  0xfa, 0xbe, 0xcf, 0xbd, 0x11, 0xe8, 0x68, 0x82, 0xe7, 0xf6, 0xf5, 0x04, 0x5d, 0x82, 0xa0, 0x0b,
+  0x3e, 0xa9, 0x74, 0xdc, 0xd5, 0x97, 0xcb, 0x9b, 0xaf, 0x10, 0x69, 0x3f, 0x2c, 0x0a, 0x31, 0x96,
+  0xce, 0xc3, 0xdc, 0x7b, 0x40, 0x7b, 0x33, 0x95, 0xdf, 0x16, 0x07, 0x9f, 0xbf, 0xcc, 0x3d, 0xdc,
+  0xbb, 0x78, 0xf7, 0x0b, 0x0c, 0xb9, 0xe3, 0x80, 0xa7, 0xdd, 0xa0, 0xab, 0xfd, 0x1c, 0x77, 0xd4,
+  0xc1, 0xfc, 0xe7, 0xfa, 0x39, 0xc4, 0x65, 0x04, 0x8b, 0x45, 0x07, 0x50, 0x36, 0x05, 0x6b, 0x10,
+  0xd7, 0xe3, 0x20, 0x08, 0xb4, 0x79, 0x70, 0xbf, 0x7d, 0x03, 0x3f, 0x2b, 0x8b, 0x89, 0xa3, 0x5d,
+  0xd4, 0xed, 0x7d, 0xfe, 0xb2, 0xe6, 0xca, 0x83, 0x18, 0x39, 0x4d, 0x14, 0x05, 0x3f, 0x01, 0x39,
+  0xd6, 0x93, 0xdd, 0xdd, 0x25, 0x3b, 0x3a, 0xad, 0xa6, 0x5b, 0x45, 0x75, 0xf9, 0x6d, 0x6f, 0xcf,
+  0x9b, 0x2a, 0x11, 0x33, 0xc4, 0xf9, 0x4a, 0xa4, 0xa0, 0x4a, 0xed, 0x5c, 0x78, 0x2d, 0x68, 0xbb,
+  0x87, 0x6b, 0xa4, 0x3a, 0x4c, 0x40, 0x33, 0x69, 0xc1, 0xeb, 0x0d, 0x11, 0x3a, 0xb4, 0x21, 0xdd,
+  0x07, 0xfa, 0xaa, 0x03, 0x64, 0x0b, 0xc7, 0xc8, 0xe0, 0xf9, 0x0d, 0xa6, 0xa8, 0xe8, 0x48, 0xeb,
+  0x5c, 0xdc, 0x94, 0x1a, 0x1c, 0x2e, 0x62, 0x0c, 0x1c, 0x6d, 0xf1, 0xb6, 0x57, 0x28, 0x09, 0x9e,
+  0x5b, 0x53, 0x12, 0x73, 0x56, 0x8e, 0x69, 0xfd, 0xca, 0x71, 0x51, 0x60, 0x9d, 0xd4, 0xd2, 0x9f,
+  0x86, 0x49, 0x09, 0x87, 0x23, 0x95, 0x3b, 0xe4, 0x01, 0xa0, 0x7f, 0xd0, 0xd1, 0x7e, 0x34, 0x11,
+  0x49, 0x9c, 0x83, 0xac, 0xce, 0x7d, 0x08, 0x7b, 0x7b, 0x2e, 0x02, 0x0c, 0xa9, 0x9a, 0x42, 0x8f,
+  0xd6, 0x9c, 0x95, 0xcc, 0x67, 0xf8, 0xe2, 0x2e, 0x15, 0x28, 0x54, 0xa0, 0x3a, 0x0b, 0xbc, 0x0e,
+  0x15, 0xee, 0xab, 0x68, 0x25, 0xcc, 0xe1, 0x54, 0x46, 0x6c, 0xa3, 0x53, 0x6f, 0xb9, 0x69, 0xfc,
+  0xe0, 0x1e, 0x7c, 0x56, 0x5f, 0x6c, 0x5c, 0x3c, 0xb1, 0x46, 0xa2, 0x3f, 0xff, 0xf6, 0xb0, 0x5c,
+  0x99, 0x33, 0xa7, 0x7a, 0xa3, 0x48, 0xcf, 0x59, 0x7c, 0x9c, 0xba, 0x7f, 0xae, 0x36, 0x62, 0xb8,
+  0xaa, 0x53, 0xed, 0xee, 0x6e, 0x1b, 0xb1, 0xd0, 0x02, 0xe1, 0xb8, 0x7c, 0x24, 0xc4, 0xc2, 0x0c,
+  0x13, 0x24, 0xb6, 0x07, 0x13, 0xee, 0xdc, 0x3a, 0xac, 0x36, 0x1d, 0x56, 0x4f, 0x3b, 0xcc, 0x77,
+  0x7a, 0x98, 0x75, 0x9e, 0x5a, 0x67, 0xfc, 0x25, 0xf2, 0x27, 0x67, 0x15, 0x4b, 0x0d, 0xed, 0x37,
+  0x4d, 0x28, 0xd7, 0x93, 0x08, 0x66, 0x96, 0x84, 0x11, 0x5c, 0x0b, 0x4d, 0xd4, 0x9b, 0xaf, 0x27,
+  0x50, 0xeb, 0x71, 0x02, 0xf1, 0xf9, 0x5a, 0xae, 0x62, 0x1c, 0x1f, 0x6c, 0xb4, 0x36, 0x58, 0xb4,
+  0x03, 0xdf, 0xbe, 0x19, 0x77, 0x76, 0x90, 0xb0, 0xc6, 0xbd, 0x8a, 0xa1, 0x87, 0x2b, 0x72, 0x09,
+  0x99, 0x95, 0x96, 0x5b, 0xfa, 0x3e, 0xc3, 0xc2, 0xa9, 0xe1, 0x8e, 0x72, 0xd9, 0x47, 0xdc, 0x48,
+  0x0f, 0x3e, 0xd9, 0x82, 0x6a, 0x9f, 0x37, 0x4f, 0x8c, 0xd5, 0xd8, 0x86, 0x95, 0x7b, 0xed, 0x7d,
+  0x82, 0xcd, 0xd8, 0x08, 0xd6, 0xf8, 0xe4, 0xc1, 0xf6, 0xb1, 0x96, 0x3e, 0x27, 0x2a, 0x8c, 0xff,
+  0x39, 0xa4, 0x74, 0xc4, 0x02, 0x61, 0xdd, 0x97, 0x96, 0xee, 0xa6, 0x26, 0xa3, 0x4b, 0x72, 0x3b,
+  0x58, 0x79, 0xc4, 0x29, 0x23, 0xb7, 0xbf, 0x93, 0xe3, 0x88, 0x3b, 0x79, 0xde, 0xf8, 0x1a, 0x4e,
+  0xc3, 0x85, 0x82, 0x47, 0x82, 0x61, 0x71, 0x2f, 0x51, 0x05, 0xe6, 0x75, 0xec, 0xdf, 0xa8, 0xf8,
+  0x7e, 0x23, 0x06, 0x92, 0xe4, 0xc3, 0x38, 0xee, 0x4f, 0xb1, 0x10, 0x9f, 0x8b, 0x02, 0x7b, 0x12,
+  0xe4, 0x0e, 0x27, 0x37, 0xb9, 0xe7, 0x60, 0xc9, 0x78, 0x78, 0x0f, 0xfa, 0x93, 0xe3, 0xce, 0x9f,
+  0x96, 0x83, 0x3c, 0x57, 0x39, 0xba, 0x87, 0x72, 0xc4, 0x16, 0x95, 0x20, 0xe5, 0xd5, 0xd8, 0xe1,
+  0x7d, 0xfa, 0xce, 0xaa, 0xf3, 0x62, 0xd1, 0x63, 0x23, 0x91, 0x80, 0x39, 0x06, 0x76, 0x30, 0x2c,
+  0x56, 0xfc, 0xbc, 0xfa, 0xae, 0x46, 0xd4, 0x24, 0x47, 0x62, 0x5c, 0xe6, 0xa1, 0x01, 0xc8, 0x1e,
+  0x83, 0x8d, 0x42, 0x41, 0xb5, 0xfe, 0x3f, 0xf2, 0x4c, 0x46, 0x2a, 0xcd, 0x10, 0x27, 0x60, 0x59,
+  0x38, 0x06, 0x16, 0x87, 0x3a, 0xdc, 0xc1, 0x8a, 0xbd, 0x86, 0xe9, 0x10, 0x79, 0xc0, 0xc9, 0xc0,
+  0x01, 0x0f, 0x82, 0xaa, 0xd4, 0x63, 0xb1, 0x36, 0xfa, 0xfc, 0x2c, 0x57, 0x5a, 0x45, 0x2a, 0xd9,
+  0xdd, 0x75, 0x4c, 0x67, 0x6b, 0x7a, 0x8e, 0x29, 0xe4, 0x01, 0x49, 0x24, 0x43, 0xad, 0x72, 0xd4,
+  0x4a, 0x9d, 0xeb, 0x4c, 0x43, 0x4a, 0x07, 0x8f, 0xce, 0x32, 0xee, 0x62, 0x39, 0xac, 0xc4, 0x70,
+  0x7f, 0x9a, 0xa1, 0xc3, 0xbf, 0xa1, 0x7e, 0xf6, 0x41, 0xc5, 0xe0, 0xb3, 0x41, 0x02, 0x61, 0x01,
+  0x0c, 0x81, 0x40, 0x7a, 0x5f, 0x9f, 0xf7, 0x4f, 0xd8, 0xd9, 0x00, 0x5d, 0xf2, 0x36, 0x34, 0x16,
+  0x9b, 0x1a, 0x3d, 0xa3, 0xcd, 0x75, 0x49, 0xca, 0x30, 0xe0, 0x3b, 0xcd, 0x65, 0xd9, 0xd4, 0x0a,
+  0x6c, 0x0a, 0xef, 0xb2, 0xa0, 0xc5, 0xbd, 0x9d, 0x96, 0x3b, 0xaf, 0x75, 0x1a, 0x55, 0xe3, 0xee,
+  0x14, 0xfa, 0x1e, 0xfb, 0xf8, 0x3f, 0x44, 0x4a, 0xcd, 0x9e, 0x95, 0x79, 0x82, 0x34, 0xa1, 0x4f,
+  0x7e, 0x54, 0x60, 0x16, 0x1e, 0xa2, 0xa0, 0x11, 0xe8, 0x34, 0xec, 0xc8, 0x42, 0x51, 0xc7, 0x60,
+  0x90, 0x65, 0x4c, 0x23, 0xac, 0x7e, 0xdd, 0x0e, 0x16, 0xaa, 0xb4, 0xc6, 0x88, 0xee, 0xf4, 0xf4,
+  0x47, 0xc1, 0x99, 0x25, 0xfc, 0x70, 0xc4, 0x19, 0x0e, 0x28, 0x13, 0x85, 0x2b, 0x99, 0x2a, 0x68,
+  0x92, 0x88, 0xc5, 0x94, 0x45, 0x09, 0xf6, 0x21, 0x4c, 0x13, 0x85, 0x70, 0xcc, 0x36, 0xbf, 0x4d,
+  0x20, 0xc9, 0x8e, 0x79, 0xb7, 0xd6, 0x41, 0xb6, 0x69, 0x8c, 0x86, 0x4d, 0x28, 0xfb, 0xc2, 0xd1,
+  0x6a, 0x94, 0x88, 0xe8, 0x36, 0xe0, 0xa7, 0x64, 0xf6, 0x5d, 0xa7, 0x61, 0x17, 0xd0, 0x35, 0x54,
+  0xd1, 0x7d, 0x7a, 0x4f, 0x6d, 0xb9, 0xe9, 0x98, 0x36, 0x1d, 0x87, 0xd1, 0xed, 0x6a, 0xdf, 0xc6,
+  0x8e, 0xa2, 0xbc, 0x49, 0x05, 0xfa, 0x38, 0x0c, 0xa7, 0xc0, 0x76, 0x59, 0x4f, 0x61, 0xb5, 0x88,
+  0xf4, 0x4a, 0x78, 0x92, 0xa3, 0x5f, 0xd6, 0xd2, 0x64, 0xdf, 0x0e, 0x43, 0x08, 0x6e, 0x99, 0x21,
+  0x30, 0xfb, 0xf8, 0xa9, 0xdd, 0xad, 0x76, 0x30, 0xad, 0x18, 0xdc, 0x21, 0xab, 0x89, 0x92, 0x55,
+  0xc1, 0x42, 0x99, 0xf6, 0xd2, 0x5c, 0x6d, 0xd3, 0x43, 0xc2, 0xcd, 0x74, 0xfc, 0xd5, 0xf9, 0x2e,
+  0xc8, 0x55, 0x2a, 0x00, 0x6b, 0xae, 0xa2, 0xf5, 0x0b, 0xab, 0xcc, 0xa0, 0xcb, 0x1c, 0x53, 0x1c,
+  0x18, 0x20, 0xa1, 0xee, 0xc9, 0xa4, 0x54, 0x9a, 0xd8, 0x4f, 0x1e, 0xb8, 0x07, 0x24, 0xde, 0x31,
+  0x75, 0x89, 0xad, 0xd5, 0x24, 0x56, 0x55, 0xa4, 0xc5, 0x84, 0x47, 0x8f, 0xcb, 0x02, 0x14, 0xf0,
+  0xf6, 0x3e, 0x37, 0x76, 0x16, 0x66, 0x32, 0x0c, 0x09, 0x3e, 0xc4, 0x8f, 0xb5, 0x2d, 0x56, 0x56,
+  0x9a, 0x06, 0x1b, 0x9a, 0xde, 0xb4, 0xad, 0xa6, 0xa1, 0xc6, 0xbc, 0x89, 0x90, 0xd1, 0x0c, 0x1b,
+  0x19, 0xc1, 0x1a, 0x6a, 0xd6, 0xf4, 0xcd, 0x3f, 0x86, 0x54, 0x61, 0x27, 0xa7, 0xbd, 0xc1, 0x86,
+  0xb3, 0x95, 0xba, 0xb3, 0x26, 0xaf, 0x2c, 0xc9, 0x32, 0xbd, 0x81, 0x9c, 0x2f, 0xf8, 0x81, 0xd4,
+  0x4a, 0x85, 0x0c, 0x78, 0xd3, 0x98, 0x0b, 0xf8, 0xfe, 0xeb, 0xd7, 0x9c, 0xe5, 0xf0, 0xdf, 0x52,
+  0xe0, 0x6c, 0xd2, 0x65, 0x3e, 0xdb, 0xd2, 0xd3, 0x7a, 0x21, 0x3d, 0xfb, 0x2f, 0xa4, 0xa7, 0xfd,
+  0x53, 0x7a, 0xd6, 0xa0, 0x1c, 0xe3, 0xa4, 0x3b, 0x0b, 0xef, 0x0f, 0x6a, 0x6b, 0xa0, 0x59, 0xdd,
+  0xef, 0x7f, 0x1a, 0xb3, 0xda, 0xa6, 0x9e, 0x17, 0xc2, 0xec, 0xfd, 0x0b, 0x61, 0xf6, 0xfe, 0xe7,
+  0x31, 0xab, 0x55, 0xa0, 0x61, 0x66, 0x63, 0x1e, 0xa2, 0x54, 0x71, 0x7b, 0xf0, 0x08, 0xb7, 0xe1,
+  0xff, 0x80, 0x5b, 0xed, 0xbb, 0x8e, 0x56, 0x7a, 0x5a, 0x2f, 0xa4, 0x67, 0xff, 0x85, 0xf4, 0xb4,
+  0x7f, 0x4e, 0x0f, 0x01, 0x94, 0x9e, 0x5c, 0x0c, 0x19, 0x36, 0x68, 0xbc, 0x15, 0x15, 0x8b, 0xd4,
+  0xb5, 0x85, 0x86, 0xb2, 0x56, 0x2a, 0x46, 0x02, 0x36, 0x71, 0xab, 0xa6, 0x53, 0xd9, 0xae, 0x6d,
+  0x94, 0x9b, 0xaa, 0x36, 0x7c, 0x78, 0x54, 0x65, 0x98, 0x69, 0xa9, 0x09, 0xed, 0xef, 0x25, 0x02,
+  0x7b, 0x1f, 0x96, 0x88, 0x03, 0xd6, 0x29, 0xb2, 0x50, 0x2e, 0xbd, 0x14, 0x19, 0xf6, 0x81, 0x8b,
+  0x55, 0x51, 0x83, 0x18, 0x3b, 0x11, 0x0a, 0x18, 0x07, 0xab, 0x72, 0x6b, 0x5a, 0x3d, 0xb0, 0xa3,
+  0x28, 0x22, 0x47, 0x07, 0x4a, 0x48, 0x6d, 0x2a, 0x6d, 0xed, 0x68, 0xc0, 0xa8, 0x3c, 0x3e, 0xe9,
+  0xfb, 0xd1, 0xe0, 0xd9, 0xfa, 0x68, 0x1d, 0x3e, 0x7a, 0x5c, 0x16, 0x4d, 0xba, 0x9d, 0x8a, 0x18,
+  0x6d, 0x0d, 0x8c, 0xd4, 0x01, 0xdb, 0xd8, 0x1e, 0x4d, 0x20, 0xba, 0xbd, 0x51, 0x77, 0x4b, 0x15,
+  0xa7, 0xb6, 0x00, 0x92, 0x23, 0x8b, 0x62, 0xf9, 0xd8, 0x19, 0xba, 0x42, 0xba, 0xdf, 0xab, 0xae,
+  0x95, 0xb2, 0x81, 0x8d, 0xd4, 0x5a, 0x75, 0x45, 0xa5, 0x1a, 0x07, 0x06, 0x8c, 0xa2, 0xe3, 0x3f,
+  0xbc, 0xf5, 0xde, 0xb4, 0xe7, 0xee, 0x37, 0xec, 0x19, 0xcc, 0xdc, 0xc9, 0x03, 0xde, 0x37, 0x26,
+  0xd0, 0x02, 0x06, 0xda, 0x67, 0x6f, 0xcd, 0x2f, 0x0c, 0x21, 0x42, 0x98, 0x17, 0x0b, 0xb7, 0xd6,
+  0x10, 0x63, 0xa6, 0x95, 0xd1, 0x85, 0x46, 0x42, 0x72, 0xb0, 0x49, 0xa2, 0xa3, 0xde, 0x33, 0x24,
+  0xba, 0x5b, 0xb0, 0xa8, 0xb5, 0x60, 0x51, 0xab, 0xbd, 0x45, 0x22, 0x3c, 0x3a, 0x1d, 0xb0, 0xa0,
+  0xc0, 0x9a, 0x8b, 0xc1, 0x42, 0x27, 0x36, 0xf8, 0x8e, 0xbd, 0x02, 0x30, 0x3b, 0xed, 0x22, 0x15,
+  0x29, 0xd4, 0x8b, 0x48, 0xd3, 0x42, 0x38, 0xa2, 0x79, 0xe8, 0x46, 0x29, 0x0c, 0xa8, 0x95, 0xdd,
+  0xde, 0xd3, 0xe2, 0xdd, 0x13, 0x51, 0xac, 0x91, 0x63, 0x4b, 0xac, 0x56, 0xc9, 0x61, 0xf4, 0x8e,
+  0x12, 0x2c, 0x99, 0xc5, 0x73, 0x8a, 0xb0, 0x57, 0x5d, 0xc0, 0x14, 0xad, 0x39, 0xd4, 0x42, 0x73,
+  0xc0, 0x11, 0x31, 0xc5, 0x91, 0x16, 0x62, 0x77, 0xb9, 0x83, 0xa6, 0x25, 0x73, 0x84, 0xc5, 0xc1,
+  0x9e, 0xa6, 0x2b, 0xb1, 0x15, 0x61, 0x16, 0x53, 0xd8, 0xa2, 0x6a, 0xff, 0x2e, 0x83, 0x5c, 0xd0,
+  0xcf, 0x13, 0x48, 0x7a, 0x43, 0xd0, 0x13, 0x7b, 0x31, 0xb1, 0xd8, 0x17, 0x09, 0x40, 0xf6, 0x03,
+  0x46, 0x5d, 0x0f, 0x6d, 0xe8, 0x3a, 0xa2, 0x5b, 0xeb, 0xa1, 0x5d, 0x9a, 0x94, 0xd8, 0x0c, 0x6f,
+  0x04, 0x4b, 0xd4, 0xa6, 0x02, 0x63, 0x2e, 0x8a, 0xa2, 0x84, 0xc2, 0x37, 0x41, 0x3e, 0xb1, 0x43,
+  0x01, 0x48, 0x63, 0x49, 0x8c, 0xac, 0x31, 0x51, 0x30, 0xea, 0xee, 0x34, 0x9c, 0x44, 0x2a, 0xc7,
+  0xe3, 0xea, 0xe4, 0xde, 0x63, 0x42, 0xd2, 0xaf, 0x28, 0x05, 0x14, 0x2c, 0x53, 0x33, 0xc4, 0x82,
+  0x06, 0xf0, 0x32, 0x35, 0xa7, 0xf7, 0x3b, 0x0d, 0x61, 0x86, 0x34, 0x3b, 0xe2, 0xe1, 0x85, 0x35,
+  0xe6, 0xe6, 0x54, 0xd7, 0x18, 0xea, 0x84, 0x68, 0xf4, 0x11, 0xef, 0xb0, 0x1a, 0xec, 0x8c, 0x23,
+  0xba, 0x76, 0xa0, 0x37, 0x04, 0x07, 0x1a, 0xf0, 0x0b, 0xa6, 0x08, 0xdd, 0xfe, 0x70, 0x50, 0xbf,
+  0xb8, 0xbc, 0x36, 0x9e, 0xfd, 0x8e, 0xe7, 0x65, 0x8b, 0xbb, 0x19, 0x79, 0x46, 0x7e, 0x96, 0x05,
+  0xf9, 0x14, 0xb2, 0xdc, 0x68, 0xfb, 0x81, 0x4b, 0x84, 0x04, 0xba, 0x55, 0xeb, 0xdb, 0xc3, 0x59,
+  0x0f, 0x7e, 0x00, 0xe1, 0xc7, 0xbe, 0x85, 0xf0, 0x34, 0xcc, 0xe3, 0x59, 0x88, 0x75, 0xe3, 0xc3,
+  0x51, 0x6f, 0xb9, 0xa5, 0xf6, 0xb8, 0x0e, 0x7c, 0xc4, 0x75, 0xbb, 0xe3, 0x3c, 0xc4, 0xbb, 0xeb,
+  0x10, 0x40, 0x6e, 0x45, 0x3d, 0x4f, 0x44, 0x4c, 0x61, 0x97, 0x1b, 0x01, 0x37, 0x33, 0x62, 0xcd,
+  0x8c, 0xb5, 0x04, 0x18, 0x0e, 0xc0, 0x15, 0x60, 0x7d, 0xba, 0xc3, 0x52, 0x27, 0xba, 0x42, 0x5b,
+  0x16, 0xae, 0x8d, 0xcc, 0xe8, 0x5f, 0x9d, 0x3e, 0x95, 0x1a, 0xa4, 0xbf, 0xf6, 0x1c, 0x7b, 0xff,
+  0x8e, 0xf4, 0x3e, 0xee, 0xed, 0xd8, 0xab, 0xc3, 0xa7, 0x57, 0x6d, 0x9c, 0x5c, 0xe9, 0x8e, 0x83,
+  0x7d, 0x0f, 0x71, 0x79, 0x6e, 0x13, 0x55, 0x34, 0x8c, 0x47, 0x7b, 0xbf, 0x3e, 0xb8, 0xec, 0x3f,
+  0x27, 0xf4, 0x86, 0x77, 0x8d, 0xcc, 0x09, 0x94, 0x77, 0xcf, 0xc9, 0xfc, 0xca, 0xbb, 0xbf, 0x9f,
+  0x5d, 0xd5, 0x3f, 0xf5, 0x9f, 0xf5, 0xef, 0x2d, 0xef, 0xfe, 0xab, 0x14, 0x12, 0xbd, 0xab, 0x9f,
+  0x88, 0x71, 0xfd, 0x32, 0xd2, 0x21, 0xba, 0x78, 0x55, 0xc7, 0xb3, 0x3e, 0x69, 0x7c, 0x91, 0xb6,
+  0xaf, 0x56, 0xfb, 0x8c, 0x17, 0xcf, 0x96, 0x01, 0x04, 0x68, 0x08, 0xf9, 0xf8, 0xd7, 0x57, 0xa4,
+  0xf2, 0x09, 0xb9, 0x85, 0xc2, 0xd7, 0xbc, 0x7b, 0x35, 0x13, 0x89, 0x18, 0x4f, 0xf4, 0x39, 0x16,
+  0xd7, 0xef, 0x6b, 0xc5, 0x9a, 0x70, 0xfd, 0xb4, 0x40, 0x6d, 0x55, 0x7e, 0xae, 0xaf, 0x10, 0x40,
+  0x34, 0xda, 0x6c, 0xad, 0xa4, 0xd6, 0xeb, 0xc4, 0x8a, 0x0c, 0x74, 0x77, 0xf8, 0x7f, 0x5f, 0x4f,
+  0x1a, 0x74, 0xf7, 0xa2, 0x4a, 0x45, 0x17, 0x34, 0xba, 0xad, 0xd1, 0xcf, 0xce, 0x7f, 0x01, 0x83,
+  0x80, 0x44, 0x0c, 0x86, 0x16, 0x00, 0x00
 };
 
 
diff --git a/wled00/ir.cpp b/wled00/ir.cpp
index 3401232f2b..5c6c556a30 100644
--- a/wled00/ir.cpp
+++ b/wled00/ir.cpp
@@ -70,15 +70,6 @@ void decBrightness()
   }
 }
 
-// apply preset or fallback to a effect and palette if it doesn't exist
-void presetFallback(uint8_t presetID, uint8_t effectID, uint8_t paletteID)
-{
-  applyPreset(presetID, CALL_MODE_BUTTON_PRESET);
-  //these two will be overwritten if preset exists in handlePresets()
-  effectCurrent = effectID;
-  effectPalette = paletteID;
-}
-
 byte relativeChange(byte property, int8_t amount, byte lowerBoundary, byte higherBoundary)
 {
   int16_t new_val = (int16_t) property + amount;
diff --git a/wled00/presets.cpp b/wled00/presets.cpp
index 7c1ce6cc10..4a65c46ec0 100644
--- a/wled00/presets.cpp
+++ b/wled00/presets.cpp
@@ -120,6 +120,15 @@ bool applyPreset(byte index, byte callMode)
   return true;
 }
 
+// apply preset or fallback to a effect and palette if it doesn't exist
+void presetFallback(uint8_t presetID, uint8_t effectID, uint8_t paletteID)
+{
+  applyPreset(presetID, CALL_MODE_BUTTON_PRESET);
+  //these two will be overwritten if preset exists in handlePresets()
+  effectCurrent = effectID;
+  effectPalette = paletteID;
+}
+
 void handlePresets()
 {
   if (presetToSave) {
diff --git a/wled00/remote.cpp b/wled00/remote.cpp
new file mode 100644
index 0000000000..cb8c57da98
--- /dev/null
+++ b/wled00/remote.cpp
@@ -0,0 +1,174 @@
+#include "wled.h"
+#include "remote_codes.h"
+
+#ifdef WLED_DISABLE_REMOTE
+void handleRemote(){}
+#else
+
+// This is kind of an esoteric strucure because it's pulled from the "Wizmote"
+// product spec. That remote is used as the baseline for behavior and availability
+// since it's broadly commercially available and works out of the box as a drop-in
+typedef struct message_structure {
+  uint8_t program;      // 0x91 for ON button, 0x81 for all others
+  uint8_t seq[4];       // Incremetal sequence number 32 bit unsigned integer LSB first
+  uint8_t byte5 = 32;   // Unknown
+  uint8_t button;       // Identifies which button is being pressed
+  uint8_t byte8 = 1;    // Unknown, but always 0x01
+  uint8_t byte9 = 100;  // Unnkown, but always 0x64
+
+  uint8_t byte10;  // Unknown, maybe checksum
+  uint8_t byte11;  // Unknown, maybe checksum
+  uint8_t byte12;  // Unknown, maybe checksum
+  uint8_t byte13;  // Unknown, maybe checksum
+} message_structure;
+
+int esp_now_state = ESP_NOW_STATE_UNINIT;
+uint32_t last_seq = -1;
+
+int brightnessBeforeNightMode = NIGHT_MODE_DEACTIVATED;
+
+message_structure incoming;
+
+// Pulled from the IR Remote logic but reduced to 10 steps with a constant of 3
+const byte brightnessSteps[] = {
+  6, 9, 14, 22, 33, 50, 75, 113, 170, 255
+};
+const size_t numBrightnessSteps = sizeof(brightnessSteps) / sizeof(uint8_t);
+
+bool nightModeActive() {
+  return brightnessBeforeNightMode != NIGHT_MODE_DEACTIVATED;
+}
+
+void activateNightMode() {
+  brightnessBeforeNightMode = bri;
+  bri = NIGHT_MODE_BRIGHTNESS;
+}
+
+bool resetNightMode() {
+  if (!nightModeActive()) {
+    return false;
+  }
+  bri = brightnessBeforeNightMode;
+  brightnessBeforeNightMode = NIGHT_MODE_DEACTIVATED;
+  return true;
+}
+
+// increment `bri` to the next `brightnessSteps` value
+void brightnessUp() {
+  if (nightModeActive()) { return; }
+  // dumb incremental search is efficient enough for so few items
+  for (uint8_t index = 0; index < numBrightnessSteps; ++index) {
+    if (brightnessSteps[index] > bri) {
+      bri = brightnessSteps[index];
+      break;
+    }
+  }
+}
+
+// decrement `bri` to the next `brightnessSteps` value
+void brightnessDown() {
+  if (nightModeActive()) { return; }
+  // dumb incremental search is efficient enough for so few items
+  for (int index = numBrightnessSteps - 1; index >= 0; --index) {
+    if (brightnessSteps[index] < bri) {
+      bri = brightnessSteps[index];
+      break;
+    }
+  }
+}
+
+void setOn() {
+  if (resetNightMode()) {
+    stateUpdated(CALL_MODE_BUTTON);
+  }
+  if (!bri) {
+    toggleOnOff(); 
+  }
+}
+
+void setOff() {
+  if (resetNightMode()) {
+    stateUpdated(CALL_MODE_BUTTON);
+  }
+  if (bri) {
+    toggleOnOff(); 
+  }
+}
+ 
+// Callback function that will be executed when data is received
+void OnDataRecv(uint8_t * mac, uint8_t *incomingData, uint8_t len) {
+
+  sprintf (last_signal_src, "%02x%02x%02x%02x%02x%02x",
+    mac [0], mac [1], mac [2], mac [3], mac [4], mac [5]);
+
+  if (strcmp(last_signal_src, linked_remote) != 0) {
+    DEBUG_PRINT(F("ESP Now Message Received from Unlinked Sender: "));
+    DEBUG_PRINTLN(last_signal_src);
+    return;
+  }
+
+  if (len != sizeof(incoming)) {
+    DEBUG_PRINT(F("Unknown incoming ESP Now message received of length "));
+    DEBUG_PRINTLN(len);
+    return;
+  }
+
+  memcpy(&(incoming.program), incomingData, sizeof(incoming));
+  uint32_t cur_seq = incoming.seq[0] | (incoming.seq[1] << 8) | (incoming.seq[2] << 16) | (incoming.seq[3] << 24);
+
+  if (cur_seq == last_seq) {
+    return;
+  }
+
+
+  DEBUG_PRINT(F("Incoming ESP Now Packet["));
+  DEBUG_PRINT(cur_seq);
+  DEBUG_PRINT(F("] from sender["));
+  DEBUG_PRINT(last_signal_src);
+  DEBUG_PRINT(F("] button: "));
+  DEBUG_PRINTLN(incoming.button);
+  switch (incoming.button) {
+    case WIZMOTE_BUTTON_ON             : setOn();                                     stateUpdated(CALL_MODE_BUTTON); break;
+    case WIZMOTE_BUTTON_OFF            : setOff();                                    stateUpdated(CALL_MODE_BUTTON); break;
+    case WIZMOTE_BUTTON_ONE            : presetFallback(1, FX_MODE_STATIC,        0); resetNightMode(); break;
+    case WIZMOTE_BUTTON_TWO            : presetFallback(2, FX_MODE_BREATH,        0); resetNightMode(); break;
+    case WIZMOTE_BUTTON_THREE          : presetFallback(3, FX_MODE_FIRE_FLICKER,  0); resetNightMode(); break;
+    case WIZMOTE_BUTTON_FOUR           : presetFallback(4, FX_MODE_RAINBOW,       0); resetNightMode(); break;
+    case WIZMOTE_BUTTON_NIGHT          : activateNightMode();                         stateUpdated(CALL_MODE_BUTTON); break;
+    case WIZMOTE_BUTTON_BRIGHT_UP      : brightnessUp();                              stateUpdated(CALL_MODE_BUTTON); break;
+    case WIZMOTE_BUTTON_BRIGHT_DOWN    : brightnessDown();                            stateUpdated(CALL_MODE_BUTTON); break;
+    default: break;
+
+  }
+
+  last_seq = cur_seq;
+}
+
+void handleRemote() {
+  if (enable_espnow_remote) {
+    if (esp_now_state == ESP_NOW_STATE_UNINIT) {
+      DEBUG_PRINTLN(F("Initializing ESP_NOW listener"));
+      // Init ESP-NOW
+      if (esp_now_init() != 0) {
+        DEBUG_PRINTLN(F("Error initializing ESP-NOW"));
+        esp_now_state = ESP_NOW_STATE_ERROR;
+      }
+      esp_now_set_self_role(ESP_NOW_ROLE_SLAVE);
+      esp_now_register_recv_cb(OnDataRecv);
+      esp_now_state = ESP_NOW_STATE_ON;
+    }
+  } else {
+    if (esp_now_state == ESP_NOW_STATE_ON) {
+      DEBUG_PRINTLN(F("Disabling ESP-NOW Remote Listener"));
+      if (esp_now_deinit() != 0) {
+        DEBUG_PRINTLN(F("Error de-initializing ESP-NOW"));
+      }
+      esp_now_state = ESP_NOW_STATE_UNINIT;
+    } else if (esp_now_state == ESP_NOW_STATE_ERROR) {
+      //Clear any error states (allows retrying by cycling)
+      esp_now_state = ESP_NOW_STATE_UNINIT;
+    }
+  }
+}
+
+#endif
\ No newline at end of file
diff --git a/wled00/remote_codes.h b/wled00/remote_codes.h
new file mode 100644
index 0000000000..cc01b5c060
--- /dev/null
+++ b/wled00/remote_codes.h
@@ -0,0 +1,17 @@
+
+#define ESP_NOW_STATE_UNINIT       0
+#define ESP_NOW_STATE_ON           1
+#define ESP_NOW_STATE_ERROR        2
+
+#define NIGHT_MODE_DEACTIVATED     -1
+#define NIGHT_MODE_BRIGHTNESS      5
+
+#define WIZMOTE_BUTTON_ON          1
+#define WIZMOTE_BUTTON_OFF         2
+#define WIZMOTE_BUTTON_NIGHT       3
+#define WIZMOTE_BUTTON_ONE         16
+#define WIZMOTE_BUTTON_TWO         17
+#define WIZMOTE_BUTTON_THREE       18
+#define WIZMOTE_BUTTON_FOUR        19
+#define WIZMOTE_BUTTON_BRIGHT_UP   9
+#define WIZMOTE_BUTTON_BRIGHT_DOWN 8
\ No newline at end of file
diff --git a/wled00/set.cpp b/wled00/set.cpp
index 08927a67a3..8c433adfa2 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -36,6 +36,14 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
 
     noWifiSleep = request->hasArg(F("WS"));
 
+    #ifndef WLED_DISABLE_REMOTE
+    enable_espnow_remote = request->hasArg(F("RE"));
+    strlcpy(linked_remote,request->arg(F("RMAC")).c_str(), 13);
+
+    //Normalize MAC format to lowercase
+    strlcpy(linked_remote,strlwr(linked_remote), 13);
+    #endif
+
     #ifdef WLED_USE_ETHERNET
     ethernetType = request->arg(F("ETH")).toInt();
     WLED::instance().initEthernet();
diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 5859d0fc9d..7088306e35 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -46,6 +46,7 @@ void WLED::loop()
   handleIR();        // 2nd call to function needed for ESP32 to return valid results -- should be good for ESP8266, too
   #endif
   handleConnection();
+  handleRemote();
   handleSerial();
   handleNotifications();
   handleTransitions();
diff --git a/wled00/wled.h b/wled00/wled.h
index 44f9b4afd9..f0d21dcc73 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -44,6 +44,8 @@
   #define WLED_ENABLE_WEBSOCKETS
 #endif
 
+//#define WLED_DISABLE_REMOTE      // Removes dependence on esp now 
+
 #define WLED_ENABLE_FS_EDITOR      // enable /edit page for editing FS content. Will also be disabled with OTA lock
 
 // to toggle usb serial debug (un)comment the following line
@@ -105,6 +107,7 @@
 #endif
 #include <WiFiUdp.h>
 #include <DNSServer.h>
+#include <espnow.h>
 #ifndef WLED_DISABLE_OTA
   #define NO_OTA_PORT
   #include <ArduinoOTA.h>
@@ -444,6 +447,12 @@ WLED_GLOBAL bool hueApplyColor _INIT(true);
 
 WLED_GLOBAL uint16_t serialBaud _INIT(1152); // serial baud rate, multiply by 100
 
+#ifndef WLED_DISABLE_REMOTE
+WLED_GLOBAL bool enable_espnow_remote _INIT(false);
+WLED_GLOBAL char linked_remote[13]   _INIT("");
+WLED_GLOBAL char last_signal_src[13]   _INIT("");
+#endif
+
 // Time CONFIG
 WLED_GLOBAL bool ntpEnabled _INIT(false);    // get internet time. Only required if you use clock overlays or time-activated macros
 WLED_GLOBAL bool useAMPM _INIT(false);       // 12h/24h clock format
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index 5e2d617780..551d3e48c1 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -328,6 +328,11 @@ void getSettingsJS(byte subPage, char* dest)
     sappend('v',SET_F("AC"),apChannel);
     sappend('c',SET_F("WS"),noWifiSleep);
 
+    #ifndef WLED_DISABLE_REMOTE
+    sappend('c',SET_F("RE"),enable_espnow_remote);
+    sappends('s',SET_F("RMAC"),linked_remote);
+    #endif
+
     #ifdef WLED_USE_ETHERNET
     sappend('v',SET_F("ETH"),ethernetType);
     #else
@@ -335,6 +340,11 @@ void getSettingsJS(byte subPage, char* dest)
     oappend(SET_F("document.getElementById('ethd').style.display='none';"));
     #endif
 
+    #ifdef WLED_DISABLE_REMOTE
+    //hide remote settings if not compiled
+    oappend(SET_F("document.getElementById('remd').style.display='none';"));
+    #endif
+
     if (Network.isConnected()) //is connected
     {
       char s[32];
@@ -360,6 +370,19 @@ void getSettingsJS(byte subPage, char* dest)
     {
       sappends('m',SET_F("(\"sip\")[1]"),(char*)F("Not active"));
     }
+
+    #ifndef WLED_DISABLE_REMOTE
+    if (last_signal_src[0] != 0) //Have seen an ESP-NOW Remote
+    {
+      sappends('m',SET_F("(\"rlid\")[0]"),last_signal_src);
+    } else if (!enable_espnow_remote)
+    {
+      sappends('m',SET_F("(\"rlid\")[0]"),(char*)F("(Enable remote to listen)"));
+    } else 
+    {
+      sappends('m',SET_F("(\"rlid\")[0]"),(char*)F("None"));
+    }
+    #endif
   }
 
   if (subPage == 2)

From 4aa4fe7fcc2aadde6e28ec4c26f0d5b24a0fa8c6 Mon Sep 17 00:00:00 2001
From: Clayton Sims <csims@dimagi.com>
Date: Wed, 7 Jun 2023 16:42:50 -0500
Subject: [PATCH 2/9] cleanup irrelevant comment

---
 wled00/cfg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index 6e68581d54..84160cbff1 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -444,7 +444,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
 #ifndef WLED_DISABLE_REMOTE
   JsonObject remote = doc["remote"];
   CJSON(enable_espnow_remote, remote[F("remote_enabled")]);
-  getStringFromJson(linked_remote, remote[F("linked_remote")], 13); // "wled/test"
+  getStringFromJson(linked_remote, remote[F("linked_remote")], 13);
 #endif
 
 

From 553c7151082edebdfbd3dbf1d6956093ca3e0754 Mon Sep 17 00:00:00 2001
From: Clayton Sims <csims@dimagi.com>
Date: Wed, 7 Jun 2023 17:03:02 -0500
Subject: [PATCH 3/9] don't bring in espnow package includes when feature
 disabled

---
 wled00/wled.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/wled00/wled.h b/wled00/wled.h
index f0d21dcc73..2b054af7da 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -107,7 +107,9 @@
 #endif
 #include <WiFiUdp.h>
 #include <DNSServer.h>
-#include <espnow.h>
+#ifndef WLED_DISABLE_REMOTE
+  #include <espnow.h>
+#endif
 #ifndef WLED_DISABLE_OTA
   #define NO_OTA_PORT
   #include <ArduinoOTA.h>

From d3b4c9f457613d4a100e7dbf897aab182465f70a Mon Sep 17 00:00:00 2001
From: Clayton Sims <csims@dimagi.com>
Date: Thu, 8 Jun 2023 17:15:51 -0500
Subject: [PATCH 4/9] Formatting and removing inaccurate call mode hardcoding

---
 wled00/fcn_declare.h  |  2 +-
 wled00/ir.cpp         |  8 +++++++
 wled00/presets.cpp    |  4 ++--
 wled00/remote.cpp     | 53 ++++++++++++++++++++++++++++++-------------
 wled00/remote_codes.h | 17 --------------
 wled00/xml.cpp        |  8 +++----
 6 files changed, 51 insertions(+), 41 deletions(-)
 delete mode 100644 wled00/remote_codes.h

diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index 85d247638a..e093e8f298 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -189,8 +189,8 @@ void serializePlaylist(JsonObject obj);
 //presets.cpp
 void initPresetsFile();
 void handlePresets();
-void presetFallback(uint8_t presetID, uint8_t effectID, uint8_t paletteID);
 bool applyPreset(byte index, byte callMode = CALL_MODE_DIRECT_CHANGE);
+void applyPresetWithFallback(uint8_t presetID, uint8_t effectID, uint8_t paletteID, uint8_t callMode);
 inline bool applyTemporaryPreset() {return applyPreset(255);};
 void savePreset(byte index, const char* pname = nullptr, JsonObject saveobj = JsonObject());
 inline void saveTemporaryPreset() {savePreset(255);};
diff --git a/wled00/ir.cpp b/wled00/ir.cpp
index 5c6c556a30..c1ce92c6aa 100644
--- a/wled00/ir.cpp
+++ b/wled00/ir.cpp
@@ -70,6 +70,14 @@ void decBrightness()
   }
 }
 
+void presetFallback(uint8_t presetID, uint8_t effectID, uint8_t paletteID)
+{
+  applyPresetWithFallback(presetID, CALL_MODE_BUTTON_PRESET, effectID, paletteID);
+  //these two will be overwritten if preset exists in handlePresets()
+  effectCurrent = effectID;
+  effectPalette = paletteID;
+}
+
 byte relativeChange(byte property, int8_t amount, byte lowerBoundary, byte higherBoundary)
 {
   int16_t new_val = (int16_t) property + amount;
diff --git a/wled00/presets.cpp b/wled00/presets.cpp
index 4a65c46ec0..05a5d3cbe9 100644
--- a/wled00/presets.cpp
+++ b/wled00/presets.cpp
@@ -121,9 +121,9 @@ bool applyPreset(byte index, byte callMode)
 }
 
 // apply preset or fallback to a effect and palette if it doesn't exist
-void presetFallback(uint8_t presetID, uint8_t effectID, uint8_t paletteID)
+void applyPresetWithFallback(uint8_t index, uint8_t callMode, uint8_t effectID, uint8_t paletteID)
 {
-  applyPreset(presetID, CALL_MODE_BUTTON_PRESET);
+  applyPreset(index, callMode);
   //these two will be overwritten if preset exists in handlePresets()
   effectCurrent = effectID;
   effectPalette = paletteID;
diff --git a/wled00/remote.cpp b/wled00/remote.cpp
index cb8c57da98..7a27585675 100644
--- a/wled00/remote.cpp
+++ b/wled00/remote.cpp
@@ -1,5 +1,21 @@
 #include "wled.h"
-#include "remote_codes.h"
+
+#define ESP_NOW_STATE_UNINIT       0
+#define ESP_NOW_STATE_ON           1
+#define ESP_NOW_STATE_ERROR        2
+
+#define NIGHT_MODE_DEACTIVATED     -1
+#define NIGHT_MODE_BRIGHTNESS      5
+
+#define WIZMOTE_BUTTON_ON          1
+#define WIZMOTE_BUTTON_OFF         2
+#define WIZMOTE_BUTTON_NIGHT       3
+#define WIZMOTE_BUTTON_ONE         16
+#define WIZMOTE_BUTTON_TWO         17
+#define WIZMOTE_BUTTON_THREE       18
+#define WIZMOTE_BUTTON_FOUR        19
+#define WIZMOTE_BUTTON_BRIGHT_UP   9
+#define WIZMOTE_BUTTON_BRIGHT_DOWN 8
 
 #ifdef WLED_DISABLE_REMOTE
 void handleRemote(){}
@@ -22,12 +38,10 @@ typedef struct message_structure {
   uint8_t byte13;  // Unknown, maybe checksum
 } message_structure;
 
-int esp_now_state = ESP_NOW_STATE_UNINIT;
-uint32_t last_seq = -1;
-
-int brightnessBeforeNightMode = NIGHT_MODE_DEACTIVATED;
-
-message_structure incoming;
+static int esp_now_state = ESP_NOW_STATE_UNINIT;
+static uint32_t last_seq = -1;
+static int brightnessBeforeNightMode = NIGHT_MODE_DEACTIVATED;
+static message_structure incoming;
 
 // Pulled from the IR Remote logic but reduced to 10 steps with a constant of 3
 const byte brightnessSteps[] = {
@@ -94,6 +108,13 @@ void setOff() {
     toggleOnOff(); 
   }
 }
+
+void presetWithFallback(uint8_t presetID, uint8_t effectID, uint8_t paletteID) {
+  applyPresetWithFallback(presetID, CALL_MODE_BUTTON_PRESET, effectID, paletteID);
+  //these two will be overwritten if preset exists in handlePresets()
+  effectCurrent = effectID;
+  effectPalette = paletteID;
+}
  
 // Callback function that will be executed when data is received
 void OnDataRecv(uint8_t * mac, uint8_t *incomingData, uint8_t len) {
@@ -128,15 +149,15 @@ void OnDataRecv(uint8_t * mac, uint8_t *incomingData, uint8_t len) {
   DEBUG_PRINT(F("] button: "));
   DEBUG_PRINTLN(incoming.button);
   switch (incoming.button) {
-    case WIZMOTE_BUTTON_ON             : setOn();                                     stateUpdated(CALL_MODE_BUTTON); break;
-    case WIZMOTE_BUTTON_OFF            : setOff();                                    stateUpdated(CALL_MODE_BUTTON); break;
-    case WIZMOTE_BUTTON_ONE            : presetFallback(1, FX_MODE_STATIC,        0); resetNightMode(); break;
-    case WIZMOTE_BUTTON_TWO            : presetFallback(2, FX_MODE_BREATH,        0); resetNightMode(); break;
-    case WIZMOTE_BUTTON_THREE          : presetFallback(3, FX_MODE_FIRE_FLICKER,  0); resetNightMode(); break;
-    case WIZMOTE_BUTTON_FOUR           : presetFallback(4, FX_MODE_RAINBOW,       0); resetNightMode(); break;
-    case WIZMOTE_BUTTON_NIGHT          : activateNightMode();                         stateUpdated(CALL_MODE_BUTTON); break;
-    case WIZMOTE_BUTTON_BRIGHT_UP      : brightnessUp();                              stateUpdated(CALL_MODE_BUTTON); break;
-    case WIZMOTE_BUTTON_BRIGHT_DOWN    : brightnessDown();                            stateUpdated(CALL_MODE_BUTTON); break;
+    case WIZMOTE_BUTTON_ON             : setOn();                                         stateUpdated(CALL_MODE_BUTTON); break;
+    case WIZMOTE_BUTTON_OFF            : setOff();                                        stateUpdated(CALL_MODE_BUTTON); break;
+    case WIZMOTE_BUTTON_ONE            : presetWithFallback(1, FX_MODE_STATIC,        0); resetNightMode(); break;
+    case WIZMOTE_BUTTON_TWO            : presetWithFallback(2, FX_MODE_BREATH,        0); resetNightMode(); break;
+    case WIZMOTE_BUTTON_THREE          : presetWithFallback(3, FX_MODE_FIRE_FLICKER,  0); resetNightMode(); break;
+    case WIZMOTE_BUTTON_FOUR           : presetWithFallback(4, FX_MODE_RAINBOW,       0); resetNightMode(); break;
+    case WIZMOTE_BUTTON_NIGHT          : activateNightMode();                             stateUpdated(CALL_MODE_BUTTON); break;
+    case WIZMOTE_BUTTON_BRIGHT_UP      : brightnessUp();                                  stateUpdated(CALL_MODE_BUTTON); break;
+    case WIZMOTE_BUTTON_BRIGHT_DOWN    : brightnessDown();                                stateUpdated(CALL_MODE_BUTTON); break;
     default: break;
 
   }
diff --git a/wled00/remote_codes.h b/wled00/remote_codes.h
deleted file mode 100644
index cc01b5c060..0000000000
--- a/wled00/remote_codes.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#define ESP_NOW_STATE_UNINIT       0
-#define ESP_NOW_STATE_ON           1
-#define ESP_NOW_STATE_ERROR        2
-
-#define NIGHT_MODE_DEACTIVATED     -1
-#define NIGHT_MODE_BRIGHTNESS      5
-
-#define WIZMOTE_BUTTON_ON          1
-#define WIZMOTE_BUTTON_OFF         2
-#define WIZMOTE_BUTTON_NIGHT       3
-#define WIZMOTE_BUTTON_ONE         16
-#define WIZMOTE_BUTTON_TWO         17
-#define WIZMOTE_BUTTON_THREE       18
-#define WIZMOTE_BUTTON_FOUR        19
-#define WIZMOTE_BUTTON_BRIGHT_UP   9
-#define WIZMOTE_BUTTON_BRIGHT_DOWN 8
\ No newline at end of file
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index 551d3e48c1..3106e29b05 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -331,6 +331,9 @@ void getSettingsJS(byte subPage, char* dest)
     #ifndef WLED_DISABLE_REMOTE
     sappend('c',SET_F("RE"),enable_espnow_remote);
     sappends('s',SET_F("RMAC"),linked_remote);
+    #else
+    //hide remote settings if not compiled
+    oappend(SET_F("document.getElementById('remd').style.display='none';"));
     #endif
 
     #ifdef WLED_USE_ETHERNET
@@ -340,11 +343,6 @@ void getSettingsJS(byte subPage, char* dest)
     oappend(SET_F("document.getElementById('ethd').style.display='none';"));
     #endif
 
-    #ifdef WLED_DISABLE_REMOTE
-    //hide remote settings if not compiled
-    oappend(SET_F("document.getElementById('remd').style.display='none';"));
-    #endif
-
     if (Network.isConnected()) //is connected
     {
       char s[32];

From 1ef029987f7d5fc05014575645fc10a365e7733a Mon Sep 17 00:00:00 2001
From: Clayton Sims <csims@dimagi.com>
Date: Mon, 12 Jun 2023 17:09:19 -0500
Subject: [PATCH 5/9] Fork ESP Now code by platform (8266 v. esp32)

---
 wled00/remote.cpp | 8 ++++++++
 wled00/wled.h     | 9 ++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/wled00/remote.cpp b/wled00/remote.cpp
index 7a27585675..57c57c739c 100644
--- a/wled00/remote.cpp
+++ b/wled00/remote.cpp
@@ -117,7 +117,11 @@ void presetWithFallback(uint8_t presetID, uint8_t effectID, uint8_t paletteID) {
 }
  
 // Callback function that will be executed when data is received
+#ifdef ESP8266
 void OnDataRecv(uint8_t * mac, uint8_t *incomingData, uint8_t len) {
+#else
+void OnDataRecv(const uint8_t * mac, const uint8_t *incomingData, int len) {
+#endif
 
   sprintf (last_signal_src, "%02x%02x%02x%02x%02x%02x",
     mac [0], mac [1], mac [2], mac [3], mac [4], mac [5]);
@@ -174,7 +178,11 @@ void handleRemote() {
         DEBUG_PRINTLN(F("Error initializing ESP-NOW"));
         esp_now_state = ESP_NOW_STATE_ERROR;
       }
+
+      #ifdef ESP8266
       esp_now_set_self_role(ESP_NOW_ROLE_SLAVE);
+      #endif
+      
       esp_now_register_recv_cb(OnDataRecv);
       esp_now_state = ESP_NOW_STATE_ON;
     }
diff --git a/wled00/wled.h b/wled00/wled.h
index 2b054af7da..38d9a9382f 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -75,6 +75,9 @@
   {
   #include <user_interface.h>
   }
+  #ifndef WLED_DISABLE_REMOTE
+    #include <espnow.h>
+  #endif
 #else // ESP32
   #include <HardwareSerial.h>  // ensure we have the correct "Serial" on new MCUs (depends on ARDUINO_USB_MODE and ARDUINO_USB_CDC_ON_BOOT)
   #include <WiFi.h>
@@ -91,6 +94,9 @@
     #include <LittleFS.h>
   #endif
   #include "esp_task_wdt.h"
+  #ifndef WLED_DISABLE_REMOTE
+    #include <esp_now.h>
+  #endif
 #endif
 #include <Wire.h>
 #include <SPI.h>
@@ -107,9 +113,6 @@
 #endif
 #include <WiFiUdp.h>
 #include <DNSServer.h>
-#ifndef WLED_DISABLE_REMOTE
-  #include <espnow.h>
-#endif
 #ifndef WLED_DISABLE_OTA
   #define NO_OTA_PORT
   #include <ArduinoOTA.h>

From 14185df8f47bb01f233599f8e280dfc8a3353846 Mon Sep 17 00:00:00 2001
From: Clayton Sims <csims@dimagi.com>
Date: Mon, 12 Jun 2023 17:15:38 -0500
Subject: [PATCH 6/9] compiled html update

---
 wled00/html_settings.h | 300 +++++++++++++++++++++--------------------
 1 file changed, 154 insertions(+), 146 deletions(-)

diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index de1196de75..f930b8ccc4 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -8,7 +8,7 @@
 // Autogenerated from wled00/data/style.css, do not edit!!
 const uint16_t PAGE_settingsCss_length = 847;
 const uint8_t PAGE_settingsCss[] PROGMEM = {
-  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x55, 0xc1, 0x8e, 0x9b, 0x30,
+  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x55, 0xc1, 0x8e, 0x9b, 0x30,
   0x10, 0xfd, 0x15, 0xaa, 0x68, 0xa5, 0xad, 0x14, 0x10, 0x10, 0xc8, 0xa6, 0x46, 0x95, 0xaa, 0xde,
   0x7b, 0xab, 0xaa, 0x4a, 0xd5, 0x1e, 0x0c, 0x1e, 0x82, 0x15, 0x63, 0x23, 0xdb, 0x74, 0x49, 0x11,
   0xff, 0x5e, 0xdb, 0xc0, 0x42, 0xb2, 0x68, 0x7b, 0xa9, 0xa2, 0x44, 0xc4, 0x63, 0xc6, 0x6f, 0xde,
@@ -67,7 +67,7 @@ const uint8_t PAGE_settingsCss[] PROGMEM = {
 // Autogenerated from wled00/data/settings.htm, do not edit!!
 const uint16_t PAGE_settings_length = 992;
 const uint8_t PAGE_settings[] PROGMEM = {
-  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x56, 0x6d, 0x6f, 0xdb, 0x36,
+  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x56, 0x6d, 0x6f, 0xdb, 0x36,
   0x10, 0xfe, 0xee, 0x5f, 0xc1, 0xb0, 0x58, 0x23, 0xa1, 0xb2, 0xec, 0x38, 0xc3, 0xb0, 0xc9, 0x96,
   0x8b, 0x35, 0x2f, 0x9b, 0x87, 0x04, 0x0d, 0x90, 0xa4, 0xdd, 0x80, 0x7d, 0xa1, 0xc9, 0x93, 0xcc,
   0x46, 0x22, 0x05, 0xf2, 0xe4, 0xc4, 0x73, 0xf3, 0xdf, 0x77, 0x94, 0x9d, 0xb7, 0x26, 0x18, 0x86,
@@ -133,149 +133,157 @@ const uint8_t PAGE_settings[] PROGMEM = {
 
 
 // Autogenerated from wled00/data/settings_wifi.htm, do not edit!!
-const uint16_t PAGE_settings_wifi_length = 2141;
+const uint16_t PAGE_settings_wifi_length = 2259;
 const uint8_t PAGE_settings_wifi[] PROGMEM = {
-  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xb5, 0x58, 0x6b, 0x73, 0xdb, 0xba,
-  0x11, 0xfd, 0xae, 0x5f, 0x01, 0xa3, 0x1d, 0x0f, 0x39, 0xa6, 0x29, 0xc9, 0x4a, 0x72, 0x53, 0x5b,
-  0x54, 0xea, 0x87, 0x6e, 0xec, 0x36, 0xd7, 0x56, 0x47, 0x9e, 0x78, 0x3a, 0x69, 0xe6, 0x5e, 0x9a,
-  0x5c, 0x49, 0x88, 0x49, 0x80, 0x25, 0x40, 0xc9, 0x1e, 0x47, 0xff, 0xbd, 0xbb, 0x00, 0xf5, 0xb4,
-  0x9d, 0x76, 0x32, 0xee, 0x64, 0x92, 0x90, 0xc4, 0x62, 0x77, 0x71, 0xf6, 0xec, 0x03, 0xea, 0xee,
-  0x9c, 0x5d, 0x9d, 0x5e, 0xff, 0x73, 0xd0, 0x67, 0x13, 0x93, 0x67, 0xbd, 0x2e, 0xfd, 0xcb, 0xb2,
-  0x58, 0x8e, 0x23, 0x0e, 0x92, 0xe3, 0x3b, 0xc4, 0x69, 0xaf, 0x9b, 0x83, 0x89, 0x59, 0x32, 0x89,
-  0x4b, 0x0d, 0x26, 0xe2, 0x95, 0x19, 0xed, 0xbf, 0xe7, 0xf5, 0xd7, 0x86, 0x8c, 0x73, 0x88, 0xf8,
-  0x54, 0xc0, 0xac, 0x50, 0xa5, 0xe1, 0x2c, 0x51, 0xd2, 0x80, 0x44, 0xb1, 0x99, 0x48, 0xcd, 0x24,
-  0x7a, 0xdb, 0x6a, 0x2d, 0x45, 0xb7, 0x96, 0x52, 0x98, 0x8a, 0x04, 0xf6, 0xed, 0x4b, 0x20, 0xa4,
-  0x30, 0x22, 0xce, 0xf6, 0x75, 0x12, 0x67, 0x10, 0xb5, 0x83, 0x3c, 0xbe, 0x17, 0x79, 0x95, 0x2f,
-  0xdf, 0x2b, 0x0d, 0xa5, 0x7d, 0x89, 0x6f, 0xf1, 0x5d, 0x2a, 0xfe, 0xc4, 0x72, 0xaf, 0x6b, 0x84,
-  0xc9, 0xa0, 0x77, 0x23, 0x7e, 0x15, 0x6c, 0x08, 0xc6, 0x08, 0x39, 0xd6, 0xdd, 0xa6, 0xfb, 0xd8,
-  0xd5, 0x49, 0x29, 0x0a, 0xd3, 0x6b, 0x4c, 0xe3, 0x92, 0x65, 0x2a, 0x11, 0x45, 0x90, 0x46, 0xa9,
-  0x4a, 0xaa, 0x1c, 0x1d, 0x0a, 0xf0, 0x43, 0xb4, 0xd3, 0x0e, 0x50, 0xbd, 0xfc, 0xa4, 0x54, 0xa1,
-  0xa3, 0x56, 0x50, 0x94, 0x30, 0xc4, 0xd7, 0xe1, 0xf0, 0xe2, 0x2c, 0xe2, 0xfc, 0x68, 0x54, 0xc9,
-  0xc4, 0x08, 0x25, 0xd9, 0xf8, 0x22, 0xf5, 0x8c, 0xff, 0x58, 0x82, 0xa9, 0x4a, 0xc9, 0xd2, 0x70,
-  0x0c, 0xa6, 0x9f, 0x01, 0x69, 0x39, 0x79, 0xb0, 0x4b, 0xf3, 0xa5, 0x68, 0xd2, 0xdf, 0x90, 0x4c,
-  0x4a, 0x88, 0x0d, 0xd4, 0xc2, 0x1b, 0x82, 0xe7, 0x9e, 0xff, 0x38, 0x13, 0x32, 0x55, 0xb3, 0x50,
-  0x15, 0x20, 0x3d, 0x3e, 0x31, 0xa6, 0xd0, 0x87, 0xcd, 0xe6, 0x9d, 0x54, 0xe1, 0x2c, 0x03, 0xb2,
-  0xd2, 0x1c, 0xe1, 0xee, 0xaa, 0x04, 0xdd, 0xd4, 0xf5, 0xd1, 0x9a, 0x7f, 0x9a, 0x89, 0x91, 0xd8,
-  0x5f, 0xbc, 0xf2, 0x35, 0x85, 0x27, 0xdb, 0x0a, 0x97, 0x9b, 0x78, 0xc0, 0x7f, 0xd7, 0x90, 0x8d,
-  0xd6, 0xa5, 0x2f, 0x51, 0x1a, 0x43, 0xa3, 0x0d, 0x33, 0x91, 0x87, 0x50, 0x7c, 0xb0, 0xf6, 0xd1,
-  0x3c, 0xdf, 0xb3, 0x48, 0x1d, 0x72, 0xee, 0xef, 0xf1, 0xe6, 0x37, 0xad, 0x64, 0x53, 0x82, 0xe1,
-  0x01, 0x44, 0x84, 0x02, 0x27, 0xb8, 0xb8, 0x7f, 0x04, 0x61, 0x2a, 0x34, 0x45, 0x25, 0x8d, 0x76,
-  0x5a, 0x01, 0x84, 0x06, 0xee, 0xcd, 0xe9, 0x22, 0xd2, 0x84, 0xa1, 0x44, 0xc3, 0x61, 0x18, 0xf2,
-  0x60, 0x04, 0x26, 0x99, 0xe0, 0xc9, 0x43, 0x33, 0x41, 0xa7, 0x4c, 0xd4, 0x33, 0x21, 0x29, 0xf5,
-  0xfc, 0xd5, 0x97, 0xab, 0xdb, 0x6f, 0x90, 0x98, 0x30, 0xd6, 0x5a, 0x8c, 0xa5, 0xf7, 0x38, 0x0f,
-  0x1e, 0xd1, 0xe2, 0x4c, 0x95, 0x77, 0xfa, 0xf0, 0xcb, 0xd7, 0x79, 0x80, 0x7b, 0x17, 0xef, 0xa1,
-  0xc6, 0xa0, 0x7b, 0x9e, 0x09, 0xc0, 0x8f, 0x7a, 0x10, 0x96, 0xb8, 0x63, 0xdf, 0xd8, 0xff, 0xfc,
-  0xb0, 0x84, 0xb4, 0x4a, 0x60, 0xb1, 0xe8, 0x19, 0x94, 0xcd, 0xc1, 0x19, 0xc4, 0xf5, 0x34, 0x8a,
-  0x22, 0xb0, 0x0f, 0xfe, 0xf7, 0xef, 0x26, 0x2c, 0x2a, 0x3d, 0xf1, 0xc0, 0x47, 0xdd, 0xc1, 0x97,
-  0xaf, 0x6b, 0xae, 0x3c, 0x8a, 0x91, 0xd7, 0x42, 0x51, 0x13, 0x66, 0x20, 0xc7, 0x66, 0xb2, 0xbb,
-  0xbb, 0xe4, 0x47, 0xb7, 0xdd, 0xf2, 0xeb, 0xb8, 0x2e, 0xbf, 0xed, 0xed, 0x05, 0x53, 0x25, 0x52,
-  0x86, 0x48, 0x5f, 0x8b, 0x1c, 0x54, 0x65, 0xbc, 0xcb, 0xa0, 0x0d, 0x1d, 0xff, 0x68, 0x8d, 0x56,
-  0x47, 0x19, 0x18, 0x26, 0x1d, 0x7c, 0xa7, 0x43, 0x04, 0x0f, 0x6d, 0x48, 0xff, 0x91, 0xbe, 0x42,
-  0x84, 0x7c, 0xe1, 0x18, 0x1b, 0x3c, 0xbf, 0x45, 0x15, 0x15, 0x1d, 0x1b, 0x53, 0x8a, 0xdb, 0xca,
-  0x80, 0xc7, 0x45, 0x8a, 0xa1, 0xa3, 0x2d, 0xc1, 0xf6, 0x0a, 0xa5, 0xc1, 0x4b, 0x6b, 0x4a, 0x62,
-  0xd6, 0xca, 0x31, 0xad, 0x5f, 0x7b, 0x3e, 0x0a, 0xac, 0xd3, 0x5a, 0x86, 0xd3, 0x38, 0xab, 0xe0,
-  0x68, 0xa4, 0x4a, 0x8f, 0x3c, 0x30, 0xe8, 0x9f, 0xe9, 0x42, 0x98, 0x4c, 0x44, 0x96, 0x96, 0x20,
-  0xeb, 0x73, 0x1f, 0x99, 0xbd, 0x3d, 0x1f, 0x01, 0x86, 0x5c, 0x4d, 0xe1, 0x94, 0xd6, 0xbc, 0x95,
-  0xcc, 0x17, 0xf3, 0xd5, 0x5f, 0x2a, 0x50, 0xa8, 0x40, 0x75, 0x17, 0x78, 0x1d, 0x29, 0xdc, 0x57,
-  0x13, 0x4b, 0xdb, 0xc3, 0xa9, 0x82, 0xf8, 0x86, 0x87, 0xd3, 0x5b, 0x6e, 0x5a, 0x3f, 0x78, 0x60,
-  0xbe, 0xa8, 0xaf, 0x2e, 0x2e, 0x81, 0xde, 0xa0, 0xd1, 0x1f, 0x7f, 0x7e, 0x5c, 0xae, 0xcd, 0x99,
-  0x57, 0xbf, 0x51, 0xac, 0xe7, 0x2c, 0x3d, 0xc9, 0xfd, 0x3f, 0x56, 0x5b, 0x31, 0x60, 0xf5, 0xb9,
-  0x30, 0x5e, 0x5b, 0x66, 0x1c, 0xb8, 0x40, 0x48, 0x2e, 0x1f, 0x09, 0xb3, 0xb8, 0xc0, 0x24, 0x49,
-  0xdd, 0xd1, 0xb4, 0x3f, 0x77, 0x2e, 0xab, 0x4d, 0x97, 0xd5, 0xf3, 0x2e, 0xf3, 0x9d, 0x53, 0xcc,
-  0xbc, 0x40, 0x6d, 0xb2, 0xfe, 0x0a, 0x39, 0x54, 0xb2, 0x9a, 0xa9, 0x96, 0xfa, 0x9b, 0x46, 0x94,
-  0x1f, 0x48, 0x04, 0xb4, 0xc8, 0xe2, 0x04, 0x6e, 0x84, 0x21, 0xfa, 0xcd, 0xd7, 0xd3, 0xa8, 0xfd,
-  0x5c, 0x1a, 0xf1, 0xf9, 0x5a, 0xce, 0x62, 0x34, 0x1f, 0x5d, 0xcc, 0x36, 0xb8, 0xb4, 0x63, 0xbe,
-  0x7f, 0xb7, 0x2e, 0xed, 0x20, 0x6d, 0xad, 0x8b, 0x35, 0x4f, 0x8f, 0x56, 0x14, 0x13, 0xb2, 0xa8,
-  0x1c, 0xc3, 0xcc, 0x43, 0x81, 0x05, 0x94, 0x0c, 0x91, 0x83, 0x88, 0x1d, 0xe9, 0xc1, 0x27, 0x57,
-  0x58, 0xdd, 0xf3, 0xe6, 0xa9, 0xb1, 0x2a, 0xbb, 0xe0, 0xf2, 0xa0, 0x73, 0x40, 0xd0, 0x59, 0x1b,
-  0xd1, 0x1a, 0xab, 0x02, 0xb3, 0x7d, 0xb0, 0xa5, 0xcf, 0x99, 0x8a, 0xd3, 0xbf, 0x0d, 0x29, 0x29,
-  0xb1, 0x50, 0x38, 0xf7, 0xa5, 0x23, 0xbd, 0xad, 0xcd, 0xe8, 0x92, 0xdc, 0x0e, 0x58, 0x99, 0x70,
-  0xca, 0xcb, 0xed, 0xef, 0xe4, 0x38, 0x62, 0x4f, 0x9e, 0x37, 0xbf, 0xc5, 0xd3, 0x78, 0xa1, 0xe0,
-  0x89, 0x60, 0xac, 0x1f, 0x24, 0xaa, 0xc0, 0xec, 0x4e, 0xc3, 0x5b, 0x95, 0x3e, 0x6c, 0x44, 0x41,
-  0x92, 0x7c, 0x9c, 0xa6, 0xfd, 0x29, 0x62, 0xfc, 0x49, 0x68, 0x84, 0x1a, 0x4a, 0x8f, 0x93, 0x9b,
-  0x3c, 0xf0, 0xb0, 0x70, 0x3c, 0x7e, 0x04, 0xf3, 0xd9, 0xf3, 0xe7, 0xcf, 0xcb, 0x41, 0x59, 0xaa,
-  0x12, 0xdd, 0x43, 0x39, 0x62, 0x8c, 0xca, 0x20, 0xcc, 0xd4, 0xd8, 0xe3, 0x7d, 0xfa, 0xce, 0xea,
-  0xf3, 0x62, 0xe9, 0x63, 0x23, 0x91, 0x81, 0x3d, 0x06, 0x76, 0x32, 0x2c, 0x59, 0xfc, 0x53, 0xfd,
-  0x5d, 0x8d, 0xa8, 0x59, 0x8e, 0xc4, 0xb8, 0x2a, 0x63, 0x0b, 0x90, 0x3b, 0x06, 0x1b, 0xc5, 0x82,
-  0x6a, 0xfe, 0xbf, 0xe4, 0x85, 0x4c, 0x54, 0x5e, 0x20, 0x4e, 0xc0, 0x8a, 0x78, 0x0c, 0x2c, 0x8d,
-  0x4d, 0xbc, 0x83, 0x95, 0x7b, 0x0d, 0xd3, 0x21, 0xf2, 0x80, 0x93, 0x81, 0x43, 0x1e, 0x45, 0x75,
-  0xc9, 0xc7, 0xa2, 0x6d, 0xf5, 0x85, 0x45, 0xa9, 0x8c, 0x4a, 0x54, 0xb6, 0xbb, 0xeb, 0xd9, 0x0e,
-  0xd7, 0x0a, 0x3c, 0x5b, 0xd0, 0x23, 0x92, 0xc8, 0x86, 0x46, 0x95, 0xa8, 0x95, 0x3a, 0xd8, 0x85,
-  0x81, 0x9c, 0x0e, 0x9e, 0x5c, 0x14, 0xdc, 0xc7, 0xa2, 0x58, 0x8b, 0xe1, 0xfe, 0xbc, 0x40, 0x87,
-  0x7f, 0x45, 0xfd, 0xec, 0x37, 0x95, 0x42, 0xc8, 0x06, 0x19, 0xc4, 0x1a, 0x18, 0x02, 0x81, 0x04,
-  0xbf, 0xf9, 0xd4, 0x3f, 0x63, 0x17, 0x03, 0x74, 0x29, 0xd8, 0xd0, 0xa8, 0x37, 0x35, 0x06, 0x56,
-  0x9b, 0xef, 0x93, 0x94, 0x65, 0xc0, 0x0f, 0x9a, 0xcc, 0xb2, 0xb9, 0x69, 0x6c, 0x0d, 0x1f, 0x8a,
-  0xa8, 0xcd, 0x83, 0x9d, 0xb6, 0x3f, 0x6f, 0x74, 0x9b, 0x75, 0x03, 0xef, 0x6a, 0xf3, 0x80, 0xfd,
-  0xfc, 0xaf, 0x22, 0xa7, 0xa6, 0xcf, 0xaa, 0x32, 0x43, 0x9a, 0xd0, 0xa7, 0x30, 0xd1, 0x98, 0x89,
-  0x47, 0x28, 0x68, 0x05, 0xba, 0x4d, 0x37, 0xba, 0x50, 0xd4, 0x31, 0x18, 0x64, 0x19, 0xd3, 0x08,
-  0x6b, 0x60, 0xaf, 0x8b, 0xe5, 0x2a, 0x6f, 0x30, 0xa2, 0x3b, 0x3d, 0xfd, 0xae, 0x39, 0x73, 0x84,
-  0x1f, 0x8e, 0x38, 0xc3, 0x41, 0x65, 0xa2, 0x70, 0xa5, 0x50, 0x9a, 0x26, 0x8a, 0x54, 0x4c, 0x59,
-  0x92, 0x61, 0x37, 0xc2, 0x34, 0x51, 0x08, 0xc7, 0x6c, 0xf3, 0xdb, 0x04, 0xb2, 0xe2, 0x84, 0xf7,
-  0x1a, 0x5d, 0x64, 0x9b, 0xc1, 0x68, 0xb8, 0x84, 0x72, 0x2f, 0x1c, 0xad, 0x26, 0x99, 0x48, 0xee,
-  0x22, 0x7e, 0x4e, 0x66, 0x3f, 0x74, 0x9b, 0x6e, 0x01, 0x5d, 0x43, 0x15, 0xbd, 0xe7, 0xf7, 0x34,
-  0x96, 0x9b, 0x4e, 0x68, 0xd3, 0x49, 0x9c, 0xdc, 0xad, 0xf6, 0x6d, 0xec, 0xd0, 0xd5, 0x6d, 0x2e,
-  0xd0, 0xc7, 0x61, 0x3c, 0x05, 0xb6, 0xcb, 0xb0, 0x54, 0x48, 0xac, 0x68, 0x2b, 0xe1, 0x49, 0x89,
-  0x7e, 0x39, 0x4b, 0x93, 0x03, 0x37, 0x14, 0x21, 0xb8, 0x55, 0x81, 0xc0, 0x1c, 0xe0, 0xa7, 0x4e,
-  0xaf, 0xde, 0xc1, 0x8c, 0x62, 0x70, 0x8f, 0xac, 0x26, 0x4a, 0xd6, 0x25, 0x0b, 0x65, 0x3a, 0x4b,
-  0x73, 0x8d, 0x4d, 0x0f, 0x09, 0x37, 0xdb, 0xf9, 0x57, 0xe7, 0xbb, 0x24, 0x57, 0xa9, 0x00, 0xac,
-  0xb9, 0x8a, 0xd6, 0x2f, 0x9d, 0x32, 0x8b, 0x2e, 0xf3, 0x6c, 0x71, 0x60, 0x80, 0x84, 0x7a, 0x20,
-  0x93, 0x52, 0x19, 0x62, 0x3f, 0x79, 0xe0, 0x1f, 0x92, 0x78, 0xd7, 0xd6, 0x25, 0xb6, 0x56, 0x93,
-  0x58, 0x5d, 0x91, 0x16, 0x93, 0x1e, 0x3d, 0x2e, 0x0b, 0x50, 0xc4, 0x3b, 0x07, 0xdc, 0xda, 0x59,
-  0x98, 0x29, 0x30, 0x24, 0xf8, 0x90, 0x3e, 0xd5, 0xb6, 0x58, 0x59, 0x69, 0x1a, 0x6c, 0x68, 0x7a,
-  0xd7, 0x71, 0x9a, 0x86, 0x06, 0xf3, 0x26, 0x41, 0x46, 0x33, 0x6c, 0x67, 0x04, 0x6b, 0x6c, 0x58,
-  0x2b, 0xb4, 0x7f, 0x18, 0x52, 0x85, 0x9d, 0x9d, 0x9f, 0x0e, 0x36, 0x9c, 0xad, 0xd5, 0x5d, 0xb4,
-  0x78, 0x6d, 0x49, 0x56, 0xf9, 0x2d, 0x94, 0x7c, 0xc1, 0x0f, 0xa4, 0x56, 0x2e, 0x64, 0xc4, 0x5b,
-  0xd6, 0x5c, 0xc4, 0x0f, 0xde, 0xbe, 0xe5, 0xac, 0x84, 0x7f, 0x57, 0x02, 0x27, 0x94, 0x1e, 0x0b,
-  0xd9, 0x96, 0x9e, 0xf6, 0x2b, 0xe9, 0x39, 0x78, 0x25, 0x3d, 0x9d, 0x9f, 0xd2, 0xb3, 0x06, 0xe5,
-  0x18, 0x27, 0xde, 0x59, 0xfc, 0x70, 0xd8, 0x58, 0x03, 0xcd, 0xe9, 0xfe, 0xf8, 0xd3, 0x98, 0x35,
-  0x36, 0xf5, 0xbc, 0x12, 0x66, 0x1f, 0x5f, 0x09, 0xb3, 0x8f, 0x3f, 0x8f, 0x59, 0xa3, 0x06, 0x0d,
-  0x33, 0x1b, 0xf3, 0x10, 0xa5, 0xf4, 0xdd, 0xe1, 0x13, 0xdc, 0x86, 0xff, 0x03, 0x6e, 0x8d, 0x1f,
-  0x3a, 0x5a, 0xeb, 0x69, 0xbf, 0x92, 0x9e, 0x83, 0x57, 0xd2, 0xd3, 0xf9, 0x39, 0x3d, 0x04, 0x50,
-  0x7e, 0x76, 0x39, 0x64, 0xd8, 0xa0, 0xf1, 0x76, 0xa4, 0x17, 0xa9, 0xeb, 0x0a, 0x0d, 0x65, 0xad,
-  0x54, 0x8c, 0x04, 0x5c, 0xe2, 0xd6, 0x4d, 0xa7, 0xb6, 0xdd, 0xd8, 0x28, 0x37, 0x75, 0x6d, 0xf8,
-  0xed, 0x49, 0x95, 0x61, 0xb6, 0xa5, 0x66, 0xb4, 0xff, 0x34, 0x13, 0xd8, 0xfb, 0xb0, 0x44, 0x1c,
-  0xb2, 0xae, 0x2e, 0x62, 0xb9, 0xf4, 0x52, 0x14, 0xd8, 0x07, 0x2e, 0x57, 0x45, 0x0d, 0x52, 0xec,
-  0x44, 0x28, 0x60, 0x1d, 0xac, 0xcb, 0xad, 0x6d, 0xf5, 0xc0, 0x8e, 0x93, 0x84, 0x1c, 0x1d, 0x28,
-  0x21, 0x8d, 0xad, 0xb4, 0x8d, 0xe3, 0x01, 0xa3, 0xf2, 0xf8, 0xac, 0xef, 0xc7, 0x83, 0x17, 0xeb,
-  0xa3, 0x73, 0xf8, 0xf8, 0x69, 0x59, 0xb4, 0xe9, 0x76, 0x2e, 0x52, 0xb4, 0x35, 0xb0, 0x52, 0x87,
-  0x6c, 0x63, 0x7b, 0x32, 0x81, 0xe4, 0xee, 0x56, 0xdd, 0x2f, 0x55, 0x9c, 0xbb, 0x02, 0x48, 0x8e,
-  0x2c, 0x8a, 0xe5, 0x53, 0x67, 0xe8, 0x2a, 0xe9, 0xff, 0xa8, 0xba, 0xd6, 0xca, 0x06, 0x2e, 0x52,
-  0x6b, 0xd5, 0x15, 0x95, 0x1a, 0x1c, 0x18, 0x30, 0x8a, 0x5e, 0xf8, 0xf8, 0x3e, 0x78, 0xd7, 0x99,
-  0xfb, 0xdf, 0xb1, 0x67, 0x30, 0x7b, 0x37, 0x8f, 0x78, 0xdf, 0x9a, 0x40, 0x0b, 0x18, 0xe8, 0x90,
-  0xbd, 0xb7, 0xbf, 0x34, 0xc4, 0x08, 0x61, 0xa9, 0x17, 0x6e, 0xad, 0x21, 0xc6, 0x6c, 0x2b, 0xa3,
-  0x6b, 0x8d, 0x84, 0xec, 0x70, 0x93, 0x44, 0xc7, 0xa7, 0x2f, 0x90, 0xe8, 0x7e, 0xc1, 0xa2, 0xf6,
-  0x82, 0x45, 0xed, 0xce, 0x16, 0x89, 0xf0, 0xe8, 0x74, 0x40, 0x4d, 0x81, 0xb5, 0x97, 0x83, 0x85,
-  0x4e, 0x6c, 0xf0, 0x5d, 0x77, 0x0d, 0x60, 0x6e, 0xda, 0x45, 0x2a, 0x52, 0xa8, 0x17, 0x91, 0xa6,
-  0x85, 0x78, 0x44, 0xf3, 0xd0, 0xad, 0x52, 0x18, 0x50, 0x27, 0xbb, 0xbd, 0xa7, 0xcd, 0x7b, 0x67,
-  0x42, 0xaf, 0x91, 0x63, 0x4b, 0xac, 0x51, 0xcb, 0x61, 0xf4, 0x8e, 0x33, 0x2c, 0x99, 0xfa, 0x25,
-  0x45, 0xd8, 0xab, 0x2e, 0x61, 0x8a, 0xd6, 0x3c, 0x6a, 0xa1, 0x25, 0xe0, 0x88, 0x98, 0xe3, 0x48,
-  0x0b, 0xa9, 0xbf, 0xdc, 0x41, 0xd3, 0x92, 0x3d, 0xc2, 0xe2, 0x60, 0xcf, 0xd3, 0x95, 0xd8, 0x8a,
-  0x30, 0x8b, 0x29, 0x6c, 0x51, 0xb5, 0x7f, 0x5f, 0x40, 0x29, 0xe8, 0x67, 0x0a, 0x24, 0xbd, 0x25,
-  0xe8, 0x99, 0xbb, 0x9a, 0x38, 0xec, 0x75, 0x06, 0x50, 0xfc, 0x17, 0x46, 0xdd, 0x0c, 0x5d, 0xe8,
-  0xba, 0xa2, 0xd7, 0x38, 0x45, 0xbb, 0x34, 0x29, 0xb1, 0x19, 0xde, 0x08, 0x96, 0xa8, 0x4d, 0x05,
-  0xc6, 0x5c, 0x68, 0x5d, 0x81, 0x0e, 0x6d, 0x90, 0xcf, 0xdc, 0x50, 0x00, 0xd2, 0x5a, 0x12, 0x23,
-  0x67, 0x4c, 0x68, 0x46, 0xdd, 0x9d, 0x86, 0x93, 0x44, 0x95, 0x78, 0x5c, 0x93, 0x3d, 0x04, 0x4c,
-  0x48, 0xfa, 0x35, 0x45, 0x83, 0x66, 0x85, 0x9a, 0x21, 0x16, 0x34, 0x80, 0x57, 0xb9, 0x3d, 0x7d,
-  0xd8, 0x6d, 0x0a, 0x3b, 0xa4, 0xb9, 0x11, 0x0f, 0xe7, 0xb9, 0x94, 0xbb, 0x53, 0xd1, 0xa5, 0x8c,
-  0x0a, 0xeb, 0x35, 0x7a, 0xec, 0x26, 0x9c, 0x8d, 0x40, 0xf7, 0xaf, 0xcf, 0x9f, 0x8b, 0xf4, 0xa5,
-  0x92, 0xd0, 0x78, 0x29, 0x18, 0x7f, 0xc1, 0x68, 0x9d, 0x9c, 0xee, 0xb8, 0x49, 0xf8, 0xf3, 0x9b,
-  0x0e, 0x0e, 0x62, 0x34, 0xb2, 0x63, 0x19, 0xc7, 0x33, 0xbc, 0xb4, 0x89, 0x12, 0xb4, 0x3f, 0x1c,
-  0x74, 0x0e, 0xf6, 0x07, 0x57, 0xfd, 0x97, 0x84, 0xde, 0xf1, 0x9e, 0x95, 0x39, 0x83, 0xea, 0xfe,
-  0x25, 0x99, 0x5f, 0x78, 0xef, 0xef, 0x17, 0xd7, 0xfb, 0x9f, 0xfb, 0x2f, 0xfa, 0xf7, 0x9e, 0xf7,
-  0xfe, 0x51, 0x09, 0x89, 0xde, 0xed, 0x9f, 0x89, 0xf1, 0xfe, 0x55, 0x62, 0x62, 0x74, 0xf1, 0x7a,
-  0x1f, 0xcf, 0xfa, 0xac, 0xf1, 0x05, 0x0b, 0xdf, 0xac, 0xf6, 0x59, 0x2f, 0x5e, 0x64, 0x35, 0x02,
-  0x34, 0x84, 0x72, 0xfc, 0xcb, 0x1b, 0x52, 0xf9, 0x8c, 0xdc, 0x42, 0xe1, 0x5b, 0xde, 0xbb, 0x9e,
-  0x89, 0x4c, 0x8c, 0x27, 0xe6, 0x13, 0xd6, 0x8a, 0x1f, 0x6b, 0x45, 0x8a, 0xdf, 0x3c, 0x2f, 0xd0,
-  0x58, 0x65, 0xd3, 0xcd, 0x35, 0x02, 0x88, 0x46, 0x5b, 0xed, 0x95, 0xd4, 0x3a, 0xed, 0xed, 0xdf,
-  0x7a, 0xfe, 0x2d, 0xff, 0xef, 0xd3, 0x76, 0x93, 0xae, 0x12, 0x94, 0x78, 0x74, 0xdf, 0xa0, 0xcb,
-  0x07, 0xfd, 0x9a, 0xfa, 0x1f, 0x45, 0x82, 0x46, 0x3f, 0x5d, 0x15, 0x00, 0x00
+  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xb5, 0x58, 0x6d, 0x6f, 0xdb, 0x38,
+  0x12, 0xfe, 0xee, 0x5f, 0xc1, 0xf0, 0x0e, 0x85, 0x84, 0xc8, 0x72, 0x1c, 0xb7, 0xdd, 0x5e, 0x62,
+  0x79, 0x2f, 0x71, 0xbc, 0x4d, 0x6e, 0xd3, 0xc4, 0x57, 0x07, 0x0d, 0x0e, 0xbd, 0x62, 0x57, 0x91,
+  0xc6, 0x36, 0x1b, 0x99, 0xd4, 0x89, 0x94, 0x9d, 0x20, 0xf5, 0x7f, 0xbf, 0x19, 0x52, 0x7e, 0x4d,
+  0xd2, 0x1e, 0x8a, 0x1c, 0x0a, 0xa4, 0x92, 0x38, 0x9c, 0x97, 0x67, 0x1e, 0xce, 0x0c, 0xdd, 0xde,
+  0x39, 0xb9, 0xec, 0x5e, 0xfd, 0xab, 0xdf, 0x63, 0x63, 0x33, 0xc9, 0x3a, 0x6d, 0xfa, 0xcb, 0xb2,
+  0x58, 0x8e, 0x22, 0x0e, 0x92, 0xe3, 0x3b, 0xc4, 0x69, 0xa7, 0x3d, 0x01, 0x13, 0xb3, 0x64, 0x1c,
+  0x17, 0x1a, 0x4c, 0xc4, 0x4b, 0x33, 0xac, 0xbf, 0xe3, 0xd5, 0xd7, 0x9a, 0x8c, 0x27, 0x10, 0xf1,
+  0xa9, 0x80, 0x59, 0xae, 0x0a, 0xc3, 0x59, 0xa2, 0xa4, 0x01, 0x89, 0x62, 0x33, 0x91, 0x9a, 0x71,
+  0xf4, 0x66, 0x6f, 0x6f, 0x29, 0xba, 0xb5, 0x94, 0xc2, 0x54, 0x24, 0x50, 0xb7, 0x2f, 0x81, 0x90,
+  0xc2, 0x88, 0x38, 0xab, 0xeb, 0x24, 0xce, 0x20, 0x6a, 0x06, 0x93, 0xf8, 0x4e, 0x4c, 0xca, 0xc9,
+  0xf2, 0xbd, 0xd4, 0x50, 0xd8, 0x97, 0xf8, 0x06, 0xdf, 0xa5, 0xe2, 0x8f, 0x2c, 0x77, 0xda, 0x46,
+  0x98, 0x0c, 0x3a, 0xd7, 0xe2, 0x37, 0xc1, 0x06, 0x60, 0x8c, 0x90, 0x23, 0xdd, 0x6e, 0xb8, 0x8f,
+  0x6d, 0x9d, 0x14, 0x22, 0x37, 0x9d, 0xda, 0x34, 0x2e, 0x58, 0xa6, 0x12, 0x91, 0x07, 0x69, 0x94,
+  0xaa, 0xa4, 0x9c, 0xa0, 0x43, 0x01, 0x7e, 0x88, 0x76, 0x9a, 0x01, 0xaa, 0x97, 0xe7, 0x4a, 0xe5,
+  0x3a, 0xda, 0x0b, 0xf2, 0x02, 0x06, 0xf8, 0x3a, 0x18, 0x9c, 0x9d, 0x44, 0x9c, 0x1f, 0x0e, 0x4b,
+  0x99, 0x18, 0xa1, 0x24, 0x1b, 0x9d, 0xa5, 0x9e, 0xf1, 0x1f, 0x0a, 0x30, 0x65, 0x21, 0x59, 0x1a,
+  0x8e, 0xc0, 0xf4, 0x32, 0x20, 0x2d, 0xc7, 0xf7, 0x76, 0x69, 0xbe, 0x14, 0x4d, 0x7a, 0x1b, 0x92,
+  0x49, 0x01, 0xb1, 0x81, 0x4a, 0x78, 0x43, 0xf0, 0xd4, 0xf3, 0x1f, 0x66, 0x42, 0xa6, 0x6a, 0x16,
+  0xaa, 0x1c, 0xa4, 0xc7, 0xc7, 0xc6, 0xe4, 0xfa, 0xa0, 0xd1, 0xb8, 0x95, 0x2a, 0x9c, 0x65, 0x40,
+  0x56, 0x1a, 0x43, 0xdc, 0x5d, 0x16, 0xa0, 0x1b, 0xba, 0x0a, 0xad, 0xf1, 0x97, 0x99, 0x18, 0x8a,
+  0xfa, 0xe2, 0x95, 0xaf, 0x29, 0x3c, 0xde, 0x56, 0xb8, 0xdc, 0xc4, 0x03, 0xfe, 0x87, 0x86, 0x6c,
+  0xb8, 0x2e, 0x7d, 0x81, 0xd2, 0x98, 0x1a, 0x6d, 0x98, 0x89, 0x3c, 0x84, 0xe2, 0x57, 0x6b, 0x1f,
+  0xcd, 0xf3, 0x5d, 0x8b, 0xd4, 0x01, 0xe7, 0xfe, 0x2e, 0x6f, 0x7c, 0xd5, 0x4a, 0x36, 0x24, 0x18,
+  0x1e, 0x40, 0x44, 0x28, 0x70, 0x82, 0x8b, 0xfb, 0x87, 0x10, 0xa6, 0x42, 0x53, 0x56, 0xd2, 0x68,
+  0x67, 0x2f, 0x80, 0xd0, 0xc0, 0x9d, 0xe9, 0x2e, 0x32, 0x4d, 0x18, 0x4a, 0x34, 0x1c, 0x86, 0x21,
+  0x0f, 0x86, 0x60, 0x92, 0x31, 0x46, 0x1e, 0x9a, 0x31, 0x3a, 0x65, 0xa2, 0x8e, 0x09, 0x49, 0xa9,
+  0xe7, 0xaf, 0xbe, 0x5c, 0xde, 0x7c, 0x85, 0xc4, 0x84, 0xb1, 0xd6, 0x62, 0x24, 0xbd, 0x87, 0x79,
+  0xf0, 0x80, 0x16, 0x67, 0xaa, 0xb8, 0xd5, 0x07, 0x9f, 0xbf, 0xcc, 0x03, 0xdc, 0xbb, 0x78, 0x0f,
+  0x35, 0x26, 0xdd, 0xf3, 0x4c, 0x00, 0x7e, 0xd4, 0x81, 0xb0, 0xc0, 0x1d, 0x75, 0x63, 0xff, 0xf3,
+  0xc3, 0x02, 0xd2, 0x32, 0x81, 0xc5, 0xa2, 0x67, 0x50, 0x76, 0x02, 0xce, 0x20, 0xae, 0xa7, 0x51,
+  0x14, 0x81, 0x7d, 0xf0, 0xbf, 0x7d, 0x33, 0x61, 0x5e, 0xea, 0xb1, 0x07, 0x3e, 0xea, 0x0e, 0x3e,
+  0x7f, 0x59, 0x73, 0xe5, 0x41, 0x0c, 0xbd, 0x3d, 0x14, 0x35, 0x61, 0x06, 0x72, 0x64, 0xc6, 0xaf,
+  0x5e, 0x2d, 0xf9, 0xd1, 0x6e, 0xee, 0xf9, 0x55, 0x5e, 0x97, 0xdf, 0x76, 0x77, 0x83, 0xa9, 0x12,
+  0x29, 0x43, 0xa4, 0xaf, 0xc4, 0x04, 0x54, 0x69, 0xbc, 0x8b, 0xa0, 0x09, 0x2d, 0xff, 0x70, 0x8d,
+  0x56, 0x87, 0x19, 0x18, 0x26, 0x1d, 0x7c, 0xdd, 0x01, 0x82, 0x87, 0x36, 0xa4, 0xff, 0x40, 0x5f,
+  0x21, 0x42, 0xbe, 0x70, 0xcc, 0x0d, 0xc6, 0x6f, 0x51, 0x45, 0x45, 0x47, 0xc6, 0x14, 0xe2, 0xa6,
+  0x34, 0xe0, 0x71, 0x91, 0x62, 0xea, 0x68, 0x4b, 0xb0, 0xbd, 0x42, 0xc7, 0xe0, 0xb9, 0x35, 0x25,
+  0xf1, 0xd4, 0xca, 0x11, 0xad, 0x5f, 0x79, 0x3e, 0x0a, 0xac, 0xd3, 0x5a, 0x86, 0xd3, 0x38, 0x2b,
+  0xe1, 0x70, 0xa8, 0x0a, 0x8f, 0x3c, 0x30, 0xe8, 0x9f, 0x69, 0x43, 0x98, 0x8c, 0x45, 0x96, 0x16,
+  0x20, 0xab, 0xb8, 0x0f, 0xcd, 0xee, 0xae, 0x8f, 0x00, 0xc3, 0x44, 0x4d, 0xa1, 0x4b, 0x6b, 0xde,
+  0x4a, 0xe6, 0xb3, 0xf9, 0xe2, 0x2f, 0x15, 0x28, 0x54, 0xa0, 0xda, 0x0b, 0xbc, 0x0e, 0x15, 0xee,
+  0xab, 0x88, 0xa5, 0x6d, 0x70, 0x2a, 0x27, 0xbe, 0x61, 0x70, 0x7a, 0xcb, 0x4d, 0xeb, 0x07, 0x0f,
+  0xcc, 0x67, 0xf5, 0xc5, 0xe5, 0x25, 0xd0, 0x1b, 0x34, 0xfa, 0xf3, 0xaf, 0x0f, 0xcb, 0xb5, 0x39,
+  0xf3, 0xaa, 0x37, 0xca, 0xf5, 0x9c, 0xa5, 0xc7, 0x13, 0xff, 0xcf, 0xd5, 0x56, 0x4c, 0x58, 0x15,
+  0x17, 0xe6, 0x6b, 0xcb, 0x8c, 0x03, 0x17, 0x08, 0xc9, 0xe5, 0x23, 0x61, 0x16, 0xe7, 0x78, 0x48,
+  0x52, 0x17, 0x9a, 0xf6, 0xe7, 0xce, 0x65, 0xb5, 0xe9, 0xb2, 0x7a, 0xda, 0x65, 0xbe, 0xd3, 0xc5,
+  0x93, 0x17, 0xa8, 0x4d, 0xd6, 0x5f, 0x22, 0x87, 0x0a, 0x56, 0x31, 0xd5, 0x52, 0x7f, 0xd3, 0x88,
+  0xf2, 0x03, 0x89, 0x80, 0xe6, 0x59, 0x9c, 0xc0, 0xb5, 0x30, 0x44, 0xbf, 0xf9, 0xfa, 0x31, 0x6a,
+  0x3e, 0x75, 0x8c, 0xf8, 0x7c, 0xed, 0xcc, 0x62, 0x36, 0x1f, 0x5c, 0xce, 0x36, 0xb8, 0xb4, 0x63,
+  0xbe, 0x7d, 0xb3, 0x2e, 0xed, 0x20, 0x6d, 0xad, 0x8b, 0x15, 0x4f, 0x0f, 0x57, 0x14, 0x13, 0x32,
+  0x2f, 0x1d, 0xc3, 0xcc, 0x7d, 0x8e, 0x05, 0x94, 0x0c, 0x91, 0x83, 0x88, 0x1d, 0xe9, 0xc1, 0x27,
+  0x57, 0x58, 0xdd, 0xf3, 0x66, 0xd4, 0x58, 0x95, 0x5d, 0x72, 0x79, 0xd0, 0xda, 0x27, 0xe8, 0xac,
+  0x8d, 0x68, 0x8d, 0x55, 0x81, 0xd9, 0x0e, 0x6c, 0xe9, 0x73, 0xa6, 0xe2, 0xf4, 0x1f, 0x03, 0x3a,
+  0x94, 0x58, 0x28, 0x9c, 0xfb, 0xd2, 0x91, 0xde, 0xd6, 0x66, 0x74, 0x49, 0x6e, 0x27, 0xac, 0x48,
+  0x38, 0x9d, 0xcb, 0xed, 0xef, 0xe4, 0x38, 0x62, 0x4f, 0x9e, 0x37, 0xbe, 0xc6, 0xd3, 0x78, 0xa1,
+  0xe0, 0x91, 0x60, 0xac, 0xef, 0x25, 0xaa, 0xc0, 0xd3, 0x9d, 0x86, 0x37, 0x2a, 0xbd, 0xdf, 0xc8,
+  0x82, 0x24, 0xf9, 0x38, 0x4d, 0x7b, 0x53, 0xc4, 0xf8, 0x5c, 0x68, 0x84, 0x1a, 0x0a, 0x8f, 0x93,
+  0x9b, 0x3c, 0xf0, 0xb0, 0x70, 0x3c, 0xbc, 0x07, 0xf3, 0xc9, 0xf3, 0xe7, 0x4f, 0xcb, 0x41, 0x51,
+  0xa8, 0x02, 0xdd, 0x43, 0x39, 0x62, 0x8c, 0xca, 0x20, 0xcc, 0xd4, 0xc8, 0xe3, 0x3d, 0xfa, 0xce,
+  0xaa, 0x78, 0xb1, 0xf4, 0xb1, 0xa1, 0xc8, 0xc0, 0x86, 0x81, 0x9d, 0x0c, 0x4b, 0x16, 0x3f, 0xaf,
+  0xbe, 0xab, 0x21, 0x35, 0xcb, 0xa1, 0x18, 0x95, 0x45, 0x6c, 0x01, 0x72, 0x61, 0xb0, 0x61, 0x2c,
+  0xa8, 0xe6, 0xff, 0x5b, 0x9e, 0xc9, 0x44, 0x4d, 0x72, 0xc4, 0x09, 0x58, 0x1e, 0x8f, 0x80, 0xa5,
+  0xb1, 0x89, 0x77, 0xb0, 0x72, 0xaf, 0x61, 0x3a, 0x40, 0x1e, 0x70, 0x32, 0x70, 0xc0, 0xa3, 0xa8,
+  0x2a, 0xf9, 0x58, 0xb4, 0xad, 0xbe, 0x30, 0x2f, 0x94, 0x51, 0x89, 0xca, 0x5e, 0xbd, 0xf2, 0x6c,
+  0x87, 0xdb, 0x0b, 0x3c, 0x5b, 0xd0, 0x23, 0x92, 0xc8, 0x06, 0x46, 0x15, 0xa8, 0x95, 0x3a, 0xd8,
+  0x99, 0x81, 0x09, 0x05, 0x9e, 0x9c, 0xe5, 0xdc, 0xc7, 0xa2, 0x58, 0x89, 0xe1, 0xfe, 0x49, 0x8e,
+  0x0e, 0xff, 0x86, 0xfa, 0xd9, 0x07, 0x95, 0x42, 0xc8, 0xfa, 0x19, 0xc4, 0x1a, 0x18, 0x02, 0x81,
+  0x04, 0xbf, 0x3e, 0xef, 0x9d, 0xb0, 0xb3, 0x3e, 0xba, 0x14, 0x6c, 0x68, 0xd4, 0x9b, 0x1a, 0x03,
+  0xab, 0xcd, 0xf7, 0x49, 0xca, 0x32, 0xe0, 0x3b, 0x4d, 0x66, 0xd9, 0xdc, 0x34, 0xb6, 0x86, 0x5f,
+  0xf3, 0xa8, 0xc9, 0x83, 0x9d, 0xa6, 0x3f, 0xaf, 0xb5, 0x1b, 0x55, 0x03, 0x6f, 0x6b, 0x73, 0x8f,
+  0xfd, 0xfc, 0xef, 0x62, 0x42, 0x4d, 0x9f, 0x95, 0x45, 0x86, 0x34, 0xa1, 0x4f, 0x61, 0xa2, 0xf1,
+  0x24, 0x1e, 0xa2, 0xa0, 0x15, 0x68, 0x37, 0xdc, 0xe8, 0x42, 0x59, 0xc7, 0x64, 0x90, 0x65, 0x3c,
+  0x46, 0x58, 0x03, 0x3b, 0x6d, 0x2c, 0x57, 0x93, 0x1a, 0x23, 0xba, 0xd3, 0xd3, 0x1f, 0x9a, 0x33,
+  0x47, 0xf8, 0xc1, 0x90, 0x33, 0x1c, 0x54, 0xc6, 0x0a, 0x57, 0x72, 0xa5, 0x69, 0xa2, 0x48, 0xc5,
+  0x94, 0x25, 0x19, 0x76, 0x23, 0x3c, 0x26, 0x0a, 0xe1, 0x98, 0x6d, 0x7e, 0x1b, 0x43, 0x96, 0x1f,
+  0xf3, 0x4e, 0xad, 0x8d, 0x6c, 0x33, 0x98, 0x0d, 0x77, 0xa0, 0xdc, 0x0b, 0x47, 0xab, 0x49, 0x26,
+  0x92, 0xdb, 0x88, 0x9f, 0x92, 0xd9, 0x5f, 0xdb, 0x0d, 0xb7, 0x80, 0xae, 0xa1, 0x8a, 0xce, 0xd3,
+  0x7b, 0x6a, 0xcb, 0x4d, 0xc7, 0xb4, 0xe9, 0x38, 0x4e, 0x6e, 0x57, 0xfb, 0x36, 0x76, 0xe8, 0xf2,
+  0x66, 0x22, 0xd0, 0xc7, 0x41, 0x3c, 0x05, 0xf6, 0x8a, 0x61, 0xa9, 0x90, 0x58, 0xd1, 0x56, 0xc2,
+  0xe3, 0x02, 0xfd, 0x72, 0x96, 0xc6, 0xfb, 0x6e, 0x28, 0x42, 0x70, 0xcb, 0x1c, 0x81, 0xd9, 0xc7,
+  0x4f, 0xad, 0x4e, 0xb5, 0x83, 0x19, 0xc5, 0xe0, 0x0e, 0x59, 0x4d, 0x94, 0xac, 0x4a, 0x16, 0xca,
+  0xb4, 0x96, 0xe6, 0x6a, 0x9b, 0x1e, 0x12, 0x6e, 0xb6, 0xf3, 0xaf, 0xe2, 0xbb, 0x20, 0x57, 0xa9,
+  0x00, 0xac, 0xb9, 0x8a, 0xd6, 0x2f, 0x9c, 0x32, 0x8b, 0x2e, 0xf3, 0x6c, 0x71, 0x60, 0x80, 0x84,
+  0xba, 0x27, 0x93, 0x52, 0x19, 0x62, 0x3f, 0x79, 0xe0, 0x1f, 0x90, 0x78, 0xdb, 0xd6, 0x25, 0xb6,
+  0x56, 0x93, 0x58, 0x55, 0x91, 0x16, 0x93, 0x1e, 0x3d, 0x2e, 0x0b, 0x50, 0xc4, 0x5b, 0xfb, 0xdc,
+  0xda, 0x59, 0x98, 0xc9, 0x31, 0x25, 0xf8, 0x90, 0x3e, 0xd6, 0xb6, 0x58, 0x59, 0x69, 0xea, 0x6f,
+  0x68, 0x7a, 0xdb, 0x72, 0x9a, 0x06, 0x06, 0xcf, 0x4d, 0x82, 0x8c, 0x66, 0xd8, 0xce, 0x08, 0xd6,
+  0xd8, 0xb0, 0xbd, 0xd0, 0xfe, 0x63, 0x48, 0x15, 0x76, 0x72, 0xda, 0xed, 0x6f, 0x38, 0x5b, 0xa9,
+  0x3b, 0xdb, 0xe3, 0x95, 0x25, 0x59, 0x4e, 0x6e, 0xa0, 0xe0, 0x0b, 0x7e, 0x20, 0xb5, 0x26, 0x42,
+  0x46, 0x7c, 0xcf, 0x9a, 0x8b, 0xf8, 0xfe, 0x9b, 0x37, 0x9c, 0x15, 0xf0, 0x9f, 0x52, 0xe0, 0x84,
+  0xd2, 0x61, 0x21, 0xdb, 0xd2, 0xd3, 0x7c, 0x21, 0x3d, 0xfb, 0x2f, 0xa4, 0xa7, 0xf5, 0x53, 0x7a,
+  0xd6, 0xa0, 0x1c, 0xe1, 0xc4, 0x3b, 0x8b, 0xef, 0x0f, 0x6a, 0x6b, 0xa0, 0x39, 0xdd, 0xef, 0x7f,
+  0x1a, 0xb3, 0xda, 0xa6, 0x9e, 0x17, 0xc2, 0xec, 0xfd, 0x0b, 0x61, 0xf6, 0xfe, 0xe7, 0x31, 0xab,
+  0x55, 0xa0, 0xe1, 0xc9, 0xc6, 0x73, 0x88, 0x52, 0xfa, 0xf6, 0xe0, 0x11, 0x6e, 0x83, 0xff, 0x01,
+  0xb7, 0xda, 0x77, 0x1d, 0xad, 0xf4, 0x34, 0x5f, 0x48, 0xcf, 0xfe, 0x0b, 0xe9, 0x69, 0xfd, 0x9c,
+  0x1e, 0x02, 0x68, 0x72, 0x72, 0x31, 0x60, 0xd8, 0xa0, 0xf1, 0x76, 0xa4, 0x17, 0x47, 0xd7, 0x15,
+  0x1a, 0x3a, 0xb5, 0x52, 0x31, 0x12, 0x70, 0x07, 0xb7, 0x6a, 0x3a, 0x95, 0xed, 0xda, 0x46, 0xb9,
+  0xa9, 0x6a, 0xc3, 0x87, 0x47, 0x55, 0x86, 0xd9, 0x96, 0x9a, 0xd1, 0xfe, 0x6e, 0x26, 0xb0, 0xf7,
+  0x61, 0x89, 0x38, 0x60, 0x6d, 0x9d, 0xc7, 0x72, 0xe9, 0xa5, 0xc8, 0xb1, 0x0f, 0x5c, 0xac, 0x8a,
+  0x1a, 0xa4, 0xd8, 0x89, 0x50, 0xc0, 0x3a, 0x58, 0x95, 0x5b, 0xdb, 0xea, 0x81, 0x1d, 0x25, 0x09,
+  0x39, 0xda, 0x57, 0x42, 0x1a, 0x5b, 0x69, 0x6b, 0x47, 0x7d, 0x46, 0xe5, 0xf1, 0x49, 0xdf, 0x8f,
+  0xfa, 0xcf, 0xd6, 0x47, 0xe7, 0xf0, 0xd1, 0xe3, 0xb2, 0x68, 0x8f, 0xdb, 0xa9, 0x48, 0xd1, 0x56,
+  0xdf, 0x4a, 0x1d, 0xb0, 0x8d, 0xed, 0xc9, 0x18, 0x92, 0xdb, 0x1b, 0x75, 0xb7, 0x54, 0x71, 0xea,
+  0x0a, 0x20, 0x39, 0xb2, 0x28, 0x96, 0x8f, 0x9d, 0xa1, 0xab, 0xa4, 0xff, 0xbd, 0xea, 0x5a, 0x29,
+  0xeb, 0xbb, 0x4c, 0xad, 0x55, 0x57, 0x54, 0x6a, 0x70, 0x60, 0xc0, 0x2c, 0x7a, 0xe1, 0xc3, 0xbb,
+  0xe0, 0x6d, 0x6b, 0xee, 0x7f, 0xc3, 0x9e, 0xc1, 0xec, 0xdd, 0x3c, 0xe2, 0x3d, 0x6b, 0x02, 0x2d,
+  0x60, 0xa2, 0x43, 0xf6, 0xce, 0xfe, 0xd2, 0x10, 0x23, 0x84, 0x85, 0x5e, 0xb8, 0xb5, 0x86, 0x18,
+  0xb3, 0xad, 0x8c, 0xae, 0x35, 0x12, 0xb2, 0x83, 0x4d, 0x12, 0x1d, 0x75, 0x9f, 0x21, 0xd1, 0xdd,
+  0x82, 0x45, 0xcd, 0x05, 0x8b, 0x9a, 0xad, 0x2d, 0x12, 0x61, 0xe8, 0x14, 0xa0, 0xa6, 0xc4, 0xda,
+  0xcb, 0xc1, 0x42, 0x27, 0x36, 0xf8, 0xb6, 0xbb, 0x06, 0x30, 0x37, 0xed, 0x22, 0x15, 0x29, 0xd5,
+  0x8b, 0x4c, 0xd3, 0x42, 0x3c, 0xa4, 0x79, 0xe8, 0x46, 0x29, 0x4c, 0xa8, 0x93, 0xdd, 0xde, 0xd3,
+  0xe4, 0x9d, 0x13, 0xa1, 0xd7, 0xc8, 0xb1, 0x25, 0x56, 0xab, 0xe4, 0x30, 0x7b, 0x47, 0x19, 0x96,
+  0x4c, 0xfd, 0x9c, 0x22, 0xec, 0x55, 0x17, 0x30, 0x45, 0x6b, 0x1e, 0xb5, 0xd0, 0x02, 0x70, 0x44,
+  0x9c, 0xe0, 0x48, 0x0b, 0xa9, 0xbf, 0xdc, 0x41, 0xd3, 0x92, 0x0d, 0x61, 0x11, 0xd8, 0xd3, 0x74,
+  0x25, 0xb6, 0x22, 0xcc, 0x62, 0x0a, 0x5b, 0x54, 0xed, 0xdd, 0xe5, 0x50, 0x08, 0xfa, 0x99, 0x02,
+  0x49, 0x6f, 0x09, 0x7a, 0xe2, 0xae, 0x26, 0x0e, 0x7b, 0x9d, 0x01, 0xe4, 0x3f, 0x60, 0xd4, 0xf5,
+  0xc0, 0xa5, 0xae, 0x2d, 0x3a, 0xb5, 0x2e, 0xda, 0xa5, 0x49, 0x89, 0xcd, 0xf0, 0x46, 0xb0, 0x44,
+  0x6d, 0x2a, 0x30, 0xe7, 0x42, 0xeb, 0x12, 0x74, 0x68, 0x93, 0x7c, 0xe2, 0x86, 0x02, 0x90, 0xd6,
+  0x92, 0x18, 0x3a, 0x63, 0x42, 0x33, 0xea, 0xee, 0x34, 0x9c, 0x24, 0xaa, 0xc0, 0x70, 0x4d, 0x76,
+  0x1f, 0x30, 0x21, 0xe9, 0xd7, 0x14, 0x0d, 0x9a, 0xe5, 0x6a, 0x86, 0x58, 0xd0, 0x00, 0x5e, 0x4e,
+  0x6c, 0xf4, 0x61, 0xbb, 0x21, 0xec, 0x90, 0xe6, 0x46, 0x3c, 0xbc, 0xb6, 0xa6, 0xdc, 0x46, 0x75,
+  0x8d, 0xa9, 0xce, 0x88, 0x46, 0x1f, 0xf1, 0x26, 0x6b, 0xc0, 0xcd, 0x38, 0xa2, 0xe3, 0x06, 0x7a,
+  0x4b, 0x70, 0xa0, 0x01, 0x5f, 0x33, 0x45, 0xe8, 0xf6, 0x06, 0xfd, 0xfa, 0xc5, 0xe5, 0xb5, 0xf5,
+  0xec, 0x77, 0x8c, 0x97, 0x2d, 0x6e, 0x67, 0xe4, 0x19, 0xf9, 0x59, 0x6a, 0xf2, 0x29, 0x66, 0x85,
+  0xd5, 0xf6, 0x03, 0x97, 0x08, 0x09, 0x74, 0xab, 0xd6, 0x73, 0xc1, 0x39, 0x0f, 0x7e, 0x00, 0xe1,
+  0xc7, 0x9e, 0x83, 0xf0, 0x34, 0x2e, 0xd2, 0x59, 0x8c, 0x75, 0xe3, 0xc3, 0x51, 0x77, 0xb9, 0xa5,
+  0xf6, 0xb8, 0x0e, 0x7c, 0xc4, 0x75, 0xb7, 0xe3, 0x3c, 0xc6, 0xfb, 0xeb, 0x00, 0x40, 0x6e, 0x65,
+  0xbd, 0xc8, 0x44, 0x4a, 0x69, 0x97, 0x1b, 0x09, 0xb7, 0x33, 0x62, 0xcd, 0x8e, 0xb5, 0x04, 0x18,
+  0x0e, 0xc0, 0x15, 0x60, 0x3d, 0xba, 0xc5, 0x52, 0x27, 0xba, 0x42, 0x5b, 0x0e, 0xae, 0x8d, 0x93,
+  0xd1, 0xbb, 0x3a, 0x7d, 0xea, 0x68, 0x90, 0xfe, 0xda, 0x73, 0xec, 0xfd, 0x1b, 0xd2, 0xfb, 0xb8,
+  0xbb, 0xe3, 0xae, 0x0e, 0x9f, 0x5e, 0xb7, 0x70, 0x72, 0xa5, 0x3b, 0x0e, 0xf6, 0x3d, 0xc4, 0xe5,
+  0xb9, 0x4d, 0x54, 0xd1, 0x30, 0x1f, 0xad, 0xfd, 0x7a, 0xff, 0xb2, 0xf7, 0x9c, 0xd0, 0x5b, 0xde,
+  0xb1, 0x32, 0x27, 0x50, 0xde, 0x3d, 0x27, 0xf3, 0x0b, 0xef, 0xfc, 0x7e, 0x76, 0x55, 0xff, 0xd4,
+  0x7b, 0xd6, 0xbf, 0x77, 0xbc, 0xf3, 0xcf, 0x52, 0x48, 0xf4, 0xae, 0x7e, 0x22, 0x46, 0xf5, 0xcb,
+  0xc4, 0xc4, 0xe8, 0xe2, 0x55, 0x1d, 0x63, 0x7d, 0xd2, 0xf8, 0xe2, 0xd8, 0xbe, 0x5e, 0xed, 0xb3,
+  0x5e, 0x3c, 0x5b, 0x06, 0x10, 0xa0, 0x01, 0x14, 0xa3, 0x5f, 0x5e, 0x93, 0xca, 0x27, 0xe4, 0x16,
+  0x0a, 0xdf, 0xf0, 0xce, 0xd5, 0x4c, 0x64, 0x62, 0x34, 0x36, 0xe7, 0x58, 0x5c, 0xbf, 0xaf, 0x15,
+  0x6b, 0xc2, 0xf5, 0xd3, 0x02, 0xb5, 0x55, 0xf9, 0xb9, 0xbe, 0x42, 0x00, 0xd1, 0xe8, 0x5e, 0x73,
+  0x25, 0xb5, 0x5e, 0x27, 0x56, 0x64, 0xa0, 0xbb, 0xc3, 0xff, 0xfb, 0x7a, 0xd2, 0xa0, 0xbb, 0x17,
+  0x55, 0x2a, 0xba, 0xa0, 0xd1, 0x6d, 0x8d, 0x7e, 0x7e, 0xfe, 0x2f, 0x6f, 0x53, 0x05, 0x09, 0x8e,
+  0x16, 0x00, 0x00
 };
 
 
 // Autogenerated from wled00/data/settings_leds.htm, do not edit!!
 const uint16_t PAGE_settings_leds_length = 7593;
 const uint8_t PAGE_settings_leds[] PROGMEM = {
-  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xdd, 0x3c, 0xdb, 0x76, 0xe2, 0x48,
+  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xdd, 0x3c, 0xdb, 0x76, 0xe2, 0x48,
   0x92, 0xef, 0x7c, 0x45, 0x5a, 0xdd, 0xed, 0x92, 0x1a, 0x19, 0x24, 0x2e, 0x6e, 0x0c, 0x08, 0xaf,
   0xa1, 0x2e, 0xed, 0x19, 0xbb, 0xed, 0x03, 0xae, 0xaa, 0x99, 0x53, 0x5d, 0xa7, 0x4b, 0x48, 0x09,
   0xa8, 0x2c, 0x24, 0x46, 0x12, 0xbe, 0xac, 0xed, 0xfd, 0xa6, 0xfd, 0x86, 0xfd, 0xb2, 0x8d, 0xc8,
@@ -756,7 +764,7 @@ const uint8_t PAGE_settings_leds[] PROGMEM = {
 // Autogenerated from wled00/data/settings_dmx.htm, do not edit!!
 const uint16_t PAGE_settings_dmx_length = 1612;
 const uint8_t PAGE_settings_dmx[] PROGMEM = {
-  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x95, 0x57, 0xdb, 0x72, 0xdb, 0x36,
+  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x95, 0x57, 0xdb, 0x72, 0xdb, 0x36,
   0x10, 0x7d, 0xd7, 0x57, 0x20, 0x78, 0x88, 0xc9, 0x31, 0x43, 0x4a, 0x4e, 0x95, 0x36, 0x32, 0x49,
   0x37, 0x56, 0x5c, 0xdb, 0x1d, 0xdb, 0xf5, 0x44, 0x49, 0xd3, 0x4e, 0xd3, 0xe9, 0x40, 0xe4, 0x4a,
   0x44, 0x4c, 0x02, 0x2c, 0x00, 0x4a, 0x76, 0x2e, 0xff, 0xde, 0x05, 0x48, 0x5d, 0xec, 0xd8, 0x69,
@@ -863,7 +871,7 @@ const uint8_t PAGE_settings_dmx[] PROGMEM = {
 // Autogenerated from wled00/data/settings_ui.htm, do not edit!!
 const uint16_t PAGE_settings_ui_length = 3181;
 const uint8_t PAGE_settings_ui[] PROGMEM = {
-  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x59, 0x6d, 0x77, 0xda, 0x38,
+  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x59, 0x6d, 0x77, 0xda, 0x38,
   0x16, 0xfe, 0xce, 0xaf, 0x50, 0xd5, 0x39, 0x19, 0x38, 0x71, 0x81, 0xb4, 0xb3, 0x67, 0x5b, 0xc0,
   0x64, 0x9b, 0x34, 0xd3, 0x66, 0x4e, 0x3a, 0xed, 0x96, 0x74, 0x3b, 0x73, 0xba, 0x3d, 0x19, 0x63,
   0x0b, 0x50, 0x63, 0x5b, 0x1e, 0x4b, 0x0e, 0xc9, 0x52, 0xfe, 0xfb, 0x3e, 0x57, 0xb2, 0xc1, 0x90,
@@ -1068,7 +1076,7 @@ const uint8_t PAGE_settings_ui[] PROGMEM = {
 // Autogenerated from wled00/data/settings_sync.htm, do not edit!!
 const uint16_t PAGE_settings_sync_length = 3340;
 const uint8_t PAGE_settings_sync[] PROGMEM = {
-  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x1a, 0x6b, 0x53, 0xdb, 0xb8,
+  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x1a, 0x6b, 0x53, 0xdb, 0xb8,
   0xf6, 0xbb, 0x7f, 0x85, 0xf0, 0xce, 0x74, 0x93, 0x25, 0xe4, 0x01, 0x84, 0x52, 0x88, 0xdd, 0x0b,
   0x84, 0x42, 0xee, 0x2d, 0x34, 0x4d, 0xe8, 0xb6, 0x3b, 0x73, 0x67, 0x76, 0x14, 0x5b, 0x49, 0x04,
   0xb6, 0xe5, 0x95, 0x64, 0x1e, 0xd3, 0xed, 0x7f, 0xbf, 0xe7, 0xc8, 0x8f, 0x24, 0x26, 0xaf, 0xde,
@@ -1283,7 +1291,7 @@ const uint8_t PAGE_settings_sync[] PROGMEM = {
 // Autogenerated from wled00/data/settings_time.htm, do not edit!!
 const uint16_t PAGE_settings_time_length = 3313;
 const uint8_t PAGE_settings_time[] PROGMEM = {
-  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xd5, 0x1a, 0x6b, 0x57, 0xdb, 0x38,
+  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xd5, 0x1a, 0x6b, 0x57, 0xdb, 0x38,
   0xf6, 0x7b, 0x7e, 0x85, 0x50, 0x7b, 0x98, 0x78, 0x70, 0x9e, 0x90, 0x16, 0x92, 0xd8, 0xdd, 0x10,
   0xd2, 0x42, 0x4b, 0x02, 0x67, 0x92, 0x0e, 0xbb, 0xd3, 0xf6, 0x4c, 0x15, 0x5b, 0x49, 0x0c, 0x8e,
   0xe4, 0xb5, 0x65, 0x02, 0x4b, 0xf9, 0xef, 0x7b, 0x25, 0x39, 0xce, 0xd3, 0xd0, 0x76, 0x66, 0x3f,
@@ -1497,7 +1505,7 @@ const uint8_t PAGE_settings_time[] PROGMEM = {
 // Autogenerated from wled00/data/settings_sec.htm, do not edit!!
 const uint16_t PAGE_settings_sec_length = 2407;
 const uint8_t PAGE_settings_sec[] PROGMEM = {
-  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xa5, 0x58, 0x6d, 0x53, 0xdb, 0x48,
+  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xa5, 0x58, 0x6d, 0x53, 0xdb, 0x48,
   0x12, 0xfe, 0xee, 0x5f, 0x31, 0x9e, 0x54, 0xb1, 0xd6, 0x45, 0x58, 0x40, 0x72, 0x5b, 0x09, 0x58,
   0xce, 0x41, 0x20, 0x1b, 0xae, 0x20, 0x50, 0xd8, 0x6c, 0xee, 0x2a, 0x97, 0x4a, 0x8d, 0xa5, 0xb1,
   0x35, 0xb1, 0xac, 0xd1, 0xce, 0x8c, 0x70, 0x7c, 0xd9, 0xfd, 0xef, 0xf7, 0xf4, 0x48, 0x32, 0x86,
@@ -1654,7 +1662,7 @@ const uint8_t PAGE_settings_sec[] PROGMEM = {
 // Autogenerated from wled00/data/settings_um.htm, do not edit!!
 const uint16_t PAGE_settings_um_length = 2786;
 const uint8_t PAGE_settings_um[] PROGMEM = {
-  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xcd, 0x59, 0x6d, 0x73, 0xdb, 0x36,
+  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xcd, 0x59, 0x6d, 0x73, 0xdb, 0x36,
   0x12, 0xfe, 0xee, 0x5f, 0x41, 0x23, 0x1e, 0x9b, 0x1c, 0xd1, 0x94, 0x9c, 0xb4, 0x33, 0xa9, 0x24,
   0xd2, 0x97, 0x38, 0x69, 0xa3, 0xcb, 0x8b, 0x3d, 0xe3, 0xb4, 0x9d, 0x1b, 0xc7, 0x17, 0x53, 0x22,
   0x24, 0x21, 0xa6, 0x00, 0x16, 0x04, 0xfd, 0x72, 0xb2, 0xfe, 0xfb, 0x3d, 0x0b, 0xbe, 0x88, 0x72,
@@ -1835,7 +1843,7 @@ const uint8_t PAGE_settings_um[] PROGMEM = {
 // Autogenerated from wled00/data/settings_2D.htm, do not edit!!
 const uint16_t PAGE_settings_2D_length = 3172;
 const uint8_t PAGE_settings_2D[] PROGMEM = {
-  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xc5, 0x5a, 0x5b, 0x77, 0xdb, 0x36,
+  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xc5, 0x5a, 0x5b, 0x77, 0xdb, 0x36,
   0x12, 0x7e, 0xd7, 0xaf, 0x80, 0xd1, 0xae, 0x4b, 0x5a, 0xd4, 0xcd, 0x4d, 0x7a, 0x5a, 0x49, 0x94,
   0x36, 0x8e, 0xd3, 0xd8, 0x7b, 0xec, 0x44, 0xc7, 0x72, 0xed, 0xe4, 0xb4, 0x3d, 0x0d, 0x4d, 0x42,
   0x12, 0x12, 0x0a, 0x60, 0x09, 0x48, 0xb6, 0xeb, 0xf8, 0xbf, 0xef, 0x0c, 0xc0, 0x9b, 0x68, 0xd9,
@@ -2040,7 +2048,7 @@ const uint8_t PAGE_settings_2D[] PROGMEM = {
 // Autogenerated from wled00/data/settings_pin.htm, do not edit!!
 const uint16_t PAGE_settings_pin_length = 471;
 const uint8_t PAGE_settings_pin[] PROGMEM = {
-  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x5d, 0x52, 0x4d, 0x6f, 0x13, 0x31,
+  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x5d, 0x52, 0x4d, 0x6f, 0x13, 0x31,
   0x10, 0xbd, 0xef, 0xaf, 0x30, 0x73, 0x69, 0x82, 0x92, 0x6c, 0xa8, 0xa8, 0x04, 0xaa, 0xbd, 0x42,
   0x81, 0x1e, 0xb8, 0x94, 0x48, 0xe5, 0x52, 0x55, 0x55, 0xe5, 0xd8, 0xb3, 0x89, 0x55, 0x7f, 0x2c,
   0xb6, 0x37, 0x21, 0x54, 0xfc, 0x77, 0xc6, 0xbb, 0xa1, 0xa0, 0x5c, 0xd6, 0x7e, 0x33, 0xe3, 0x37,

From 49a5847fa2cbd21e50593b22c76f985e7899bbd8 Mon Sep 17 00:00:00 2001
From: Clayton Sims <csims@dimagi.com>
Date: Mon, 12 Jun 2023 17:29:58 -0500
Subject: [PATCH 7/9] Disable ESP-NOW remote by default on ESP32 until tested

---
 wled00/wled.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wled00/wled.h b/wled00/wled.h
index 38d9a9382f..bbd34eec76 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -94,6 +94,9 @@
     #include <LittleFS.h>
   #endif
   #include "esp_task_wdt.h"
+
+  #define WLED_DISABLE_REMOTE // Temporarily disable ESP-NOW for esp32 platform
+
   #ifndef WLED_DISABLE_REMOTE
     #include <esp_now.h>
   #endif

From 09b564ca4b9bde9439d58911758390abc796f25b Mon Sep 17 00:00:00 2001
From: cschwinne <dev.aircoookie@gmail.com>
Date: Sat, 17 Jun 2023 11:17:00 +0200
Subject: [PATCH 8/9] Enable ESP-NOW remote for ESP32

---
 wled00/fcn_declare.h | 2 +-
 wled00/ir.cpp        | 3 ---
 wled00/wled.h        | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index f5e96635b5..9e51059ac5 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -200,7 +200,7 @@ void serializePlaylist(JsonObject obj);
 void initPresetsFile();
 void handlePresets();
 bool applyPreset(byte index, byte callMode = CALL_MODE_DIRECT_CHANGE);
-void applyPresetWithFallback(uint8_t presetID, uint8_t effectID, uint8_t paletteID, uint8_t callMode);
+void applyPresetWithFallback(uint8_t presetID, uint8_t callMode, uint8_t effectID, uint8_t paletteID);
 inline bool applyTemporaryPreset() {return applyPreset(255);};
 void savePreset(byte index, const char* pname = nullptr, JsonObject saveobj = JsonObject());
 inline void saveTemporaryPreset() {savePreset(255);};
diff --git a/wled00/ir.cpp b/wled00/ir.cpp
index c1ce92c6aa..4770b7134f 100644
--- a/wled00/ir.cpp
+++ b/wled00/ir.cpp
@@ -73,9 +73,6 @@ void decBrightness()
 void presetFallback(uint8_t presetID, uint8_t effectID, uint8_t paletteID)
 {
   applyPresetWithFallback(presetID, CALL_MODE_BUTTON_PRESET, effectID, paletteID);
-  //these two will be overwritten if preset exists in handlePresets()
-  effectCurrent = effectID;
-  effectPalette = paletteID;
 }
 
 byte relativeChange(byte property, int8_t amount, byte lowerBoundary, byte higherBoundary)
diff --git a/wled00/wled.h b/wled00/wled.h
index 3d9ca7099c..42554d4f92 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -95,8 +95,6 @@
   #endif
   #include "esp_task_wdt.h"
 
-  #define WLED_DISABLE_REMOTE // Temporarily disable ESP-NOW for esp32 platform
-
   #ifndef WLED_DISABLE_REMOTE
     #include <esp_now.h>
   #endif

From 3c28bbd9c5b9cd26c7bc4fa0fc5128fdc2e8edfe Mon Sep 17 00:00:00 2001
From: cschwinne <dev.aircoookie@gmail.com>
Date: Sat, 17 Jun 2023 23:35:00 +0200
Subject: [PATCH 9/9] Rename ESP NOW define

---
 wled00/cfg.cpp       | 4 ++--
 wled00/fcn_declare.h | 2 +-
 wled00/remote.cpp    | 5 +----
 wled00/set.cpp       | 2 +-
 wled00/wled.h        | 8 ++++----
 wled00/xml.cpp       | 4 ++--
 6 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index 79df1d766e..15ef0e1f03 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -443,7 +443,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
   CJSON(retainMqttMsg, if_mqtt[F("rtn")]);
 #endif
 
-#ifndef WLED_DISABLE_REMOTE
+#ifndef WLED_DISABLE_ESPNOW
   JsonObject remote = doc["remote"];
   CJSON(enable_espnow_remote, remote[F("remote_enabled")]);
   getStringFromJson(linked_remote, remote[F("linked_remote")], 13);
@@ -902,7 +902,7 @@ void serializeConfig() {
   if_mqtt_topics[F("group")] = mqttGroupTopic;
 #endif
 
-#ifndef WLED_DISABLE_REMOTE
+#ifndef WLED_DISABLE_ESPNOW
   JsonObject remote = doc.createNestedObject(F("remote"));
   remote[F("remote_enabled")] = enable_espnow_remote;
   remote[F("linked_remote")] = linked_remote;
diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index 9e51059ac5..40a91c34be 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -200,7 +200,7 @@ void serializePlaylist(JsonObject obj);
 void initPresetsFile();
 void handlePresets();
 bool applyPreset(byte index, byte callMode = CALL_MODE_DIRECT_CHANGE);
-void applyPresetWithFallback(uint8_t presetID, uint8_t callMode, uint8_t effectID, uint8_t paletteID);
+void applyPresetWithFallback(uint8_t presetID, uint8_t callMode, uint8_t effectID = 0, uint8_t paletteID = 0);
 inline bool applyTemporaryPreset() {return applyPreset(255);};
 void savePreset(byte index, const char* pname = nullptr, JsonObject saveobj = JsonObject());
 inline void saveTemporaryPreset() {savePreset(255);};
diff --git a/wled00/remote.cpp b/wled00/remote.cpp
index 57c57c739c..c3ae5ecb24 100644
--- a/wled00/remote.cpp
+++ b/wled00/remote.cpp
@@ -17,7 +17,7 @@
 #define WIZMOTE_BUTTON_BRIGHT_UP   9
 #define WIZMOTE_BUTTON_BRIGHT_DOWN 8
 
-#ifdef WLED_DISABLE_REMOTE
+#ifdef WLED_DISABLE_ESPNOW
 void handleRemote(){}
 #else
 
@@ -111,9 +111,6 @@ void setOff() {
 
 void presetWithFallback(uint8_t presetID, uint8_t effectID, uint8_t paletteID) {
   applyPresetWithFallback(presetID, CALL_MODE_BUTTON_PRESET, effectID, paletteID);
-  //these two will be overwritten if preset exists in handlePresets()
-  effectCurrent = effectID;
-  effectPalette = paletteID;
 }
  
 // Callback function that will be executed when data is received
diff --git a/wled00/set.cpp b/wled00/set.cpp
index 68e59b52b1..588ae0cd7b 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -34,7 +34,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
 
     noWifiSleep = request->hasArg(F("WS"));
 
-    #ifndef WLED_DISABLE_REMOTE
+    #ifndef WLED_DISABLE_ESPNOW
     enable_espnow_remote = request->hasArg(F("RE"));
     strlcpy(linked_remote,request->arg(F("RMAC")).c_str(), 13);
 
diff --git a/wled00/wled.h b/wled00/wled.h
index 42554d4f92..58182278bf 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -44,7 +44,7 @@
   #define WLED_ENABLE_WEBSOCKETS
 #endif
 
-//#define WLED_DISABLE_REMOTE      // Removes dependence on esp now 
+//#define WLED_DISABLE_ESPNOW      // Removes dependence on esp now 
 
 #define WLED_ENABLE_FS_EDITOR      // enable /edit page for editing FS content. Will also be disabled with OTA lock
 
@@ -75,7 +75,7 @@
   {
   #include <user_interface.h>
   }
-  #ifndef WLED_DISABLE_REMOTE
+  #ifndef WLED_DISABLE_ESPNOW
     #include <espnow.h>
   #endif
 #else // ESP32
@@ -95,7 +95,7 @@
   #endif
   #include "esp_task_wdt.h"
 
-  #ifndef WLED_DISABLE_REMOTE
+  #ifndef WLED_DISABLE_ESPNOW
     #include <esp_now.h>
   #endif
 #endif
@@ -453,7 +453,7 @@ WLED_GLOBAL bool hueApplyColor _INIT(true);
 
 WLED_GLOBAL uint16_t serialBaud _INIT(1152); // serial baud rate, multiply by 100
 
-#ifndef WLED_DISABLE_REMOTE
+#ifndef WLED_DISABLE_ESPNOW
 WLED_GLOBAL bool enable_espnow_remote _INIT(false);
 WLED_GLOBAL char linked_remote[13]   _INIT("");
 WLED_GLOBAL char last_signal_src[13]   _INIT("");
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index d4ae7a2ee1..e9eb8dd0f5 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -328,7 +328,7 @@ void getSettingsJS(byte subPage, char* dest)
     sappend('v',SET_F("AC"),apChannel);
     sappend('c',SET_F("WS"),noWifiSleep);
 
-    #ifndef WLED_DISABLE_REMOTE
+    #ifndef WLED_DISABLE_ESPNOW
     sappend('c',SET_F("RE"),enable_espnow_remote);
     sappends('s',SET_F("RMAC"),linked_remote);
     #else
@@ -369,7 +369,7 @@ void getSettingsJS(byte subPage, char* dest)
       sappends('m',SET_F("(\"sip\")[1]"),(char*)F("Not active"));
     }
 
-    #ifndef WLED_DISABLE_REMOTE
+    #ifndef WLED_DISABLE_ESPNOW
     if (last_signal_src[0] != 0) //Have seen an ESP-NOW Remote
     {
       sappends('m',SET_F("(\"rlid\")[0]"),last_signal_src);