From 0b2e5ce67e7fb15b080051dba304d7282082cc95 Mon Sep 17 00:00:00 2001
From: Awawa <69086569+awawa-dev@users.noreply.github.com>
Date: Mon, 16 Feb 2026 19:35:30 +0100
Subject: [PATCH 1/2] Validate selected GPIOs for LED output

---
 data/settings.html | 114 ++++++++++++++++++++++++++++++++++++++++-----
 src/leds.cpp       |  10 ++++
 src/web_server.cpp |   4 +-
 3 files changed, 115 insertions(+), 13 deletions(-)

diff --git a/data/settings.html b/data/settings.html
index 000bc94..919a643 100644
--- a/data/settings.html
+++ b/data/settings.html
@@ -60,6 +60,20 @@ <h1>Settings</h1>
           </select>
         </label>
 
+        <label>Data Pin (GPIO)
+          <select type="number" name="dataPin" required></select>
+        </label>
+
+        <label id="clockPinLabel">Clock Pin (GPIO)
+          <select type="number" name="clockPin"></select>
+        </label>
+
+        <label>Number of LEDs
+          <input type="number" name="numLeds" min="1" max="2000" value="16" required>
+        </label>
+
+        <hr class="section-divider">
+        
         <div id="whiteCalibration" style="display: none;">
           <h5>White channel calibration</h5>
           <div style="display: grid; grid-template-columns: 1fr 1fr 1fr; gap: 1rem;">            
@@ -72,18 +86,6 @@ <h5>White channel calibration</h5>
           </div>
           <hr class="section-divider">
         </div>
-
-        <label>Data Pin (GPIO)
-          <input type="number" name="dataPin" min="0" max="48" value="2" required>
-        </label>
-
-        <label>Clock Pin (only for SPI LEDs)
-          <input type="number" name="clockPin" min="0" max="39" value="0">
-        </label>
-
-        <label>Number of LEDs
-          <input type="number" name="numLeds" min="1" max="2000" value="16" required>
-        </label>
       </fieldset>
 
       <fieldset>
@@ -132,6 +134,84 @@ <h5>White channel calibration</h5>
   </article>
   <script>
       let scanInterval = 3500;
+      let cfgDeviceArchitecture = "";
+
+      function setupPinValidator() {
+          const hardwareLimits = {
+              "ESP32-C6": { gpio: [0,1,2,3,4,5,6,7,8,10,15,18,19,20,21,22], spi: {6:5} },
+              "ESP32-S3": { gpio: [1,2,4,5,6,7,8,10,16,17,18,48], spi: {11:12} },
+              "ESP32-C3": { gpio: [0,1,2,3,4,5,6,7,8,10,20,21], spi: {7:6} },
+              "ESP8266":  { gpio: [2],                       spi: {19:18} },
+              "ESP32":    { gpio: null,                      spi: {23:18} },
+              "ESP32-S2": { gpio: null,                      spi: {19:18} }
+          };
+          
+          const arch = (typeof cfgDeviceArchitecture !== 'undefined') ? cfgDeviceArchitecture : "";
+          const els = { type: document.getElementById('ledType'), clkLabel: document.getElementById('clockPinLabel') };
+
+          if (!els.type || !els.clkLabel) {
+              console.warn("LED Validator: Missing required DOM elements (ledType/clockPinLabel)");
+              return;
+          }
+
+          // Re-add ARIA-live to clkLabel for better accessibility during dynamic updates
+          els.clkLabel.setAttribute('aria-live', 'polite');
+
+          const setField = (name, opts) => {
+              const old = document.getElementsByName(name)[0];
+              if (!old) return null;
+              
+              const isSel = (opts != null);
+              const signature = "sig_" + JSON.stringify(opts);
+
+              if ((old.tagName === 'SELECT') === isSel && old.dataset.sig === signature) return old;
+
+              // Remember focus state
+              const wasFocused = (document.activeElement === old);
+
+              const el = isSel ? document.createElement('select') : Object.assign(document.createElement('input'), {
+                  type: 'number', min: 0, max: (arch.includes('8266') ? 16 : 48), step: '1'
+              });
+              
+              el.name = name; el.id = old.id; el.required = true;
+              el.dataset.sig = signature;
+
+              if (isSel) {
+                  opts.forEach(p => el.add(new Option(`GPIO ${p}`, p)));
+                  el.value = opts.includes(parseInt(old.value)) ? old.value : opts[0];
+                  // If only one option, disable for clarity and add tooltip
+                  if (opts.length === 1) { 
+                      el.disabled = true;
+                      el.title = "Only one valid GPIO for this mode/architecture"; 
+                  }
+              } else {
+                  el.value = old.value || 0;
+              }
+
+              old.replaceWith(el);
+              el.addEventListener('change', updateUI); 
+              
+              if (wasFocused) el.focus(); // Restore focus
+              return el;
+          };
+
+          function updateUI() {
+              const isSpi = els.type.value == "2";
+              const cfg = hardwareLimits[arch];
+
+              let validPins = cfg ? (isSpi ? Object.keys(cfg.spi).map(Number) : cfg.gpio) : null;
+              const dataPinEditor = setField('dataPin', validPins);
+              
+              const autoClk = (cfg && cfg.spi) ? (cfg.spi[dataPinEditor.value] ?? null) : null;
+              const clockPinEditor = setField('clockPin', ((autoClk !== null) ? [autoClk] : null)); 
+
+              els.clkLabel.style.display = isSpi ? 'block' : 'none';
+              clockPinEditor.disabled = clockPinEditor.disabled || !isSpi;
+          }
+
+          els.type.onchange = updateUI;
+          updateUI(); 
+      }
 
       function setCalibration(gain, r, g, b) {
           const fields = { 'calGain': gain, 'calRed': r, 'calGreen': g, 'calBlue': b };
@@ -227,16 +307,26 @@ <h5>White channel calibration</h5>
               const c = await res.json();
               const l = c.config;
 
+              const archField = l["architecture"];              
+              if (archField !== undefined){
+                  cfgDeviceArchitecture = archField;                  
+              }              
+
               const fields = ['type', 'dataPin', 'clockPin', 'numLeds', 'brightness', 'r', 'g', 'b', 'effect', 'extraMdnsTag', 'calGain', 'calRed', 'calGreen', 'calBlue'];
               fields.forEach(field => {
                   const el = document.querySelector(`[name="${field}"]`);
                   if (el && l[field] !== undefined){
+                    if (field == 'dataPin' || field == 'clockPin')
+                    {
+                        el.add(new Option(`GPIO ${l[field]}`, l[field]));
+                    }
                     el.value = l[field];
                     el.dispatchEvent(new Event('input'));
                   }
               });
 
               toggleCalibration();
+              setupPinValidator();
           }
           catch (e) {
               console.error("Config load failed:", e);
diff --git a/src/leds.cpp b/src/leds.cpp
index 826e5c4..ba473ea 100644
--- a/src/leds.cpp
+++ b/src/leds.cpp
@@ -170,10 +170,14 @@ void initLEDs(LedType cfgLedType, uint16_t cfgLedNumLeds, uint8_t cfgLedDataPin,
         if (fastLedsType == LedType::WS2812 || fastLedsType == LedType::SK6812)
         {
             switch (cfgLedDataPin) {
+                #if !defined(CONFIG_IDF_TARGET_ESP32S3)
                 case 0: FastLED.addLeds<WS2812, 0, GRB>(leds, virtualLedsNumber); break;
+                #endif
                 case 1: FastLED.addLeds<WS2812, 1, GRB>(leds, virtualLedsNumber); break;
                 case 2: FastLED.addLeds<WS2812, 2, GRB>(leds, virtualLedsNumber); break;
+                #if !defined(CONFIG_IDF_TARGET_ESP32S3)
                 case 3: FastLED.addLeds<WS2812, 3, GRB>(leds, virtualLedsNumber); break;
+                #endif
                 case 4: FastLED.addLeds<WS2812, 4, GRB>(leds, virtualLedsNumber); break;
                 case 5: FastLED.addLeds<WS2812, 5, GRB>(leds, virtualLedsNumber); break;
                 case 6: FastLED.addLeds<WS2812, 6, GRB>(leds, virtualLedsNumber); break;
@@ -188,7 +192,13 @@ void initLEDs(LedType cfgLedType, uint16_t cfgLedNumLeds, uint8_t cfgLedDataPin,
                 case 21: FastLED.addLeds<WS2812, 21, GRB>(leds, virtualLedsNumber); break;
                 case 22: FastLED.addLeds<WS2812, 22, GRB>(leds, virtualLedsNumber); break;
                 #elif defined(CONFIG_IDF_TARGET_ESP32S3)
+                case 16: FastLED.addLeds<WS2812, 16, GRB>(leds, virtualLedsNumber); break;
+                case 17: FastLED.addLeds<WS2812, 17, GRB>(leds, virtualLedsNumber); break;
+                case 18: FastLED.addLeds<WS2812, 18, GRB>(leds, virtualLedsNumber); break;
                 case 48: FastLED.addLeds<WS2812, 48, GRB>(leds, virtualLedsNumber); break;
+                #elif defined(CONFIG_IDF_TARGET_ESP32C3)
+                case 20: FastLED.addLeds<WS2812, 20, GRB>(leds, virtualLedsNumber); break;
+                case 21: FastLED.addLeds<WS2812, 21, GRB>(leds, virtualLedsNumber); break;
                 #endif
                 default:
                     FastLED.addLeds<WS2812, 2, GRB>(leds, virtualLedsNumber);
diff --git a/src/web_server.cpp b/src/web_server.cpp
index e1f80b5..9b7eb79 100644
--- a/src/web_server.cpp
+++ b/src/web_server.cpp
@@ -258,7 +258,7 @@ void setupWebServer(AsyncWebServer& server) {
 
         if (request->hasParam("extraMdnsTag", true)) {            
             auto val = sanitizeMdnsService(request->getParam("extraMdnsTag", true)->value());
-            needsRestart = (cfg.extraMdnsTag != val);
+            needsRestart = needsRestart || (cfg.extraMdnsTag != val);
             cfg.extraMdnsTag = val;
         }
 
@@ -280,6 +280,8 @@ void setupWebServer(AsyncWebServer& server) {
         AsyncResponseStream *response = request->beginResponseStream(mime_application_json);                
         JsonDocument doc;         
         JsonObject led = doc["config"].to<JsonObject>();
+        led["architecture"] = getDeviceArch();
+        
         led["type"]         = (int)cfg.led.type;
         led["dataPin"]      = cfg.led.dataPin;
         led["clockPin"]     = cfg.led.clockPin;

From 1da7469b0fe55b88155f9896a2ce2aee8eda6a0c Mon Sep 17 00:00:00 2001
From: Awawa <69086569+awawa-dev@users.noreply.github.com>
Date: Tue, 17 Feb 2026 19:38:56 +0100
Subject: [PATCH 2/2] GUI and control improvements

---
 3RD_PARTY_LICENSES          |  15 +
 data/css/settings.css       |  19 +-
 data/settings.html          | 167 +++++-----
 include/config.h            |  32 +-
 include/leds.h              |  20 +-
 include/logger.h            |  20 ++
 include/storage.h           |   6 +-
 include/uni_json_api.h      |   7 +
 include/volatile_state.h    |  26 ++
 platformio.ini              |   8 +
 readme.md                   |  38 +++
 scripts/collect_firmware.py |  21 +-
 src/calibration.cpp         |   2 +-
 src/config.cpp              |  19 +-
 src/leds.cpp                | 617 ++++++++++++++++++++++--------------
 src/main.cpp                |  24 +-
 src/manager.cpp             |  11 +-
 src/mdns_service.cpp        |  20 +-
 src/storage.cpp             | 119 +++----
 src/udp_receiver.cpp        |  59 +++-
 src/uni_json_api.cpp        | 234 ++++++++++++++
 src/utils.cpp               |  10 +-
 src/volatile_state.cpp      |  72 +++++
 src/web_server.cpp          | 104 ++----
 version                     |   2 +-
 25 files changed, 1133 insertions(+), 539 deletions(-)
 create mode 100644 include/logger.h
 create mode 100644 include/uni_json_api.h
 create mode 100644 include/volatile_state.h
 create mode 100644 readme.md
 create mode 100644 src/uni_json_api.cpp
 create mode 100644 src/volatile_state.cpp

diff --git a/3RD_PARTY_LICENSES b/3RD_PARTY_LICENSES
index a24a567..1af254f 100644
--- a/3RD_PARTY_LICENSES
+++ b/3RD_PARTY_LICENSES
@@ -403,3 +403,18 @@ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+==============================================
+                picocss/pico
+==============================================
+
+MIT License
+
+Copyright (c) 2019-2024 Pico
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
diff --git a/data/css/settings.css b/data/css/settings.css
index 21bc3b1..b9ba791 100644
--- a/data/css/settings.css
+++ b/data/css/settings.css
@@ -93,4 +93,21 @@ hr.section-divider {
         #444 88%, 
         transparent
     );
-}
\ No newline at end of file
+}
+
+details > div {
+    padding-top: 1rem;
+}
+
+details summary[role="button"] {
+    background-color: #6a2525;
+    border-color: #7a2525;
+    color: #F0F1F3;
+}
+
+details summary[role="button"]:hover,
+details summary[role="button"]:focus {
+    background-color: #7a2525;
+    border-color: #8a2525;
+    color: #F5F5F8
+}
diff --git a/data/settings.html b/data/settings.html
index 919a643..73ccb33 100644
--- a/data/settings.html
+++ b/data/settings.html
@@ -29,93 +29,95 @@ <h1>Settings</h1>
 
     <!-- WiFi settings -->
     <form action="/save_wifi" method="POST">
-      <fieldset>
-        <legend>WiFi Configuration</legend>
-        <hr class="section-divider">
-        <label for="ssid_select">SSID:</label>
-        <select name="ssid" id="ssid_select" required>
-          <option value="">Scanning...</option>
-        </select>
-        <div id="custom_ssid_wrapper" style="display:none; margin-top:8px;">
-          <label for="ssid_custom">Custom SSID:</label>
-          <input type="text" name="ssid_custom" id="ssid_custom" placeholder="Enter custom SSID">
+      <details id="wifi_configuration_page" style="display: none;">
+        <summary role="button" class="outline secondary">WiFi Configuration</summary>
+        <div>
+          <label for="ssid_select">SSID:</label>
+          <select name="ssid" id="ssid_select" required>
+            <option value="">Scanning...</option>
+          </select>
+          <div id="custom_ssid_wrapper" style="display:none; margin-top:8px;">
+            <label for="ssid_custom">Custom SSID:</label>
+            <input type="text" name="ssid_custom" id="ssid_custom" placeholder="Enter custom SSID">
+          </div>
+          <label>Password <input type="password" name="pass" required></label>
+          <button type="submit">Save WiFi & Restart</button>
         </div>
-        <label>Password <input type="password" name="pass" required></label>
-        <button type="submit">Save WiFi & Restart</button>
-      </fieldset>
+      </details>
     </form>
 
-    <hr>
-
     <!-- Settings -->
     <form action="/save_config" method="POST">
-      <fieldset>
-        <legend>LED Strip</legend>
-        <hr class="section-divider">
-        <label>LED Type
-          <select id="ledType" name="type" required>
-            <option value="0">WS2812B NeoPixel (RGB)</option>
-            <option value="1">SK6812 NeoPixel (RGBW)</option>
-            <option value="2">APA102 DotStar SPI (RGB)</option>
-          </select>
-        </label>
-
-        <label>Data Pin (GPIO)
-          <select type="number" name="dataPin" required></select>
-        </label>
-
-        <label id="clockPinLabel">Clock Pin (GPIO)
-          <select type="number" name="clockPin"></select>
-        </label>
-
-        <label>Number of LEDs
-          <input type="number" name="numLeds" min="1" max="2000" value="16" required>
-        </label>
-
-        <hr class="section-divider">
+      <details>
+        <summary role="button" class="outline secondary">LED Hardware</summary>
+        <div>
+          <label>LED type
+            <select id="ledType" name="type" required>
+              <option value="0">WS2812B NeoPixel (RGB)</option>
+              <option value="1">SK6812 NeoPixel (RGBW)</option>
+              <option value="2">APA102 DotStar SPI (RGB)</option>
+            </select>
+          </label>
+
+          <label>Data Pin (GPIO)
+            <select type="number" name="dataPin" required></select>
+          </label>
+
+          <label id="clockPinLabel">Clock Pin (GPIO)
+            <select type="number" name="clockPin"></select>
+          </label>
+
+          <label>Number of LEDs
+            <input type="number" name="numLeds" min="1" max="2000" value="16" required>
+          </label>          
         
-        <div id="whiteCalibration" style="display: none;">
-          <h5>White channel calibration</h5>
-          <div style="display: grid; grid-template-columns: 1fr 1fr 1fr; gap: 1rem;">            
-            <label>R <input type="number" name="calRed" min="0" max="255" value="160"></label>
-            <label>G <input type="number" name="calGreen" min="0" max="255" value="160"></label>
-            <label>B <input type="number" name="calBlue" min="0" max="255" value="160"></label>
-            <label>White <input type="number" name="calGain" min="0" max="255" value="255"></label>
-            <button type="button" onclick="setCalibration(255, 160, 160, 160)">Set Cold</button>
-            <button type="button" onclick="setCalibration(255, 176, 176, 112)">Set Neutral</button>
+          <div id="whiteCalibration" style="display: none;">
+            <hr class="section-divider">
+            <h5>White channel calibration</h5>
+            <div style="display: grid; grid-template-columns: 1fr 1fr 1fr; gap: 1rem;">            
+              <label>R <input type="number" name="calRed" min="0" max="255" value="160"></label>
+              <label>G <input type="number" name="calGreen" min="0" max="255" value="160"></label>
+              <label>B <input type="number" name="calBlue" min="0" max="255" value="160"></label>
+              <label>White <input type="number" name="calGain" min="0" max="255" value="255"></label>
+              <button type="button" onclick="setCalibration(255, 160, 160, 160)">Set Cold</button>
+              <button type="button" onclick="setCalibration(255, 176, 176, 112)">Set Neutral</button>
+            </div>
           </div>
-          <hr class="section-divider">
         </div>
-      </fieldset>
-
-      <fieldset>
-        <legend>Default Appearance</legend>
-        <label>Brightness (1–255)
-          <input type="number" name="brightness" min="1" max="255" value="255" oninput="this.nextElementSibling.value=this.value"><input type="range" min="1" max="255" value="255" oninput="this.previousElementSibling.value=this.value">
-        </label>
-
-        <div style="display: grid; grid-template-columns: 1fr 1fr 1fr; gap: 1rem;">
-          <label>R <input type="number" name="r" min="0" max="255" value="196" oninput="this.nextElementSibling.value=this.value"><input type="range" min="0" max="255" value="196" oninput="this.previousElementSibling.value=this.value"></label>
-          <label>G <input type="number" name="g" min="0" max="255" value="32" oninput="this.nextElementSibling.value=this.value"><input type="range" min="0" max="255" value="32" oninput="this.previousElementSibling.value=this.value"></label>
-          <label>B <input type="number" name="b" min="0" max="255" value="8" oninput="this.nextElementSibling.value=this.value"><input type="range" min="0" max="255" value="8" oninput="this.previousElementSibling.value=this.value"></label>
+      </details>
+
+      <details>
+        <summary role="button" class="outline secondary">Light Preset</summary>
+        <div>
+          <label>Brightness (1–255)
+            <input type="number" name="brightness" min="1" max="255" value="255" oninput="this.nextElementSibling.value=this.value"><input type="range" min="1" max="255" value="255" oninput="this.previousElementSibling.value=this.value">
+          </label>
+
+          <label>Default Color
+            <div style="display: grid; grid-template-columns: 1fr 1fr 1fr; gap: 1rem;">
+              <label>R <input type="number" name="r" min="0" max="255" value="196" oninput="this.nextElementSibling.value=this.value"><input type="range" min="0" max="255" value="196" oninput="this.previousElementSibling.value=this.value"></label>
+              <label>G <input type="number" name="g" min="0" max="255" value="32" oninput="this.nextElementSibling.value=this.value"><input type="range" min="0" max="255" value="32" oninput="this.previousElementSibling.value=this.value"></label>
+              <label>B <input type="number" name="b" min="0" max="255" value="8" oninput="this.nextElementSibling.value=this.value"><input type="range" min="0" max="255" value="8" oninput="this.previousElementSibling.value=this.value"></label>
+            </div>
+          </label>
+
+          <label>Default Effect
+            <select name="effect">
+              <option value="0">Solid Color</option>
+              <option value="1">Rainbow</option>
+            </select>
+          </label>
         </div>
-
-        <label>Default Effect
-          <select name="effect">
-            <option value="0">Solid Color</option>
-            <option value="1">Rainbow</option>
-          </select>
-        </label>
-      </fieldset>
-
-      <fieldset>
-        <legend>Misc</legend>
-        <hr class="section-divider">   
-        <label>Extra MDNS tag
-          <input type="text" name="extraMdnsTag" maxlength="15">
-        </label>
-        
-      </fieldset>
+      </details>
+
+      <details>
+        <summary role="button" class="outline secondary">Network</summary>
+        <div>
+          <label>Extra MDNS tag
+            <input type="text" name="extraMdnsTag" maxlength="15">
+          </label>
+        </div>
+      </details>
 
       <button type="submit">Save Settings</button>
     </form>
@@ -325,6 +327,10 @@ <h5>White channel calibration</h5>
                   }
               });
 
+              if (l["apMode"] === true) {
+                  document.getElementById("wifi_configuration_page").style.display = "block";
+              }
+
               toggleCalibration();
               setupPinValidator();
           }
@@ -371,7 +377,10 @@ <h5>White channel calibration</h5>
                   msg = document.createElement('small');
                   msg.id = 'wifi-error-msg';
                   msg.className = 'form-error-msg';
-                  document.querySelector('form[action="/save_wifi"] fieldset').appendChild(msg);
+                  const container = document.querySelector('#wifi-section > div') || document.querySelector('#wifi-section');
+                  if (container) {
+                      container.appendChild(msg);
+                  }
               }
               msg.textContent = 'Custom SSID is required';
               customInput.classList.add('error-active');
diff --git a/include/config.h b/include/config.h
index 0f21336..752a025 100644
--- a/include/config.h
+++ b/include/config.h
@@ -3,6 +3,7 @@
 #include <Arduino.h>
 #include <ArduinoJson.h>
 #include <vector>
+#include "logger.h"
 
 #define CONFIG_FILE "/config.json"
 
@@ -12,13 +13,6 @@ enum class LedType : uint8_t {
     APA102 = 2
 };
 
-struct Calibration {
-	uint8_t gain  = 0xFF;
-	uint8_t red   = 0xA0;
-	uint8_t green = 0xA0;
-	uint8_t blue  = 0xA0;
-};
-
 struct LedConfig {
     LedType  type       = LedType::WS2812;
     uint8_t  dataPin    = 2;     // default for most boards
@@ -27,22 +21,28 @@ struct LedConfig {
     uint8_t  brightness = 255;
     uint8_t  r = 196, g = 32, b = 8;
     uint8_t  effect     = 0;
-    Calibration calibration;
-};
 
-struct WifiConfig {
-    String ssid;
-    String password;
+    struct Calibration {
+	    uint8_t gain  = 0xFF;
+	    uint8_t red   = 0xA0;
+	    uint8_t green = 0xA0;
+	    uint8_t blue  = 0xA0;
+    } calibration;
 };
 
 struct AppConfig {
-    WifiConfig wifi;
+    struct WifiConfig {
+        String ssid;
+        String password;
+    } wifi;
     LedConfig  led;
     String     deviceName = APP_NAME;
     String     extraMdnsTag = "WLED";
 };
 
-extern AppConfig cfg;
+namespace Config {
+    extern const AppConfig& cfg;
 
-bool loadConfig();
-bool saveConfig();
+    bool loadConfig();
+    bool saveConfig(const AppConfig &cfg);
+};
diff --git a/include/leds.h b/include/leds.h
index 6306c10..da9c17f 100644
--- a/include/leds.h
+++ b/include/leds.h
@@ -4,9 +4,17 @@
 #include <vector>
 #include "config.h"
 
-void applyLedConfig();
-int getLedsNumber();
-void setLed(int index, uint8_t r, uint8_t g, uint8_t b);
-void setLed(int index, uint8_t r, uint8_t g, uint8_t b, uint8_t w);
-void checkDeleyedRender();
-void renderLed(bool isNewFrame);
+namespace Leds {
+    void applyLedConfig();
+    int getLedsNumber();
+    void checkDeleyedRender();
+    void renderLed(bool isNewFrame);
+    void synchronizeLedsToVolatileStateBeforeDeleyedRender();
+
+    template<bool applyBrightness>
+    void setLed(int index, uint8_t r, uint8_t g, uint8_t b);
+
+    template<bool applyBrightness>
+    void setLedW(int index, uint8_t r, uint8_t g, uint8_t b, uint8_t w);
+};
+
diff --git a/include/logger.h b/include/logger.h
new file mode 100644
index 0000000..f75088a
--- /dev/null
+++ b/include/logger.h
@@ -0,0 +1,20 @@
+// File: include/logger.h
+#pragma once
+#include <Arduino.h>
+
+namespace Log {
+    template<typename... Args>
+    void inline debug(Args... args) {
+        #ifdef DEBUG_LOG
+            (Serial.print(args), ...);
+            Serial.println();
+        #endif
+    }
+    void inline raw(const char* message, char* buffer, int len) {
+        #ifdef DEBUG_LOG
+            Serial.print(message);
+            Serial.write(buffer,len);
+            Serial.println();
+        #endif
+    } 
+}
\ No newline at end of file
diff --git a/include/storage.h b/include/storage.h
index 652a515..fd6c18c 100644
--- a/include/storage.h
+++ b/include/storage.h
@@ -3,5 +3,7 @@
 #pragma once
 #include "config.h"
 
-bool loadConfig(AppConfig& cfg);
-bool saveConfig(const AppConfig& cfg);
\ No newline at end of file
+namespace Storage {
+    bool loadConfig(AppConfig& cfg);
+    bool saveConfig(const AppConfig& cfg);
+};
diff --git a/include/uni_json_api.h b/include/uni_json_api.h
new file mode 100644
index 0000000..1d8ab70
--- /dev/null
+++ b/include/uni_json_api.h
@@ -0,0 +1,7 @@
+// File: include/uni_api.h
+#pragma once
+
+#include <Arduino.h>
+#include <ESPAsyncWebServer.h>
+
+void setupUniApiJsonHandler(AsyncWebServer &server);
diff --git a/include/volatile_state.h b/include/volatile_state.h
new file mode 100644
index 0000000..be13265
--- /dev/null
+++ b/include/volatile_state.h
@@ -0,0 +1,26 @@
+// File: include/config.h
+#pragma once
+#include <Arduino.h>
+
+struct VolatileState {
+    bool     on = false;
+    bool     live = false;
+    struct StaticColor
+    {
+        uint8_t  red = 0, green = 0, blue = 0;
+    } staticColor;
+    uint8_t  effect     = 0;
+    uint8_t  brightness = 255;
+};
+
+namespace Volatile{
+    extern const VolatileState& state;
+
+    void updateBrightness(uint8_t  brightness);
+    void updatePowerOn(bool on);
+    void updateStaticColor(uint8_t red, uint8_t green, uint8_t blue);
+
+    bool clearUpdatedBrightnessState();
+    bool clearUpdatedPowerOnState();
+    bool clearUpdatedStaticColorState();
+};
diff --git a/platformio.ini b/platformio.ini
index dc71caf..2383555 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -16,6 +16,7 @@ lib_deps =
 
 build_flags =
     -DAPP_NAME=\"Hyperk\"
+    ; -DDEBUG_LOG ; enable debug log to serial port
 
 ; ==================================================
 ; ESP32, S2 (Core 2.x, NeoPixelBus)
@@ -26,6 +27,7 @@ platform = espressif32 @ 6.7.0
 board = esp32dev
 board_build.partitions = partitions_4mb.csv
 board_build.filesystem = littlefs
+board_build.flash_mode = dio
 framework = arduino
 
 lib_deps =
@@ -35,6 +37,10 @@ lib_deps =
 build_flags =
     ${env.build_flags}
     -DMAX_LEDS=${env.custom_max_leds}
+    -std=gnu++17
+
+build_unflags =
+    -std=gnu++11
 
 [env:esp32s2]
 extends = env:esp32
@@ -49,6 +55,7 @@ platform = https://github.com/pioarduino/platform-espressif32/releases/download/
 board = esp32-c3-devkitm-1
 board_build.partitions = partitions_4mb.csv
 board_build.filesystem = littlefs
+board_build.flash_mode = dio
 framework = arduino
 
 lib_deps =
@@ -63,6 +70,7 @@ build_flags =
     -DMAX_LEDS=${env.custom_max_leds}
     -DUSE_FASTLED
     -DFASTLED_RMT_MAX_CHANNELS=1
+    ;-DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_MODE=1
 
 [env:esp32s3]
 extends = env:esp32c3
diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..da731c3
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,38 @@
+# Hyperk
+
+Hyperk is a minimalist, high-performance uni-platform WiFi LED driver for ESP8266, ESP32 (S2, S3, C3, C6), Raspberry Pi Pico W (RP2040, RP2350). Designed as a lightweight and streamlined component that avoids unnecessary complexity, it delivers low‑latency performance and integrates smoothly with platforms such as HyperHDR, while offering essential home‑automation capabilities through a clean, modern codebase.
+
+## Installation
+
+The firmware can be flashed directly from your browser:
+**[hyperk.hyperhdr.org](https://hyperk.hyperhdr.org)**
+
+---
+
+## Supported Hardware
+
+- **Espressif:** ESP8266, ESP32, ESP32-S2, ESP32-S3, ESP32-C3, ESP32-C6
+- **Raspberry Pi:** RP2040, RP2350
+
+## Supported LED Types
+
+- **NeoPixel RGB:** WS2812b and compatible.
+- **NeoPixel RGBW:** SK6812 (includes white channel calibration known from HyperSerial).
+- **DotStar SPI:** APA102 and high-speed clocked LEDs.
+
+## Integration
+
+- **HyperHDR:** Native support via `udpraw` and `WLED` protocols. A dedicated DDP driver coming soon to HyperHDR.
+- **Home Assistant:** Automatic discovery with support for power on/off, color, and brightness control.
+
+## Network Services
+
+| Service | Port | Protocol / Description |
+| :--- | :--- | :--- |
+| Web GUI | 80 | Device configuration |
+| UDP DDP | 4048 | DDP listener |
+| UDP RealTime | 21324 | Real-time stream listener |
+| UDP Raw RGB | 5568 | Raw color stream listener |
+
+---
+*Developed for performance. Optimized for HyperHDR.*
\ No newline at end of file
diff --git a/scripts/collect_firmware.py b/scripts/collect_firmware.py
index 51e8a4f..f857090 100644
--- a/scripts/collect_firmware.py
+++ b/scripts/collect_firmware.py
@@ -22,7 +22,10 @@ def run_merge_bin(mcu, factory_path, boot_addr, bootloader, partitions, source_p
         "0x8000", partitions,
         "0x10000", source_path
     ]
-    
+    full_cmd_str = " ".join(cmd)
+    print(">>> [MERGING] merge_bin:")
+    print(full_cmd_str)
+    print("-" * 50)
     subprocess.run(cmd, check=True)
 
 def copy_firmware(target, source, env):
@@ -49,25 +52,27 @@ def copy_firmware(target, source, env):
     if os.path.exists(source_path):
         # 1. Kopiowanie OTA
         dest_name = f"Hyperk_{app_version}_{env_name}{ext}"
-        dest_path = os.path.join(dist_dir, dest_name)
-        shutil.copy2(source_path, dest_path)
-        print(f">>> [COPY] {dest_name}")
+        dest_path = os.path.join(dist_dir, dest_name)                
 
         # 2. Factory Merge
-        if ext == ".bin" and "esp" in env_name:            
+        if ext == ".bin" and "esp" in env_name and "esp8266" not in env_name:            
             bootloader = os.path.join(build_dir, "bootloader.bin")
             partitions = os.path.join(build_dir, "partitions.bin")
             
             if os.path.exists(bootloader) and os.path.exists(partitions):
-                mcu = env.get("BOARD_MCU", "esp32")
-                boot_addr = "0x1000" if mcu == "esp32" else "0x0"
-                factory_path = os.path.join(dist_dir, f"Hyperk_{app_version}_{env_name}_factory_flash.bin")
+                mcu = env.get("BOARD_MCU", "esp32")                
+                factory_path = os.path.join(dist_dir, f"Hyperk_{app_version}_{env_name}_factory.bin")
+                boot_addr = "0x1000" if mcu in ["esp32", "esp32s2"] else "0x0"
                 try:
                     run_merge_bin(mcu, factory_path, boot_addr, bootloader, partitions, source_path, env)
                     print(f">>> [SUCCESS] Factory image: {os.path.basename(factory_path)}")
                 except Exception as e:
                     print(f">>> [ERROR] Merge failed for {env_name}: {e}")
                     env.Exit(1)
+        else:
+            shutil.copy2(source_path, dest_path)
+            print(f">>> [SUCCESS] Copy: {dest_name}")
+
     else:
         print(f">>> [ERROR] File not found: {source_path}")
 
diff --git a/src/calibration.cpp b/src/calibration.cpp
index dde90b7..75bf3bd 100644
--- a/src/calibration.cpp
+++ b/src/calibration.cpp
@@ -83,7 +83,7 @@ namespace
 
 void printCalibration()
 {
-    Serial.printf("RGBW => Gain: %i/255, red: %i, green: %i, blue: %i\n", gain, red, green, blue);
+    Log::debug("RGBW => Gain: ",gain ,"/255, red: ",red ,", green: ",green ,", blue: ", blue);
 }
 
 void deleteCalibration()
diff --git a/src/config.cpp b/src/config.cpp
index 6cb09ea..fa90fd4 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -27,13 +27,18 @@
 
 #include "config.h"
 #include "storage.h"
+#include "volatile_state.h"
 
-AppConfig cfg;
+namespace Config {
+    AppConfig internalCfg;
+    const AppConfig& cfg = internalCfg;
 
-bool loadConfig() {
-    return loadConfig(cfg);
-}
+    bool loadConfig() {
+        return Storage::loadConfig(internalCfg);
+    }
 
-bool saveConfig() {
-    return saveConfig(cfg);
-}
+    bool saveConfig(const AppConfig& cfg) {
+        internalCfg = cfg;
+        return Storage::saveConfig(internalCfg);
+    }
+};
\ No newline at end of file
diff --git a/src/leds.cpp b/src/leds.cpp
index ba473ea..c2f5c11 100644
--- a/src/leds.cpp
+++ b/src/leds.cpp
@@ -29,7 +29,7 @@
     #include <FastLED.h>
     #include "config.h"
 
-    namespace
+    namespace Leds
     {
         CRGB* leds = nullptr;
         uint16_t fastLedsNumber = 0;
@@ -68,7 +68,7 @@
         typedef NeoPixelBus<NeoGrbwFeature, Rp2040x4Pio0Ws2812xMethod> NeoPixelRgbw;
     #endif
 
-    namespace
+    namespace Leds
     {
         DotStar* dotstar = nullptr;
         NeoPixel* neopixel = nullptr;
@@ -81,288 +81,415 @@
 #include "storage.h"
 #include "manager.h"
 #include "calibration.h"
+#include "volatile_state.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace{
+namespace Leds{
     volatile bool delayedRender = false;
-}
-
-int getLedsNumber()
-{
-    #ifdef USE_FASTLED
-        return fastLedsNumber;
-    #else    
-        if (dotstar != nullptr) 
-            return dotstar->PixelCount();
-        else if (neopixel != nullptr)
-            return neopixel->PixelCount();
-        else if (neopixelRgbw != nullptr)
-            return neopixelRgbw->PixelCount();
-        
-        return 0;
-    #endif
-}
-
-void clearAll()
-{
-    #ifdef USE_FASTLED
-        FastLED.clear(true);
-    #else
-        if (dotstar == nullptr && neopixel == nullptr && neopixelRgbw == nullptr) 
-            return;
 
-        if (dotstar != nullptr) 
-            {dotstar->ClearTo(RgbwColor(0, 0, 0, 31)); dotstar->Show();}
-        else if (neopixel != nullptr)
-            {neopixel->ClearTo(RgbColor(0, 0, 0)); neopixel->Show();}
-        else if (neopixelRgbw != nullptr)
-            {neopixelRgbw->ClearTo(RgbwColor(0, 0, 0, 0)); neopixelRgbw->Show();}
-    #endif
-}
+    int getLedsNumber()
+    {
+        #ifdef USE_FASTLED
+            return fastLedsNumber;
+        #else    
+            if (dotstar != nullptr) 
+                return dotstar->PixelCount();
+            else if (neopixel != nullptr)
+                return neopixel->PixelCount();
+            else if (neopixelRgbw != nullptr)
+                return neopixelRgbw->PixelCount();
+            
+            return 0;
+        #endif
+    }
 
-void initLEDs(LedType cfgLedType, uint16_t cfgLedNumLeds, uint8_t cfgLedDataPin, uint8_t cfgLedClockPin,
-                uint8_t calGain, uint8_t calRed, uint8_t calGreen, uint8_t calBlue) {
-    clearAll();
+    void clearAll()
+    {
+        #ifdef USE_FASTLED
+            FastLED.clear(true);
+        #else
+            if (dotstar == nullptr && neopixel == nullptr && neopixelRgbw == nullptr) 
+                return;
 
-    #ifdef USE_FASTLED
-        if (leds != nullptr)
-        {
-            delete[] leds;
-            leds = nullptr;
-        }
-    #else
-        if (dotstar != nullptr || neopixel != nullptr || neopixelRgbw != nullptr) 
-        { 
-                delay(50);
-                delete dotstar; dotstar = nullptr;
-                delete neopixel; neopixel = nullptr; 
-                delete neopixelRgbw; neopixelRgbw = nullptr;
-                delay(100);
-        }    
-    #endif
+            if (dotstar != nullptr) 
+                {dotstar->ClearTo(RgbwColor(0, 0, 0, 31)); dotstar->Show();}
+            else if (neopixel != nullptr)
+                {neopixel->ClearTo(RgbColor(0, 0, 0)); neopixel->Show();}
+            else if (neopixelRgbw != nullptr)
+                {neopixelRgbw->ClearTo(RgbwColor(0, 0, 0, 0)); neopixelRgbw->Show();}
+        #endif
+    }
 
-    if (cfgLedType != LedType::SK6812)
+    bool canRender()
     {
-        deleteCalibration();
+        #ifndef USE_FASTLED
+            if (dotstar != nullptr) 
+            {
+                return dotstar->CanShow();
+            }
+            else if (neopixel != nullptr)
+            {
+                return neopixel->CanShow();
+            }
+            else if (neopixelRgbw != nullptr)
+            {
+                return neopixelRgbw->CanShow();
+            }
+        #endif
+        return true;
     }
 
-    delayedRender = false;
+    void synchronizeLedsToVolatileStateBeforeDeleyedRender()
+    {
+        if (delayedRender || !canRender())
+            return;
 
-    // LED controller setup
-    #ifdef USE_FASTLED
-        fastLedsNumber = cfgLedNumLeds;
-        fastLedsType = cfgLedType;
-        int virtualLedsNumber = fastLedsNumber;
+        bool updated = false;
+        if (Volatile::clearUpdatedBrightnessState())
+        {
+            updated = true;
+            Log::debug("Updating brightness to: ", Volatile::state.brightness);
+            #ifdef USE_FASTLED
+                FastLED.setBrightness(Volatile::state.brightness);
+            #endif
+        }
 
-        if (fastLedsType == LedType::SK6812)
+        if (Volatile::clearUpdatedPowerOnState())
         {
-            virtualLedsNumber = (fastLedsNumber * 4 + 2) / 3;
-            const size_t bytesToAllocate = virtualLedsNumber * 3;
-            leds = reinterpret_cast<CRGB*>(new uint8_t[bytesToAllocate]);
-            memset(leds, 0, bytesToAllocate);
+            updated = true;
+            Log::debug("Updating power on to: ", Volatile::state.on);
         }
-        else
+
+        if (Volatile::clearUpdatedStaticColorState())
         {
-            leds = new CRGB[virtualLedsNumber];
+            updated = true;
+            Log::debug("Updating static color to: {", Volatile::state.staticColor.red, ", ", Volatile::state.staticColor.green, ", ", Volatile::state.staticColor.blue, "}");
         }
 
-        if (fastLedsType == LedType::WS2812 || fastLedsType == LedType::SK6812)
+        if (updated)
         {
-            switch (cfgLedDataPin) {
-                #if !defined(CONFIG_IDF_TARGET_ESP32S3)
-                case 0: FastLED.addLeds<WS2812, 0, GRB>(leds, virtualLedsNumber); break;
-                #endif
-                case 1: FastLED.addLeds<WS2812, 1, GRB>(leds, virtualLedsNumber); break;
-                case 2: FastLED.addLeds<WS2812, 2, GRB>(leds, virtualLedsNumber); break;
-                #if !defined(CONFIG_IDF_TARGET_ESP32S3)
-                case 3: FastLED.addLeds<WS2812, 3, GRB>(leds, virtualLedsNumber); break;
-                #endif
-                case 4: FastLED.addLeds<WS2812, 4, GRB>(leds, virtualLedsNumber); break;
-                case 5: FastLED.addLeds<WS2812, 5, GRB>(leds, virtualLedsNumber); break;
-                case 6: FastLED.addLeds<WS2812, 6, GRB>(leds, virtualLedsNumber); break;
-                case 7: FastLED.addLeds<WS2812, 7, GRB>(leds, virtualLedsNumber); break;
-                case 8: FastLED.addLeds<WS2812, 8, GRB>(leds, virtualLedsNumber); break;
-                case 10: FastLED.addLeds<WS2812, 10, GRB>(leds, virtualLedsNumber); break;
-                #if defined(CONFIG_IDF_TARGET_ESP32C6)
-                case 15: FastLED.addLeds<WS2812, 15, GRB>(leds, virtualLedsNumber); break;
-                case 18: FastLED.addLeds<WS2812, 18, GRB>(leds, virtualLedsNumber); break;
-                case 19: FastLED.addLeds<WS2812, 19, GRB>(leds, virtualLedsNumber); break;
-                case 20: FastLED.addLeds<WS2812, 20, GRB>(leds, virtualLedsNumber); break;
-                case 21: FastLED.addLeds<WS2812, 21, GRB>(leds, virtualLedsNumber); break;
-                case 22: FastLED.addLeds<WS2812, 22, GRB>(leds, virtualLedsNumber); break;
-                #elif defined(CONFIG_IDF_TARGET_ESP32S3)
-                case 16: FastLED.addLeds<WS2812, 16, GRB>(leds, virtualLedsNumber); break;
-                case 17: FastLED.addLeds<WS2812, 17, GRB>(leds, virtualLedsNumber); break;
-                case 18: FastLED.addLeds<WS2812, 18, GRB>(leds, virtualLedsNumber); break;
-                case 48: FastLED.addLeds<WS2812, 48, GRB>(leds, virtualLedsNumber); break;
-                #elif defined(CONFIG_IDF_TARGET_ESP32C3)
-                case 20: FastLED.addLeds<WS2812, 20, GRB>(leds, virtualLedsNumber); break;
-                case 21: FastLED.addLeds<WS2812, 21, GRB>(leds, virtualLedsNumber); break;
-                #endif
-                default:
-                    FastLED.addLeds<WS2812, 2, GRB>(leds, virtualLedsNumber);
-                    break;
-            }
+            auto r = (Volatile::state.on) ? Volatile::state.staticColor.red : 0;
+            auto g = (Volatile::state.on) ? Volatile::state.staticColor.green : 0;
+            auto b = (Volatile::state.on) ? Volatile::state.staticColor.blue : 0;
+
+            #ifdef USE_FASTLED
+                fill_solid(leds, getLedsNumber(), CRGB(r, g, b));
+                FastLED.show();
+            #else
+                if (dotstar == nullptr && neopixel == nullptr && neopixelRgbw == nullptr) 
+                    return;
+
+                if (dotstar != nullptr) {
+                    RgbwColor col(r, g, b, 31);
+                    col.Dim(Volatile::state.brightness);
+                    dotstar->ClearTo(col);
+                    dotstar->Show();
+                }
+                else if (neopixel != nullptr) {
+                    RgbColor col(r, g, b);
+                    col.Dim(Volatile::state.brightness);
+                    neopixel->ClearTo(col);
+                    neopixel->Show();
+                }
+                else if (neopixelRgbw != nullptr) {
+                    RgbwColor col(r, g, b, 0);
+                    col.Dim(Volatile::state.brightness);
+                    neopixelRgbw->ClearTo(col);
+                    neopixelRgbw->Show();
+                }
+            #endif
         }
-        else
-        { // SPI (APA102 / SK9822)
-            switch (cfgLedDataPin) {
-                #if defined(CONFIG_IDF_TARGET_ESP32S3)
-                    case 11: FastLED.addLeds<APA102, 11, 12, BGR>(leds, virtualLedsNumber); break;
-                #elif defined(CONFIG_IDF_TARGET_ESP32C3)
-                    case 7:  FastLED.addLeds<APA102, 7, 6, BGR>(leds, virtualLedsNumber); break;
-                #elif defined(CONFIG_IDF_TARGET_ESP32C6)
-                    case 6:  FastLED.addLeds<APA102, 6, 5, BGR>(leds, virtualLedsNumber); break;
-                #endif
-                
-                default:                        
-                        Serial.println("\n!!! FATAL ERROR: Invalid LED Data Pin. Must use Hardware SPI pins. !!!");
-                        FastLED.addLeds<APA102, 7, 6, BGR>(leds, virtualLedsNumber);
+    }
+
+    void initLEDs(LedType cfgLedType, uint16_t cfgLedNumLeds, uint8_t cfgLedDataPin, uint8_t cfgLedClockPin,
+                    uint8_t calGain, uint8_t calRed, uint8_t calGreen, uint8_t calBlue) {
+        clearAll();
+
+        #ifdef USE_FASTLED
+            if (FastLED.count())
+            {
+                return;
             }
-        }
-    #else
-        if (cfgLedType == LedType::WS2812 || cfgLedType == LedType::SK6812)
-        { // clockless
-            switch (cfgLedType)
+
+            if (leds != nullptr)
             {
-                case LedType::SK6812:
-                    setParamsAndPrepareCalibration(calGain, calRed, calGreen, calBlue);
-                    neopixelRgbw = new NeoPixelRgbw(cfgLedNumLeds, cfgLedDataPin);
-                    neopixelRgbw->Begin();
-                    break;
-                default:
-                    neopixel = new NeoPixel(cfgLedNumLeds, cfgLedDataPin);
-                    neopixel->Begin();
+                delete[] leds;
+                leds = nullptr;
             }
-        }
-        else
-        { // SPI (APA102 / SK9822)
-            #if defined(ARDUINO_ARCH_ESP32)
-                dotstar = new DotStar(cfgLedNumLeds, cfgLedDataPin, cfgLedClockPin); //23, 18
-            #else 
-                dotstar = new DotStar(cfgLedNumLeds, cfgLedDataPin, cfgLedClockPin); //19, 18
-            #endif
-            dotstar->Begin();
-        }
-    #endif
+        #else
+            if (dotstar != nullptr || neopixel != nullptr || neopixelRgbw != nullptr) 
+            { 
+                    delay(50);
+                    delete dotstar; dotstar = nullptr;
+                    delete neopixel; neopixel = nullptr; 
+                    delete neopixelRgbw; neopixelRgbw = nullptr;
+                    delay(100);
+            }    
+        #endif
 
-    clearAll();
-}
-
-void applyLedConfig()
-{
-    initLEDs(cfg.led.type, cfg.led.numLeds, cfg.led.dataPin, cfg.led.clockPin, cfg.led.calibration.gain, cfg.led.calibration.red, cfg.led.calibration.green, cfg.led.calibration.blue);
-}
-
-void setLed(int index, uint8_t r, uint8_t g, uint8_t b)
-{
-    #ifdef USE_FASTLED
-        if (fastLedsType == LedType::SK6812)
-        {            
-            if (index >= fastLedsNumber) return;
-            const RgbwColor calibrated = rgb2rgbw(r, g, b);
-            uint16_t i = index * 4;
-            reinterpret_cast<uint8_t*>(leds)[i]     = calibrated.G;
-            reinterpret_cast<uint8_t*>(leds)[i + 1] = calibrated.R;
-            reinterpret_cast<uint8_t*>(leds)[i + 2] = calibrated.B;
-            reinterpret_cast<uint8_t*>(leds)[i + 3] = calibrated.W;
-        }
-        else
+        if (cfgLedType != LedType::SK6812)
         {
-            if (index >= fastLedsNumber) return;
-            leds[index] = CRGB(r, g, b);
+            deleteCalibration();
         }
-    #else
-        if (dotstar != nullptr) 
-            dotstar->SetPixelColor(index, RgbwColor(r, g, b, 31));
-        else if (neopixel != nullptr)
-            neopixel->SetPixelColor(index, RgbColor(r, g, b));
-        else if (neopixelRgbw != nullptr)
-            neopixelRgbw->SetPixelColor(index, rgb2rgbw(r, g, b));
-    #endif
-}
 
-void setLed(int index, uint8_t r, uint8_t g, uint8_t b, uint8_t w)
-{
-    #ifdef USE_FASTLED
-        if (fastLedsType == LedType::SK6812)
-        {
-            if (index >= fastLedsNumber) return;
-            uint16_t i = index * 4;
-            reinterpret_cast<uint8_t*>(leds)[i]     = g;
-            reinterpret_cast<uint8_t*>(leds)[i + 1] = r;
-            reinterpret_cast<uint8_t*>(leds)[i + 2] = b;
-            reinterpret_cast<uint8_t*>(leds)[i + 3] = w;
-        }
-        else
-        {
-            if (index >= fastLedsNumber) return;
-            leds[index] = CRGB(r, g, b);
-        }
-    #else
-        if (dotstar != nullptr) 
-            dotstar->SetPixelColor(index, RgbwColor(r, g, b, min(w, (uint8_t)31)));
-        else if (neopixel != nullptr)
-            neopixel->SetPixelColor(index, RgbColor(r, g, b));
-        else if (neopixelRgbw != nullptr)
-            neopixelRgbw->SetPixelColor(index, RgbwColor(r, g, b, w));
-    #endif
-}
+        delayedRender = false;
 
-void checkDeleyedRender()
-{
-    if (delayedRender)
+        // LED controller setup
+        #ifdef USE_FASTLED
+            fastLedsNumber = cfgLedNumLeds;
+            fastLedsType = cfgLedType;
+            int virtualLedsNumber = fastLedsNumber;
+
+            if (fastLedsType == LedType::SK6812)
+            {
+                virtualLedsNumber = (fastLedsNumber * 4 + 2) / 3;
+                const size_t bytesToAllocate = virtualLedsNumber * 3;
+                leds = reinterpret_cast<CRGB*>(new uint8_t[bytesToAllocate]);
+                memset(leds, 0, bytesToAllocate);
+            }
+            else
+            {
+                leds = new CRGB[virtualLedsNumber];
+            }
+
+            if (fastLedsType == LedType::WS2812 || fastLedsType == LedType::SK6812)
+            {
+                switch (cfgLedDataPin) {
+                    #if !defined(CONFIG_IDF_TARGET_ESP32S3)
+                    case 0: FastLED.addLeds<WS2812, 0, GRB>(leds, virtualLedsNumber); break;
+                    #endif
+                    case 1: FastLED.addLeds<WS2812, 1, GRB>(leds, virtualLedsNumber); break;
+                    case 2: FastLED.addLeds<WS2812, 2, GRB>(leds, virtualLedsNumber); break;
+                    #if !defined(CONFIG_IDF_TARGET_ESP32S3)
+                    case 3: FastLED.addLeds<WS2812, 3, GRB>(leds, virtualLedsNumber); break;
+                    #endif
+                    case 4: FastLED.addLeds<WS2812, 4, GRB>(leds, virtualLedsNumber); break;
+                    case 5: FastLED.addLeds<WS2812, 5, GRB>(leds, virtualLedsNumber); break;
+                    case 6: FastLED.addLeds<WS2812, 6, GRB>(leds, virtualLedsNumber); break;
+                    case 7: FastLED.addLeds<WS2812, 7, GRB>(leds, virtualLedsNumber); break;
+                    case 8: FastLED.addLeds<WS2812, 8, GRB>(leds, virtualLedsNumber); break;
+                    case 10: FastLED.addLeds<WS2812, 10, GRB>(leds, virtualLedsNumber); break;
+                    #if defined(CONFIG_IDF_TARGET_ESP32C6)
+                    case 15: FastLED.addLeds<WS2812, 15, GRB>(leds, virtualLedsNumber); break;
+                    case 18: FastLED.addLeds<WS2812, 18, GRB>(leds, virtualLedsNumber); break;
+                    case 19: FastLED.addLeds<WS2812, 19, GRB>(leds, virtualLedsNumber); break;
+                    case 20: FastLED.addLeds<WS2812, 20, GRB>(leds, virtualLedsNumber); break;
+                    case 21: FastLED.addLeds<WS2812, 21, GRB>(leds, virtualLedsNumber); break;
+                    case 22: FastLED.addLeds<WS2812, 22, GRB>(leds, virtualLedsNumber); break;
+                    #elif defined(CONFIG_IDF_TARGET_ESP32S3)
+                    case 16: FastLED.addLeds<WS2812, 16, GRB>(leds, virtualLedsNumber); break;
+                    case 17: FastLED.addLeds<WS2812, 17, GRB>(leds, virtualLedsNumber); break;
+                    case 18: FastLED.addLeds<WS2812, 18, GRB>(leds, virtualLedsNumber); break;
+                    case 48: FastLED.addLeds<WS2812, 48, GRB>(leds, virtualLedsNumber); break;
+                    #elif defined(CONFIG_IDF_TARGET_ESP32C3)
+                    case 20: FastLED.addLeds<WS2812, 20, GRB>(leds, virtualLedsNumber); break;
+                    case 21: FastLED.addLeds<WS2812, 21, GRB>(leds, virtualLedsNumber); break;
+                    #endif
+                    default:
+                        FastLED.addLeds<WS2812, 2, GRB>(leds, virtualLedsNumber);
+                        break;
+                }
+            }
+            else
+            { // SPI (APA102 / SK9822)
+                switch (cfgLedDataPin) {
+                    #if defined(CONFIG_IDF_TARGET_ESP32S3)
+                        case 11: FastLED.addLeds<APA102, 11, 12, BGR>(leds, virtualLedsNumber); break;
+                    #elif defined(CONFIG_IDF_TARGET_ESP32C3)
+                        case 7:  FastLED.addLeds<APA102, 7, 6, BGR>(leds, virtualLedsNumber); break;
+                    #elif defined(CONFIG_IDF_TARGET_ESP32C6)
+                        case 6:  FastLED.addLeds<APA102, 6, 5, BGR>(leds, virtualLedsNumber); break;
+                    #endif
+                    
+                    default:                        
+                            Log::debug("!!! FATAL ERROR: Invalid LED Data Pin. Must use Hardware SPI pins. !!!");
+                            FastLED.addLeds<APA102, 7, 6, BGR>(leds, virtualLedsNumber);
+                }
+            }
+
+            FastLED.setBrightness(Volatile::state.brightness);
+        #else
+            if (cfgLedType == LedType::WS2812 || cfgLedType == LedType::SK6812)
+            { // clockless
+                switch (cfgLedType)
+                {
+                    case LedType::SK6812:
+                        setParamsAndPrepareCalibration(calGain, calRed, calGreen, calBlue);
+                        neopixelRgbw = new NeoPixelRgbw(cfgLedNumLeds, cfgLedDataPin);
+                        neopixelRgbw->Begin();
+                        break;
+                    default:
+                        neopixel = new NeoPixel(cfgLedNumLeds, cfgLedDataPin);
+                        neopixel->Begin();
+                }
+            }
+            else
+            { // SPI (APA102 / SK9822)
+                #if defined(ARDUINO_ARCH_ESP32)
+                    dotstar = new DotStar(cfgLedNumLeds, cfgLedDataPin, cfgLedClockPin); //23, 18
+                #else 
+                    dotstar = new DotStar(cfgLedNumLeds, cfgLedDataPin, cfgLedClockPin); //19, 18
+                #endif
+                dotstar->Begin();
+            }
+        #endif
+
+        clearAll();
+    }
+
+    void applyLedConfig()
     {
-        renderLed(false);
+        const AppConfig& cfg = Config::cfg;
+        initLEDs(cfg.led.type, cfg.led.numLeds, cfg.led.dataPin, cfg.led.clockPin, cfg.led.calibration.gain, cfg.led.calibration.red, cfg.led.calibration.green, cfg.led.calibration.blue);
+        Volatile::updateBrightness(cfg.led.brightness);
+        Volatile::updatePowerOn(cfg.led.r || cfg.led.g || cfg.led.b);
+        Volatile::updateStaticColor(cfg.led.r, cfg.led.g, cfg.led.b);
     }
-}
 
-void queueRender(bool isNewFrame)
-{
-    if (isNewFrame && delayedRender)
+    template<bool applyBrightness>
+    void setLed(int index, uint8_t r, uint8_t g, uint8_t b)
     {
-        stats.skippedFrames = stats.skippedFrames + 1;
+        #ifdef USE_FASTLED
+            if (fastLedsType == LedType::SK6812)
+            {            
+                if (index >= fastLedsNumber) return;
+                const RgbwColor calibrated = rgb2rgbw(r, g, b);
+                uint16_t i = index * 4;
+                reinterpret_cast<uint8_t*>(leds)[i]     = calibrated.G;
+                reinterpret_cast<uint8_t*>(leds)[i + 1] = calibrated.R;
+                reinterpret_cast<uint8_t*>(leds)[i + 2] = calibrated.B;
+                reinterpret_cast<uint8_t*>(leds)[i + 3] = calibrated.W;
+            }
+            else
+            {
+                if (index >= fastLedsNumber) return;
+                leds[index] = CRGB(r, g, b);
+            }
+        #else
+            if (dotstar != nullptr)
+            {
+                RgbwColor col(r, g, b, 31);
+                if constexpr (applyBrightness) col.Dim(Volatile::state.brightness);
+                dotstar->SetPixelColor(index, col);
+            }
+            else if (neopixel != nullptr)
+            {
+                RgbColor col(r, g, b);
+                if constexpr (applyBrightness) col.Dim(Volatile::state.brightness);
+                neopixel->SetPixelColor(index, col);
+            }
+            else if (neopixelRgbw != nullptr)
+            {
+                RgbwColor col = rgb2rgbw(r, g, b);
+                if constexpr (applyBrightness) col.Dim(Volatile::state.brightness);
+                neopixelRgbw->SetPixelColor(index, col);
+            }
+        #endif
     }
-    delayedRender = true;
-}
-
-void renderLed(bool isNewFrame)
-{
-    #ifdef USE_FASTLED
-        FastLED.show();
-    #else
-        if (dotstar != nullptr) 
-        {
-            if (!dotstar->CanShow())
+
+    template<bool applyBrightness>
+    void setLedW(int index, uint8_t r, uint8_t g, uint8_t b, uint8_t w)
+    {
+        #ifdef USE_FASTLED
+            if (fastLedsType == LedType::SK6812)
             {
-                queueRender(isNewFrame);
-                return;
+                if (index >= fastLedsNumber) return;
+                uint16_t i = index * 4;
+                reinterpret_cast<uint8_t*>(leds)[i]     = g;
+                reinterpret_cast<uint8_t*>(leds)[i + 1] = r;
+                reinterpret_cast<uint8_t*>(leds)[i + 2] = b;
+                reinterpret_cast<uint8_t*>(leds)[i + 3] = w;
             }
-            dotstar->Show();
-        }
-        else if (neopixel != nullptr)
-        {
-            if (!neopixel->CanShow())
+            else
             {
-                queueRender(isNewFrame);
-                return;
+                if (index >= fastLedsNumber) return;
+                leds[index] = CRGB(r, g, b);
             }
-            neopixel->Show();
+        #else
+            if (dotstar != nullptr)
+            {
+                RgbwColor col(r, g, b, min(w, (uint8_t)31));
+                if constexpr (applyBrightness) col.Dim(Volatile::state.brightness);
+                dotstar->SetPixelColor(index, col);
+            }
+            else if (neopixel != nullptr)
+            {
+                RgbColor col(r, g, b);
+                if constexpr (applyBrightness) col.Dim(Volatile::state.brightness);
+                neopixel->SetPixelColor(index, col);
+            }
+            else if (neopixelRgbw != nullptr)
+            {
+                RgbwColor col(r, g, b, w);
+                if constexpr (applyBrightness) col.Dim(Volatile::state.brightness);
+                neopixelRgbw->SetPixelColor(index, col);
+            }
+        #endif
+    }
+
+    void checkDeleyedRender()
+    {
+        if (delayedRender)
+        {
+            renderLed(false);
         }
-        else if (neopixelRgbw != nullptr)
+    }
+
+    void queueRender(bool isNewFrame)
+    {
+        if (isNewFrame && delayedRender)
         {
-            if (!neopixelRgbw->CanShow())
+            stats.skippedFrames = stats.skippedFrames + 1;
+        }
+        delayedRender = true;
+    }
+
+    void renderLed(bool isNewFrame)
+    {
+        #ifdef USE_FASTLED
+            FastLED.show();
+        #else
+            if (dotstar != nullptr) 
             {
-                queueRender(isNewFrame);
-                return;
+                if (!dotstar->CanShow())
+                {
+                    queueRender(isNewFrame);
+                    return;
+                }
+                dotstar->Show();
             }
-            neopixelRgbw->Show();
-        }
-        else
-            return;
-    #endif
+            else if (neopixel != nullptr)
+            {
+                if (!neopixel->CanShow())
+                {
+                    queueRender(isNewFrame);
+                    return;
+                }
+                neopixel->Show();
+            }
+            else if (neopixelRgbw != nullptr)
+            {
+                if (!neopixelRgbw->CanShow())
+                {
+                    queueRender(isNewFrame);
+                    return;
+                }
+                neopixelRgbw->Show();
+            }
+            else
+                return;
+        #endif
+
+        delayedRender = false;
+        stats.renderedFrames = stats.renderedFrames + 1;
+    }
+
+    template void setLed<false>(int, uint8_t, uint8_t, uint8_t);
+    template void setLedW<false>(int, uint8_t, uint8_t, uint8_t, uint8_t);
 
-    delayedRender = false;
-    stats.renderedFrames = stats.renderedFrames + 1;
-}
+    #ifndef USE_FASTLED
+        template void setLed<true>(int, uint8_t, uint8_t, uint8_t);
+        template void setLedW<true>(int, uint8_t, uint8_t, uint8_t, uint8_t);
+    #endif
+}
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 5e967a2..939a290 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -63,7 +63,7 @@ void startAP() {
     IPAddress IP = WiFi.softAPIP();    
     dnsServer.setErrorReplyCode(DNSReplyCode::NoError);
     dnsServer.start(53, "*", IP);        
-    Serial.printf("Captive Portal Ready at: %s\n", IP.toString().c_str());
+    Log::debug("Captive Portal Ready at: ", IP);
 }
 
 bool isAPMode() {
@@ -75,21 +75,26 @@ void setup() {
     Serial.begin(115200);
     delay(500);
 
+    #ifdef DEBUG_LOG
+        delay(8000);
+    #endif
+
     #if defined(ARDUINO_ARCH_ESP32)
         LittleFS.begin(true);
     #else
         if (!LittleFS.begin()) {
-            Serial.println("FS Mount failed, formatting...");
+            Log::debug("FS Mount failed, formatting...");
             LittleFS.format();
             LittleFS.begin();
         }
     #endif
 
-    loadConfig();
+    Config::loadConfig();
 
-    applyLedConfig();
+    Leds::applyLedConfig();
 
     // WiFi connection with fallback
+    const AppConfig& cfg = Config::cfg;
     if (cfg.wifi.ssid.length() > 0)
     {
         WiFi.begin(cfg.wifi.ssid.c_str(), cfg.wifi.password.c_str());
@@ -106,22 +111,21 @@ void setup() {
     }
     else
     {
-        Serial.printf("Connected → %s\n", WiFi.localIP().toString().c_str());
+        Log::debug("Connected → ", WiFi.localIP());
     }
 
     startMDNS();
     setupWebServer(server);
     server.begin();
 
-    Serial.print("HTTP Server started on IP: ");
-    Serial.println(WiFi.localIP());
+    Log::debug("HTTP Server started on IP: ", WiFi.localIP());
 
     udpDDP.begin(4048);
-    Serial.println("UDP DDP listener started on port 4048");
+    Log::debug("UDP DDP listener started on port 4048");
     udpRealTime.begin(21324);
-    Serial.println("UDP RealTime listener started on port 21324");
+    Log::debug("UDP RealTime listener started on port 21324");
     udpRAW.begin(5568);
-    Serial.println("Raw RGB color stream listener started on port 5568");
+    Log::debug("Raw RGB color stream listener started on port 5568");
 }
 
 void loop()
diff --git a/src/manager.cpp b/src/manager.cpp
index e189f1f..577adbc 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -50,14 +50,15 @@ void managerScheduleReboot(uint32_t delay_ms)
     _rebootTime = millis() + delay_ms;
     _pendingReboot = true;
 
-    Serial.println("--- REBOOT SCHEDULED ---");
-    Serial.print("Current millis: "); Serial.println(millis());
-    Serial.print("Reboot target : "); Serial.println(_rebootTime);
+    Log::debug("--- REBOOT SCHEDULED ---");
+    Log::debug("Current millis: ", millis());
+    Log::debug("Reboot target : ", _rebootTime);
 }
 
 void managerLoop()
 {
-    checkDeleyedRender();
+    Leds::synchronizeLedsToVolatileStateBeforeDeleyedRender();
+    Leds::checkDeleyedRender();
 
     if (_pendingReboot && millis() >= _rebootTime)
     {
@@ -67,7 +68,7 @@ void managerLoop()
     if (_pendingApplyConfig && !_pendingReboot)
     {
         _pendingApplyConfig = false;
-        applyLedConfig();    
+        Leds::applyLedConfig();    
     }
 
     uint32_t currentTag = millis() / 1000;   
diff --git a/src/mdns_service.cpp b/src/mdns_service.cpp
index a2d04b4..e02f01e 100644
--- a/src/mdns_service.cpp
+++ b/src/mdns_service.cpp
@@ -66,26 +66,34 @@ String sanitizeMdnsService(String s) {
 
     if (j > 0)
     {
-        Serial.print("Registering MDNS service: "); Serial.println(buf);
+        Log::debug("Validated MDNS service name: ", buf);
         return String(buf);
     }
     else
     {
-        Serial.print("MDNS service name is invalid: "); Serial.println(s);
+        Log::debug("MDNS service name is invalid: ", s);
         return String("invalid-name");
     }
 }
 
 void startMDNS()
 {
+    const AppConfig& cfg = Config::cfg;
+
     if (MDNS.begin(cfg.deviceName.c_str()))
     {
+        String macId = WiFi.macAddress();
+        macId.replace(":", "");
+        macId.toLowerCase();
+
         // 1. Extra mdns tag
         if (cfg.extraMdnsTag.length() > 0)
         {
             auto extraMDNS = sanitizeMdnsService(cfg.extraMdnsTag);
             MDNS.addService(extraMDNS, "tcp", 80);
-            MDNS.addServiceTxt(extraMDNS, "tcp", "model", (APP_NAME "-" + getDeviceArch()).c_str());
+            MDNS.addServiceTxt(extraMDNS, "tcp", "id", macId.c_str());
+            String fullModelName = String(APP_NAME) + "-" + String(APP_VERSION);
+            MDNS.addServiceTxt(extraMDNS, "tcp", "mdl", fullModelName.c_str());            
             MDNS.addServiceTxt(extraMDNS, "tcp", "mac", WiFi.macAddress().c_str());
             MDNS.addServiceTxt(extraMDNS, "tcp", "src", "udp");
         }
@@ -94,14 +102,12 @@ void startMDNS()
         auto ourMDNS = sanitizeMdnsService(APP_NAME);
         MDNS.addService(ourMDNS, "tcp", 80);        
         MDNS.addServiceTxt(ourMDNS, "tcp", "ver", APP_VERSION);
+        MDNS.addServiceTxt(ourMDNS, "tcp", "id", macId.c_str());
 
         MDNS.addService("ddp", "udp", 4048);
         MDNS.addService("realtime", "udp", 21324);
         MDNS.addService("raw", "udp", 5568);
 
-        Serial.printf("mDNS: %s.local (%s v%s)\n", 
-                      cfg.deviceName.c_str(), 
-                      APP_NAME, 
-                      APP_VERSION);
+        Log::debug("mDNS: ", cfg.deviceName, ".local (", APP_NAME, " v", APP_VERSION, ")");
     }
 }
\ No newline at end of file
diff --git a/src/storage.cpp b/src/storage.cpp
index 0b0af9b..078d5dc 100644
--- a/src/storage.cpp
+++ b/src/storage.cpp
@@ -28,72 +28,75 @@
 #include "storage.h"
 #include <LittleFS.h>
 
-bool loadConfig(AppConfig& cfg) {
-    if (!LittleFS.exists(CONFIG_FILE)) {
-        Serial.println("No config file → creating default");
-        return saveConfig(cfg);
-    }
+namespace Storage {
 
-    File file = LittleFS.open(CONFIG_FILE, "r");
-    JsonDocument doc;
-    DeserializationError err = deserializeJson(doc, file);
-    file.close();
+    bool loadConfig(AppConfig& cfg) {
+        if (!LittleFS.exists(CONFIG_FILE)) {
+            Log::debug("No config file → creating default");
+            return saveConfig(cfg);
+        }
 
-    if (err) {
-        Serial.println("JSON parse error");
-        return false;
-    }
+        File file = LittleFS.open(CONFIG_FILE, "r");
+        JsonDocument doc;
+        DeserializationError err = deserializeJson(doc, file);
+        file.close();
 
-    cfg.wifi.ssid     = doc["wifi"]["ssid"] | "";
-    cfg.wifi.password = doc["wifi"]["password"] | "";
-    cfg.deviceName    = doc["deviceName"] | APP_NAME;
-    cfg.extraMdnsTag  = doc["extraMdnsTag"] | "WLED";
+        if (err) {
+            Log::debug("JSON parse error");
+            return false;
+        }
 
-    cfg.led.type       = static_cast<LedType>(doc["led"]["type"] | static_cast<int>(LedType::WS2812));
-    cfg.led.dataPin    = doc["led"]["dataPin"]    | 2;
-    cfg.led.clockPin   = doc["led"]["clockPin"]   | 0;
-    cfg.led.numLeds    = doc["led"]["numLeds"]    | 16;
-    cfg.led.brightness = doc["led"]["brightness"] | 255;
-    cfg.led.r          = doc["led"]["r"] | 196;
-    cfg.led.g          = doc["led"]["g"] | 32;
-    cfg.led.b          = doc["led"]["b"] | 8;
-    cfg.led.effect     = doc["led"]["effect"] | 0;
+        cfg.wifi.ssid     = doc["wifi"]["ssid"] | "";
+        cfg.wifi.password = doc["wifi"]["password"] | "";
+        cfg.deviceName    = doc["deviceName"] | APP_NAME;
+        cfg.extraMdnsTag  = doc["extraMdnsTag"] | "WLED";
 
-    cfg.led.calibration.gain  = doc["calibration"]["gain"]  | 0xFF;
-    cfg.led.calibration.red   = doc["calibration"]["red"]   | 0xA0;
-    cfg.led.calibration.green = doc["calibration"]["green"] | 0xA0;
-    cfg.led.calibration.blue  = doc["calibration"]["blue"]  | 0xA0;
+        cfg.led.type       = static_cast<LedType>(doc["led"]["type"] | static_cast<int>(LedType::WS2812));
+        cfg.led.dataPin    = doc["led"]["dataPin"]    | 2;
+        cfg.led.clockPin   = doc["led"]["clockPin"]   | 0;
+        cfg.led.numLeds    = doc["led"]["numLeds"]    | 16;
+        cfg.led.brightness = doc["led"]["brightness"] | 255;
+        cfg.led.r          = doc["led"]["r"] | 196;
+        cfg.led.g          = doc["led"]["g"] | 32;
+        cfg.led.b          = doc["led"]["b"] | 8;
+        cfg.led.effect     = doc["led"]["effect"] | 0;
 
-    return true;
-}
+        cfg.led.calibration.gain  = doc["calibration"]["gain"]  | 0xFF;
+        cfg.led.calibration.red   = doc["calibration"]["red"]   | 0xA0;
+        cfg.led.calibration.green = doc["calibration"]["green"] | 0xA0;
+        cfg.led.calibration.blue  = doc["calibration"]["blue"]  | 0xA0;
 
-bool saveConfig(const AppConfig& cfg) {
-    JsonDocument doc;
+        return true;
+    }
 
-    doc["wifi"]["ssid"]     = cfg.wifi.ssid;
-    doc["wifi"]["password"] = cfg.wifi.password;
-    doc["deviceName"]       = cfg.deviceName;
-    doc["extraMdnsTag"]        = cfg.extraMdnsTag;
+    bool saveConfig(const AppConfig& cfg) {
+        JsonDocument doc;
 
-    doc["led"]["type"]       = static_cast<uint8_t>(cfg.led.type);
-    doc["led"]["dataPin"]    = cfg.led.dataPin;
-    doc["led"]["clockPin"]   = cfg.led.clockPin;
-    doc["led"]["numLeds"]    = cfg.led.numLeds;
-    doc["led"]["brightness"] = cfg.led.brightness;
-    doc["led"]["r"]          = cfg.led.r;
-    doc["led"]["g"]          = cfg.led.g;
-    doc["led"]["b"]          = cfg.led.b;
-    doc["led"]["effect"]     = cfg.led.effect;
+        doc["wifi"]["ssid"]     = cfg.wifi.ssid;
+        doc["wifi"]["password"] = cfg.wifi.password;
+        doc["deviceName"]       = cfg.deviceName;
+        doc["extraMdnsTag"]        = cfg.extraMdnsTag;
 
-    doc["calibration"]["gain"]  = cfg.led.calibration.gain;
-    doc["calibration"]["red"]   = cfg.led.calibration.red;
-    doc["calibration"]["green"] = cfg.led.calibration.green;
-    doc["calibration"]["blue"]  = cfg.led.calibration.blue;
+        doc["led"]["type"]       = static_cast<uint8_t>(cfg.led.type);
+        doc["led"]["dataPin"]    = cfg.led.dataPin;
+        doc["led"]["clockPin"]   = cfg.led.clockPin;
+        doc["led"]["numLeds"]    = cfg.led.numLeds;
+        doc["led"]["brightness"] = cfg.led.brightness;
+        doc["led"]["r"]          = cfg.led.r;
+        doc["led"]["g"]          = cfg.led.g;
+        doc["led"]["b"]          = cfg.led.b;
+        doc["led"]["effect"]     = cfg.led.effect;
 
-    File file = LittleFS.open(CONFIG_FILE, "w");
-    if (!file) return false;
-    serializeJson(doc, file);
-    file.flush();
-    file.close();
-    return true;
-}
\ No newline at end of file
+        doc["calibration"]["gain"]  = cfg.led.calibration.gain;
+        doc["calibration"]["red"]   = cfg.led.calibration.red;
+        doc["calibration"]["green"] = cfg.led.calibration.green;
+        doc["calibration"]["blue"]  = cfg.led.calibration.blue;
+
+        File file = LittleFS.open(CONFIG_FILE, "w");
+        if (!file) return false;
+        serializeJson(doc, file);
+        file.flush();
+        file.close();
+        return true;
+    }
+};
\ No newline at end of file
diff --git a/src/udp_receiver.cpp b/src/udp_receiver.cpp
index cc7ddfb..c42cf02 100644
--- a/src/udp_receiver.cpp
+++ b/src/udp_receiver.cpp
@@ -30,6 +30,7 @@
 #include "udp_receiver.h"
 #include "config.h"
 #include "leds.h"
+#include "volatile_state.h"
 
 namespace {
     struct DDPHeader {
@@ -58,6 +59,16 @@ void handleDDP(WiFiUDP& udp) {
         return;
     }
 
+    #ifdef USE_FASTLED
+        const bool brightnessControl = false;
+        auto setPixel = Leds::setLed<false>;
+        auto setPixelW = Leds::setLedW<false>;
+    #else
+        const bool brightnessControl = (Volatile::state.brightness != 255);
+        auto setPixel = brightnessControl ? Leds::setLed<true> : Leds::setLed<false>;
+        auto setPixelW = brightnessControl ? Leds::setLedW<true> : Leds::setLedW<false>;
+    #endif     
+
     uint8_t buffer[packetSize];    
     uint8_t* endBuffer = &(buffer[0]) + udp.read(buffer, packetSize);        
     DDPHeader* hdr = reinterpret_cast<DDPHeader*>(&(buffer[0]));
@@ -72,7 +83,7 @@ void handleDDP(WiFiUDP& udp) {
         char info[128];
         int infoLen = snprintf(info, sizeof(info),
                                "1;%d;%s;%s;%s;%d;4048", 
-                               1, APP_NAME, "PicoESP", APP_VERSION, getLedsNumber());
+                               1, APP_NAME, "PicoESP", APP_VERSION, Leds::getLedsNumber());
 
         hdr->len = __builtin_bswap16(infoLen);
 
@@ -96,25 +107,25 @@ void handleDDP(WiFiUDP& udp) {
 
     const int bytesPerLed = ((hdr->type & 0x38) == 0x18 || hdr->type == 0x03) ? 4 : 3;
     const int offset = channelOffset / bytesPerLed;
-    const int maxLedNumber = getLedsNumber();
+    const int maxLedNumber = Leds::getLedsNumber();
 
     if (bytesPerLed == 4)
     {
         for (int i = offset; rgb + 3 < endBuffer && i < maxLedNumber; rgb += 4)
-            setLed(i++, rgb[0], rgb[1], rgb[2], rgb[3]);        
+            setPixelW(i++, rgb[0], rgb[1], rgb[2], rgb[3]);        
     }
     else
     {
         for (int i = offset; rgb + 2 < endBuffer && i < maxLedNumber; rgb += 3)
-            setLed(i++, rgb[0], rgb[1], rgb[2]);
+            setPixel(i++, rgb[0], rgb[1], rgb[2]);
     }
 
     if (hdr->flags & 0x01) {
-        renderLed(true);
+        Leds::renderLed(true);
     }
 }
 
-void handleRealTime(WiFiUDP& udp) {
+void handleRealTime(WiFiUDP& udp) {    
     int packetSize = udp.parsePacket();
     if (packetSize < 5 || packetSize >= MTU_SIZE)
     {
@@ -122,18 +133,28 @@ void handleRealTime(WiFiUDP& udp) {
         return;
     }
 
+    #ifdef USE_FASTLED
+        const bool brightnessControl = false;
+        auto setPixel = Leds::setLed<false>;
+        auto setPixelW = Leds::setLedW<false>;
+    #else
+        const bool brightnessControl = (Volatile::state.brightness != 255);
+        auto setPixel = brightnessControl ? Leds::setLed<true> : Leds::setLed<false>;
+        auto setPixelW = brightnessControl ? Leds::setLedW<true> : Leds::setLedW<false>;
+    #endif     
+
     uint8_t buffer[packetSize]; 
     uint8_t* endBuffer = &(buffer[0]) + udp.read(buffer, packetSize);    
 
     const uint8_t protocolType = buffer[0];
-    const int maxLedNumber = getLedsNumber();
+    const int maxLedNumber = Leds::getLedsNumber();
     const uint8_t* rgb = nullptr;
 
     // 0x01 = WARLS, 0x02 = DNRGB, 0x04 = DRGB (indexed), 0x03 = DRGBW support (RGBW)    
     if (protocolType == 0x02) {
         rgb = &(buffer[2]);
         for (int i = 0; rgb + 2 < endBuffer && i < maxLedNumber; rgb += 3) {
-            setLed(i++, rgb[0], rgb[1], rgb[2]);
+            setPixel(i++, rgb[0], rgb[1], rgb[2]);
         }
     }
     else if (protocolType == 0x04) {        
@@ -151,19 +172,19 @@ void handleRealTime(WiFiUDP& udp) {
         }
 
         for (int i = offset; rgb + 2 < endBuffer && i < maxLedNumber; rgb += 3) {
-            setLed(i++, rgb[0], rgb[1], rgb[2]);
+            setPixel(i++, rgb[0], rgb[1], rgb[2]);
         }
     }
     else if (protocolType == 0x03) { // DRGBW support (r, g, b, w...)
         rgb = &(buffer[2]);
         for (int i = 0; rgb + 3 < endBuffer && i < maxLedNumber; rgb += 4) {
-            setLed(i++, rgb[0], rgb[1], rgb[2], rgb[3]);
+            setPixelW(i++, rgb[0], rgb[1], rgb[2], rgb[3]);
         }
     }
     else
         return;
 
-    renderLed(true);
+    Leds::renderLed(true);
 }
 
 void handleRAW(WiFiUDP& udp)
@@ -175,15 +196,25 @@ void handleRAW(WiFiUDP& udp)
         return;
     }
 
+    #ifdef USE_FASTLED
+        const bool brightnessControl = false;
+        auto setPixel = Leds::setLed<false>;
+        auto setPixelW = Leds::setLedW<false>;
+    #else
+        const bool brightnessControl = (Volatile::state.brightness != 255);
+        auto setPixel = brightnessControl ? Leds::setLed<true> : Leds::setLed<false>;
+        auto setPixelW = brightnessControl ? Leds::setLedW<true> : Leds::setLedW<false>;
+    #endif    
+
     uint8_t buffer[packetSize]; 
     uint8_t* endBuffer = &(buffer[0]) + udp.read(buffer, packetSize);    
 
-    const int maxLedNumber = getLedsNumber();
+    const int maxLedNumber = Leds::getLedsNumber();
     const uint8_t* rgb = &(buffer[0]);
 
     for (int i = 0; rgb + 2 < endBuffer && i < maxLedNumber; rgb += 3) {
-        setLed(i++, rgb[0], rgb[1], rgb[2]);
+        setPixel(i++, rgb[0], rgb[1], rgb[2]);
     }
 
-    renderLed(true);
+    Leds::renderLed(true);
 }
diff --git a/src/uni_json_api.cpp b/src/uni_json_api.cpp
new file mode 100644
index 0000000..02e4903
--- /dev/null
+++ b/src/uni_json_api.cpp
@@ -0,0 +1,234 @@
+#include "uni_json_api.h"
+#include "config.h"
+#include "utils.h"
+#include "leds.h"
+#include "volatile_state.h"
+
+#if defined(ESP8266)
+    #include <ESP8266WiFi.h>
+#else
+    #include <WiFi.h>
+#endif
+
+#define TPL_BODY \
+    R"raw({"state":{)raw" \
+    R"raw("on":######,"bri":####,"mainseg":0,"lor":0,)raw" \
+    R"raw("seg":[{"id":0,"fx":0,"pal":0,"sel":true,"cct":0,"o1":false,"o2":false,"o3":false,"si":0,"m12":0,"bri":255,"start":0,"stop":######,"on":######,"col":[[####,####,####],[0,0,0],[0,0,0]]}],)raw" \
+    R"raw("nl":{"on":false,"dur":60,"mode":1,"tbri":0},)raw" \
+    R"raw("udpn":{"send":false,"recv":false}},)raw" \
+    R"raw("info":{)raw" \
+    R"raw("ver":"0.15.3","vid":2508020,"cn":"Hyperk","name":"Hyperk","arch":"##########","uptime":############,"live":######,"freeheap":########,)raw" \
+    R"raw("leds":{"count":######,"maxseg":1,"lc":1,"seglc":[1],"cct":0,"wv":0,"maxpwr":0,"rgbw":######},)raw" \
+    R"raw("wifi":{"rssi":######,"signal":####,"channel":###},)raw" \
+    R"raw("fs":{"u":16,"t":61,"pmt":0}},)raw" \
+    R"raw("effects":["Solid"],"palettes":["Default"]})raw"
+
+static const char JSON_TPL[] PROGMEM = TPL_BODY;
+static constexpr char TPL_CONST[] = TPL_BODY;
+
+constexpr int getTokenPos(const char* target, int start_at = 0) {
+    int i = start_at;
+    while (TPL_CONST[i] != '\0') {
+        bool found = true; int j = 0;
+        while (target[j] != '\0') {
+            if (TPL_CONST[i + j] != target[j]) { found = false; break; }
+            j++;
+        }
+        if (found) return i + j;
+        i++;
+    }
+    return -1;
+}
+
+static constexpr int P_ON    = getTokenPos("\"on\":");
+static constexpr int P_BRI   = getTokenPos("\"bri\":");
+static constexpr int P_SEGON = getTokenPos("\"on\":", P_ON);
+static constexpr int P_STOP  = getTokenPos("\"stop\":");
+static constexpr int P_R     = getTokenPos("\"col\":[[");
+static constexpr int P_G     = P_R + 5;
+static constexpr int P_B     = P_G + 5;
+static constexpr int P_ARCH  = getTokenPos("\"arch\":\"");
+static constexpr int P_UP    = getTokenPos("\"uptime\":");
+static constexpr int P_CNT   = getTokenPos("\"count\":", P_UP);
+static constexpr int P_RSSI  = getTokenPos("\"rssi\":");
+static constexpr int P_SIG   = getTokenPos("\"signal\":");
+static constexpr int P_CH    = getTokenPos("\"channel\":");
+static constexpr int P_RGBW  = getTokenPos("\"rgbw\":");
+static constexpr int P_LIVE  = getTokenPos("\"live\":");
+static constexpr int P_FREEH = getTokenPos("\"freeheap\":");
+
+void fWrite(char* b, int p, int l, int32_t vv) {    
+    bool sign = false;
+    uint32_t v = abs(vv);
+    for (int i = l - 1; i >= 0; i--, v /= 10)
+    {
+        b[p + i] = (v > 0 || i == l - 1) ? (v % 10) + '0' : ' ';
+        if (vv < 0 && !sign && b[p + i] == ' ')
+        {
+            sign = true;
+            b[p + i] = '-';
+        }
+    }
+}
+
+void sWrite(char* b, int p, int l, const char* s) {
+    size_t len = strlen(s);
+    size_t copy_len = (len < (size_t)l) ? len : (size_t)l;
+
+    memcpy(b + p, s, copy_len);
+    if (copy_len < (size_t)l) {
+        memset(b + p + copy_len, ' ', (size_t)l - copy_len);
+    }
+}
+
+
+
+void uniConfigJsonResponse(AsyncWebServerRequest *request);
+
+void setupUniApiJsonHandler(AsyncWebServer &server) {
+    server.on("/presets.json", HTTP_GET, [](AsyncWebServerRequest *request){  
+        
+        Log::debug("-------- /presets.json ---------");
+        Log::debug("{\"0\":{\"n\":\"Default\"}}");        
+
+        request->send(200, "application/json", "{\"0\":{\"n\":\"Default\"}}");
+    });
+
+    server.on("/json/state", HTTP_POST, [](AsyncWebServerRequest *request) {},NULL,
+        [](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) {
+            
+            Log::debug("-------- /json/state ---------");
+            Log::debug("--- Body starts ---");
+            Log::raw("Inbound JSON: ", reinterpret_cast<char*>(data), len);
+            Log::debug("--- Body ends ---");            
+
+            JsonDocument doc;
+            deserializeJson(doc, data, len);
+
+            if (doc["bri"].is<int>())
+            {
+                Volatile::updateBrightness(doc["bri"]);
+                Log::debug("[UNIAPI] BRI: ", Volatile::state.brightness);
+            }
+            else
+            {
+                doc["bri"] = Volatile::state.brightness;
+            }
+
+            if (doc["seg"].is<JsonArray>())
+            {
+                if (JsonArray sg = doc["seg"]; sg.size() > 0 && sg[0].is<JsonObject>()) 
+                {
+                    JsonObject seg = sg[0];
+                
+                    if (seg["on"].is<bool>())
+                    {           
+                        Volatile::updatePowerOn(seg["on"]);
+
+                        seg["id"] = 0;
+                        seg["bri"] = 255;
+                        seg["start"] = 0;
+                        seg["stop"] = Leds::getLedsNumber();
+                        
+                        Log::debug("[UNIAPI] SEG ON: ", Volatile::state.on);
+                    }
+
+                    if (seg["col"].is<JsonArray>())
+                    {
+                        if (JsonArray colors = seg["col"]; colors.size() > 0 && colors[0].is<JsonArray>()) {
+                            if (JsonArray singleColor = colors[0]; singleColor.size() > 2){
+                                Volatile::updateStaticColor(singleColor[0], singleColor[1], singleColor[2]);
+                                Log::debug("[UNIAPI] COLOR: {", Volatile::state.staticColor.red, ", ", Volatile::state.staticColor.green, ", ", Volatile::state.staticColor.blue, "}");
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (doc["on"].is<bool>())
+            {           
+                Volatile::updatePowerOn(doc["on"]);
+
+                JsonArray segArray = doc["seg"].is<JsonArray>() ? doc["seg"].as<JsonArray>() : doc["seg"].to<JsonArray>();
+                JsonObject seg = segArray.size() > 0 ? segArray[0] : segArray.add<JsonObject>();
+                seg["id"] = 0;
+                seg["bri"] = 255;
+                seg["start"] = 0;
+                seg["stop"] = Leds::getLedsNumber();
+                seg["on"] = doc["on"];
+
+                Log::debug("[UNIAPI] ON: ", Volatile::state.on);
+            }
+
+
+            JsonObject udpn = doc["udpn"].to<JsonObject>();
+            udpn["send"] = false;
+            udpn["recv"] = false;
+            JsonObject nl = doc["nl"].to<JsonObject>();
+            nl["on"] = false;            
+            doc["lor"] = 0;
+
+            String response;
+            serializeJson(doc, response);
+            request->send(200, "application/json", response);
+            
+            Log::debug("Outbound response JSON: ", response.c_str());
+    });
+
+    server.on("/json", HTTP_GET, [](AsyncWebServerRequest *request){
+        Log::debug("-------- /json ---------");
+        uniConfigJsonResponse(request);
+    });
+}
+
+void uniConfigJsonResponse(AsyncWebServerRequest *request)
+{
+    const AppConfig& cfg = Config::cfg;
+    char b[sizeof(JSON_TPL)];
+    memcpy_P(b, JSON_TPL, sizeof(JSON_TPL));
+
+    // Current state
+    sWrite(b, P_ON, 6, Volatile::state.on ? "true" : "false");
+    sWrite(b, P_SEGON, 6, Volatile::state.on ? "true" : "false");
+
+    // Brightness/LED count
+    int ledsCount = Leds::getLedsNumber();
+    fWrite(b, P_BRI, 4, Volatile::state.brightness);
+    fWrite(b, P_STOP, 6, ledsCount);
+    fWrite(b, P_CNT, 6, ledsCount);
+
+    // Current colors
+    fWrite(b, P_R, 4, Volatile::state.staticColor.red);
+    fWrite(b, P_G, 4, Volatile::state.staticColor.green);
+    fWrite(b, P_B, 4, Volatile::state.staticColor.blue);
+
+    // Live
+    sWrite(b, P_LIVE, 6, (Volatile::state.live) ? "true" : "false");
+
+    // RGBW capabilities
+    sWrite(b, P_RGBW, 6, (cfg.led.type == LedType::SK6812) ? "true" : "false");
+
+    // Architecture
+    sWrite(b, P_ARCH, 10, getDeviceArch().c_str());
+
+    #if defined(ARDUINO_ARCH_RP2040) || defined(ARDUINO_ARCH_RP2350)
+        uint32_t freeHeap = rp2040.getFreeHeap();
+    #else
+        uint32_t freeHeap = ESP.getFreeHeap();
+    #endif
+    fWrite(b, P_FREEH, 8, freeHeap);
+
+    fWrite(b, P_UP, 12, millis() / 1000);
+
+    int32_t rssiVal = WiFi.RSSI();
+    fWrite(b, P_SIG, 4, (rssiVal <= -100) ? 0 : (rssiVal >= -50) ? 100
+                                                                 : 2 * (rssiVal + 100));
+    fWrite(b, P_CH, 3, WiFi.channel());
+
+    // RSSI
+    fWrite(b, P_RSSI, 6, rssiVal);
+    
+    Log::raw("Outbound JSON: ", b, sizeof(b));
+
+    request->send(200, "application/json", b);
+}
diff --git a/src/utils.cpp b/src/utils.cpp
index b9605a3..95c9cd9 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -39,18 +39,18 @@
 #endif
 
 #include "utils.h"
+#include "logger.h"
 
 void rebootDevice() {
-    Serial.println("\n[UTILS] Critical: Hyperk is rebooting system...");
+    Log::debug("[UTILS] Critical: Hyperk is rebooting system...");
     
     WiFi.disconnect(true);
-    Serial.println("[UTILS] WiFi is closed.");
+    Log::debug("[UTILS] WiFi is closed.");
         
     LittleFS.end(); 
-    Serial.println("[UTILS] File System unmounted.");
+    Log::debug("[UTILS] File System unmounted.");
 
-    Serial.println("[UTILS] Executing Hardware Reset...");
-    Serial.flush();
+    Log::debug("[UTILS] Executing Hardware Reset...");
     delay(200);
 
     #if defined(ARDUINO_ARCH_RP2040) || defined(ARDUINO_ARCH_RP2350)
diff --git a/src/volatile_state.cpp b/src/volatile_state.cpp
new file mode 100644
index 0000000..098d501
--- /dev/null
+++ b/src/volatile_state.cpp
@@ -0,0 +1,72 @@
+/* volatile_state.cpp
+*
+*  MIT License
+*
+*  Copyright (c) 2026 awawa-dev
+*
+*  Project homesite: https://github.com/awawa-dev/Hyperk
+*
+*  Permission is hereby granted, free of charge, to any person obtaining a copy
+*  of this software and associated documentation files (the "Software"), to deal
+*  in the Software without restriction, including without limitation the rights
+*  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+*  copies of the Software, and to permit persons to whom the Software is
+*  furnished to do so, subject to the following conditions:
+*
+*  The above copyright notice and this permission notice shall be included in all
+*  copies or substantial portions of the Software.
+
+*  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+*  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+*  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+*  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+*  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+*  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+*  SOFTWARE.
+*/
+#include "volatile_state.h"
+
+namespace Volatile{
+    static VolatileState internalState;
+    const VolatileState& state = internalState;
+
+    bool updatedBrightness = false;
+    bool updatedPowerOn = false;
+    bool updatedStaticColor = false;
+
+    void updateBrightness(uint8_t  brightness){
+        internalState.brightness = brightness;
+        updatedBrightness = true;
+    };
+
+    void updatePowerOn(bool on){
+        internalState.on = on;
+        updatedPowerOn = true;
+    };
+
+    void updateStaticColor(uint8_t red, uint8_t green, uint8_t blue){
+        internalState.staticColor.red = red;
+        internalState.staticColor.green = green;
+        internalState.staticColor.blue = blue;
+        updatedStaticColor = true;
+    };
+
+    bool clearUpdatedBrightnessState(){
+        bool ret = updatedBrightness;
+        updatedBrightness = false;
+        return ret;
+    };
+
+    bool clearUpdatedPowerOnState(){
+        bool ret = updatedPowerOn;
+        updatedPowerOn = false;
+        return ret;
+    };
+
+    bool clearUpdatedStaticColorState(){
+        bool ret = updatedStaticColor;
+        updatedStaticColor = false;
+        return ret;
+    };
+}
+
diff --git a/src/web_server.cpp b/src/web_server.cpp
index 9b7eb79..426c9e4 100644
--- a/src/web_server.cpp
+++ b/src/web_server.cpp
@@ -41,6 +41,7 @@
 #include "manager.h"
 #include "mdns_service.h"
 #include "web_resources.h"
+#include "uni_json_api.h"
 
 namespace {
     constexpr auto mime_application_json = "application/json";
@@ -50,91 +51,32 @@ namespace {
 
 void setupStaticHandlers(AsyncWebServer& server);
 
-void dummyApi(JsonDocument& doc, bool onlyState)
-{
-    // 1. STATE
-    JsonObject state = onlyState ? doc.to<JsonObject>() : doc["state"].to<JsonObject>();
-    state["on"]  = true;
-    state["bri"] = cfg.led.brightness;
-    state["mainseg"] = 0;
-    state["live"] = true;
-
-    if (onlyState)
-        return;
-
-    // 2. INFO
-    JsonObject info = doc["info"].to<JsonObject>();
-    info["ver"]  = F("0.14.4");
-    info["vid"]  = 2310130;
-    info["leds"]["count"] = getLedsNumber();
-    info["name"] = cfg.deviceName;
-    info["product"] = F(APP_NAME);
-    info["uptime"] = millis() / 1000;
-    info["arch"] = getDeviceArch();
-
-    // 2. WIFI
-    JsonObject wifi = info["wifi"].to<JsonObject>();
-    int32_t rssi = WiFi.RSSI();
-    wifi["rssi"] = rssi;
-    wifi["signal"] = (rssi <= -100) ? 0 : (rssi >= -50) ? 100 : 2 * (rssi + 100);
-    wifi["channel"] = WiFi.channel();        
-
-    // 3. FS
-    size_t totalBytes = 0, usedBytes = 0;
-    #if defined(ESP32)
-        totalBytes = LittleFS.totalBytes();
-        usedBytes = LittleFS.usedBytes();
-    #else
-        FSInfo fs_info;
-        if (LittleFS.info(fs_info)) {
-            totalBytes = fs_info.totalBytes;
-            usedBytes = fs_info.usedBytes;
-        }
-    #endif
-    JsonObject fs = info["fs"].to<JsonObject>();
-    fs["t"] = (totalBytes > 0) ? totalBytes / 1024 : 1024; 
-    fs["u"] = usedBytes / 1024;
-    fs["pmt"] = 0;
-
-    // 4. EFFECTS & PALETTES
-    doc["effects"].add("Solid");
-    doc["palettes"].add("Default");
-}
-
 void setupWebServer(AsyncWebServer& server) {
-    // minimal dummy JSON API for HA discovery and telemetry
-    server.on("/json/state", HTTP_PUT, [](AsyncWebServerRequest *request) {
-        AsyncResponseStream *response = request->beginResponseStream(mime_application_json);
-        JsonDocument doc;
-        dummyApi(doc, true);
-        serializeJson(doc, *response);
-        request->send(response);
-    });
 
-    server.on("/json", HTTP_GET, [](AsyncWebServerRequest *request) {
-        AsyncResponseStream *response = request->beginResponseStream(mime_application_json);
-        JsonDocument doc;
-        dummyApi(doc, false);
-        serializeJson(doc, *response);
-        request->send(response);
-    });
+    setupUniApiJsonHandler(server);
 
     // Scan WiFi
     server.on("/api/wifi_scan", HTTP_GET, [](AsyncWebServerRequest *request) {
+        if (!isAPMode())
+        {
+            request->send(202, mime_application_json, "{\"status\":\"unsupported\"}");
+            return;
+        }
+
         int n = WiFi.scanComplete();
-        Serial.printf("[WiFi Scan] Status: %d\n", n);
+        Log::debug("[WiFi Scan] Status: ", n);
 
         if (n == -1) { // scan in progress
-            Serial.println("[WiFi Scan] Still scanning...");
+            Log::debug("[WiFi Scan] Still scanning...");
             request->send(202, mime_application_json, "{\"status\":\"scanning\"}");
         } 
         else if (n == -2 || (n == 0)) { // restart scan
-            Serial.println("[WiFi Scan] Starting new async scan...");
+            Log::debug("[WiFi Scan] Starting new async scan...");
             WiFi.scanNetworks(true); 
             request->send(202, mime_application_json, "{\"status\":\"started\"}");
         } 
         else if (n > 0) { // scan is completed
-            Serial.printf("[WiFi Scan] Found %d networks. Sending to client.\n", n);
+            Log::debug("[WiFi Scan] Found ", n, " networks. Sending to client.");
             
             AsyncResponseStream *response = request->beginResponseStream(mime_application_json);
             JsonDocument doc;
@@ -162,6 +104,14 @@ void setupWebServer(AsyncWebServer& server) {
     // Save WiFi
     server.on("/save_wifi", HTTP_POST, [](AsyncWebServerRequest *request) {
         if (request->hasParam("ssid", true) && request->hasParam("pass", true)) {
+            if (!isAPMode())
+            {
+                request->send(200, mime_text_html,"Unsupported");
+                return;
+            }
+
+            AppConfig cfg = Config::cfg;
+
             cfg.wifi.ssid = request->getParam("ssid", true)->value();
             cfg.wifi.ssid.trim();
             if (cfg.wifi.ssid == "CUSTOM") {
@@ -173,7 +123,7 @@ void setupWebServer(AsyncWebServer& server) {
                 }
             }
             cfg.wifi.password = request->getParam("pass", true)->value();
-            saveConfig();
+            Config::saveConfig(cfg);
             
             auto newAddress = sanitizeMdnsService(cfg.deviceName);
             AsyncWebServerResponse *response = request->beginResponse(200, mime_text_html, 
@@ -190,13 +140,14 @@ void setupWebServer(AsyncWebServer& server) {
 
             response->addHeader(F("Connection"), F("close"));
             request->send(response);
-            Serial.println("WiFi Config saved. Rebooting in 2s...");
+            Log::debug("WiFi Config saved. Rebooting in 2s...");
             managerScheduleReboot(2000);
         }
     });
 
     // Save settings
     server.on("/save_config", HTTP_POST, [](AsyncWebServerRequest *request) {
+        AppConfig cfg = Config::cfg;
         bool needsRestart = false;
 
         if (request->hasParam("type", true)) {
@@ -262,11 +213,11 @@ void setupWebServer(AsyncWebServer& server) {
             cfg.extraMdnsTag = val;
         }
 
-        saveConfig();
+        Config::saveConfig(cfg);
 
         if (needsRestart) {
             request->send(200, mime_application_json, "{\"status\":\"reboot\"}");
-            Serial.println("Configuration saved. Rebooting in 2s...");
+            Log::debug("Configuration saved. Rebooting in 2s...");
             managerScheduleReboot(2000);
         }
         else {
@@ -278,8 +229,10 @@ void setupWebServer(AsyncWebServer& server) {
     // Current config
     server.on("/api/get_current_config", HTTP_GET, [](AsyncWebServerRequest *request) {        
         AsyncResponseStream *response = request->beginResponseStream(mime_application_json);                
+        const AppConfig& cfg = Config::cfg;
         JsonDocument doc;         
         JsonObject led = doc["config"].to<JsonObject>();
+        led["apMode"]       = isAPMode();
         led["architecture"] = getDeviceArch();
         
         led["type"]         = (int)cfg.led.type;
@@ -305,6 +258,7 @@ void setupWebServer(AsyncWebServer& server) {
     // Internal stats API
     server.on("/api/stats", HTTP_GET, [](AsyncWebServerRequest *request) {
         AsyncResponseStream *response = request->beginResponseStream(mime_application_json);
+        const AppConfig& cfg = Config::cfg;
         JsonDocument doc;
         
         doc["VERSION"] = APP_VERSION;
@@ -323,6 +277,8 @@ void setupWebServer(AsyncWebServer& server) {
 
     // Not found and captivity mode
     server.onNotFound([](AsyncWebServerRequest *request) {
+        Log::debug("404 Not Found: ", request->url());
+
         if (isAPMode() && request->method() == HTTP_GET) {
             request->redirect("/");
         }
diff --git a/version b/version
index 3fc3728..4450b18 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.0.1-alpha.2
+0.0.1-alpha.3