diff --git a/wled00/wled.cpp b/wled00/wled.cpp
new file mode 100644
index 00000000..50a83f27
--- /dev/null
+++ b/wled00/wled.cpp
@@ -0,0 +1,503 @@
+#include "wled.h"
+
+WLED::WLED() {
+
+}
+
+//turns all LEDs off and restarts ESP
+void WLED::reset()
+{
+    briT = 0;
+    long dly = millis();
+    while (millis() - dly < 250)
+    {
+        yield(); //enough time to send response to client
+    }
+    setAllLeds();
+    DEBUG_PRINTLN("MODULE RESET");
+    ESP.restart();
+}
+
+bool oappendi(int i)
+{
+    char s[11];
+    sprintf(s, "%ld", i);
+    return oappend(s);
+}
+
+bool oappend(const char *txt)
+{
+    uint16_t len = strlen(txt);
+    if (olen + len >= OMAX)
+        return false; //buffer full
+    strcpy(obuf + olen, txt);
+    olen += len;
+    return true;
+}
+
+void WLED::loop()
+{
+    handleIR(); //2nd call to function needed for ESP32 to return valid results -- should be good for ESP8266, too
+    handleConnection();
+    handleSerial();
+    handleNotifications();
+    handleTransitions();
+#ifdef WLED_ENABLE_DMX
+    handleDMX();
+#endif
+    userLoop();
+
+    yield();
+    handleIO();
+    handleIR();
+    handleNetworkTime();
+    handleAlexa();
+
+    handleOverlays();
+    yield();
+#ifdef WLED_USE_ANALOG_LEDS
+    strip.setRgbwPwm();
+#endif
+
+    if (doReboot)
+        reset();
+
+    if (!realtimeMode) //block stuff if WARLS/Adalight is enabled
+    {
+        if (apActive)
+            dnsServer.processNextRequest();
+#ifndef WLED_DISABLE_OTA
+        if (WLED_CONNECTED && aOtaEnabled)
+            ArduinoOTA.handle();
+#endif
+        handleNightlight();
+        yield();
+
+        handleHue();
+        handleBlynk();
+
+        yield();
+        if (!offMode)
+            strip.service();
+    }
+    yield();
+#ifdef ESP8266
+    MDNS.update();
+#endif
+    if (millis() - lastMqttReconnectAttempt > 30000)
+        initMqtt();
+
+//DEBUG serial logging
+#ifdef WLED_DEBUG
+    if (millis() - debugTime > 9999)
+    {
+        DEBUG_PRINTLN("---DEBUG INFO---");
+        DEBUG_PRINT("Runtime: ");
+        DEBUG_PRINTLN(millis());
+        DEBUG_PRINT("Unix time: ");
+        DEBUG_PRINTLN(now());
+        DEBUG_PRINT("Free heap: ");
+        DEBUG_PRINTLN(ESP.getFreeHeap());
+        DEBUG_PRINT("Wifi state: ");
+        DEBUG_PRINTLN(WiFi.status());
+        if (WiFi.status() != lastWifiState)
+        {
+            wifiStateChangedTime = millis();
+        }
+        lastWifiState = WiFi.status();
+        DEBUG_PRINT("State time: ");
+        DEBUG_PRINTLN(wifiStateChangedTime);
+        DEBUG_PRINT("NTP last sync: ");
+        DEBUG_PRINTLN(ntpLastSyncTime);
+        DEBUG_PRINT("Client IP: ");
+        DEBUG_PRINTLN(WiFi.localIP());
+        DEBUG_PRINT("Loops/sec: ");
+        DEBUG_PRINTLN(loops / 10);
+        loops = 0;
+        debugTime = millis();
+    }
+    loops++;
+#endif // WLED_DEBU
+}
+
+void WLED::wledInit()
+{
+    EEPROM.begin(EEPSIZE);
+    ledCount = EEPROM.read(229) + ((EEPROM.read(398) << 8) & 0xFF00);
+    if (ledCount > MAX_LEDS || ledCount == 0)
+        ledCount = 30;
+
+#ifdef ESP8266
+#if LEDPIN == 3
+    if (ledCount > MAX_LEDS_DMA)
+        ledCount = MAX_LEDS_DMA; //DMA method uses too much ram
+#endif
+#endif
+    Serial.begin(115200);
+    Serial.setTimeout(50);
+    DEBUG_PRINTLN();
+    DEBUG_PRINT("---WLED ");
+    DEBUG_PRINT(versionString);
+    DEBUG_PRINT(" ");
+    DEBUG_PRINT(VERSION);
+    DEBUG_PRINTLN(" INIT---");
+#ifdef ARDUINO_ARCH_ESP32
+    DEBUG_PRINT("esp32 ");
+    DEBUG_PRINTLN(ESP.getSdkVersion());
+#else
+    DEBUG_PRINT("esp8266 ");
+    DEBUG_PRINTLN(ESP.getCoreVersion());
+#endif
+    int heapPreAlloc = ESP.getFreeHeap();
+    DEBUG_PRINT("heap ");
+    DEBUG_PRINTLN(ESP.getFreeHeap());
+
+    strip.init(EEPROM.read(372), ledCount, EEPROM.read(2204)); //init LEDs quickly
+    strip.setBrightness(0);
+
+    DEBUG_PRINT("LEDs inited. heap usage ~");
+    DEBUG_PRINTLN(heapPreAlloc - ESP.getFreeHeap());
+
+#ifndef WLED_DISABLE_FILESYSTEM
+#ifdef ARDUINO_ARCH_ESP32
+    SPIFFS.begin(true);
+#endif
+    SPIFFS.begin();
+#endif
+
+    DEBUG_PRINTLN("Load EEPROM");
+    loadSettingsFromEEPROM(true);
+    beginStrip();
+    userSetup();
+    if (strcmp(clientSSID, DEFAULT_CLIENT_SSID) == 0)
+        showWelcomePage = true;
+    WiFi.persistent(false);
+
+    if (macroBoot > 0)
+        applyMacro(macroBoot);
+    Serial.println("Ada");
+
+    //generate module IDs
+    escapedMac = WiFi.macAddress();
+    escapedMac.replace(":", "");
+    escapedMac.toLowerCase();
+    if (strcmp(cmDNS, "x") == 0) //fill in unique mdns default
+    {
+        strcpy(cmDNS, "wled-");
+        sprintf(cmDNS + 5, "%*s", 6, escapedMac.c_str() + 6);
+    }
+    if (mqttDeviceTopic[0] == 0)
+    {
+        strcpy(mqttDeviceTopic, "wled/");
+        sprintf(mqttDeviceTopic + 5, "%*s", 6, escapedMac.c_str() + 6);
+    }
+    if (mqttClientID[0] == 0)
+    {
+        strcpy(mqttClientID, "WLED-");
+        sprintf(mqttClientID + 5, "%*s", 6, escapedMac.c_str() + 6);
+    }
+
+    strip.service();
+
+#ifndef WLED_DISABLE_OTA
+    if (aOtaEnabled)
+    {
+        ArduinoOTA.onStart([]() {
+#ifdef ESP8266
+            wifi_set_sleep_type(NONE_SLEEP_T);
+#endif
+            DEBUG_PRINTLN("Start ArduinoOTA");
+        });
+        if (strlen(cmDNS) > 0)
+            ArduinoOTA.setHostname(cmDNS);
+    }
+#endif
+#ifdef WLED_ENABLE_DMX
+    dmx.init(512); // initialize with bus length
+#endif
+    //HTTP server page init
+    initServer();
+}
+
+void WLED::beginStrip()
+{
+    // Initialize NeoPixel Strip and button
+    strip.setShowCallback(handleOverlayDraw);
+
+#ifdef BTNPIN
+    pinMode(BTNPIN, INPUT_PULLUP);
+#endif
+
+    if (bootPreset > 0)
+        applyPreset(bootPreset, turnOnAtBoot);
+    colorUpdated(NOTIFIER_CALL_MODE_INIT);
+
+//init relay pin
+#if RLYPIN >= 0
+    pinMode(RLYPIN, OUTPUT);
+#if RLYMDE
+    digitalWrite(RLYPIN, bri);
+#else
+    digitalWrite(RLYPIN, !bri);
+#endif
+#endif
+
+    //disable button if it is "pressed" unintentionally
+#ifdef BTNPIN
+    if (digitalRead(BTNPIN) == LOW)
+        buttonEnabled = false;
+#else
+    buttonEnabled = false;
+#endif
+}
+
+void WLED::initAP(bool resetAP = false)
+{
+    if (apBehavior == AP_BEHAVIOR_BUTTON_ONLY && !resetAP)
+        return;
+
+    if (!apSSID[0] || resetAP)
+        strcpy(apSSID, "WLED-AP");
+    if (resetAP)
+        strcpy(apPass, DEFAULT_AP_PASS);
+    DEBUG_PRINT("Opening access point ");
+    DEBUG_PRINTLN(apSSID);
+    WiFi.softAPConfig(IPAddress(4, 3, 2, 1), IPAddress(4, 3, 2, 1), IPAddress(255, 255, 255, 0));
+    WiFi.softAP(apSSID, apPass, apChannel, apHide);
+
+    if (!apActive) //start captive portal if AP active
+    {
+        DEBUG_PRINTLN("Init AP interfaces");
+        server.begin();
+        if (udpPort > 0 && udpPort != ntpLocalPort)
+        {
+            udpConnected = notifierUdp.begin(udpPort);
+        }
+        if (udpRgbPort > 0 && udpRgbPort != ntpLocalPort && udpRgbPort != udpPort)
+        {
+            udpRgbConnected = rgbUdp.begin(udpRgbPort);
+        }
+
+        dnsServer.setErrorReplyCode(DNSReplyCode::NoError);
+        dnsServer.start(53, "*", WiFi.softAPIP());
+    }
+    apActive = true;
+}
+
+void WLED::initConnection()
+{
+    WiFi.disconnect(); //close old connections
+#ifdef ESP8266
+    WiFi.setPhyMode(WIFI_PHY_MODE_11N);
+#endif
+
+    if (staticIP[0] != 0 && staticGateway[0] != 0)
+    {
+        WiFi.config(staticIP, staticGateway, staticSubnet, IPAddress(8, 8, 8, 8));
+    }
+    else
+    {
+        WiFi.config(0U, 0U, 0U);
+    }
+
+    lastReconnectAttempt = millis();
+
+    if (!WLED_WIFI_CONFIGURED)
+    {
+        DEBUG_PRINT("No connection configured. ");
+        if (!apActive)
+            initAP(); //instantly go to ap mode
+        return;
+    }
+    else if (!apActive)
+    {
+        if (apBehavior == AP_BEHAVIOR_ALWAYS)
+        {
+            initAP();
+        }
+        else
+        {
+            DEBUG_PRINTLN("Access point disabled.");
+            WiFi.softAPdisconnect(true);
+        }
+    }
+    showWelcomePage = false;
+
+    DEBUG_PRINT("Connecting to ");
+    DEBUG_PRINT(clientSSID);
+    DEBUG_PRINTLN("...");
+
+#ifdef ESP8266
+    WiFi.hostname(serverDescription);
+#endif
+
+    WiFi.begin(clientSSID, clientPass);
+
+#ifdef ARDUINO_ARCH_ESP32
+    WiFi.setSleep(!noWifiSleep);
+    WiFi.setHostname(serverDescription);
+#else
+    wifi_set_sleep_type((noWifiSleep) ? NONE_SLEEP_T : MODEM_SLEEP_T);
+#endif
+}
+
+void WLED::initInterfaces()
+{
+    DEBUG_PRINTLN("Init STA interfaces");
+
+    if (hueIP[0] == 0)
+    {
+        hueIP[0] = WiFi.localIP()[0];
+        hueIP[1] = WiFi.localIP()[1];
+        hueIP[2] = WiFi.localIP()[2];
+    }
+
+    //init Alexa hue emulation
+    if (alexaEnabled)
+        alexaInit();
+
+#ifndef WLED_DISABLE_OTA
+    if (aOtaEnabled)
+        ArduinoOTA.begin();
+#endif
+
+    strip.service();
+    // Set up mDNS responder:
+    if (strlen(cmDNS) > 0)
+    {
+        if (!aOtaEnabled)
+            MDNS.begin(cmDNS);
+
+        DEBUG_PRINTLN("mDNS started");
+        MDNS.addService("http", "tcp", 80);
+        MDNS.addService("wled", "tcp", 80);
+        MDNS.addServiceTxt("wled", "tcp", "mac", escapedMac.c_str());
+    }
+    server.begin();
+
+    if (udpPort > 0 && udpPort != ntpLocalPort)
+    {
+        udpConnected = notifierUdp.begin(udpPort);
+        if (udpConnected && udpRgbPort != udpPort)
+            udpRgbConnected = rgbUdp.begin(udpRgbPort);
+    }
+    if (ntpEnabled)
+        ntpConnected = ntpUdp.begin(ntpLocalPort);
+
+    initBlynk(blynkApiKey);
+    e131.begin((e131Multicast) ? E131_MULTICAST : E131_UNICAST, e131Universe, E131_MAX_UNIVERSE_COUNT);
+    reconnectHue();
+    initMqtt();
+    interfacesInited = true;
+    wasConnected = true;
+}
+
+byte stacO = 0;
+uint32_t lastHeap;
+unsigned long heapTime = 0;
+
+void WLED::handleConnection()
+{
+    if (millis() < 2000 && (!WLED_WIFI_CONFIGURED || apBehavior == AP_BEHAVIOR_ALWAYS))
+        return;
+    if (lastReconnectAttempt == 0)
+        initConnection();
+
+    //reconnect WiFi to clear stale allocations if heap gets too low
+    if (millis() - heapTime > 5000)
+    {
+        uint32_t heap = ESP.getFreeHeap();
+        if (heap < 9000 && lastHeap < 9000)
+        {
+            DEBUG_PRINT("Heap too low! ");
+            DEBUG_PRINTLN(heap);
+            forceReconnect = true;
+        }
+        lastHeap = heap;
+        heapTime = millis();
+    }
+
+    byte stac = 0;
+    if (apActive)
+    {
+#ifdef ESP8266
+        stac = wifi_softap_get_station_num();
+#else
+        wifi_sta_list_t stationList;
+        esp_wifi_ap_get_sta_list(&stationList);
+        stac = stationList.num;
+#endif
+        if (stac != stacO)
+        {
+            stacO = stac;
+            DEBUG_PRINT("Connected AP clients: ");
+            DEBUG_PRINTLN(stac);
+            if (!WLED_CONNECTED && WLED_WIFI_CONFIGURED)
+            { //trying to connect, but not connected
+                if (stac)
+                    WiFi.disconnect(); //disable search so that AP can work
+                else
+                    initConnection(); //restart search
+            }
+        }
+    }
+    if (forceReconnect)
+    {
+        DEBUG_PRINTLN("Forcing reconnect.");
+        initConnection();
+        interfacesInited = false;
+        forceReconnect = false;
+        wasConnected = false;
+        return;
+    }
+    if (!WLED_CONNECTED)
+    {
+        if (interfacesInited)
+        {
+            DEBUG_PRINTLN("Disconnected!");
+            interfacesInited = false;
+            initConnection();
+        }
+        if (millis() - lastReconnectAttempt > ((stac) ? 300000 : 20000) && WLED_WIFI_CONFIGURED)
+            initConnection();
+        if (!apActive && millis() - lastReconnectAttempt > 12000 && (!wasConnected || apBehavior == AP_BEHAVIOR_NO_CONN))
+            initAP();
+    }
+    else if (!interfacesInited)
+    { //newly connected
+        DEBUG_PRINTLN("");
+        DEBUG_PRINT("Connected! IP address: ");
+        DEBUG_PRINTLN(WiFi.localIP());
+        initInterfaces();
+        userConnected();
+
+        //shut down AP
+        if (apBehavior != AP_BEHAVIOR_ALWAYS && apActive)
+        {
+            dnsServer.stop();
+            WiFi.softAPdisconnect(true);
+            apActive = false;
+            DEBUG_PRINTLN("Access point disabled.");
+        }
+    }
+}
+
+//by https://github.com/tzapu/WiFiManager/blob/master/WiFiManager.cpp
+int WLED::getSignalQuality(int rssi)
+{
+    int quality = 0;
+
+    if (rssi <= -100)
+    {
+        quality = 0;
+    }
+    else if (rssi >= -50)
+    {
+        quality = 100;
+    }
+    else
+    {
+        quality = 2 * (rssi + 100);
+    }
+    return quality;
+}
\ No newline at end of file
diff --git a/wled00/wled.h b/wled00/wled.h
new file mode 100644
index 00000000..4f9b79af
--- /dev/null
+++ b/wled00/wled.h
@@ -0,0 +1,529 @@
+#ifndef WLED_H
+#define WLED_H
+
+/*
+   Main sketch, global variable declarations
+*/
+/*
+ * @title WLED project sketch
+ * @version 0.9.1
+ * @author Christian Schwinne
+ */
+
+//ESP8266-01 (blue) got too little storage space to work with all features of WLED. To use it, you must use ESP8266 Arduino Core v2.4.2 and the setting 512K(No SPIFFS).
+
+//ESP8266-01 (black) has 1MB flash and can thus fit the whole program. Use 1M(64K SPIFFS).
+//Uncomment some of the following lines to disable features to compile for ESP8266-01 (max flash size 434kB):
+
+//You are required to disable over-the-air updates:
+//#define WLED_DISABLE_OTA         //saves 14kb
+
+//You need to choose some of these features to disable:
+//#define WLED_DISABLE_ALEXA       //saves 11kb
+//#define WLED_DISABLE_BLYNK       //saves 6kb
+//#define WLED_DISABLE_CRONIXIE    //saves 3kb
+//#define WLED_DISABLE_HUESYNC     //saves 4kb
+//#define WLED_DISABLE_INFRARED    //there is no pin left for this on ESP8266-01, saves 12kb
+#define WLED_ENABLE_MQTT     //saves 12kb
+#define WLED_ENABLE_ADALIGHT //saves 500b only
+//#define WLED_ENABLE_DMX          //uses 3.5kb
+
+#define WLED_DISABLE_FILESYSTEM //SPIFFS is not used by any WLED feature yet
+//#define WLED_ENABLE_FS_SERVING   //Enable sending html file from SPIFFS before serving progmem version
+//#define WLED_ENABLE_FS_EDITOR    //enable /edit page for editing SPIFFS content. Will also be disabled with OTA lock
+
+//to toggle usb serial debug (un)comment the following line
+//#define WLED_DEBUG
+
+//library inclusions
+#include <Arduino.h>
+#ifdef WLED_ENABLE_DMX
+#include <ESPDMX.h>
+DMXESPSerial dmx;
+#endif
+#ifdef ESP8266
+#include <ESP8266WiFi.h>
+#include <ESP8266mDNS.h>
+#include <ESPAsyncTCP.h>
+extern "C"
+{
+#include <user_interface.h>
+}
+#else //ESP32
+#include <WiFi.h>
+#include "esp_wifi.h"
+#include <ESPmDNS.h>
+#include <AsyncTCP.h>
+#include "SPIFFS.h"
+#endif
+
+#include <ESPAsyncWebServer.h>
+#include <EEPROM.h>
+#include <WiFiUdp.h>
+#include <DNSServer.h>
+#ifndef WLED_DISABLE_OTA
+#include <ArduinoOTA.h>
+#endif
+#include <SPIFFSEditor.h>
+#include "src/dependencies/time/TimeLib.h"
+#include "src/dependencies/timezone/Timezone.h"
+#ifndef WLED_DISABLE_ALEXA
+#define ESPALEXA_ASYNC
+#define ESPALEXA_NO_SUBPAGE
+#define ESPALEXA_MAXDEVICES 1
+// #define ESPALEXA_DEBUG
+#include "src/dependencies/espalexa/Espalexa.h"
+#endif
+#ifndef WLED_DISABLE_BLYNK
+#include "src/dependencies/blynk/BlynkSimpleEsp.h"
+#endif
+#include "src/dependencies/e131/ESPAsyncE131.h"
+#include "src/dependencies/async-mqtt-client/AsyncMqttClient.h"
+#include "src/dependencies/json/AsyncJson-v6.h"
+#include "src/dependencies/json/ArduinoJson-v6.h"
+#include "html_ui.h"
+#include "html_settings.h"
+#include "html_other.h"
+#include "FX.h"
+#include "ir_codes.h"
+#include "const.h"
+
+#ifndef CLIENT_SSID
+#define CLIENT_SSID DEFAULT_CLIENT_SSID
+#endif
+
+#ifndef CLIENT_PASS
+#define CLIENT_PASS ""
+#endif
+
+#if IR_PIN < 0
+#ifndef WLED_DISABLE_INFRARED
+#define WLED_DISABLE_INFRARED
+#endif
+#endif
+
+#ifndef WLED_DISABLE_INFRARED
+#include <IRremoteESP8266.h>
+#include <IRrecv.h>
+#include <IRutils.h>
+#endif
+
+// remove flicker because PWM signal of RGB channels can become out of phase
+#if defined(WLED_USE_ANALOG_LEDS) && defined(ESP8266)
+#include "src/dependencies/arduino/core_esp8266_waveform.h"
+#endif
+
+// enable additional debug output
+#ifdef WLED_DEBUG
+#ifndef ESP8266
+#include <rom/rtc.h>
+#endif
+#endif
+
+//version code in format yymmddb (b = daily build)
+#define VERSION 2003222
+
+char versionString[] = "0.9.1";
+
+//AP and OTA default passwords (for maximum change them!)
+char apPass[65] = DEFAULT_AP_PASS;
+char otaPass[33] = DEFAULT_OTA_PASS;
+
+//Hardware CONFIG (only changeble HERE, not at runtime)
+//LED strip pin, button pin and IR pin changeable in NpbWrapper.h!
+
+byte auxDefaultState = 0;                       //0: input 1: high 2: low
+byte auxTriggeredState = 0;                     //0: input 1: high 2: low
+char ntpServerName[33] = "0.wled.pool.ntp.org"; //NTP server to use
+
+//WiFi CONFIG (all these can be changed via web UI, no need to set them here)
+char clientSSID[33] = CLIENT_SSID;
+char clientPass[65] = CLIENT_PASS;
+char cmDNS[33] = "x";                       //mDNS address (placeholder, will be replaced by wledXXXXXXXXXXXX.local)
+char apSSID[33] = "";                       //AP off by default (unless setup)
+byte apChannel = 1;                         //2.4GHz WiFi AP channel (1-13)
+byte apHide = 0;                            //hidden AP SSID
+byte apBehavior = AP_BEHAVIOR_BOOT_NO_CONN; //access point opens when no connection after boot by default
+IPAddress staticIP(0, 0, 0, 0);             //static IP of ESP
+IPAddress staticGateway(0, 0, 0, 0);        //gateway (router) IP
+IPAddress staticSubnet(255, 255, 255, 0);   //most common subnet in home networks
+bool noWifiSleep = false;                   //disabling modem sleep modes will increase heat output and power usage, but may help with connection issues
+
+//LED CONFIG
+uint16_t ledCount = 30;            //overcurrent prevented by ABL
+bool useRGBW = false;              //SK6812 strips can contain an extra White channel
+#define ABL_MILLIAMPS_DEFAULT 850; //auto lower brightness to stay close to milliampere limit
+bool turnOnAtBoot = true;          //turn on LEDs at power-up
+byte bootPreset = 0;               //save preset to load after power-up
+
+byte col[]{255, 160, 0, 0}; //current RGB(W) primary color. col[] should be updated if you want to change the color.
+byte colSec[]{0, 0, 0, 0};  //current RGB(W) secondary color
+byte briS = 128;            //default brightness
+
+byte nightlightTargetBri = 0; //brightness after nightlight is over
+byte nightlightDelayMins = 60;
+bool nightlightFade = true;       //if enabled, light will gradually dim towards the target bri. Otherwise, it will instantly set after delay over
+bool nightlightColorFade = false; //if enabled, light will gradually fade color from primary to secondary color.
+bool fadeTransition = true;       //enable crossfading color transition
+uint16_t transitionDelay = 750;   //default crossfade duration in ms
+
+bool skipFirstLed = false; //ignore first LED in strip (useful if you need the LED as signal repeater)
+byte briMultiplier = 100;  //% of brightness to set (to limit power, if you set it to 50 and set bri to 255, actual brightness will be 127)
+
+//User Interface CONFIG
+char serverDescription[33] = "WLED"; //Name of module
+bool syncToggleReceive = false;      //UIs which only have a single button for sync should toggle send+receive if this is true, only send otherwise
+
+//Sync CONFIG
+bool buttonEnabled = true;
+byte irEnabled = 0; //Infrared receiver
+
+uint16_t udpPort = 21324;    //WLED notifier default port
+uint16_t udpRgbPort = 19446; //Hyperion port
+
+bool receiveNotificationBrightness = true; //apply brightness from incoming notifications
+bool receiveNotificationColor = true;      //apply color
+bool receiveNotificationEffects = true;    //apply effects setup
+bool notifyDirect = false;                 //send notification if change via UI or HTTP API
+bool notifyButton = false;                 //send if updated by button or infrared remote
+bool notifyAlexa = false;                  //send notification if updated via Alexa
+bool notifyMacro = false;                  //send notification for macro
+bool notifyHue = true;                     //send notification if Hue light changes
+bool notifyTwice = false;                  //notifications use UDP: enable if devices don't sync reliably
+
+bool alexaEnabled = true;               //enable device discovery by Amazon Echo
+char alexaInvocationName[33] = "Light"; //speech control name of device. Choose something voice-to-text can understand
+
+char blynkApiKey[36] = ""; //Auth token for Blynk server. If empty, no connection will be made
+
+uint16_t realtimeTimeoutMs = 2500;      //ms timeout of realtime mode before returning to normal mode
+int arlsOffset = 0;                     //realtime LED offset
+bool receiveDirect = true;              //receive UDP realtime
+bool arlsDisableGammaCorrection = true; //activate if gamma correction is handled by the source
+bool arlsForceMaxBri = false;           //enable to force max brightness if source has very dark colors that would be black
+
+#define E131_MAX_UNIVERSE_COUNT 9
+uint16_t e131Universe = 1;                               //settings for E1.31 (sACN) protocol (only DMX_MODE_MULTIPLE_* can span over consequtive universes)
+uint8_t DMXMode = DMX_MODE_MULTIPLE_RGB;                 //DMX mode (s.a.)
+uint16_t DMXAddress = 1;                                 //DMX start address of fixture, a.k.a. first Channel [for E1.31 (sACN) protocol]
+uint8_t DMXOldDimmer = 0;                                //only update brightness on change
+uint8_t e131LastSequenceNumber[E131_MAX_UNIVERSE_COUNT]; //to detect packet loss
+bool e131Multicast = false;                              //multicast or unicast
+bool e131SkipOutOfSequence = false;                      //freeze instead of flickering
+
+bool mqttEnabled = false;
+char mqttDeviceTopic[33] = "";        //main MQTT topic (individual per device, default is wled/mac)
+char mqttGroupTopic[33] = "wled/all"; //second MQTT topic (for example to group devices)
+char mqttServer[33] = "";             //both domains and IPs should work (no SSL)
+char mqttUser[41] = "";               //optional: username for MQTT auth
+char mqttPass[41] = "";               //optional: password for MQTT auth
+char mqttClientID[41] = "";           //override the client ID
+uint16_t mqttPort = 1883;
+
+bool huePollingEnabled = false;    //poll hue bridge for light state
+uint16_t huePollIntervalMs = 2500; //low values (< 1sec) may cause lag but offer quicker response
+char hueApiKey[47] = "api";        //key token will be obtained from bridge
+byte huePollLightId = 1;           //ID of hue lamp to sync to. Find the ID in the hue app ("about" section)
+IPAddress hueIP = (0, 0, 0, 0);    //IP address of the bridge
+bool hueApplyOnOff = true;
+bool hueApplyBri = true;
+bool hueApplyColor = true;
+
+//Time CONFIG
+bool ntpEnabled = false;  //get internet time. Only required if you use clock overlays or time-activated macros
+bool useAMPM = false;     //12h/24h clock format
+byte currentTimezone = 0; //Timezone ID. Refer to timezones array in wled10_ntp.ino
+int utcOffsetSecs = 0;    //Seconds to offset from UTC before timzone calculation
+
+byte overlayDefault = 0;                        //0: no overlay 1: analog clock 2: single-digit clocl 3: cronixie
+byte overlayMin = 0, overlayMax = ledCount - 1; //boundaries of overlay mode
+
+byte analogClock12pixel = 0;          //The pixel in your strip where "midnight" would be
+bool analogClockSecondsTrail = false; //Display seconds as trail of LEDs instead of a single pixel
+bool analogClock5MinuteMarks = false; //Light pixels at every 5-minute position
+
+char cronixieDisplay[7] = "HHMMSS"; //Cronixie Display mask. See wled13_cronixie.ino
+bool cronixieBacklight = true;      //Allow digits to be back-illuminated
+
+bool countdownMode = false;                  //Clock will count down towards date
+byte countdownYear = 20, countdownMonth = 1; //Countdown target date, year is last two digits
+byte countdownDay = 1, countdownHour = 0;
+byte countdownMin = 0, countdownSec = 0;
+
+byte macroBoot = 0; //macro loaded after startup
+byte macroNl = 0;   //after nightlight delay over
+byte macroCountdown = 0;
+byte macroAlexaOn = 0, macroAlexaOff = 0;
+byte macroButton = 0, macroLongPress = 0, macroDoublePress = 0;
+
+//Security CONFIG
+bool otaLock = false;    //prevents OTA firmware updates without password. ALWAYS enable if system exposed to any public networks
+bool wifiLock = false;   //prevents access to WiFi settings when OTA lock is enabled
+bool aOtaEnabled = true; //ArduinoOTA allows easy updates directly from the IDE. Careful, it does not auto-disable when OTA lock is on
+
+uint16_t userVar0 = 0, userVar1 = 0;
+
+#ifdef WLED_ENABLE_DMX
+//dmx CONFIG
+byte DMXChannels = 7; // number of channels per fixture
+byte DMXFixtureMap[15] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+// assigns the different channels to different functions. See wled21_dmx.ino for more information.
+uint16_t DMXGap = 10;   // gap between the fixtures. makes addressing easier because you don't have to memorize odd numbers when climbing up onto a rig.
+uint16_t DMXStart = 10; // start address of the first fixture
+#endif
+
+//internal global variable declarations
+//wifi
+bool apActive = false;
+bool forceReconnect = false;
+uint32_t lastReconnectAttempt = 0;
+bool interfacesInited = false;
+bool wasConnected = false;
+
+//color
+byte colOld[]{0, 0, 0, 0}; //color before transition
+byte colT[]{0, 0, 0, 0};   //color that is currently displayed on the LEDs
+byte colIT[]{0, 0, 0, 0};  //color that was last sent to LEDs
+byte colSecT[]{0, 0, 0, 0};
+byte colSecOld[]{0, 0, 0, 0};
+byte colSecIT[]{0, 0, 0, 0};
+
+byte lastRandomIndex = 0; //used to save last random color so the new one is not the same
+
+//transitions
+bool transitionActive = false;
+uint16_t transitionDelayDefault = transitionDelay;
+uint16_t transitionDelayTemp = transitionDelay;
+unsigned long transitionStartTime;
+float tperLast = 0; //crossfade transition progress, 0.0f - 1.0f
+bool jsonTransitionOnce = false;
+
+//nightlight
+bool nightlightActive = false;
+bool nightlightActiveOld = false;
+uint32_t nightlightDelayMs = 10;
+uint8_t nightlightDelayMinsDefault = nightlightDelayMins;
+unsigned long nightlightStartTime;
+byte briNlT = 0;           //current nightlight brightness
+byte colNlT[]{0, 0, 0, 0}; //current nightlight color
+
+//brightness
+unsigned long lastOnTime = 0;
+bool offMode = !turnOnAtBoot;
+byte bri = briS;
+byte briOld = 0;
+byte briT = 0;
+byte briIT = 0;
+byte briLast = 128;   //brightness before turned off. Used for toggle function
+byte whiteLast = 128; //white channel before turned off. Used for toggle function
+
+//button
+bool buttonPressedBefore = false;
+bool buttonLongPressed = false;
+unsigned long buttonPressedTime = 0;
+unsigned long buttonWaitTime = 0;
+
+//notifications
+bool notifyDirectDefault = notifyDirect;
+bool receiveNotifications = true;
+unsigned long notificationSentTime = 0;
+byte notificationSentCallMode = NOTIFIER_CALL_MODE_INIT;
+bool notificationTwoRequired = false;
+
+//effects
+byte effectCurrent = 0;
+byte effectSpeed = 128;
+byte effectIntensity = 128;
+byte effectPalette = 0;
+
+//network
+bool udpConnected = false, udpRgbConnected = false;
+
+//ui style
+bool showWelcomePage = false;
+
+//hue
+byte hueError = HUE_ERROR_INACTIVE;
+//uint16_t hueFailCount = 0;
+float hueXLast = 0, hueYLast = 0;
+uint16_t hueHueLast = 0, hueCtLast = 0;
+byte hueSatLast = 0, hueBriLast = 0;
+unsigned long hueLastRequestSent = 0;
+bool hueAuthRequired = false;
+bool hueReceived = false;
+bool hueStoreAllowed = false, hueNewKey = false;
+
+//overlays
+byte overlayCurrent = overlayDefault;
+byte overlaySpeed = 200;
+unsigned long overlayRefreshMs = 200;
+unsigned long overlayRefreshedTime;
+
+//cronixie
+byte dP[]{0, 0, 0, 0, 0, 0};
+bool cronixieInit = false;
+
+//countdown
+unsigned long countdownTime = 1514764800L;
+bool countdownOverTriggered = true;
+
+//timer
+byte lastTimerMinute = 0;
+byte timerHours[] = {0, 0, 0, 0, 0, 0, 0, 0};
+byte timerMinutes[] = {0, 0, 0, 0, 0, 0, 0, 0};
+byte timerMacro[] = {0, 0, 0, 0, 0, 0, 0, 0};
+byte timerWeekday[] = {255, 255, 255, 255, 255, 255, 255, 255}; //weekdays to activate on
+//bit pattern of arr elem: 0b11111111: sun,sat,fri,thu,wed,tue,mon,validity
+
+//blynk
+bool blynkEnabled = false;
+
+//preset cycling
+bool presetCyclingEnabled = false;
+byte presetCycleMin = 1, presetCycleMax = 5;
+uint16_t presetCycleTime = 1250;
+unsigned long presetCycledTime = 0;
+byte presetCycCurr = presetCycleMin;
+bool presetApplyBri = true;
+bool saveCurrPresetCycConf = false;
+
+//realtime
+byte realtimeMode = REALTIME_MODE_INACTIVE;
+IPAddress realtimeIP = (0, 0, 0, 0);
+unsigned long realtimeTimeout = 0;
+
+//mqtt
+long lastMqttReconnectAttempt = 0;
+long lastInterfaceUpdate = 0;
+byte interfaceUpdateCallMode = NOTIFIER_CALL_MODE_INIT;
+char mqttStatusTopic[40] = ""; //this must be global because of async handlers
+
+#if AUXPIN >= 0
+    //auxiliary debug pin
+byte auxTime = 0;
+unsigned long auxStartTime = 0;
+bool auxActive = false, auxActiveBefore = false;
+#endif
+
+//alexa udp
+String escapedMac;
+#ifndef WLED_DISABLE_ALEXA
+Espalexa espalexa;
+EspalexaDevice *espalexaDevice;
+#endif
+
+//dns server
+DNSServer dnsServer;
+
+//network time
+bool ntpConnected = false;
+time_t local = 0;
+unsigned long ntpLastSyncTime = 999000000L;
+unsigned long ntpPacketSentTime = 999000000L;
+IPAddress ntpServerIP;
+uint16_t ntpLocalPort = 2390;
+#define NTP_PACKET_SIZE 48
+
+//maximum number of LEDs - MAX_LEDS is coming from the JSON response getting too big, MAX_LEDS_DMA will become a timing issue
+#define MAX_LEDS 1500
+#define MAX_LEDS_DMA 500
+
+//string temp buffer (now stored in stack locally)
+#define OMAX 2048
+char *obuf;
+uint16_t olen = 0;
+
+//presets
+uint16_t savedPresets = 0;
+int8_t currentPreset = -1;
+bool isPreset = false;
+
+byte errorFlag = 0;
+
+String messageHead, messageSub;
+byte optionType;
+
+bool doReboot = false; //flag to initiate reboot from async handlers
+bool doPublishMqtt = false;
+
+//server library objects
+AsyncWebServer server(80);
+AsyncClient *hueClient = NULL;
+AsyncMqttClient *mqtt = NULL;
+
+//function prototypes
+void colorFromUint32(uint32_t, bool = false);
+void serveMessage(AsyncWebServerRequest *, uint16_t, String, String, byte);
+void handleE131Packet(e131_packet_t *, IPAddress);
+void arlsLock(uint32_t, byte);
+void handleOverlayDraw();
+
+//udp interface objects
+WiFiUDP notifierUdp, rgbUdp;
+WiFiUDP ntpUdp;
+ESPAsyncE131 e131(handleE131Packet);
+bool e131NewData = false;
+
+//led fx library object
+WS2812FX strip = WS2812FX();
+
+#define WLED_CONNECTED (WiFi.status() == WL_CONNECTED)
+#define WLED_WIFI_CONFIGURED (strlen(clientSSID) >= 1 && strcmp(clientSSID, DEFAULT_CLIENT_SSID) != 0)
+
+//debug macros
+#ifdef WLED_DEBUG
+#define DEBUG_PRINT(x) Serial.print(x)
+#define DEBUG_PRINTLN(x) Serial.println(x)
+#define DEBUG_PRINTF(x) Serial.printf(x)
+unsigned long debugTime = 0;
+int lastWifiState = 3;
+unsigned long wifiStateChangedTime = 0;
+int loops = 0;
+#else
+#define DEBUG_PRINT(x)
+#define DEBUG_PRINTLN(x)
+#define DEBUG_PRINTF(x)
+#endif
+
+
+// TODO: Inline?
+//append new c string to temp buffer efficiently
+bool oappend(const char *txt);
+//append new number to temp buffer efficiently
+bool oappendi(int i);
+
+class WLED
+{
+public:
+    static WLED &instance()
+    {
+        static WLED instance;
+        return instance;
+    }
+
+    WLED();
+
+    void wledInit();
+
+    void reset();
+    void loop();
+
+
+    //boot starts here
+    void setup()
+    {
+        wledInit();
+    }
+
+    void loop();
+
+private:
+    void wledInit();
+    void beginStrip();
+
+    void handleConnection();
+    void initAP(bool resetAP = false);
+    void initConnection();
+    void initInterfaces();
+};
+#endif // WLED_H
diff --git a/wled00/wled00.ino b/wled00/wled00.ino
index 7c64796d..fc06f211 100644
--- a/wled00/wled00.ino
+++ b/wled00/wled00.ino
@@ -1,617 +1,13 @@
 /*
-   Main sketch, global variable declarations
+    Arduino Studio support file.
 */
-/*
- * @title WLED project sketch
- * @version 0.9.1
- * @author Christian Schwinne
- */
+#include "wled.h"
 
-//ESP8266-01 (blue) got too little storage space to work with all features of WLED. To use it, you must use ESP8266 Arduino Core v2.4.2 and the setting 512K(No SPIFFS).
-
-//ESP8266-01 (black) has 1MB flash and can thus fit the whole program. Use 1M(64K SPIFFS).
-//Uncomment some of the following lines to disable features to compile for ESP8266-01 (max flash size 434kB):
-
-//You are required to disable over-the-air updates:
-//#define WLED_DISABLE_OTA         //saves 14kb
-
-//You need to choose some of these features to disable:
-//#define WLED_DISABLE_ALEXA       //saves 11kb
-//#define WLED_DISABLE_BLYNK       //saves 6kb
-//#define WLED_DISABLE_CRONIXIE    //saves 3kb
-//#define WLED_DISABLE_HUESYNC     //saves 4kb
-//#define WLED_DISABLE_INFRARED    //there is no pin left for this on ESP8266-01, saves 12kb
-#define WLED_ENABLE_MQTT           //saves 12kb
-#define WLED_ENABLE_ADALIGHT       //saves 500b only
-//#define WLED_ENABLE_DMX          //uses 3.5kb
-
-#define WLED_DISABLE_FILESYSTEM    //SPIFFS is not used by any WLED feature yet
-//#define WLED_ENABLE_FS_SERVING   //Enable sending html file from SPIFFS before serving progmem version
-//#define WLED_ENABLE_FS_EDITOR    //enable /edit page for editing SPIFFS content. Will also be disabled with OTA lock
-
-//to toggle usb serial debug (un)comment the following line
-//#define WLED_DEBUG
-
-//library inclusions
-#include <Arduino.h>
-#ifdef WLED_ENABLE_DMX
-  #include <ESPDMX.h>
-  DMXESPSerial dmx;
-#endif
-#ifdef ESP8266
-  #include <ESP8266WiFi.h>
-  #include <ESP8266mDNS.h>
-  #include <ESPAsyncTCP.h>
-  extern "C" {
-  #include <user_interface.h>
-  }
-#else  //ESP32
-  #include <WiFi.h>
-  #include "esp_wifi.h"
-  #include <ESPmDNS.h>
-  #include <AsyncTCP.h>
-  #include "SPIFFS.h"
-#endif
-
-#include <ESPAsyncWebServer.h>
-#include <EEPROM.h>
-#include <WiFiUdp.h>
-#include <DNSServer.h>
-#ifndef WLED_DISABLE_OTA
-  #include <ArduinoOTA.h>
-#endif
-#include <SPIFFSEditor.h>
-#include "src/dependencies/time/TimeLib.h"
-#include "src/dependencies/timezone/Timezone.h"
-#ifndef WLED_DISABLE_ALEXA
-  #define ESPALEXA_ASYNC
-  #define ESPALEXA_NO_SUBPAGE
-  #define ESPALEXA_MAXDEVICES 1
-  // #define ESPALEXA_DEBUG
-  #include "src/dependencies/espalexa/Espalexa.h"
-#endif
-#ifndef WLED_DISABLE_BLYNK
-  #include "src/dependencies/blynk/BlynkSimpleEsp.h"
-#endif
-#include "src/dependencies/e131/ESPAsyncE131.h"
-#include "src/dependencies/async-mqtt-client/AsyncMqttClient.h"
-#include "src/dependencies/json/AsyncJson-v6.h"
-#include "src/dependencies/json/ArduinoJson-v6.h"
-#include "html_ui.h"
-#include "html_settings.h"
-#include "html_other.h"
-#include "FX.h"
-#include "ir_codes.h"
-#include "const.h"
-
-#ifndef CLIENT_SSID
-#define CLIENT_SSID DEFAULT_CLIENT_SSID
-#endif
-
-#ifndef CLIENT_PASS
-#define CLIENT_PASS ""
-#endif
-
-
-#if IR_PIN < 0
-  #ifndef WLED_DISABLE_INFRARED
-    #define WLED_DISABLE_INFRARED
-  #endif
-#endif
-
-#ifndef WLED_DISABLE_INFRARED
-  #include <IRremoteESP8266.h>
-  #include <IRrecv.h>
-  #include <IRutils.h>
-#endif
-
-// remove flicker because PWM signal of RGB channels can become out of phase
-#if defined(WLED_USE_ANALOG_LEDS) && defined(ESP8266)
-  #include "src/dependencies/arduino/core_esp8266_waveform.h"
-#endif
-
-// enable additional debug output
-#ifdef WLED_DEBUG
-  #ifndef ESP8266
-    #include <rom/rtc.h>
-  #endif
-#endif
-
-//version code in format yymmddb (b = daily build)
-#define VERSION 2003222
-
-char versionString[] = "0.9.1";
-
-
-//AP and OTA default passwords (for maximum change them!)
-char apPass[65] = DEFAULT_AP_PASS;
-char otaPass[33] = DEFAULT_OTA_PASS;
-
-
-//Hardware CONFIG (only changeble HERE, not at runtime)
-//LED strip pin, button pin and IR pin changeable in NpbWrapper.h!
-
-byte auxDefaultState   = 0;                   //0: input 1: high 2: low
-byte auxTriggeredState = 0;                   //0: input 1: high 2: low
-char ntpServerName[33] = "0.wled.pool.ntp.org";//NTP server to use
-
-
-//WiFi CONFIG (all these can be changed via web UI, no need to set them here)
-char clientSSID[33] = CLIENT_SSID;
-char clientPass[65] = CLIENT_PASS;
-char cmDNS[33] = "x";                         //mDNS address (placeholder, will be replaced by wledXXXXXXXXXXXX.local)
-char apSSID[33] = "";                         //AP off by default (unless setup)
-byte apChannel = 1;                           //2.4GHz WiFi AP channel (1-13)
-byte apHide = 0;                              //hidden AP SSID
-byte apBehavior = AP_BEHAVIOR_BOOT_NO_CONN;   //access point opens when no connection after boot by default
-IPAddress staticIP(0, 0, 0, 0);               //static IP of ESP
-IPAddress staticGateway(0, 0, 0, 0);          //gateway (router) IP
-IPAddress staticSubnet(255, 255, 255, 0);     //most common subnet in home networks
-bool noWifiSleep = false;                     //disabling modem sleep modes will increase heat output and power usage, but may help with connection issues
-
-
-//LED CONFIG
-uint16_t ledCount = 30;                       //overcurrent prevented by ABL
-bool useRGBW = false;                         //SK6812 strips can contain an extra White channel
-#define ABL_MILLIAMPS_DEFAULT 850;            //auto lower brightness to stay close to milliampere limit
-bool turnOnAtBoot  = true;                    //turn on LEDs at power-up
-byte bootPreset = 0;                          //save preset to load after power-up
-
-byte col[] {255, 160, 0, 0};                  //current RGB(W) primary color. col[] should be updated if you want to change the color.
-byte colSec[] {0, 0, 0, 0};                   //current RGB(W) secondary color
-byte briS = 128;                              //default brightness
-
-byte nightlightTargetBri = 0;                 //brightness after nightlight is over
-byte nightlightDelayMins = 60;
-bool nightlightFade = true;                   //if enabled, light will gradually dim towards the target bri. Otherwise, it will instantly set after delay over
-bool nightlightColorFade = false;             //if enabled, light will gradually fade color from primary to secondary color.
-bool fadeTransition = true;                   //enable crossfading color transition
-uint16_t transitionDelay = 750;               //default crossfade duration in ms
-
-bool skipFirstLed = false;                    //ignore first LED in strip (useful if you need the LED as signal repeater)
-byte briMultiplier =  100;                    //% of brightness to set (to limit power, if you set it to 50 and set bri to 255, actual brightness will be 127)
-
-
-//User Interface CONFIG
-char serverDescription[33] = "WLED";          //Name of module
-bool syncToggleReceive = false;               //UIs which only have a single button for sync should toggle send+receive if this is true, only send otherwise
-
-
-//Sync CONFIG
-bool buttonEnabled =  true;
-byte irEnabled     =  0;                      //Infrared receiver
-
-uint16_t udpPort    = 21324;                  //WLED notifier default port
-uint16_t udpRgbPort = 19446;                  //Hyperion port
-
-bool receiveNotificationBrightness = true;    //apply brightness from incoming notifications
-bool receiveNotificationColor      = true;    //apply color
-bool receiveNotificationEffects    = true;    //apply effects setup
-bool notifyDirect = false;                    //send notification if change via UI or HTTP API
-bool notifyButton = false;                    //send if updated by button or infrared remote
-bool notifyAlexa  = false;                    //send notification if updated via Alexa
-bool notifyMacro  = false;                    //send notification for macro
-bool notifyHue    =  true;                    //send notification if Hue light changes
-bool notifyTwice  = false;                    //notifications use UDP: enable if devices don't sync reliably
-
-bool alexaEnabled = true;                     //enable device discovery by Amazon Echo
-char alexaInvocationName[33] = "Light";       //speech control name of device. Choose something voice-to-text can understand
-
-char blynkApiKey[36] = "";                    //Auth token for Blynk server. If empty, no connection will be made
-
-uint16_t realtimeTimeoutMs = 2500;            //ms timeout of realtime mode before returning to normal mode
-int  arlsOffset = 0;                          //realtime LED offset
-bool receiveDirect    =  true;                //receive UDP realtime
-bool arlsDisableGammaCorrection = true;       //activate if gamma correction is handled by the source
-bool arlsForceMaxBri = false;                 //enable to force max brightness if source has very dark colors that would be black
-
-#define E131_MAX_UNIVERSE_COUNT 9
-uint16_t e131Universe = 1;                    //settings for E1.31 (sACN) protocol (only DMX_MODE_MULTIPLE_* can span over consequtive universes)
-uint8_t  DMXMode = DMX_MODE_MULTIPLE_RGB;     //DMX mode (s.a.)
-uint16_t DMXAddress = 1;                      //DMX start address of fixture, a.k.a. first Channel [for E1.31 (sACN) protocol]
-uint8_t  DMXOldDimmer = 0;                    //only update brightness on change
-uint8_t  e131LastSequenceNumber[E131_MAX_UNIVERSE_COUNT];          //to detect packet loss
-bool     e131Multicast = false;               //multicast or unicast
-bool     e131SkipOutOfSequence = false;       //freeze instead of flickering
-
-bool mqttEnabled = false;
-char mqttDeviceTopic[33] = "";                //main MQTT topic (individual per device, default is wled/mac)
-char mqttGroupTopic[33] = "wled/all";         //second MQTT topic (for example to group devices)
-char mqttServer[33] = "";                     //both domains and IPs should work (no SSL)
-char mqttUser[41] = "";                       //optional: username for MQTT auth
-char mqttPass[41] = "";                       //optional: password for MQTT auth
-char mqttClientID[41] = "";                   //override the client ID
-uint16_t mqttPort = 1883;
-
-bool huePollingEnabled = false;               //poll hue bridge for light state
-uint16_t huePollIntervalMs = 2500;            //low values (< 1sec) may cause lag but offer quicker response
-char hueApiKey[47] = "api";                   //key token will be obtained from bridge
-byte huePollLightId = 1;                      //ID of hue lamp to sync to. Find the ID in the hue app ("about" section)
-IPAddress hueIP = (0, 0, 0, 0);               //IP address of the bridge
-bool hueApplyOnOff = true;
-bool hueApplyBri   = true;
-bool hueApplyColor = true;
-
-
-//Time CONFIG
-bool ntpEnabled = false;                      //get internet time. Only required if you use clock overlays or time-activated macros
-bool useAMPM = false;                         //12h/24h clock format
-byte currentTimezone = 0;                     //Timezone ID. Refer to timezones array in wled10_ntp.ino
-int  utcOffsetSecs   = 0;                     //Seconds to offset from UTC before timzone calculation
-
-byte overlayDefault = 0;                      //0: no overlay 1: analog clock 2: single-digit clocl 3: cronixie
-byte overlayMin = 0, overlayMax = ledCount - 1; //boundaries of overlay mode
-
-byte analogClock12pixel = 0;                  //The pixel in your strip where "midnight" would be
-bool analogClockSecondsTrail = false;         //Display seconds as trail of LEDs instead of a single pixel
-bool analogClock5MinuteMarks = false;         //Light pixels at every 5-minute position
-
-char cronixieDisplay[7] = "HHMMSS";           //Cronixie Display mask. See wled13_cronixie.ino
-bool cronixieBacklight = true;                //Allow digits to be back-illuminated
-
-bool countdownMode = false;                   //Clock will count down towards date
-byte countdownYear = 20, countdownMonth = 1;  //Countdown target date, year is last two digits
-byte countdownDay  =  1, countdownHour  = 0;
-byte countdownMin  =  0, countdownSec   = 0;
-
-
-byte macroBoot = 0;                           //macro loaded after startup
-byte macroNl = 0;                             //after nightlight delay over
-byte macroCountdown = 0;
-byte macroAlexaOn = 0, macroAlexaOff = 0;
-byte macroButton = 0, macroLongPress = 0, macroDoublePress = 0;
-
-
-//Security CONFIG
-bool otaLock = false;                         //prevents OTA firmware updates without password. ALWAYS enable if system exposed to any public networks
-bool wifiLock = false;                        //prevents access to WiFi settings when OTA lock is enabled
-bool aOtaEnabled = true;                      //ArduinoOTA allows easy updates directly from the IDE. Careful, it does not auto-disable when OTA lock is on
-
-
-uint16_t userVar0 = 0, userVar1 = 0;
-
-#ifdef WLED_ENABLE_DMX
-  //dmx CONFIG
-  byte DMXChannels = 7;                       // number of channels per fixture
-  byte DMXFixtureMap[15] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-                                              // assigns the different channels to different functions. See wled21_dmx.ino for more information.
-  uint16_t DMXGap = 10;                       // gap between the fixtures. makes addressing easier because you don't have to memorize odd numbers when climbing up onto a rig.
-  uint16_t DMXStart = 10;                     // start address of the first fixture
-#endif
-
-
-//internal global variable declarations
-//wifi
-bool apActive = false;
-bool forceReconnect = false;
-uint32_t lastReconnectAttempt = 0;
-bool interfacesInited = false;
-bool wasConnected = false;
-
-//color
-byte colOld[] {0, 0, 0, 0};                   //color before transition
-byte colT[] {0, 0, 0, 0};                     //color that is currently displayed on the LEDs
-byte colIT[] {0, 0, 0, 0};                    //color that was last sent to LEDs
-byte colSecT[] {0, 0, 0, 0};
-byte colSecOld[] {0, 0, 0, 0};
-byte colSecIT[] {0, 0, 0, 0};
-
-byte lastRandomIndex = 0;                     //used to save last random color so the new one is not the same
-
-//transitions
-bool transitionActive = false;
-uint16_t transitionDelayDefault = transitionDelay;
-uint16_t transitionDelayTemp = transitionDelay;
-unsigned long transitionStartTime;
-float tperLast = 0;                           //crossfade transition progress, 0.0f - 1.0f
-bool jsonTransitionOnce = false;
-
-//nightlight
-bool nightlightActive = false;
-bool nightlightActiveOld = false;
-uint32_t nightlightDelayMs = 10;
-uint8_t nightlightDelayMinsDefault = nightlightDelayMins;
-unsigned long nightlightStartTime;
-byte briNlT = 0;                              //current nightlight brightness
-byte colNlT[] {0, 0, 0, 0};                   //current nightlight color
-
-//brightness
-unsigned long lastOnTime = 0;
-bool offMode = !turnOnAtBoot;
-byte bri = briS;
-byte briOld = 0;
-byte briT = 0;
-byte briIT = 0;
-byte briLast = 128;                           //brightness before turned off. Used for toggle function
-byte whiteLast = 128;                         //white channel before turned off. Used for toggle function
-
-//button
-bool buttonPressedBefore = false;
-bool buttonLongPressed = false;
-unsigned long buttonPressedTime = 0;
-unsigned long buttonWaitTime = 0;
-
-//notifications
-bool notifyDirectDefault = notifyDirect;
-bool receiveNotifications = true;
-unsigned long notificationSentTime = 0;
-byte notificationSentCallMode = NOTIFIER_CALL_MODE_INIT;
-bool notificationTwoRequired = false;
-
-//effects
-byte effectCurrent = 0;
-byte effectSpeed = 128;
-byte effectIntensity = 128;
-byte effectPalette = 0;
-
-//network
-bool udpConnected = false, udpRgbConnected = false;
-
-//ui style
-bool showWelcomePage = false;
-
-//hue
-byte hueError = HUE_ERROR_INACTIVE;
-//uint16_t hueFailCount = 0;
-float hueXLast = 0, hueYLast = 0;
-uint16_t hueHueLast = 0, hueCtLast = 0;
-byte hueSatLast = 0, hueBriLast = 0;
-unsigned long hueLastRequestSent = 0;
-bool hueAuthRequired = false;
-bool hueReceived = false;
-bool hueStoreAllowed = false, hueNewKey = false;
-
-//overlays
-byte overlayCurrent = overlayDefault;
-byte overlaySpeed = 200;
-unsigned long overlayRefreshMs = 200;
-unsigned long overlayRefreshedTime;
-
-//cronixie
-byte dP[] {0, 0, 0, 0, 0, 0};
-bool cronixieInit = false;
-
-//countdown
-unsigned long countdownTime = 1514764800L;
-bool countdownOverTriggered = true;
-
-//timer
-byte lastTimerMinute = 0;
-byte timerHours[]   = {0, 0, 0, 0, 0, 0, 0, 0};
-byte timerMinutes[] = {0, 0, 0, 0, 0, 0, 0, 0};
-byte timerMacro[]   = {0, 0, 0, 0, 0, 0, 0, 0};
-byte timerWeekday[] = {255, 255, 255, 255, 255, 255, 255, 255}; //weekdays to activate on
-//bit pattern of arr elem: 0b11111111: sun,sat,fri,thu,wed,tue,mon,validity
-
-//blynk
-bool blynkEnabled = false;
-
-//preset cycling
-bool presetCyclingEnabled = false;
-byte presetCycleMin = 1, presetCycleMax = 5;
-uint16_t presetCycleTime = 1250;
-unsigned long presetCycledTime = 0; byte presetCycCurr = presetCycleMin;
-bool presetApplyBri = true;
-bool saveCurrPresetCycConf = false;
-
-//realtime
-byte realtimeMode = REALTIME_MODE_INACTIVE;
-IPAddress realtimeIP = (0,0,0,0);
-unsigned long realtimeTimeout = 0;
-
-//mqtt
-long lastMqttReconnectAttempt = 0;
-long lastInterfaceUpdate = 0;
-byte interfaceUpdateCallMode = NOTIFIER_CALL_MODE_INIT;
-char mqttStatusTopic[40] = ""; //this must be global because of async handlers
-
-#if AUXPIN >= 0
-  //auxiliary debug pin
-  byte auxTime = 0;
-  unsigned long auxStartTime = 0;
-  bool auxActive = false, auxActiveBefore = false;
-#endif
-
-//alexa udp
-String escapedMac;
-#ifndef WLED_DISABLE_ALEXA
-  Espalexa espalexa;
-  EspalexaDevice* espalexaDevice;
-#endif
-
-//dns server
-DNSServer dnsServer;
-
-//network time
-bool ntpConnected = false;
-time_t local = 0;
-unsigned long ntpLastSyncTime = 999000000L;
-unsigned long ntpPacketSentTime = 999000000L;
-IPAddress ntpServerIP;
-uint16_t ntpLocalPort = 2390;
-#define NTP_PACKET_SIZE 48
-
-//maximum number of LEDs - MAX_LEDS is coming from the JSON response getting too big, MAX_LEDS_DMA will become a timing issue
-#define MAX_LEDS 1500
-#define MAX_LEDS_DMA 500
-
-//string temp buffer (now stored in stack locally)
-#define OMAX 2048
-char* obuf;
-uint16_t olen = 0;
-
-//presets
-uint16_t savedPresets = 0;
-int8_t currentPreset = -1;
-bool isPreset = false;
-
-byte errorFlag = 0;
-
-String messageHead, messageSub;
-byte optionType;
-
-bool doReboot = false; //flag to initiate reboot from async handlers
-bool doPublishMqtt = false;
-
-//server library objects
-AsyncWebServer server(80);
-AsyncClient* hueClient = NULL;
-AsyncMqttClient* mqtt = NULL;
-
-//function prototypes
-void colorFromUint32(uint32_t, bool = false);
-void serveMessage(AsyncWebServerRequest*, uint16_t, String, String, byte);
-void handleE131Packet(e131_packet_t*, IPAddress);
-void arlsLock(uint32_t,byte);
-void handleOverlayDraw();
-
-//udp interface objects
-WiFiUDP notifierUdp, rgbUdp;
-WiFiUDP ntpUdp;
-ESPAsyncE131 e131(handleE131Packet);
-bool e131NewData = false;
-
-//led fx library object
-WS2812FX strip = WS2812FX();
-
-#define WLED_CONNECTED (WiFi.status() == WL_CONNECTED)
-#define WLED_WIFI_CONFIGURED (strlen(clientSSID) >= 1 && strcmp(clientSSID,DEFAULT_CLIENT_SSID) != 0)
-
-//debug macros
-#ifdef WLED_DEBUG
-  #define DEBUG_PRINT(x)  Serial.print (x)
-  #define DEBUG_PRINTLN(x) Serial.println (x)
-  #define DEBUG_PRINTF(x) Serial.printf (x)
-  unsigned long debugTime = 0;
-  int lastWifiState = 3;
-  unsigned long wifiStateChangedTime = 0;
-  int loops = 0;
-#else
-  #define DEBUG_PRINT(x)
-  #define DEBUG_PRINTLN(x)
-  #define DEBUG_PRINTF(x)
-#endif
-
-//filesystem
-#ifndef WLED_DISABLE_FILESYSTEM
-  #include <FS.h>
-  #ifdef ARDUINO_ARCH_ESP32
-    #include "SPIFFS.h"
-  #endif
-  #include "SPIFFSEditor.h"
-#endif
-
-
-
-//turns all LEDs off and restarts ESP
-void reset()
-{
-  briT = 0;
-  long dly = millis();
-  while (millis() - dly < 250)
-  {
-    yield(); //enough time to send response to client
-  }
-  setAllLeds();
-  DEBUG_PRINTLN("MODULE RESET");
-  ESP.restart();
-}
-
-
-//append new c string to temp buffer efficiently
-bool oappend(const char* txt)
-{
-  uint16_t len = strlen(txt);
-  if (olen + len >= OMAX) return false; //buffer full
-  strcpy(obuf + olen, txt);
-  olen += len;
-  return true;
-}
-
-
-//append new number to temp buffer efficiently
-bool oappendi(int i)
-{
-  char s[11];
-  sprintf(s, "%ld", i);
-  return oappend(s);
-}
-
-
-//boot starts here
 void setup() {
-  wledInit();
+  //auto& wled = Wled();
 }
 
-
-//main program loop
 void loop() {
-  handleIR();          //2nd call to function needed for ESP32 to return valid results -- should be good for ESP8266, too
-  handleConnection();
-  handleSerial();
-  handleNotifications();
-  handleTransitions();
-#ifdef WLED_ENABLE_DMX
-  handleDMX();
-#endif
-  userLoop();
 
-  yield();
-  handleIO();
-  handleIR();
-  handleNetworkTime();
-  handleAlexa();
 
-  handleOverlays();
-  yield();
-#ifdef WLED_USE_ANALOG_LEDS 
-  strip.setRgbwPwm();
-#endif
-
-  if (doReboot) reset();
-
-  if (!realtimeMode) //block stuff if WARLS/Adalight is enabled
-  {
-    if (apActive) dnsServer.processNextRequest();
-#ifndef WLED_DISABLE_OTA
-    if (WLED_CONNECTED && aOtaEnabled) ArduinoOTA.handle();
-#endif
-    handleNightlight();
-    yield();
-
-    handleHue();
-    handleBlynk();
-
-    yield();
-    if (!offMode) strip.service();
-  }
-  yield();
-#ifdef ESP8266
-  MDNS.update();
-#endif
-  if (millis() - lastMqttReconnectAttempt > 30000) initMqtt();
-
-  //DEBUG serial logging
-#ifdef WLED_DEBUG
-  if (millis() - debugTime > 9999)
-  {
-    DEBUG_PRINTLN("---DEBUG INFO---");
-    DEBUG_PRINT("Runtime: "); DEBUG_PRINTLN(millis());
-    DEBUG_PRINT("Unix time: "); DEBUG_PRINTLN(now());
-    DEBUG_PRINT("Free heap: "); DEBUG_PRINTLN(ESP.getFreeHeap());
-    DEBUG_PRINT("Wifi state: "); DEBUG_PRINTLN(WiFi.status());
-    if (WiFi.status() != lastWifiState)
-    {
-      wifiStateChangedTime = millis();
-    }
-    lastWifiState = WiFi.status();
-    DEBUG_PRINT("State time: "); DEBUG_PRINTLN(wifiStateChangedTime);
-    DEBUG_PRINT("NTP last sync: "); DEBUG_PRINTLN(ntpLastSyncTime);
-    DEBUG_PRINT("Client IP: "); DEBUG_PRINTLN(WiFi.localIP());
-    DEBUG_PRINT("Loops/sec: "); DEBUG_PRINTLN(loops / 10);
-    loops = 0;
-    debugTime = millis();
-  }
-  loops++;
-#endif
-}
+}
\ No newline at end of file
diff --git a/wled00/wled05_init.ino b/wled00/wled05_init.ino
deleted file mode 100644
index 29ae0e7a..00000000
--- a/wled00/wled05_init.ino
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * Setup code
- */
-
-void wledInit()
-{
-  EEPROM.begin(EEPSIZE);
-  ledCount = EEPROM.read(229) + ((EEPROM.read(398) << 8) & 0xFF00);
-  if (ledCount > MAX_LEDS || ledCount == 0) ledCount = 30;
-
-  #ifdef ESP8266
-  #if LEDPIN == 3
-  if (ledCount > MAX_LEDS_DMA) ledCount = MAX_LEDS_DMA; //DMA method uses too much ram
-  #endif
-  #endif
-  Serial.begin(115200);
-  Serial.setTimeout(50);
-  DEBUG_PRINTLN();
-  DEBUG_PRINT("---WLED "); DEBUG_PRINT(versionString); DEBUG_PRINT(" "); DEBUG_PRINT(VERSION); DEBUG_PRINTLN(" INIT---");
-  #ifdef ARDUINO_ARCH_ESP32
-  DEBUG_PRINT("esp32 ");   DEBUG_PRINTLN(ESP.getSdkVersion());
-  #else
-  DEBUG_PRINT("esp8266 "); DEBUG_PRINTLN(ESP.getCoreVersion());
-  #endif
-  int heapPreAlloc = ESP.getFreeHeap();
-  DEBUG_PRINT("heap ");
-  DEBUG_PRINTLN(ESP.getFreeHeap());
-
-  strip.init(EEPROM.read(372),ledCount,EEPROM.read(2204)); //init LEDs quickly
-  strip.setBrightness(0);
-
-  DEBUG_PRINT("LEDs inited. heap usage ~");
-  DEBUG_PRINTLN(heapPreAlloc - ESP.getFreeHeap());
-
-  #ifndef WLED_DISABLE_FILESYSTEM
-   #ifdef ARDUINO_ARCH_ESP32
-    SPIFFS.begin(true);
-   #endif
-    SPIFFS.begin();
-  #endif
-
-  DEBUG_PRINTLN("Load EEPROM");
-  loadSettingsFromEEPROM(true);
-  beginStrip();
-  userSetup();
-  if (strcmp(clientSSID,DEFAULT_CLIENT_SSID) == 0) showWelcomePage = true;
-  WiFi.persistent(false);
-
-  if (macroBoot>0) applyMacro(macroBoot);
-  Serial.println("Ada");
-
-  //generate module IDs
-  escapedMac = WiFi.macAddress();
-  escapedMac.replace(":", "");
-  escapedMac.toLowerCase();
-  if (strcmp(cmDNS,"x") == 0) //fill in unique mdns default
-  {
-    strcpy(cmDNS, "wled-");
-    sprintf(cmDNS+5, "%*s", 6, escapedMac.c_str()+6);
-  }
-  if (mqttDeviceTopic[0] == 0)
-  {
-    strcpy(mqttDeviceTopic, "wled/");
-    sprintf(mqttDeviceTopic+5, "%*s", 6, escapedMac.c_str()+6);
-  }
-  if (mqttClientID[0] == 0)
-  {
-    strcpy(mqttClientID, "WLED-");
-    sprintf(mqttClientID+5, "%*s", 6, escapedMac.c_str()+6);
-  }
-
-  strip.service();
-
-  #ifndef WLED_DISABLE_OTA
-    if (aOtaEnabled)
-    {
-      ArduinoOTA.onStart([]() {
-        #ifdef ESP8266
-        wifi_set_sleep_type(NONE_SLEEP_T);
-        #endif
-        DEBUG_PRINTLN("Start ArduinoOTA");
-      });
-      if (strlen(cmDNS) > 0) ArduinoOTA.setHostname(cmDNS);
-    }
-  #endif
-  #ifdef WLED_ENABLE_DMX
-    dmx.init(512); // initialize with bus length
-  #endif
-  //HTTP server page init
-  initServer();
-}
-
-
-void beginStrip()
-{
-  // Initialize NeoPixel Strip and button
-  strip.setShowCallback(handleOverlayDraw);
-
-#ifdef BTNPIN
-  pinMode(BTNPIN, INPUT_PULLUP);
-#endif
-
-  if (bootPreset > 0) applyPreset(bootPreset, turnOnAtBoot);
-  colorUpdated(NOTIFIER_CALL_MODE_INIT);
-
-  //init relay pin
-  #if RLYPIN >= 0
-    pinMode(RLYPIN, OUTPUT);
-    #if RLYMDE
-      digitalWrite(RLYPIN, bri);
-    #else
-      digitalWrite(RLYPIN, !bri);
-    #endif
-  #endif
-
-  //disable button if it is "pressed" unintentionally
-#ifdef BTNPIN
-  if(digitalRead(BTNPIN) == LOW) buttonEnabled = false;
-#else
-  buttonEnabled = false;
-#endif
-}
-
-
-void initAP(bool resetAP=false){
-  if (apBehavior == AP_BEHAVIOR_BUTTON_ONLY && !resetAP) return;
-
-  if (!apSSID[0] || resetAP) strcpy(apSSID, "WLED-AP");
-  if (resetAP) strcpy(apPass,DEFAULT_AP_PASS);
-  DEBUG_PRINT("Opening access point ");
-  DEBUG_PRINTLN(apSSID);
-  WiFi.softAPConfig(IPAddress(4, 3, 2, 1), IPAddress(4, 3, 2, 1), IPAddress(255,255,255,0));
-  WiFi.softAP(apSSID, apPass, apChannel, apHide);
-  
-  if (!apActive) //start captive portal if AP active
-  {
-    DEBUG_PRINTLN("Init AP interfaces");
-    server.begin();
-    if (udpPort > 0 && udpPort != ntpLocalPort)
-    {
-      udpConnected = notifierUdp.begin(udpPort);
-    }
-    if (udpRgbPort > 0 && udpRgbPort != ntpLocalPort && udpRgbPort != udpPort)
-    {
-      udpRgbConnected = rgbUdp.begin(udpRgbPort);
-    }
-
-    dnsServer.setErrorReplyCode(DNSReplyCode::NoError);
-    dnsServer.start(53, "*", WiFi.softAPIP());
-  }
-  apActive = true;
-}
-
-void initConnection()
-{
-  WiFi.disconnect(); //close old connections
-  #ifdef ESP8266
-  WiFi.setPhyMode(WIFI_PHY_MODE_11N);
-  #endif
-
-  if (staticIP[0] != 0 && staticGateway[0] != 0)
-  {
-    WiFi.config(staticIP, staticGateway, staticSubnet, IPAddress(8,8,8,8));
-  } else
-  {
-    WiFi.config(0U, 0U, 0U);
-  }
-
-  lastReconnectAttempt = millis();
-
-  if (!WLED_WIFI_CONFIGURED)
-  {
-    DEBUG_PRINT("No connection configured. ");
-    if (!apActive) initAP(); //instantly go to ap mode
-    return;
-  } else if (!apActive) {
-    if (apBehavior == AP_BEHAVIOR_ALWAYS)
-    {
-      initAP();
-    } else
-    {
-      DEBUG_PRINTLN("Access point disabled.");
-      WiFi.softAPdisconnect(true);
-    }
-  }
-  showWelcomePage = false;
-  
-  DEBUG_PRINT("Connecting to ");
-  DEBUG_PRINT(clientSSID);
-  DEBUG_PRINTLN("...");
-
-  #ifdef ESP8266
-   WiFi.hostname(serverDescription);
-  #endif
-  
-   WiFi.begin(clientSSID, clientPass);
-   
-  #ifdef ARDUINO_ARCH_ESP32
-   WiFi.setSleep(!noWifiSleep);
-   WiFi.setHostname(serverDescription);
-  #else
-   wifi_set_sleep_type((noWifiSleep) ? NONE_SLEEP_T : MODEM_SLEEP_T);
-  #endif
-}
-
-void initInterfaces() {
-  DEBUG_PRINTLN("Init STA interfaces");
-  
-  if (hueIP[0] == 0)
-  {
-    hueIP[0] = WiFi.localIP()[0];
-    hueIP[1] = WiFi.localIP()[1];
-    hueIP[2] = WiFi.localIP()[2];
-  }
-
-  //init Alexa hue emulation
-  if (alexaEnabled) alexaInit();
-
-  #ifndef WLED_DISABLE_OTA
-   if (aOtaEnabled) ArduinoOTA.begin();
-  #endif
-
-  strip.service();
-  // Set up mDNS responder:
-  if (strlen(cmDNS) > 0)
-  {
-    if (!aOtaEnabled) MDNS.begin(cmDNS);
-
-    DEBUG_PRINTLN("mDNS started");
-    MDNS.addService("http", "tcp", 80);
-    MDNS.addService("wled", "tcp", 80);
-    MDNS.addServiceTxt("wled", "tcp", "mac", escapedMac.c_str());
-  }
-  server.begin();
-
-  if (udpPort > 0 && udpPort != ntpLocalPort)
-  {
-    udpConnected = notifierUdp.begin(udpPort);
-    if (udpConnected && udpRgbPort != udpPort) udpRgbConnected = rgbUdp.begin(udpRgbPort);
-  }
-  if (ntpEnabled) ntpConnected = ntpUdp.begin(ntpLocalPort);
-
-  initBlynk(blynkApiKey);
-  e131.begin((e131Multicast) ? E131_MULTICAST : E131_UNICAST , e131Universe, E131_MAX_UNIVERSE_COUNT);
-  reconnectHue();
-  initMqtt();
-  interfacesInited = true;
-  wasConnected = true;
-}
-
-byte stacO = 0;
-uint32_t lastHeap;
-unsigned long heapTime = 0;
-
-void handleConnection() {
-  if (millis() < 2000 && (!WLED_WIFI_CONFIGURED || apBehavior == AP_BEHAVIOR_ALWAYS)) return;
-  if (lastReconnectAttempt == 0) initConnection();
-
-  //reconnect WiFi to clear stale allocations if heap gets too low
-  if (millis() - heapTime > 5000)
-  {
-    uint32_t heap = ESP.getFreeHeap();
-    if (heap < 9000 && lastHeap < 9000) {
-      DEBUG_PRINT("Heap too low! ");
-      DEBUG_PRINTLN(heap);
-      forceReconnect = true;
-    }
-    lastHeap = heap;
-    heapTime = millis();
-  }
-  
-  byte stac = 0;
-  if (apActive) {
-    #ifdef ESP8266
-    stac = wifi_softap_get_station_num();
-    #else
-    wifi_sta_list_t stationList;
-    esp_wifi_ap_get_sta_list(&stationList);
-    stac = stationList.num;
-    #endif
-    if (stac != stacO)
-    {
-      stacO = stac;
-      DEBUG_PRINT("Connected AP clients: ");
-      DEBUG_PRINTLN(stac);
-      if (!WLED_CONNECTED && WLED_WIFI_CONFIGURED) { //trying to connect, but not connected
-        if (stac) WiFi.disconnect(); //disable search so that AP can work
-        else initConnection(); //restart search 
-      }
-    }
-  }
-  if (forceReconnect) {
-    DEBUG_PRINTLN("Forcing reconnect.");
-    initConnection();
-    interfacesInited = false;
-    forceReconnect = false;
-    wasConnected = false;
-    return;
-  }
-  if (!WLED_CONNECTED) {
-    if (interfacesInited) {
-      DEBUG_PRINTLN("Disconnected!");
-      interfacesInited = false;
-      initConnection();
-    }
-    if (millis() - lastReconnectAttempt > ((stac) ? 300000 : 20000) && WLED_WIFI_CONFIGURED) initConnection();
-    if (!apActive && millis() - lastReconnectAttempt > 12000 && (!wasConnected || apBehavior == AP_BEHAVIOR_NO_CONN)) initAP(); 
-  } else if (!interfacesInited) { //newly connected
-    DEBUG_PRINTLN("");
-    DEBUG_PRINT("Connected! IP address: ");
-    DEBUG_PRINTLN(WiFi.localIP());
-    initInterfaces();
-    userConnected();
-
-    //shut down AP
-    if (apBehavior != AP_BEHAVIOR_ALWAYS && apActive)
-    {
-      dnsServer.stop();
-      WiFi.softAPdisconnect(true);
-      apActive = false;
-      DEBUG_PRINTLN("Access point disabled.");
-    }
-  }
-}
-
-//by https://github.com/tzapu/WiFiManager/blob/master/WiFiManager.cpp
-int getSignalQuality(int rssi)
-{
-  int quality = 0;
-
-  if (rssi <= -100) {
-    quality = 0;
-  } else if (rssi >= -50) {
-    quality = 100;
-  } else {
-    quality = 2 * (rssi + 100);
-  }
-  return quality;
-}
diff --git a/wled00/wled06_usermod.ino b/wled00/wled06_usermod.cpp
similarity index 97%
rename from wled00/wled06_usermod.ino
rename to wled00/wled06_usermod.cpp
index 010d0f38..c780ffee 100644
--- a/wled00/wled06_usermod.ino
+++ b/wled00/wled06_usermod.cpp
@@ -1,3 +1,4 @@
+#include "wled.h"
 /*
  * This file allows you to add own functionality to WLED more easily
  * See: https://github.com/Aircoookie/WLED/wiki/Add-own-functionality
diff --git a/wled00/wled12_alexa.ino b/wled00/wled_alexa.cpp
similarity index 89%
rename from wled00/wled12_alexa.ino
rename to wled00/wled_alexa.cpp
index 5163640e..b68843cb 100644
--- a/wled00/wled12_alexa.ino
+++ b/wled00/wled_alexa.cpp
@@ -1,10 +1,6 @@
-/*
- * Alexa Voice On/Off/Brightness Control. Emulates a Philips Hue bridge to Alexa.
- * 
- * This was put together from these two excellent projects:
- * https://github.com/kakopappa/arduino-esp8266-alexa-wemo-switch
- * https://github.com/probonopd/ESP8266HueEmulator
- */
+#include "wled_alexa.h"
+#include "wled.h"
+#include "src/dependencies/espalexa/EspalexaDevice.h"
 
 #ifndef WLED_DISABLE_ALEXA
 void onAlexaChange(EspalexaDevice* dev);
diff --git a/wled00/wled_alexa.h b/wled00/wled_alexa.h
new file mode 100644
index 00000000..4bf7bd12
--- /dev/null
+++ b/wled00/wled_alexa.h
@@ -0,0 +1,16 @@
+#ifndef WLED_ALEXA_H
+#define WLED_ALEXA_H
+/*
+ * Alexa Voice On/Off/Brightness Control. Emulates a Philips Hue bridge to Alexa.
+ * 
+ * This was put together from these two excellent projects:
+ * https://github.com/kakopappa/arduino-esp8266-alexa-wemo-switch
+ * https://github.com/probonopd/ESP8266HueEmulator
+ */
+class EspalexaDevice;
+void onAlexaChange(EspalexaDevice* dev);
+void alexaInit();
+void handleAlexa();
+void onAlexaChange(EspalexaDevice* dev);
+
+#define WLED_ALEXA_H
\ No newline at end of file
diff --git a/wled00/wled16_blynk.ino b/wled00/wled_blynk.cpp
similarity index 94%
rename from wled00/wled16_blynk.ino
rename to wled00/wled_blynk.cpp
index ea4d6877..c6754a23 100644
--- a/wled00/wled16_blynk.ino
+++ b/wled00/wled_blynk.cpp
@@ -1,6 +1,6 @@
-/*
- * Remote light control with the free Blynk app
- */
+#include "wled_blynk.h"
+#include "wled.h"
+#include "src/dependencies/blynk/Blynk/BlynkHandlers.h"
 
 uint16_t blHue = 0;
 byte blSat = 255;
diff --git a/wled00/wled_blynk.h b/wled00/wled_blynk.h
new file mode 100644
index 00000000..e8c8341b
--- /dev/null
+++ b/wled00/wled_blynk.h
@@ -0,0 +1,13 @@
+#ifndef WLED_BLYNK_H
+#define WLED_BLYNK_H
+#include <Arduino.h>
+/*
+ * Remote light control with the free Blynk app
+ */
+
+void initBlynk(const char* auth);
+void handleBlynk();
+void updateBlynk();
+// Unsure if the macro expansions need to accessed through the declaration... TODO
+
+#endif //WLED_BLYNK_H
\ No newline at end of file
diff --git a/wled00/wled09_button.ino b/wled00/wled_button.cpp
similarity index 98%
rename from wled00/wled09_button.ino
rename to wled00/wled_button.cpp
index 1cd868be..12fe5b49 100644
--- a/wled00/wled09_button.ino
+++ b/wled00/wled_button.cpp
@@ -1,3 +1,5 @@
+#include "wled_button.h"
+#include "wled.h"
 /*
  * Physical IO
  */
diff --git a/wled00/wled_button.h b/wled00/wled_button.h
new file mode 100644
index 00000000..5f894477
--- /dev/null
+++ b/wled00/wled_button.h
@@ -0,0 +1,12 @@
+#ifndef WLED_BUTTON_H
+#define WLED_BUTTON_H
+#include <Arduino.h>
+/*
+ * Physical IO
+ */
+
+void shortPressAction();
+void handleButton();
+void handleIO();
+
+#endif // WLED_BUTTON_H
\ No newline at end of file
diff --git a/wled00/wled14_colors.ino b/wled00/wled_colors.cpp
similarity index 96%
rename from wled00/wled14_colors.ino
rename to wled00/wled_colors.cpp
index a1db307a..dcd32e57 100644
--- a/wled00/wled14_colors.ino
+++ b/wled00/wled_colors.cpp
@@ -1,6 +1,5 @@
-/*
- * Color conversion methods
- */
+#include "wled_colors.h"
+#include "wled.h"
 
 void colorFromUint32(uint32_t in, bool secondary)
 {
@@ -18,7 +17,7 @@ void colorFromUint32(uint32_t in, bool secondary)
 }
 
 //load a color without affecting the white channel
-void colorFromUint24(uint32_t in, bool secondary = false)
+void colorFromUint24(uint32_t in, bool secondary)
 {
   if (secondary) {
     colSec[0] = in >> 16 & 0xFF;
@@ -32,7 +31,7 @@ void colorFromUint24(uint32_t in, bool secondary = false)
 }
 
 //relatively change white brightness, minumum A=5
-void relativeChangeWhite(int8_t amount, byte lowerBoundary =0)
+void relativeChangeWhite(int8_t amount, byte lowerBoundary)
 {
   int16_t new_val = (int16_t) col[3] + amount;
   if (new_val > 0xFF) new_val = 0xFF;
@@ -149,7 +148,8 @@ void colorRGBtoXY(byte* rgb, float* xy) //rgb to coordinates (https://www.develo
   xy[0] = X / (X + Y + Z);
   xy[1] = Y / (X + Y + Z);
 }
-#endif
+#endif // WLED_DISABLE_HUESYNC
+
 
 void colorFromDecOrHexString(byte* rgb, char* in)
 {
diff --git a/wled00/wled_colors.h b/wled00/wled_colors.h
new file mode 100644
index 00000000..2b3ff32c
--- /dev/null
+++ b/wled00/wled_colors.h
@@ -0,0 +1,20 @@
+#ifndef WLED_COLORS_H
+#define WLED_COLORS_H
+#include <Arduino.h>
+/*
+ * Color conversion methods
+ */
+
+void colorFromUint32(uint32_t in, bool secondary);
+void colorFromUint24(uint32_t in, bool secondary = false);
+void relativeChangeWhite(int8_t amount, byte lowerBoundary = 0);
+void colorHStoRGB(uint16_t hue, byte sat, byte* rgb); //hue, sat to rgb
+void colorCTtoRGB(uint16_t mired, byte* rgb); //white spectrum to rgb
+
+void colorXYtoRGB(float x, float y, byte* rgb); // only defined if huesync disabled TODO
+void colorRGBtoXY(byte* rgb, float* xy); // only defined if huesync disabled TODO
+
+void colorFromDecOrHexString(byte* rgb, char* in);
+void colorRGBtoRGBW(byte* rgb); //rgb to rgbw (http://codewelt.com/rgbw). (RGBW_MODE_LEGACY)
+
+#endif //WLED_COLORS_H
\ No newline at end of file
diff --git a/wled00/wled13_cronixie.ino b/wled00/wled_cronixie.cpp
similarity index 97%
rename from wled00/wled13_cronixie.ino
rename to wled00/wled_cronixie.cpp
index dd687ca1..107af752 100644
--- a/wled00/wled13_cronixie.ino
+++ b/wled00/wled_cronixie.cpp
@@ -1,9 +1,8 @@
-/*
- * Support for the Cronixie clock
- */
+#include "wled_cronixie.h"
+#include "wled.h"
+
 #ifndef WLED_DISABLE_CRONIXIE
 byte _digitOut[6] = {10,10,10,10,10,10};
-#endif
  
 byte getSameCodeLength(char code, int index, char const cronixieDisplay[])
 {
@@ -23,7 +22,6 @@ byte getSameCodeLength(char code, int index, char const cronixieDisplay[])
 
 void setCronixie()
 {
-  #ifndef WLED_DISABLE_CRONIXIE
   /*
    * digit purpose index
    * 0-9 | 0-9 (incl. random)
@@ -144,12 +142,10 @@ void setCronixie()
   DEBUG_PRINTLN((int)dP[5]);
 
   _overlayCronixie(); //refresh
-  #endif
 }
 
 void _overlayCronixie()
 {
-  #ifndef WLED_DISABLE_CRONIXIE
   byte h = hour(local);
   byte h0 = h;
   byte m = minute(local);
@@ -211,12 +207,10 @@ void _overlayCronixie()
       }
     }
   }
-  #endif
 }
 
 void _drawOverlayCronixie()
 {
-  #ifndef WLED_DISABLE_CRONIXIE
   byte offsets[] = {5, 0, 6, 1, 7, 2, 8, 3, 9, 4};
   
   for (uint16_t i = 0; i < 6; i++)
@@ -239,5 +233,11 @@ void _drawOverlayCronixie()
       }
     }
   }
-  #endif
 }
+
+#else // WLED_DISABLE_CRONIXIE
+byte getSameCodeLength(char code, int index, char const cronixieDisplay[]) {}
+void setCronixie() {}
+void _overlayCronixie() {}
+void _drawOverlayCronixie() {}
+#endif
diff --git a/wled00/wled_cronixie.h b/wled00/wled_cronixie.h
new file mode 100644
index 00000000..9dea69b3
--- /dev/null
+++ b/wled00/wled_cronixie.h
@@ -0,0 +1,13 @@
+#ifndef WLED_CRONIXIE_H
+#define WLED_CRONIXIE_H
+#include <Arduino.h>
+/*
+ * Support for the Cronixie clock
+ */
+
+byte getSameCodeLength(char code, int index, char const cronixieDisplay[]);
+void setCronixie();
+void _overlayCronixie();    
+void _drawOverlayCronixie();
+
+#endif // WLED_CRONIXIE_H
\ No newline at end of file
diff --git a/wled00/wled21_dmx.ino b/wled00/wled_dmx.cpp
similarity index 89%
rename from wled00/wled21_dmx.ino
rename to wled00/wled_dmx.cpp
index 4230f07d..f620f777 100644
--- a/wled00/wled21_dmx.ino
+++ b/wled00/wled_dmx.cpp
@@ -1,10 +1,7 @@
-/*
- * Support for DMX via MAX485.
- * Needs the espdmx library. You might have to change the output pin within the library. Sketchy, i know.
- * https://github.com/Rickgg/ESP-Dmx
- */
-#ifdef WLED_ENABLE_DMX
+#include "wled_dmx.h"
+#include "wled.h"
 
+#ifdef WLED_ENABLE_DMX
 void handleDMX() {
   // TODO: calculate brightness manually if no shutter channel is set
   
diff --git a/wled00/wled_dmx.h b/wled00/wled_dmx.h
new file mode 100644
index 00000000..94cbb0d2
--- /dev/null
+++ b/wled00/wled_dmx.h
@@ -0,0 +1,11 @@
+#ifndef WLED_DMX_H
+#define WLED_DMX_H
+/*
+ * Support for DMX via MAX485.
+ * Needs the espdmx library. You might have to change the output pin within the library. Sketchy, i know.
+ * https://github.com/Rickgg/ESP-Dmx
+ */
+
+void handleDMX();
+
+#endif //WLED_DMX_H
\ No newline at end of file
diff --git a/wled00/wled01_eeprom.ino b/wled00/wled_eeprom.cpp
similarity index 99%
rename from wled00/wled01_eeprom.ino
rename to wled00/wled_eeprom.cpp
index 1f0e8426..0ddbf57f 100644
--- a/wled00/wled01_eeprom.ino
+++ b/wled00/wled_eeprom.cpp
@@ -1,7 +1,5 @@
-/*
- * Methods to handle saving and loading to non-volatile memory
- * EEPROM Map: https://github.com/Aircoookie/WLED/wiki/EEPROM-Map
- */
+#include "wled_eeprom.h"
+#include "wled.h"
 
 #define EEPSIZE 2560  //Maximum is 4096
 
diff --git a/wled00/wled_eeprom.h b/wled00/wled_eeprom.h
new file mode 100644
index 00000000..fe5c2cbf
--- /dev/null
+++ b/wled00/wled_eeprom.h
@@ -0,0 +1,22 @@
+#ifndef WLED_EPPROM_H
+#define WLED_EPPROM_H
+#include <Arduino.h>
+/*
+ * Methods to handle saving and loading to non-volatile memory
+ * EEPROM Map: https://github.com/Aircoookie/WLED/wiki/EEPROM-Map
+ */
+
+void commit();
+void clearEEPROM();
+void writeStringToEEPROM(uint16_t pos, char* str, uint16_t len);
+void readStringFromEEPROM(uint16_t pos, char* str, uint16_t len);
+void saveSettingsToEEPROM();
+void loadSettingsFromEEPROM(bool first);
+void savedToPresets();
+bool applyPreset(byte index, bool loadBri = true);
+void savePreset(byte index, bool persist = true);
+void loadMacro(byte index, char* m);
+void applyMacro(byte index);
+void saveMacro(byte index, String mc, bool persist = true); //only commit on single save, not in settings
+
+#endif //WLED_EPPROM_H
diff --git a/wled00/wled04_file.ino b/wled00/wled_file.cpp
similarity index 95%
rename from wled00/wled04_file.ino
rename to wled00/wled_file.cpp
index de752328..700d66ee 100644
--- a/wled00/wled04_file.ino
+++ b/wled00/wled_file.cpp
@@ -1,6 +1,14 @@
-/*
- * Utility for SPIFFS filesystem & Serial console
- */
+#include "wled_file.h"
+#include "wled.h"
+//filesystem
+#ifndef WLED_DISABLE_FILESYSTEM
+#include <FS.h>
+#ifdef ARDUINO_ARCH_ESP32
+#include "SPIFFS.h"
+#endif
+#include "SPIFFSEditor.h"
+#endif
+
 enum class AdaState {
   Header_A,
   Header_d,
diff --git a/wled00/wled_file.h b/wled00/wled_file.h
new file mode 100644
index 00000000..7457ec4c
--- /dev/null
+++ b/wled00/wled_file.h
@@ -0,0 +1,12 @@
+#ifndef WLED_FILE_H
+#define WLED_FILE_H
+#include <Arduino.h>
+#include <ESPAsyncWebServer.h>
+/*
+ * Utility for SPIFFS filesystem & Serial console
+ */
+
+void handleSerial();
+bool handleFileRead(AsyncWebServerRequest*, String path);
+
+#endif // WLED_FILE_H
\ No newline at end of file
diff --git a/wled00/wled15_hue.ino b/wled00/wled_hue.cpp
similarity index 99%
rename from wled00/wled15_hue.ino
rename to wled00/wled_hue.cpp
index 5f6b8f5b..082685d7 100644
--- a/wled00/wled15_hue.ino
+++ b/wled00/wled_hue.cpp
@@ -1,7 +1,8 @@
-/*
- * Sync to Philips hue lights
- */
+#include "wled_hue.h"
+#include "wled.h"
+
 #ifndef WLED_DISABLE_HUESYNC
+
 void handleHue()
 {
   if (hueReceived)
diff --git a/wled00/wled_hue.h b/wled00/wled_hue.h
new file mode 100644
index 00000000..dcf39729
--- /dev/null
+++ b/wled00/wled_hue.h
@@ -0,0 +1,10 @@
+#ifndef WLED_HUE_H
+#define WLED_HUE_H
+/*
+ * Sync to Philips hue lights
+ */
+
+void handleHue();
+void reconnectHue();
+
+#endif //WLED_HUE_H
\ No newline at end of file
diff --git a/wled00/wled20_ir.ino b/wled00/wled_ir.cpp
similarity index 99%
rename from wled00/wled20_ir.ino
rename to wled00/wled_ir.cpp
index 64c131c2..53f0d23f 100644
--- a/wled00/wled20_ir.ino
+++ b/wled00/wled_ir.cpp
@@ -1,6 +1,5 @@
-/*
- * Infrared sensor support for generic 24/40/44 key RGB remotes
- */
+#include "wled_ir.h"
+#include "wled.h"
 
 #if defined(WLED_DISABLE_INFRARED)
 void handleIR(){}
diff --git a/wled00/wled_ir.h b/wled00/wled_ir.h
new file mode 100644
index 00000000..3479f410
--- /dev/null
+++ b/wled00/wled_ir.h
@@ -0,0 +1,9 @@
+#ifndef WLED_IR_H
+#define WLED_IR_H
+/*
+ * Infrared sensor support for generic 24/40/44 key RGB remotes
+ */
+
+void handleIR();
+
+#endif //WLED_IR_H
\ No newline at end of file
diff --git a/wled00/wled19_json.ino b/wled00/wled_json.cpp
similarity index 99%
rename from wled00/wled19_json.ino
rename to wled00/wled_json.cpp
index df9bcead..43d3136d 100644
--- a/wled00/wled19_json.ino
+++ b/wled00/wled_json.cpp
@@ -1,6 +1,5 @@
-/*
- * JSON API (De)serialization
- */
+#include "wled_json.h"
+#include "wled.h"
 
 void deserializeSegment(JsonObject elem, byte it)
 {
diff --git a/wled00/wled_json.h b/wled00/wled_json.h
new file mode 100644
index 00000000..83830faf
--- /dev/null
+++ b/wled00/wled_json.h
@@ -0,0 +1,15 @@
+#ifndef WLED_JSON_H
+#define WLED_JSON_H
+/*
+ * JSON API (De)serialization
+ */
+
+void deserializeSegment(JsonObject elem, byte it);
+bool deserializeState(JsonObject root);
+void serializeSegment(JsonObject& root, WS2812FX::Segment& seg, byte id);
+void serializeState(JsonObject root);
+void serializeInfo(JsonObject root);
+void serveJson(AsyncWebServerRequest* request);
+void serveLiveLeds(AsyncWebServerRequest* request);
+
+#endif //WLED_JSON_H
\ No newline at end of file
diff --git a/wled00/wled08_led.ino b/wled00/wled_led.cpp
similarity index 98%
rename from wled00/wled08_led.ino
rename to wled00/wled_led.cpp
index 63009f98..aefb004a 100644
--- a/wled00/wled08_led.ino
+++ b/wled00/wled_led.cpp
@@ -1,6 +1,6 @@
-/*
- * LED methods
- */
+#include "wled_led.h"
+#include "wled.h"
+
 void setValuesFromMainSeg()
 {
   WS2812FX::Segment& seg = strip.getSegment(strip.getMainSegmentId());
@@ -50,7 +50,7 @@ void setAllLeds() {
 }
 
 
-void setLedsStandard(bool justColors = false)
+void setLedsStandard(bool justColors)
 {
   for (byte i=0; i<4; i++)
   {
diff --git a/wled00/wled_led.h b/wled00/wled_led.h
new file mode 100644
index 00000000..aebe95e4
--- /dev/null
+++ b/wled00/wled_led.h
@@ -0,0 +1,19 @@
+#ifndef WLED_LED_H
+#define WLED_LED_H
+#include <Arduino.h>
+/*
+ * LED methods
+ */
+
+void setValuesFromMainSeg();
+void resetTimebase();
+void toggleOnOff();
+void setAllLeds();
+void setLedsStandard(bool justColors = false);
+bool colorChanged();
+void colorUpdated(int callMode);
+void updateInterfaces(uint8_t callMode);
+void handleTransitions();
+void handleNightlight();
+
+#endif
\ No newline at end of file
diff --git a/wled00/wled17_mqtt.ino b/wled00/wled_mqtt.cpp
similarity index 98%
rename from wled00/wled17_mqtt.ino
rename to wled00/wled_mqtt.cpp
index 741c807f..d4fc80c0 100644
--- a/wled00/wled17_mqtt.ino
+++ b/wled00/wled_mqtt.cpp
@@ -1,6 +1,5 @@
-/*
- * MQTT communication protocol for home automation
- */
+#include "wled_mqtt.h"
+#include "wled.h"
 
 #ifdef WLED_ENABLE_MQTT
 #define MQTT_KEEP_ALIVE_TIME 60    // contact the MQTT broker every 60 seconds
diff --git a/wled00/wled_mqtt.h b/wled00/wled_mqtt.h
new file mode 100644
index 00000000..f1c7160e
--- /dev/null
+++ b/wled00/wled_mqtt.h
@@ -0,0 +1,9 @@
+#ifndef WLED_MQTT_H
+#define WLED_MQTT_H
+/*
+ * MQTT communication protocol for home automation
+ */
+bool initMqtt();
+void publishMqtt();
+
+#endif //WLED_MQTT_H
\ No newline at end of file
diff --git a/wled00/wled07_notify.ino b/wled00/wled_notify.cpp
similarity index 99%
rename from wled00/wled07_notify.ino
rename to wled00/wled_notify.cpp
index 8fcbdbe8..7827aba9 100644
--- a/wled00/wled07_notify.ino
+++ b/wled00/wled_notify.cpp
@@ -1,6 +1,6 @@
-/*
- * UDP notifier
- */
+#include "wled_notify.h"
+#include "wled.h"
+#include "src/dependencies/e131/ESPAsyncE131.h"
 
 #define WLEDPACKETSIZE 29
 #define UDP_IN_MAXSIZE 1472
diff --git a/wled00/wled_notify.h b/wled00/wled_notify.h
new file mode 100644
index 00000000..63d01142
--- /dev/null
+++ b/wled00/wled_notify.h
@@ -0,0 +1,17 @@
+#ifndef WLED_NOTIFY_H
+#define WLED_NOTIFY_H
+#include <Arduino.h>
+#include "const.h"
+/*
+ * UDP notifier
+ */
+union e131_packet_t;    // Will this compile?
+class IPAddress;
+
+void notify(byte callMode, bool followUp=false);
+void arlsLock(uint32_t timeoutMs, byte md = REALTIME_MODE_GENERIC);
+void handleE131Packet(e131_packet_t* p, IPAddress clientIP);
+void handleNotifications();
+void setRealtimePixel(uint16_t i, byte r, byte g, byte b, byte w);
+
+#endif // WLED_NOTIFY_H
\ No newline at end of file
diff --git a/wled00/wled10_ntp.ino b/wled00/wled_ntp.cpp
similarity index 58%
rename from wled00/wled10_ntp.ino
rename to wled00/wled_ntp.cpp
index 2c5a64c4..82b99f96 100644
--- a/wled00/wled10_ntp.ino
+++ b/wled00/wled_ntp.cpp
@@ -1,63 +1,7 @@
-/*
- * Acquires time from NTP server
- */
+#include "wled_ntp.h"
+#include "wled.h"
+#include "wled_eeprom.h" 
 
-TimeChangeRule UTCr = {Last, Sun, Mar, 1, 0};     // UTC
-Timezone tzUTC(UTCr, UTCr);
-
-TimeChangeRule BST = {Last, Sun, Mar, 1, 60};        // British Summer Time
-TimeChangeRule GMT = {Last, Sun, Oct, 2, 0};         // Standard Time
-Timezone tzUK(BST, GMT);
-
-TimeChangeRule CEST = {Last, Sun, Mar, 2, 120};     //Central European Summer Time
-TimeChangeRule CET = {Last, Sun, Oct, 3, 60};       //Central European Standard Time
-Timezone tzEUCentral(CEST, CET);
-
-TimeChangeRule EEST = {Last, Sun, Mar, 3, 180};     //Central European Summer Time
-TimeChangeRule EET = {Last, Sun, Oct, 4, 120};       //Central European Standard Time
-Timezone tzEUEastern(EEST, EET);
-
-TimeChangeRule EDT = {Second, Sun, Mar, 2, -240 };    //Daylight time = UTC - 4 hours
-TimeChangeRule EST = {First, Sun, Nov, 2, -300 };     //Standard time = UTC - 5 hours
-Timezone tzUSEastern(EDT, EST);
-
-TimeChangeRule CDT = {Second, Sun, Mar, 2, -300 };    //Daylight time = UTC - 5 hours
-TimeChangeRule CST = {First, Sun, Nov, 2, -360 };     //Standard time = UTC - 6 hours
-Timezone tzUSCentral(CDT, CST);
-
-Timezone tzCASaskatchewan(CST, CST); //Central without DST
-
-TimeChangeRule MDT = {Second, Sun, Mar, 2, -360 };    //Daylight time = UTC - 6 hours
-TimeChangeRule MST = {First, Sun, Nov, 2, -420 };     //Standard time = UTC - 7 hours
-Timezone tzUSMountain(MDT, MST);
-
-Timezone tzUSArizona(MST, MST); //Mountain without DST
-
-TimeChangeRule PDT = {Second, Sun, Mar, 2, -420 };    //Daylight time = UTC - 7 hours
-TimeChangeRule PST = {First, Sun, Nov, 2, -480 };     //Standard time = UTC - 8 hours
-Timezone tzUSPacific(PDT, PST);
-
-TimeChangeRule ChST = {Last, Sun, Mar, 1, 480};     // China Standard Time = UTC + 8 hours
-Timezone tzChina(ChST, ChST);
-
-TimeChangeRule JST = {Last, Sun, Mar, 1, 540};     // Japan Standard Time = UTC + 9 hours
-Timezone tzJapan(JST, JST);
-
-TimeChangeRule AEDT = {Second, Sun, Oct, 2, 660 };    //Daylight time = UTC + 11 hours
-TimeChangeRule AEST = {First, Sun, Apr, 3, 600 };     //Standard time = UTC + 10 hours
-Timezone tzAUEastern(AEDT, AEST);
-
-TimeChangeRule NZDT = {Second, Sun, Sep, 2, 780 };    //Daylight time = UTC + 13 hours
-TimeChangeRule NZST = {First, Sun, Apr, 3, 720 };     //Standard time = UTC + 12 hours
-Timezone tzNZ(NZDT, NZST);
-
-TimeChangeRule NKST = {Last, Sun, Mar, 1, 510};     //Pyongyang Time = UTC + 8.5 hours
-Timezone tzNK(NKST, NKST);
-
-TimeChangeRule IST = {Last, Sun, Mar, 1, 330};     // India Standard Time = UTC + 5.5 hours
-Timezone tzIndia(IST, IST);
-
-Timezone* timezones[] = {&tzUTC, &tzUK, &tzEUCentral, &tzEUEastern, &tzUSEastern, &tzUSCentral, &tzUSMountain, &tzUSArizona, &tzUSPacific, &tzChina, &tzJapan, &tzAUEastern, &tzNZ, &tzNK, &tzIndia, &tzCASaskatchewan};  
 
 void handleNetworkTime()
 {
diff --git a/wled00/wled_ntp.h b/wled00/wled_ntp.h
new file mode 100644
index 00000000..14293342
--- /dev/null
+++ b/wled00/wled_ntp.h
@@ -0,0 +1,76 @@
+#ifndef WLED_NTP_H
+#define WLED_NTP_H
+#include <Arduino.h>
+#include "timezone/Timezone.h"
+
+/*
+ * Acquires time from NTP server
+ */
+TimeChangeRule UTCr = {Last, Sun, Mar, 1, 0};     // UTC
+Timezone tzUTC(UTCr, UTCr);
+
+TimeChangeRule BST = {Last, Sun, Mar, 1, 60};        // British Summer Time
+TimeChangeRule GMT = {Last, Sun, Oct, 2, 0};         // Standard Time
+Timezone tzUK(BST, GMT);
+
+TimeChangeRule CEST = {Last, Sun, Mar, 2, 120};     //Central European Summer Time
+TimeChangeRule CET = {Last, Sun, Oct, 3, 60};       //Central European Standard Time
+Timezone tzEUCentral(CEST, CET);
+
+TimeChangeRule EEST = {Last, Sun, Mar, 3, 180};     //Central European Summer Time
+TimeChangeRule EET = {Last, Sun, Oct, 4, 120};       //Central European Standard Time
+Timezone tzEUEastern(EEST, EET);
+
+TimeChangeRule EDT = {Second, Sun, Mar, 2, -240 };    //Daylight time = UTC - 4 hours
+TimeChangeRule EST = {First, Sun, Nov, 2, -300 };     //Standard time = UTC - 5 hours
+Timezone tzUSEastern(EDT, EST);
+
+TimeChangeRule CDT = {Second, Sun, Mar, 2, -300 };    //Daylight time = UTC - 5 hours
+TimeChangeRule CST = {First, Sun, Nov, 2, -360 };     //Standard time = UTC - 6 hours
+Timezone tzUSCentral(CDT, CST);
+
+Timezone tzCASaskatchewan(CST, CST); //Central without DST
+
+TimeChangeRule MDT = {Second, Sun, Mar, 2, -360 };    //Daylight time = UTC - 6 hours
+TimeChangeRule MST = {First, Sun, Nov, 2, -420 };     //Standard time = UTC - 7 hours
+Timezone tzUSMountain(MDT, MST);
+
+Timezone tzUSArizona(MST, MST); //Mountain without DST
+
+TimeChangeRule PDT = {Second, Sun, Mar, 2, -420 };    //Daylight time = UTC - 7 hours
+TimeChangeRule PST = {First, Sun, Nov, 2, -480 };     //Standard time = UTC - 8 hours
+Timezone tzUSPacific(PDT, PST);
+
+TimeChangeRule ChST = {Last, Sun, Mar, 1, 480};     // China Standard Time = UTC + 8 hours
+Timezone tzChina(ChST, ChST);
+
+TimeChangeRule JST = {Last, Sun, Mar, 1, 540};     // Japan Standard Time = UTC + 9 hours
+Timezone tzJapan(JST, JST);
+
+TimeChangeRule AEDT = {Second, Sun, Oct, 2, 660 };    //Daylight time = UTC + 11 hours
+TimeChangeRule AEST = {First, Sun, Apr, 3, 600 };     //Standard time = UTC + 10 hours
+Timezone tzAUEastern(AEDT, AEST);
+
+TimeChangeRule NZDT = {Second, Sun, Sep, 2, 780 };    //Daylight time = UTC + 13 hours
+TimeChangeRule NZST = {First, Sun, Apr, 3, 720 };     //Standard time = UTC + 12 hours
+Timezone tzNZ(NZDT, NZST);
+
+TimeChangeRule NKST = {Last, Sun, Mar, 1, 510};     //Pyongyang Time = UTC + 8.5 hours
+Timezone tzNK(NKST, NKST);
+
+TimeChangeRule IST = {Last, Sun, Mar, 1, 330};     // India Standard Time = UTC + 5.5 hours
+Timezone tzIndia(IST, IST);
+
+Timezone* timezones[] = {&tzUTC, &tzUK, &tzEUCentral, &tzEUEastern, &tzUSEastern, &tzUSCentral, &tzUSMountain, &tzUSArizona, &tzUSPacific, &tzChina, &tzJapan, &tzAUEastern, &tzNZ, &tzNK, &tzIndia, &tzCASaskatchewan};  
+
+void handleNetworkTime();
+void sendNTPPacket();
+bool checkNTPResponse();    
+void updateLocalTime();
+void getTimeString(char* out);
+bool checkCountdown();
+void setCountdown();
+byte weekdayMondayFirst();
+void checkTimers();
+
+#endif // WLED_NTP_H
\ No newline at end of file
diff --git a/wled00/wled11_ol.ino b/wled00/wled_overlay.cpp
similarity index 98%
rename from wled00/wled11_ol.ino
rename to wled00/wled_overlay.cpp
index 93f7b96d..93348e79 100644
--- a/wled00/wled11_ol.ino
+++ b/wled00/wled_overlay.cpp
@@ -1,6 +1,5 @@
-/*
- * Used to draw clock overlays over the strip
- */
+#include "wled_overlay.h"
+#include "wled.h"
  
 void initCronixie()
 {
diff --git a/wled00/wled_overlay.h b/wled00/wled_overlay.h
new file mode 100644
index 00000000..47573978
--- /dev/null
+++ b/wled00/wled_overlay.h
@@ -0,0 +1,12 @@
+#ifndef WLED_OVERLAYS_H
+#define WLED_OVERLAYS_H
+#include <Arduino.h>
+/*
+ * Used to draw clock overlays over the strip
+ */
+
+void initCronixie();
+void handleOverlays();
+void handleOverlayDraw();
+
+#endif // WLED_OVERLAY_H
\ No newline at end of file
diff --git a/wled00/wled18_server.ino b/wled00/wled_server.cpp
similarity index 99%
rename from wled00/wled18_server.ino
rename to wled00/wled_server.cpp
index f11a64be..c73e027f 100644
--- a/wled00/wled18_server.ino
+++ b/wled00/wled_server.cpp
@@ -1,6 +1,5 @@
-/*
- * Server page definitions
- */
+#include "wled_server.h"
+#include "wled.h"
 
 //Is this an IP?
 bool isIp(String str) {
@@ -303,7 +302,7 @@ String msgProcessor(const String& var)
 }
 
 
-void serveMessage(AsyncWebServerRequest* request, uint16_t code, String headl, String subl="", byte optionT=255)
+void serveMessage(AsyncWebServerRequest* request, uint16_t code, String headl, String subl, byte optionT)
 {
   messageHead = headl;
   messageSub = subl;
diff --git a/wled00/wled_server.h b/wled00/wled_server.h
new file mode 100644
index 00000000..08679e17
--- /dev/null
+++ b/wled00/wled_server.h
@@ -0,0 +1,18 @@
+#ifndef WLED_SERVER_H
+#define WLED_SERVER_H
+/*
+ * Server page declarations
+ */
+
+bool isIp(String str);
+bool captivePortal(AsyncWebServerRequest *request);
+void initServer();
+void serveIndexOrWelcome(AsyncWebServerRequest *request);
+void serveIndex(AsyncWebServerRequest* request);
+String msgProcessor(const String& var);
+void serveMessage(AsyncWebServerRequest* request, uint16_t code, String headl, String subl="", byte optionT=255);
+String settingsProcessor(const String& var);
+String dmxProcessor(const String& var);
+void serveSettings(AsyncWebServerRequest* request);
+
+#endif //WLED_SERVER_H
\ No newline at end of file
diff --git a/wled00/wled03_set.ino b/wled00/wled_set.cpp
similarity index 99%
rename from wled00/wled03_set.ino
rename to wled00/wled_set.cpp
index fc82256d..d81cac91 100644
--- a/wled00/wled03_set.ino
+++ b/wled00/wled_set.cpp
@@ -1,3 +1,7 @@
+#include "wled_set.h"
+#include "wled.h"
+#include "wled_hue.h"
+#include "wled_colors.h"
 /*
  * Receives client input
  */
diff --git a/wled00/wled_set.h b/wled00/wled_set.h
new file mode 100644
index 00000000..7efde0d7
--- /dev/null
+++ b/wled00/wled_set.h
@@ -0,0 +1,12 @@
+#ifndef WLED_SET_H
+#define WLED_SET_H
+#include <Arduino.h>
+#include <ESPAsyncWebServer.h>
+
+void _setRandomColor(bool _sec,bool fromButton=false);
+bool isAsterisksOnly(const char* str, byte maxLen);
+void handleSettingsSet(AsyncWebServerRequest *request, byte subPage);
+int getNumVal(const String* req, uint16_t pos);
+bool updateVal(const String* req, const char* key, byte* val, byte minv=0, byte maxv=255);
+
+#endif // WLED_SET_H
\ No newline at end of file
diff --git a/wled00/wled02_xml.ino b/wled00/wled_xml.cpp
similarity index 99%
rename from wled00/wled02_xml.ino
rename to wled00/wled_xml.cpp
index 100be482..07009cf3 100644
--- a/wled00/wled02_xml.ino
+++ b/wled00/wled_xml.cpp
@@ -1,6 +1,7 @@
-/*
- * Sending XML status files to client
- */
+#include "wled_xml.h"
+#include "wled.h"
+#include "wled_eeprom.h"
+
 
 //build XML response to HTTP /win API request
 char* XML_response(AsyncWebServerRequest *request, char* dest = nullptr)
diff --git a/wled00/wled_xml.h b/wled00/wled_xml.h
new file mode 100644
index 00000000..5cfb1dbb
--- /dev/null
+++ b/wled00/wled_xml.h
@@ -0,0 +1,15 @@
+#ifndef WLED_XML_H
+#define WLED_XML_H
+#include <Arduino.h>
+#include <ESPAsyncWebServer.h>
+
+/*
+ * Sending XML status files to client
+ */
+char* XML_response(AsyncWebServerRequest *request, char* dest = nullptr);
+char* URL_response(AsyncWebServerRequest *request);
+void sappend(char stype, const char* key, int val);
+void sappends(char stype, const char* key, char* val);
+void getSettingsJS(byte subPage, char* dest);
+
+#endif // WLED_XML_H
\ No newline at end of file