From fe594fd93d7904c637ac91415add11c59207f433 Mon Sep 17 00:00:00 2001
From: Awawa <69086569+awawa-dev@users.noreply.github.com>
Date: Sun, 15 Feb 2026 11:09:41 +0100
Subject: [PATCH 1/5] Switch modern S3/C3/C6 to FastLED & Core3

---
 .github/FUNDING.yml         |  1 +
 .github/dependabot.yml      |  8 +++++
 .github/workflows/build.yml | 18 +++++++----
 .gitignore                  |  1 +
 .vscode/tasks.json          | 58 +++++++++++++++++++++++++++++++++
 data/settings.html          |  2 +-
 partitions.csv              | 11 -------
 partitions_4mb.csv          |  6 ++++
 partitions_8mb.csv          |  7 ----
 platformio.ini              | 51 +++++++++++++----------------
 scripts/collect_firmware.py | 64 +++++++++++++++++++++++++++++--------
 src/leds.cpp                | 31 ++++++++++++------
 12 files changed, 181 insertions(+), 77 deletions(-)
 create mode 100644 .github/FUNDING.yml
 create mode 100644 .github/dependabot.yml
 create mode 100644 .vscode/tasks.json
 delete mode 100644 partitions.csv
 create mode 100644 partitions_4mb.csv
 delete mode 100644 partitions_8mb.csv

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..7743b06
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: awawa-dev
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..71e9068
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every month
+      interval: "monthly"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 96b7201..9cc1bbc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,7 +2,6 @@ name: PlatformIO Build All
 
 on:
   push:
-    branches: [ master ]
   workflow_dispatch:
 
 jobs:
@@ -18,17 +17,24 @@ jobs:
         with:
           python-version: '3.12'
 
+      - name: Build cache
+        uses: actions/cache@v5
+        with:
+          key: ${{ runner.os }}-platformio-${{ hashFiles('**/platformio.ini') }}
+          path: |
+            ~/.platformio
+            .pio
+
       - name: Install PlatformIO
         run: |
           python -m pip install --upgrade pip
           pip install --upgrade platformio
 
-      - name: Build All Environments (except ESP32-C6)
-        run: pio run
-
-      - name: Build ESP32-C6
+      - name: Build All Environments
         run: |
-          pio run -e esp32c6
+          pio run -e esp32c3 -e esp32s3 -e esp32c6
+          pio run -e esp32 -e esp32s2 -e esp8266          
+          pio run -e pico -e pico2
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v6
diff --git a/.gitignore b/.gitignore
index c9c9d8a..b6aa784 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,6 @@
 .vscode/extensions.json
 .vscode/settings.json
 src/idf_component.yml
+src/idf_component.yml.orig
 include/web_resources.h
 release/
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000..ec129dc
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,58 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Build ESP Core 2.x",
+      "type": "shell",
+      "command": "pio run -e esp32 -e esp32s2 -e esp8266",
+      "problemMatcher": [],
+      "presentation": { "reveal": "always", "panel": "shared" },
+      "options": {
+        "env": {
+          "PATH": "${userHome}/.platformio/penv/Scripts;${userHome}/.platformio/penv;${env:PATH}",
+          "PYTHONPATH": ""
+        }
+      }
+    },
+    {
+      "label": "Build ESP Core 3.x",
+      "type": "shell",
+      "command": "pio run -e esp32c3 -e esp32s3 -e esp32c6",
+      "problemMatcher": [],
+      "presentation": { "reveal": "always", "panel": "shared" },
+      "options": {
+        "env": {
+          "PATH": "${userHome}/.platformio/penv/Scripts;${userHome}/.platformio/penv;${env:PATH}",
+          "PYTHONPATH": ""
+        }
+      }
+    },
+    {
+      "label": "Build RP2040",
+      "type": "shell",
+      "command": "pio run -e pico -e pico2",
+      "problemMatcher": [],
+      "presentation": { "reveal": "always", "panel": "shared" },
+      "options": {
+        "env": {
+          "PATH": "${userHome}/.platformio/penv/Scripts;${userHome}/.platformio/penv;${env:PATH}",
+          "PYTHONPATH": ""
+        }
+      }
+    },
+    {
+      "label": "Build ALL",
+      "dependsOn": [
+        "Build ESP Core 3.x",
+        "Build ESP Core 2.x",        
+        "Build RP2040"
+      ],
+      "dependsOrder": "sequence",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "presentation": { "reveal": "always", "panel": "shared" }
+    }
+  ]
+}
diff --git a/data/settings.html b/data/settings.html
index 28d5fea..e397fed 100644
--- a/data/settings.html
+++ b/data/settings.html
@@ -73,7 +73,7 @@ <h5>White channel calibration</h5>
         </div>
 
         <label>Data Pin (GPIO)
-          <input type="number" name="dataPin" min="0" max="39" value="2" required>
+          <input type="number" name="dataPin" min="0" max="48" value="2" required>
         </label>
 
         <label>Clock Pin (only for SPI LEDs)
diff --git a/partitions.csv b/partitions.csv
deleted file mode 100644
index 0e73c18..0000000
--- a/partitions.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# Name,   Type, SubType, Offset,  Size, Flags
-# Standard partitions for NVS and OTA data
-nvs,      data, nvs,     ,        0x5000,
-otadata,  data, ota,     ,        0x2000,
-# App partitions - increased to 1.72MB each
-app0,     app,  ota_0,   ,        0x1B0000,
-app1,     app,  ota_1,   ,        0x1B0000,
-# Changed subtype to spiffs to match name and silence the warning
-spiffs,   data, spiffs,  ,        0x40000,
-# Reserved for core dumps
-coredump, data, coredump,,        0x10000,
\ No newline at end of file
diff --git a/partitions_4mb.csv b/partitions_4mb.csv
new file mode 100644
index 0000000..d1c2fb9
--- /dev/null
+++ b/partitions_4mb.csv
@@ -0,0 +1,6 @@
+# Name,   Type, SubType,  Offset,   Size,     Flags
+nvs,      data, nvs,      0x9000,   0x5000,
+otadata,  data, ota,      0xE000,   0x2000,
+app0,     app,  ota_0,    0x10000,  0x1D0000,
+app1,     app,  ota_1,    0x1E0000, 0x1D0000,
+spiffs,   data, spiffs,   0x3B0000, 0x50000,
\ No newline at end of file
diff --git a/partitions_8mb.csv b/partitions_8mb.csv
deleted file mode 100644
index af9df4b..0000000
--- a/partitions_8mb.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-# Name,   Type, SubType, Offset,  Size, Flags
-nvs,      data, nvs,     ,        0x5000,
-otadata,  data, ota,     ,        0x2000,
-app0,     app,  ota_0,   ,        0x300000,
-app1,     app,  ota_1,   ,        0x300000,
-spiffs,   data, spiffs,  ,        0x100000,
-coredump, data, coredump, ,        0x10000,
\ No newline at end of file
diff --git a/platformio.ini b/platformio.ini
index b539afa..dc71caf 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -13,58 +13,48 @@ custom_max_leds = 2000
 lib_deps =
     esp32async/ESPAsyncWebServer @ 3.9.6
     bblanchon/ArduinoJson @ 7.4.0
-    makuna/NeoPixelBus @ 2.8.4
 
 build_flags =
     -DAPP_NAME=\"Hyperk\"
 
 ; ==================================================
-; Build all configuration
-; ==================================================
-
-[platformio]
-default_envs = esp32, esp32s2, esp32s3, esp32c3, pico, pico2, esp8266
-
-; ==================================================
-; ESP32
+; ESP32, S2 (Core 2.x, NeoPixelBus)
 ; ==================================================
 
 [env:esp32]
 platform = espressif32 @ 6.7.0
 board = esp32dev
-board_build.partitions = partitions.csv
+board_build.partitions = partitions_4mb.csv
 board_build.filesystem = littlefs
+framework = arduino
 
 lib_deps =
     ${env.lib_deps}
+     makuna/NeoPixelBus @ 2.8.4
 
 build_flags =
     ${env.build_flags}
     -DMAX_LEDS=${env.custom_max_leds}
 
-; ==================================================
-; ESP32-S2, S3, C3, C6 (esp32 is shared)
-; ==================================================
-
 [env:esp32s2]
 extends = env:esp32
 board = esp32-s2-saola-1
 
-[env:esp32s3]
-extends = env:esp32
-board = esp32-s3-devkitc-1
+; ==================================================
+; ESP32-S3, C3, C6 (Core 3.x, FastLED)
+; ==================================================
 
 [env:esp32c3]
-extends = env:esp32
-board = esp32-c3-devkitm-1
-
-[env:esp32c6]
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.37/platform-espressif32.zip
-board = esp32-c6-devkitc-1
-board_build.partitions = partitions_8mb.csv
+board = esp32-c3-devkitm-1
+board_build.partitions = partitions_4mb.csv
 board_build.filesystem = littlefs
 framework = arduino
 
+lib_deps =
+    ${env.lib_deps}
+    fastled/FastLED @ 3.10.3
+
 extra_scripts = 
     ${env.extra_scripts}
 
@@ -74,11 +64,14 @@ build_flags =
     -DUSE_FASTLED
     -DFASTLED_RMT_MAX_CHANNELS=1
 
-lib_deps =
-    ${env.lib_deps}
-    fastled/FastLED @ 3.10.3
-    
-lib_ignore = NeoPixelBus
+[env:esp32s3]
+extends = env:esp32c3
+board = esp32-s3-devkitc-1
+
+[env:esp32c6]
+extends = env:esp32c3
+board = esp32-c6-devkitc-1
+
 ; ==================================================
 ; ESP8266
 ; ==================================================
@@ -91,6 +84,7 @@ board_build.ldscript = eagle.flash.4m1m.ld
 
 lib_deps = 
     ${env.lib_deps}
+     makuna/NeoPixelBus @ 2.8.4
 
 build_flags = 
     ${env.build_flags}
@@ -110,6 +104,7 @@ board_build.filesystem_size = 0.5m
 
 lib_deps =
     ${env.lib_deps}
+     makuna/NeoPixelBus @ 2.8.4
 
 build_flags =
     ${env.build_flags}
diff --git a/scripts/collect_firmware.py b/scripts/collect_firmware.py
index 258aa2b..83a1cbf 100644
--- a/scripts/collect_firmware.py
+++ b/scripts/collect_firmware.py
@@ -1,10 +1,34 @@
 import os
 import shutil
 import re
+import subprocess
 from os.path import exists
 
 Import("env")
 
+def run_merge_bin(mcu, factory_path, boot_addr, bootloader, partitions, source_path, env):
+    new_syntax_mcus = ["esp32c3", "esp32c6", "esp32h2"]
+    use_new = mcu in new_syntax_mcus
+
+    cmd_name = "merge-bin" if use_new else "merge_bin"
+    f_mode_flag = "--flash-mode" if use_new else "--flash_mode"
+    f_size_flag = "--flash-size" if use_new else "--flash_size"
+
+    cmd = [
+        env.subst("$PYTHONEXE"), "-m", "esptool",
+        "--chip", mcu,
+        cmd_name,
+        "-o", factory_path,
+        f_mode_flag, env.get("BOARD_FLASH_MODE", "dio"),
+        f_size_flag, env.get("BOARD_FLASH_SIZE", "4MB"),
+        boot_addr, bootloader,
+        "0x8000", partitions,
+        "0x10000", source_path
+    ]
+    
+    print(f">>> [EXEC] Using {'NEW' if use_new else 'OLD'} esptool syntax for {mcu}")
+    subprocess.run(cmd, check=True)
+
 def copy_firmware(target, source, env):
     env_name = env.get("PIOENV")
     app_version = "unknown"
@@ -18,24 +42,36 @@ def copy_firmware(target, source, env):
 
     project_dir = env.get("PROJECT_DIR")
     dist_dir = os.path.join(project_dir, "release")
-    
     if not os.path.exists(dist_dir):
         os.makedirs(dist_dir)
 
+    build_dir = env.subst("$BUILD_DIR")
+    is_pico = "pico" in env_name
+    ext = ".uf2" if is_pico else ".bin"
+    source_path = os.path.join(build_dir, env.subst("${PROGNAME}") + ext)
 
-    exts = [".uf2"] if "pico" in env_name else [".bin"]
-    base_path = env.subst("$BUILD_DIR/${PROGNAME}")
+    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}")
 
-    for ext in exts:
-        source_path = base_path + ext
-        
-        if os.path.exists(source_path):
-            dest_name = f"Hyperk_{app_version}_{env_name}{ext}"
-            dest_path = os.path.join(dist_dir, dest_name)
-            
-            print(f">>> [COPY] {os.path.basename(source_path)} -> {dest_path}")
-            shutil.copy2(source_path, dest_path)
-        else:
-            print(f">>> [ERROR] File not found: {source_path}")
+        # 2. Factory Merge
+        if ext == ".bin" and "esp" 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 = "0x0" if mcu in ["esp32s2", "esp32s3", "esp32c3", "esp32c6"] else "0x1000"
+                factory_path = os.path.join(dist_dir, f"Hyperk_{app_version}_{env_name}_factory_flash_at_{boot_addr}.bin")
+                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}")
+    else:
+        print(f">>> [ERROR] File not found: {source_path}")
+
 env.AddPostAction("buildprog", copy_firmware)
\ No newline at end of file
diff --git a/src/leds.cpp b/src/leds.cpp
index 112312d..826e5c4 100644
--- a/src/leds.cpp
+++ b/src/leds.cpp
@@ -178,26 +178,37 @@ void initLEDs(LedType cfgLedType, uint16_t cfgLedNumLeds, uint8_t cfgLedDataPin,
                 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 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 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 48: FastLED.addLeds<WS2812, 48, GRB>(leds, virtualLedsNumber); break;
+                #endif
                 default:
                     FastLED.addLeds<WS2812, 2, GRB>(leds, virtualLedsNumber);
                     break;
             }
         }
         else
-        { // SPI (APA102 / SK9822)            
+        { // SPI (APA102 / SK9822)
             switch (cfgLedDataPin) {
-                case 6:  FastLED.addLeds<APA102, 6, 7, BGR>(leds, virtualLedsNumber); break;
-                case 18: FastLED.addLeds<APA102, 18, 19, BGR>(leds, virtualLedsNumber); break;
-                case 0:  FastLED.addLeds<APA102, 0, 1, BGR>(leds, virtualLedsNumber); break;
-                case 4:  FastLED.addLeds<APA102, 4, 5, BGR>(leds, virtualLedsNumber); break;
-                default:
-                    FastLED.addLeds<APA102, 6, 7, BGR>(leds, virtualLedsNumber); 
-                    break;
+                #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);
             }
         }
     #else

From 9830f23f47dc7d39948969106c7ed095c32eebc5 Mon Sep 17 00:00:00 2001
From: Awawa <69086569+awawa-dev@users.noreply.github.com>
Date: Sun, 15 Feb 2026 20:44:57 +0100
Subject: [PATCH 2/5] Dont use Github Action cache

---
 .github/workflows/build.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9cc1bbc..39857b6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,14 +17,6 @@ jobs:
         with:
           python-version: '3.12'
 
-      - name: Build cache
-        uses: actions/cache@v5
-        with:
-          key: ${{ runner.os }}-platformio-${{ hashFiles('**/platformio.ini') }}
-          path: |
-            ~/.platformio
-            .pio
-
       - name: Install PlatformIO
         run: |
           python -m pip install --upgrade pip

From e51fdb5df27e7158f48bca08dc44ee68be8059f6 Mon Sep 17 00:00:00 2001
From: Awawa <69086569+awawa-dev@users.noreply.github.com>
Date: Sun, 15 Feb 2026 20:57:21 +0100
Subject: [PATCH 3/5] Install esptool

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 39857b6..6fd122e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Install PlatformIO
         run: |
           python -m pip install --upgrade pip
-          pip install --upgrade platformio
+          pip install --upgrade platformio esptool
 
       - name: Build All Environments
         run: |

From d2e8ee0bce7e1c100230625ee3134a4ee6df0bf3 Mon Sep 17 00:00:00 2001
From: Awawa <69086569+awawa-dev@users.noreply.github.com>
Date: Sun, 15 Feb 2026 21:30:41 +0100
Subject: [PATCH 4/5] Additional full factory firmware

---
 scripts/collect_firmware.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/scripts/collect_firmware.py b/scripts/collect_firmware.py
index 83a1cbf..8109c1d 100644
--- a/scripts/collect_firmware.py
+++ b/scripts/collect_firmware.py
@@ -7,12 +7,9 @@
 Import("env")
 
 def run_merge_bin(mcu, factory_path, boot_addr, bootloader, partitions, source_path, env):
-    new_syntax_mcus = ["esp32c3", "esp32c6", "esp32h2"]
-    use_new = mcu in new_syntax_mcus
-
-    cmd_name = "merge-bin" if use_new else "merge_bin"
-    f_mode_flag = "--flash-mode" if use_new else "--flash_mode"
-    f_size_flag = "--flash-size" if use_new else "--flash_size"
+    cmd_name = "merge_bin"
+    f_mode_flag = "--flash_mode"
+    f_size_flag = "--flash_size"
 
     cmd = [
         env.subst("$PYTHONEXE"), "-m", "esptool",
@@ -26,7 +23,6 @@ def run_merge_bin(mcu, factory_path, boot_addr, bootloader, partitions, source_p
         "0x10000", source_path
     ]
     
-    print(f">>> [EXEC] Using {'NEW' if use_new else 'OLD'} esptool syntax for {mcu}")
     subprocess.run(cmd, check=True)
 
 def copy_firmware(target, source, env):
@@ -64,8 +60,8 @@ def copy_firmware(target, source, env):
             
             if os.path.exists(bootloader) and os.path.exists(partitions):
                 mcu = env.get("BOARD_MCU", "esp32")
-                boot_addr = "0x0" if mcu in ["esp32s2", "esp32s3", "esp32c3", "esp32c6"] else "0x1000"
-                factory_path = os.path.join(dist_dir, f"Hyperk_{app_version}_{env_name}_factory_flash_at_{boot_addr}.bin")
+                boot_addr = "0x1000" if mcu == "esp32" else "0x0"
+                factory_path = os.path.join(dist_dir, f"Hyperk_{app_version}_{env_name}_factory_flash.bin")
                 try:
                     run_merge_bin(mcu, factory_path, boot_addr, bootloader, partitions, source_path, env)
                     print(f">>> [SUCCESS] Factory image: {os.path.basename(factory_path)}")

From b8378b6f0e0f60384360e26592db4964c6a5e7e1 Mon Sep 17 00:00:00 2001
From: Awawa <69086569+awawa-dev@users.noreply.github.com>
Date: Sun, 15 Feb 2026 21:36:12 +0100
Subject: [PATCH 5/5] Update version

---
 data/{ => css}/settings.css |   0
 data/css/style.css          |  15 +++++++++++++++
 data/img/hyperk.png         | Bin 0 -> 591 bytes
 data/index.html             |   4 +++-
 data/settings.html          |   5 +++--
 data/stats.html             |  14 ++++++++------
 data/style.css              |  15 ---------------
 scripts/collect_firmware.py |   1 +
 src/web_server.cpp          |   3 ++-
 version                     |   2 +-
 10 files changed, 33 insertions(+), 26 deletions(-)
 rename data/{ => css}/settings.css (100%)
 create mode 100644 data/css/style.css
 create mode 100644 data/img/hyperk.png
 delete mode 100644 data/style.css

diff --git a/data/settings.css b/data/css/settings.css
similarity index 100%
rename from data/settings.css
rename to data/css/settings.css
diff --git a/data/css/style.css b/data/css/style.css
new file mode 100644
index 0000000..3a1fd47
--- /dev/null
+++ b/data/css/style.css
@@ -0,0 +1,15 @@
+.logo-h {
+  display: inline-block;
+  width: 24px;
+  height: 24px;
+  background: url("/img/hyperk.png") no-repeat center;
+  background-size: contain;
+  vertical-align: middle;
+}
+
+.yperk {
+  color: #E78080;
+}
+.perk {
+  color: #E70000;
+}
diff --git a/data/img/hyperk.png b/data/img/hyperk.png
new file mode 100644
index 0000000000000000000000000000000000000000..38c79802c4f3014919337c3cb35ec47a97a10570
GIT binary patch
literal 591
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyD*}8%T!D0MZf+hJVKPACc~IHB
zyu2JR$jt>&K#eaL8Ky8W>}O;GYTU@kB*MUumX>ytk?}esV^UI5N=iy_aIl}BpQD4r
z0S2a5j0`&&8Qol61qB69GcuW&m>3!uJYr-#$;cSMz+lP1AjZIOi;?jnBjXxI#tDoJ
z?(Xga{QN5znfe$R#Tgi!e!KVptrRW^@(X52{d&^DQdp4d$NiF|jt&s{xsj`ofq~K4
z)5S5w;&kien`KP~0uIXEn>xJNWqSlBDCuo^m;3+!c_|jd;scLs=T=XOoO$ZN3(p?L
z*GufL3c8ALy4-!c{m``KA5*x?w{c##={|P0GotZOm-RBK{}RV71wP%7(<+Q{?lv`R
zv&?&RWW($DHJ&_kkN8bpsh+2>^UdZDf7lBw+HcmeO_Kip?rV1FKjV5iHueVB4Rd~P
zUM05n&GC=}&JjY6hhjBfbSmkrnDAoL{~gWN)A<tHnbQ;;COdyqJvonQ!NICP<s}RM
zM;6s^Epl%u2`&nX>sVo+Z{`}v;*wGSko^lcv#8?lX)GouH=SA5wdss=LC9&9Uas9z
zM`J!lJ<yX3i{ei7YCGy?v;KIk)$~K>HE;iKQhB~OD{+oF_hFykzp|cYwN=z^+|rv^
zzHV>R%Mafk3akk{{xa~_y1o;OJ1#%2t^W6al8AF#iuR5*z|dy!boFyt=akR{0LyXg
Avj6}9

literal 0
HcmV?d00001

diff --git a/data/index.html b/data/index.html
index deb7dd1..73f6cf5 100644
--- a/data/index.html
+++ b/data/index.html
@@ -5,7 +5,9 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Hyperk</title>
   <link rel="stylesheet" href="/css/pico.min.css?v=1">
-  <link rel="stylesheet" href="/style.css?v=1">
+  <link rel="stylesheet" href="/css/style.css?v=1">
+  <link rel="stylesheet" href="/css/settings.css?v=1">
+  <link id="favicon" rel="icon" type="image/png" href="/img/hyperk.png?v=1">
 </head>
 <body>
   <nav class="container-fluid">
diff --git a/data/settings.html b/data/settings.html
index e397fed..000bc94 100644
--- a/data/settings.html
+++ b/data/settings.html
@@ -5,8 +5,9 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Settings - Hyperk</title>
   <link rel="stylesheet" href="/css/pico.min.css?v=1">
-  <link rel="stylesheet" href="/style.css?v=1">
-  <link rel="stylesheet" href="/settings.css?v=1">
+  <link rel="stylesheet" href="/css/style.css?v=1">
+  <link rel="stylesheet" href="/css/settings.css?v=1">
+  <link id="favicon" rel="icon" type="image/png" href="/img/hyperk.png?v=1">
 </head>
 <body>
 
diff --git a/data/stats.html b/data/stats.html
index 8620c7e..d1e6d96 100644
--- a/data/stats.html
+++ b/data/stats.html
@@ -5,7 +5,9 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Stats - Hyperk</title>
   <link rel="stylesheet" href="/css/pico.min.css?v=1">
-  <link rel="stylesheet" href="/style.css?v=1">
+  <link rel="stylesheet" href="/css/style.css?v=1">
+  <link rel="stylesheet" href="/css/settings.css?v=1">
+  <link id="favicon" rel="icon" type="image/png" href="/img/hyperk.png?v=1">
 </head>
 <body>
   <nav class="container-fluid">
@@ -23,12 +25,11 @@
 
   <main class="container">
     <h1>System Statistics</h1>
-
+    <hr>
     <table>
-      <thead>
-        <tr><th>Parameter</th><th>Value</th></tr>
-      </thead>
+      <thead></thead>
       <tbody>
+        <tr><td>Version</td><td id="stat-version">Loading...</td></tr>
         <tr><td>Device Name</td><td id="stat-device">Loading...</td></tr>
         <tr><td>IP Address</td><td id="stat-ip">Loading...</td></tr>
         <tr><td>Signal Strength</td><td id="stat-rssi">Loading...</td></tr>
@@ -52,7 +53,8 @@ <h1>System Statistics</h1>
               let h = Math.floor(t / 3600), m = Math.floor(t / 60) % 60, s = t % 60;
               let uptime = h > 0 ? `${h}:${String(m).padStart(2, '0')}:${String(s).padStart(2, '0')}` :
                             m > 0 ? `${m}:${String(s).padStart(2, '0')}` : `${s}s`;
-              document.getElementById('stat-device').innerText = data.DEVICE;
+              document.getElementById('stat-version').innerText = data.VERSION;
+              document.getElementById('stat-device').innerText = data.DEVICE;              
               document.getElementById('stat-ip').innerText = data.IP;              
               document.getElementById('stat-rssi').innerText = data.RSSI;                                      
               document.getElementById('stat-uptime').innerText = uptime;
diff --git a/data/style.css b/data/style.css
deleted file mode 100644
index 96b3eac..0000000
--- a/data/style.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.logo-h {
-  display: inline-block;
-  width: 24px;
-  height: 24px;
-  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAAqFBMVEUAAABtbW1ubW1ubW1tbW1ubW1ubW1tbW1ubW1ubW1ubW1ubm1ubW1ubW1ubm5sbGxsbGxtbWxsbGwAAADoAQCUAAC/AQJtbW2xAQIUAABmZmbZAQHXAQFiYmJkZGRTU1NOTk5BQEDAAALqAQC5AQFGRUURERHLAQI0NDQxMDDiAQHJAQFQAAA5AAAWAADaAQHRAQGsAQGQAQBHR0cQDw+oAQKOAQEXAABC+0RMAAAAE3RSTlMAZfXJQDkTEQr433RiiIj433Ri84EKcQAAAUNJREFUOMuFk9l2gjAQQCOLsohLBx2MEJAiLrTubf//zxoEMXPA432de5JZmcrA6EmMAeukP9URRRQJRN3tt8KWp/FkC3e2Cdc8i8bNiViBwoo7phr/GMc5EPLYHipxXEOLNTaGOW7ixLDrX6xJDJ3ETpWpJ24gueyz8PwHcDiH2X4Gkhv37vVrVf4zfx4GB4BFsJz7s6oWrezHVMBDWBJBwl0p6IkiLKiQ6LL/uIM7lw5hhwNmIECTQ/YlyZ4CoMF6USOkof9ZcnwKokeEdFNyUl6IqDAvNkVRBERof+EH9AsDFSH7lgQ0ybLMpoqyzENwVMskjQq7GsVc8VrgLhlWWgthSobFRjyvx306l8LPKdv/giTno2phnDcLw0z7+mrlaoZ4fbG0jWF3rr2C6fD24RCsUcfpUfqujsijiNPjfXv+/5IUQ4ZkK7isAAAAAElFTkSuQmCC") no-repeat center;
-  background-size: contain;
-  vertical-align: middle;
-}
-
-.yperk {
-  color: #E78080;
-}
-.perk {
-  color: #E70000;
-}
\ No newline at end of file
diff --git a/scripts/collect_firmware.py b/scripts/collect_firmware.py
index 8109c1d..51e8a4f 100644
--- a/scripts/collect_firmware.py
+++ b/scripts/collect_firmware.py
@@ -67,6 +67,7 @@ def copy_firmware(target, source, 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:
         print(f">>> [ERROR] File not found: {source_path}")
 
diff --git a/src/web_server.cpp b/src/web_server.cpp
index 4218c28..e1f80b5 100644
--- a/src/web_server.cpp
+++ b/src/web_server.cpp
@@ -305,6 +305,7 @@ void setupWebServer(AsyncWebServer& server) {
         AsyncResponseStream *response = request->beginResponseStream(mime_application_json);
         JsonDocument doc;
         
+        doc["VERSION"] = APP_VERSION;
         doc["DEVICE"] = cfg.deviceName;
         doc["IP"]     = WiFi.localIP().toString();
         doc["RSSI"]   = String(WiFi.RSSI()) + " dBm";
@@ -342,7 +343,7 @@ void sendEmbeddedFile(AsyncWebServerRequest *request, const uint8_t* content, ui
     {
         response->addHeader(F("Content-Encoding"), F("gzip"));
         response->addHeader(F("Connection"), F("close"));
-        if (strcmp(contentType, "text/css") == 0) 
+        if (strcmp(contentType, "text/css") == 0 || strcmp(contentType, "image/png") == 0) 
         {
             response->addHeader(F("Cache-Control"), F("public, max-age=31536000"));
         }
diff --git a/version b/version
index 457ec10..3fc3728 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.0.1-alpha.1
+0.0.1-alpha.2