diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml
index fe3f995d1..2bfc5d806 100644
--- a/.github/workflows/Tasmota_build_devel.yml
+++ b/.github/workflows/Tasmota_build_devel.yml
@@ -9,1318 +9,74 @@ on:
     - '**.md' # Do no build if *.md files changes
 
 jobs:
-
-  tasmota:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-minimal:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-minimal
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-lite:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-lite
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-knx:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-knx
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-sensors:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-sensors
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-display:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-display
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-ir:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-ir
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-zbbridge:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-zbbridge
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-zigbee:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-zigbee
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-AF:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-AF
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-BG:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-BG
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-BR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-BR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-CN:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-CN
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-CZ:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-CZ
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-DE:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-DE
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-ES:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-ES
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-FR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-FR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-FY:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-FY
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-GR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-GR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-HE:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-HE
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-HU:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-HU
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-IT:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-IT
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-KO:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-KO
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-NL:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-NL
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-PL:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-PL
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-PT:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-PT
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-RO:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-RO
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-RU:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-RU
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-SE:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-SE
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-SK:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-SK
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-TR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-TR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-TW:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-TW
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-UK:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-UK
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-VN:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-VN
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32solo1:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32solo1
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-webcam:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-webcam
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-odroidgo:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-odroidgo
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-core2:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-core2
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-bluetooth:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-bluetooth
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-display:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-display
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-lvgl:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-lvgl
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-ir:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-ir
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-  tasmota32c3:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32c3
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-  tasmota32-AF:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-AF
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-BG:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-BG
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-BR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-BR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-CN:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-CN
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-CZ:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-CZ
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-DE:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-DE
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-ES:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-ES
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-FR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-FR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-FY:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-FY
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-GR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-GR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-HE:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-HE
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-HU:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-HU
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-IT:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-IT
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-KO:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-KO
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-NL:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-NL
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-PL:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-PL
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-PT:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-PT
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-RO:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-RO
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-RU:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-RU
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-SE:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-SE
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-SK:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-SK
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-TR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-TR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-TW:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-TW
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-UK:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-UK
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-VN:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-VN
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
+  base-images:
+    runs-on: ubuntu-latest
+    if: github.repository == 'arendst/Tasmota'
+    continue-on-error: true
+    strategy:
+      matrix:
+        variant:
+          - tasmota
+          - tasmota-minimal
+          - tasmota-display
+          - tasmota-ir
+          - tasmota-knx
+          - tasmota-lite
+          - tasmota-sensors
+          - tasmota-zbbridge
+          - tasmota-zigbee
+          - tasmota32
+          - tasmota32-webcam
+          - tasmota32-bluetooth
+          - tasmota32-core2
+          - tasmota32-display
+          - tasmota32-ir
+          - tasmota32-lvgl
+          - tasmota32-odroidgo
+          - tasmota32c3
+          - tasmota32solo1
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: development
+      - name: Set up Python
+        uses: actions/setup-python@v1
+      - name: Install dependencies
+        run: |
+          pip install -U platformio
+      - name: Run PlatformIO
+        run: platformio run -e ${{ matrix.variant }}
+      - uses: actions/upload-artifact@v2
+        with:
+          name: firmware
+          path: ./build_output
+
+  language-images:
+    runs-on: ubuntu-latest
+    if: github.repository == 'arendst/Tasmota'
+    continue-on-error: true
+    strategy:
+      matrix:
+        variant: [ tasmota, tasmota32 ]
+        language: [ AF, BG, BR, CN, CZ, DE, ES, FR, FY, GR, HE, HU, IT, KO, NL, PL, PT, RO, RU, SE, SK, TR, TW, UK, VN ]
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: development
+      - name: Set up Python
+        uses: actions/setup-python@v1
+      - name: Install dependencies
+        run: |
+          pip install -U platformio
+      - name: Run PlatformIO
+        run: platformio run -e ${{ matrix.variant }}-${{ matrix.language }}
+      - uses: actions/upload-artifact@v2
+        with:
+          name: firmware
+          path: ./build_output
 
   Upload:
-    needs: [tasmota-VN, tasmota32-VN, tasmota32-TW, tasmota32-TR]
+    needs: [base-images, language-images]
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml
index 4639fde5e..9ca6e1f6c 100644
--- a/.github/workflows/Tasmota_build_master.yml
+++ b/.github/workflows/Tasmota_build_master.yml
@@ -5,1320 +5,77 @@ on:
     branches: master
     paths-ignore:
     - '.github/**' # Ignore changes towards the .github directory
+    - '**.md' # Do no build if *.md files changes
 
 jobs:
-
-  tasmota:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-minimal:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-minimal
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-lite:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-lite
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-knx:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-knx
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-sensors:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-sensors
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-display:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-display
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-ir:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-ir
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-zbbridge:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-zbbridge
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-zigbee:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-zigbee
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-AF:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-AF
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-BG:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-BG
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-BR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-BR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-CN:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-CN
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-CZ:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-CZ
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-DE:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-DE
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-ES:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-ES
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-FR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-FR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-FY:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-FY
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-GR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-GR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-HE:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-HE
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-HU:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-HU
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-IT:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-IT
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-KO:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-KO
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-NL:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-NL
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-PL:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-PL
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-PT:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-PT
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-RO:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-RO
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-RU:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-RU
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-SE:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-SE
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-SK:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-SK
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-TR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-TR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-TW:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-TW
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-UK:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-UK
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-VN:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-VN
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32solo1:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32solo1
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-webcam:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-webcam
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-odroidgo:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-odroidgo
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-core2:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-core2
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-bluetooth:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-bluetooth
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-display:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-display
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-lvgl:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-lvgl
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-ir:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-ir
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-  tasmota32c3:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32c3
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-  tasmota32-AF:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-AF
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-BG:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-BG
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-BR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-BR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-CN:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-CN
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-CZ:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-CZ
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-DE:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-DE
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-ES:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-ES
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-FR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-FR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-FY:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-FY
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-GR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-GR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-HE:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-HE
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-HU:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-HU
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-IT:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-IT
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-KO:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-KO
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-NL:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-NL
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-PL:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-PL
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-PT:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-PT
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-RO:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-RO
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-RU:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-RU
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-SE:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-SE
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-SK:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-SK
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-TR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-TR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-TW:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-TW
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-UK:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-UK
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-VN:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-VN
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
+  base-images:
+    runs-on: ubuntu-latest
+    if: github.repository == 'arendst/Tasmota'
+    continue-on-error: true
+    strategy:
+      matrix:
+        variant:
+          - tasmota
+          - tasmota-minimal
+          - tasmota-display
+          - tasmota-ir
+          - tasmota-knx
+          - tasmota-lite
+          - tasmota-sensors
+          - tasmota-zbbridge
+          - tasmota-zigbee
+          - tasmota32
+          - tasmota32-webcam
+          - tasmota32-bluetooth
+          - tasmota32-core2
+          - tasmota32-display
+          - tasmota32-ir
+          - tasmota32-lvgl
+          - tasmota32-odroidgo
+          - tasmota32c3
+          - tasmota32solo1
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: master
+      - name: Set up Python
+        uses: actions/setup-python@v1
+      - name: Install dependencies
+        run: |
+          pip install -U platformio
+      - name: Run PlatformIO
+        run: platformio run -e ${{ matrix.variant }}
+      - uses: actions/upload-artifact@v2
+        with:
+          name: firmware
+          path: ./build_output
+
+  language-images:
+    runs-on: ubuntu-latest
+    if: github.repository == 'arendst/Tasmota'
+    continue-on-error: true
+    strategy:
+      matrix:
+        variant: [ tasmota, tasmota32 ]
+        language: [ AF, BG, BR, CN, CZ, DE, ES, FR, FY, GR, HE, HU, IT, KO, NL, PL, PT, RO, RU, SE, SK, TR, TW, UK, VN ]
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: master
+      - name: Set up Python
+        uses: actions/setup-python@v1
+      - name: Install dependencies
+        run: |
+          pip install -U platformio
+      - name: Run PlatformIO
+        run: platformio run -e ${{ matrix.variant }}-${{ matrix.language }}
+      - uses: actions/upload-artifact@v2
+        with:
+          name: firmware
+          path: ./build_output
 
   Upload:
-    needs: [tasmota-VN, tasmota32-VN, tasmota32-TW, tasmota32-TR]
+    needs: [base-images, language-images]
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
diff --git a/.github/workflows/build_all_the_things.yml b/.github/workflows/build_all_the_things.yml
index 2ffca53b7..cb41ae85e 100644
--- a/.github/workflows/build_all_the_things.yml
+++ b/.github/workflows/build_all_the_things.yml
@@ -18,6 +18,7 @@ on:
 jobs:
   base-images:
     runs-on: ubuntu-latest
+    if: github.repository == 'arendst/Tasmota'
     strategy:
       matrix:
         variant:
@@ -59,6 +60,7 @@ jobs:
 
   language-images:
     runs-on: ubuntu-latest
+    if: github.repository == 'arendst/Tasmota'
     strategy:
       matrix:
         variant: [ tasmota ]
diff --git a/lib/lib_audio/ESP8266Audio/src/AudioFileSourceICYStream.cpp b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceICYStream.cpp
index 63c84f328..bbc348d53 100644
--- a/lib/lib_audio/ESP8266Audio/src/AudioFileSourceICYStream.cpp
+++ b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceICYStream.cpp
@@ -20,7 +20,9 @@
 
 #if defined(ESP32) || defined(ESP8266)
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+  #define _GNU_SOURCE
+#endif
 
 #include "AudioFileSourceICYStream.h"
 #include <string.h>
diff --git a/lib/lib_audio/ESP8266Audio/src/libflac/config.h b/lib/lib_audio/ESP8266Audio/src/libflac/config.h
index cf6c07dfe..b0aebe44d 100644
--- a/lib/lib_audio/ESP8266Audio/src/libflac/config.h
+++ b/lib/lib_audio/ESP8266Audio/src/libflac/config.h
@@ -3,7 +3,9 @@
 #ifdef DEBUG
   #undef NDEBUG
 #else
-  #define NDEBUG
+  #ifndef NDEBUG
+    #define NDEBUG
+  #endif
 #endif
 
 /* config.h.  Generated from config.h.in by configure.  */
diff --git a/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.cpp b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.cpp
index 5e88150cc..398dba0df 100644
--- a/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.cpp
+++ b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.cpp
@@ -1610,10 +1610,12 @@ void Adafruit_GFX_Button::drawButton(boolean inverted) {
     text    = _fillcolor;
   }
 
+  #if defined USE_UFILESYS
   if (_label[0]=='/') {
     draw_picture(_label, _x1, _y1, _w, _h, outline, inverted);
     _gfx->drawRect(_x1, _y1, _w, _h, text);
   } else {
+  #endif
     uint8_t r = min(_w, _h) / 4; // Corner radius
     _gfx->fillRoundRect(_x1, _y1, _w, _h, r, fill);
     _gfx->drawRoundRect(_x1, _y1, _w, _h, r, outline);
@@ -1622,7 +1624,9 @@ void Adafruit_GFX_Button::drawButton(boolean inverted) {
     _gfx->setTextColor(text);
     _gfx->setTextSize(_textsize_x, _textsize_y);
     _gfx->print(_label);
+  #if defined USE_UFILESYS
   }
+  #endif
 }
 
 /**************************************************************************/
diff --git a/lib/libesp32/Berry/default/be_md5_lib.c b/lib/libesp32/Berry/default/be_md5_lib.c
deleted file mode 100644
index 2c8dfd77b..000000000
--- a/lib/libesp32/Berry/default/be_md5_lib.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/********************************************************************
- * Berry module `webserver`
- * 
- * To use: `import webserver`
- * 
- * Allows to respond to HTTP request
- *******************************************************************/
-#include "be_constobj.h"
-
-extern int m_md5_init(bvm *vm);
-extern int m_md5_update(bvm *vm);
-extern int m_md5_finish(bvm *vm);
-
-#include "../generate/be_fixed_be_class_md5.h"
-
-void be_load_md5_lib(bvm *vm) {
-    be_pushntvclass(vm, &be_class_md5);
-    be_setglobal(vm, "MD5");
-    be_pop(vm, 1);
-}
-/* @const_object_info_begin
-
-class be_class_md5 (scope: global, name: MD5) {
-    .p, var
-
-    init, func(m_md5_init)
-    update, func(m_md5_update)
-    finish, func(m_md5_finish)
-}
-@const_object_info_end */
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota.h b/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota.h
deleted file mode 100644
index dc2abcca8..000000000
--- a/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota.h
+++ /dev/null
@@ -1,96 +0,0 @@
-#include "be_constobj.h"
-
-static be_define_const_map_slots(be_class_tasmota_map) {
-    { be_const_key(gc, -1), be_const_closure(Tasmota_gc_closure) },
-    { be_const_key(read_sensors, 7), be_const_func(l_read_sensors) },
-    { be_const_key(_get_cb, -1), be_const_func(l_get_cb) },
-    { be_const_key(response_append, 50), be_const_func(l_respAppend) },
-    { be_const_key(try_rule, 74), be_const_closure(Tasmota_try_rule_closure) },
-    { be_const_key(eth, -1), be_const_func(l_eth) },
-    { be_const_key(find_key_i, -1), be_const_closure(Tasmota_find_key_i_closure) },
-    { be_const_key(exec_tele, 73), be_const_closure(Tasmota_exec_tele_closure) },
-    { be_const_key(remove_driver, 28), be_const_closure(Tasmota_remove_driver_closure) },
-    { be_const_key(load, -1), be_const_closure(Tasmota_load_closure) },
-    { be_const_key(_settings_ptr, -1), be_const_comptr(&Settings) },
-    { be_const_key(cmd_res, -1), be_const_var(0) },
-    { be_const_key(time_str, 43), be_const_closure(Tasmota_time_str_closure) },
-    { be_const_key(set_power, -1), be_const_func(l_setpower) },
-    { be_const_key(yield, 20), be_const_func(l_yield) },
-    { be_const_key(set_light, -1), be_const_closure(Tasmota_set_light_closure) },
-    { be_const_key(find_op, 32), be_const_closure(Tasmota_find_op_closure) },
-    { be_const_key(get_power, -1), be_const_func(l_getpower) },
-    { be_const_key(add_rule, -1), be_const_closure(Tasmota_add_rule_closure) },
-    { be_const_key(cb_dispatch, -1), be_const_closure(Tasmota_cb_dispatch_closure) },
-    { be_const_key(global, -1), be_const_var(1) },
-    { be_const_key(i2c_enabled, -1), be_const_func(l_i2cenabled) },
-    { be_const_key(remove_cmd, 10), be_const_closure(Tasmota_remove_cmd_closure) },
-    { be_const_key(millis, 18), be_const_func(l_millis) },
-    { be_const_key(publish, 69), be_const_func(l_publish) },
-    { be_const_key(_drivers, -1), be_const_var(2) },
-    { be_const_key(resp_cmnd, -1), be_const_func(l_respCmnd) },
-    { be_const_key(time_dump, -1), be_const_func(l_time_dump) },
-    { be_const_key(web_send, -1), be_const_func(l_webSend) },
-    { be_const_key(hs2rgb, -1), be_const_closure(Tasmota_hs2rgb_closure) },
-    { be_const_key(memory, -1), be_const_func(l_memory) },
-    { be_const_key(gen_cb, 0), be_const_closure(Tasmota_gen_cb_closure) },
-    { be_const_key(rtc, -1), be_const_func(l_rtc) },
-    { be_const_key(get_option, -1), be_const_func(l_getoption) },
-    { be_const_key(add_cmd, -1), be_const_closure(Tasmota_add_cmd_closure) },
-    { be_const_key(init, -1), be_const_closure(Tasmota_init_closure) },
-    { be_const_key(_timers, -1), be_const_var(3) },
-    { be_const_key(_global_addr, -1), be_const_comptr(&TasmotaGlobal) },
-    { be_const_key(wd, -1), be_const_var(4) },
-    { be_const_key(exec_cmd, -1), be_const_closure(Tasmota_exec_cmd_closure) },
-    { be_const_key(wire_scan, -1), be_const_closure(Tasmota_wire_scan_closure) },
-    { be_const_key(_global_def, 61), be_const_comptr(&be_tasmota_global_struct) },
-    { be_const_key(resp_cmnd_failed, 11), be_const_func(l_respCmndFailed) },
-    { be_const_key(chars_in_string, -1), be_const_closure(Tasmota_chars_in_string_closure) },
-    { be_const_key(web_send_decimal, -1), be_const_func(l_webSendDecimal) },
-    { be_const_key(_debug_present, 4), be_const_var(5) },
-    { be_const_key(cmd, -1), be_const_closure(Tasmota_cmd_closure) },
-    { be_const_key(_cb, -1), be_const_var(6) },
-    { be_const_key(remove_rule, -1), be_const_closure(Tasmota_remove_rule_closure) },
-    { be_const_key(run_deferred, -1), be_const_closure(Tasmota_run_deferred_closure) },
-    { be_const_key(strftime, -1), be_const_func(l_strftime) },
-    { be_const_key(add_driver, 3), be_const_closure(Tasmota_add_driver_closure) },
-    { be_const_key(kv, 60), be_const_closure(Tasmota_kv_closure) },
-    { be_const_key(set_timer, 58), be_const_closure(Tasmota_set_timer_closure) },
-    { be_const_key(scale_uint, -1), be_const_func(l_scaleuint) },
-    { be_const_key(remove_timer, -1), be_const_closure(Tasmota_remove_timer_closure) },
-    { be_const_key(settings, 49), be_const_var(7) },
-    { be_const_key(arch, -1), be_const_func(l_arch) },
-    { be_const_key(_ccmd, 64), be_const_var(8) },
-    { be_const_key(wire1, 46), be_const_var(9) },
-    { be_const_key(exec_rules, 66), be_const_closure(Tasmota_exec_rules_closure) },
-    { be_const_key(strptime, -1), be_const_func(l_strptime) },
-    { be_const_key(_cmd, -1), be_const_func(l_cmd) },
-    { be_const_key(resp_cmnd_error, -1), be_const_func(l_respCmndError) },
-    { be_const_key(time_reached, -1), be_const_func(l_timereached) },
-    { be_const_key(_rules, -1), be_const_var(10) },
-    { be_const_key(publish_result, -1), be_const_func(l_publish_result) },
-    { be_const_key(_settings_def, -1), be_const_comptr(&be_tasmota_settings_struct) },
-    { be_const_key(get_switch, -1), be_const_func(l_getswitch) },
-    { be_const_key(delay, 71), be_const_func(l_delay) },
-    { be_const_key(resp_cmnd_str, -1), be_const_func(l_respCmndStr) },
-    { be_const_key(wifi, -1), be_const_func(l_wifi) },
-    { be_const_key(save, 15), be_const_func(l_save) },
-    { be_const_key(log, 37), be_const_func(l_logInfo) },
-    { be_const_key(resolvecmnd, -1), be_const_func(l_resolveCmnd) },
-    { be_const_key(resp_cmnd_done, -1), be_const_func(l_respCmndDone) },
-    { be_const_key(get_light, 5), be_const_closure(Tasmota_get_light_closure) },
-    { be_const_key(get_free_heap, -1), be_const_func(l_getFreeHeap) },
-    { be_const_key(wire2, -1), be_const_var(11) },
-    { be_const_key(event, 34), be_const_closure(Tasmota_event_closure) },
-};
-
-static be_define_const_map(
-    be_class_tasmota_map,
-    80
-);
-
-BE_EXPORT_VARIABLE be_define_const_class(
-    be_class_tasmota,
-    12,
-    NULL,
-    Tasmota
-);
diff --git a/lib/libesp32/Berry/LICENSE b/lib/libesp32/berry/LICENSE
similarity index 100%
rename from lib/libesp32/Berry/LICENSE
rename to lib/libesp32/berry/LICENSE
diff --git a/lib/libesp32/Berry/Makefile b/lib/libesp32/berry/Makefile
similarity index 100%
rename from lib/libesp32/Berry/Makefile
rename to lib/libesp32/berry/Makefile
diff --git a/lib/libesp32/Berry/README.md b/lib/libesp32/berry/README.md
similarity index 100%
rename from lib/libesp32/Berry/README.md
rename to lib/libesp32/berry/README.md
diff --git a/lib/libesp32/Berry/berry-logo.png b/lib/libesp32/berry/berry-logo.png
similarity index 100%
rename from lib/libesp32/Berry/berry-logo.png
rename to lib/libesp32/berry/berry-logo.png
diff --git a/lib/libesp32/Berry/default/be_animate_lib.c b/lib/libesp32/berry/default/be_animate_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_animate_lib.c
rename to lib/libesp32/berry/default/be_animate_lib.c
diff --git a/lib/libesp32/Berry/default/be_autoconf_lib.c b/lib/libesp32/berry/default/be_autoconf_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_autoconf_lib.c
rename to lib/libesp32/berry/default/be_autoconf_lib.c
diff --git a/lib/libesp32/Berry/default/be_crypto_lib.c b/lib/libesp32/berry/default/be_crypto_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_crypto_lib.c
rename to lib/libesp32/berry/default/be_crypto_lib.c
diff --git a/lib/libesp32/Berry/default/be_ctypes.c b/lib/libesp32/berry/default/be_ctypes.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_ctypes.c
rename to lib/libesp32/berry/default/be_ctypes.c
diff --git a/lib/libesp32/Berry/default/be_display_lib.c b/lib/libesp32/berry/default/be_display_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_display_lib.c
rename to lib/libesp32/berry/default/be_display_lib.c
diff --git a/lib/libesp32/Berry/default/be_driverlib.c b/lib/libesp32/berry/default/be_driverlib.c
similarity index 54%
rename from lib/libesp32/Berry/default/be_driverlib.c
rename to lib/libesp32/berry/default/be_driverlib.c
index 45a611382..0d163f836 100644
--- a/lib/libesp32/Berry/default/be_driverlib.c
+++ b/lib/libesp32/berry/default/be_driverlib.c
@@ -6,57 +6,6 @@
  *******************************************************************/
 #include "be_constobj.h"
 
-/********************************************************************
-** Solidified function: init
-********************************************************************/
-be_local_closure(Driver_init,   /* name */
-  be_nested_proto(
-    1,                          /* nstack */
-    1,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    0,                          /* has constants */
-    NULL,                       /* no const */
-    &be_const_str_init,
-    &be_const_str_solidified,
-    ( &(const binstruction[ 1]) {  /* code */
-      0x80000000,  //  0000  RET	0
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: get_tasmota
-********************************************************************/
-be_local_closure(Driver_get_tasmota,   /* name */
-  be_nested_proto(
-    2,                          /* nstack */
-    1,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_str(tasmota),
-    }),
-    &be_const_str_get_tasmota,
-    &be_const_str_solidified,
-    ( &(const binstruction[ 2]) {  /* code */
-      0xB8060000,  //  0000  GETNGBL	R1	K0
-      0x80040200,  //  0001  RET	1	R1
-    })
-  )
-);
-/*******************************************************************/
-
-
 /********************************************************************
 ** Solidified function: add_cmd
 ********************************************************************/
@@ -123,24 +72,22 @@ be_local_closure(Driver_add_cmd,   /* name */
 be_local_class(Driver,
     13,
     NULL,
-    be_nested_map(16,
+    be_nested_map(14,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_const_key(web_add_main_button, 14), be_const_var(4) },
-        { be_const_key(web_add_console_button, -1), be_const_var(7) },
-        { be_const_key(web_add_management_button, 8), be_const_var(5) },
-        { be_const_key(init, -1), be_const_closure(Driver_init_closure) },
-        { be_const_key(json_append, -1), be_const_var(10) },
-        { be_const_key(web_add_config_button, 7), be_const_var(6) },
-        { be_const_key(every_100ms, -1), be_const_var(1) },
-        { be_const_key(display, -1), be_const_var(12) },
-        { be_const_key(web_add_button, 13), be_const_var(3) },
-        { be_const_key(every_second, -1), be_const_var(0) },
-        { be_const_key(save_before_restart, -1), be_const_var(8) },
-        { be_const_key(get_tasmota, -1), be_const_closure(Driver_get_tasmota_closure) },
-        { be_const_key(web_sensor, 6), be_const_var(9) },
-        { be_const_key(web_add_handler, -1), be_const_var(2) },
-        { be_const_key(button_pressed, 1), be_const_var(11) },
+        { be_const_key(web_add_console_button, 6), be_const_var(7) },
+        { be_const_key(web_add_config_button, -1), be_const_var(6) },
+        { be_const_key(button_pressed, 9), be_const_var(11) },
+        { be_const_key(every_second, 1), be_const_var(0) },
+        { be_const_key(web_add_handler, 11), be_const_var(2) },
         { be_const_key(add_cmd, -1), be_const_closure(Driver_add_cmd_closure) },
+        { be_const_key(web_sensor, -1), be_const_var(9) },
+        { be_const_key(display, -1), be_const_var(12) },
+        { be_const_key(web_add_main_button, 2), be_const_var(4) },
+        { be_const_key(save_before_restart, -1), be_const_var(8) },
+        { be_const_key(web_add_management_button, 0), be_const_var(5) },
+        { be_const_key(every_100ms, 13), be_const_var(1) },
+        { be_const_key(json_append, -1), be_const_var(10) },
+        { be_const_key(web_add_button, -1), be_const_var(3) },
     })),
     be_str_literal("Driver")
 );
diff --git a/lib/libesp32/Berry/default/be_energy_ctypes_definitions.c b/lib/libesp32/berry/default/be_energy_ctypes_definitions.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_energy_ctypes_definitions.c
rename to lib/libesp32/berry/default/be_energy_ctypes_definitions.c
diff --git a/lib/libesp32/Berry/default/be_energylib.c b/lib/libesp32/berry/default/be_energylib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_energylib.c
rename to lib/libesp32/berry/default/be_energylib.c
diff --git a/lib/libesp32/Berry/default/be_flash_lib.c b/lib/libesp32/berry/default/be_flash_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_flash_lib.c
rename to lib/libesp32/berry/default/be_flash_lib.c
diff --git a/lib/libesp32/Berry/default/be_gpio_lib.c b/lib/libesp32/berry/default/be_gpio_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_gpio_lib.c
rename to lib/libesp32/berry/default/be_gpio_lib.c
diff --git a/lib/libesp32/Berry/default/be_i2c_axp192_lib.c b/lib/libesp32/berry/default/be_i2c_axp192_lib.c
similarity index 99%
rename from lib/libesp32/Berry/default/be_i2c_axp192_lib.c
rename to lib/libesp32/berry/default/be_i2c_axp192_lib.c
index 4f9f02307..298e7b3a2 100644
--- a/lib/libesp32/Berry/default/be_i2c_axp192_lib.c
+++ b/lib/libesp32/berry/default/be_i2c_axp192_lib.c
@@ -712,7 +712,7 @@ be_local_closure(AXP192_web_sensor,   /* name */
     /* K4   */  be_nested_str(_X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D),
     /* K5   */  be_nested_str(_X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D),
     /* K6   */  be_nested_str(_X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D),
-    /* K7   */  be_nested_str(_X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D),
+    /* K7   */  be_nested_str(_X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_X26deg_X3BC_X7Be_X7D),
     /* K8   */  be_nested_str(get_vbus_voltage),
     /* K9   */  be_nested_str(get_bat_voltage),
     /* K10  */  be_nested_str(get_bat_current),
diff --git a/lib/libesp32/Berry/default/be_i2c_driverlib.c b/lib/libesp32/berry/default/be_i2c_driverlib.c
similarity index 89%
rename from lib/libesp32/Berry/default/be_i2c_driverlib.c
rename to lib/libesp32/berry/default/be_i2c_driverlib.c
index 45f829e19..a61321c12 100644
--- a/lib/libesp32/Berry/default/be_i2c_driverlib.c
+++ b/lib/libesp32/berry/default/be_i2c_driverlib.c
@@ -279,7 +279,7 @@ be_local_closure(I2C_Driver_read8,   /* name */
 ********************************************************************/
 be_local_closure(I2C_Driver_init,   /* name */
   be_nested_proto(
-    10,                          /* nstack */
+    9,                          /* nstack */
     4,                          /* argc */
     0,                          /* varg */
     0,                          /* has upvals */
@@ -288,7 +288,7 @@ be_local_closure(I2C_Driver_init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[10]) {     /* constants */
-    /* K0   */  be_nested_str(get_tasmota),
+    /* K0   */  be_nested_str(tasmota),
     /* K1   */  be_nested_str(i2c_enabled),
     /* K2   */  be_nested_str(addr),
     /* K3   */  be_nested_str(wire),
@@ -302,49 +302,49 @@ be_local_closure(I2C_Driver_init,   /* name */
     &be_const_str_init,
     &be_const_str_solidified,
     ( &(const binstruction[44]) {  /* code */
-      0x8C100100,  //  0000  GETMET	R4	R0	K0
-      0x7C100200,  //  0001  CALL	R4	1
-      0x4C140000,  //  0002  LDNIL	R5
-      0x20140605,  //  0003  NE	R5	R3	R5
-      0x78160004,  //  0004  JMPF	R5	#000A
-      0x8C140901,  //  0005  GETMET	R5	R4	K1
-      0x5C1C0600,  //  0006  MOVE	R7	R3
-      0x7C140400,  //  0007  CALL	R5	2
-      0x74160000,  //  0008  JMPT	R5	#000A
-      0x80000A00,  //  0009  RET	0
-      0x90020402,  //  000A  SETMBR	R0	K2	R2
-      0x8C140904,  //  000B  GETMET	R5	R4	K4
-      0x881C0102,  //  000C  GETMBR	R7	R0	K2
-      0x7C140400,  //  000D  CALL	R5	2
-      0x90020605,  //  000E  SETMBR	R0	K3	R5
-      0x88140103,  //  000F  GETMBR	R5	R0	K3
-      0x78160019,  //  0010  JMPF	R5	#002B
-      0x60140004,  //  0011  GETGBL	R5	G4
-      0x5C180200,  //  0012  MOVE	R6	R1
-      0x7C140200,  //  0013  CALL	R5	1
-      0x1C140B05,  //  0014  EQ	R5	R5	K5
-      0x78160004,  //  0015  JMPF	R5	#001B
-      0x5C140200,  //  0016  MOVE	R5	R1
-      0x5C180000,  //  0017  MOVE	R6	R0
-      0x7C140200,  //  0018  CALL	R5	1
-      0x90020C05,  //  0019  SETMBR	R0	K6	R5
+      0x4C100000,  //  0000  LDNIL	R4
+      0x20100604,  //  0001  NE	R4	R3	R4
+      0x78120005,  //  0002  JMPF	R4	#0009
+      0xB8120000,  //  0003  GETNGBL	R4	K0
+      0x8C100901,  //  0004  GETMET	R4	R4	K1
+      0x5C180600,  //  0005  MOVE	R6	R3
+      0x7C100400,  //  0006  CALL	R4	2
+      0x74120000,  //  0007  JMPT	R4	#0009
+      0x80000800,  //  0008  RET	0
+      0x90020402,  //  0009  SETMBR	R0	K2	R2
+      0xB8120000,  //  000A  GETNGBL	R4	K0
+      0x8C100904,  //  000B  GETMET	R4	R4	K4
+      0x88180102,  //  000C  GETMBR	R6	R0	K2
+      0x7C100400,  //  000D  CALL	R4	2
+      0x90020604,  //  000E  SETMBR	R0	K3	R4
+      0x88100103,  //  000F  GETMBR	R4	R0	K3
+      0x78120019,  //  0010  JMPF	R4	#002B
+      0x60100004,  //  0011  GETGBL	R4	G4
+      0x5C140200,  //  0012  MOVE	R5	R1
+      0x7C100200,  //  0013  CALL	R4	1
+      0x1C100905,  //  0014  EQ	R4	R4	K5
+      0x78120004,  //  0015  JMPF	R4	#001B
+      0x5C100200,  //  0016  MOVE	R4	R1
+      0x5C140000,  //  0017  MOVE	R5	R0
+      0x7C100200,  //  0018  CALL	R4	1
+      0x90020C04,  //  0019  SETMBR	R0	K6	R4
       0x70020000,  //  001A  JMP		#001C
       0x90020C01,  //  001B  SETMBR	R0	K6	R1
-      0x88140106,  //  001C  GETMBR	R5	R0	K6
-      0x4C180000,  //  001D  LDNIL	R6
-      0x1C140A06,  //  001E  EQ	R5	R5	R6
-      0x78160001,  //  001F  JMPF	R5	#0022
-      0x4C140000,  //  0020  LDNIL	R5
-      0x90020605,  //  0021  SETMBR	R0	K3	R5
-      0x88140103,  //  0022  GETMBR	R5	R0	K3
-      0x78160006,  //  0023  JMPF	R5	#002B
-      0x60140001,  //  0024  GETGBL	R5	G1
-      0x58180007,  //  0025  LDCONST	R6	K7
-      0x881C0106,  //  0026  GETMBR	R7	R0	K6
-      0x58200008,  //  0027  LDCONST	R8	K8
-      0x88240103,  //  0028  GETMBR	R9	R0	K3
-      0x88241309,  //  0029  GETMBR	R9	R9	K9
-      0x7C140800,  //  002A  CALL	R5	4
+      0x88100106,  //  001C  GETMBR	R4	R0	K6
+      0x4C140000,  //  001D  LDNIL	R5
+      0x1C100805,  //  001E  EQ	R4	R4	R5
+      0x78120001,  //  001F  JMPF	R4	#0022
+      0x4C100000,  //  0020  LDNIL	R4
+      0x90020604,  //  0021  SETMBR	R0	K3	R4
+      0x88100103,  //  0022  GETMBR	R4	R0	K3
+      0x78120006,  //  0023  JMPF	R4	#002B
+      0x60100001,  //  0024  GETGBL	R4	G1
+      0x58140007,  //  0025  LDCONST	R5	K7
+      0x88180106,  //  0026  GETMBR	R6	R0	K6
+      0x581C0008,  //  0027  LDCONST	R7	K8
+      0x88200103,  //  0028  GETMBR	R8	R0	K3
+      0x88201109,  //  0029  GETMBR	R8	R8	K9
+      0x7C100800,  //  002A  CALL	R4	4
       0x80000000,  //  002B  RET	0
     })
   )
diff --git a/lib/libesp32/Berry/default/be_i2s_audio_lib.c b/lib/libesp32/berry/default/be_i2s_audio_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_i2s_audio_lib.c
rename to lib/libesp32/berry/default/be_i2s_audio_lib.c
diff --git a/lib/libesp32/Berry/default/be_leds_animator_lib.c b/lib/libesp32/berry/default/be_leds_animator_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_leds_animator_lib.c
rename to lib/libesp32/berry/default/be_leds_animator_lib.c
diff --git a/lib/libesp32/Berry/default/be_leds_lib.c b/lib/libesp32/berry/default/be_leds_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_leds_lib.c
rename to lib/libesp32/berry/default/be_leds_lib.c
diff --git a/lib/libesp32/Berry/default/be_leds_ntv_lib.c b/lib/libesp32/berry/default/be_leds_ntv_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_leds_ntv_lib.c
rename to lib/libesp32/berry/default/be_leds_ntv_lib.c
diff --git a/lib/libesp32/Berry/default/be_light_lib.c b/lib/libesp32/berry/default/be_light_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_light_lib.c
rename to lib/libesp32/berry/default/be_light_lib.c
diff --git a/lib/libesp32/Berry/default/be_lvgl_clock_icon_lib.c b/lib/libesp32/berry/default/be_lvgl_clock_icon_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_lvgl_clock_icon_lib.c
rename to lib/libesp32/berry/default/be_lvgl_clock_icon_lib.c
diff --git a/lib/libesp32/Berry/default/be_lvgl_ctypes_definitions.c b/lib/libesp32/berry/default/be_lvgl_ctypes_definitions.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_lvgl_ctypes_definitions.c
rename to lib/libesp32/berry/default/be_lvgl_ctypes_definitions.c
diff --git a/lib/libesp32/Berry/default/be_lvgl_glob_lib.c b/lib/libesp32/berry/default/be_lvgl_glob_lib.c
similarity index 93%
rename from lib/libesp32/Berry/default/be_lvgl_glob_lib.c
rename to lib/libesp32/berry/default/be_lvgl_glob_lib.c
index 01bd4ed1d..06827fc0e 100644
--- a/lib/libesp32/Berry/default/be_lvgl_glob_lib.c
+++ b/lib/libesp32/berry/default/be_lvgl_glob_lib.c
@@ -69,7 +69,7 @@ be_local_closure(LVGL_glob_widget_event_impl,   /* name */
     }),
     &be_const_str_widget_event_impl,
     &be_const_str_solidified,
-    ( &(const binstruction[30]) {  /* code */
+    ( &(const binstruction[28]) {  /* code */
       0xA40E0000,  //  0000  IMPORT	R3	K0
       0xB8120200,  //  0001  GETNGBL	R4	K1
       0x8C100902,  //  0002  GETMET	R4	R4	K2
@@ -81,25 +81,23 @@ be_local_closure(LVGL_glob_widget_event_impl,   /* name */
       0x7C140400,  //  0008  CALL	R5	2
       0x88180B04,  //  0009  GETMBR	R6	R5	K4
       0x8C1C0105,  //  000A  GETMET	R7	R0	K5
-      0x60240009,  //  000B  GETGBL	R9	G9
-      0x5C280C00,  //  000C  MOVE	R10	R6
-      0x7C240200,  //  000D  CALL	R9	1
-      0x7C1C0400,  //  000E  CALL	R7	2
-      0x60200004,  //  000F  GETGBL	R8	G4
-      0x5C240E00,  //  0010  MOVE	R9	R7
-      0x7C200200,  //  0011  CALL	R8	1
-      0x1C201106,  //  0012  EQ	R8	R8	K6
-      0x78220008,  //  0013  JMPF	R8	#001D
-      0x8C200707,  //  0014  GETMET	R8	R3	K7
-      0x5C280E00,  //  0015  MOVE	R10	R7
-      0x582C0008,  //  0016  LDCONST	R11	K8
-      0x7C200600,  //  0017  CALL	R8	3
-      0x78220003,  //  0018  JMPF	R8	#001D
-      0x8C200F08,  //  0019  GETMET	R8	R7	K8
-      0x5C280800,  //  001A  MOVE	R10	R4
-      0x5C2C0A00,  //  001B  MOVE	R11	R5
-      0x7C200600,  //  001C  CALL	R8	3
-      0x80000000,  //  001D  RET	0
+      0x5C240C00,  //  000B  MOVE	R9	R6
+      0x7C1C0400,  //  000C  CALL	R7	2
+      0x60200004,  //  000D  GETGBL	R8	G4
+      0x5C240E00,  //  000E  MOVE	R9	R7
+      0x7C200200,  //  000F  CALL	R8	1
+      0x1C201106,  //  0010  EQ	R8	R8	K6
+      0x78220008,  //  0011  JMPF	R8	#001B
+      0x8C200707,  //  0012  GETMET	R8	R3	K7
+      0x5C280E00,  //  0013  MOVE	R10	R7
+      0x582C0008,  //  0014  LDCONST	R11	K8
+      0x7C200600,  //  0015  CALL	R8	3
+      0x78220003,  //  0016  JMPF	R8	#001B
+      0x8C200F08,  //  0017  GETMET	R8	R7	K8
+      0x5C280800,  //  0018  MOVE	R10	R4
+      0x5C2C0A00,  //  0019  MOVE	R11	R5
+      0x7C200600,  //  001A  CALL	R8	3
+      0x80000000,  //  001B  RET	0
     })
   )
 );
@@ -130,7 +128,7 @@ be_local_closure(LVGL_glob_lvgl_event_dispatch,   /* name */
     }),
     &be_const_str_lvgl_event_dispatch,
     &be_const_str_solidified,
-    ( &(const binstruction[20]) {  /* code */
+    ( &(const binstruction[18]) {  /* code */
       0xA40A0000,  //  0000  IMPORT	R2	K0
       0xB80E0200,  //  0001  GETNGBL	R3	K1
       0x8C0C0702,  //  0002  GETMET	R3	R3	K2
@@ -138,19 +136,17 @@ be_local_closure(LVGL_glob_lvgl_event_dispatch,   /* name */
       0x5C1C0200,  //  0004  MOVE	R7	R1
       0x7C140400,  //  0005  CALL	R5	2
       0x7C0C0400,  //  0006  CALL	R3	2
-      0x60100009,  //  0007  GETGBL	R4	G9
-      0x88140704,  //  0008  GETMBR	R5	R3	K4
-      0x7C100200,  //  0009  CALL	R4	1
-      0x88140105,  //  000A  GETMBR	R5	R0	K5
-      0x94140A04,  //  000B  GETIDX	R5	R5	R4
-      0x8C180106,  //  000C  GETMET	R6	R0	K6
-      0x5C200800,  //  000D  MOVE	R8	R4
-      0x7C180400,  //  000E  CALL	R6	2
-      0x5C1C0A00,  //  000F  MOVE	R7	R5
-      0x5C200C00,  //  0010  MOVE	R8	R6
-      0x5C240600,  //  0011  MOVE	R9	R3
-      0x7C1C0400,  //  0012  CALL	R7	2
-      0x80000000,  //  0013  RET	0
+      0x88100704,  //  0007  GETMBR	R4	R3	K4
+      0x88140105,  //  0008  GETMBR	R5	R0	K5
+      0x94140A04,  //  0009  GETIDX	R5	R5	R4
+      0x8C180106,  //  000A  GETMET	R6	R0	K6
+      0x5C200800,  //  000B  MOVE	R8	R4
+      0x7C180400,  //  000C  CALL	R6	2
+      0x5C1C0A00,  //  000D  MOVE	R7	R5
+      0x5C200C00,  //  000E  MOVE	R8	R6
+      0x5C240600,  //  000F  MOVE	R9	R3
+      0x7C1C0400,  //  0010  CALL	R7	2
+      0x80000000,  //  0011  RET	0
     })
   )
 );
@@ -229,7 +225,7 @@ be_local_closure(LVGL_glob_register_obj,   /* name */
     }),
     &be_const_str_register_obj,
     &be_const_str_solidified,
-    ( &(const binstruction[13]) {  /* code */
+    ( &(const binstruction[11]) {  /* code */
       0x88080100,  //  0000  GETMBR	R2	R0	K0
       0x4C0C0000,  //  0001  LDNIL	R3
       0x1C080403,  //  0002  EQ	R2	R2	R3
@@ -237,12 +233,10 @@ be_local_closure(LVGL_glob_register_obj,   /* name */
       0x60080013,  //  0004  GETGBL	R2	G19
       0x7C080000,  //  0005  CALL	R2	0
       0x90020002,  //  0006  SETMBR	R0	K0	R2
-      0x60080009,  //  0007  GETGBL	R2	G9
-      0x880C0301,  //  0008  GETMBR	R3	R1	K1
-      0x7C080200,  //  0009  CALL	R2	1
-      0x880C0100,  //  000A  GETMBR	R3	R0	K0
-      0x980C0401,  //  000B  SETIDX	R3	R2	R1
-      0x80000000,  //  000C  RET	0
+      0x88080301,  //  0007  GETMBR	R2	R1	K1
+      0x880C0100,  //  0008  GETMBR	R3	R0	K0
+      0x980C0401,  //  0009  SETIDX	R3	R2	R1
+      0x80000000,  //  000A  RET	0
     })
   )
 );
@@ -798,23 +792,23 @@ be_local_class(LVGL_glob,
     NULL,
     be_nested_map(20,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_const_key(widget_ctor_cb, 9), be_const_var(4) },
+        { be_const_key(widget_ctor_cb, 8), be_const_var(4) },
         { be_const_key(get_object_from_ptr, 4), be_const_closure(LVGL_glob_get_object_from_ptr_closure) },
         { be_const_key(cb_obj, 7), be_const_var(0) },
         { be_const_key(widget_struct_by_class, -1), be_const_var(8) },
         { be_const_key(widget_event_impl, -1), be_const_closure(LVGL_glob_widget_event_impl_closure) },
         { be_const_key(widget_dtor_cb, 6), be_const_var(5) },
         { be_const_key(cb_event_closure, -1), be_const_var(1) },
-        { be_const_key(lvgl_event_dispatch, 16), be_const_closure(LVGL_glob_lvgl_event_dispatch_closure) },
-        { be_const_key(widget_dtor_impl, -1), be_const_closure(LVGL_glob_widget_dtor_impl_closure) },
+        { be_const_key(cb_do_nothing, 16), be_const_static_closure(LVGL_glob__anonymous__closure) },
         { be_const_key(null_cb, -1), be_const_var(3) },
-        { be_const_key(register_obj, 8), be_const_closure(LVGL_glob_register_obj_closure) },
+        { be_const_key(register_obj, -1), be_const_closure(LVGL_glob_register_obj_closure) },
+        { be_const_key(widget_dtor_impl, 9), be_const_closure(LVGL_glob_widget_dtor_impl_closure) },
         { be_const_key(gen_cb, -1), be_const_closure(LVGL_glob_gen_cb_closure) },
-        { be_const_key(widget_struct_default, -1), be_const_var(7) },
-        { be_const_key(deregister_obj, 12), be_const_closure(LVGL_glob_deregister_obj_closure) },
+        { be_const_key(deregister_obj, -1), be_const_closure(LVGL_glob_deregister_obj_closure) },
+        { be_const_key(widget_struct_default, 12), be_const_var(7) },
         { be_const_key(widget_event_cb, -1), be_const_var(6) },
         { be_const_key(widget_cb, -1), be_const_closure(LVGL_glob_widget_cb_closure) },
-        { be_const_key(cb_do_nothing, 3), be_const_closure(LVGL_glob__anonymous__closure) },
+        { be_const_key(lvgl_event_dispatch, 3), be_const_closure(LVGL_glob_lvgl_event_dispatch_closure) },
         { be_const_key(event_cb, -1), be_const_var(2) },
         { be_const_key(create_custom_widget, -1), be_const_closure(LVGL_glob_create_custom_widget_closure) },
         { be_const_key(widget_ctor_impl, -1), be_const_closure(LVGL_glob_widget_ctor_impl_closure) },
diff --git a/lib/libesp32/Berry/default/be_lvgl_module.c b/lib/libesp32/berry/default/be_lvgl_module.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_lvgl_module.c
rename to lib/libesp32/berry/default/be_lvgl_module.c
diff --git a/lib/libesp32/Berry/default/be_lvgl_signal_arcs_lib.c b/lib/libesp32/berry/default/be_lvgl_signal_arcs_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_lvgl_signal_arcs_lib.c
rename to lib/libesp32/berry/default/be_lvgl_signal_arcs_lib.c
diff --git a/lib/libesp32/Berry/default/be_lvgl_signal_bars_lib.c b/lib/libesp32/berry/default/be_lvgl_signal_bars_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_lvgl_signal_bars_lib.c
rename to lib/libesp32/berry/default/be_lvgl_signal_bars_lib.c
diff --git a/lib/libesp32/Berry/default/be_lvgl_widgets_lib.c b/lib/libesp32/berry/default/be_lvgl_widgets_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_lvgl_widgets_lib.c
rename to lib/libesp32/berry/default/be_lvgl_widgets_lib.c
diff --git a/lib/libesp32/Berry/default/be_lvgl_wifi_arcs_icon_lib.c b/lib/libesp32/berry/default/be_lvgl_wifi_arcs_icon_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_lvgl_wifi_arcs_icon_lib.c
rename to lib/libesp32/berry/default/be_lvgl_wifi_arcs_icon_lib.c
diff --git a/lib/libesp32/Berry/default/be_lvgl_wifi_arcs_lib.c b/lib/libesp32/berry/default/be_lvgl_wifi_arcs_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_lvgl_wifi_arcs_lib.c
rename to lib/libesp32/berry/default/be_lvgl_wifi_arcs_lib.c
diff --git a/lib/libesp32/Berry/default/be_lvgl_wifi_bars_icon_lib.c b/lib/libesp32/berry/default/be_lvgl_wifi_bars_icon_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_lvgl_wifi_bars_icon_lib.c
rename to lib/libesp32/berry/default/be_lvgl_wifi_bars_icon_lib.c
diff --git a/lib/libesp32/Berry/default/be_lvgl_wifi_bars_lib.c b/lib/libesp32/berry/default/be_lvgl_wifi_bars_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_lvgl_wifi_bars_lib.c
rename to lib/libesp32/berry/default/be_lvgl_wifi_bars_lib.c
diff --git a/lib/libesp32/berry/default/be_md5_lib.c b/lib/libesp32/berry/default/be_md5_lib.c
new file mode 100644
index 000000000..2db161a0b
--- /dev/null
+++ b/lib/libesp32/berry/default/be_md5_lib.c
@@ -0,0 +1,100 @@
+/********************************************************************
+ * Berry module `webserver`
+ * 
+ * To use: `import webserver`
+ * 
+ * Allows to respond to HTTP request
+ *******************************************************************/
+#include "be_constobj.h"
+#include "be_mem.h"
+#include "be_exec.h"
+#include "esp_rom_md5.h"
+
+int free_ctx(bvm* vm) {
+  int argc = be_top(vm);
+  if (argc > 0) {
+    be_getmember(vm, 1, ".p");
+    md5_context_t * ctx = (md5_context_t *) be_tocomptr(vm, -1);
+    if (ctx != NULL) {
+      be_os_free(ctx);
+    }
+  }
+  be_return_nil(vm);
+}
+
+// `Md5.init() -> `
+int32_t m_md5_init(struct bvm *vm);
+int32_t m_md5_init(struct bvm *vm) {
+
+  md5_context_t * ctx = (md5_context_t *) be_os_malloc(sizeof(md5_context_t));
+  if (!ctx) {
+    be_throw(vm, BE_MALLOC_FAIL);
+  }
+  esp_rom_md5_init(ctx);
+
+  be_newcomobj(vm, ctx, &free_ctx);
+  be_setmember(vm, 1, ".p");
+  be_return_nil(vm);
+}
+
+// `Md5.update(content:bytes()) -> nil`
+//
+// Add raw bytes to the MD5 calculation
+int32_t m_md5_update(struct bvm *vm);
+int32_t m_md5_update(struct bvm *vm) {
+  int32_t argc = be_top(vm); // Get the number of arguments
+  if (argc >= 2 && be_isinstance(vm, 2)) {
+    do {
+      be_getglobal(vm, "bytes"); /* get the bytes class */ /* TODO eventually replace with be_getbuiltin */
+      if (!be_isderived(vm, 2)) break;
+      size_t length = 0;
+      const void * bytes = be_tobytes(vm, 2, &length);
+      if (!bytes) break;
+
+      be_getmember(vm, 1, ".p");
+      md5_context_t * ctx;
+      ctx = (md5_context_t *) be_tocomptr(vm, -1);
+      if (!ctx) break;
+
+      if (length > 0) {
+        esp_rom_md5_update(ctx, (const uint8_t*) bytes, length);
+      }
+      be_return_nil(vm);
+      // success
+    } while (0);
+  }
+  be_raise(vm, "value_error", NULL);
+}
+
+// `Md5.update(content:bytes()) -> nil`
+//
+// Add raw bytes to the MD5 calculation
+int32_t m_md5_finish(struct bvm *vm);
+int32_t m_md5_finish(struct bvm *vm) {
+  be_getmember(vm, 1, ".p");
+  md5_context_t * ctx;
+  ctx = (md5_context_t *) be_tocomptr(vm, -1);
+
+  uint8_t output[16];
+  esp_rom_md5_final(output, ctx);
+  be_pushbytes(vm, output, sizeof(output));
+  be_return(vm);
+}
+
+#include "../generate/be_fixed_be_class_md5.h"
+
+void be_load_md5_lib(bvm *vm) {
+    be_pushntvclass(vm, &be_class_md5);
+    be_setglobal(vm, "MD5");
+    be_pop(vm, 1);
+}
+/* @const_object_info_begin
+
+class be_class_md5 (scope: global, name: MD5) {
+    .p, var
+
+    init, func(m_md5_init)
+    update, func(m_md5_update)
+    finish, func(m_md5_finish)
+}
+@const_object_info_end */
diff --git a/lib/libesp32/Berry/default/be_modtab.c b/lib/libesp32/berry/default/be_modtab.c
similarity index 97%
rename from lib/libesp32/Berry/default/be_modtab.c
rename to lib/libesp32/berry/default/be_modtab.c
index 47db8b24e..934400bbb 100644
--- a/lib/libesp32/Berry/default/be_modtab.c
+++ b/lib/libesp32/berry/default/be_modtab.c
@@ -23,6 +23,10 @@ be_extern_native_module(solidify);
 be_extern_native_module(introspect);
 be_extern_native_module(strict);
 
+/* Berry extensions */
+#include "be_mapping.h"
+be_extern_native_module(cb);
+
 /* Tasmota specific */
 be_extern_native_module(python_compat);
 be_extern_native_module(re);
@@ -85,6 +89,10 @@ BERRY_LOCAL const bntvmodule* const be_module_table[] = {
 #if BE_USE_STRICT_MODULE
     &be_native_module(strict),
 #endif
+
+    /* Berry extensions */
+    &be_native_module(cb),
+
     /* user-defined modules register start */
     
     &be_native_module(python_compat),
diff --git a/lib/libesp32/Berry/default/be_onewire_lib.c b/lib/libesp32/berry/default/be_onewire_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_onewire_lib.c
rename to lib/libesp32/berry/default/be_onewire_lib.c
diff --git a/lib/libesp32/Berry/default/be_path_tasmota_lib.c b/lib/libesp32/berry/default/be_path_tasmota_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_path_tasmota_lib.c
rename to lib/libesp32/berry/default/be_path_tasmota_lib.c
diff --git a/lib/libesp32/Berry/default/be_persist_lib.c b/lib/libesp32/berry/default/be_persist_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_persist_lib.c
rename to lib/libesp32/berry/default/be_persist_lib.c
diff --git a/lib/libesp32/Berry/default/be_port.cpp b/lib/libesp32/berry/default/be_port.cpp
similarity index 100%
rename from lib/libesp32/Berry/default/be_port.cpp
rename to lib/libesp32/berry/default/be_port.cpp
diff --git a/lib/libesp32/Berry/default/be_python_compat.c b/lib/libesp32/berry/default/be_python_compat.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_python_compat.c
rename to lib/libesp32/berry/default/be_python_compat.c
diff --git a/lib/libesp32/Berry/default/be_re_lib.c b/lib/libesp32/berry/default/be_re_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_re_lib.c
rename to lib/libesp32/berry/default/be_re_lib.c
diff --git a/lib/libesp32/Berry/default/be_serial_lib.c b/lib/libesp32/berry/default/be_serial_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_serial_lib.c
rename to lib/libesp32/berry/default/be_serial_lib.c
diff --git a/lib/libesp32/Berry/default/be_tapp_lib.c b/lib/libesp32/berry/default/be_tapp_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_tapp_lib.c
rename to lib/libesp32/berry/default/be_tapp_lib.c
diff --git a/lib/libesp32/Berry/default/be_tasmotalib.c b/lib/libesp32/berry/default/be_tasmotalib.c
similarity index 95%
rename from lib/libesp32/Berry/default/be_tasmotalib.c
rename to lib/libesp32/berry/default/be_tasmotalib.c
index e117bae70..6539b0de3 100644
--- a/lib/libesp32/Berry/default/be_tasmotalib.c
+++ b/lib/libesp32/berry/default/be_tasmotalib.c
@@ -16,7 +16,6 @@ extern int l_arch(bvm *vm);
 extern int l_publish(bvm *vm);
 extern int l_publish_result(bvm *vm);
 extern int l_cmd(bvm *vm);
-extern int l_get_cb(bvm *vm);
 extern int l_getoption(bvm *vm);
 extern int l_millis(bvm *vm);
 extern int l_timereached(bvm *vm);
@@ -384,7 +383,7 @@ be_local_closure(Tasmota_try_rule,   /* name */
 ********************************************************************/
 be_local_closure(Tasmota_gen_cb,   /* name */
   be_nested_proto(
-    7,                          /* nstack */
+    6,                          /* nstack */
     2,                          /* argc */
     0,                          /* varg */
     0,                          /* has upvals */
@@ -392,52 +391,18 @@ be_local_closure(Tasmota_gen_cb,   /* name */
     0,                          /* has sup protos */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
-    ( &(const bvalue[ 7]) {     /* constants */
-    /* K0   */  be_nested_str(_cb),
-    /* K1   */  be_const_int(0),
-    /* K2   */  be_nested_str(find),
-    /* K3   */  be_nested_str(_get_cb),
-    /* K4   */  be_nested_str(stop_iteration),
-    /* K5   */  be_nested_str(internal_error),
-    /* K6   */  be_nested_str(No_X20callback_X20available),
+    ( &(const bvalue[ 2]) {     /* constants */
+    /* K0   */  be_nested_str(cb),
+    /* K1   */  be_nested_str(gen_cb),
     }),
     &be_const_str_gen_cb,
     &be_const_str_solidified,
-    ( &(const binstruction[34]) {  /* code */
-      0x88080100,  //  0000  GETMBR	R2	R0	K0
-      0x4C0C0000,  //  0001  LDNIL	R3
-      0x1C080403,  //  0002  EQ	R2	R2	R3
-      0x780A0002,  //  0003  JMPF	R2	#0007
-      0x60080013,  //  0004  GETGBL	R2	G19
-      0x7C080000,  //  0005  CALL	R2	0
-      0x90020002,  //  0006  SETMBR	R0	K0	R2
-      0x60080010,  //  0007  GETGBL	R2	G16
-      0x540E0012,  //  0008  LDINT	R3	19
-      0x400E0203,  //  0009  CONNECT	R3	K1	R3
-      0x7C080200,  //  000A  CALL	R2	1
-      0xA8020010,  //  000B  EXBLK	0	#001D
-      0x5C0C0400,  //  000C  MOVE	R3	R2
-      0x7C0C0000,  //  000D  CALL	R3	0
-      0x88100100,  //  000E  GETMBR	R4	R0	K0
-      0x8C100902,  //  000F  GETMET	R4	R4	K2
-      0x5C180600,  //  0010  MOVE	R6	R3
-      0x7C100400,  //  0011  CALL	R4	2
-      0x4C140000,  //  0012  LDNIL	R5
-      0x1C100805,  //  0013  EQ	R4	R4	R5
-      0x78120006,  //  0014  JMPF	R4	#001C
-      0x88100100,  //  0015  GETMBR	R4	R0	K0
-      0x98100601,  //  0016  SETIDX	R4	R3	R1
-      0x8C100103,  //  0017  GETMET	R4	R0	K3
-      0x5C180600,  //  0018  MOVE	R6	R3
-      0x7C100400,  //  0019  CALL	R4	2
-      0xA8040001,  //  001A  EXBLK	1	1
-      0x80040800,  //  001B  RET	1	R4
-      0x7001FFEE,  //  001C  JMP		#000C
-      0x58080004,  //  001D  LDCONST	R2	K4
-      0xAC080200,  //  001E  CATCH	R2	1	0
-      0xB0080000,  //  001F  RAISE	2	R0	R0
-      0xB0060B06,  //  0020  RAISE	1	K5	K6
-      0x80000000,  //  0021  RET	0
+    ( &(const binstruction[ 5]) {  /* code */
+      0xA40A0000,  //  0000  IMPORT	R2	K0
+      0x8C0C0501,  //  0001  GETMET	R3	R2	K1
+      0x5C140200,  //  0002  MOVE	R5	R1
+      0x7C0C0400,  //  0003  CALL	R3	2
+      0x80040600,  //  0004  RET	1	R3
     })
   )
 );
@@ -1605,53 +1570,6 @@ be_local_closure(Tasmota_exec_rules,   /* name */
 /*******************************************************************/
 
 
-/********************************************************************
-** Solidified function: cb_dispatch
-********************************************************************/
-be_local_closure(Tasmota_cb_dispatch,   /* name */
-  be_nested_proto(
-    12,                          /* nstack */
-    6,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_str(_cb),
-    /* K1   */  be_const_int(0),
-    /* K2   */  be_nested_str(find),
-    }),
-    &be_const_str_cb_dispatch,
-    &be_const_str_solidified,
-    ( &(const binstruction[20]) {  /* code */
-      0x88180100,  //  0000  GETMBR	R6	R0	K0
-      0x4C1C0000,  //  0001  LDNIL	R7
-      0x1C180C07,  //  0002  EQ	R6	R6	R7
-      0x781A0000,  //  0003  JMPF	R6	#0005
-      0x80060200,  //  0004  RET	1	K1
-      0x88180100,  //  0005  GETMBR	R6	R0	K0
-      0x8C180D02,  //  0006  GETMET	R6	R6	K2
-      0x5C200200,  //  0007  MOVE	R8	R1
-      0x7C180400,  //  0008  CALL	R6	2
-      0x4C1C0000,  //  0009  LDNIL	R7
-      0x201C0C07,  //  000A  NE	R7	R6	R7
-      0x781E0006,  //  000B  JMPF	R7	#0013
-      0x5C1C0C00,  //  000C  MOVE	R7	R6
-      0x5C200400,  //  000D  MOVE	R8	R2
-      0x5C240600,  //  000E  MOVE	R9	R3
-      0x5C280800,  //  000F  MOVE	R10	R4
-      0x5C2C0A00,  //  0010  MOVE	R11	R5
-      0x7C1C0800,  //  0011  CALL	R7	4
-      0x80040E00,  //  0012  RET	1	R7
-      0x80060200,  //  0013  RET	1	K1
-    })
-  )
-);
-/*******************************************************************/
-
-
 /********************************************************************
 ** Solidified function: hs2rgb
 ********************************************************************/
@@ -2072,7 +1990,6 @@ class be_class_tasmota (scope: global, name: Tasmota) {
     _timers, var
     _ccmd, var
     _drivers, var
-    _cb, var
     wire1, var
     wire2, var
     global, var
@@ -2094,7 +2011,6 @@ class be_class_tasmota (scope: global, name: Tasmota) {
     publish, func(l_publish)
     publish_result, func(l_publish_result)
     _cmd, func(l_cmd)
-    _get_cb, func(l_get_cb)
     get_option, func(l_getoption)
     millis, func(l_millis)
     time_reached, func(l_timereached)
@@ -2155,7 +2071,6 @@ class be_class_tasmota (scope: global, name: Tasmota) {
 
     hs2rgb, closure(Tasmota_hs2rgb_closure)
 
-    cb_dispatch, closure(Tasmota_cb_dispatch_closure)
     gen_cb, closure(Tasmota_gen_cb_closure)
 
     get_light, closure(Tasmota_get_light_closure)
diff --git a/lib/libesp32/Berry/default/be_tcpclient_lib.c b/lib/libesp32/berry/default/be_tcpclient_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_tcpclient_lib.c
rename to lib/libesp32/berry/default/be_tcpclient_lib.c
diff --git a/lib/libesp32/Berry/default/be_timer_class.c b/lib/libesp32/berry/default/be_timer_class.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_timer_class.c
rename to lib/libesp32/berry/default/be_timer_class.c
diff --git a/lib/libesp32/Berry/default/be_unishox_lib.c b/lib/libesp32/berry/default/be_unishox_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_unishox_lib.c
rename to lib/libesp32/berry/default/be_unishox_lib.c
diff --git a/lib/libesp32/Berry/default/be_webclient_lib.c b/lib/libesp32/berry/default/be_webclient_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_webclient_lib.c
rename to lib/libesp32/berry/default/be_webclient_lib.c
diff --git a/lib/libesp32/Berry/default/be_webserver_lib.c b/lib/libesp32/berry/default/be_webserver_lib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_webserver_lib.c
rename to lib/libesp32/berry/default/be_webserver_lib.c
diff --git a/lib/libesp32/Berry/default/be_wirelib.c b/lib/libesp32/berry/default/be_wirelib.c
similarity index 100%
rename from lib/libesp32/Berry/default/be_wirelib.c
rename to lib/libesp32/berry/default/be_wirelib.c
diff --git a/lib/libesp32/Berry/default/berry_conf.h b/lib/libesp32/berry/default/berry_conf.h
similarity index 96%
rename from lib/libesp32/Berry/default/berry_conf.h
rename to lib/libesp32/berry/default/berry_conf.h
index d2284ac31..607a9c612 100644
--- a/lib/libesp32/Berry/default/berry_conf.h
+++ b/lib/libesp32/berry/default/berry_conf.h
@@ -65,20 +65,14 @@
  **/
 #define BE_DEBUG_VAR_INFO               0
 
-/* Macro: BE_USE_OBSERVABILITY_HOOK
- * Use the obshook function to report low-level actions.
- * Default: 0
- **/
-#define BE_USE_OBSERVABILITY_HOOK       1
-
-/* Macro: BE_USE_OBSERVABILITY_HOOK
+/* Macro: BE_USE_PERF_COUNTERS
  * Use the obshook function to report low-level actions.
  * Default: 0
  **/
 #define BE_USE_PERF_COUNTERS            1
 
 /* Macro: BE_VM_OBSERVABILITY_SAMPLING
- * If BE_USE_OBSERVABILITY_HOOK == 1 and BE_USE_PERF_COUNTERS == 1
+ * If BE_USE_PERF_COUNTERS == 1
  * then the observability hook is called regularly in the VM loop
  * allowing to stop infinite loops or too-long running code.
  * The value is a power of 2.
diff --git a/lib/libesp32/Berry/default/embedded/Animate.be b/lib/libesp32/berry/default/embedded/Animate.be
similarity index 100%
rename from lib/libesp32/Berry/default/embedded/Animate.be
rename to lib/libesp32/berry/default/embedded/Animate.be
diff --git a/lib/libesp32/Berry/default/embedded/Driver.be b/lib/libesp32/berry/default/embedded/Driver.be
similarity index 88%
rename from lib/libesp32/Berry/default/embedded/Driver.be
rename to lib/libesp32/berry/default/embedded/Driver.be
index d0782f024..bb365aa29 100644
--- a/lib/libesp32/Berry/default/embedded/Driver.be
+++ b/lib/libesp32/berry/default/embedded/Driver.be
@@ -16,13 +16,6 @@ class Driver
   var button_pressed
   var display
 
-  def init()
-  end
-
-  def get_tasmota()
-    return tasmota
-  end
-
   def add_cmd(c, f)
     tasmota.add_cmd(c, / cmd, idx, payload, payload_json -> f(self, cmd, idx, payload, payload_json))
   end
diff --git a/lib/libesp32/Berry/default/embedded/Tasmota.be b/lib/libesp32/berry/default/embedded/Tasmota.be
similarity index 96%
rename from lib/libesp32/Berry/default/embedded/Tasmota.be
rename to lib/libesp32/berry/default/embedded/Tasmota.be
index 3305d57ff..22752a47d 100644
--- a/lib/libesp32/Berry/default/embedded/Tasmota.be
+++ b/lib/libesp32/berry/default/embedded/Tasmota.be
@@ -21,7 +21,6 @@ class Tasmota
   var _timers
   var _ccmd
   var _drivers
-  var _cb
   var wire1
   var wire2
   var cmd_res         # store the command result, nil if disables, true if capture enabled, contains return value
@@ -520,28 +519,11 @@ class Tasmota
     end
   end
 
-
-  #- dispatch callback number n, with parameters v0,v1,v2,v3 -#
-  def cb_dispatch(n,v0,v1,v2,v3)
-    if self._cb == nil return 0 end
-    var f = self._cb.find(n)
-    if f != nil
-      return f(v0,v1,v2,v3)
-    end
-    return 0
-  end
-
   #- generate a new C callback and record the associated Berry closure -#
   def gen_cb(f)
-    if self._cb == nil self._cb = {} end  # create map if not already initialized
-    for i:0..19
-      if self._cb.find(i) == nil
-        #- free slot -#
-        self._cb[i] = f
-        return self._get_cb(i)
-      end
-    end
-    raise "internal_error", "No callback available"
+    # DEPRECATED
+    import cb
+    return cb.gen_cb(f)
   end
 
   #- convert hue/sat to rgb -#
diff --git a/lib/libesp32/Berry/default/embedded/Wire.be b/lib/libesp32/berry/default/embedded/Wire.be
similarity index 100%
rename from lib/libesp32/Berry/default/embedded/Wire.be
rename to lib/libesp32/berry/default/embedded/Wire.be
diff --git a/lib/libesp32/Berry/default/embedded/autoconf.be b/lib/libesp32/berry/default/embedded/autoconf.be
similarity index 100%
rename from lib/libesp32/Berry/default/embedded/autoconf.be
rename to lib/libesp32/berry/default/embedded/autoconf.be
diff --git a/lib/libesp32/Berry/default/embedded/i2c_axp192.be b/lib/libesp32/berry/default/embedded/i2c_axp192.be
similarity index 99%
rename from lib/libesp32/Berry/default/embedded/i2c_axp192.be
rename to lib/libesp32/berry/default/embedded/i2c_axp192.be
index 3d958334f..d762b0363 100644
--- a/lib/libesp32/Berry/default/embedded/i2c_axp192.be
+++ b/lib/libesp32/berry/default/embedded/i2c_axp192.be
@@ -153,7 +153,7 @@ class AXP192 : I2C_Driver
              "{s}Batt Voltage{m}%.3f V{e}"..
              "{s}Batt Current{m}%.1f mA{e}"..
              #"{s}Batt Power{m}%.3f{e}"..
-             "{s}Temp AXP{m}%.1f °C{e}",
+             "{s}Temp AXP{m}%.1f &deg;C{e}",
              self.get_vbus_voltage(), self.get_vbus_voltage(),
              self.get_bat_voltage(), self.get_bat_current(),
              #self.get_bat_power(),
diff --git a/lib/libesp32/Berry/default/embedded/i2c_driver.be b/lib/libesp32/berry/default/embedded/i2c_driver.be
similarity index 97%
rename from lib/libesp32/Berry/default/embedded/i2c_driver.be
rename to lib/libesp32/berry/default/embedded/i2c_driver.be
index a66afa5ad..816a4d9be 100644
--- a/lib/libesp32/Berry/default/embedded/i2c_driver.be
+++ b/lib/libesp32/berry/default/embedded/i2c_driver.be
@@ -29,8 +29,6 @@ class I2C_Driver
    -   i2c_index : Tasmota I2C index, see `I2CDEVICES.md` (int)
    --#
   def init(name_or_detect, addr, i2c_index)
-    var tasmota = self.get_tasmota()            #- retrieve the 'tasmota' singleton -#
-
     #- check if the i2c index is disabled by Tasmota configuration -#
     if i2c_index != nil && !tasmota.i2c_enabled(i2c_index) return end
 
diff --git a/lib/libesp32/Berry/default/embedded/leds.be b/lib/libesp32/berry/default/embedded/leds.be
similarity index 100%
rename from lib/libesp32/Berry/default/embedded/leds.be
rename to lib/libesp32/berry/default/embedded/leds.be
diff --git a/lib/libesp32/Berry/default/embedded/leds_animator.be b/lib/libesp32/berry/default/embedded/leds_animator.be
similarity index 100%
rename from lib/libesp32/Berry/default/embedded/leds_animator.be
rename to lib/libesp32/berry/default/embedded/leds_animator.be
diff --git a/lib/libesp32/Berry/default/embedded/lv_clock_icon.be b/lib/libesp32/berry/default/embedded/lv_clock_icon.be
similarity index 100%
rename from lib/libesp32/Berry/default/embedded/lv_clock_icon.be
rename to lib/libesp32/berry/default/embedded/lv_clock_icon.be
diff --git a/lib/libesp32/Berry/default/embedded/lv_signal_arcs.be b/lib/libesp32/berry/default/embedded/lv_signal_arcs.be
similarity index 100%
rename from lib/libesp32/Berry/default/embedded/lv_signal_arcs.be
rename to lib/libesp32/berry/default/embedded/lv_signal_arcs.be
diff --git a/lib/libesp32/Berry/default/embedded/lv_signal_bars.be b/lib/libesp32/berry/default/embedded/lv_signal_bars.be
similarity index 100%
rename from lib/libesp32/Berry/default/embedded/lv_signal_bars.be
rename to lib/libesp32/berry/default/embedded/lv_signal_bars.be
diff --git a/lib/libesp32/Berry/default/embedded/lvgl_glob.be b/lib/libesp32/berry/default/embedded/lvgl_glob.be
similarity index 98%
rename from lib/libesp32/Berry/default/embedded/lvgl_glob.be
rename to lib/libesp32/berry/default/embedded/lvgl_glob.be
index f7f6b8e84..04250ff54 100644
--- a/lib/libesp32/Berry/default/embedded/lvgl_glob.be
+++ b/lib/libesp32/berry/default/embedded/lvgl_glob.be
@@ -23,8 +23,7 @@ class LVGL_glob
   #- register an lv.lv_* object in the mapping -#
   def register_obj(obj)
     if self.cb_obj == nil    self.cb_obj = {} end
-    var native_ptr = int(obj._p)
-    self.cb_obj[native_ptr] = obj
+    self.cb_obj[obj._p] = obj
   end
 
   def get_object_from_ptr(ptr)
@@ -38,7 +37,7 @@ class LVGL_glob
 
     var event = lv.lv_event(introspect.toptr(event_ptr))
 
-    var target = int(event.target)
+    var target = event.target
     var f = self.cb_event_closure[target]
     var obj = self.get_object_from_ptr(target)
     #print('>> lvgl_event_dispatch', f, obj, event)
@@ -87,7 +86,7 @@ class LVGL_glob
     var cl = lv.lv_obj_class(cl_ptr)
     var event = lv.lv_event(e_ptr)
     var obj_ptr = event.target
-    var obj = self.get_object_from_ptr(int(obj_ptr))
+    var obj = self.get_object_from_ptr(obj_ptr)
     if type(obj) == 'instance' && introspect.get(obj, 'widget_event')
       obj.widget_event(cl, event)
     end
diff --git a/lib/libesp32/Berry/default/embedded/openhasp.be b/lib/libesp32/berry/default/embedded/openhasp.be
similarity index 100%
rename from lib/libesp32/Berry/default/embedded/openhasp.be
rename to lib/libesp32/berry/default/embedded/openhasp.be
diff --git a/lib/libesp32/Berry/default/embedded/openhasp/demo-all.jsonl b/lib/libesp32/berry/default/embedded/openhasp/demo-all.jsonl
similarity index 100%
rename from lib/libesp32/Berry/default/embedded/openhasp/demo-all.jsonl
rename to lib/libesp32/berry/default/embedded/openhasp/demo-all.jsonl
diff --git a/lib/libesp32/Berry/default/embedded/openhasp/demo1.jsonl b/lib/libesp32/berry/default/embedded/openhasp/demo1.jsonl
similarity index 100%
rename from lib/libesp32/Berry/default/embedded/openhasp/demo1.jsonl
rename to lib/libesp32/berry/default/embedded/openhasp/demo1.jsonl
diff --git a/lib/libesp32/Berry/default/embedded/openhasp/demo2.jsonl b/lib/libesp32/berry/default/embedded/openhasp/demo2.jsonl
similarity index 100%
rename from lib/libesp32/Berry/default/embedded/openhasp/demo2.jsonl
rename to lib/libesp32/berry/default/embedded/openhasp/demo2.jsonl
diff --git a/lib/libesp32/Berry/default/embedded/openhasp/demo3.jsonl b/lib/libesp32/berry/default/embedded/openhasp/demo3.jsonl
similarity index 100%
rename from lib/libesp32/Berry/default/embedded/openhasp/demo3.jsonl
rename to lib/libesp32/berry/default/embedded/openhasp/demo3.jsonl
diff --git a/lib/libesp32/Berry/default/embedded/persist.be b/lib/libesp32/berry/default/embedded/persist.be
similarity index 100%
rename from lib/libesp32/Berry/default/embedded/persist.be
rename to lib/libesp32/berry/default/embedded/persist.be
diff --git a/lib/libesp32/Berry/default/embedded/tapp.be b/lib/libesp32/berry/default/embedded/tapp.be
similarity index 100%
rename from lib/libesp32/Berry/default/embedded/tapp.be
rename to lib/libesp32/berry/default/embedded/tapp.be
diff --git a/lib/libesp32/Berry/default/embedded/test_crypto.be b/lib/libesp32/berry/default/embedded/test_crypto.be
similarity index 100%
rename from lib/libesp32/Berry/default/embedded/test_crypto.be
rename to lib/libesp32/berry/default/embedded/test_crypto.be
diff --git a/lib/libesp32/Berry/default/static_block.hpp b/lib/libesp32/berry/default/static_block.hpp
similarity index 100%
rename from lib/libesp32/Berry/default/static_block.hpp
rename to lib/libesp32/berry/default/static_block.hpp
diff --git a/lib/libesp32/Berry/examples/anon_func.be b/lib/libesp32/berry/examples/anon_func.be
similarity index 100%
rename from lib/libesp32/Berry/examples/anon_func.be
rename to lib/libesp32/berry/examples/anon_func.be
diff --git a/lib/libesp32/Berry/examples/bigloop.be b/lib/libesp32/berry/examples/bigloop.be
similarity index 100%
rename from lib/libesp32/Berry/examples/bigloop.be
rename to lib/libesp32/berry/examples/bigloop.be
diff --git a/lib/libesp32/Berry/examples/bintree.be b/lib/libesp32/berry/examples/bintree.be
similarity index 100%
rename from lib/libesp32/Berry/examples/bintree.be
rename to lib/libesp32/berry/examples/bintree.be
diff --git a/lib/libesp32/Berry/examples/calcpi.be b/lib/libesp32/berry/examples/calcpi.be
similarity index 100%
rename from lib/libesp32/Berry/examples/calcpi.be
rename to lib/libesp32/berry/examples/calcpi.be
diff --git a/lib/libesp32/Berry/examples/exception.be b/lib/libesp32/berry/examples/exception.be
similarity index 100%
rename from lib/libesp32/Berry/examples/exception.be
rename to lib/libesp32/berry/examples/exception.be
diff --git a/lib/libesp32/Berry/examples/fib_rec.be b/lib/libesp32/berry/examples/fib_rec.be
similarity index 100%
rename from lib/libesp32/Berry/examples/fib_rec.be
rename to lib/libesp32/berry/examples/fib_rec.be
diff --git a/lib/libesp32/Berry/examples/guess_number.be b/lib/libesp32/berry/examples/guess_number.be
similarity index 100%
rename from lib/libesp32/Berry/examples/guess_number.be
rename to lib/libesp32/berry/examples/guess_number.be
diff --git a/lib/libesp32/Berry/examples/json.be b/lib/libesp32/berry/examples/json.be
similarity index 100%
rename from lib/libesp32/Berry/examples/json.be
rename to lib/libesp32/berry/examples/json.be
diff --git a/lib/libesp32/Berry/examples/lambda.be b/lib/libesp32/berry/examples/lambda.be
similarity index 100%
rename from lib/libesp32/Berry/examples/lambda.be
rename to lib/libesp32/berry/examples/lambda.be
diff --git a/lib/libesp32/Berry/examples/listdir.be b/lib/libesp32/berry/examples/listdir.be
similarity index 100%
rename from lib/libesp32/Berry/examples/listdir.be
rename to lib/libesp32/berry/examples/listdir.be
diff --git a/lib/libesp32/Berry/examples/qsort.be b/lib/libesp32/berry/examples/qsort.be
similarity index 100%
rename from lib/libesp32/Berry/examples/qsort.be
rename to lib/libesp32/berry/examples/qsort.be
diff --git a/lib/libesp32/Berry/examples/repl.be b/lib/libesp32/berry/examples/repl.be
similarity index 100%
rename from lib/libesp32/Berry/examples/repl.be
rename to lib/libesp32/berry/examples/repl.be
diff --git a/lib/libesp32/Berry/examples/string.be b/lib/libesp32/berry/examples/string.be
similarity index 100%
rename from lib/libesp32/Berry/examples/string.be
rename to lib/libesp32/berry/examples/string.be
diff --git a/lib/libesp32/Berry/examples/strmod.be b/lib/libesp32/berry/examples/strmod.be
similarity index 100%
rename from lib/libesp32/Berry/examples/strmod.be
rename to lib/libesp32/berry/examples/strmod.be
diff --git a/lib/libesp32/berry/gen.sh b/lib/libesp32/berry/gen.sh
new file mode 100755
index 000000000..303a62c95
--- /dev/null
+++ b/lib/libesp32/berry/gen.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+python3 tools/pycoc/main.py -o generate src default ../berry_mapping/src -c default/berry_conf.h
diff --git a/lib/libesp32/Berry/generate/be_const_strtab.h b/lib/libesp32/berry/generate/be_const_strtab.h
similarity index 99%
rename from lib/libesp32/Berry/generate/be_const_strtab.h
rename to lib/libesp32/berry/generate/be_const_strtab.h
index 9692c8508..cdf680ea3 100644
--- a/lib/libesp32/Berry/generate/be_const_strtab.h
+++ b/lib/libesp32/berry/generate/be_const_strtab.h
@@ -48,7 +48,6 @@ extern const bcstring be_const_str_I2C_X3A;
 extern const bcstring be_const_str_LVG_X3A_X20call_X20to_X20unsupported_X20callback;
 extern const bcstring be_const_str_Leds;
 extern const bcstring be_const_str_MD5;
-extern const bcstring be_const_str_No_X20callback_X20available;
 extern const bcstring be_const_str_None;
 extern const bcstring be_const_str_OPTION_A;
 extern const bcstring be_const_str_OneWire;
@@ -163,7 +162,7 @@ extern const bcstring be_const_str__X7B;
 extern const bcstring be_const_str__X7B_X7D;
 extern const bcstring be_const_str__X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D;
 extern const bcstring be_const_str__X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D;
-extern const bcstring be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D;
+extern const bcstring be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_X26deg_X3BC_X7Be_X7D;
 extern const bcstring be_const_str__X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D;
 extern const bcstring be_const_str__X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D;
 extern const bcstring be_const_str__X7D;
@@ -175,7 +174,6 @@ extern const bcstring be_const_str__archive;
 extern const bcstring be_const_str__available;
 extern const bcstring be_const_str__begin_transmission;
 extern const bcstring be_const_str__buffer;
-extern const bcstring be_const_str__cb;
 extern const bcstring be_const_str__ccmd;
 extern const bcstring be_const_str__class;
 extern const bcstring be_const_str__cmd;
@@ -187,7 +185,6 @@ extern const bcstring be_const_str__end_transmission;
 extern const bcstring be_const_str__energy;
 extern const bcstring be_const_str__error;
 extern const bcstring be_const_str__filename;
-extern const bcstring be_const_str__get_cb;
 extern const bcstring be_const_str__global_addr;
 extern const bcstring be_const_str__global_def;
 extern const bcstring be_const_str__lvgl;
@@ -250,7 +247,7 @@ extern const bcstring be_const_str_call;
 extern const bcstring be_const_str_call_native;
 extern const bcstring be_const_str_calldepth;
 extern const bcstring be_const_str_can_show;
-extern const bcstring be_const_str_cb_dispatch;
+extern const bcstring be_const_str_cb;
 extern const bcstring be_const_str_cb_do_nothing;
 extern const bcstring be_const_str_cb_event_closure;
 extern const bcstring be_const_str_cb_obj;
@@ -384,6 +381,7 @@ extern const bcstring be_const_str_get_bat_power;
 extern const bcstring be_const_str_get_bat_voltage;
 extern const bcstring be_const_str_get_battery_chargin_status;
 extern const bcstring be_const_str_get_bri;
+extern const bcstring be_const_str_get_cb_list;
 extern const bcstring be_const_str_get_coords;
 extern const bcstring be_const_str_get_current_module_name;
 extern const bcstring be_const_str_get_current_module_path;
@@ -402,7 +400,6 @@ extern const bcstring be_const_str_get_style_bg_color;
 extern const bcstring be_const_str_get_style_line_color;
 extern const bcstring be_const_str_get_style_pad_right;
 extern const bcstring be_const_str_get_switch;
-extern const bcstring be_const_str_get_tasmota;
 extern const bcstring be_const_str_get_temp;
 extern const bcstring be_const_str_get_vbus_current;
 extern const bcstring be_const_str_get_vbus_voltage;
@@ -556,7 +553,6 @@ extern const bcstring be_const_str_readline;
 extern const bcstring be_const_str_real;
 extern const bcstring be_const_str_reapply;
 extern const bcstring be_const_str_redirect;
-extern const bcstring be_const_str_reduce;
 extern const bcstring be_const_str_refr_size;
 extern const bcstring be_const_str_register_obj;
 extern const bcstring be_const_str_remove;
diff --git a/lib/libesp32/Berry/generate/be_const_strtab_def.h b/lib/libesp32/berry/generate/be_const_strtab_def.h
similarity index 61%
rename from lib/libesp32/Berry/generate/be_const_strtab_def.h
rename to lib/libesp32/berry/generate/be_const_strtab_def.h
index 44676a35e..cd2198905 100644
--- a/lib/libesp32/Berry/generate/be_const_strtab_def.h
+++ b/lib/libesp32/berry/generate/be_const_strtab_def.h
@@ -1,720 +1,716 @@
-be_define_const_str(, "", 2166136261u, 0, 0, &be_const_str_True);
-be_define_const_str(_X0A, "\n", 252472541u, 0, 1, &be_const_str_i2c_enabled);
-be_define_const_str(_X20, " ", 621580159u, 0, 1, &be_const_str_add_cmd);
-be_define_const_str(_X21_X3D, "!=", 2428715011u, 0, 2, &be_const_str__X23autoexec_X2Ebe);
-be_define_const_str(_X21_X3D_X3D, "!==", 559817114u, 0, 3, &be_const_str__X2Ew);
-be_define_const_str(_X23, "#", 638357778u, 0, 1, &be_const_str_No_X20callback_X20available);
-be_define_const_str(_X23autoexec_X2Ebat, "#autoexec.bat", 3382890497u, 0, 13, NULL);
-be_define_const_str(_X23autoexec_X2Ebe, "#autoexec.be", 1181757091u, 0, 12, &be_const_str_assert);
-be_define_const_str(_X23display_X2Eini, "#display.ini", 182218220u, 0, 12, &be_const_str_code);
-be_define_const_str(_X23init_X2Ebat, "#init.bat", 3297595077u, 0, 9, &be_const_str__X2502d_X25s_X2502d);
-be_define_const_str(_X23preinit_X2Ebe, "#preinit.be", 687035716u, 0, 11, &be_const_str__timers);
-be_define_const_str(_X2502d_X25s_X2502d, "%02d%s%02d", 1587999717u, 0, 10, &be_const_str__X3D_X3C_X3E_X21);
-be_define_const_str(_X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d, "%04d-%02d-%02dT%02d:%02d:%02d", 3425528601u, 0, 29, &be_const_str_get_object_from_ptr);
-be_define_const_str(_X25s_X2Eautoconf, "%s.autoconf", 3560383524u, 0, 11, &be_const_str_RES_OK);
-be_define_const_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, "&lt;Error: apply new or remove&gt;", 2855507949u, 0, 34, &be_const_str_hs2rgb);
-be_define_const_str(_X26lt_X3BNone_X26gt_X3B, "&lt;None&gt;", 2602165498u, 0, 12, &be_const_str__X2Fac);
-be_define_const_str(_X28_X29, "()", 685372826u, 0, 2, NULL);
-be_define_const_str(_X2B, "+", 772578730u, 0, 1, &be_const_str_lower);
-be_define_const_str(_X2C, ",", 688690635u, 0, 1, &be_const_str_SERIAL_7O1);
-be_define_const_str(_X2D_X2D_X3A_X2D_X2D, "--:--", 1370615441u, 0, 5, &be_const_str__X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E);
-be_define_const_str(_X2E, ".", 722245873u, 0, 1, &be_const_str_search);
-be_define_const_str(_X2E_X2E, "..", 2748622605u, 0, 2, &be_const_str__debug_present);
-be_define_const_str(_X2Eautoconf, ".autoconf", 2524679088u, 0, 9, &be_const_str_false);
-be_define_const_str(_X2Ebe, ".be", 1325797348u, 0, 3, &be_const_str_Tasmota);
-be_define_const_str(_X2Ebec, ".bec", 3985273221u, 0, 4, &be_const_str_CFG_X3A_X20downloading_X20_X27_X25s_X27);
-be_define_const_str(_X2Elen, ".len", 850842136u, 0, 4, &be_const_str__X3Cselect_X20name_X3D_X27zip_X27_X3E);
-be_define_const_str(_X2Ep, ".p", 1171526419u, 0, 2, NULL);
-be_define_const_str(_X2Ep1, ".p1", 249175686u, 0, 3, &be_const_str__t);
-be_define_const_str(_X2Ep2, ".p2", 232398067u, 0, 3, &be_const_str_BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29);
-be_define_const_str(_X2Esize, ".size", 1965188224u, 0, 5, &be_const_str_is_first_time);
-be_define_const_str(_X2Etapp, ".tapp", 1363391594u, 0, 5, &be_const_str__X7B);
-be_define_const_str(_X2Ew, ".w", 1255414514u, 0, 2, &be_const_str_clear);
-be_define_const_str(_X2F, "/", 705468254u, 0, 1, &be_const_str_SERIAL_7O2);
-be_define_const_str(_X2F_X2Eautoconf, "/.autoconf", 2212074393u, 0, 10, &be_const_str_CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27);
-be_define_const_str(_X2F_X3Frst_X3D, "/?rst=", 580074707u, 0, 6, &be_const_str_SERIAL_7N2);
-be_define_const_str(_X2Fac, "/ac", 3904651978u, 0, 3, &be_const_str_WS2812);
-be_define_const_str(_X3A, ":", 1057798253u, 0, 1, &be_const_str_AudioFileSourceFS);
-be_define_const_str(_X3C, "<", 957132539u, 0, 1, &be_const_str_digital_write);
-be_define_const_str(_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "</form></p>", 3546571739u, 0, 11, &be_const_str_LVG_X3A_X20call_X20to_X20unsupported_X20callback);
-be_define_const_str(_X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "</select><p></p>", 1863865923u, 0, 16, &be_const_str_rule);
-be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_set_chg_current);
-be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "<button name='reapply' class='button bgrn'>Re-apply current configuration</button>", 3147934216u, 0, 82, &be_const_str_find_op);
-be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "<button name='zipapply' class='button bgrn'>Apply configuration</button>", 1205771629u, 0, 72, NULL);
-be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "<fieldset><style>.bdis{background:#888;}.bdis:hover{background:#888;}</style>", 842307168u, 0, 77, &be_const_str_get_current_module_path);
-be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "<instance: %s(%s, %s, %s)", 257363333u, 0, 25, NULL);
-be_define_const_str(_X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E, "<label>Choose a device configuration:</label><br>", 1336654704u, 0, 49, &be_const_str_delay);
-be_define_const_str(_X3Clambda_X3E, "<lambda>", 607256038u, 0, 8, &be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20);
-be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, "<legend><b title='Autoconfiguration'>&nbsp;Current auto-configuration</b></legend>", 4212500780u, 0, 82, &be_const_str_CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29);
-be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, "<legend><b title='New autoconf'>&nbsp;Select new auto-configuration</b></legend>", 1926223891u, 0, 80, &be_const_str_CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29);
-be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "<option value='%s'>%s</option>", 510303524u, 0, 30, &be_const_str_write);
-be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "<option value='reset'>&lt;Remove autoconf&gt;</option>", 3994619755u, 0, 54, &be_const_str_None);
-be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "<p style='width:340px;'><b>Exception:</b><br>'%s'<br>%s</p>", 4252565082u, 0, 59, &be_const_str_classof);
-be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "<p></p></fieldset><p></p>", 2052843416u, 0, 25, &be_const_str_button_pressed);
-be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "<p><form id=ac action='ac' style='display: block;' method='get'><button>&#129668; Auto-configuration</button></form></p>", 452285201u, 0, 120, NULL);
-be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "<p><form id=reapply style='display: block;' action='/ac' method='post' ", 546993478u, 0, 71, &be_const_str_wd);
-be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "<p><form id=zip style='display: block;' action='/ac' method='post' ", 4033622166u, 0, 67, &be_const_str__X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E);
-be_define_const_str(_X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E, "<p><small>&nbsp;(This feature requires an internet connection)</small></p>", 2719266486u, 0, 74, NULL);
-be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "<p>Current configuration: </p><p><b>%s</b></p>", 4115655761u, 0, 46, &be_const_str_exec_tele);
-be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "<select name='zip'>", 4247924536u, 0, 19, &be_const_str_False);
-be_define_const_str(_X3D, "=", 940354920u, 0, 1, &be_const_str_CFG_X3A_X20return_code_X3D_X25i);
-be_define_const_str(_X3D_X3C_X3E_X21, "=<>!", 2664470277u, 0, 4, &be_const_str_CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting);
-be_define_const_str(_X3D_X3D, "==", 2431966415u, 0, 2, &be_const_str_get);
-be_define_const_str(_X3E, ">", 990687777u, 0, 1, &be_const_str_CFG_X3A_X20loading_X20_X27_X25s_X27);
-be_define_const_str(_X3E_X3D, ">=", 284975636u, 0, 2, &be_const_str__anonymous_);
-be_define_const_str(_X3F, "?", 973910158u, 0, 1, &be_const_str_TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27);
-be_define_const_str(AES_GCM, "AES_GCM", 3832208678u, 0, 7, NULL);
-be_define_const_str(AXP192, "AXP192", 757230128u, 0, 6, &be_const_str__buffer);
-be_define_const_str(Animate_X20pc_X20is_X20out_X20of_X20range, "Animate pc is out of range", 1854929421u, 0, 26, &be_const_str_true);
-be_define_const_str(AudioFileSource, "AudioFileSource", 2959980058u, 0, 15, &be_const_str_allocated);
-be_define_const_str(AudioFileSourceFS, "AudioFileSourceFS", 1839147653u, 0, 17, &be_const_str_due);
-be_define_const_str(AudioGenerator, "AudioGenerator", 1839297342u, 0, 14, &be_const_str_enabled);
-be_define_const_str(AudioGeneratorMP3, "AudioGeneratorMP3", 2199818488u, 0, 17, &be_const_str_check_privileged_access);
-be_define_const_str(AudioGeneratorWAV, "AudioGeneratorWAV", 2746509368u, 0, 17, &be_const_str_digital_read);
-be_define_const_str(AudioOutput, "AudioOutput", 3257792048u, 0, 11, &be_const_str_get_pixel_color);
-be_define_const_str(AudioOutputI2S, "AudioOutputI2S", 638031784u, 0, 14, NULL);
-be_define_const_str(Auto_X2Dconfiguration, "Auto-configuration", 1665006109u, 0, 18, NULL);
-be_define_const_str(BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20, "BRY: ERROR, bad json: ", 2715135809u, 0, 22, &be_const_str_fromptr);
-be_define_const_str(BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, "BRY: Exception> '%s' - %s", 2246990964u, 0, 25, &be_const_str_SERIAL_6N2);
-be_define_const_str(BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29, "BRY: could not save compiled file %s (%s)", 736659787u, 0, 41, NULL);
-be_define_const_str(BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson, "BRY: failed to load _persist.json", 2991913445u, 0, 33, &be_const_str_set_time);
-be_define_const_str(BUTTON_CONFIGURATION, "BUTTON_CONFIGURATION", 70820856u, 0, 20, &be_const_str_files);
-be_define_const_str(CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting, "CFG: 'init.bat' done, restarting", 1569670677u, 0, 32, &be_const_str_push_path);
-be_define_const_str(CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, "CFG: Exception> '%s' - %s", 1228874553u, 0, 25, &be_const_str_CFG_X3A_X20removed_X20file_X20_X27_X25s_X27);
-be_define_const_str(CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29, "CFG: could not run %s (%s - %s)", 1428829580u, 0, 31, &be_const_str_COLOR_BLACK);
-be_define_const_str(CFG_X3A_X20downloading_X20_X27_X25s_X27, "CFG: downloading '%s'", 589480701u, 0, 21, &be_const_str_floor);
-be_define_const_str(CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27, "CFG: exception '%s' - '%s'", 4095407913u, 0, 26, &be_const_str_get_option);
-be_define_const_str(CFG_X3A_X20loaded_X20_X20, "CFG: loaded  ", 3710273538u, 0, 13, &be_const_str_delete_all_configs);
+be_define_const_str(, "", 2166136261u, 0, 0, &be_const_str_AudioFileSourceFS);
+be_define_const_str(_X0A, "\n", 252472541u, 0, 1, &be_const_str_file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27);
+be_define_const_str(_X20, " ", 621580159u, 0, 1, &be_const_str_gen_cb);
+be_define_const_str(_X21_X3D, "!=", 2428715011u, 0, 2, &be_const_str__X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E);
+be_define_const_str(_X21_X3D_X3D, "!==", 559817114u, 0, 3, &be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E);
+be_define_const_str(_X23, "#", 638357778u, 0, 1, &be_const_str_refr_size);
+be_define_const_str(_X23autoexec_X2Ebat, "#autoexec.bat", 3382890497u, 0, 13, &be_const_str_get_option);
+be_define_const_str(_X23autoexec_X2Ebe, "#autoexec.be", 1181757091u, 0, 12, &be_const_str_every_second);
+be_define_const_str(_X23display_X2Eini, "#display.ini", 182218220u, 0, 12, &be_const_str__X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E);
+be_define_const_str(_X23init_X2Ebat, "#init.bat", 3297595077u, 0, 9, &be_const_str_real);
+be_define_const_str(_X23preinit_X2Ebe, "#preinit.be", 687035716u, 0, 11, &be_const_str_publish_result);
+be_define_const_str(_X2502d_X25s_X2502d, "%02d%s%02d", 1587999717u, 0, 10, &be_const_str_last_modified);
+be_define_const_str(_X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d, "%04d-%02d-%02dT%02d:%02d:%02d", 3425528601u, 0, 29, &be_const_str__write);
+be_define_const_str(_X25s_X2Eautoconf, "%s.autoconf", 3560383524u, 0, 11, &be_const_str_format);
+be_define_const_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, "&lt;Error: apply new or remove&gt;", 2855507949u, 0, 34, &be_const_str___upper__);
+be_define_const_str(_X26lt_X3BNone_X26gt_X3B, "&lt;None&gt;", 2602165498u, 0, 12, &be_const_str_SERIAL_7E2);
+be_define_const_str(_X28_X29, "()", 685372826u, 0, 2, &be_const_str_get_alternate);
+be_define_const_str(_X2B, "+", 772578730u, 0, 1, &be_const_str_area);
+be_define_const_str(_X2C, ",", 688690635u, 0, 1, NULL);
+be_define_const_str(_X2D_X2D_X3A_X2D_X2D, "--:--", 1370615441u, 0, 5, &be_const_str__X2F_X2Eautoconf);
+be_define_const_str(_X2E, ".", 722245873u, 0, 1, &be_const_str__ccmd);
+be_define_const_str(_X2E_X2E, "..", 2748622605u, 0, 2, NULL);
+be_define_const_str(_X2Eautoconf, ".autoconf", 2524679088u, 0, 9, NULL);
+be_define_const_str(_X2Ebe, ".be", 1325797348u, 0, 3, &be_const_str_digital_read);
+be_define_const_str(_X2Ebec, ".bec", 3985273221u, 0, 4, &be_const_str_CFG_X3A_X20loading_X20);
+be_define_const_str(_X2Elen, ".len", 850842136u, 0, 4, &be_const_str_SERIAL_6N2);
+be_define_const_str(_X2Ep, ".p", 1171526419u, 0, 2, &be_const_str_arg_name);
+be_define_const_str(_X2Ep1, ".p1", 249175686u, 0, 3, &be_const_str_battery_present);
+be_define_const_str(_X2Ep2, ".p2", 232398067u, 0, 3, &be_const_str_b);
+be_define_const_str(_X2Esize, ".size", 1965188224u, 0, 5, &be_const_str_CFG_X3A_X20loaded_X20_X27_X25s_X27);
+be_define_const_str(_X2Etapp, ".tapp", 1363391594u, 0, 5, &be_const_str_Parameter_X20error);
+be_define_const_str(_X2Ew, ".w", 1255414514u, 0, 2, &be_const_str_running);
+be_define_const_str(_X2F, "/", 705468254u, 0, 1, &be_const_str__class);
+be_define_const_str(_X2F_X2Eautoconf, "/.autoconf", 2212074393u, 0, 10, &be_const_str_connect);
+be_define_const_str(_X2F_X3Frst_X3D, "/?rst=", 580074707u, 0, 6, &be_const_str_content_stop);
+be_define_const_str(_X2Fac, "/ac", 3904651978u, 0, 3, &be_const_str_ins_ramp);
+be_define_const_str(_X3A, ":", 1057798253u, 0, 1, &be_const_str_get_string);
+be_define_const_str(_X3C, "<", 957132539u, 0, 1, &be_const_str_set_bri);
+be_define_const_str(_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "</form></p>", 3546571739u, 0, 11, &be_const_str_remove);
+be_define_const_str(_X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "</select><p></p>", 1863865923u, 0, 16, NULL);
+be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_remove_rule);
+be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "<button name='reapply' class='button bgrn'>Re-apply current configuration</button>", 3147934216u, 0, 82, &be_const_str___lower__);
+be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "<button name='zipapply' class='button bgrn'>Apply configuration</button>", 1205771629u, 0, 72, &be_const_str_content_send_style);
+be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "<fieldset><style>.bdis{background:#888;}.bdis:hover{background:#888;}</style>", 842307168u, 0, 77, &be_const_str_bri);
+be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "<instance: %s(%s, %s, %s)", 257363333u, 0, 25, &be_const_str_deg);
+be_define_const_str(_X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E, "<label>Choose a device configuration:</label><br>", 1336654704u, 0, 49, &be_const_str_cosh);
+be_define_const_str(_X3Clambda_X3E, "<lambda>", 607256038u, 0, 8, &be_const_str_item);
+be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, "<legend><b title='Autoconfiguration'>&nbsp;Current auto-configuration</b></legend>", 4212500780u, 0, 82, &be_const_str_AXP192);
+be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, "<legend><b title='New autoconf'>&nbsp;Select new auto-configuration</b></legend>", 1926223891u, 0, 80, &be_const_str_internal_error);
+be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "<option value='%s'>%s</option>", 510303524u, 0, 30, &be_const_str_enabled);
+be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "<option value='reset'>&lt;Remove autoconf&gt;</option>", 3994619755u, 0, 54, &be_const_str_widget_cb);
+be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "<p style='width:340px;'><b>Exception:</b><br>'%s'<br>%s</p>", 4252565082u, 0, 59, &be_const_str_EVENT_DRAW_MAIN);
+be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "<p></p></fieldset><p></p>", 2052843416u, 0, 25, &be_const_str_allocated);
+be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "<p><form id=ac action='ac' style='display: block;' method='get'><button>&#129668; Auto-configuration</button></form></p>", 452285201u, 0, 120, &be_const_str_CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s);
+be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "<p><form id=reapply style='display: block;' action='/ac' method='post' ", 546993478u, 0, 71, &be_const_str_find_op);
+be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "<p><form id=zip style='display: block;' action='/ac' method='post' ", 4033622166u, 0, 67, NULL);
+be_define_const_str(_X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E, "<p><small>&nbsp;(This feature requires an internet connection)</small></p>", 2719266486u, 0, 74, &be_const_str_str);
+be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "<p>Current configuration: </p><p><b>%s</b></p>", 4115655761u, 0, 46, &be_const_str_gc);
+be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "<select name='zip'>", 4247924536u, 0, 19, &be_const_str_RES_OK);
+be_define_const_str(_X3D, "=", 940354920u, 0, 1, &be_const_str_AudioFileSource);
+be_define_const_str(_X3D_X3C_X3E_X21, "=<>!", 2664470277u, 0, 4, &be_const_str_ctypes_bytes_dyn);
+be_define_const_str(_X3D_X3D, "==", 2431966415u, 0, 2, &be_const_str_CFG_X3A_X20removed_X20file_X20_X27_X25s_X27);
+be_define_const_str(_X3E, ">", 990687777u, 0, 1, NULL);
+be_define_const_str(_X3E_X3D, ">=", 284975636u, 0, 2, NULL);
+be_define_const_str(_X3F, "?", 973910158u, 0, 1, &be_const_str_SERIAL_5N1);
+be_define_const_str(AES_GCM, "AES_GCM", 3832208678u, 0, 7, &be_const_str_cmd_res);
+be_define_const_str(AXP192, "AXP192", 757230128u, 0, 6, &be_const_str_shared_key);
+be_define_const_str(Animate_X20pc_X20is_X20out_X20of_X20range, "Animate pc is out of range", 1854929421u, 0, 26, &be_const_str_add_driver);
+be_define_const_str(AudioFileSource, "AudioFileSource", 2959980058u, 0, 15, &be_const_str__timers);
+be_define_const_str(AudioFileSourceFS, "AudioFileSourceFS", 1839147653u, 0, 17, &be_const_str_MD5);
+be_define_const_str(AudioGenerator, "AudioGenerator", 1839297342u, 0, 14, &be_const_str_BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s);
+be_define_const_str(AudioGeneratorMP3, "AudioGeneratorMP3", 2199818488u, 0, 17, NULL);
+be_define_const_str(AudioGeneratorWAV, "AudioGeneratorWAV", 2746509368u, 0, 17, &be_const_str_add);
+be_define_const_str(AudioOutput, "AudioOutput", 3257792048u, 0, 11, &be_const_str_no_X20GPIO_X20specified_X20for_X20neopixelbus);
+be_define_const_str(AudioOutputI2S, "AudioOutputI2S", 638031784u, 0, 14, &be_const_str_codedump);
+be_define_const_str(Auto_X2Dconfiguration, "Auto-configuration", 1665006109u, 0, 18, &be_const_str_fromptr);
+be_define_const_str(BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20, "BRY: ERROR, bad json: ", 2715135809u, 0, 22, &be_const_str_hs2rgb);
+be_define_const_str(BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, "BRY: Exception> '%s' - %s", 2246990964u, 0, 25, &be_const_str_animate);
+be_define_const_str(BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29, "BRY: could not save compiled file %s (%s)", 736659787u, 0, 41, &be_const_str_True);
+be_define_const_str(BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson, "BRY: failed to load _persist.json", 2991913445u, 0, 33, NULL);
+be_define_const_str(BUTTON_CONFIGURATION, "BUTTON_CONFIGURATION", 70820856u, 0, 20, &be_const_str_tob64);
+be_define_const_str(CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting, "CFG: 'init.bat' done, restarting", 1569670677u, 0, 32, &be_const_str_get_object_from_ptr);
+be_define_const_str(CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, "CFG: Exception> '%s' - %s", 1228874553u, 0, 25, &be_const_str_concat);
+be_define_const_str(CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29, "CFG: could not run %s (%s - %s)", 1428829580u, 0, 31, NULL);
+be_define_const_str(CFG_X3A_X20downloading_X20_X27_X25s_X27, "CFG: downloading '%s'", 589480701u, 0, 21, &be_const_str_LVG_X3A_X20call_X20to_X20unsupported_X20callback);
+be_define_const_str(CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27, "CFG: exception '%s' - '%s'", 4095407913u, 0, 26, &be_const_str_get_free_heap);
+be_define_const_str(CFG_X3A_X20loaded_X20_X20, "CFG: loaded  ", 3710273538u, 0, 13, &be_const_str_rtc);
 be_define_const_str(CFG_X3A_X20loaded_X20_X27_X25s_X27, "CFG: loaded '%s'", 1699028828u, 0, 16, NULL);
-be_define_const_str(CFG_X3A_X20loading_X20, "CFG: loading ", 4010361503u, 0, 13, NULL);
-be_define_const_str(CFG_X3A_X20loading_X20_X27_X25s_X27, "CFG: loading '%s'", 2285306097u, 0, 17, &be_const_str_SK6812_GRBW);
+be_define_const_str(CFG_X3A_X20loading_X20, "CFG: loading ", 4010361503u, 0, 13, &be_const_str_set_height);
+be_define_const_str(CFG_X3A_X20loading_X20_X27_X25s_X27, "CFG: loading '%s'", 2285306097u, 0, 17, &be_const_str_SERIAL_6N1);
 be_define_const_str(CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29, "CFG: multiple autoconf files found, aborting ('%s' + '%s')", 197663371u, 0, 58, NULL);
-be_define_const_str(CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found, "CFG: no '*.autoconf' file found", 127493957u, 0, 31, &be_const_str_get_free_heap);
-be_define_const_str(CFG_X3A_X20ran_X20_X20, "CFG: ran  ", 3579570472u, 0, 10, &be_const_str_contains);
-be_define_const_str(CFG_X3A_X20removed_X20file_X20_X27_X25s_X27, "CFG: removed file '%s'", 2048602473u, 0, 22, &be_const_str_SERIAL_8E2);
-be_define_const_str(CFG_X3A_X20removing_X20autoconf_X20files, "CFG: removing autoconf files", 4014704970u, 0, 28, &be_const_str_get_bat_charge_current);
-be_define_const_str(CFG_X3A_X20removing_X20first_X20time_X20marker, "CFG: removing first time marker", 2125556683u, 0, 31, &be_const_str__lvgl);
-be_define_const_str(CFG_X3A_X20return_code_X3D_X25i, "CFG: return_code=%i", 2059897320u, 0, 19, &be_const_str_OPTION_A);
+be_define_const_str(CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found, "CFG: no '*.autoconf' file found", 127493957u, 0, 31, &be_const_str_get_style_bg_color);
+be_define_const_str(CFG_X3A_X20ran_X20_X20, "CFG: ran  ", 3579570472u, 0, 10, &be_const_str_resp_cmnd_str);
+be_define_const_str(CFG_X3A_X20removed_X20file_X20_X27_X25s_X27, "CFG: removed file '%s'", 2048602473u, 0, 22, &be_const_str_millis);
+be_define_const_str(CFG_X3A_X20removing_X20autoconf_X20files, "CFG: removing autoconf files", 4014704970u, 0, 28, &be_const_str__anonymous_);
+be_define_const_str(CFG_X3A_X20removing_X20first_X20time_X20marker, "CFG: removing first time marker", 2125556683u, 0, 31, &be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E);
+be_define_const_str(CFG_X3A_X20return_code_X3D_X25i, "CFG: return_code=%i", 2059897320u, 0, 19, &be_const_str_group_def);
 be_define_const_str(CFG_X3A_X20running_X20, "CFG: running ", 2478334534u, 0, 13, NULL);
 be_define_const_str(CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem, "CFG: skipping 'display.ini' because already present in file-system", 3965549264u, 0, 66, NULL);
-be_define_const_str(COLOR_BLACK, "COLOR_BLACK", 264427940u, 0, 11, NULL);
-be_define_const_str(COLOR_WHITE, "COLOR_WHITE", 2536871270u, 0, 11, &be_const_str__energy);
-be_define_const_str(EC_C25519, "EC_C25519", 95492591u, 0, 9, &be_const_str_gc);
-be_define_const_str(EVENT_DRAW_MAIN, "EVENT_DRAW_MAIN", 1955620614u, 0, 15, &be_const_str_SERIAL_5E2);
-be_define_const_str(EVENT_DRAW_PART_BEGIN, "EVENT_DRAW_PART_BEGIN", 3391865024u, 0, 21, &be_const_str_available);
-be_define_const_str(EVENT_DRAW_PART_END, "EVENT_DRAW_PART_END", 3301625292u, 0, 19, &be_const_str_chars_in_string);
-be_define_const_str(False, "False", 2541049336u, 0, 5, &be_const_str_set_style_line_color);
-be_define_const_str(GET, "GET", 2531704439u, 0, 3, &be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E);
-be_define_const_str(HTTP_GET, "HTTP_GET", 1722467738u, 0, 8, &be_const_str_I2C_Driver);
-be_define_const_str(HTTP_POST, "HTTP_POST", 1999554144u, 0, 9, &be_const_str_imin);
-be_define_const_str(I2C_X3A, "I2C:", 813483371u, 0, 4, &be_const_str_read24);
-be_define_const_str(I2C_Driver, "I2C_Driver", 1714501658u, 0, 10, &be_const_str_addr);
-be_define_const_str(LVG_X3A_X20call_X20to_X20unsupported_X20callback, "LVG: call to unsupported callback", 504176819u, 0, 33, &be_const_str_cb_dispatch);
-be_define_const_str(Leds, "Leds", 2709245275u, 0, 4, &be_const_str_arg_name);
-be_define_const_str(MD5, "MD5", 1935726387u, 0, 3, NULL);
-be_define_const_str(No_X20callback_X20available, "No callback available", 633786138u, 0, 21, &be_const_str_gpio);
-be_define_const_str(None, "None", 810547195u, 0, 4, &be_const_str_SERIAL_5E1);
-be_define_const_str(OPTION_A, "OPTION_A", 1133299440u, 0, 8, &be_const_str_init_draw_line_dsc);
-be_define_const_str(OneWire, "OneWire", 2298990722u, 0, 7, &be_const_str_Timer);
-be_define_const_str(PART_MAIN, "PART_MAIN", 2473491508u, 0, 9, &be_const_str_STATE_DEFAULT);
-be_define_const_str(POST, "POST", 1929554311u, 0, 4, NULL);
-be_define_const_str(Parameter_X20error, "Parameter error", 3840042038u, 0, 15, NULL);
-be_define_const_str(RES_OK, "RES_OK", 1233817284u, 0, 6, &be_const_str_bri);
-be_define_const_str(Restart_X201, "Restart 1", 3504455855u, 0, 9, &be_const_str_min);
-be_define_const_str(SERIAL_5E1, "SERIAL_5E1", 1163775235u, 0, 10, &be_const_str_zero);
-be_define_const_str(SERIAL_5E2, "SERIAL_5E2", 1180552854u, 0, 10, &be_const_str_lv_obj_class);
-be_define_const_str(SERIAL_5N1, "SERIAL_5N1", 3313031680u, 0, 10, &be_const_str_ins_ramp);
-be_define_const_str(SERIAL_5N2, "SERIAL_5N2", 3363364537u, 0, 10, NULL);
-be_define_const_str(SERIAL_5O1, "SERIAL_5O1", 3782657917u, 0, 10, &be_const_str_flush);
-be_define_const_str(SERIAL_5O2, "SERIAL_5O2", 3732325060u, 0, 10, NULL);
-be_define_const_str(SERIAL_6E1, "SERIAL_6E1", 334249486u, 0, 10, NULL);
-be_define_const_str(SERIAL_6E2, "SERIAL_6E2", 317471867u, 0, 10, NULL);
-be_define_const_str(SERIAL_6N1, "SERIAL_6N1", 198895701u, 0, 10, &be_const_str_char);
-be_define_const_str(SERIAL_6N2, "SERIAL_6N2", 148562844u, 0, 10, &be_const_str_matrix);
-be_define_const_str(SERIAL_6O1, "SERIAL_6O1", 266153272u, 0, 10, &be_const_str_atleast1);
-be_define_const_str(SERIAL_6O2, "SERIAL_6O2", 316486129u, 0, 10, &be_const_str_content_send);
-be_define_const_str(SERIAL_7E1, "SERIAL_7E1", 147718061u, 0, 10, &be_const_str_stop_iteration);
-be_define_const_str(SERIAL_7E2, "SERIAL_7E2", 97385204u, 0, 10, &be_const_str_copy);
-be_define_const_str(SERIAL_7N1, "SERIAL_7N1", 1891060246u, 0, 10, NULL);
-be_define_const_str(SERIAL_7N2, "SERIAL_7N2", 1874282627u, 0, 10, &be_const_str_elif);
-be_define_const_str(SERIAL_7O1, "SERIAL_7O1", 1823802675u, 0, 10, &be_const_str_init);
-be_define_const_str(SERIAL_7O2, "SERIAL_7O2", 1840580294u, 0, 10, &be_const_str_global);
-be_define_const_str(SERIAL_8E1, "SERIAL_8E1", 2371121616u, 0, 10, &be_const_str_scan);
-be_define_const_str(SERIAL_8E2, "SERIAL_8E2", 2421454473u, 0, 10, &be_const_str_deregister_obj);
-be_define_const_str(SERIAL_8N1, "SERIAL_8N1", 2369297235u, 0, 10, &be_const_str_resp_cmnd_done);
-be_define_const_str(SERIAL_8N2, "SERIAL_8N2", 2386074854u, 0, 10, &be_const_str_sys);
-be_define_const_str(SERIAL_8O1, "SERIAL_8O1", 289122742u, 0, 10, &be_const_str_get_vbus_current);
-be_define_const_str(SERIAL_8O2, "SERIAL_8O2", 272345123u, 0, 10, &be_const_str_gamma10);
-be_define_const_str(SK6812_GRBW, "SK6812_GRBW", 81157857u, 0, 11, NULL);
-be_define_const_str(STATE_DEFAULT, "STATE_DEFAULT", 712406428u, 0, 13, &be_const_str_classname);
-be_define_const_str(TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27, "TAP: found Tasmota App '%s'", 2643152398u, 0, 27, NULL);
-be_define_const_str(Tasmota, "Tasmota", 4047617668u, 0, 7, &be_const_str_top);
-be_define_const_str(Tele, "Tele", 1329980653u, 0, 4, &be_const_str_exists);
-be_define_const_str(Timer, "Timer", 3948127682u, 0, 5, &be_const_str_del);
-be_define_const_str(True, "True", 3453902341u, 0, 4, &be_const_str_real);
-be_define_const_str(Unknown_X20command, "Unknown command", 1830905432u, 0, 15, &be_const_str_get_percentage);
-be_define_const_str(WS2812, "WS2812", 3539741218u, 0, 6, &be_const_str_finish);
-be_define_const_str(WS2812_GRB, "WS2812_GRB", 1736405692u, 0, 10, &be_const_str_tasmota);
-be_define_const_str(Wire, "Wire", 1938276536u, 0, 4, &be_const_str__begin_transmission);
-be_define_const_str(_X5B, "[", 3725336506u, 0, 1, NULL);
-be_define_const_str(_X5D, "]", 3624670792u, 0, 1, NULL);
-be_define_const_str(_, "_", 3658226030u, 0, 1, NULL);
-be_define_const_str(__iterator__, "__iterator__", 3884039703u, 0, 12, &be_const_str_pixel_count);
-be_define_const_str(__lower__, "__lower__", 123855590u, 0, 9, &be_const_str_pin_mode);
-be_define_const_str(__upper__, "__upper__", 3612202883u, 0, 9, &be_const_str_engine);
-be_define_const_str(_anonymous_, "_anonymous_", 1957281476u, 0, 11, &be_const_str_get_light);
-be_define_const_str(_archive, "_archive", 4004559404u, 0, 8, &be_const_str_cosh);
-be_define_const_str(_available, "_available", 1306196581u, 0, 10, &be_const_str_is_running);
-be_define_const_str(_begin_transmission, "_begin_transmission", 2779461176u, 0, 19, &be_const_str_lv_event_cb);
-be_define_const_str(_buffer, "_buffer", 2044888568u, 0, 7, &be_const_str_every_50ms);
-be_define_const_str(_cb, "_cb", 4043300367u, 0, 3, NULL);
-be_define_const_str(_ccmd, "_ccmd", 2163421413u, 0, 5, &be_const_str_animators);
-be_define_const_str(_class, "_class", 2732146350u, 0, 6, &be_const_str__X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D);
-be_define_const_str(_cmd, "_cmd", 3419822142u, 0, 4, NULL);
-be_define_const_str(_debug_present, "_debug_present", 4063411725u, 0, 14, &be_const_str_call_native);
-be_define_const_str(_def, "_def", 1985022181u, 0, 4, NULL);
-be_define_const_str(_dirty, "_dirty", 283846766u, 0, 6, &be_const_str_get_coords);
-be_define_const_str(_drivers, "_drivers", 3260328985u, 0, 8, &be_const_str__write);
-be_define_const_str(_end_transmission, "_end_transmission", 3237480400u, 0, 17, NULL);
-be_define_const_str(_energy, "_energy", 535372070u, 0, 7, &be_const_str_quality);
-be_define_const_str(_error, "_error", 1132109656u, 0, 6, &be_const_str__ptr);
-be_define_const_str(_filename, "_filename", 1430813195u, 0, 9, &be_const_str_set_text);
-be_define_const_str(_get_cb, "_get_cb", 1448849122u, 0, 7, &be_const_str_find);
-be_define_const_str(_global_addr, "_global_addr", 533766721u, 0, 12, &be_const_str_display_X2Eini);
-be_define_const_str(_global_def, "_global_def", 646007001u, 0, 11, &be_const_str_get_warning_level);
-be_define_const_str(_lvgl, "_lvgl", 2689219483u, 0, 5, &be_const_str_get_height);
-be_define_const_str(_p, "_p", 1594591802u, 0, 2, &be_const_str_format);
-be_define_const_str(_persist_X2Ejson, "_persist.json", 2008425138u, 0, 13, &be_const_str_value);
-be_define_const_str(_ptr, "_ptr", 306235816u, 0, 4, &be_const_str_rtc);
-be_define_const_str(_read, "_read", 346717030u, 0, 5, &be_const_str_is_dirty);
+be_define_const_str(COLOR_BLACK, "COLOR_BLACK", 264427940u, 0, 11, &be_const_str_set_percentage);
+be_define_const_str(COLOR_WHITE, "COLOR_WHITE", 2536871270u, 0, 11, NULL);
+be_define_const_str(EC_C25519, "EC_C25519", 95492591u, 0, 9, &be_const_str__debug_present);
+be_define_const_str(EVENT_DRAW_MAIN, "EVENT_DRAW_MAIN", 1955620614u, 0, 15, NULL);
+be_define_const_str(EVENT_DRAW_PART_BEGIN, "EVENT_DRAW_PART_BEGIN", 3391865024u, 0, 21, &be_const_str__ptr);
+be_define_const_str(EVENT_DRAW_PART_END, "EVENT_DRAW_PART_END", 3301625292u, 0, 19, NULL);
+be_define_const_str(False, "False", 2541049336u, 0, 5, &be_const_str_attrdump);
+be_define_const_str(GET, "GET", 2531704439u, 0, 3, &be_const_str_content_flush);
+be_define_const_str(HTTP_GET, "HTTP_GET", 1722467738u, 0, 8, &be_const_str_rad);
+be_define_const_str(HTTP_POST, "HTTP_POST", 1999554144u, 0, 9, NULL);
+be_define_const_str(I2C_X3A, "I2C:", 813483371u, 0, 4, &be_const_str_push_path);
+be_define_const_str(I2C_Driver, "I2C_Driver", 1714501658u, 0, 10, NULL);
+be_define_const_str(LVG_X3A_X20call_X20to_X20unsupported_X20callback, "LVG: call to unsupported callback", 504176819u, 0, 33, NULL);
+be_define_const_str(Leds, "Leds", 2709245275u, 0, 4, &be_const_str_byte);
+be_define_const_str(MD5, "MD5", 1935726387u, 0, 3, &be_const_str_atan2);
+be_define_const_str(None, "None", 810547195u, 0, 4, &be_const_str_SERIAL_8E2);
+be_define_const_str(OPTION_A, "OPTION_A", 1133299440u, 0, 8, &be_const_str_SERIAL_6O1);
+be_define_const_str(OneWire, "OneWire", 2298990722u, 0, 7, &be_const_str_get_cb_list);
+be_define_const_str(PART_MAIN, "PART_MAIN", 2473491508u, 0, 9, NULL);
+be_define_const_str(POST, "POST", 1929554311u, 0, 4, &be_const_str_deregister_obj);
+be_define_const_str(Parameter_X20error, "Parameter error", 3840042038u, 0, 15, &be_const_str_connection_error);
+be_define_const_str(RES_OK, "RES_OK", 1233817284u, 0, 6, &be_const_str_SERIAL_5O2);
+be_define_const_str(Restart_X201, "Restart 1", 3504455855u, 0, 9, NULL);
+be_define_const_str(SERIAL_5E1, "SERIAL_5E1", 1163775235u, 0, 10, &be_const_str_get_size);
+be_define_const_str(SERIAL_5E2, "SERIAL_5E2", 1180552854u, 0, 10, &be_const_str_available);
+be_define_const_str(SERIAL_5N1, "SERIAL_5N1", 3313031680u, 0, 10, &be_const_str_deinit);
+be_define_const_str(SERIAL_5N2, "SERIAL_5N2", 3363364537u, 0, 10, &be_const_str_zero);
+be_define_const_str(SERIAL_5O1, "SERIAL_5O1", 3782657917u, 0, 10, &be_const_str_SERIAL_8O2);
+be_define_const_str(SERIAL_5O2, "SERIAL_5O2", 3732325060u, 0, 10, &be_const_str_calldepth);
+be_define_const_str(SERIAL_6E1, "SERIAL_6E1", 334249486u, 0, 10, &be_const_str_public_key);
+be_define_const_str(SERIAL_6E2, "SERIAL_6E2", 317471867u, 0, 10, &be_const_str_SK6812_GRBW);
+be_define_const_str(SERIAL_6N1, "SERIAL_6N1", 198895701u, 0, 10, &be_const_str_push);
+be_define_const_str(SERIAL_6N2, "SERIAL_6N2", 148562844u, 0, 10, &be_const_str_check_privileged_access);
+be_define_const_str(SERIAL_6O1, "SERIAL_6O1", 266153272u, 0, 10, &be_const_str__X5B);
+be_define_const_str(SERIAL_6O2, "SERIAL_6O2", 316486129u, 0, 10, &be_const_str_widget_instance_size);
+be_define_const_str(SERIAL_7E1, "SERIAL_7E1", 147718061u, 0, 10, NULL);
+be_define_const_str(SERIAL_7E2, "SERIAL_7E2", 97385204u, 0, 10, &be_const_str__energy);
+be_define_const_str(SERIAL_7N1, "SERIAL_7N1", 1891060246u, 0, 10, &be_const_str__X7D);
+be_define_const_str(SERIAL_7N2, "SERIAL_7N2", 1874282627u, 0, 10, &be_const_str_draw_line_dsc);
+be_define_const_str(SERIAL_7O1, "SERIAL_7O1", 1823802675u, 0, 10, NULL);
+be_define_const_str(SERIAL_7O2, "SERIAL_7O2", 1840580294u, 0, 10, &be_const_str_SERIAL_8E1);
+be_define_const_str(SERIAL_8E1, "SERIAL_8E1", 2371121616u, 0, 10, &be_const_str_files);
+be_define_const_str(SERIAL_8E2, "SERIAL_8E2", 2421454473u, 0, 10, &be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf);
+be_define_const_str(SERIAL_8N1, "SERIAL_8N1", 2369297235u, 0, 10, &be_const_str_load_templates);
+be_define_const_str(SERIAL_8N2, "SERIAL_8N2", 2386074854u, 0, 10, NULL);
+be_define_const_str(SERIAL_8O1, "SERIAL_8O1", 289122742u, 0, 10, &be_const_str_exec_rules);
+be_define_const_str(SERIAL_8O2, "SERIAL_8O2", 272345123u, 0, 10, &be_const_str_ctypes_bytes);
+be_define_const_str(SK6812_GRBW, "SK6812_GRBW", 81157857u, 0, 11, &be_const_str_add_rule);
+be_define_const_str(STATE_DEFAULT, "STATE_DEFAULT", 712406428u, 0, 13, &be_const_str__request_from);
+be_define_const_str(TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27, "TAP: found Tasmota App '%s'", 2643152398u, 0, 27, &be_const_str_draw_arc);
+be_define_const_str(Tasmota, "Tasmota", 4047617668u, 0, 7, NULL);
+be_define_const_str(Tele, "Tele", 1329980653u, 0, 4, &be_const_str_abs);
+be_define_const_str(Timer, "Timer", 3948127682u, 0, 5, &be_const_str__t);
+be_define_const_str(True, "True", 3453902341u, 0, 4, &be_const_str__filename);
+be_define_const_str(Unknown_X20command, "Unknown command", 1830905432u, 0, 15, &be_const_str_var);
+be_define_const_str(WS2812, "WS2812", 3539741218u, 0, 6, &be_const_str_addr);
+be_define_const_str(WS2812_GRB, "WS2812_GRB", 1736405692u, 0, 10, NULL);
+be_define_const_str(Wire, "Wire", 1938276536u, 0, 4, &be_const_str_get_style_line_color);
+be_define_const_str(_X5B, "[", 3725336506u, 0, 1, &be_const_str_counters);
+be_define_const_str(_X5D, "]", 3624670792u, 0, 1, &be_const_str_imin);
+be_define_const_str(_, "_", 3658226030u, 0, 1, &be_const_str_add_anim);
+be_define_const_str(__iterator__, "__iterator__", 3884039703u, 0, 12, &be_const_str_open);
+be_define_const_str(__lower__, "__lower__", 123855590u, 0, 9, &be_const_str__X7B);
+be_define_const_str(__upper__, "__upper__", 3612202883u, 0, 9, NULL);
+be_define_const_str(_anonymous_, "_anonymous_", 1957281476u, 0, 11, &be_const_str_get_vbus_current);
+be_define_const_str(_archive, "_archive", 4004559404u, 0, 8, NULL);
+be_define_const_str(_available, "_available", 1306196581u, 0, 10, &be_const_str_persist);
+be_define_const_str(_begin_transmission, "_begin_transmission", 2779461176u, 0, 19, &be_const_str_kv);
+be_define_const_str(_buffer, "_buffer", 2044888568u, 0, 7, &be_const_str_draw_line_dsc_init);
+be_define_const_str(_ccmd, "_ccmd", 2163421413u, 0, 5, &be_const_str_read);
+be_define_const_str(_class, "_class", 2732146350u, 0, 6, &be_const_str_webserver);
+be_define_const_str(_cmd, "_cmd", 3419822142u, 0, 4, &be_const_str_super);
+be_define_const_str(_debug_present, "_debug_present", 4063411725u, 0, 14, NULL);
+be_define_const_str(_def, "_def", 1985022181u, 0, 4, &be_const_str_arch);
+be_define_const_str(_dirty, "_dirty", 283846766u, 0, 6, &be_const_str_asstring);
+be_define_const_str(_drivers, "_drivers", 3260328985u, 0, 8, NULL);
+be_define_const_str(_end_transmission, "_end_transmission", 3237480400u, 0, 17, &be_const_str_begin);
+be_define_const_str(_energy, "_energy", 535372070u, 0, 7, &be_const_str_color);
+be_define_const_str(_error, "_error", 1132109656u, 0, 6, &be_const_str_is_first_time);
+be_define_const_str(_filename, "_filename", 1430813195u, 0, 9, &be_const_str_create_segment);
+be_define_const_str(_global_addr, "_global_addr", 533766721u, 0, 12, &be_const_str_list);
+be_define_const_str(_global_def, "_global_def", 646007001u, 0, 11, &be_const_str_editable);
+be_define_const_str(_lvgl, "_lvgl", 2689219483u, 0, 5, NULL);
+be_define_const_str(_p, "_p", 1594591802u, 0, 2, &be_const_str_is_dirty);
+be_define_const_str(_persist_X2Ejson, "_persist.json", 2008425138u, 0, 13, NULL);
+be_define_const_str(_ptr, "_ptr", 306235816u, 0, 4, &be_const_str_cb_obj);
+be_define_const_str(_read, "_read", 346717030u, 0, 5, NULL);
 be_define_const_str(_request_from, "_request_from", 3965148604u, 0, 13, NULL);
-be_define_const_str(_rules, "_rules", 4266217105u, 0, 6, NULL);
-be_define_const_str(_settings_def, "_settings_def", 3775560307u, 0, 13, &be_const_str_set);
-be_define_const_str(_settings_ptr, "_settings_ptr", 1825772182u, 0, 13, &be_const_str_remove_cmd);
-be_define_const_str(_t, "_t", 1527481326u, 0, 2, &be_const_str_draw_line_dsc_init);
-be_define_const_str(_timers, "_timers", 2600100916u, 0, 7, &be_const_str_eth);
-be_define_const_str(_write, "_write", 2215462825u, 0, 6, &be_const_str_v);
-be_define_const_str(a, "a", 3826002220u, 0, 1, &be_const_str_add);
-be_define_const_str(abs, "abs", 709362235u, 0, 3, &be_const_str_get_aps_voltage);
-be_define_const_str(acos, "acos", 1006755615u, 0, 4, &be_const_str_lv);
-be_define_const_str(add, "add", 993596020u, 0, 3, &be_const_str_bytes);
-be_define_const_str(add_anim, "add_anim", 3980662668u, 0, 8, NULL);
-be_define_const_str(add_cmd, "add_cmd", 3361630879u, 0, 7, &be_const_str_arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj);
+be_define_const_str(_rules, "_rules", 4266217105u, 0, 6, &be_const_str_map);
+be_define_const_str(_settings_def, "_settings_def", 3775560307u, 0, 13, NULL);
+be_define_const_str(_settings_ptr, "_settings_ptr", 1825772182u, 0, 13, &be_const_str_insert);
+be_define_const_str(_t, "_t", 1527481326u, 0, 2, &be_const_str_k);
+be_define_const_str(_timers, "_timers", 2600100916u, 0, 7, &be_const_str_reset);
+be_define_const_str(_write, "_write", 2215462825u, 0, 6, &be_const_str_autorun);
+be_define_const_str(a, "a", 3826002220u, 0, 1, NULL);
+be_define_const_str(abs, "abs", 709362235u, 0, 3, &be_const_str_h);
+be_define_const_str(acos, "acos", 1006755615u, 0, 4, &be_const_str_digital_write);
+be_define_const_str(add, "add", 993596020u, 0, 3, &be_const_str_every_50ms);
+be_define_const_str(add_anim, "add_anim", 3980662668u, 0, 8, &be_const_str_remove_cmd);
+be_define_const_str(add_cmd, "add_cmd", 3361630879u, 0, 7, NULL);
 be_define_const_str(add_driver, "add_driver", 1654458371u, 0, 10, NULL);
-be_define_const_str(add_header, "add_header", 927130612u, 0, 10, &be_const_str_couldn_X27t_X20not_X20initialize_X20noepixelbus);
-be_define_const_str(add_rule, "add_rule", 596540743u, 0, 8, &be_const_str_resp_cmnd_error);
-be_define_const_str(addr, "addr", 1087856498u, 0, 4, &be_const_str_battery_present);
-be_define_const_str(allocated, "allocated", 429986098u, 0, 9, &be_const_str_create_custom_widget);
-be_define_const_str(alternate, "alternate", 1140253277u, 0, 9, &be_const_str_out_X20of_X20range);
-be_define_const_str(animate, "animate", 3885786800u, 0, 7, &be_const_str_set_ldo_voltage);
-be_define_const_str(animators, "animators", 279858213u, 0, 9, &be_const_str_read_bytes);
-be_define_const_str(arch, "arch", 2952804297u, 0, 4, &be_const_str_arg_size);
-be_define_const_str(area, "area", 2601460036u, 0, 4, &be_const_str_draw_arc);
-be_define_const_str(arg, "arg", 1047474471u, 0, 3, &be_const_str_page_autoconf_mgr);
-be_define_const_str(arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj, "arg must be a subclass of lv_obj", 1641882079u, 0, 32, &be_const_str_create_segment);
-be_define_const_str(arg_name, "arg_name", 1345046155u, 0, 8, &be_const_str_has);
-be_define_const_str(arg_size, "arg_size", 3310243257u, 0, 8, NULL);
+be_define_const_str(add_header, "add_header", 927130612u, 0, 10, &be_const_str_io_error);
+be_define_const_str(add_rule, "add_rule", 596540743u, 0, 8, NULL);
+be_define_const_str(addr, "addr", 1087856498u, 0, 4, &be_const_str_closure);
+be_define_const_str(allocated, "allocated", 429986098u, 0, 9, &be_const_str_classname);
+be_define_const_str(alternate, "alternate", 1140253277u, 0, 9, &be_const_str_day);
+be_define_const_str(animate, "animate", 3885786800u, 0, 7, &be_const_str_gamma);
+be_define_const_str(animators, "animators", 279858213u, 0, 9, NULL);
+be_define_const_str(arch, "arch", 2952804297u, 0, 4, &be_const_str_get_input_power_status);
+be_define_const_str(area, "area", 2601460036u, 0, 4, &be_const_str_asin);
+be_define_const_str(arg, "arg", 1047474471u, 0, 3, &be_const_str_math);
+be_define_const_str(arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj, "arg must be a subclass of lv_obj", 1641882079u, 0, 32, &be_const_str_ins_goto);
+be_define_const_str(arg_name, "arg_name", 1345046155u, 0, 8, &be_const_str_exists);
+be_define_const_str(arg_size, "arg_size", 3310243257u, 0, 8, &be_const_str_has);
 be_define_const_str(as, "as", 1579491469u, 67, 2, NULL);
-be_define_const_str(asin, "asin", 4272848550u, 0, 4, &be_const_str_destructor_cb);
-be_define_const_str(assert, "assert", 2774883451u, 0, 6, &be_const_str_member);
-be_define_const_str(asstring, "asstring", 1298225088u, 0, 8, &be_const_str_invalidate);
-be_define_const_str(atan, "atan", 108579519u, 0, 4, &be_const_str_fromb64);
-be_define_const_str(atan2, "atan2", 3173440503u, 0, 5, &be_const_str_millis);
-be_define_const_str(atleast1, "atleast1", 1956331672u, 0, 8, &be_const_str_connected);
-be_define_const_str(attrdump, "attrdump", 1521571304u, 0, 8, &be_const_str_counters);
-be_define_const_str(autoexec, "autoexec", 3676861891u, 0, 8, NULL);
-be_define_const_str(autorun, "autorun", 1447527407u, 0, 7, &be_const_str_return);
-be_define_const_str(available, "available", 1727918744u, 0, 9, &be_const_str_fromstring);
-be_define_const_str(b, "b", 3876335077u, 0, 1, &be_const_str_display);
-be_define_const_str(back_forth, "back_forth", 2665042062u, 0, 10, &be_const_str_dac_voltage);
-be_define_const_str(base_class, "base_class", 1107737279u, 0, 10, NULL);
-be_define_const_str(battery_present, "battery_present", 3588397058u, 0, 15, &be_const_str_run_bat);
-be_define_const_str(begin, "begin", 1748273790u, 0, 5, &be_const_str_gamma8);
-be_define_const_str(bool, "bool", 3365180733u, 0, 4, &be_const_str_set_power);
+be_define_const_str(asin, "asin", 4272848550u, 0, 4, NULL);
+be_define_const_str(assert, "assert", 2774883451u, 0, 6, &be_const_str_constructor_cb);
+be_define_const_str(asstring, "asstring", 1298225088u, 0, 8, &be_const_str_pop_path);
+be_define_const_str(atan, "atan", 108579519u, 0, 4, &be_const_str_is_running);
+be_define_const_str(atan2, "atan2", 3173440503u, 0, 5, &be_const_str_get_battery_chargin_status);
+be_define_const_str(atleast1, "atleast1", 1956331672u, 0, 8, &be_const_str_draw_line);
+be_define_const_str(attrdump, "attrdump", 1521571304u, 0, 8, NULL);
+be_define_const_str(autoexec, "autoexec", 3676861891u, 0, 8, &be_const_str_create_matrix);
+be_define_const_str(autorun, "autorun", 1447527407u, 0, 7, &be_const_str_tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29);
+be_define_const_str(available, "available", 1727918744u, 0, 9, &be_const_str_get_percentage);
+be_define_const_str(b, "b", 3876335077u, 0, 1, NULL);
+be_define_const_str(back_forth, "back_forth", 2665042062u, 0, 10, NULL);
+be_define_const_str(base_class, "base_class", 1107737279u, 0, 10, &be_const_str_loop);
+be_define_const_str(battery_present, "battery_present", 3588397058u, 0, 15, &be_const_str_wire_scan);
+be_define_const_str(begin, "begin", 1748273790u, 0, 5, &be_const_str_write);
+be_define_const_str(bool, "bool", 3365180733u, 0, 4, &be_const_str_duration);
 be_define_const_str(break, "break", 3378807160u, 58, 5, NULL);
-be_define_const_str(bri, "bri", 2112284244u, 0, 3, &be_const_str_cos);
-be_define_const_str(bus, "bus", 1607822841u, 0, 3, &be_const_str_get_vbus_voltage);
-be_define_const_str(button_pressed, "button_pressed", 1694209616u, 0, 14, &be_const_str_insert);
-be_define_const_str(byte, "byte", 1683620383u, 0, 4, NULL);
-be_define_const_str(bytes, "bytes", 1706151940u, 0, 5, NULL);
-be_define_const_str(c, "c", 3859557458u, 0, 1, &be_const_str_decrypt);
-be_define_const_str(call, "call", 3018949801u, 0, 4, NULL);
-be_define_const_str(call_native, "call_native", 1389147405u, 0, 11, &be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson);
-be_define_const_str(calldepth, "calldepth", 3122364302u, 0, 9, &be_const_str_event_send);
-be_define_const_str(can_show, "can_show", 960091187u, 0, 8, &be_const_str_ctypes_bytes_dyn);
-be_define_const_str(cb_dispatch, "cb_dispatch", 1741510499u, 0, 11, &be_const_str_set_bri);
-be_define_const_str(cb_do_nothing, "cb_do_nothing", 1488730702u, 0, 13, NULL);
-be_define_const_str(cb_event_closure, "cb_event_closure", 3828267325u, 0, 16, NULL);
-be_define_const_str(cb_obj, "cb_obj", 1195696482u, 0, 6, &be_const_str_rotate);
-be_define_const_str(ceil, "ceil", 1659167240u, 0, 4, &be_const_str_set_width);
+be_define_const_str(bri, "bri", 2112284244u, 0, 3, NULL);
+be_define_const_str(bus, "bus", 1607822841u, 0, 3, &be_const_str_issubclass);
+be_define_const_str(button_pressed, "button_pressed", 1694209616u, 0, 14, &be_const_str_set_light);
+be_define_const_str(byte, "byte", 1683620383u, 0, 4, &be_const_str_log);
+be_define_const_str(bytes, "bytes", 1706151940u, 0, 5, &be_const_str_pc_rel);
+be_define_const_str(c, "c", 3859557458u, 0, 1, &be_const_str_log10);
+be_define_const_str(call, "call", 3018949801u, 0, 4, &be_const_str_energy_struct);
+be_define_const_str(call_native, "call_native", 1389147405u, 0, 11, &be_const_str_strptime);
+be_define_const_str(calldepth, "calldepth", 3122364302u, 0, 9, NULL);
+be_define_const_str(can_show, "can_show", 960091187u, 0, 8, &be_const_str_out_X20of_X20range);
+be_define_const_str(cb, "cb", 1428787088u, 0, 2, NULL);
+be_define_const_str(cb_do_nothing, "cb_do_nothing", 1488730702u, 0, 13, &be_const_str_range);
+be_define_const_str(cb_event_closure, "cb_event_closure", 3828267325u, 0, 16, &be_const_str_get_warning_level);
+be_define_const_str(cb_obj, "cb_obj", 1195696482u, 0, 6, &be_const_str_count);
+be_define_const_str(ceil, "ceil", 1659167240u, 0, 4, &be_const_str_height_def);
 be_define_const_str(char, "char", 2823553821u, 0, 4, NULL);
-be_define_const_str(chars_in_string, "chars_in_string", 3148785132u, 0, 15, &be_const_str_kv);
-be_define_const_str(check_privileged_access, "check_privileged_access", 3692933968u, 0, 23, &be_const_str_group_def);
+be_define_const_str(chars_in_string, "chars_in_string", 3148785132u, 0, 15, &be_const_str_listdir);
+be_define_const_str(check_privileged_access, "check_privileged_access", 3692933968u, 0, 23, &be_const_str_run_deferred);
 be_define_const_str(class, "class", 2872970239u, 57, 5, NULL);
-be_define_const_str(class_init_obj, "class_init_obj", 178410604u, 0, 14, &be_const_str_set_useragent);
-be_define_const_str(classname, "classname", 1998589948u, 0, 9, NULL);
-be_define_const_str(classof, "classof", 1796577762u, 0, 7, NULL);
+be_define_const_str(class_init_obj, "class_init_obj", 178410604u, 0, 14, &be_const_str_compile);
+be_define_const_str(classname, "classname", 1998589948u, 0, 9, &be_const_str_destructor_cb);
+be_define_const_str(classof, "classof", 1796577762u, 0, 7, &be_const_str_line_dsc);
 be_define_const_str(clear, "clear", 1550717474u, 0, 5, NULL);
-be_define_const_str(clear_first_time, "clear_first_time", 632769909u, 0, 16, &be_const_str_read);
-be_define_const_str(clear_to, "clear_to", 3528002130u, 0, 8, &be_const_str_geti);
-be_define_const_str(close, "close", 667630371u, 0, 5, &be_const_str_depower);
-be_define_const_str(closure, "closure", 1548407746u, 0, 7, &be_const_str_param);
-be_define_const_str(cmd, "cmd", 4136785899u, 0, 3, &be_const_str_input);
+be_define_const_str(clear_first_time, "clear_first_time", 632769909u, 0, 16, &be_const_str_url_encode);
+be_define_const_str(clear_to, "clear_to", 3528002130u, 0, 8, &be_const_str_try);
+be_define_const_str(close, "close", 667630371u, 0, 5, &be_const_str_set_style_bg_color);
+be_define_const_str(closure, "closure", 1548407746u, 0, 7, &be_const_str_eth);
+be_define_const_str(cmd, "cmd", 4136785899u, 0, 3, &be_const_str_get);
 be_define_const_str(cmd_res, "cmd_res", 921166762u, 0, 7, NULL);
-be_define_const_str(code, "code", 4180765940u, 0, 4, &be_const_str_null_cb);
-be_define_const_str(codedump, "codedump", 1786337906u, 0, 8, NULL);
-be_define_const_str(collect, "collect", 2399039025u, 0, 7, &be_const_str_json_fdump_any);
-be_define_const_str(color, "color", 1031692888u, 0, 5, &be_const_str_has_arg);
-be_define_const_str(compile, "compile", 1000265118u, 0, 7, NULL);
-be_define_const_str(compress, "compress", 2818084237u, 0, 8, NULL);
+be_define_const_str(code, "code", 4180765940u, 0, 4, &be_const_str_fromstring);
+be_define_const_str(codedump, "codedump", 1786337906u, 0, 8, &be_const_str_top);
+be_define_const_str(collect, "collect", 2399039025u, 0, 7, &be_const_str_json_fdump_list);
+be_define_const_str(color, "color", 1031692888u, 0, 5, &be_const_str_del);
+be_define_const_str(compile, "compile", 1000265118u, 0, 7, &be_const_str_skip);
+be_define_const_str(compress, "compress", 2818084237u, 0, 8, &be_const_str_width_def);
 be_define_const_str(concat, "concat", 4124019837u, 0, 6, NULL);
-be_define_const_str(connect, "connect", 2866859257u, 0, 7, NULL);
-be_define_const_str(connected, "connected", 1424938192u, 0, 9, &be_const_str_debug);
-be_define_const_str(connection_error, "connection_error", 1358926260u, 0, 16, &be_const_str_json_fdump);
-be_define_const_str(constructor_cb, "constructor_cb", 2489105297u, 0, 14, &be_const_str_minute);
-be_define_const_str(contains, "contains", 1825239352u, 0, 8, &be_const_str_deinit);
-be_define_const_str(content_button, "content_button", 1956476087u, 0, 14, &be_const_str_pixels_buffer);
-be_define_const_str(content_flush, "content_flush", 214922475u, 0, 13, &be_const_str_leds);
-be_define_const_str(content_send, "content_send", 1673733649u, 0, 12, &be_const_str_load);
-be_define_const_str(content_send_style, "content_send_style", 1087907647u, 0, 18, &be_const_str_read8);
-be_define_const_str(content_start, "content_start", 2937509069u, 0, 13, &be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf);
-be_define_const_str(content_stop, "content_stop", 658554751u, 0, 12, NULL);
-be_define_const_str(continue, "continue", 2977070660u, 59, 8, NULL);
-be_define_const_str(copy, "copy", 3848464964u, 0, 4, &be_const_str_json_append);
-be_define_const_str(cos, "cos", 4220379804u, 0, 3, &be_const_str_count);
-be_define_const_str(cosh, "cosh", 4099687964u, 0, 4, &be_const_str_set_percentage);
-be_define_const_str(couldn_X27t_X20not_X20initialize_X20noepixelbus, "couldn't not initialize noepixelbus", 2536490812u, 0, 35, NULL);
-be_define_const_str(count, "count", 967958004u, 0, 5, &be_const_str_every_100ms);
-be_define_const_str(counters, "counters", 4095866864u, 0, 8, &be_const_str_on);
-be_define_const_str(create_custom_widget, "create_custom_widget", 1140594778u, 0, 20, &be_const_str_instance);
-be_define_const_str(create_matrix, "create_matrix", 3528185923u, 0, 13, &be_const_str_dirty);
-be_define_const_str(create_segment, "create_segment", 3863522719u, 0, 14, &be_const_str_exec_cmd);
-be_define_const_str(ctor, "ctor", 375399343u, 0, 4, &be_const_str_tcpclient);
-be_define_const_str(ctypes_bytes, "ctypes_bytes", 3879019703u, 0, 12, NULL);
-be_define_const_str(ctypes_bytes_dyn, "ctypes_bytes_dyn", 915205307u, 0, 16, &be_const_str_time_dump);
-be_define_const_str(dac_voltage, "dac_voltage", 1552257222u, 0, 11, &be_const_str_reverse_gamma10);
-be_define_const_str(day, "day", 3830391293u, 0, 3, &be_const_str_duration);
-be_define_const_str(debug, "debug", 1483009432u, 0, 5, &be_const_str_str);
-be_define_const_str(decompress, "decompress", 2887031650u, 0, 10, &be_const_str_imax);
-be_define_const_str(decrypt, "decrypt", 2886974618u, 0, 7, &be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E);
+be_define_const_str(connect, "connect", 2866859257u, 0, 7, &be_const_str_resolvecmnd);
+be_define_const_str(connected, "connected", 1424938192u, 0, 9, &be_const_str_exp);
+be_define_const_str(connection_error, "connection_error", 1358926260u, 0, 16, &be_const_str_tanh);
+be_define_const_str(constructor_cb, "constructor_cb", 2489105297u, 0, 14, NULL);
+be_define_const_str(contains, "contains", 1825239352u, 0, 8, &be_const_str_set_x);
+be_define_const_str(content_button, "content_button", 1956476087u, 0, 14, NULL);
+be_define_const_str(content_flush, "content_flush", 214922475u, 0, 13, &be_const_str_engine);
+be_define_const_str(content_send, "content_send", 1673733649u, 0, 12, NULL);
+be_define_const_str(content_send_style, "content_send_style", 1087907647u, 0, 18, &be_const_str_tolower);
+be_define_const_str(content_start, "content_start", 2937509069u, 0, 13, &be_const_str_get_bri);
+be_define_const_str(content_stop, "content_stop", 658554751u, 0, 12, &be_const_str_widget_destructor);
+be_define_const_str(continue, "continue", 2977070660u, 59, 8, &be_const_str_if);
+be_define_const_str(copy, "copy", 3848464964u, 0, 4, &be_const_str_def);
+be_define_const_str(cos, "cos", 4220379804u, 0, 3, &be_const_str_detected_X20on_X20bus);
+be_define_const_str(cosh, "cosh", 4099687964u, 0, 4, NULL);
+be_define_const_str(couldn_X27t_X20not_X20initialize_X20noepixelbus, "couldn't not initialize noepixelbus", 2536490812u, 0, 35, &be_const_str_delay);
+be_define_const_str(count, "count", 967958004u, 0, 5, NULL);
+be_define_const_str(counters, "counters", 4095866864u, 0, 8, &be_const_str_set_ldo_voltage);
+be_define_const_str(create_custom_widget, "create_custom_widget", 1140594778u, 0, 20, &be_const_str_get_switch);
+be_define_const_str(create_matrix, "create_matrix", 3528185923u, 0, 13, NULL);
+be_define_const_str(create_segment, "create_segment", 3863522719u, 0, 14, &be_const_str_v);
+be_define_const_str(ctor, "ctor", 375399343u, 0, 4, &be_const_str_floor);
+be_define_const_str(ctypes_bytes, "ctypes_bytes", 3879019703u, 0, 12, &be_const_str_widget_event_impl);
+be_define_const_str(ctypes_bytes_dyn, "ctypes_bytes_dyn", 915205307u, 0, 16, &be_const_str_set_text);
+be_define_const_str(dac_voltage, "dac_voltage", 1552257222u, 0, 11, &be_const_str_set_alternate);
+be_define_const_str(day, "day", 3830391293u, 0, 3, &be_const_str_event);
+be_define_const_str(debug, "debug", 1483009432u, 0, 5, &be_const_str_number);
+be_define_const_str(decompress, "decompress", 2887031650u, 0, 10, &be_const_str_get_temp);
+be_define_const_str(decrypt, "decrypt", 2886974618u, 0, 7, &be_const_str_set_matrix_pixel_color);
 be_define_const_str(def, "def", 3310976652u, 55, 3, NULL);
-be_define_const_str(deg, "deg", 3327754271u, 0, 3, &be_const_str_set_y);
-be_define_const_str(deinit, "deinit", 2345559592u, 0, 6, &be_const_str_tan);
-be_define_const_str(del, "del", 3478752842u, 0, 3, &be_const_str_range);
-be_define_const_str(delay, "delay", 1322381784u, 0, 5, &be_const_str_shared_key);
-be_define_const_str(delete_all_configs, "delete_all_configs", 2382067578u, 0, 18, &be_const_str_get_bat_voltage);
-be_define_const_str(depower, "depower", 3563819571u, 0, 7, &be_const_str_get_battery_chargin_status);
-be_define_const_str(deregister_obj, "deregister_obj", 3909966993u, 0, 14, &be_const_str_strip);
-be_define_const_str(destructor_cb, "destructor_cb", 1930283190u, 0, 13, &be_const_str_state);
-be_define_const_str(detect, "detect", 8884370u, 0, 6, &be_const_str_hex);
-be_define_const_str(detected_X20on_X20bus, "detected on bus", 1432002650u, 0, 15, &be_const_str_nan);
-be_define_const_str(digital_read, "digital_read", 3585496928u, 0, 12, NULL);
-be_define_const_str(digital_write, "digital_write", 3435877979u, 0, 13, &be_const_str_set_style_text_font);
+be_define_const_str(deg, "deg", 3327754271u, 0, 3, &be_const_str_dump);
+be_define_const_str(deinit, "deinit", 2345559592u, 0, 6, &be_const_str_tomap);
+be_define_const_str(del, "del", 3478752842u, 0, 3, NULL);
+be_define_const_str(delay, "delay", 1322381784u, 0, 5, &be_const_str_instance);
+be_define_const_str(delete_all_configs, "delete_all_configs", 2382067578u, 0, 18, NULL);
+be_define_const_str(depower, "depower", 3563819571u, 0, 7, &be_const_str_flush);
+be_define_const_str(deregister_obj, "deregister_obj", 3909966993u, 0, 14, NULL);
+be_define_const_str(destructor_cb, "destructor_cb", 1930283190u, 0, 13, &be_const_str_event_send);
+be_define_const_str(detect, "detect", 8884370u, 0, 6, &be_const_str_run);
+be_define_const_str(detected_X20on_X20bus, "detected on bus", 1432002650u, 0, 15, NULL);
+be_define_const_str(digital_read, "digital_read", 3585496928u, 0, 12, &be_const_str_json_fdump);
+be_define_const_str(digital_write, "digital_write", 3435877979u, 0, 13, NULL);
 be_define_const_str(dirty, "dirty", 2667581083u, 0, 5, NULL);
-be_define_const_str(display, "display", 1164572437u, 0, 7, NULL);
-be_define_const_str(display_X2Eini, "display.ini", 2646174001u, 0, 11, &be_const_str_function);
+be_define_const_str(display, "display", 1164572437u, 0, 7, &be_const_str_obj_event_base);
+be_define_const_str(display_X2Eini, "display.ini", 2646174001u, 0, 11, NULL);
 be_define_const_str(do, "do", 1646057492u, 65, 2, NULL);
-be_define_const_str(draw_arc, "draw_arc", 1828251676u, 0, 8, &be_const_str_io_error);
-be_define_const_str(draw_line, "draw_line", 1634465686u, 0, 9, &be_const_str_item);
-be_define_const_str(draw_line_dsc, "draw_line_dsc", 4220676203u, 0, 13, &be_const_str_energy_struct);
-be_define_const_str(draw_line_dsc_init, "draw_line_dsc_init", 3866693646u, 0, 18, NULL);
-be_define_const_str(due, "due", 3895530293u, 0, 3, &be_const_str_pow);
+be_define_const_str(draw_arc, "draw_arc", 1828251676u, 0, 8, &be_const_str_p1);
+be_define_const_str(draw_line, "draw_line", 1634465686u, 0, 9, &be_const_str_set_dc_voltage);
+be_define_const_str(draw_line_dsc, "draw_line_dsc", 4220676203u, 0, 13, &be_const_str_fromb64);
+be_define_const_str(draw_line_dsc_init, "draw_line_dsc_init", 3866693646u, 0, 18, &be_const_str_length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032);
+be_define_const_str(due, "due", 3895530293u, 0, 3, &be_const_str_erase);
 be_define_const_str(dump, "dump", 3663001223u, 0, 4, NULL);
-be_define_const_str(duration, "duration", 799079693u, 0, 8, &be_const_str_time_reached);
-be_define_const_str(editable, "editable", 60532369u, 0, 8, &be_const_str_resize);
+be_define_const_str(duration, "duration", 799079693u, 0, 8, &be_const_str_f);
+be_define_const_str(editable, "editable", 60532369u, 0, 8, &be_const_str_get_power);
 be_define_const_str(elif, "elif", 3232090307u, 51, 4, NULL);
 be_define_const_str(else, "else", 3183434736u, 52, 4, NULL);
-be_define_const_str(enabled, "enabled", 49525662u, 0, 7, &be_const_str_widget_width_def);
-be_define_const_str(encrypt, "encrypt", 2194327650u, 0, 7, &be_const_str_introspect);
+be_define_const_str(enabled, "enabled", 49525662u, 0, 7, &be_const_str_pin_mode);
+be_define_const_str(encrypt, "encrypt", 2194327650u, 0, 7, &be_const_str_finish);
 be_define_const_str(end, "end", 1787721130u, 56, 3, NULL);
 be_define_const_str(energy_struct, "energy_struct", 1655792843u, 0, 13, NULL);
-be_define_const_str(engine, "engine", 3993360443u, 0, 6, &be_const_str_obj_event_base);
-be_define_const_str(erase, "erase", 1010949589u, 0, 5, &be_const_str_lv_obj);
-be_define_const_str(escape, "escape", 2652972038u, 0, 6, &be_const_str_path);
-be_define_const_str(eth, "eth", 2191266556u, 0, 3, &be_const_str_set_pixel_color);
-be_define_const_str(event, "event", 4264611999u, 0, 5, &be_const_str_issubclass);
-be_define_const_str(event_cb, "event_cb", 3128698017u, 0, 8, &be_const_str_get_power);
-be_define_const_str(event_send, "event_send", 598925582u, 0, 10, &be_const_str_lvgl_event_dispatch);
-be_define_const_str(every_100ms, "every_100ms", 1546407804u, 0, 11, &be_const_str_web_send_decimal);
-be_define_const_str(every_50ms, "every_50ms", 2383884008u, 0, 10, &be_const_str_length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032);
-be_define_const_str(every_second, "every_second", 2075451465u, 0, 12, &be_const_str_serial);
+be_define_const_str(engine, "engine", 3993360443u, 0, 6, &be_const_str_getbits);
+be_define_const_str(erase, "erase", 1010949589u, 0, 5, &be_const_str_class);
+be_define_const_str(escape, "escape", 2652972038u, 0, 6, NULL);
+be_define_const_str(eth, "eth", 2191266556u, 0, 3, &be_const_str_widget_constructor);
+be_define_const_str(event, "event", 4264611999u, 0, 5, &be_const_str_resp_cmnd_error);
+be_define_const_str(event_cb, "event_cb", 3128698017u, 0, 8, NULL);
+be_define_const_str(event_send, "event_send", 598925582u, 0, 10, &be_const_str_name);
+be_define_const_str(every_100ms, "every_100ms", 1546407804u, 0, 11, &be_const_str_zip);
+be_define_const_str(every_50ms, "every_50ms", 2383884008u, 0, 10, &be_const_str_size);
+be_define_const_str(every_second, "every_second", 2075451465u, 0, 12, NULL);
 be_define_const_str(except, "except", 950914032u, 69, 6, NULL);
-be_define_const_str(exec_cmd, "exec_cmd", 493567399u, 0, 8, &be_const_str__X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D);
-be_define_const_str(exec_rules, "exec_rules", 1445221092u, 0, 10, &be_const_str_write8);
-be_define_const_str(exec_tele, "exec_tele", 1020751601u, 0, 9, NULL);
-be_define_const_str(exists, "exists", 1002329533u, 0, 6, &be_const_str_get_bat_power);
-be_define_const_str(exp, "exp", 1923516200u, 0, 3, &be_const_str_listdir);
-be_define_const_str(f, "f", 3809224601u, 0, 1, NULL);
+be_define_const_str(exec_cmd, "exec_cmd", 493567399u, 0, 8, &be_const_str_hour);
+be_define_const_str(exec_rules, "exec_rules", 1445221092u, 0, 10, &be_const_str_find);
+be_define_const_str(exec_tele, "exec_tele", 1020751601u, 0, 9, &be_const_str_widget_height_def);
+be_define_const_str(exists, "exists", 1002329533u, 0, 6, &be_const_str_tostring);
+be_define_const_str(exp, "exp", 1923516200u, 0, 3, NULL);
+be_define_const_str(f, "f", 3809224601u, 0, 1, &be_const_str_function);
 be_define_const_str(false, "false", 184981848u, 62, 5, NULL);
 be_define_const_str(file, "file", 2867484483u, 0, 4, NULL);
-be_define_const_str(file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27, "file extension is not '.be' or '.bec'", 3095719639u, 0, 37, &be_const_str_hour);
-be_define_const_str(files, "files", 1055342736u, 0, 5, &be_const_str_page_autoconf_ctl);
-be_define_const_str(find, "find", 3186656602u, 0, 4, NULL);
-be_define_const_str(find_key_i, "find_key_i", 850136726u, 0, 10, &be_const_str_w);
-be_define_const_str(find_op, "find_op", 3766713376u, 0, 7, NULL);
-be_define_const_str(finish, "finish", 1494643858u, 0, 6, &be_const_str_isinstance);
-be_define_const_str(floor, "floor", 3102149661u, 0, 5, &be_const_str_get_style_bg_color);
+be_define_const_str(file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27, "file extension is not '.be' or '.bec'", 3095719639u, 0, 37, &be_const_str_strip);
+be_define_const_str(files, "files", 1055342736u, 0, 5, &be_const_str_get_coords);
+be_define_const_str(find, "find", 3186656602u, 0, 4, &be_const_str_hex);
+be_define_const_str(find_key_i, "find_key_i", 850136726u, 0, 10, NULL);
+be_define_const_str(find_op, "find_op", 3766713376u, 0, 7, &be_const_str_memory);
+be_define_const_str(finish, "finish", 1494643858u, 0, 6, NULL);
+be_define_const_str(floor, "floor", 3102149661u, 0, 5, NULL);
 be_define_const_str(flush, "flush", 3002334877u, 0, 5, NULL);
 be_define_const_str(for, "for", 2901640080u, 54, 3, NULL);
-be_define_const_str(format, "format", 3114108242u, 0, 6, &be_const_str_pi);
-be_define_const_str(from_to, "from_to", 21625507u, 0, 7, &be_const_str_static);
-be_define_const_str(fromb64, "fromb64", 2717019639u, 0, 7, NULL);
-be_define_const_str(fromptr, "fromptr", 666189689u, 0, 7, &be_const_str_set_style_bg_color);
-be_define_const_str(fromstring, "fromstring", 610302344u, 0, 10, &be_const_str_publish);
-be_define_const_str(function, "function", 2664841801u, 0, 8, NULL);
-be_define_const_str(gamma, "gamma", 3492353034u, 0, 5, &be_const_str_isnan);
+be_define_const_str(format, "format", 3114108242u, 0, 6, &be_const_str_offset);
+be_define_const_str(from_to, "from_to", 21625507u, 0, 7, &be_const_str_json);
+be_define_const_str(fromb64, "fromb64", 2717019639u, 0, 7, &be_const_str_r);
+be_define_const_str(fromptr, "fromptr", 666189689u, 0, 7, NULL);
+be_define_const_str(fromstring, "fromstring", 610302344u, 0, 10, NULL);
+be_define_const_str(function, "function", 2664841801u, 0, 8, &be_const_str_get_bat_power);
+be_define_const_str(gamma, "gamma", 3492353034u, 0, 5, &be_const_str_string);
 be_define_const_str(gamma10, "gamma10", 3472052483u, 0, 7, NULL);
-be_define_const_str(gamma8, "gamma8", 3802843830u, 0, 6, &be_const_str_memory);
-be_define_const_str(gc, "gc", 1042313471u, 0, 2, &be_const_str_tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29);
-be_define_const_str(gen_cb, "gen_cb", 3245227551u, 0, 6, NULL);
-be_define_const_str(get, "get", 1410115415u, 0, 3, NULL);
-be_define_const_str(get_alternate, "get_alternate", 1450148894u, 0, 13, &be_const_str_scale_uint);
-be_define_const_str(get_aps_voltage, "get_aps_voltage", 2293036435u, 0, 15, NULL);
-be_define_const_str(get_bat_charge_current, "get_bat_charge_current", 1385293050u, 0, 22, &be_const_str_read12);
-be_define_const_str(get_bat_current, "get_bat_current", 1912106073u, 0, 15, NULL);
-be_define_const_str(get_bat_power, "get_bat_power", 3067374853u, 0, 13, &be_const_str_json_fdump_list);
-be_define_const_str(get_bat_voltage, "get_bat_voltage", 706676538u, 0, 15, &be_const_str_save_before_restart);
-be_define_const_str(get_battery_chargin_status, "get_battery_chargin_status", 2233241571u, 0, 26, &be_const_str_split);
-be_define_const_str(get_bri, "get_bri", 2041809895u, 0, 7, &be_const_str_math);
-be_define_const_str(get_coords, "get_coords", 1044089006u, 0, 10, &be_const_str_get_temp);
-be_define_const_str(get_current_module_name, "get_current_module_name", 2379270740u, 0, 23, &be_const_str_get_width);
-be_define_const_str(get_current_module_path, "get_current_module_path", 3206673408u, 0, 23, NULL);
-be_define_const_str(get_free_heap, "get_free_heap", 625069757u, 0, 13, &be_const_str_push);
-be_define_const_str(get_height, "get_height", 3571755523u, 0, 10, &be_const_str_ins_goto);
-be_define_const_str(get_input_power_status, "get_input_power_status", 4102829177u, 0, 22, NULL);
-be_define_const_str(get_light, "get_light", 381930476u, 0, 9, &be_const_str_setitem);
-be_define_const_str(get_object_from_ptr, "get_object_from_ptr", 2345019201u, 0, 19, &be_const_str_log);
+be_define_const_str(gamma8, "gamma8", 3802843830u, 0, 6, &be_const_str_else);
+be_define_const_str(gc, "gc", 1042313471u, 0, 2, &be_const_str_remove_timer);
+be_define_const_str(gen_cb, "gen_cb", 3245227551u, 0, 6, &be_const_str_pixels_buffer);
+be_define_const_str(get, "get", 1410115415u, 0, 3, &be_const_str_sqrt);
+be_define_const_str(get_alternate, "get_alternate", 1450148894u, 0, 13, &be_const_str_readbytes);
+be_define_const_str(get_aps_voltage, "get_aps_voltage", 2293036435u, 0, 15, &be_const_str_traceback);
+be_define_const_str(get_bat_charge_current, "get_bat_charge_current", 1385293050u, 0, 22, &be_const_str_get_style_pad_right);
+be_define_const_str(get_bat_current, "get_bat_current", 1912106073u, 0, 15, &be_const_str_leds);
+be_define_const_str(get_bat_power, "get_bat_power", 3067374853u, 0, 13, &be_const_str_init);
+be_define_const_str(get_bat_voltage, "get_bat_voltage", 706676538u, 0, 15, NULL);
+be_define_const_str(get_battery_chargin_status, "get_battery_chargin_status", 2233241571u, 0, 26, NULL);
+be_define_const_str(get_bri, "get_bri", 2041809895u, 0, 7, NULL);
+be_define_const_str(get_cb_list, "get_cb_list", 1605319182u, 0, 11, &be_const_str_pi);
+be_define_const_str(get_coords, "get_coords", 1044089006u, 0, 10, NULL);
+be_define_const_str(get_current_module_name, "get_current_module_name", 2379270740u, 0, 23, &be_const_str_isinstance);
+be_define_const_str(get_current_module_path, "get_current_module_path", 3206673408u, 0, 23, &be_const_str_matrix);
+be_define_const_str(get_free_heap, "get_free_heap", 625069757u, 0, 13, NULL);
+be_define_const_str(get_height, "get_height", 3571755523u, 0, 10, &be_const_str_get_vbus_voltage);
+be_define_const_str(get_input_power_status, "get_input_power_status", 4102829177u, 0, 22, &be_const_str_value_error);
+be_define_const_str(get_light, "get_light", 381930476u, 0, 9, NULL);
+be_define_const_str(get_object_from_ptr, "get_object_from_ptr", 2345019201u, 0, 19, &be_const_str__X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D);
 be_define_const_str(get_option, "get_option", 2123730033u, 0, 10, NULL);
-be_define_const_str(get_percentage, "get_percentage", 2880483992u, 0, 14, NULL);
+be_define_const_str(get_percentage, "get_percentage", 2880483992u, 0, 14, &be_const_str_global);
 be_define_const_str(get_pixel_color, "get_pixel_color", 337490048u, 0, 15, NULL);
-be_define_const_str(get_power, "get_power", 3009799377u, 0, 9, &be_const_str_open);
+be_define_const_str(get_power, "get_power", 3009799377u, 0, 9, &be_const_str_set_time);
 be_define_const_str(get_size, "get_size", 2803644713u, 0, 8, NULL);
 be_define_const_str(get_string, "get_string", 4195847969u, 0, 10, NULL);
-be_define_const_str(get_style_bg_color, "get_style_bg_color", 964794381u, 0, 18, &be_const_str_r);
-be_define_const_str(get_style_line_color, "get_style_line_color", 805371932u, 0, 20, &be_const_str_time_str);
+be_define_const_str(get_style_bg_color, "get_style_bg_color", 964794381u, 0, 18, NULL);
+be_define_const_str(get_style_line_color, "get_style_line_color", 805371932u, 0, 20, &be_const_str_ip);
 be_define_const_str(get_style_pad_right, "get_style_pad_right", 3150287466u, 0, 19, NULL);
-be_define_const_str(get_switch, "get_switch", 164821028u, 0, 10, &be_const_str_isrunning);
-be_define_const_str(get_tasmota, "get_tasmota", 334356779u, 0, 11, &be_const_str_getbits);
+be_define_const_str(get_switch, "get_switch", 164821028u, 0, 10, &be_const_str_init_draw_line_dsc);
 be_define_const_str(get_temp, "get_temp", 3370919486u, 0, 8, NULL);
-be_define_const_str(get_vbus_current, "get_vbus_current", 1205347942u, 0, 16, &be_const_str_while);
-be_define_const_str(get_vbus_voltage, "get_vbus_voltage", 2398210401u, 0, 16, &be_const_str_return_X20code_X3D_X25i);
-be_define_const_str(get_warning_level, "get_warning_level", 1737834441u, 0, 17, &be_const_str_map);
-be_define_const_str(get_width, "get_width", 3293417300u, 0, 9, NULL);
-be_define_const_str(getbits, "getbits", 3094168979u, 0, 7, &be_const_str_tag);
-be_define_const_str(geti, "geti", 2381006490u, 0, 4, &be_const_str_k);
-be_define_const_str(global, "global", 503252654u, 0, 6, &be_const_str_widget_constructor);
-be_define_const_str(gpio, "gpio", 2638155258u, 0, 4, &be_const_str_line_dsc);
-be_define_const_str(group_def, "group_def", 1524213328u, 0, 9, &be_const_str_web_send);
-be_define_const_str(h, "h", 3977000791u, 0, 1, &be_const_str_value_error);
+be_define_const_str(get_vbus_current, "get_vbus_current", 1205347942u, 0, 16, &be_const_str_rotate);
+be_define_const_str(get_vbus_voltage, "get_vbus_voltage", 2398210401u, 0, 16, NULL);
+be_define_const_str(get_warning_level, "get_warning_level", 1737834441u, 0, 17, NULL);
+be_define_const_str(get_width, "get_width", 3293417300u, 0, 9, &be_const_str_scan);
+be_define_const_str(getbits, "getbits", 3094168979u, 0, 7, NULL);
+be_define_const_str(geti, "geti", 2381006490u, 0, 4, &be_const_str_id);
+be_define_const_str(global, "global", 503252654u, 0, 6, &be_const_str_members);
+be_define_const_str(gpio, "gpio", 2638155258u, 0, 4, NULL);
+be_define_const_str(group_def, "group_def", 1524213328u, 0, 9, &be_const_str_isnan);
+be_define_const_str(h, "h", 3977000791u, 0, 1, &be_const_str_response_append);
 be_define_const_str(has, "has", 3988721635u, 0, 3, NULL);
-be_define_const_str(has_arg, "has_arg", 424878688u, 0, 7, &be_const_str_rad);
-be_define_const_str(height_def, "height_def", 2348238838u, 0, 10, &be_const_str_wire2);
-be_define_const_str(hex, "hex", 4273249610u, 0, 3, &be_const_str_register_obj);
-be_define_const_str(hour, "hour", 3053661199u, 0, 4, &be_const_str_widget_ctor_impl);
+be_define_const_str(has_arg, "has_arg", 424878688u, 0, 7, NULL);
+be_define_const_str(height_def, "height_def", 2348238838u, 0, 10, NULL);
+be_define_const_str(hex, "hex", 4273249610u, 0, 3, &be_const_str_set_auth);
+be_define_const_str(hour, "hour", 3053661199u, 0, 4, &be_const_str_search);
 be_define_const_str(hs2rgb, "hs2rgb", 1040816349u, 0, 6, NULL);
-be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s/%s.autoconf", 2743526309u, 0, 70, NULL);
-be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s_manifest.json", 3657552045u, 0, 72, NULL);
-be_define_const_str(i2c_enabled, "i2c_enabled", 218388101u, 0, 11, &be_const_str_keys);
-be_define_const_str(id, "id", 926444256u, 0, 2, &be_const_str_print);
+be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s/%s.autoconf", 2743526309u, 0, 70, &be_const_str_reverse);
+be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s_manifest.json", 3657552045u, 0, 72, &be_const_str_return);
+be_define_const_str(i2c_enabled, "i2c_enabled", 218388101u, 0, 11, &be_const_str_light);
+be_define_const_str(id, "id", 926444256u, 0, 2, &be_const_str_web_add_handler);
 be_define_const_str(if, "if", 959999494u, 50, 2, NULL);
-be_define_const_str(imax, "imax", 3084515410u, 0, 4, NULL);
-be_define_const_str(imin, "imin", 2714127864u, 0, 4, &be_const_str_members);
+be_define_const_str(imax, "imax", 3084515410u, 0, 4, &be_const_str_continue);
+be_define_const_str(imin, "imin", 2714127864u, 0, 4, NULL);
 be_define_const_str(import, "import", 288002260u, 66, 6, NULL);
-be_define_const_str(init, "init", 380752755u, 0, 4, NULL);
-be_define_const_str(init_draw_line_dsc, "init_draw_line_dsc", 2507936040u, 0, 18, &be_const_str_pop);
-be_define_const_str(input, "input", 4191711099u, 0, 5, &be_const_str_json);
-be_define_const_str(ins_goto, "ins_goto", 1342843963u, 0, 8, NULL);
-be_define_const_str(ins_ramp, "ins_ramp", 1068049360u, 0, 8, &be_const_str_wire_scan);
-be_define_const_str(ins_time, "ins_time", 2980245553u, 0, 8, &be_const_str_target_search);
+be_define_const_str(init, "init", 380752755u, 0, 4, &be_const_str_stop_iteration);
+be_define_const_str(init_draw_line_dsc, "init_draw_line_dsc", 2507936040u, 0, 18, &be_const_str_pin);
+be_define_const_str(input, "input", 4191711099u, 0, 5, NULL);
+be_define_const_str(ins_goto, "ins_goto", 1342843963u, 0, 8, &be_const_str_web_add_config_button);
+be_define_const_str(ins_ramp, "ins_ramp", 1068049360u, 0, 8, &be_const_str_web_add_console_button);
+be_define_const_str(ins_time, "ins_time", 2980245553u, 0, 8, &be_const_str_member);
 be_define_const_str(insert, "insert", 3332609576u, 0, 6, NULL);
-be_define_const_str(instance, "instance", 193386898u, 0, 8, NULL);
-be_define_const_str(instance_size, "instance_size", 4280269518u, 0, 13, NULL);
-be_define_const_str(int, "int", 2515107422u, 0, 3, NULL);
-be_define_const_str(internal_error, "internal_error", 2519158169u, 0, 14, &be_const_str_offseta);
-be_define_const_str(introspect, "introspect", 164638290u, 0, 10, &be_const_str_widget_dtor_impl);
-be_define_const_str(invalidate, "invalidate", 2649734928u, 0, 10, &be_const_str_no_X20GPIO_X20specified_X20for_X20neopixelbus);
-be_define_const_str(io_error, "io_error", 1970281036u, 0, 8, &be_const_str_readbytes);
-be_define_const_str(ip, "ip", 1261996636u, 0, 2, &be_const_str_super);
-be_define_const_str(is_dirty, "is_dirty", 418034110u, 0, 8, &be_const_str_rand);
-be_define_const_str(is_first_time, "is_first_time", 275242384u, 0, 13, &be_const_str_local);
-be_define_const_str(is_running, "is_running", 2226847261u, 0, 10, &be_const_str_reverse);
+be_define_const_str(instance, "instance", 193386898u, 0, 8, &be_const_str_write_gpio);
+be_define_const_str(instance_size, "instance_size", 4280269518u, 0, 13, &be_const_str_persist_X2E_p_X20is_X20not_X20a_X20map);
+be_define_const_str(int, "int", 2515107422u, 0, 3, &be_const_str_json_append);
+be_define_const_str(internal_error, "internal_error", 2519158169u, 0, 14, NULL);
+be_define_const_str(introspect, "introspect", 164638290u, 0, 10, &be_const_str_widget_ctor_cb);
+be_define_const_str(invalidate, "invalidate", 2649734928u, 0, 10, &be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E);
+be_define_const_str(io_error, "io_error", 1970281036u, 0, 8, &be_const_str_pin_used);
+be_define_const_str(ip, "ip", 1261996636u, 0, 2, &be_const_str_null_cb);
+be_define_const_str(is_dirty, "is_dirty", 418034110u, 0, 8, &be_const_str_w);
+be_define_const_str(is_first_time, "is_first_time", 275242384u, 0, 13, NULL);
+be_define_const_str(is_running, "is_running", 2226847261u, 0, 10, &be_const_str_round_end);
 be_define_const_str(isinstance, "isinstance", 3669352738u, 0, 10, NULL);
-be_define_const_str(isnan, "isnan", 2981347434u, 0, 5, NULL);
-be_define_const_str(isrunning, "isrunning", 1688182268u, 0, 9, &be_const_str_refr_size);
-be_define_const_str(issubclass, "issubclass", 4078395519u, 0, 10, NULL);
-be_define_const_str(item, "item", 2671260646u, 0, 4, &be_const_str_widget_editable);
-be_define_const_str(iter, "iter", 3124256359u, 0, 4, &be_const_str_class);
-be_define_const_str(json, "json", 916562499u, 0, 4, NULL);
-be_define_const_str(json_append, "json_append", 3002019284u, 0, 11, NULL);
-be_define_const_str(json_fdump, "json_fdump", 1694216580u, 0, 10, &be_const_str_nil);
-be_define_const_str(json_fdump_any, "json_fdump_any", 3348629385u, 0, 14, &be_const_str_pixel_size);
-be_define_const_str(json_fdump_list, "json_fdump_list", 3903879853u, 0, 15, &be_const_str_json_fdump_map);
-be_define_const_str(json_fdump_map, "json_fdump_map", 4091954653u, 0, 14, &be_const_str_select);
-be_define_const_str(k, "k", 3993778410u, 0, 1, &be_const_str_set_auth);
+be_define_const_str(isnan, "isnan", 2981347434u, 0, 5, &be_const_str_lv_obj_class);
+be_define_const_str(isrunning, "isrunning", 1688182268u, 0, 9, &be_const_str_pop);
+be_define_const_str(issubclass, "issubclass", 4078395519u, 0, 10, &be_const_str_read_sensors);
+be_define_const_str(item, "item", 2671260646u, 0, 4, &be_const_str_seti);
+be_define_const_str(iter, "iter", 3124256359u, 0, 4, &be_const_str_keys);
+be_define_const_str(json, "json", 916562499u, 0, 4, &be_const_str_y1);
+be_define_const_str(json_append, "json_append", 3002019284u, 0, 11, &be_const_str_set_chg_current);
+be_define_const_str(json_fdump, "json_fdump", 1694216580u, 0, 10, NULL);
+be_define_const_str(json_fdump_any, "json_fdump_any", 3348629385u, 0, 14, &be_const_str_pixel_count);
+be_define_const_str(json_fdump_list, "json_fdump_list", 3903879853u, 0, 15, NULL);
+be_define_const_str(json_fdump_map, "json_fdump_map", 4091954653u, 0, 14, &be_const_str_pow);
+be_define_const_str(k, "k", 3993778410u, 0, 1, &be_const_str_set_first_time);
 be_define_const_str(keys, "keys", 4182378701u, 0, 4, NULL);
-be_define_const_str(kv, "kv", 1497177492u, 0, 2, &be_const_str_persist_X2E_p_X20is_X20not_X20a_X20map);
-be_define_const_str(last_modified, "last_modified", 772177145u, 0, 13, NULL);
-be_define_const_str(leds, "leds", 558858555u, 0, 4, &be_const_str__X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D);
-be_define_const_str(length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032, "length in bits must be between 0 and 32", 2584509128u, 0, 39, &be_const_str_lv_event);
+be_define_const_str(kv, "kv", 1497177492u, 0, 2, &be_const_str_wire2);
+be_define_const_str(last_modified, "last_modified", 772177145u, 0, 13, &be_const_str_p2);
+be_define_const_str(leds, "leds", 558858555u, 0, 4, &be_const_str_month);
+be_define_const_str(length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032, "length in bits must be between 0 and 32", 2584509128u, 0, 39, &be_const_str_widget_editable);
 be_define_const_str(light, "light", 3801947695u, 0, 5, NULL);
-be_define_const_str(line_dsc, "line_dsc", 4094490978u, 0, 8, &be_const_str_offset);
+be_define_const_str(line_dsc, "line_dsc", 4094490978u, 0, 8, NULL);
 be_define_const_str(list, "list", 217798785u, 0, 4, NULL);
-be_define_const_str(listdir, "listdir", 2005220720u, 0, 7, NULL);
+be_define_const_str(listdir, "listdir", 2005220720u, 0, 7, &be_const_str_round_start);
 be_define_const_str(load, "load", 3859241449u, 0, 4, NULL);
 be_define_const_str(load_templates, "load_templates", 3513870133u, 0, 14, NULL);
-be_define_const_str(local, "local", 2621662984u, 0, 5, &be_const_str_round_start);
-be_define_const_str(log, "log", 1062293841u, 0, 3, &be_const_str_read_sensors);
-be_define_const_str(log10, "log10", 2346846000u, 0, 5, NULL);
+be_define_const_str(local, "local", 2621662984u, 0, 5, &be_const_str_publish);
+be_define_const_str(log, "log", 1062293841u, 0, 3, NULL);
+be_define_const_str(log10, "log10", 2346846000u, 0, 5, &be_const_str_web_send);
 be_define_const_str(loop, "loop", 3723446379u, 0, 4, NULL);
-be_define_const_str(lower, "lower", 3038577850u, 0, 5, &be_const_str_end);
-be_define_const_str(lv, "lv", 1529997255u, 0, 2, &be_const_str_x);
-be_define_const_str(lv_event, "lv_event", 2434089968u, 0, 8, &be_const_str_remove_rule);
-be_define_const_str(lv_event_cb, "lv_event_cb", 2480731016u, 0, 11, &be_const_str_run_deferred);
-be_define_const_str(lv_obj, "lv_obj", 4257833149u, 0, 6, &be_const_str_traceback);
-be_define_const_str(lv_obj_class, "lv_obj_class", 4039656294u, 0, 12, NULL);
-be_define_const_str(lvgl_event_dispatch, "lvgl_event_dispatch", 2104396622u, 0, 19, &be_const_str_set_matrix_pixel_color);
-be_define_const_str(map, "map", 3751997361u, 0, 3, &be_const_str_redirect);
-be_define_const_str(math, "math", 4001929615u, 0, 4, NULL);
-be_define_const_str(matrix, "matrix", 365099244u, 0, 6, NULL);
+be_define_const_str(lower, "lower", 3038577850u, 0, 5, &be_const_str_wire);
+be_define_const_str(lv, "lv", 1529997255u, 0, 2, &be_const_str_pixel_size);
+be_define_const_str(lv_event, "lv_event", 2434089968u, 0, 8, NULL);
+be_define_const_str(lv_event_cb, "lv_event_cb", 2480731016u, 0, 11, &be_const_str_set_pixel_color);
+be_define_const_str(lv_obj, "lv_obj", 4257833149u, 0, 6, &be_const_str_widget_dtor_cb);
+be_define_const_str(lv_obj_class, "lv_obj_class", 4039656294u, 0, 12, &be_const_str_set_style_pad_right);
+be_define_const_str(lvgl_event_dispatch, "lvgl_event_dispatch", 2104396622u, 0, 19, &be_const_str_widget_event);
+be_define_const_str(map, "map", 3751997361u, 0, 3, NULL);
+be_define_const_str(math, "math", 4001929615u, 0, 4, &be_const_str_as);
+be_define_const_str(matrix, "matrix", 365099244u, 0, 6, &be_const_str_nan);
 be_define_const_str(member, "member", 719708611u, 0, 6, NULL);
-be_define_const_str(members, "members", 937576464u, 0, 7, &be_const_str_target);
-be_define_const_str(memory, "memory", 2229924270u, 0, 6, &be_const_str_resp_cmnd_str);
+be_define_const_str(members, "members", 937576464u, 0, 7, NULL);
+be_define_const_str(memory, "memory", 2229924270u, 0, 6, NULL);
 be_define_const_str(millis, "millis", 1214679063u, 0, 6, NULL);
-be_define_const_str(min, "min", 3381609815u, 0, 3, &be_const_str_widget_cb);
-be_define_const_str(minute, "minute", 954666857u, 0, 6, NULL);
-be_define_const_str(module, "module", 3617558685u, 0, 6, &be_const_str_percentage);
-be_define_const_str(month, "month", 3598321157u, 0, 5, NULL);
+be_define_const_str(min, "min", 3381609815u, 0, 3, NULL);
+be_define_const_str(minute, "minute", 954666857u, 0, 6, &be_const_str_strftime);
+be_define_const_str(module, "module", 3617558685u, 0, 6, NULL);
+be_define_const_str(month, "month", 3598321157u, 0, 5, &be_const_str_solidified);
 be_define_const_str(name, "name", 2369371622u, 0, 4, NULL);
-be_define_const_str(nan, "nan", 797905850u, 0, 3, NULL);
+be_define_const_str(nan, "nan", 797905850u, 0, 3, &be_const_str_wifi);
 be_define_const_str(nil, "nil", 228849900u, 63, 3, NULL);
-be_define_const_str(no_X20GPIO_X20specified_X20for_X20neopixelbus, "no GPIO specified for neopixelbus", 42078528u, 0, 33, &be_const_str_number);
-be_define_const_str(null_cb, "null_cb", 2333536460u, 0, 7, &be_const_str_public_key);
-be_define_const_str(number, "number", 467038368u, 0, 6, NULL);
-be_define_const_str(obj_class_create_obj, "obj_class_create_obj", 3304390632u, 0, 20, &be_const_str_write_bytes);
+be_define_const_str(no_X20GPIO_X20specified_X20for_X20neopixelbus, "no GPIO specified for neopixelbus", 42078528u, 0, 33, &be_const_str_preinit);
+be_define_const_str(null_cb, "null_cb", 2333536460u, 0, 7, &be_const_str_save);
+be_define_const_str(number, "number", 467038368u, 0, 6, &be_const_str_time_str);
+be_define_const_str(obj_class_create_obj, "obj_class_create_obj", 3304390632u, 0, 20, NULL);
 be_define_const_str(obj_event_base, "obj_event_base", 1624064363u, 0, 14, NULL);
-be_define_const_str(offset, "offset", 348705738u, 0, 6, &be_const_str_sec);
-be_define_const_str(offseta, "offseta", 1663383089u, 0, 7, NULL);
+be_define_const_str(offset, "offset", 348705738u, 0, 6, &be_const_str_on);
+be_define_const_str(offseta, "offseta", 1663383089u, 0, 7, &be_const_str_set_style_text_font);
 be_define_const_str(on, "on", 1630810064u, 0, 2, NULL);
 be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will cause a restart.\");'>", 232646018u, 0, 57, NULL);
-be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will change the current configuration and cause a restart.\");'>", 3792412559u, 0, 94, &be_const_str_sqrt);
-be_define_const_str(open, "open", 3546203337u, 0, 4, NULL);
+be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will change the current configuration and cause a restart.\");'>", 3792412559u, 0, 94, NULL);
+be_define_const_str(open, "open", 3546203337u, 0, 4, &be_const_str_resp_cmnd_done);
 be_define_const_str(out_X20of_X20range, "out of range", 2236631477u, 0, 12, NULL);
-be_define_const_str(p1, "p1", 2689521274u, 0, 2, &be_const_str_widget_event_cb);
-be_define_const_str(p2, "p2", 2672743655u, 0, 2, NULL);
-be_define_const_str(page_autoconf_ctl, "page_autoconf_ctl", 2453381496u, 0, 17, &be_const_str_pc_rel);
-be_define_const_str(page_autoconf_mgr, "page_autoconf_mgr", 3643937031u, 0, 17, &be_const_str_reduce);
-be_define_const_str(param, "param", 1309554226u, 0, 5, &be_const_str_set_dcdc_enable);
-be_define_const_str(path, "path", 2223459638u, 0, 4, &be_const_str_pop_path);
-be_define_const_str(pc, "pc", 1313756516u, 0, 2, &be_const_str_zip);
+be_define_const_str(p1, "p1", 2689521274u, 0, 2, NULL);
+be_define_const_str(p2, "p2", 2672743655u, 0, 2, &be_const_str_the_X20second_X20argument_X20is_X20not_X20a_X20function);
+be_define_const_str(page_autoconf_ctl, "page_autoconf_ctl", 2453381496u, 0, 17, &be_const_str_pc);
+be_define_const_str(page_autoconf_mgr, "page_autoconf_mgr", 3643937031u, 0, 17, &be_const_str_return_X20code_X3D_X25i);
+be_define_const_str(param, "param", 1309554226u, 0, 5, &be_const_str_set_style_line_color);
+be_define_const_str(path, "path", 2223459638u, 0, 4, &be_const_str_read32);
+be_define_const_str(pc, "pc", 1313756516u, 0, 2, NULL);
 be_define_const_str(pc_abs, "pc_abs", 920256495u, 0, 6, NULL);
-be_define_const_str(pc_rel, "pc_rel", 991921176u, 0, 6, NULL);
-be_define_const_str(percentage, "percentage", 2538831285u, 0, 10, &be_const_str_web_add_config_button);
-be_define_const_str(persist, "persist", 3917083779u, 0, 7, NULL);
-be_define_const_str(persist_X2E_p_X20is_X20not_X20a_X20map, "persist._p is not a map", 1176528732u, 0, 23, &be_const_str_publish_result);
-be_define_const_str(pi, "pi", 1213090802u, 0, 2, &be_const_str_set_alternate);
-be_define_const_str(pin, "pin", 1866532500u, 0, 3, &be_const_str_running);
-be_define_const_str(pin_mode, "pin_mode", 3258314030u, 0, 8, &be_const_str_set_first_time);
-be_define_const_str(pin_used, "pin_used", 4033854612u, 0, 8, &be_const_str_reapply);
+be_define_const_str(pc_rel, "pc_rel", 991921176u, 0, 6, &be_const_str_print);
+be_define_const_str(percentage, "percentage", 2538831285u, 0, 10, NULL);
+be_define_const_str(persist, "persist", 3917083779u, 0, 7, &be_const_str_serial);
+be_define_const_str(persist_X2E_p_X20is_X20not_X20a_X20map, "persist._p is not a map", 1176528732u, 0, 23, &be_const_str_quality);
+be_define_const_str(pi, "pi", 1213090802u, 0, 2, &be_const_str_yield);
+be_define_const_str(pin, "pin", 1866532500u, 0, 3, &be_const_str_resp_cmnd_failed);
+be_define_const_str(pin_mode, "pin_mode", 3258314030u, 0, 8, NULL);
+be_define_const_str(pin_used, "pin_used", 4033854612u, 0, 8, NULL);
 be_define_const_str(pixel_count, "pixel_count", 2439130743u, 0, 11, NULL);
 be_define_const_str(pixel_size, "pixel_size", 2209135785u, 0, 10, NULL);
-be_define_const_str(pixels_buffer, "pixels_buffer", 1229555807u, 0, 13, NULL);
-be_define_const_str(point, "point", 414084241u, 0, 5, &be_const_str_setmember);
+be_define_const_str(pixels_buffer, "pixels_buffer", 1229555807u, 0, 13, &be_const_str_select);
+be_define_const_str(point, "point", 414084241u, 0, 5, NULL);
 be_define_const_str(pop, "pop", 1362321360u, 0, 3, NULL);
-be_define_const_str(pop_path, "pop_path", 2403243998u, 0, 8, NULL);
-be_define_const_str(pow, "pow", 1479764693u, 0, 3, NULL);
-be_define_const_str(preinit, "preinit", 2722007100u, 0, 7, NULL);
-be_define_const_str(print, "print", 372738696u, 0, 5, &be_const_str_else);
-be_define_const_str(public_key, "public_key", 4169142980u, 0, 10, &be_const_str_continue);
-be_define_const_str(publish, "publish", 264247304u, 0, 7, &be_const_str_web_add_main_button);
-be_define_const_str(publish_result, "publish_result", 2013351252u, 0, 14, &be_const_str_set_x);
-be_define_const_str(push, "push", 2272264157u, 0, 4, &be_const_str_stop);
-be_define_const_str(push_path, "push_path", 1155254157u, 0, 9, NULL);
+be_define_const_str(pop_path, "pop_path", 2403243998u, 0, 8, &be_const_str_rand);
+be_define_const_str(pow, "pow", 1479764693u, 0, 3, &be_const_str_setbits);
+be_define_const_str(preinit, "preinit", 2722007100u, 0, 7, &be_const_str_widget_dtor_impl);
+be_define_const_str(print, "print", 372738696u, 0, 5, &be_const_str_save_before_restart);
+be_define_const_str(public_key, "public_key", 4169142980u, 0, 10, NULL);
+be_define_const_str(publish, "publish", 264247304u, 0, 7, NULL);
+be_define_const_str(publish_result, "publish_result", 2013351252u, 0, 14, &be_const_str_set_width);
+be_define_const_str(push, "push", 2272264157u, 0, 4, NULL);
+be_define_const_str(push_path, "push_path", 1155254157u, 0, 9, &be_const_str_split);
 be_define_const_str(quality, "quality", 2597670950u, 0, 7, NULL);
-be_define_const_str(r, "r", 4144776981u, 0, 1, &be_const_str_tele);
-be_define_const_str(rad, "rad", 1358899048u, 0, 3, NULL);
+be_define_const_str(r, "r", 4144776981u, 0, 1, NULL);
+be_define_const_str(rad, "rad", 1358899048u, 0, 3, &be_const_str_setitem);
 be_define_const_str(raise, "raise", 1593437475u, 70, 5, NULL);
-be_define_const_str(rand, "rand", 2711325910u, 0, 4, NULL);
-be_define_const_str(range, "range", 4208725202u, 0, 5, &be_const_str_web_add_handler);
+be_define_const_str(rand, "rand", 2711325910u, 0, 4, &be_const_str_run_bat);
+be_define_const_str(range, "range", 4208725202u, 0, 5, NULL);
 be_define_const_str(read, "read", 3470762949u, 0, 4, NULL);
 be_define_const_str(read12, "read12", 4291076970u, 0, 6, NULL);
-be_define_const_str(read13, "read13", 12887293u, 0, 6, &be_const_str_set_timer);
+be_define_const_str(read13, "read13", 12887293u, 0, 6, NULL);
 be_define_const_str(read24, "read24", 1808533811u, 0, 6, NULL);
-be_define_const_str(read32, "read32", 1741276240u, 0, 6, &be_const_str_break);
-be_define_const_str(read8, "read8", 2802788167u, 0, 5, &be_const_str_readline);
-be_define_const_str(read_bytes, "read_bytes", 3576733173u, 0, 10, &be_const_str_type);
+be_define_const_str(read32, "read32", 1741276240u, 0, 6, NULL);
+be_define_const_str(read8, "read8", 2802788167u, 0, 5, &be_const_str_type);
+be_define_const_str(read_bytes, "read_bytes", 3576733173u, 0, 10, NULL);
 be_define_const_str(read_sensors, "read_sensors", 892689201u, 0, 12, NULL);
-be_define_const_str(readbytes, "readbytes", 2716426756u, 0, 9, &be_const_str_show);
-be_define_const_str(readline, "readline", 1212709927u, 0, 8, &be_const_str_solidified);
-be_define_const_str(real, "real", 3604983901u, 0, 4, &be_const_str__X7B_X7D);
-be_define_const_str(reapply, "reapply", 3778939332u, 0, 7, NULL);
+be_define_const_str(readbytes, "readbytes", 2716426756u, 0, 9, NULL);
+be_define_const_str(readline, "readline", 1212709927u, 0, 8, NULL);
+be_define_const_str(real, "real", 3604983901u, 0, 4, &be_const_str_tcpclient);
+be_define_const_str(reapply, "reapply", 3778939332u, 0, 7, &be_const_str_settings);
 be_define_const_str(redirect, "redirect", 389758641u, 0, 8, NULL);
-be_define_const_str(reduce, "reduce", 2002030311u, 0, 6, NULL);
-be_define_const_str(refr_size, "refr_size", 1958144468u, 0, 9, NULL);
+be_define_const_str(refr_size, "refr_size", 1958144468u, 0, 9, &be_const_str_toupper);
 be_define_const_str(register_obj, "register_obj", 3982614770u, 0, 12, NULL);
-be_define_const_str(remove, "remove", 3683784189u, 0, 6, NULL);
+be_define_const_str(remove, "remove", 3683784189u, 0, 6, &be_const_str_seg7_font);
 be_define_const_str(remove_cmd, "remove_cmd", 3832315702u, 0, 10, NULL);
-be_define_const_str(remove_driver, "remove_driver", 1030243768u, 0, 13, &be_const_str_string);
-be_define_const_str(remove_rule, "remove_rule", 3456211328u, 0, 11, NULL);
+be_define_const_str(remove_driver, "remove_driver", 1030243768u, 0, 13, &be_const_str_for);
+be_define_const_str(remove_rule, "remove_rule", 3456211328u, 0, 11, &be_const_str_import);
 be_define_const_str(remove_timer, "remove_timer", 4141472215u, 0, 12, NULL);
 be_define_const_str(reset, "reset", 1695364032u, 0, 5, NULL);
-be_define_const_str(reset_search, "reset_search", 1350414305u, 0, 12, &be_const_str_widget_destructor);
-be_define_const_str(resize, "resize", 3514612129u, 0, 6, NULL);
+be_define_const_str(reset_search, "reset_search", 1350414305u, 0, 12, NULL);
+be_define_const_str(resize, "resize", 3514612129u, 0, 6, &be_const_str_set);
 be_define_const_str(resolvecmnd, "resolvecmnd", 993361485u, 0, 11, NULL);
-be_define_const_str(resp_cmnd, "resp_cmnd", 2869459626u, 0, 9, &be_const_str_web_add_management_button);
-be_define_const_str(resp_cmnd_done, "resp_cmnd_done", 2601874875u, 0, 14, &be_const_str_raise);
+be_define_const_str(resp_cmnd, "resp_cmnd", 2869459626u, 0, 9, &be_const_str_update);
+be_define_const_str(resp_cmnd_done, "resp_cmnd_done", 2601874875u, 0, 14, NULL);
 be_define_const_str(resp_cmnd_error, "resp_cmnd_error", 2404088863u, 0, 15, NULL);
-be_define_const_str(resp_cmnd_failed, "resp_cmnd_failed", 2136281562u, 0, 16, NULL);
+be_define_const_str(resp_cmnd_failed, "resp_cmnd_failed", 2136281562u, 0, 16, &be_const_str_web_add_management_button);
 be_define_const_str(resp_cmnd_str, "resp_cmnd_str", 737845590u, 0, 13, NULL);
 be_define_const_str(response_append, "response_append", 450346371u, 0, 15, NULL);
 be_define_const_str(return, "return", 2246981567u, 60, 6, NULL);
-be_define_const_str(return_X20code_X3D_X25i, "return code=%i", 2127454401u, 0, 14, &be_const_str_set_ldo_enable);
-be_define_const_str(reverse, "reverse", 558918661u, 0, 7, &be_const_str_sin);
-be_define_const_str(reverse_gamma10, "reverse_gamma10", 739112262u, 0, 15, &be_const_str_to_gamma);
+be_define_const_str(return_X20code_X3D_X25i, "return code=%i", 2127454401u, 0, 14, NULL);
+be_define_const_str(reverse, "reverse", 558918661u, 0, 7, NULL);
+be_define_const_str(reverse_gamma10, "reverse_gamma10", 739112262u, 0, 15, NULL);
 be_define_const_str(rotate, "rotate", 2784296202u, 0, 6, NULL);
-be_define_const_str(round_end, "round_end", 985288225u, 0, 9, NULL);
-be_define_const_str(round_start, "round_start", 2949484384u, 0, 11, &be_const_str_wire);
-be_define_const_str(rtc, "rtc", 1070575216u, 0, 3, &be_const_str_settings);
-be_define_const_str(rule, "rule", 4230889683u, 0, 4, NULL);
-be_define_const_str(run, "run", 718098122u, 0, 3, NULL);
+be_define_const_str(round_end, "round_end", 985288225u, 0, 9, &be_const_str_set_ldo_enable);
+be_define_const_str(round_start, "round_start", 2949484384u, 0, 11, NULL);
+be_define_const_str(rtc, "rtc", 1070575216u, 0, 3, &be_const_str_web_add_button);
+be_define_const_str(rule, "rule", 4230889683u, 0, 4, &be_const_str_valuer_error);
+be_define_const_str(run, "run", 718098122u, 0, 3, &be_const_str_toptr);
 be_define_const_str(run_bat, "run_bat", 2536903298u, 0, 7, NULL);
 be_define_const_str(run_deferred, "run_deferred", 371594696u, 0, 12, NULL);
 be_define_const_str(running, "running", 343848780u, 0, 7, NULL);
-be_define_const_str(save, "save", 3439296072u, 0, 4, &be_const_str_tanh);
-be_define_const_str(save_before_restart, "save_before_restart", 1253239338u, 0, 19, NULL);
-be_define_const_str(scale_uint, "scale_uint", 3090811094u, 0, 10, &be_const_str_set_style_pad_right);
-be_define_const_str(scan, "scan", 3974641896u, 0, 4, &be_const_str_set_dc_voltage);
+be_define_const_str(save, "save", 3439296072u, 0, 4, NULL);
+be_define_const_str(save_before_restart, "save_before_restart", 1253239338u, 0, 19, &be_const_str_scale_uint);
+be_define_const_str(scale_uint, "scale_uint", 3090811094u, 0, 10, NULL);
+be_define_const_str(scan, "scan", 3974641896u, 0, 4, NULL);
 be_define_const_str(search, "search", 2150836393u, 0, 6, NULL);
 be_define_const_str(sec, "sec", 3139892658u, 0, 3, NULL);
 be_define_const_str(seg7_font, "seg7_font", 4099690689u, 0, 9, NULL);
-be_define_const_str(select, "select", 297952813u, 0, 6, NULL);
-be_define_const_str(serial, "serial", 3687697785u, 0, 6, &be_const_str_url_encode);
-be_define_const_str(set, "set", 3324446467u, 0, 3, NULL);
-be_define_const_str(set_alternate, "set_alternate", 1709680562u, 0, 13, &be_const_str_widget_struct_by_class);
+be_define_const_str(select, "select", 297952813u, 0, 6, &be_const_str_static);
+be_define_const_str(serial, "serial", 3687697785u, 0, 6, &be_const_str_set_y);
+be_define_const_str(set, "set", 3324446467u, 0, 3, &be_const_str_time_dump);
+be_define_const_str(set_alternate, "set_alternate", 1709680562u, 0, 13, NULL);
 be_define_const_str(set_auth, "set_auth", 1057170930u, 0, 8, NULL);
-be_define_const_str(set_bri, "set_bri", 2789118779u, 0, 7, &be_const_str_wire1);
+be_define_const_str(set_bri, "set_bri", 2789118779u, 0, 7, NULL);
 be_define_const_str(set_chg_current, "set_chg_current", 336304386u, 0, 15, NULL);
-be_define_const_str(set_dc_voltage, "set_dc_voltage", 2181981936u, 0, 14, &be_const_str_toupper);
-be_define_const_str(set_dcdc_enable, "set_dcdc_enable", 1594690786u, 0, 15, &be_const_str_tomap);
+be_define_const_str(set_dc_voltage, "set_dc_voltage", 2181981936u, 0, 14, NULL);
+be_define_const_str(set_dcdc_enable, "set_dcdc_enable", 1594690786u, 0, 15, NULL);
 be_define_const_str(set_first_time, "set_first_time", 3111247550u, 0, 14, NULL);
-be_define_const_str(set_height, "set_height", 1080207399u, 0, 10, &be_const_str_width_def);
+be_define_const_str(set_height, "set_height", 1080207399u, 0, 10, NULL);
 be_define_const_str(set_ldo_enable, "set_ldo_enable", 2916502041u, 0, 14, NULL);
-be_define_const_str(set_ldo_voltage, "set_ldo_voltage", 4090501160u, 0, 15, &be_const_str_tob64);
-be_define_const_str(set_light, "set_light", 3176076152u, 0, 9, &be_const_str_setrange);
+be_define_const_str(set_ldo_voltage, "set_ldo_voltage", 4090501160u, 0, 15, NULL);
+be_define_const_str(set_light, "set_light", 3176076152u, 0, 9, NULL);
 be_define_const_str(set_matrix_pixel_color, "set_matrix_pixel_color", 1197149462u, 0, 22, NULL);
-be_define_const_str(set_percentage, "set_percentage", 2952022724u, 0, 14, NULL);
+be_define_const_str(set_percentage, "set_percentage", 2952022724u, 0, 14, &be_const_str_to_gamma);
 be_define_const_str(set_pixel_color, "set_pixel_color", 1275248356u, 0, 15, NULL);
-be_define_const_str(set_power, "set_power", 549820893u, 0, 9, &be_const_str_widget_height_def);
+be_define_const_str(set_power, "set_power", 549820893u, 0, 9, NULL);
 be_define_const_str(set_style_bg_color, "set_style_bg_color", 1689513089u, 0, 18, NULL);
 be_define_const_str(set_style_line_color, "set_style_line_color", 3665238976u, 0, 20, NULL);
 be_define_const_str(set_style_pad_right, "set_style_pad_right", 3314069054u, 0, 19, NULL);
-be_define_const_str(set_style_text_font, "set_style_text_font", 1028590019u, 0, 19, NULL);
+be_define_const_str(set_style_text_font, "set_style_text_font", 1028590019u, 0, 19, &be_const_str_x);
 be_define_const_str(set_text, "set_text", 1849641155u, 0, 8, NULL);
 be_define_const_str(set_time, "set_time", 900236405u, 0, 8, NULL);
-be_define_const_str(set_timeouts, "set_timeouts", 3732850900u, 0, 12, &be_const_str_import);
+be_define_const_str(set_timeouts, "set_timeouts", 3732850900u, 0, 12, &be_const_str_show);
 be_define_const_str(set_timer, "set_timer", 2135414533u, 0, 9, NULL);
-be_define_const_str(set_useragent, "set_useragent", 612237244u, 0, 13, NULL);
-be_define_const_str(set_width, "set_width", 484671920u, 0, 9, &be_const_str__X7D);
-be_define_const_str(set_x, "set_x", 1849400772u, 0, 5, &be_const_str_def);
+be_define_const_str(set_useragent, "set_useragent", 612237244u, 0, 13, &be_const_str_tasmota);
+be_define_const_str(set_width, "set_width", 484671920u, 0, 9, &be_const_str_write_bit);
+be_define_const_str(set_x, "set_x", 1849400772u, 0, 5, &be_const_str_target);
 be_define_const_str(set_y, "set_y", 1866178391u, 0, 5, NULL);
 be_define_const_str(setbits, "setbits", 2762408167u, 0, 7, NULL);
 be_define_const_str(seti, "seti", 1500556254u, 0, 4, NULL);
 be_define_const_str(setitem, "setitem", 1554834596u, 0, 7, NULL);
-be_define_const_str(setmember, "setmember", 1432909441u, 0, 9, &be_const_str_strptime);
-be_define_const_str(setrange, "setrange", 3794019032u, 0, 8, NULL);
+be_define_const_str(setmember, "setmember", 1432909441u, 0, 9, &be_const_str_stop);
+be_define_const_str(setrange, "setrange", 3794019032u, 0, 8, &be_const_str_value);
 be_define_const_str(settings, "settings", 1745255176u, 0, 8, NULL);
-be_define_const_str(shared_key, "shared_key", 2200833624u, 0, 10, &be_const_str_wifi);
-be_define_const_str(show, "show", 2840060476u, 0, 4, &be_const_str_y);
+be_define_const_str(shared_key, "shared_key", 2200833624u, 0, 10, &be_const_str_tan);
+be_define_const_str(show, "show", 2840060476u, 0, 4, NULL);
 be_define_const_str(sin, "sin", 3761252941u, 0, 3, NULL);
-be_define_const_str(sinh, "sinh", 282220607u, 0, 4, &be_const_str_tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29);
-be_define_const_str(size, "size", 597743964u, 0, 4, NULL);
+be_define_const_str(sinh, "sinh", 282220607u, 0, 4, NULL);
+be_define_const_str(size, "size", 597743964u, 0, 4, &be_const_str_sys);
 be_define_const_str(skip, "skip", 1097563074u, 0, 4, NULL);
-be_define_const_str(solidified, "solidified", 3257553487u, 0, 10, NULL);
-be_define_const_str(split, "split", 2276994531u, 0, 5, &be_const_str_strftime);
-be_define_const_str(sqrt, "sqrt", 2112764879u, 0, 4, NULL);
+be_define_const_str(solidified, "solidified", 3257553487u, 0, 10, &be_const_str_tr);
+be_define_const_str(split, "split", 2276994531u, 0, 5, &be_const_str_upper);
+be_define_const_str(sqrt, "sqrt", 2112764879u, 0, 4, &be_const_str_tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29);
 be_define_const_str(srand, "srand", 465518633u, 0, 5, NULL);
 be_define_const_str(start, "start", 1697318111u, 0, 5, NULL);
-be_define_const_str(state, "state", 2016490230u, 0, 5, NULL);
+be_define_const_str(state, "state", 2016490230u, 0, 5, &be_const_str_write_bytes);
 be_define_const_str(static, "static", 3532702267u, 71, 6, NULL);
 be_define_const_str(stop, "stop", 3411225317u, 0, 4, NULL);
 be_define_const_str(stop_iteration, "stop_iteration", 4173793901u, 0, 14, NULL);
-be_define_const_str(str, "str", 3259748752u, 0, 3, NULL);
+be_define_const_str(str, "str", 3259748752u, 0, 3, &be_const_str_end);
 be_define_const_str(strftime, "strftime", 187738851u, 0, 8, NULL);
-be_define_const_str(string, "string", 398550328u, 0, 6, NULL);
+be_define_const_str(string, "string", 398550328u, 0, 6, &be_const_str_false);
 be_define_const_str(strip, "strip", 4246411473u, 0, 5, NULL);
-be_define_const_str(strptime, "strptime", 1277910361u, 0, 8, &be_const_str_unknown_X20instruction);
-be_define_const_str(super, "super", 4152230356u, 0, 5, &be_const_str_year);
+be_define_const_str(strptime, "strptime", 1277910361u, 0, 8, NULL);
+be_define_const_str(super, "super", 4152230356u, 0, 5, NULL);
 be_define_const_str(sys, "sys", 3277365014u, 0, 3, NULL);
-be_define_const_str(tag, "tag", 2516003219u, 0, 3, &be_const_str_widget_instance_size);
-be_define_const_str(tan, "tan", 2633446552u, 0, 3, NULL);
+be_define_const_str(tag, "tag", 2516003219u, 0, 3, NULL);
+be_define_const_str(tan, "tan", 2633446552u, 0, 3, &be_const_str_do);
 be_define_const_str(tanh, "tanh", 153638352u, 0, 4, NULL);
 be_define_const_str(target, "target", 845187144u, 0, 6, NULL);
 be_define_const_str(target_search, "target_search", 1947846553u, 0, 13, NULL);
 be_define_const_str(tasmota, "tasmota", 424643812u, 0, 7, NULL);
 be_define_const_str(tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29, "tasmota.get_light() is deprecated, use light.get()", 3525753647u, 0, 50, NULL);
 be_define_const_str(tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29, "tasmota.set_light() is deprecated, use light.set()", 2124937871u, 0, 50, NULL);
-be_define_const_str(tcpclient, "tcpclient", 3828797983u, 0, 9, NULL);
+be_define_const_str(tcpclient, "tcpclient", 3828797983u, 0, 9, &be_const_str_time_reached);
 be_define_const_str(tele, "tele", 3474458061u, 0, 4, NULL);
 be_define_const_str(the_X20second_X20argument_X20is_X20not_X20a_X20function, "the second argument is not a function", 3954574469u, 0, 37, NULL);
 be_define_const_str(time_dump, "time_dump", 3330410747u, 0, 9, NULL);
 be_define_const_str(time_reached, "time_reached", 2075136773u, 0, 12, NULL);
-be_define_const_str(time_str, "time_str", 2613827612u, 0, 8, &be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D);
-be_define_const_str(to_gamma, "to_gamma", 1597139862u, 0, 8, NULL);
-be_define_const_str(tob64, "tob64", 373777640u, 0, 5, NULL);
-be_define_const_str(tolower, "tolower", 1042520049u, 0, 7, NULL);
+be_define_const_str(time_str, "time_str", 2613827612u, 0, 8, &be_const_str_wd);
+be_define_const_str(to_gamma, "to_gamma", 1597139862u, 0, 8, &be_const_str_web_sensor);
+be_define_const_str(tob64, "tob64", 373777640u, 0, 5, &be_const_str_y);
+be_define_const_str(tolower, "tolower", 1042520049u, 0, 7, &be_const_str_wire1);
 be_define_const_str(tomap, "tomap", 612167626u, 0, 5, NULL);
 be_define_const_str(top, "top", 2802900028u, 0, 3, NULL);
 be_define_const_str(toptr, "toptr", 3379847454u, 0, 5, NULL);
 be_define_const_str(tostring, "tostring", 2299708645u, 0, 8, NULL);
-be_define_const_str(toupper, "toupper", 3691983576u, 0, 7, NULL);
+be_define_const_str(toupper, "toupper", 3691983576u, 0, 7, &be_const_str_widget_event_cb);
 be_define_const_str(tr, "tr", 1195724803u, 0, 2, NULL);
-be_define_const_str(traceback, "traceback", 3385188109u, 0, 9, &be_const_str_as);
+be_define_const_str(traceback, "traceback", 3385188109u, 0, 9, NULL);
 be_define_const_str(true, "true", 1303515621u, 61, 4, NULL);
 be_define_const_str(try, "try", 2887626766u, 68, 3, NULL);
-be_define_const_str(try_rule, "try_rule", 1986449405u, 0, 8, &be_const_str_widget_dtor_cb);
+be_define_const_str(try_rule, "try_rule", 1986449405u, 0, 8, NULL);
 be_define_const_str(type, "type", 1361572173u, 0, 4, NULL);
-be_define_const_str(unknown_X20instruction, "unknown instruction", 1093911841u, 0, 19, &be_const_str_widget_event_impl);
+be_define_const_str(unknown_X20instruction, "unknown instruction", 1093911841u, 0, 19, &be_const_str_raise);
 be_define_const_str(update, "update", 672109684u, 0, 6, NULL);
 be_define_const_str(upper, "upper", 176974407u, 0, 5, NULL);
-be_define_const_str(url_encode, "url_encode", 528392145u, 0, 10, NULL);
-be_define_const_str(v, "v", 4077666505u, 0, 1, &be_const_str_valuer_error);
-be_define_const_str(value, "value", 1113510858u, 0, 5, &be_const_str_web_add_button);
+be_define_const_str(url_encode, "url_encode", 528392145u, 0, 10, &be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_X26deg_X3BC_X7Be_X7D);
+be_define_const_str(v, "v", 4077666505u, 0, 1, &be_const_str_widget_struct_default);
+be_define_const_str(value, "value", 1113510858u, 0, 5, NULL);
 be_define_const_str(value_error, "value_error", 773297791u, 0, 11, NULL);
 be_define_const_str(valuer_error, "valuer_error", 2567947105u, 0, 12, NULL);
 be_define_const_str(var, "var", 2317739966u, 64, 3, NULL);
-be_define_const_str(w, "w", 4060888886u, 0, 1, NULL);
-be_define_const_str(wd, "wd", 1531424278u, 0, 2, NULL);
+be_define_const_str(w, "w", 4060888886u, 0, 1, &be_const_str__X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D);
+be_define_const_str(wd, "wd", 1531424278u, 0, 2, &be_const_str_except);
 be_define_const_str(web_add_button, "web_add_button", 3537875058u, 0, 14, NULL);
 be_define_const_str(web_add_config_button, "web_add_config_button", 639674325u, 0, 21, NULL);
 be_define_const_str(web_add_console_button, "web_add_console_button", 3481436192u, 0, 22, NULL);
 be_define_const_str(web_add_handler, "web_add_handler", 3990174962u, 0, 15, NULL);
 be_define_const_str(web_add_main_button, "web_add_main_button", 3960367664u, 0, 19, NULL);
-be_define_const_str(web_add_management_button, "web_add_management_button", 2738877186u, 0, 25, &be_const_str_webclient);
+be_define_const_str(web_add_management_button, "web_add_management_button", 2738877186u, 0, 25, NULL);
 be_define_const_str(web_send, "web_send", 2989941448u, 0, 8, NULL);
 be_define_const_str(web_send_decimal, "web_send_decimal", 1407210204u, 0, 16, NULL);
-be_define_const_str(web_sensor, "web_sensor", 2900096972u, 0, 10, &be_const_str_do);
-be_define_const_str(webclient, "webclient", 4076389146u, 0, 9, NULL);
+be_define_const_str(web_sensor, "web_sensor", 2900096972u, 0, 10, &be_const_str_nil);
+be_define_const_str(webclient, "webclient", 4076389146u, 0, 9, &be_const_str_while);
 be_define_const_str(webserver, "webserver", 1572454038u, 0, 9, NULL);
 be_define_const_str(while, "while", 231090382u, 53, 5, NULL);
-be_define_const_str(widget_cb, "widget_cb", 2763583055u, 0, 9, &be_const_str_width);
-be_define_const_str(widget_constructor, "widget_constructor", 2543785934u, 0, 18, &be_const_str_yield);
-be_define_const_str(widget_ctor_cb, "widget_ctor_cb", 876007560u, 0, 14, &be_const_str_for);
-be_define_const_str(widget_ctor_impl, "widget_ctor_impl", 194252479u, 0, 16, &be_const_str_write_file);
+be_define_const_str(widget_cb, "widget_cb", 2763583055u, 0, 9, NULL);
+be_define_const_str(widget_constructor, "widget_constructor", 2543785934u, 0, 18, NULL);
+be_define_const_str(widget_ctor_cb, "widget_ctor_cb", 876007560u, 0, 14, NULL);
+be_define_const_str(widget_ctor_impl, "widget_ctor_impl", 194252479u, 0, 16, NULL);
 be_define_const_str(widget_destructor, "widget_destructor", 4207388345u, 0, 17, NULL);
 be_define_const_str(widget_dtor_cb, "widget_dtor_cb", 3151545845u, 0, 14, NULL);
 be_define_const_str(widget_dtor_impl, "widget_dtor_impl", 520430610u, 0, 16, NULL);
-be_define_const_str(widget_editable, "widget_editable", 3821793286u, 0, 15, &be_const_str_try);
+be_define_const_str(widget_editable, "widget_editable", 3821793286u, 0, 15, NULL);
 be_define_const_str(widget_event, "widget_event", 1951408186u, 0, 12, NULL);
-be_define_const_str(widget_event_cb, "widget_event_cb", 1508466754u, 0, 15, NULL);
+be_define_const_str(widget_event_cb, "widget_event_cb", 1508466754u, 0, 15, &be_const_str_year);
 be_define_const_str(widget_event_impl, "widget_event_impl", 2178430561u, 0, 17, NULL);
 be_define_const_str(widget_group_def, "widget_group_def", 1246968785u, 0, 16, NULL);
 be_define_const_str(widget_height_def, "widget_height_def", 3131667813u, 0, 17, NULL);
 be_define_const_str(widget_instance_size, "widget_instance_size", 2055354779u, 0, 20, NULL);
-be_define_const_str(widget_struct_by_class, "widget_struct_by_class", 3806373842u, 0, 22, NULL);
+be_define_const_str(widget_struct_by_class, "widget_struct_by_class", 3806373842u, 0, 22, &be_const_str_x1);
 be_define_const_str(widget_struct_default, "widget_struct_default", 781673633u, 0, 21, NULL);
 be_define_const_str(widget_width_def, "widget_width_def", 3986078862u, 0, 16, NULL);
-be_define_const_str(width, "width", 2508680735u, 0, 5, NULL);
+be_define_const_str(width, "width", 2508680735u, 0, 5, &be_const_str_true);
 be_define_const_str(width_def, "width_def", 1143717879u, 0, 9, NULL);
-be_define_const_str(wifi, "wifi", 120087624u, 0, 4, NULL);
+be_define_const_str(wifi, "wifi", 120087624u, 0, 4, &be_const_str_write8);
 be_define_const_str(wire, "wire", 4082753944u, 0, 4, NULL);
 be_define_const_str(wire1, "wire1", 3212721419u, 0, 5, NULL);
 be_define_const_str(wire2, "wire2", 3229499038u, 0, 5, NULL);
@@ -722,9 +718,9 @@ be_define_const_str(wire_scan, "wire_scan", 2671275880u, 0, 9, NULL);
 be_define_const_str(write, "write", 3190202204u, 0, 5, NULL);
 be_define_const_str(write8, "write8", 3133991532u, 0, 6, NULL);
 be_define_const_str(write_bit, "write_bit", 2660990436u, 0, 9, NULL);
-be_define_const_str(write_bytes, "write_bytes", 1227543792u, 0, 11, &be_const_str_except);
+be_define_const_str(write_bytes, "write_bytes", 1227543792u, 0, 11, NULL);
 be_define_const_str(write_file, "write_file", 3177658879u, 0, 10, NULL);
-be_define_const_str(write_gpio, "write_gpio", 2267940334u, 0, 10, &be_const_str_if);
+be_define_const_str(write_gpio, "write_gpio", 2267940334u, 0, 10, NULL);
 be_define_const_str(x, "x", 4245442695u, 0, 1, NULL);
 be_define_const_str(x1, "x1", 274927234u, 0, 2, NULL);
 be_define_const_str(y, "y", 4228665076u, 0, 1, NULL);
@@ -732,381 +728,379 @@ be_define_const_str(y1, "y1", 2355101727u, 0, 2, NULL);
 be_define_const_str(year, "year", 2927578396u, 0, 4, NULL);
 be_define_const_str(yield, "yield", 1821831854u, 0, 5, NULL);
 be_define_const_str(zero, "zero", 2339366755u, 0, 4, NULL);
-be_define_const_str(zip, "zip", 2877453236u, 0, 3, &be_const_str__X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D);
+be_define_const_str(zip, "zip", 2877453236u, 0, 3, NULL);
 be_define_const_str(_X7B, "{", 4262220314u, 0, 1, NULL);
 be_define_const_str(_X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D, "{s}Batt Current{m}%.1f mA{e}", 866537156u, 0, 28, NULL);
 be_define_const_str(_X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D, "{s}Batt Voltage{m}%.3f V{e}", 3184308199u, 0, 27, NULL);
-be_define_const_str(_X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D, "{s}Temp AXP{m}%.1f \u00b0C{e}", 2304457292u, 0, 24, NULL);
+be_define_const_str(_X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_X26deg_X3BC_X7Be_X7D, "{s}Temp AXP{m}%.1f &deg;C{e}", 2622904081u, 0, 28, NULL);
 be_define_const_str(_X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D, "{s}VBus Current{m}%.1f mA{e}", 1032721155u, 0, 28, NULL);
 be_define_const_str(_X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D, "{s}VBus Voltage{m}%.3f V{e}", 165651270u, 0, 27, NULL);
 be_define_const_str(_X7B_X7D, "{}", 1415952421u, 0, 2, NULL);
 be_define_const_str(_X7D, "}", 4161554600u, 0, 1, NULL);
 
 static const bstring* const m_string_table[] = {
-    (const bstring *)&be_const_str__X3D,
-    (const bstring *)&be_const_str_point,
-    (const bstring *)&be_const_str_run,
     NULL,
-    (const bstring *)&be_const_str_class_init_obj,
-    (const bstring *)&be_const_str_try_rule,
-    (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20,
-    (const bstring *)&be_const_str_setbits,
-    (const bstring *)&be_const_str_AXP192,
-    (const bstring *)&be_const_str_tolower,
-    (const bstring *)&be_const_str__X2B,
-    (const bstring *)&be_const_str_I2C_X3A,
-    (const bstring *)&be_const_str_exec_rules,
-    (const bstring *)&be_const_str_read13,
-    (const bstring *)&be_const_str__X2F,
-    (const bstring *)&be_const_str_pc_abs,
-    (const bstring *)&be_const_str__error,
-    (const bstring *)&be_const_str__X23autoexec_X2Ebat,
-    (const bstring *)&be_const_str__X23,
-    (const bstring *)&be_const_str__X2Ep,
-    (const bstring *)&be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E,
-    (const bstring *)&be_const_str_SERIAL_6N1,
-    (const bstring *)&be_const_str_cb_do_nothing,
-    (const bstring *)&be_const_str_CFG_X3A_X20loading_X20,
-    (const bstring *)&be_const_str_HTTP_POST,
-    (const bstring *)&be_const_str__rules,
+    (const bstring *)&be_const_str_content_button,
     NULL,
-    NULL,
-    NULL,
-    (const bstring *)&be_const_str_the_X20second_X20argument_X20is_X20not_X20a_X20function,
-    (const bstring *)&be_const_str_begin,
-    (const bstring *)&be_const_str_POST,
-    (const bstring *)&be_const_str_web_add_console_button,
-    (const bstring *)&be_const_str__X2F_X2Eautoconf,
-    NULL,
-    (const bstring *)&be_const_str__filename,
-    (const bstring *)&be_const_str_write_bit,
-    (const bstring *)&be_const_str_SERIAL_5O1,
-    (const bstring *)&be_const_str_AES_GCM,
-    (const bstring *)&be_const_str_set_height,
-    (const bstring *)&be_const_str__end_transmission,
-    (const bstring *)&be_const_str__X2D_X2D_X3A_X2D_X2D,
-    (const bstring *)&be_const_str_cb_obj,
-    (const bstring *)&be_const_str_CFG_X3A_X20removing_X20first_X20time_X20marker,
-    (const bstring *)&be_const_str__archive,
-    (const bstring *)&be_const_str_module,
-    (const bstring *)&be_const_str_SERIAL_7N1,
-    (const bstring *)&be_const_str_sinh,
-    (const bstring *)&be_const_str__X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E,
-    (const bstring *)&be_const_str_SERIAL_6O2,
-    (const bstring *)&be_const_str_detected_X20on_X20bus,
-    (const bstring *)&be_const_str_response_append,
-    (const bstring *)&be_const_str_WS2812_GRB,
-    (const bstring *)&be_const_str__X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29,
-    (const bstring *)&be_const_str_toptr,
-    (const bstring *)&be_const_str_get_bri,
-    NULL,
-    (const bstring *)&be_const_str_arch,
-    NULL,
-    (const bstring *)&be_const_str__X3C_X2Fform_X3E_X3C_X2Fp_X3E,
-    (const bstring *)&be_const_str_connection_error,
-    (const bstring *)&be_const_str_,
-    (const bstring *)&be_const_str_calldepth,
-    (const bstring *)&be_const_str___iterator__,
-    (const bstring *)&be_const_str__X2Esize,
-    (const bstring *)&be_const_str_widget_group_def,
-    (const bstring *)&be_const_str_resp_cmnd,
-    (const bstring *)&be_const_str__X2Ep2,
-    (const bstring *)&be_const_str_get_switch,
-    (const bstring *)&be_const_str_clear_first_time,
-    NULL,
-    (const bstring *)&be_const_str_EC_C25519,
-    (const bstring *)&be_const_str_save,
-    NULL,
-    NULL,
-    (const bstring *)&be_const_str_SERIAL_8N1,
-    (const bstring *)&be_const_str_ip,
-    (const bstring *)&be_const_str_alternate,
-    (const bstring *)&be_const_str_compile,
-    (const bstring *)&be_const_str_file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27,
-    (const bstring *)&be_const_str_animate,
-    (const bstring *)&be_const_str__X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d,
-    NULL,
-    (const bstring *)&be_const_str_SERIAL_8O2,
-    (const bstring *)&be_const_str__X25s_X2Eautoconf,
-    NULL,
-    (const bstring *)&be_const_str__dirty,
-    (const bstring *)&be_const_str_y1,
-    (const bstring *)&be_const_str_remove_driver,
-    (const bstring *)&be_const_str_get_string,
-    (const bstring *)&be_const_str_CFG_X3A_X20removing_X20autoconf_X20files,
-    (const bstring *)&be_const_str_autoexec,
-    (const bstring *)&be_const_str_get_style_line_color,
-    (const bstring *)&be_const_str_bool,
-    (const bstring *)&be_const_str_write_gpio,
-    (const bstring *)&be_const_str__X3D_X3D,
-    (const bstring *)&be_const_str_id,
     (const bstring *)&be_const_str_SERIAL_5N2,
-    NULL,
-    (const bstring *)&be_const_str_persist,
-    (const bstring *)&be_const_str_set_timeouts,
-    NULL,
-    (const bstring *)&be_const_str_AudioGenerator,
-    (const bstring *)&be_const_str_byte,
-    (const bstring *)&be_const_str_EVENT_DRAW_PART_BEGIN,
-    (const bstring *)&be_const_str_collect,
-    (const bstring *)&be_const_str_widget_event,
-    (const bstring *)&be_const_str_SERIAL_6E2,
-    (const bstring *)&be_const_str_add_anim,
-    (const bstring *)&be_const_str_erase,
-    (const bstring *)&be_const_str___lower__,
-    (const bstring *)&be_const_str_arg,
-    (const bstring *)&be_const_str_CFG_X3A_X20ran_X20_X20,
-    (const bstring *)&be_const_str_srand,
-    (const bstring *)&be_const_str_skip,
-    (const bstring *)&be_const_str_Leds,
-    NULL,
-    (const bstring *)&be_const_str__X23init_X2Ebat,
-    (const bstring *)&be_const_str__X3Clambda_X3E,
-    (const bstring *)&be_const_str_GET,
-    (const bstring *)&be_const_str_widget_ctor_cb,
-    (const bstring *)&be_const_str__global_addr,
-    (const bstring *)&be_const_str_OneWire,
-    (const bstring *)&be_const_str__X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E,
-    (const bstring *)&be_const_str_update,
-    NULL,
-    NULL,
-    NULL,
-    (const bstring *)&be_const_str_AudioOutput,
-    NULL,
-    (const bstring *)&be_const_str_decompress,
-    NULL,
-    (const bstring *)&be_const_str_EVENT_DRAW_PART_END,
-    (const bstring *)&be_const_str_load_templates,
-    (const bstring *)&be_const_str_get_alternate,
-    (const bstring *)&be_const_str_acos,
     (const bstring *)&be_const_str__X2Elen,
-    (const bstring *)&be_const_str_constructor_cb,
-    (const bstring *)&be_const_str_CFG_X3A_X20loaded_X20_X20,
-    NULL,
-    (const bstring *)&be_const_str_get_current_module_name,
-    (const bstring *)&be_const_str__X2Ebec,
-    (const bstring *)&be_const_str__settings_ptr,
-    (const bstring *)&be_const_str_dump,
-    NULL,
-    (const bstring *)&be_const_str__drivers,
-    (const bstring *)&be_const_str__X28_X29,
-    NULL,
-    (const bstring *)&be_const_str__X2Ebe,
-    (const bstring *)&be_const_str_content_start,
-    (const bstring *)&be_const_str__class,
-    (const bstring *)&be_const_str_h,
-    (const bstring *)&be_const_str_Unknown_X20command,
-    (const bstring *)&be_const_str_CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s,
-    (const bstring *)&be_const_str_p1,
-    NULL,
-    NULL,
-    (const bstring *)&be_const_str_b,
-    (const bstring *)&be_const_str_Parameter_X20error,
-    (const bstring *)&be_const_str_event,
-    (const bstring *)&be_const_str_read32,
-    (const bstring *)&be_const_str_f,
-    (const bstring *)&be_const_str_resp_cmnd_failed,
-    (const bstring *)&be_const_str_create_matrix,
-    (const bstring *)&be_const_str_SERIAL_7E2,
-    (const bstring *)&be_const_str_resolvecmnd,
-    (const bstring *)&be_const_str_draw_line,
-    (const bstring *)&be_const_str_autorun,
-    (const bstring *)&be_const_str__X2Eautoconf,
-    (const bstring *)&be_const_str_editable,
-    NULL,
-    NULL,
-    NULL,
-    (const bstring *)&be_const_str__X3A,
-    (const bstring *)&be_const_str_EVENT_DRAW_MAIN,
-    (const bstring *)&be_const_str_remove_timer,
-    (const bstring *)&be_const_str_Wire,
-    (const bstring *)&be_const_str__X3E,
-    (const bstring *)&be_const_str__X26lt_X3BNone_X26gt_X3B,
-    (const bstring *)&be_const_str__X3C,
-    (const bstring *)&be_const_str_pin,
-    (const bstring *)&be_const_str__def,
-    (const bstring *)&be_const_str_int,
-    (const bstring *)&be_const_str_atan2,
-    (const bstring *)&be_const_str_AudioOutputI2S,
-    (const bstring *)&be_const_str_last_modified,
-    (const bstring *)&be_const_str_get_style_pad_right,
-    (const bstring *)&be_const_str__settings_def,
-    (const bstring *)&be_const_str_CFG_X3A_X20loaded_X20_X27_X25s_X27,
-    (const bstring *)&be_const_str__X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B,
+    (const bstring *)&be_const_str_call_native,
+    (const bstring *)&be_const_str_EVENT_DRAW_PART_END,
+    (const bstring *)&be_const_str_alternate,
+    (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20,
+    (const bstring *)&be_const_str_read13,
+    (const bstring *)&be_const_str_dac_voltage,
+    (const bstring *)&be_const_str_widget_group_def,
+    (const bstring *)&be_const_str__begin_transmission,
     NULL,
+    (const bstring *)&be_const_str_a,
     (const bstring *)&be_const_str_start,
-    (const bstring *)&be_const_str_reset,
-    (const bstring *)&be_const_str__X2E,
-    (const bstring *)&be_const_str__X21_X3D_X3D,
-    (const bstring *)&be_const_str__X2C,
-    (const bstring *)&be_const_str__X23preinit_X2Ebe,
-    (const bstring *)&be_const_str_month,
-    (const bstring *)&be_const_str_instance_size,
-    (const bstring *)&be_const_str__X20,
-    (const bstring *)&be_const_str_exp,
-    (const bstring *)&be_const_str_bus,
-    (const bstring *)&be_const_str_cmd_res,
-    (const bstring *)&be_const_str_draw_line_dsc,
-    (const bstring *)&be_const_str_BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s,
-    (const bstring *)&be_const_str_tostring,
-    (const bstring *)&be_const_str_var,
-    (const bstring *)&be_const_str_upper,
-    (const bstring *)&be_const_str_color,
-    (const bstring *)&be_const_str_internal_error,
-    (const bstring *)&be_const_str_encrypt,
-    (const bstring *)&be_const_str__X21_X3D,
-    NULL,
-    NULL,
-    (const bstring *)&be_const_str_CFG_X3A_X20running_X20,
-    (const bstring *)&be_const_str_Restart_X201,
-    (const bstring *)&be_const_str_BUTTON_CONFIGURATION,
-    NULL,
-    (const bstring *)&be_const_str_HTTP_GET,
-    (const bstring *)&be_const_str_loop,
-    (const bstring *)&be_const_str_SERIAL_5O2,
-    (const bstring *)&be_const_str__X0A,
-    (const bstring *)&be_const_str_back_forth,
-    (const bstring *)&be_const_str_add_rule,
-    (const bstring *)&be_const_str_CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem,
-    (const bstring *)&be_const_str_list,
-    (const bstring *)&be_const_str_closure,
-    (const bstring *)&be_const_str__X2F_X3Frst_X3D,
-    NULL,
-    (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E,
-    (const bstring *)&be_const_str_COLOR_WHITE,
-    NULL,
-    (const bstring *)&be_const_str_SERIAL_6O1,
-    (const bstring *)&be_const_str_widget_struct_default,
-    (const bstring *)&be_const_str_gamma,
-    (const bstring *)&be_const_str_abs,
-    (const bstring *)&be_const_str_pc,
-    (const bstring *)&be_const_str_concat,
-    (const bstring *)&be_const_str_height_def,
-    NULL,
-    (const bstring *)&be_const_str_log10,
-    (const bstring *)&be_const_str_call,
     (const bstring *)&be_const_str__p,
-    (const bstring *)&be_const_str_file,
-    (const bstring *)&be_const_str__request_from,
-    (const bstring *)&be_const_str_BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson,
-    (const bstring *)&be_const_str__X2Ep1,
-    (const bstring *)&be_const_str_content_send_style,
-    (const bstring *)&be_const_str_AudioGeneratorWAV,
-    (const bstring *)&be_const_str_seg7_font,
+    (const bstring *)&be_const_str_load,
+    (const bstring *)&be_const_str_delete_all_configs,
+    (const bstring *)&be_const_str_Auto_X2Dconfiguration,
+    (const bstring *)&be_const_str_clear,
+    (const bstring *)&be_const_str_page_autoconf_mgr,
+    (const bstring *)&be_const_str__dirty,
+    (const bstring *)&be_const_str_set_timer,
     NULL,
-    (const bstring *)&be_const_str_add_driver,
-    (const bstring *)&be_const_str_pin_used,
-    (const bstring *)&be_const_str_Tele,
-    (const bstring *)&be_const_str_SERIAL_8N2,
+    (const bstring *)&be_const_str_iter,
+    (const bstring *)&be_const_str_AudioGenerator,
     NULL,
-    (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E,
-    (const bstring *)&be_const_str_get_input_power_status,
+    (const bstring *)&be_const_str_CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29,
+    (const bstring *)&be_const_str_EC_C25519,
     (const bstring *)&be_const_str__persist_X2Ejson,
+    (const bstring *)&be_const_str_width,
+    (const bstring *)&be_const_str_STATE_DEFAULT,
+    (const bstring *)&be_const_str_assert,
+    (const bstring *)&be_const_str_button_pressed,
+    (const bstring *)&be_const_str_Animate_X20pc_X20is_X20out_X20of_X20range,
+    (const bstring *)&be_const_str__X2Fac,
+    (const bstring *)&be_const_str__X2Ebec,
+    (const bstring *)&be_const_str_instance_size,
+    (const bstring *)&be_const_str_GET,
+    (const bstring *)&be_const_str_path,
+    (const bstring *)&be_const_str_tele,
+    (const bstring *)&be_const_str_geti,
+    (const bstring *)&be_const_str_write_file,
+    (const bstring *)&be_const_str__archive,
+    (const bstring *)&be_const_str_BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson,
+    (const bstring *)&be_const_str_CFG_X3A_X20return_code_X3D_X25i,
+    (const bstring *)&be_const_str_sin,
+    (const bstring *)&be_const_str_copy,
+    (const bstring *)&be_const_str_CFG_X3A_X20downloading_X20_X27_X25s_X27,
+    NULL,
+    (const bstring *)&be_const_str__X21_X3D,
+    (const bstring *)&be_const_str__X2B,
+    (const bstring *)&be_const_str_cb_event_closure,
+    (const bstring *)&be_const_str_code,
+    NULL,
+    (const bstring *)&be_const_str_PART_MAIN,
+    (const bstring *)&be_const_str_target_search,
+    (const bstring *)&be_const_str_CFG_X3A_X20running_X20,
+    (const bstring *)&be_const_str__X2Ep,
+    (const bstring *)&be_const_str_widget_struct_by_class,
+    (const bstring *)&be_const_str_CFG_X3A_X20removing_X20first_X20time_X20marker,
+    (const bstring *)&be_const_str_False,
+    (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E,
+    (const bstring *)&be_const_str__X23preinit_X2Ebe,
+    (const bstring *)&be_const_str_bool,
+    NULL,
+    (const bstring *)&be_const_str__X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B,
+    (const bstring *)&be_const_str_SERIAL_7N1,
+    (const bstring *)&be_const_str_file,
+    (const bstring *)&be_const_str_chars_in_string,
+    (const bstring *)&be_const_str_minute,
+    (const bstring *)&be_const_str_CFG_X3A_X20ran_X20_X20,
+    (const bstring *)&be_const_str__drivers,
+    NULL,
+    (const bstring *)&be_const_str_base_class,
+    (const bstring *)&be_const_str_invalidate,
+    (const bstring *)&be_const_str_elif,
+    (const bstring *)&be_const_str_decompress,
+    (const bstring *)&be_const_str_input,
+    (const bstring *)&be_const_str__X2Eautoconf,
+    (const bstring *)&be_const_str_read8,
+    (const bstring *)&be_const_str_WS2812_GRB,
+    (const bstring *)&be_const_str_Leds,
+    (const bstring *)&be_const_str__X28_X29,
+    (const bstring *)&be_const_str_BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20,
+    (const bstring *)&be_const_str__buffer,
+    NULL,
+    (const bstring *)&be_const_str_lv_event_cb,
+    (const bstring *)&be_const_str_ins_time,
+    (const bstring *)&be_const_str_CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem,
+    (const bstring *)&be_const_str_bus,
+    (const bstring *)&be_const_str_TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27,
+    NULL,
+    (const bstring *)&be_const_str_register_obj,
+    (const bstring *)&be_const_str__lvgl,
+    (const bstring *)&be_const_str_Wire,
+    (const bstring *)&be_const_str_depower,
+    (const bstring *)&be_const_str_state,
+    (const bstring *)&be_const_str__X3D_X3D,
+    (const bstring *)&be_const_str_connected,
+    (const bstring *)&be_const_str_SERIAL_7E1,
+    (const bstring *)&be_const_str__X23,
+    (const bstring *)&be_const_str_redirect,
+    (const bstring *)&be_const_str_get_current_module_path,
+    (const bstring *)&be_const_str__X3E,
+    (const bstring *)&be_const_str__settings_ptr,
+    NULL,
+    (const bstring *)&be_const_str_WS2812,
+    (const bstring *)&be_const_str_close,
+    (const bstring *)&be_const_str_EVENT_DRAW_PART_BEGIN,
+    (const bstring *)&be_const_str_None,
+    (const bstring *)&be_const_str_add_header,
+    (const bstring *)&be_const_str_resize,
+    (const bstring *)&be_const_str__X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E,
+    (const bstring *)&be_const_str_CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29,
+    (const bstring *)&be_const_str__read,
+    (const bstring *)&be_const_str_collect,
+    (const bstring *)&be_const_str__X3E_X3D,
+    (const bstring *)&be_const_str_SERIAL_7N2,
+    (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E,
+    (const bstring *)&be_const_str_setmember,
+    (const bstring *)&be_const_str__end_transmission,
+    (const bstring *)&be_const_str_arg,
+    NULL,
+    (const bstring *)&be_const_str_lv,
+    (const bstring *)&be_const_str_resp_cmnd,
+    (const bstring *)&be_const_str_try_rule,
+    (const bstring *)&be_const_str__X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E,
+    (const bstring *)&be_const_str__X7B_X7D,
+    (const bstring *)&be_const_str_ceil,
+    (const bstring *)&be_const_str_json_fdump_any,
+    NULL,
+    (const bstring *)&be_const_str_CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found,
+    (const bstring *)&be_const_str__X25s_X2Eautoconf,
+    (const bstring *)&be_const_str_srand,
+    (const bstring *)&be_const_str_AudioGeneratorMP3,
+    NULL,
+    (const bstring *)&be_const_str_cb,
+    (const bstring *)&be_const_str_add_cmd,
+    (const bstring *)&be_const_str_reverse_gamma10,
+    (const bstring *)&be_const_str__X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E,
+    (const bstring *)&be_const_str_HTTP_GET,
+    (const bstring *)&be_const_str__X2502d_X25s_X2502d,
+    (const bstring *)&be_const_str_cos,
+    (const bstring *)&be_const_str__X3D_X3C_X3E_X21,
+    (const bstring *)&be_const_str__X2Etapp,
+    (const bstring *)&be_const_str__X2F_X3Frst_X3D,
+    (const bstring *)&be_const_str__X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E,
+    (const bstring *)&be_const_str_get_bat_current,
+    (const bstring *)&be_const_str_escape,
+    (const bstring *)&be_const_str_read24,
+    (const bstring *)&be_const_str_SERIAL_8O1,
+    (const bstring *)&be_const_str__X20,
+    (const bstring *)&be_const_str_obj_class_create_obj,
+    (const bstring *)&be_const_str__X23init_X2Ebat,
+    (const bstring *)&be_const_str__X3F,
     NULL,
     (const bstring *)&be_const_str__X23display_X2Eini,
-    (const bstring *)&be_const_str_Animate_X20pc_X20is_X20out_X20of_X20range,
-    (const bstring *)&be_const_str_SERIAL_8O1,
-    (const bstring *)&be_const_str_ctypes_bytes,
-    (const bstring *)&be_const_str__X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E,
-    (const bstring *)&be_const_str_round_end,
-    (const bstring *)&be_const_str_codedump,
-    (const bstring *)&be_const_str_MD5,
-    (const bstring *)&be_const_str_PART_MAIN,
-    NULL,
-    (const bstring *)&be_const_str_asin,
-    (const bstring *)&be_const_str_content_stop,
-    (const bstring *)&be_const_str_set_light,
-    (const bstring *)&be_const_str_get_bat_current,
-    (const bstring *)&be_const_str_x1,
-    NULL,
-    NULL,
-    (const bstring *)&be_const_str_compress,
-    (const bstring *)&be_const_str_escape,
-    (const bstring *)&be_const_str_atan,
-    (const bstring *)&be_const_str_SERIAL_5N1,
-    (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E,
-    (const bstring *)&be_const_str__X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E,
-    (const bstring *)&be_const_str_tr,
-    (const bstring *)&be_const_str__X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E,
-    (const bstring *)&be_const_str__X2E_X2E,
-    (const bstring *)&be_const_str_SERIAL_6E1,
-    (const bstring *)&be_const_str_content_button,
-    (const bstring *)&be_const_str_asstring,
-    NULL,
-    (const bstring *)&be_const_str_detect,
-    (const bstring *)&be_const_str_close,
-    (const bstring *)&be_const_str_add_header,
-    (const bstring *)&be_const_str_day,
-    (const bstring *)&be_const_str_seti,
-    (const bstring *)&be_const_str_light,
-    (const bstring *)&be_const_str__X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E,
-    (const bstring *)&be_const_str_event_cb,
-    (const bstring *)&be_const_str_AudioFileSource,
-    (const bstring *)&be_const_str_get_tasmota,
-    (const bstring *)&be_const_str_preinit,
-    (const bstring *)&be_const_str__available,
-    (const bstring *)&be_const_str_name,
-    NULL,
-    NULL,
-    (const bstring *)&be_const_str_reset_search,
-    (const bstring *)&be_const_str__X3C_X3D,
     (const bstring *)&be_const_str_from_to,
+    (const bstring *)&be_const_str_debug,
     NULL,
-    (const bstring *)&be_const_str_remove,
-    (const bstring *)&be_const_str__read,
-    (const bstring *)&be_const_str_deg,
-    (const bstring *)&be_const_str_obj_class_create_obj,
-    (const bstring *)&be_const_str_ins_time,
-    (const bstring *)&be_const_str__X2Etapp,
-    (const bstring *)&be_const_str_content_flush,
-    (const bstring *)&be_const_str_area,
-    (const bstring *)&be_const_str_CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found,
-    (const bstring *)&be_const_str_webserver,
-    (const bstring *)&be_const_str_iter,
-    (const bstring *)&be_const_str_ceil,
-    (const bstring *)&be_const_str__global_def,
-    (const bstring *)&be_const_str__get_cb,
-    (const bstring *)&be_const_str___upper__,
-    (const bstring *)&be_const_str_size,
-    (const bstring *)&be_const_str_cb_event_closure,
-    (const bstring *)&be_const_str_find_key_i,
-    (const bstring *)&be_const_str__cb,
-    (const bstring *)&be_const_str_AudioGeneratorMP3,
-    (const bstring *)&be_const_str_BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20,
-    (const bstring *)&be_const_str_clear_to,
-    (const bstring *)&be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E,
-    (const bstring *)&be_const_str_web_sensor,
-    (const bstring *)&be_const_str__ccmd,
-    NULL,
-    (const bstring *)&be_const_str_p2,
-    (const bstring *)&be_const_str_SERIAL_8E1,
-    (const bstring *)&be_const_str_connect,
-    (const bstring *)&be_const_str_c,
-    (const bstring *)&be_const_str_cmd,
-    (const bstring *)&be_const_str_a,
-    (const bstring *)&be_const_str_SERIAL_7E1,
-    (const bstring *)&be_const_str__cmd,
-    (const bstring *)&be_const_str_ctor,
-    (const bstring *)&be_const_str_attrdump,
-    (const bstring *)&be_const_str_every_second,
-    (const bstring *)&be_const_str__X5B,
-    (const bstring *)&be_const_str_can_show,
-    NULL,
-    (const bstring *)&be_const_str_Auto_X2Dconfiguration,
+    (const bstring *)&be_const_str__X2Ew,
+    (const bstring *)&be_const_str_exec_tele,
+    (const bstring *)&be_const_str_reapply,
+    (const bstring *)&be_const_str__X23autoexec_X2Ebe,
     (const bstring *)&be_const_str__,
-    (const bstring *)&be_const_str_gen_cb,
-    (const bstring *)&be_const_str__X5D,
-    (const bstring *)&be_const_str_get_size,
+    (const bstring *)&be_const_str_SERIAL_6O2,
+    (const bstring *)&be_const_str__X2Ep1,
+    (const bstring *)&be_const_str_min,
+    (const bstring *)&be_const_str__error,
+    (const bstring *)&be_const_str_offseta,
     NULL,
+    (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E,
+    (const bstring *)&be_const_str__X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E,
+    (const bstring *)&be_const_str_display_X2Eini,
+    (const bstring *)&be_const_str_introspect,
+    (const bstring *)&be_const_str__global_addr,
+    (const bstring *)&be_const_str_widget_width_def,
+    (const bstring *)&be_const_str_percentage,
+    NULL,
+    NULL,
+    (const bstring *)&be_const_str_web_add_main_button,
+    (const bstring *)&be_const_str_POST,
+    (const bstring *)&be_const_str_AES_GCM,
+    (const bstring *)&be_const_str_ctor,
+    (const bstring *)&be_const_str_read12,
+    (const bstring *)&be_const_str_acos,
+    (const bstring *)&be_const_str_setrange,
+    (const bstring *)&be_const_str_module,
+    (const bstring *)&be_const_str_COLOR_BLACK,
+    (const bstring *)&be_const_str_due,
+    (const bstring *)&be_const_str_set_dcdc_enable,
+    NULL,
+    (const bstring *)&be_const_str_bytes,
+    (const bstring *)&be_const_str_arg_size,
+    (const bstring *)&be_const_str__X2Ebe,
+    (const bstring *)&be_const_str_set_power,
+    (const bstring *)&be_const_str_clear_to,
+    (const bstring *)&be_const_str__rules,
+    (const bstring *)&be_const_str_SERIAL_8N2,
+    (const bstring *)&be_const_str__X0A,
+    (const bstring *)&be_const_str_CFG_X3A_X20loaded_X20_X20,
+    (const bstring *)&be_const_str_SERIAL_5O1,
+    (const bstring *)&be_const_str_back_forth,
+    (const bstring *)&be_const_str__X2E,
+    NULL,
+    (const bstring *)&be_const_str__X3C,
+    (const bstring *)&be_const_str__X2Esize,
+    (const bstring *)&be_const_str_CFG_X3A_X20loading_X20_X27_X25s_X27,
+    (const bstring *)&be_const_str__X3C_X3D,
+    NULL,
+    (const bstring *)&be_const_str_find_key_i,
+    (const bstring *)&be_const_str_content_start,
+    (const bstring *)&be_const_str_COLOR_WHITE,
+    NULL,
+    (const bstring *)&be_const_str_Tasmota,
+    (const bstring *)&be_const_str_rule,
+    (const bstring *)&be_const_str_atleast1,
+    (const bstring *)&be_const_str__X2Ep2,
+    (const bstring *)&be_const_str_Timer,
+    NULL,
+    (const bstring *)&be_const_str_BUTTON_CONFIGURATION,
+    (const bstring *)&be_const_str_gamma10,
+    (const bstring *)&be_const_str_lower,
+    (const bstring *)&be_const_str_i2c_enabled,
+    (const bstring *)&be_const_str_get_pixel_color,
+    (const bstring *)&be_const_str_display,
+    (const bstring *)&be_const_str_classof,
+    (const bstring *)&be_const_str__X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D,
+    (const bstring *)&be_const_str_class_init_obj,
+    (const bstring *)&be_const_str__X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d,
+    (const bstring *)&be_const_str_cb_do_nothing,
+    NULL,
+    (const bstring *)&be_const_str_get_current_module_name,
+    (const bstring *)&be_const_str_content_send,
+    (const bstring *)&be_const_str_get_bat_charge_current,
+    (const bstring *)&be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E,
+    (const bstring *)&be_const_str_get_width,
+    (const bstring *)&be_const_str_unknown_X20instruction,
+    (const bstring *)&be_const_str_SERIAL_5E2,
+    (const bstring *)&be_const_str_call,
+    (const bstring *)&be_const_str_detect,
+    (const bstring *)&be_const_str_compress,
+    NULL,
+    (const bstring *)&be_const_str_lv_obj,
+    (const bstring *)&be_const_str_AudioOutputI2S,
+    (const bstring *)&be_const_str_widget_ctor_impl,
+    (const bstring *)&be_const_str_CFG_X3A_X20removing_X20autoconf_X20files,
+    (const bstring *)&be_const_str__def,
+    (const bstring *)&be_const_str_param,
+    (const bstring *)&be_const_str_SERIAL_8N1,
+    NULL,
+    (const bstring *)&be_const_str_get_aps_voltage,
+    (const bstring *)&be_const_str__X26lt_X3BNone_X26gt_X3B,
+    (const bstring *)&be_const_str_clear_first_time,
+    (const bstring *)&be_const_str__X2F,
+    (const bstring *)&be_const_str_sinh,
+    (const bstring *)&be_const_str__X3D,
+    (const bstring *)&be_const_str__X3A,
+    (const bstring *)&be_const_str_int,
+    NULL,
+    NULL,
+    (const bstring *)&be_const_str_get_height,
+    (const bstring *)&be_const_str_SERIAL_7O2,
     (const bstring *)&be_const_str__X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E,
-    (const bstring *)&be_const_str__X3E_X3D,
+    (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20,
+    (const bstring *)&be_const_str_atan,
+    (const bstring *)&be_const_str__X5D,
+    (const bstring *)&be_const_str__X2D_X2D_X3A_X2D_X2D,
+    (const bstring *)&be_const_str_c,
+    (const bstring *)&be_const_str_Tele,
+    (const bstring *)&be_const_str_web_send_decimal,
     NULL,
-    (const bstring *)&be_const_str__X3F,
-    (const bstring *)&be_const_str_base_class
+    (const bstring *)&be_const_str_gpio,
+    NULL,
+    (const bstring *)&be_const_str_HTTP_POST,
+    (const bstring *)&be_const_str__X2E_X2E,
+    (const bstring *)&be_const_str_I2C_Driver,
+    NULL,
+    (const bstring *)&be_const_str_SERIAL_6E1,
+    (const bstring *)&be_const_str_read_bytes,
+    (const bstring *)&be_const_str_AudioOutput,
+    (const bstring *)&be_const_str_arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj,
+    (const bstring *)&be_const_str_OneWire,
+    (const bstring *)&be_const_str__X23autoexec_X2Ebat,
+    (const bstring *)&be_const_str_gamma8,
+    (const bstring *)&be_const_str__available,
+    NULL,
+    (const bstring *)&be_const_str_dirty,
+    (const bstring *)&be_const_str_get_bat_voltage,
+    (const bstring *)&be_const_str_SERIAL_5E1,
+    (const bstring *)&be_const_str__cmd,
+    NULL,
+    (const bstring *)&be_const_str_set_timeouts,
+    (const bstring *)&be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson,
+    (const bstring *)&be_const_str_break,
+    (const bstring *)&be_const_str__global_def,
+    (const bstring *)&be_const_str_imax,
+    (const bstring *)&be_const_str_Restart_X201,
+    (const bstring *)&be_const_str__X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E,
+    (const bstring *)&be_const_str__settings_def,
+    (const bstring *)&be_const_str_encrypt,
+    (const bstring *)&be_const_str_char,
+    (const bstring *)&be_const_str__X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D,
+    (const bstring *)&be_const_str_animators,
+    (const bstring *)&be_const_str_lvgl_event_dispatch,
+    (const bstring *)&be_const_str__X2C,
+    (const bstring *)&be_const_str_webclient,
+    NULL,
+    (const bstring *)&be_const_str_couldn_X27t_X20not_X20initialize_X20noepixelbus,
+    (const bstring *)&be_const_str_pc_abs,
+    (const bstring *)&be_const_str_every_100ms,
+    (const bstring *)&be_const_str_cmd,
+    (const bstring *)&be_const_str_AudioGeneratorWAV,
+    (const bstring *)&be_const_str_SERIAL_7O1,
+    (const bstring *)&be_const_str_sec,
+    (const bstring *)&be_const_str_exec_cmd,
+    (const bstring *)&be_const_str_remove_driver,
+    (const bstring *)&be_const_str_point,
+    (const bstring *)&be_const_str_OPTION_A,
+    (const bstring *)&be_const_str_readline,
+    (const bstring *)&be_const_str_set_useragent,
+    (const bstring *)&be_const_str_BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29,
+    (const bstring *)&be_const_str_get_light,
+    (const bstring *)&be_const_str_CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27,
+    (const bstring *)&be_const_str_decrypt,
+    (const bstring *)&be_const_str___iterator__,
+    (const bstring *)&be_const_str__X3Clambda_X3E,
+    (const bstring *)&be_const_str_I2C_X3A,
+    NULL,
+    (const bstring *)&be_const_str_SERIAL_6E2,
+    (const bstring *)&be_const_str_isrunning,
+    (const bstring *)&be_const_str_json_fdump_map,
+    (const bstring *)&be_const_str_create_custom_widget,
+    (const bstring *)&be_const_str_event_cb,
+    (const bstring *)&be_const_str_page_autoconf_ctl,
+    (const bstring *)&be_const_str_autoexec,
+    (const bstring *)&be_const_str_contains,
+    (const bstring *)&be_const_str_,
+    NULL,
+    (const bstring *)&be_const_str_tag,
+    (const bstring *)&be_const_str__X21_X3D_X3D,
+    (const bstring *)&be_const_str_can_show,
+    (const bstring *)&be_const_str_local,
+    (const bstring *)&be_const_str_CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting,
+    NULL,
+    (const bstring *)&be_const_str__X3C_X2Fform_X3E_X3C_X2Fp_X3E,
+    NULL,
+    NULL,
+    (const bstring *)&be_const_str_has_arg,
+    NULL,
+    (const bstring *)&be_const_str_Unknown_X20command,
+    NULL,
+    (const bstring *)&be_const_str_lv_event,
+    (const bstring *)&be_const_str__X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29,
+    (const bstring *)&be_const_str__X3Cselect_X20name_X3D_X27zip_X27_X3E,
+    (const bstring *)&be_const_str_reset_search
 };
 
 static const struct bconststrtab m_const_string_table = {
-    .size = 360,
-    .count = 743,
+    .size = 358,
+    .count = 739,
     .table = m_string_table
 };
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_aes_gcm.h b/lib/libesp32/berry/generate/be_fixed_be_class_aes_gcm.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_aes_gcm.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_aes_gcm.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_audio_file_source.h b/lib/libesp32/berry/generate/be_fixed_be_class_audio_file_source.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_audio_file_source.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_audio_file_source.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_audio_file_source_fs.h b/lib/libesp32/berry/generate/be_fixed_be_class_audio_file_source_fs.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_audio_file_source_fs.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_audio_file_source_fs.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_audio_generator.h b/lib/libesp32/berry/generate/be_fixed_be_class_audio_generator.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_audio_generator.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_audio_generator.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_audio_generator_mp3.h b/lib/libesp32/berry/generate/be_fixed_be_class_audio_generator_mp3.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_audio_generator_mp3.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_audio_generator_mp3.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_audio_generator_wav.h b/lib/libesp32/berry/generate/be_fixed_be_class_audio_generator_wav.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_audio_generator_wav.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_audio_generator_wav.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_audio_output.h b/lib/libesp32/berry/generate/be_fixed_be_class_audio_output.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_audio_output.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_audio_output.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_audio_output_i2s.h b/lib/libesp32/berry/generate/be_fixed_be_class_audio_output_i2s.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_audio_output_i2s.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_audio_output_i2s.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_bytes.h b/lib/libesp32/berry/generate/be_fixed_be_class_bytes.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_bytes.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_bytes.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_ctypes.h b/lib/libesp32/berry/generate/be_fixed_be_class_ctypes.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_ctypes.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_ctypes.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_ctypes_dyn.h b/lib/libesp32/berry/generate/be_fixed_be_class_ctypes_dyn.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_ctypes_dyn.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_ctypes_dyn.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_ec_c25519.h b/lib/libesp32/berry/generate/be_fixed_be_class_ec_c25519.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_ec_c25519.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_ec_c25519.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_list.h b/lib/libesp32/berry/generate/be_fixed_be_class_list.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_list.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_list.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_map.h b/lib/libesp32/berry/generate/be_fixed_be_class_map.h
similarity index 54%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_map.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_map.h
index f884630e3..db15432d4 100644
--- a/lib/libesp32/Berry/generate/be_fixed_be_class_map.h
+++ b/lib/libesp32/berry/generate/be_fixed_be_class_map.h
@@ -1,25 +1,24 @@
 #include "be_constobj.h"
 
 static be_define_const_map_slots(be_class_map_map) {
-    { be_const_key(setitem, -1), be_const_func(m_setitem) },
-    { be_const_key(remove, 8), be_const_func(m_remove) },
-    { be_const_key(insert, -1), be_const_func(m_insert) },
-    { be_const_key(tostring, 4), be_const_func(m_tostring) },
+    { be_const_key(tostring, -1), be_const_func(m_tostring) },
+    { be_const_key(contains, -1), be_const_func(m_contains) },
+    { be_const_key(item, 4), be_const_func(m_item) },
+    { be_const_key(setitem, 9), be_const_func(m_setitem) },
     { be_const_key(has, -1), be_const_func(m_contains) },
-    { be_const_key(init, -1), be_const_func(m_init) },
-    { be_const_key(contains, 9), be_const_func(m_contains) },
-    { be_const_key(_X2Ep, 13), be_const_var(0) },
-    { be_const_key(reduce, -1), be_const_func(m_reduce) },
-    { be_const_key(size, -1), be_const_func(m_size) },
-    { be_const_key(find, -1), be_const_func(m_find) },
     { be_const_key(keys, -1), be_const_func(m_keys) },
-    { be_const_key(item, -1), be_const_func(m_item) },
+    { be_const_key(init, -1), be_const_func(m_init) },
+    { be_const_key(remove, 5), be_const_func(m_remove) },
+    { be_const_key(size, -1), be_const_func(m_size) },
     { be_const_key(iter, -1), be_const_func(m_iter) },
+    { be_const_key(insert, -1), be_const_func(m_insert) },
+    { be_const_key(_X2Ep, -1), be_const_var(0) },
+    { be_const_key(find, 8), be_const_func(m_find) },
 };
 
 static be_define_const_map(
     be_class_map_map,
-    14
+    13
 );
 
 BE_EXPORT_VARIABLE be_define_const_class(
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_md5.h b/lib/libesp32/berry/generate/be_fixed_be_class_md5.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_md5.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_md5.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_range.h b/lib/libesp32/berry/generate/be_fixed_be_class_range.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_range.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_range.h
diff --git a/lib/libesp32/berry/generate/be_fixed_be_class_tasmota.h b/lib/libesp32/berry/generate/be_fixed_be_class_tasmota.h
new file mode 100644
index 000000000..05c140fe0
--- /dev/null
+++ b/lib/libesp32/berry/generate/be_fixed_be_class_tasmota.h
@@ -0,0 +1,93 @@
+#include "be_constobj.h"
+
+static be_define_const_map_slots(be_class_tasmota_map) {
+    { be_const_key(run_deferred, -1), be_const_closure(Tasmota_run_deferred_closure) },
+    { be_const_key(publish, -1), be_const_func(l_publish) },
+    { be_const_key(try_rule, 5), be_const_closure(Tasmota_try_rule_closure) },
+    { be_const_key(_settings_ptr, -1), be_const_comptr(&Settings) },
+    { be_const_key(get_free_heap, 47), be_const_func(l_getFreeHeap) },
+    { be_const_key(eth, 56), be_const_func(l_eth) },
+    { be_const_key(set_power, -1), be_const_func(l_setpower) },
+    { be_const_key(exec_rules, -1), be_const_closure(Tasmota_exec_rules_closure) },
+    { be_const_key(i2c_enabled, -1), be_const_func(l_i2cenabled) },
+    { be_const_key(chars_in_string, 55), be_const_closure(Tasmota_chars_in_string_closure) },
+    { be_const_key(hs2rgb, -1), be_const_closure(Tasmota_hs2rgb_closure) },
+    { be_const_key(time_str, 0), be_const_closure(Tasmota_time_str_closure) },
+    { be_const_key(set_light, -1), be_const_closure(Tasmota_set_light_closure) },
+    { be_const_key(response_append, 1), be_const_func(l_respAppend) },
+    { be_const_key(gen_cb, -1), be_const_closure(Tasmota_gen_cb_closure) },
+    { be_const_key(remove_driver, 50), be_const_closure(Tasmota_remove_driver_closure) },
+    { be_const_key(event, -1), be_const_closure(Tasmota_event_closure) },
+    { be_const_key(exec_cmd, 2), be_const_closure(Tasmota_exec_cmd_closure) },
+    { be_const_key(rtc, 12), be_const_func(l_rtc) },
+    { be_const_key(read_sensors, -1), be_const_func(l_read_sensors) },
+    { be_const_key(resp_cmnd_str, -1), be_const_func(l_respCmndStr) },
+    { be_const_key(set_timer, -1), be_const_closure(Tasmota_set_timer_closure) },
+    { be_const_key(resp_cmnd_error, -1), be_const_func(l_respCmndError) },
+    { be_const_key(exec_tele, -1), be_const_closure(Tasmota_exec_tele_closure) },
+    { be_const_key(_global_def, -1), be_const_comptr(&be_tasmota_global_struct) },
+    { be_const_key(cmd_res, -1), be_const_var(0) },
+    { be_const_key(_global_addr, -1), be_const_comptr(&TasmotaGlobal) },
+    { be_const_key(add_driver, 14), be_const_closure(Tasmota_add_driver_closure) },
+    { be_const_key(_timers, -1), be_const_var(1) },
+    { be_const_key(add_rule, -1), be_const_closure(Tasmota_add_rule_closure) },
+    { be_const_key(resp_cmnd_failed, -1), be_const_func(l_respCmndFailed) },
+    { be_const_key(remove_rule, 9), be_const_closure(Tasmota_remove_rule_closure) },
+    { be_const_key(web_send, 16), be_const_func(l_webSend) },
+    { be_const_key(resp_cmnd, -1), be_const_func(l_respCmnd) },
+    { be_const_key(remove_timer, 10), be_const_closure(Tasmota_remove_timer_closure) },
+    { be_const_key(memory, 52), be_const_func(l_memory) },
+    { be_const_key(global, 71), be_const_var(2) },
+    { be_const_key(find_op, -1), be_const_closure(Tasmota_find_op_closure) },
+    { be_const_key(yield, 60), be_const_func(l_yield) },
+    { be_const_key(resolvecmnd, -1), be_const_func(l_resolveCmnd) },
+    { be_const_key(get_option, -1), be_const_func(l_getoption) },
+    { be_const_key(kv, 43), be_const_closure(Tasmota_kv_closure) },
+    { be_const_key(wire_scan, -1), be_const_closure(Tasmota_wire_scan_closure) },
+    { be_const_key(wifi, 37), be_const_func(l_wifi) },
+    { be_const_key(_cmd, -1), be_const_func(l_cmd) },
+    { be_const_key(gc, -1), be_const_closure(Tasmota_gc_closure) },
+    { be_const_key(get_power, -1), be_const_func(l_getpower) },
+    { be_const_key(get_light, -1), be_const_closure(Tasmota_get_light_closure) },
+    { be_const_key(time_dump, -1), be_const_func(l_time_dump) },
+    { be_const_key(settings, -1), be_const_var(3) },
+    { be_const_key(cmd, 62), be_const_closure(Tasmota_cmd_closure) },
+    { be_const_key(load, -1), be_const_closure(Tasmota_load_closure) },
+    { be_const_key(strptime, -1), be_const_func(l_strptime) },
+    { be_const_key(_ccmd, -1), be_const_var(4) },
+    { be_const_key(find_key_i, 25), be_const_closure(Tasmota_find_key_i_closure) },
+    { be_const_key(delay, -1), be_const_func(l_delay) },
+    { be_const_key(time_reached, -1), be_const_func(l_timereached) },
+    { be_const_key(_settings_def, -1), be_const_comptr(&be_tasmota_settings_struct) },
+    { be_const_key(save, 36), be_const_func(l_save) },
+    { be_const_key(millis, -1), be_const_func(l_millis) },
+    { be_const_key(wire2, -1), be_const_var(5) },
+    { be_const_key(wire1, 72), be_const_var(6) },
+    { be_const_key(web_send_decimal, -1), be_const_func(l_webSendDecimal) },
+    { be_const_key(scale_uint, 51), be_const_func(l_scaleuint) },
+    { be_const_key(get_switch, -1), be_const_func(l_getswitch) },
+    { be_const_key(_debug_present, -1), be_const_var(7) },
+    { be_const_key(publish_result, -1), be_const_func(l_publish_result) },
+    { be_const_key(_drivers, -1), be_const_var(8) },
+    { be_const_key(add_cmd, -1), be_const_closure(Tasmota_add_cmd_closure) },
+    { be_const_key(strftime, -1), be_const_func(l_strftime) },
+    { be_const_key(log, -1), be_const_func(l_logInfo) },
+    { be_const_key(arch, -1), be_const_func(l_arch) },
+    { be_const_key(resp_cmnd_done, 74), be_const_func(l_respCmndDone) },
+    { be_const_key(_rules, 38), be_const_var(9) },
+    { be_const_key(remove_cmd, -1), be_const_closure(Tasmota_remove_cmd_closure) },
+    { be_const_key(init, -1), be_const_closure(Tasmota_init_closure) },
+    { be_const_key(wd, 53), be_const_var(10) },
+};
+
+static be_define_const_map(
+    be_class_tasmota_map,
+    77
+);
+
+BE_EXPORT_VARIABLE be_define_const_class(
+    be_class_tasmota,
+    11,
+    NULL,
+    Tasmota
+);
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota_onewire.h b/lib/libesp32/berry/generate/be_fixed_be_class_tasmota_onewire.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_tasmota_onewire.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_tasmota_onewire.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota_serial.h b/lib/libesp32/berry/generate/be_fixed_be_class_tasmota_serial.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_tasmota_serial.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_tasmota_serial.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota_wire.h b/lib/libesp32/berry/generate/be_fixed_be_class_tasmota_wire.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_tasmota_wire.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_tasmota_wire.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_tcpclient.h b/lib/libesp32/berry/generate/be_fixed_be_class_tcpclient.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_tcpclient.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_tcpclient.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_webclient.h b/lib/libesp32/berry/generate/be_fixed_be_class_webclient.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_be_class_webclient.h
rename to lib/libesp32/berry/generate/be_fixed_be_class_webclient.h
diff --git a/lib/libesp32/berry/generate/be_fixed_cb.h b/lib/libesp32/berry/generate/be_fixed_cb.h
new file mode 100644
index 000000000..ef458f363
--- /dev/null
+++ b/lib/libesp32/berry/generate/be_fixed_cb.h
@@ -0,0 +1,18 @@
+#include "be_constobj.h"
+
+static be_define_const_map_slots(m_libcb_map) {
+    { be_const_key(get_cb_list, -1), be_const_func(be_cb_get_cb_list) },
+    { be_const_key(gen_cb, -1), be_const_func(be_cb_gen_cb) },
+};
+
+static be_define_const_map(
+    m_libcb_map,
+    2
+);
+
+static be_define_const_module(
+    m_libcb,
+    "cb"
+);
+
+BE_EXPORT_VARIABLE be_define_const_native_module(cb);
diff --git a/lib/libesp32/Berry/generate/be_fixed_debug.h b/lib/libesp32/berry/generate/be_fixed_debug.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_debug.h
rename to lib/libesp32/berry/generate/be_fixed_debug.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_flash.h b/lib/libesp32/berry/generate/be_fixed_flash.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_flash.h
rename to lib/libesp32/berry/generate/be_fixed_flash.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_gc.h b/lib/libesp32/berry/generate/be_fixed_gc.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_gc.h
rename to lib/libesp32/berry/generate/be_fixed_gc.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_global.h b/lib/libesp32/berry/generate/be_fixed_global.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_global.h
rename to lib/libesp32/berry/generate/be_fixed_global.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_gpio.h b/lib/libesp32/berry/generate/be_fixed_gpio.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_gpio.h
rename to lib/libesp32/berry/generate/be_fixed_gpio.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_introspect.h b/lib/libesp32/berry/generate/be_fixed_introspect.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_introspect.h
rename to lib/libesp32/berry/generate/be_fixed_introspect.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_json.h b/lib/libesp32/berry/generate/be_fixed_json.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_json.h
rename to lib/libesp32/berry/generate/be_fixed_json.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_light.h b/lib/libesp32/berry/generate/be_fixed_light.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_light.h
rename to lib/libesp32/berry/generate/be_fixed_light.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_m_builtin.h b/lib/libesp32/berry/generate/be_fixed_m_builtin.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_m_builtin.h
rename to lib/libesp32/berry/generate/be_fixed_m_builtin.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_math.h b/lib/libesp32/berry/generate/be_fixed_math.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_math.h
rename to lib/libesp32/berry/generate/be_fixed_math.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_os.h b/lib/libesp32/berry/generate/be_fixed_os.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_os.h
rename to lib/libesp32/berry/generate/be_fixed_os.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_path.h b/lib/libesp32/berry/generate/be_fixed_path.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_path.h
rename to lib/libesp32/berry/generate/be_fixed_path.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_solidify.h b/lib/libesp32/berry/generate/be_fixed_solidify.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_solidify.h
rename to lib/libesp32/berry/generate/be_fixed_solidify.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_strict.h b/lib/libesp32/berry/generate/be_fixed_strict.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_strict.h
rename to lib/libesp32/berry/generate/be_fixed_strict.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_string.h b/lib/libesp32/berry/generate/be_fixed_string.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_string.h
rename to lib/libesp32/berry/generate/be_fixed_string.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_sys.h b/lib/libesp32/berry/generate/be_fixed_sys.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_sys.h
rename to lib/libesp32/berry/generate/be_fixed_sys.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_tasmota_path.h b/lib/libesp32/berry/generate/be_fixed_tasmota_path.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_tasmota_path.h
rename to lib/libesp32/berry/generate/be_fixed_tasmota_path.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_time.h b/lib/libesp32/berry/generate/be_fixed_time.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_time.h
rename to lib/libesp32/berry/generate/be_fixed_time.h
diff --git a/lib/libesp32/Berry/generate/be_fixed_webserver.h b/lib/libesp32/berry/generate/be_fixed_webserver.h
similarity index 100%
rename from lib/libesp32/Berry/generate/be_fixed_webserver.h
rename to lib/libesp32/berry/generate/be_fixed_webserver.h
diff --git a/lib/libesp32/Berry/include/be_ctypes.h b/lib/libesp32/berry/include/be_ctypes.h
similarity index 100%
rename from lib/libesp32/Berry/include/be_ctypes.h
rename to lib/libesp32/berry/include/be_ctypes.h
diff --git a/lib/libesp32/Berry/include/be_lvgl.h b/lib/libesp32/berry/include/be_lvgl.h
similarity index 100%
rename from lib/libesp32/Berry/include/be_lvgl.h
rename to lib/libesp32/berry/include/be_lvgl.h
diff --git a/lib/libesp32/Berry/library.json b/lib/libesp32/berry/library.json
similarity index 100%
rename from lib/libesp32/Berry/library.json
rename to lib/libesp32/berry/library.json
diff --git a/lib/libesp32/Berry/src/be_api.c b/lib/libesp32/berry/src/be_api.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_api.c
rename to lib/libesp32/berry/src/be_api.c
diff --git a/lib/libesp32/Berry/src/be_baselib.c b/lib/libesp32/berry/src/be_baselib.c
similarity index 99%
rename from lib/libesp32/Berry/src/be_baselib.c
rename to lib/libesp32/berry/src/be_baselib.c
index 6e92b47be..98f96b48e 100644
--- a/lib/libesp32/Berry/src/be_baselib.c
+++ b/lib/libesp32/berry/src/be_baselib.c
@@ -233,8 +233,6 @@ static int l_int(bvm *vm)
             be_pushvalue(vm, 1);
         } else if (be_isbool(vm, 1)) {
             be_pushint(vm, be_tobool(vm, 1) ? 1 : 0);
-        } else if (be_iscomptr(vm, 1)) {
-            be_pushint(vm, (int) be_tocomptr(vm, 1));
         } else {
             be_return_nil(vm);
         }
diff --git a/lib/libesp32/Berry/src/be_bytecode.c b/lib/libesp32/berry/src/be_bytecode.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_bytecode.c
rename to lib/libesp32/berry/src/be_bytecode.c
diff --git a/lib/libesp32/Berry/src/be_bytecode.h b/lib/libesp32/berry/src/be_bytecode.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_bytecode.h
rename to lib/libesp32/berry/src/be_bytecode.h
diff --git a/lib/libesp32/Berry/src/be_byteslib.c b/lib/libesp32/berry/src/be_byteslib.c
similarity index 93%
rename from lib/libesp32/Berry/src/be_byteslib.c
rename to lib/libesp32/berry/src/be_byteslib.c
index 0c3085faa..94c8823ae 100644
--- a/lib/libesp32/Berry/src/be_byteslib.c
+++ b/lib/libesp32/berry/src/be_byteslib.c
@@ -246,7 +246,7 @@ static unsigned int decode_base64(unsigned char input[], unsigned char output[])
 static void buf_set_len(buf_impl* attr, const size_t len)
 {
     uint16_t old_len = attr->len;
-    attr->len = ((int32_t)len <= attr->size) ? len : attr->size;
+    attr->len = ((int32_t)len <= attr->size) ? (int32_t)len : attr->size;
     if (old_len < attr->len) {
         memset((void*) &attr->bufptr[old_len], 0, attr->len - old_len);
     }
@@ -650,6 +650,9 @@ buf_impl bytes_check_data(bvm *vm, size_t add_size) {
     buf_impl attr = m_read_attributes(vm, 1);
     /* check if the `size` is big enough */
     if (attr.len + (int32_t)add_size > attr.size) {
+        if (attr.fixed) {
+            be_raise(vm, BYTES_RESIZE_ERROR, BYTES_RESIZE_MESSAGE);
+        }
         /* it does not fit so we need to realocate the buffer */
         bytes_resize(vm, &attr, attr.len + add_size);
     }
@@ -1268,38 +1271,38 @@ be_local_closure(getbits,   /* name */
     &be_const_str_getbits,
     &be_const_str_solidified,
     ( &(const binstruction[32]) {  /* code */
-      0x180C0500,  //  0000  LE	R3	R2	K0
-      0x740E0002,  //  0001  JMPT	R3	#0005
-      0x540E001F,  //  0002  LDINT	R3	32
-      0x240C0403,  //  0003  GT	R3	R2	R3
-      0x780E0000,  //  0004  JMPF	R3	#0006
-      0xB0060302,  //  0005  RAISE	1	K1	K2
-      0x580C0000,  //  0006  LDCONST	R3	K0
-      0x3C100303,  //  0007  SHR	R4	R1	K3
-      0x54160007,  //  0008  LDINT	R5	8
-      0x10040205,  //  0009  MOD	R1	R1	R5
-      0x58140000,  //  000A  LDCONST	R5	K0
-      0x24180500,  //  000B  GT	R6	R2	K0
-      0x781A0011,  //  000C  JMPF	R6	#001F
-      0x541A0007,  //  000D  LDINT	R6	8
-      0x04180C01,  //  000E  SUB	R6	R6	R1
-      0x241C0C02,  //  000F  GT	R7	R6	R2
-      0x781E0000,  //  0010  JMPF	R7	#0012
-      0x5C180400,  //  0011  MOVE	R6	R2
-      0x381E0806,  //  0012  SHL	R7	K4	R6
-      0x041C0F04,  //  0013  SUB	R7	R7	K4
-      0x381C0E01,  //  0014  SHL	R7	R7	R1
-      0x94200004,  //  0015  GETIDX	R8	R0	R4
-      0x2C201007,  //  0016  AND	R8	R8	R7
-      0x3C201001,  //  0017  SHR	R8	R8	R1
-      0x38201005,  //  0018  SHL	R8	R8	R5
-      0x300C0608,  //  0019  OR	R3	R3	R8
-      0x00140A06,  //  001A  ADD	R5	R5	R6
-      0x04080406,  //  001B  SUB	R2	R2	R6
-      0x58040000,  //  001C  LDCONST	R1	K0
-      0x00100904,  //  001D  ADD	R4	R4	K4
-      0x7001FFEB,  //  001E  JMP		#000B
-      0x80040600,  //  001F  RET	1	R3
+      0x180C0500,  //  0000  LE R3 R2 K0
+      0x740E0002,  //  0001  JMPT R3 #0005
+      0x540E001F,  //  0002  LDINT R3 32
+      0x240C0403,  //  0003  GT R3 R2 R3
+      0x780E0000,  //  0004  JMPF R3 #0006
+      0xB0060302,  //  0005  RAISE 1 K1 K2
+      0x580C0000,  //  0006  LDCONST R3 K0
+      0x3C100303,  //  0007  SHR R4 R1 K3
+      0x54160007,  //  0008  LDINT R5 8
+      0x10040205,  //  0009  MOD R1 R1 R5
+      0x58140000,  //  000A  LDCONST R5 K0
+      0x24180500,  //  000B  GT R6 R2 K0
+      0x781A0011,  //  000C  JMPF R6 #001F
+      0x541A0007,  //  000D  LDINT R6 8
+      0x04180C01,  //  000E  SUB R6 R6 R1
+      0x241C0C02,  //  000F  GT R7 R6 R2
+      0x781E0000,  //  0010  JMPF R7 #0012
+      0x5C180400,  //  0011  MOVE R6 R2
+      0x381E0806,  //  0012  SHL R7 K4 R6
+      0x041C0F04,  //  0013  SUB R7 R7 K4
+      0x381C0E01,  //  0014  SHL R7 R7 R1
+      0x94200004,  //  0015  GETIDX R8 R0 R4
+      0x2C201007,  //  0016  AND R8 R8 R7
+      0x3C201001,  //  0017  SHR R8 R8 R1
+      0x38201005,  //  0018  SHL R8 R8 R5
+      0x300C0608,  //  0019  OR R3 R3 R8
+      0x00140A06,  //  001A  ADD R5 R5 R6
+      0x04080406,  //  001B  SUB R2 R2 R6
+      0x58040000,  //  001C  LDCONST R1 K0
+      0x00100904,  //  001D  ADD R4 R4 K4
+      0x7001FFEB,  //  001E  JMP  #000B
+      0x80040600,  //  001F  RET 1 R3
     })
   )
 );
@@ -1328,43 +1331,43 @@ be_local_closure(setbits,   /* name */
     &be_const_str_setbits,
     &be_const_str_solidified,
     ( &(const binstruction[37]) {  /* code */
-      0x14100500,  //  0000  LT	R4	R2	K0
-      0x74120002,  //  0001  JMPT	R4	#0005
-      0x5412001F,  //  0002  LDINT	R4	32
-      0x24100404,  //  0003  GT	R4	R2	R4
-      0x78120000,  //  0004  JMPF	R4	#0006
-      0xB0060302,  //  0005  RAISE	1	K1	K2
-      0x60100009,  //  0006  GETGBL	R4	G9
-      0x5C140600,  //  0007  MOVE	R5	R3
-      0x7C100200,  //  0008  CALL	R4	1
-      0x5C0C0800,  //  0009  MOVE	R3	R4
-      0x3C100303,  //  000A  SHR	R4	R1	K3
-      0x54160007,  //  000B  LDINT	R5	8
-      0x10040205,  //  000C  MOD	R1	R1	R5
-      0x24140500,  //  000D  GT	R5	R2	K0
-      0x78160014,  //  000E  JMPF	R5	#0024
-      0x54160007,  //  000F  LDINT	R5	8
-      0x04140A01,  //  0010  SUB	R5	R5	R1
-      0x24180A02,  //  0011  GT	R6	R5	R2
-      0x781A0000,  //  0012  JMPF	R6	#0014
-      0x5C140400,  //  0013  MOVE	R5	R2
-      0x381A0805,  //  0014  SHL	R6	K4	R5
-      0x04180D04,  //  0015  SUB	R6	R6	K4
-      0x541E00FE,  //  0016  LDINT	R7	255
-      0x38200C01,  //  0017  SHL	R8	R6	R1
-      0x041C0E08,  //  0018  SUB	R7	R7	R8
-      0x94200004,  //  0019  GETIDX	R8	R0	R4
-      0x2C201007,  //  001A  AND	R8	R8	R7
-      0x2C240606,  //  001B  AND	R9	R3	R6
-      0x38241201,  //  001C  SHL	R9	R9	R1
-      0x30201009,  //  001D  OR	R8	R8	R9
-      0x98000808,  //  001E  SETIDX	R0	R4	R8
-      0x3C0C0605,  //  001F  SHR	R3	R3	R5
-      0x04080405,  //  0020  SUB	R2	R2	R5
-      0x58040000,  //  0021  LDCONST	R1	K0
-      0x00100904,  //  0022  ADD	R4	R4	K4
-      0x7001FFE8,  //  0023  JMP		#000D
-      0x80040000,  //  0024  RET	1	R0
+      0x14100500,  //  0000  LT R4 R2 K0
+      0x74120002,  //  0001  JMPT R4 #0005
+      0x5412001F,  //  0002  LDINT R4 32
+      0x24100404,  //  0003  GT R4 R2 R4
+      0x78120000,  //  0004  JMPF R4 #0006
+      0xB0060302,  //  0005  RAISE 1 K1 K2
+      0x60100009,  //  0006  GETGBL R4 G9
+      0x5C140600,  //  0007  MOVE R5 R3
+      0x7C100200,  //  0008  CALL R4 1
+      0x5C0C0800,  //  0009  MOVE R3 R4
+      0x3C100303,  //  000A  SHR R4 R1 K3
+      0x54160007,  //  000B  LDINT R5 8
+      0x10040205,  //  000C  MOD R1 R1 R5
+      0x24140500,  //  000D  GT R5 R2 K0
+      0x78160014,  //  000E  JMPF R5 #0024
+      0x54160007,  //  000F  LDINT R5 8
+      0x04140A01,  //  0010  SUB R5 R5 R1
+      0x24180A02,  //  0011  GT R6 R5 R2
+      0x781A0000,  //  0012  JMPF R6 #0014
+      0x5C140400,  //  0013  MOVE R5 R2
+      0x381A0805,  //  0014  SHL R6 K4 R5
+      0x04180D04,  //  0015  SUB R6 R6 K4
+      0x541E00FE,  //  0016  LDINT R7 255
+      0x38200C01,  //  0017  SHL R8 R6 R1
+      0x041C0E08,  //  0018  SUB R7 R7 R8
+      0x94200004,  //  0019  GETIDX R8 R0 R4
+      0x2C201007,  //  001A  AND R8 R8 R7
+      0x2C240606,  //  001B  AND R9 R3 R6
+      0x38241201,  //  001C  SHL R9 R9 R1
+      0x30201009,  //  001D  OR R8 R8 R9
+      0x98000808,  //  001E  SETIDX R0 R4 R8
+      0x3C0C0605,  //  001F  SHR R3 R3 R5
+      0x04080405,  //  0020  SUB R2 R2 R5
+      0x58040000,  //  0021  LDCONST R1 K0
+      0x00100904,  //  0022  ADD R4 R4 K4
+      0x7001FFE8,  //  0023  JMP  #000D
+      0x80040000,  //  0024  RET 1 R0
     })
   )
 );
diff --git a/lib/libesp32/Berry/src/be_class.c b/lib/libesp32/berry/src/be_class.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_class.c
rename to lib/libesp32/berry/src/be_class.c
diff --git a/lib/libesp32/Berry/src/be_class.h b/lib/libesp32/berry/src/be_class.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_class.h
rename to lib/libesp32/berry/src/be_class.h
diff --git a/lib/libesp32/Berry/src/be_code.c b/lib/libesp32/berry/src/be_code.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_code.c
rename to lib/libesp32/berry/src/be_code.c
diff --git a/lib/libesp32/Berry/src/be_code.h b/lib/libesp32/berry/src/be_code.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_code.h
rename to lib/libesp32/berry/src/be_code.h
diff --git a/lib/libesp32/Berry/src/be_constobj.h b/lib/libesp32/berry/src/be_constobj.h
similarity index 94%
rename from lib/libesp32/Berry/src/be_constobj.h
rename to lib/libesp32/berry/src/be_constobj.h
index 8716d7fe2..2ffe6a0ce 100644
--- a/lib/libesp32/Berry/src/be_constobj.h
+++ b/lib/libesp32/berry/src/be_constobj.h
@@ -201,15 +201,6 @@ const bntvmodule be_native_module(_module) = {                  \
     .members = _members                                         \
   }
 
-// #define be_local_instance(_name, _class_ptr, _members)          \
-//   static const binstance i_##_name = {                          \
-//     be_const_header(BE_INSTANCE),                               \
-//     .super = NULL,                                              \
-//     .sub = NULL,                                                \
-//     ._class = (bclass*) _class_ptr,                             \
-//     .members = _members                                         \
-//   }
-
 #define be_nested_map(_size, _slots)                            \
   & (const bmap) {                                              \
     be_const_header(BE_MAP),                                    \
@@ -233,13 +224,6 @@ const bntvmodule be_native_module(_module) = {                  \
     BE_STRING                                                   \
   }
 
-#define be_nested_str_literal(_str)                             \
-  {                                                             \
-    { .s=(be_nested_const_str(_str, 0, sizeof(_str)-1 ))        \
-    },                                                          \
-    BE_STRING                                                   \
-  }
-
 #define be_str_literal(_str)                                    \
   be_nested_const_str(_str, 0, sizeof(_str)-1 )
 
diff --git a/lib/libesp32/Berry/src/be_debug.c b/lib/libesp32/berry/src/be_debug.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_debug.c
rename to lib/libesp32/berry/src/be_debug.c
diff --git a/lib/libesp32/Berry/src/be_debug.h b/lib/libesp32/berry/src/be_debug.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_debug.h
rename to lib/libesp32/berry/src/be_debug.h
diff --git a/lib/libesp32/Berry/src/be_debuglib.c b/lib/libesp32/berry/src/be_debuglib.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_debuglib.c
rename to lib/libesp32/berry/src/be_debuglib.c
diff --git a/lib/libesp32/Berry/src/be_decoder.h b/lib/libesp32/berry/src/be_decoder.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_decoder.h
rename to lib/libesp32/berry/src/be_decoder.h
diff --git a/lib/libesp32/Berry/src/be_exec.c b/lib/libesp32/berry/src/be_exec.c
similarity index 98%
rename from lib/libesp32/Berry/src/be_exec.c
rename to lib/libesp32/berry/src/be_exec.c
index 7b741e4ff..14dbe903c 100644
--- a/lib/libesp32/Berry/src/be_exec.c
+++ b/lib/libesp32/berry/src/be_exec.c
@@ -393,10 +393,7 @@ void be_stack_expansion(bvm *vm, int n)
         stack_resize(vm, size + 1);
         be_raise(vm, "runtime_error", STACK_OVER_MSG(BE_STACK_TOTAL_MAX));
     }
-#if BE_USE_OBSERVABILITY_HOOK
-    if (vm->obshook != NULL)
-        (*vm->obshook)(vm, BE_OBS_STACK_RESIZE_START, size * sizeof(bvalue), (size + n) * sizeof(bvalue));
-#endif
+    if (vm->obshook != NULL) (*vm->obshook)(vm, BE_OBS_STACK_RESIZE_START, size * sizeof(bvalue), (size + n) * sizeof(bvalue));
     stack_resize(vm, size + n);
 }
 
diff --git a/lib/libesp32/Berry/src/be_exec.h b/lib/libesp32/berry/src/be_exec.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_exec.h
rename to lib/libesp32/berry/src/be_exec.h
diff --git a/lib/libesp32/Berry/src/be_filelib.c b/lib/libesp32/berry/src/be_filelib.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_filelib.c
rename to lib/libesp32/berry/src/be_filelib.c
diff --git a/lib/libesp32/Berry/src/be_func.c b/lib/libesp32/berry/src/be_func.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_func.c
rename to lib/libesp32/berry/src/be_func.c
diff --git a/lib/libesp32/Berry/src/be_func.h b/lib/libesp32/berry/src/be_func.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_func.h
rename to lib/libesp32/berry/src/be_func.h
diff --git a/lib/libesp32/Berry/src/be_gc.c b/lib/libesp32/berry/src/be_gc.c
similarity index 98%
rename from lib/libesp32/Berry/src/be_gc.c
rename to lib/libesp32/berry/src/be_gc.c
index b3cf7ab98..19e88cb12 100644
--- a/lib/libesp32/Berry/src/be_gc.c
+++ b/lib/libesp32/berry/src/be_gc.c
@@ -544,10 +544,7 @@ void be_gc_collect(bvm *vm)
     vm->counter_gc_kept = 0;
     vm->counter_gc_freed = 0;
 #endif
-#if BE_USE_OBSERVABILITY_HOOK
-    if (vm->obshook != NULL)
-        (*vm->obshook)(vm, BE_OBS_GC_START, vm->gc.usage);
-#endif
+    if (vm->obshook != NULL) (*vm->obshook)(vm, BE_OBS_GC_START, vm->gc.usage);
     /* step 1: set root-set reference objects to unscanned */
     premark_internal(vm); /* object internal the VM */
     premark_global(vm); /* global objects */
@@ -564,8 +561,9 @@ void be_gc_collect(bvm *vm)
     reset_fixedlist(vm);
     /* step 5: calculate the next GC threshold */
     vm->gc.threshold = next_threshold(vm->gc);
-#if BE_USE_OBSERVABILITY_HOOK
-    if (vm->obshook != NULL)
-        (*vm->obshook)(vm, BE_OBS_GC_END, vm->gc.usage, vm->counter_gc_kept, vm->counter_gc_freed);
+#if BE_USE_PERF_COUNTERS
+    if (vm->obshook != NULL) (*vm->obshook)(vm, BE_OBS_GC_END, vm->gc.usage, vm->counter_gc_kept, vm->counter_gc_freed);
+#else
+    if (vm->obshook != NULL) (*vm->obshook)(vm, BE_OBS_GC_END, vm->gc.usage);
 #endif
 }
diff --git a/lib/libesp32/Berry/src/be_gc.h b/lib/libesp32/berry/src/be_gc.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_gc.h
rename to lib/libesp32/berry/src/be_gc.h
diff --git a/lib/libesp32/Berry/src/be_gclib.c b/lib/libesp32/berry/src/be_gclib.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_gclib.c
rename to lib/libesp32/berry/src/be_gclib.c
diff --git a/lib/libesp32/Berry/src/be_globallib.c b/lib/libesp32/berry/src/be_globallib.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_globallib.c
rename to lib/libesp32/berry/src/be_globallib.c
diff --git a/lib/libesp32/Berry/src/be_introspectlib.c b/lib/libesp32/berry/src/be_introspectlib.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_introspectlib.c
rename to lib/libesp32/berry/src/be_introspectlib.c
diff --git a/lib/libesp32/Berry/src/be_jsonlib.c b/lib/libesp32/berry/src/be_jsonlib.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_jsonlib.c
rename to lib/libesp32/berry/src/be_jsonlib.c
diff --git a/lib/libesp32/Berry/src/be_lexer.c b/lib/libesp32/berry/src/be_lexer.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_lexer.c
rename to lib/libesp32/berry/src/be_lexer.c
diff --git a/lib/libesp32/Berry/src/be_lexer.h b/lib/libesp32/berry/src/be_lexer.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_lexer.h
rename to lib/libesp32/berry/src/be_lexer.h
diff --git a/lib/libesp32/Berry/src/be_libs.c b/lib/libesp32/berry/src/be_libs.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_libs.c
rename to lib/libesp32/berry/src/be_libs.c
diff --git a/lib/libesp32/Berry/src/be_libs.h b/lib/libesp32/berry/src/be_libs.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_libs.h
rename to lib/libesp32/berry/src/be_libs.h
diff --git a/lib/libesp32/Berry/src/be_list.c b/lib/libesp32/berry/src/be_list.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_list.c
rename to lib/libesp32/berry/src/be_list.c
diff --git a/lib/libesp32/Berry/src/be_list.h b/lib/libesp32/berry/src/be_list.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_list.h
rename to lib/libesp32/berry/src/be_list.h
diff --git a/lib/libesp32/Berry/src/be_listlib.c b/lib/libesp32/berry/src/be_listlib.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_listlib.c
rename to lib/libesp32/berry/src/be_listlib.c
diff --git a/lib/libesp32/Berry/src/be_map.c b/lib/libesp32/berry/src/be_map.c
similarity index 99%
rename from lib/libesp32/Berry/src/be_map.c
rename to lib/libesp32/berry/src/be_map.c
index 37f9efc62..e425a09f5 100644
--- a/lib/libesp32/Berry/src/be_map.c
+++ b/lib/libesp32/berry/src/be_map.c
@@ -203,6 +203,7 @@ static void resize(bvm *vm, bmap *map, int size)
     slots = be_malloc(vm, datasize(size));
     for (i = 0; i < size; ++i) {
         setnil(slots + i);
+        next(slots + i) = LASTNODE;
     }
     map->size = size;
     map->slots = slots;
diff --git a/lib/libesp32/Berry/src/be_map.h b/lib/libesp32/berry/src/be_map.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_map.h
rename to lib/libesp32/berry/src/be_map.h
diff --git a/lib/libesp32/Berry/src/be_maplib.c b/lib/libesp32/berry/src/be_maplib.c
similarity index 74%
rename from lib/libesp32/Berry/src/be_maplib.c
rename to lib/libesp32/berry/src/be_maplib.c
index a8fc7309e..fc9f09fe7 100644
--- a/lib/libesp32/Berry/src/be_maplib.c
+++ b/lib/libesp32/berry/src/be_maplib.c
@@ -212,62 +212,6 @@ static int m_keys(bvm *vm)
     be_return(vm);
 }
 
-/* apply a function/closure to each element of a map */
-/* `map.reduce(f:function [, initializer:any]) -> any` */
-/* Calls for each element `f(key, value, acc) -> any` */
-/* `acc` is initialized with `initilizer` if present or `nil` */
-/* the return value of the function becomes the next value passed in arg `acc` */
-static int m_reduce(bvm *vm)
-{
-    int argc = be_top(vm);
-    if (argc > 1 && be_isfunction(vm, 2)) {
-        bbool has_initializer = (argc > 2);
-        /* get map internal object */
-        be_getmember(vm, 1, ".p");
-        bvalue *v = be_indexof(vm, -1);
-        bmap *map = cast(bmap*, var_toobj(v));
-        /* get the number of slots if any */
-        int slots_initial = be_map_size(map);
-        /* place-holder for on-going value and return value */
-        if (has_initializer) {
-            be_pushvalue(vm, 3);
-        } else {
-            be_pushnil(vm);     /* if no initializer use `nil` */
-        }
-        for (int i = 0; i < slots_initial; i++) {
-            bmapnode * node = map->slots + i;
-            if (!var_isnil(&node->key)) {   /* is the key present in this slot? */
-                be_pushvalue(vm, 2);        /* push function */
-
-                bvalue kv;                  /* push key on stack */
-                kv.type = node->key.type;
-                kv.v = node->key.v;
-                bvalue *reg = vm->top; 
-                var_setval(reg, &kv);
-                be_incrtop(vm);
-
-                reg = vm->top;              /* push value on stack */
-                var_setval(reg, &node->value);
-                be_incrtop(vm);
-
-                be_pushvalue(vm, -4);
-
-                be_call(vm, 3);
-                be_pop(vm, 3);   /* pop args, keep return value */
-                be_remove(vm, -2);  /* remove previous accumulator, keep return value from function */
-            }
-            /* check if the map has been resized during the call */
-            if (be_map_size(map) != slots_initial) {
-                be_raise(vm, "stop_iteration", "map resized within apply");
-                break;      /* abort */
-            }
-        }
-        be_return(vm);
-    }
-    be_raise(vm, "value_error", "needs function as first argument");
-    be_return_nil(vm);
-}
-
 #if !BE_USE_PRECOMPILED_OBJECT
 void be_load_maplib(bvm *vm)
 {
@@ -285,7 +229,6 @@ void be_load_maplib(bvm *vm)
         { "insert", m_insert },
         { "iter", m_iter },
         { "keys", m_keys },
-        { "reduce", m_reduce },
         { NULL, NULL }
     };
     be_regclass(vm, "map", members);
@@ -306,7 +249,6 @@ class be_class_map (scope: global, name: map) {
     insert, func(m_insert)
     iter, func(m_iter)
     keys, func(m_keys)
-    reduce, func(m_reduce)
 }
 @const_object_info_end */
 #include "../generate/be_fixed_be_class_map.h"
diff --git a/lib/libesp32/Berry/src/be_mathlib.c b/lib/libesp32/berry/src/be_mathlib.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_mathlib.c
rename to lib/libesp32/berry/src/be_mathlib.c
diff --git a/lib/libesp32/Berry/src/be_mem.c b/lib/libesp32/berry/src/be_mem.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_mem.c
rename to lib/libesp32/berry/src/be_mem.c
diff --git a/lib/libesp32/Berry/src/be_mem.h b/lib/libesp32/berry/src/be_mem.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_mem.h
rename to lib/libesp32/berry/src/be_mem.h
diff --git a/lib/libesp32/Berry/src/be_module.c b/lib/libesp32/berry/src/be_module.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_module.c
rename to lib/libesp32/berry/src/be_module.c
diff --git a/lib/libesp32/Berry/src/be_module.h b/lib/libesp32/berry/src/be_module.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_module.h
rename to lib/libesp32/berry/src/be_module.h
diff --git a/lib/libesp32/Berry/src/be_object.c b/lib/libesp32/berry/src/be_object.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_object.c
rename to lib/libesp32/berry/src/be_object.c
diff --git a/lib/libesp32/Berry/src/be_object.h b/lib/libesp32/berry/src/be_object.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_object.h
rename to lib/libesp32/berry/src/be_object.h
diff --git a/lib/libesp32/Berry/src/be_opcodes.h b/lib/libesp32/berry/src/be_opcodes.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_opcodes.h
rename to lib/libesp32/berry/src/be_opcodes.h
diff --git a/lib/libesp32/Berry/src/be_oslib.c b/lib/libesp32/berry/src/be_oslib.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_oslib.c
rename to lib/libesp32/berry/src/be_oslib.c
diff --git a/lib/libesp32/Berry/src/be_parser.c b/lib/libesp32/berry/src/be_parser.c
similarity index 99%
rename from lib/libesp32/Berry/src/be_parser.c
rename to lib/libesp32/berry/src/be_parser.c
index d2f2d7af5..094a5adef 100644
--- a/lib/libesp32/Berry/src/be_parser.c
+++ b/lib/libesp32/berry/src/be_parser.c
@@ -174,7 +174,7 @@ void end_varinfo(bparser *parser, int beginpc)
     if (beginpc == -1) /* use block->beginpc by default */
         beginpc = binfo->beginpc;
     /* skip the variable of the previous blocks */
-    for (; it->beginpc < beginpc; ++it);
+    for (; (it <= end) && (it->beginpc < beginpc); ++it);
     for (; it <= end; ++it) {
         if (!it->endpc) /* write to endpc only once */
             it->endpc = finfo->pc;
diff --git a/lib/libesp32/Berry/src/be_parser.h b/lib/libesp32/berry/src/be_parser.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_parser.h
rename to lib/libesp32/berry/src/be_parser.h
diff --git a/lib/libesp32/Berry/src/be_rangelib.c b/lib/libesp32/berry/src/be_rangelib.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_rangelib.c
rename to lib/libesp32/berry/src/be_rangelib.c
diff --git a/lib/libesp32/Berry/src/be_repl.c b/lib/libesp32/berry/src/be_repl.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_repl.c
rename to lib/libesp32/berry/src/be_repl.c
diff --git a/lib/libesp32/Berry/src/be_repl.h b/lib/libesp32/berry/src/be_repl.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_repl.h
rename to lib/libesp32/berry/src/be_repl.h
diff --git a/lib/libesp32/Berry/src/be_solidifylib.c b/lib/libesp32/berry/src/be_solidifylib.c
similarity index 95%
rename from lib/libesp32/Berry/src/be_solidifylib.c
rename to lib/libesp32/berry/src/be_solidifylib.c
index 581131b75..4d4e3bcb6 100644
--- a/lib/libesp32/Berry/src/be_solidifylib.c
+++ b/lib/libesp32/berry/src/be_solidifylib.c
@@ -38,11 +38,11 @@ extern const bclass be_class_map;
         be_writestring(__lbuf);         \
     } while (0)
 
-/********************************************************************
+/********************************************************************\
  * Encode string to identifiers
  * 
  * `_X` is used as an escape marker
-/********************************************************************/
+\********************************************************************/
 static unsigned toidentifier_length(const char *s)
 {
     unsigned len = 1;
@@ -115,7 +115,6 @@ static void m_solidify_map(bvm *vm, bmap * map, const char *class_name)
             be_raise(vm, "internal_error", error);
         }
         int key_next = node->key.next;
-        size_t len = strlen(str(node->key.v.s));
         if (0xFFFFFF == key_next) {
             key_next = -1;      /* more readable */
         }
@@ -192,10 +191,16 @@ static void m_solidify_bvalue(bvm *vm, bvalue * value, const char *classname, co
         }
         break;
     case BE_CLOSURE:
-        logfmt("be_const_%sclosure(%s%s%s_closure)",
-            func_isstatic(value) ? "static_" : "",
-            classname ? classname : "", classname ? "_" : "",
-            str(((bclosure*) var_toobj(value))->proto->name));
+        {
+            const char * func_name = str(((bclosure*) var_toobj(value))->proto->name);
+            size_t id_len = toidentifier_length(func_name);
+            char func_name_id[id_len];
+            toidentifier(func_name_id, func_name);
+            logfmt("be_const_%sclosure(%s%s%s_closure)",
+                func_isstatic(value) ? "static_" : "",
+                classname ? classname : "", classname ? "_" : "",
+                func_name_id);
+        }
         break;
     case BE_CLASS:
         logfmt("be_const_class(be_class_%s)", str(((bclass*) var_toobj(value))->name));
@@ -365,9 +370,14 @@ static void m_solidify_closure(bvm *vm, bclosure *cl, const char * classname, in
     logfmt("** Solidified function: %s\n", func_name);
     logfmt("********************************************************************/\n");
 
-    logfmt("be_local_closure(%s%s%s,   /* name */\n",
-        classname ? classname : "", classname ? "_" : "",
-        func_name);
+    {
+        size_t id_len = toidentifier_length(func_name);
+        char func_name_id[id_len];
+        toidentifier(func_name_id, func_name);
+        logfmt("be_local_closure(%s%s%s,   /* name */\n",
+            classname ? classname : "", classname ? "_" : "",
+            func_name_id);
+    }
 
     m_solidify_proto(vm, pr, func_name, builtins, indent);
     logfmt("\n");
diff --git a/lib/libesp32/Berry/src/be_strictlib.c b/lib/libesp32/berry/src/be_strictlib.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_strictlib.c
rename to lib/libesp32/berry/src/be_strictlib.c
diff --git a/lib/libesp32/Berry/src/be_string.c b/lib/libesp32/berry/src/be_string.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_string.c
rename to lib/libesp32/berry/src/be_string.c
diff --git a/lib/libesp32/Berry/src/be_string.h b/lib/libesp32/berry/src/be_string.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_string.h
rename to lib/libesp32/berry/src/be_string.h
diff --git a/lib/libesp32/Berry/src/be_strlib.c b/lib/libesp32/berry/src/be_strlib.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_strlib.c
rename to lib/libesp32/berry/src/be_strlib.c
diff --git a/lib/libesp32/Berry/src/be_strlib.h b/lib/libesp32/berry/src/be_strlib.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_strlib.h
rename to lib/libesp32/berry/src/be_strlib.h
diff --git a/lib/libesp32/Berry/src/be_sys.h b/lib/libesp32/berry/src/be_sys.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_sys.h
rename to lib/libesp32/berry/src/be_sys.h
diff --git a/lib/libesp32/Berry/src/be_syslib.c b/lib/libesp32/berry/src/be_syslib.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_syslib.c
rename to lib/libesp32/berry/src/be_syslib.c
diff --git a/lib/libesp32/Berry/src/be_timelib.c b/lib/libesp32/berry/src/be_timelib.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_timelib.c
rename to lib/libesp32/berry/src/be_timelib.c
diff --git a/lib/libesp32/Berry/src/be_var.c b/lib/libesp32/berry/src/be_var.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_var.c
rename to lib/libesp32/berry/src/be_var.c
diff --git a/lib/libesp32/Berry/src/be_var.h b/lib/libesp32/berry/src/be_var.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_var.h
rename to lib/libesp32/berry/src/be_var.h
diff --git a/lib/libesp32/Berry/src/be_vector.c b/lib/libesp32/berry/src/be_vector.c
similarity index 100%
rename from lib/libesp32/Berry/src/be_vector.c
rename to lib/libesp32/berry/src/be_vector.c
diff --git a/lib/libesp32/Berry/src/be_vector.h b/lib/libesp32/berry/src/be_vector.h
similarity index 100%
rename from lib/libesp32/Berry/src/be_vector.h
rename to lib/libesp32/berry/src/be_vector.h
diff --git a/lib/libesp32/Berry/src/be_vm.c b/lib/libesp32/berry/src/be_vm.c
similarity index 99%
rename from lib/libesp32/Berry/src/be_vm.c
rename to lib/libesp32/berry/src/be_vm.c
index 26c15a1a3..e6cfd8856 100644
--- a/lib/libesp32/Berry/src/be_vm.c
+++ b/lib/libesp32/berry/src/be_vm.c
@@ -55,7 +55,7 @@
   #define COUNTER_HOOK()
 #endif
 
-#if BE_USE_PERF_COUNTERS && BE_USE_OBSERVABILITY_HOOK
+#if BE_USE_PERF_COUNTERS
   #define VM_HEARTBEAT() \
     if ((vm->counter_ins & ((1<<(BE_VM_OBSERVABILITY_SAMPLING - 1))-1) ) == 0) { /* call every 2^BE_VM_OBSERVABILITY_SAMPLING instructions */    \
         if (vm->obshook != NULL)                                                    \
@@ -461,9 +461,7 @@ BERRY_API bvm* be_vm_new(void)
     be_gc_setpause(vm, 1);
     be_loadlibs(vm);
     vm->compopt = 0;
-#if BE_USE_OBSERVABILITY_HOOK
     vm->obshook = NULL;
-#endif
 #if BE_USE_PERF_COUNTERS
     vm->counter_ins = 0;
     vm->counter_enter = 0;
@@ -1062,7 +1060,13 @@ newframe: /* a new call frame */
             if (!IGET_RA(ins)) {
                 be_except_block_setup(vm);
                 if (be_setjmp(vm->errjmp->b)) {
+                    bvalue *top = vm->top;
+                    bvalue e1 = top[0];
+                    bvalue e2 = top[1];
                     be_except_block_resume(vm);
+                    top = vm->top;
+                    top[0] = e1;
+                    top[1] = e2;
                     goto newframe;
                 }
                 reg = vm->reg;
@@ -1269,7 +1273,5 @@ BERRY_API void be_set_obs_hook(bvm *vm, bobshook hook)
     (void)vm;       /* avoid comiler warning */
     (void)hook;     /* avoid comiler warning */
 
-#if BE_USE_OBSERVABILITY_HOOK
     vm->obshook = hook;
-#endif
 }
diff --git a/lib/libesp32/Berry/src/be_vm.h b/lib/libesp32/berry/src/be_vm.h
similarity index 99%
rename from lib/libesp32/Berry/src/be_vm.h
rename to lib/libesp32/berry/src/be_vm.h
index 4d98c590f..19d745a7c 100644
--- a/lib/libesp32/Berry/src/be_vm.h
+++ b/lib/libesp32/berry/src/be_vm.h
@@ -101,9 +101,7 @@ struct bvm {
     blist *registry; /* registry list */
     struct bgc gc;
     bbyte compopt; /* compilation options */
-#if BE_USE_OBSERVABILITY_HOOK
     bobshook obshook;
-#endif
 #if BE_USE_PERF_COUNTERS
     uint32_t counter_ins; /* instructions counter */
     uint32_t counter_enter; /* counter for times the VM was entered */
diff --git a/lib/libesp32/Berry/src/berry.h b/lib/libesp32/berry/src/berry.h
similarity index 99%
rename from lib/libesp32/Berry/src/berry.h
rename to lib/libesp32/berry/src/berry.h
index e69a3bbe8..68f1efd4d 100644
--- a/lib/libesp32/Berry/src/berry.h
+++ b/lib/libesp32/berry/src/berry.h
@@ -402,6 +402,7 @@ typedef void(*bntvhook)(bvm *vm, bhookinfo *info);
 
 typedef void(*bobshook)(bvm *vm, int event, ...);
 enum beobshookevents {
+  BE_OBS_PCALL_ERROR,     /* called when be_callp() returned an error, most likely an exception */
   BE_OBS_GC_START,        /* start of GC, arg = allocated size */
   BE_OBS_GC_END,          /* end of GC, arg = allocated size */
   BE_OBS_VM_HEARTBEAT,    /* VM heartbeat called every million instructions */
diff --git a/lib/libesp32/Berry/src/berry_conf.h b/lib/libesp32/berry/src/berry_conf.h
similarity index 100%
rename from lib/libesp32/Berry/src/berry_conf.h
rename to lib/libesp32/berry/src/berry_conf.h
diff --git a/lib/libesp32/Berry/testall.be b/lib/libesp32/berry/testall.be
similarity index 100%
rename from lib/libesp32/Berry/testall.be
rename to lib/libesp32/berry/testall.be
diff --git a/lib/libesp32/Berry/tests/assignment.be b/lib/libesp32/berry/tests/assignment.be
similarity index 100%
rename from lib/libesp32/Berry/tests/assignment.be
rename to lib/libesp32/berry/tests/assignment.be
diff --git a/lib/libesp32/Berry/tests/bool.be b/lib/libesp32/berry/tests/bool.be
similarity index 100%
rename from lib/libesp32/Berry/tests/bool.be
rename to lib/libesp32/berry/tests/bool.be
diff --git a/lib/libesp32/Berry/tests/bytes.be b/lib/libesp32/berry/tests/bytes.be
similarity index 100%
rename from lib/libesp32/Berry/tests/bytes.be
rename to lib/libesp32/berry/tests/bytes.be
diff --git a/lib/libesp32/Berry/tests/bytes_b64.be b/lib/libesp32/berry/tests/bytes_b64.be
similarity index 100%
rename from lib/libesp32/Berry/tests/bytes_b64.be
rename to lib/libesp32/berry/tests/bytes_b64.be
diff --git a/lib/libesp32/Berry/tests/bytes_fixed.be b/lib/libesp32/berry/tests/bytes_fixed.be
similarity index 100%
rename from lib/libesp32/Berry/tests/bytes_fixed.be
rename to lib/libesp32/berry/tests/bytes_fixed.be
diff --git a/lib/libesp32/Berry/tests/checkspace.be b/lib/libesp32/berry/tests/checkspace.be
similarity index 100%
rename from lib/libesp32/Berry/tests/checkspace.be
rename to lib/libesp32/berry/tests/checkspace.be
diff --git a/lib/libesp32/Berry/tests/class.be b/lib/libesp32/berry/tests/class.be
similarity index 100%
rename from lib/libesp32/Berry/tests/class.be
rename to lib/libesp32/berry/tests/class.be
diff --git a/lib/libesp32/Berry/tests/class_const.be b/lib/libesp32/berry/tests/class_const.be
similarity index 100%
rename from lib/libesp32/Berry/tests/class_const.be
rename to lib/libesp32/berry/tests/class_const.be
diff --git a/lib/libesp32/Berry/tests/closure.be b/lib/libesp32/berry/tests/closure.be
similarity index 100%
rename from lib/libesp32/Berry/tests/closure.be
rename to lib/libesp32/berry/tests/closure.be
diff --git a/lib/libesp32/Berry/tests/compiler.be b/lib/libesp32/berry/tests/compiler.be
similarity index 100%
rename from lib/libesp32/Berry/tests/compiler.be
rename to lib/libesp32/berry/tests/compiler.be
diff --git a/lib/libesp32/Berry/tests/compound.be b/lib/libesp32/berry/tests/compound.be
similarity index 100%
rename from lib/libesp32/Berry/tests/compound.be
rename to lib/libesp32/berry/tests/compound.be
diff --git a/lib/libesp32/Berry/tests/cond_expr.be b/lib/libesp32/berry/tests/cond_expr.be
similarity index 100%
rename from lib/libesp32/Berry/tests/cond_expr.be
rename to lib/libesp32/berry/tests/cond_expr.be
diff --git a/lib/libesp32/Berry/tests/debug.be b/lib/libesp32/berry/tests/debug.be
similarity index 100%
rename from lib/libesp32/Berry/tests/debug.be
rename to lib/libesp32/berry/tests/debug.be
diff --git a/lib/libesp32/berry/tests/exceptions.be b/lib/libesp32/berry/tests/exceptions.be
new file mode 100644
index 000000000..dc2ad54e4
--- /dev/null
+++ b/lib/libesp32/berry/tests/exceptions.be
@@ -0,0 +1,7 @@
+
+try
+    for k: 0..1 assert({'a':1}.contains('b'), 'failure') end
+except .. as e,m
+    assert(e == "assert_failed")
+    assert(m == "failure")
+end
diff --git a/lib/libesp32/Berry/tests/for.be b/lib/libesp32/berry/tests/for.be
similarity index 100%
rename from lib/libesp32/Berry/tests/for.be
rename to lib/libesp32/berry/tests/for.be
diff --git a/lib/libesp32/Berry/tests/function.be b/lib/libesp32/berry/tests/function.be
similarity index 100%
rename from lib/libesp32/Berry/tests/function.be
rename to lib/libesp32/berry/tests/function.be
diff --git a/lib/libesp32/Berry/tests/global.be b/lib/libesp32/berry/tests/global.be
similarity index 100%
rename from lib/libesp32/Berry/tests/global.be
rename to lib/libesp32/berry/tests/global.be
diff --git a/lib/libesp32/Berry/tests/introspect.be b/lib/libesp32/berry/tests/introspect.be
similarity index 100%
rename from lib/libesp32/Berry/tests/introspect.be
rename to lib/libesp32/berry/tests/introspect.be
diff --git a/lib/libesp32/Berry/tests/json.be b/lib/libesp32/berry/tests/json.be
similarity index 100%
rename from lib/libesp32/Berry/tests/json.be
rename to lib/libesp32/berry/tests/json.be
diff --git a/lib/libesp32/Berry/tests/lexer.be b/lib/libesp32/berry/tests/lexer.be
similarity index 100%
rename from lib/libesp32/Berry/tests/lexer.be
rename to lib/libesp32/berry/tests/lexer.be
diff --git a/lib/libesp32/Berry/tests/lexergc.be b/lib/libesp32/berry/tests/lexergc.be
similarity index 100%
rename from lib/libesp32/Berry/tests/lexergc.be
rename to lib/libesp32/berry/tests/lexergc.be
diff --git a/lib/libesp32/Berry/tests/list.be b/lib/libesp32/berry/tests/list.be
similarity index 100%
rename from lib/libesp32/Berry/tests/list.be
rename to lib/libesp32/berry/tests/list.be
diff --git a/lib/libesp32/Berry/tests/member_indirect.be b/lib/libesp32/berry/tests/member_indirect.be
similarity index 100%
rename from lib/libesp32/Berry/tests/member_indirect.be
rename to lib/libesp32/berry/tests/member_indirect.be
diff --git a/lib/libesp32/Berry/tests/os.be b/lib/libesp32/berry/tests/os.be
similarity index 100%
rename from lib/libesp32/Berry/tests/os.be
rename to lib/libesp32/berry/tests/os.be
diff --git a/lib/libesp32/Berry/tests/overload.be b/lib/libesp32/berry/tests/overload.be
similarity index 100%
rename from lib/libesp32/Berry/tests/overload.be
rename to lib/libesp32/berry/tests/overload.be
diff --git a/lib/libesp32/Berry/tests/relop.be b/lib/libesp32/berry/tests/relop.be
similarity index 100%
rename from lib/libesp32/Berry/tests/relop.be
rename to lib/libesp32/berry/tests/relop.be
diff --git a/lib/libesp32/Berry/tests/string.be b/lib/libesp32/berry/tests/string.be
similarity index 100%
rename from lib/libesp32/Berry/tests/string.be
rename to lib/libesp32/berry/tests/string.be
diff --git a/lib/libesp32/Berry/tests/subobject.be b/lib/libesp32/berry/tests/subobject.be
similarity index 100%
rename from lib/libesp32/Berry/tests/subobject.be
rename to lib/libesp32/berry/tests/subobject.be
diff --git a/lib/libesp32/Berry/tests/suffix.be b/lib/libesp32/berry/tests/suffix.be
similarity index 100%
rename from lib/libesp32/Berry/tests/suffix.be
rename to lib/libesp32/berry/tests/suffix.be
diff --git a/lib/libesp32/Berry/tests/super_auto.be b/lib/libesp32/berry/tests/super_auto.be
similarity index 100%
rename from lib/libesp32/Berry/tests/super_auto.be
rename to lib/libesp32/berry/tests/super_auto.be
diff --git a/lib/libesp32/Berry/tests/super_leveled.be b/lib/libesp32/berry/tests/super_leveled.be
similarity index 100%
rename from lib/libesp32/Berry/tests/super_leveled.be
rename to lib/libesp32/berry/tests/super_leveled.be
diff --git a/lib/libesp32/Berry/tests/vararg.be b/lib/libesp32/berry/tests/vararg.be
similarity index 100%
rename from lib/libesp32/Berry/tests/vararg.be
rename to lib/libesp32/berry/tests/vararg.be
diff --git a/lib/libesp32/Berry/tests/virtual_methods.be b/lib/libesp32/berry/tests/virtual_methods.be
similarity index 100%
rename from lib/libesp32/Berry/tests/virtual_methods.be
rename to lib/libesp32/berry/tests/virtual_methods.be
diff --git a/lib/libesp32/Berry/tests/virtual_methods2.be b/lib/libesp32/berry/tests/virtual_methods2.be
similarity index 100%
rename from lib/libesp32/Berry/tests/virtual_methods2.be
rename to lib/libesp32/berry/tests/virtual_methods2.be
diff --git a/lib/libesp32/Berry/tools/coc/.gitignore b/lib/libesp32/berry/tools/coc/.gitignore
similarity index 100%
rename from lib/libesp32/Berry/tools/coc/.gitignore
rename to lib/libesp32/berry/tools/coc/.gitignore
diff --git a/lib/libesp32/Berry/tools/coc/Makefile b/lib/libesp32/berry/tools/coc/Makefile
similarity index 100%
rename from lib/libesp32/Berry/tools/coc/Makefile
rename to lib/libesp32/berry/tools/coc/Makefile
diff --git a/lib/libesp32/Berry/tools/coc/REEADME.md b/lib/libesp32/berry/tools/coc/REEADME.md
similarity index 100%
rename from lib/libesp32/Berry/tools/coc/REEADME.md
rename to lib/libesp32/berry/tools/coc/REEADME.md
diff --git a/lib/libesp32/Berry/tools/coc/block_builder.cpp b/lib/libesp32/berry/tools/coc/block_builder.cpp
similarity index 100%
rename from lib/libesp32/Berry/tools/coc/block_builder.cpp
rename to lib/libesp32/berry/tools/coc/block_builder.cpp
diff --git a/lib/libesp32/Berry/tools/coc/block_builder.h b/lib/libesp32/berry/tools/coc/block_builder.h
similarity index 100%
rename from lib/libesp32/Berry/tools/coc/block_builder.h
rename to lib/libesp32/berry/tools/coc/block_builder.h
diff --git a/lib/libesp32/Berry/tools/coc/coc_parser.cpp b/lib/libesp32/berry/tools/coc/coc_parser.cpp
similarity index 100%
rename from lib/libesp32/Berry/tools/coc/coc_parser.cpp
rename to lib/libesp32/berry/tools/coc/coc_parser.cpp
diff --git a/lib/libesp32/Berry/tools/coc/coc_parser.h b/lib/libesp32/berry/tools/coc/coc_parser.h
similarity index 100%
rename from lib/libesp32/Berry/tools/coc/coc_parser.h
rename to lib/libesp32/berry/tools/coc/coc_parser.h
diff --git a/lib/libesp32/Berry/tools/coc/coc_string.cpp b/lib/libesp32/berry/tools/coc/coc_string.cpp
similarity index 100%
rename from lib/libesp32/Berry/tools/coc/coc_string.cpp
rename to lib/libesp32/berry/tools/coc/coc_string.cpp
diff --git a/lib/libesp32/Berry/tools/coc/coc_string.h b/lib/libesp32/berry/tools/coc/coc_string.h
similarity index 100%
rename from lib/libesp32/Berry/tools/coc/coc_string.h
rename to lib/libesp32/berry/tools/coc/coc_string.h
diff --git a/lib/libesp32/Berry/tools/coc/hash_map.cpp b/lib/libesp32/berry/tools/coc/hash_map.cpp
similarity index 100%
rename from lib/libesp32/Berry/tools/coc/hash_map.cpp
rename to lib/libesp32/berry/tools/coc/hash_map.cpp
diff --git a/lib/libesp32/Berry/tools/coc/hash_map.h b/lib/libesp32/berry/tools/coc/hash_map.h
similarity index 100%
rename from lib/libesp32/Berry/tools/coc/hash_map.h
rename to lib/libesp32/berry/tools/coc/hash_map.h
diff --git a/lib/libesp32/Berry/tools/coc/macro_table.cpp b/lib/libesp32/berry/tools/coc/macro_table.cpp
similarity index 100%
rename from lib/libesp32/Berry/tools/coc/macro_table.cpp
rename to lib/libesp32/berry/tools/coc/macro_table.cpp
diff --git a/lib/libesp32/Berry/tools/coc/macro_table.h b/lib/libesp32/berry/tools/coc/macro_table.h
similarity index 100%
rename from lib/libesp32/Berry/tools/coc/macro_table.h
rename to lib/libesp32/berry/tools/coc/macro_table.h
diff --git a/lib/libesp32/Berry/tools/coc/main.cpp b/lib/libesp32/berry/tools/coc/main.cpp
similarity index 100%
rename from lib/libesp32/Berry/tools/coc/main.cpp
rename to lib/libesp32/berry/tools/coc/main.cpp
diff --git a/lib/libesp32/Berry/tools/coc/main.h b/lib/libesp32/berry/tools/coc/main.h
similarity index 100%
rename from lib/libesp32/Berry/tools/coc/main.h
rename to lib/libesp32/berry/tools/coc/main.h
diff --git a/lib/libesp32/Berry/tools/coc/object_block.h b/lib/libesp32/berry/tools/coc/object_block.h
similarity index 100%
rename from lib/libesp32/Berry/tools/coc/object_block.h
rename to lib/libesp32/berry/tools/coc/object_block.h
diff --git a/lib/libesp32/Berry/tools/coc/str_build.cpp b/lib/libesp32/berry/tools/coc/str_build.cpp
similarity index 100%
rename from lib/libesp32/Berry/tools/coc/str_build.cpp
rename to lib/libesp32/berry/tools/coc/str_build.cpp
diff --git a/lib/libesp32/Berry/tools/coc/str_build.h b/lib/libesp32/berry/tools/coc/str_build.h
similarity index 100%
rename from lib/libesp32/Berry/tools/coc/str_build.h
rename to lib/libesp32/berry/tools/coc/str_build.h
diff --git a/lib/libesp32/Berry/tools/grammar/berry.bytecode b/lib/libesp32/berry/tools/grammar/berry.bytecode
similarity index 100%
rename from lib/libesp32/Berry/tools/grammar/berry.bytecode
rename to lib/libesp32/berry/tools/grammar/berry.bytecode
diff --git a/lib/libesp32/Berry/tools/grammar/berry.ebnf b/lib/libesp32/berry/tools/grammar/berry.ebnf
similarity index 100%
rename from lib/libesp32/Berry/tools/grammar/berry.ebnf
rename to lib/libesp32/berry/tools/grammar/berry.ebnf
diff --git a/lib/libesp32/Berry/tools/grammar/const_obj.ebnf b/lib/libesp32/berry/tools/grammar/const_obj.ebnf
similarity index 100%
rename from lib/libesp32/Berry/tools/grammar/const_obj.ebnf
rename to lib/libesp32/berry/tools/grammar/const_obj.ebnf
diff --git a/lib/libesp32/Berry/tools/grammar/json.ebnf b/lib/libesp32/berry/tools/grammar/json.ebnf
similarity index 100%
rename from lib/libesp32/Berry/tools/grammar/json.ebnf
rename to lib/libesp32/berry/tools/grammar/json.ebnf
diff --git a/lib/libesp32/Berry/tools/plugins/vscode/skiars.berry-0.1.0/.vsixmanifest b/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/.vsixmanifest
similarity index 100%
rename from lib/libesp32/Berry/tools/plugins/vscode/skiars.berry-0.1.0/.vsixmanifest
rename to lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/.vsixmanifest
diff --git a/lib/libesp32/Berry/tools/plugins/vscode/skiars.berry-0.1.0/CHANGELOG.md b/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/CHANGELOG.md
similarity index 100%
rename from lib/libesp32/Berry/tools/plugins/vscode/skiars.berry-0.1.0/CHANGELOG.md
rename to lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/CHANGELOG.md
diff --git a/lib/libesp32/Berry/tools/plugins/vscode/skiars.berry-0.1.0/README.md b/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/README.md
similarity index 100%
rename from lib/libesp32/Berry/tools/plugins/vscode/skiars.berry-0.1.0/README.md
rename to lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/README.md
diff --git a/lib/libesp32/Berry/tools/plugins/vscode/skiars.berry-0.1.0/berry-configuration.json b/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/berry-configuration.json
similarity index 100%
rename from lib/libesp32/Berry/tools/plugins/vscode/skiars.berry-0.1.0/berry-configuration.json
rename to lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/berry-configuration.json
diff --git a/lib/libesp32/Berry/tools/plugins/vscode/skiars.berry-0.1.0/berry-icon.png b/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/berry-icon.png
similarity index 100%
rename from lib/libesp32/Berry/tools/plugins/vscode/skiars.berry-0.1.0/berry-icon.png
rename to lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/berry-icon.png
diff --git a/lib/libesp32/Berry/tools/plugins/vscode/skiars.berry-0.1.0/package.json b/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/package.json
similarity index 100%
rename from lib/libesp32/Berry/tools/plugins/vscode/skiars.berry-0.1.0/package.json
rename to lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/package.json
diff --git a/lib/libesp32/Berry/tools/plugins/vscode/skiars.berry-0.1.0/syntaxes/berry.json b/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/syntaxes/berry.json
similarity index 100%
rename from lib/libesp32/Berry/tools/plugins/vscode/skiars.berry-0.1.0/syntaxes/berry.json
rename to lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/syntaxes/berry.json
diff --git a/lib/libesp32/Berry/tools/plugins/vscode/skiars.berry-0.1.0/syntaxes/bytecode.json b/lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/syntaxes/bytecode.json
similarity index 100%
rename from lib/libesp32/Berry/tools/plugins/vscode/skiars.berry-0.1.0/syntaxes/bytecode.json
rename to lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/syntaxes/bytecode.json
diff --git a/lib/libesp32/Berry/tools/pycoc/block_builder.py b/lib/libesp32/berry/tools/pycoc/block_builder.py
similarity index 100%
rename from lib/libesp32/Berry/tools/pycoc/block_builder.py
rename to lib/libesp32/berry/tools/pycoc/block_builder.py
diff --git a/lib/libesp32/Berry/tools/pycoc/coc_parser.py b/lib/libesp32/berry/tools/pycoc/coc_parser.py
similarity index 100%
rename from lib/libesp32/Berry/tools/pycoc/coc_parser.py
rename to lib/libesp32/berry/tools/pycoc/coc_parser.py
diff --git a/lib/libesp32/Berry/tools/pycoc/coc_string.py b/lib/libesp32/berry/tools/pycoc/coc_string.py
similarity index 100%
rename from lib/libesp32/Berry/tools/pycoc/coc_string.py
rename to lib/libesp32/berry/tools/pycoc/coc_string.py
diff --git a/lib/libesp32/Berry/tools/pycoc/coc_string_test.py b/lib/libesp32/berry/tools/pycoc/coc_string_test.py
similarity index 100%
rename from lib/libesp32/Berry/tools/pycoc/coc_string_test.py
rename to lib/libesp32/berry/tools/pycoc/coc_string_test.py
diff --git a/lib/libesp32/Berry/tools/pycoc/hash_map.py b/lib/libesp32/berry/tools/pycoc/hash_map.py
similarity index 100%
rename from lib/libesp32/Berry/tools/pycoc/hash_map.py
rename to lib/libesp32/berry/tools/pycoc/hash_map.py
diff --git a/lib/libesp32/Berry/tools/pycoc/macro_table.py b/lib/libesp32/berry/tools/pycoc/macro_table.py
similarity index 100%
rename from lib/libesp32/Berry/tools/pycoc/macro_table.py
rename to lib/libesp32/berry/tools/pycoc/macro_table.py
diff --git a/lib/libesp32/Berry/tools/pycoc/main.py b/lib/libesp32/berry/tools/pycoc/main.py
similarity index 100%
rename from lib/libesp32/Berry/tools/pycoc/main.py
rename to lib/libesp32/berry/tools/pycoc/main.py
diff --git a/lib/libesp32/Berry/tools/pycoc/str_build.py b/lib/libesp32/berry/tools/pycoc/str_build.py
similarity index 100%
rename from lib/libesp32/Berry/tools/pycoc/str_build.py
rename to lib/libesp32/berry/tools/pycoc/str_build.py
diff --git a/lib/libesp32/berry_mapping/library.json b/lib/libesp32/berry_mapping/library.json
new file mode 100644
index 000000000..6bcf119fa
--- /dev/null
+++ b/lib/libesp32/berry_mapping/library.json
@@ -0,0 +1,17 @@
+{
+    "name": "Berry mapping to C",
+    "version": "1.0",
+    "description": "Mapping to C functions",
+    "license": "MIT",
+    "homepage": "https://github.com/arendst/Tasmota",
+    "frameworks": "*",
+    "platforms": "*",
+    "authors":
+    {
+      "name": "Stephan Hadinger",
+      "maintainer": true
+    },
+    "build": {
+      "flags": [ "-I$PROJECT_DIR/include" ]
+    }
+  }
\ No newline at end of file
diff --git a/lib/libesp32/berry_mapping/src/be_cb_module.c b/lib/libesp32/berry_mapping/src/be_cb_module.c
new file mode 100644
index 000000000..b961ae3ec
--- /dev/null
+++ b/lib/libesp32/berry_mapping/src/be_cb_module.c
@@ -0,0 +1,171 @@
+/********************************************************************
+ * Callback module
+ * 
+ * To use: `import cb`
+ * 
+ *******************************************************************/
+#include "be_constobj.h"
+
+#include "be_mapping.h"
+#include "be_gc.h"
+#include "be_exec.h"
+#include "be_vm.h"
+
+/*********************************************************************************************\
+ * Callback structures
+ * 
+ * We allow 4 parameters, or 3 if method (first arg is `self`)
+ * This could be extended if needed
+\*********************************************************************************************/
+typedef int32_t (*berry_callback_t)(int32_t v0, int32_t v1, int32_t v2, int32_t v3);
+static int32_t call_berry_cb(int32_t num, int32_t v0, int32_t v1, int32_t v2, int32_t v3);
+
+#define BERRY_CB(n) int32_t berry_cb_##n(int32_t v0, int32_t v1, int32_t v2, int32_t v3) { return call_berry_cb(n, v0, v1, v2, v3); }
+// list the callbacks
+BERRY_CB(0);
+BERRY_CB(1);
+BERRY_CB(2);
+BERRY_CB(3);
+BERRY_CB(4);
+BERRY_CB(5);
+BERRY_CB(6);
+BERRY_CB(7);
+BERRY_CB(8);
+BERRY_CB(9);
+BERRY_CB(10);
+BERRY_CB(11);
+BERRY_CB(12);
+BERRY_CB(13);
+BERRY_CB(14);
+BERRY_CB(15);
+BERRY_CB(16);
+BERRY_CB(17);
+BERRY_CB(18);
+BERRY_CB(19);
+
+// array of callbacks
+static const berry_callback_t berry_callback_array[BE_MAX_CB] = {
+  berry_cb_0,
+  berry_cb_1,
+  berry_cb_2,
+  berry_cb_3,
+  berry_cb_4,
+  berry_cb_5,
+  berry_cb_6,
+  berry_cb_7,
+  berry_cb_8,
+  berry_cb_9,
+  berry_cb_10,
+  berry_cb_11,
+  berry_cb_12,
+  berry_cb_13,
+  berry_cb_14,
+  berry_cb_15,
+  berry_cb_16,
+  berry_cb_17,
+  berry_cb_18,
+  berry_cb_19,
+};
+
+typedef struct be_callback_hook {
+  bvm *vm;
+  bgcobject *f;
+} be_callback_hook;
+
+static be_callback_hook be_cb_hooks[BE_MAX_CB] = {0};
+
+/*********************************************************************************************\
+ * `gen_cb`: Generate a new callback
+ * 
+ * arg1: function (or closure)
+\*********************************************************************************************/
+static int32_t be_cb_gen_cb(bvm *vm) {
+  int32_t top = be_top(vm);
+  if (top >= 1 && be_isfunction(vm, 1)) {
+    // find first available slot
+    int32_t slot;
+    for (slot = 0; slot < BE_MAX_CB; slot++) {
+      if (be_cb_hooks[slot].f == NULL) break;
+    }
+    bvalue *v = be_indexof(vm, 1);
+    if (slot < BE_MAX_CB) {
+      // found a free slot
+      bgcobject * f = v->v.gc;
+      // mark the function as non-gc
+      be_gc_fix_set(vm, f, btrue);
+      // record pointers
+      be_cb_hooks[slot].vm = vm;
+      be_cb_hooks[slot].f = f;
+      be_pushcomptr(vm, (void*) berry_callback_array[slot]);
+      be_return(vm);
+    } else {
+      be_raise(vm, "internal_error", "no more callbacks available, increase BE_MAX_CB");
+    }
+  }
+  be_raise(vm, "value_error", "arg must be a function");
+}
+
+/*********************************************************************************************\
+ * `get_cb_list`: Return the list of callbacks for this vm
+ * 
+\*********************************************************************************************/
+static int32_t be_cb_get_cb_list(bvm *vm) {
+  be_newobject(vm, "list");
+  int32_t i;
+  for (uint32_t i=0; i < BE_MAX_CB; i++) {
+    if (be_cb_hooks[i].vm) {
+      if (vm == be_cb_hooks[i].vm) {  // make sure it corresponds to this vm
+        be_pushcomptr(vm, be_cb_hooks[i].f);
+        be_data_push(vm, -2);
+        be_pop(vm, 1);
+      }
+    } else {
+      break;
+    }
+  }
+  be_pop(vm, 1);
+  be_return(vm);       
+}
+
+/*********************************************************************************************\
+ * Callback structures
+ * 
+ * We allow 4 parameters, or 3 if method (first arg is `self`)
+ * This could be extended if needed
+\*********************************************************************************************/
+static int32_t call_berry_cb(int32_t num, int32_t v0, int32_t v1, int32_t v2, int32_t v3) {
+  // call berry cb dispatcher
+  int32_t ret = 0;
+  // retrieve vm and function
+  if (num < 0 || num >= BE_MAX_CB || be_cb_hooks[num].vm == NULL) return 0;   // invalid call, avoid a crash
+
+  bvm * vm = be_cb_hooks[num].vm;
+  bgcobject * f = be_cb_hooks[num].f;
+
+  // push function (don't check type)
+  bvalue *top = be_incrtop(vm);
+  var_setobj(top, f->type, f);
+  // push args
+  be_pushint(vm, v0);
+  be_pushint(vm, v1);
+  be_pushint(vm, v2);
+  be_pushint(vm, v3);
+
+  ret = be_pcall(vm, 4);   // 4 arguments
+  if (ret != 0) {
+    if (vm->obshook != NULL) (*vm->obshook)(vm, BE_OBS_PCALL_ERROR);
+    be_pop(vm, be_top(vm));       // clear Berry stack
+    return 0;
+  }
+  ret = be_toint(vm, -5);
+  be_pop(vm, 5);    // remove result
+  return ret;
+}
+
+/* @const_object_info_begin
+module cb (scope: global) {
+    gen_cb, func(be_cb_gen_cb)
+    get_cb_list, func(be_cb_get_cb_list)
+}
+@const_object_info_end */
+#include "../../berry/generate/be_fixed_cb.h"
diff --git a/lib/libesp32/berry_mapping/src/be_mapping.h b/lib/libesp32/berry_mapping/src/be_mapping.h
new file mode 100644
index 000000000..850cd08c0
--- /dev/null
+++ b/lib/libesp32/berry_mapping/src/be_mapping.h
@@ -0,0 +1,10 @@
+
+
+#ifndef __BE_MAPPING__
+#define __BE_MAPPING__
+
+// include this header to force compilation fo this module
+
+#define BE_MAX_CB       20      // max number of callbacks, each callback requires a distinct address
+
+#endif // __BE_MAPPING__
diff --git a/lib/libesp32/re1.5/main.c b/lib/libesp32/re1.5/main.c
index 7d688adf1..f5ad6ae1d 100644
--- a/lib/libesp32/re1.5/main.c
+++ b/lib/libesp32/re1.5/main.c
@@ -5,7 +5,7 @@
 #include "re1.5.h"
 
 struct {
-	char *name;
+	const char *name;
 	int (*fn)(ByteProg*, Subject*, const char**, int, int);
 } tab[] = {
 	{"recursive", re1_5_recursiveprog},
diff --git a/lib/libesp32/re1.5/re1.5.h b/lib/libesp32/re1.5/re1.5.h
index a9f255d03..1a7a94554 100644
--- a/lib/libesp32/re1.5/re1.5.h
+++ b/lib/libesp32/re1.5/re1.5.h
@@ -46,7 +46,7 @@ Regexp *parse(char*);
 Regexp *reg(int type, Regexp *left, Regexp *right);
 void printre(Regexp*);
 #ifndef re1_5_fatal
-void re1_5_fatal(char*);
+void re1_5_fatal(const char*);
 #endif
 #ifndef re1_5_stack_chk
 #define re1_5_stack_chk()
diff --git a/lib/libesp32/re1.5/util.c b/lib/libesp32/re1.5/util.c
index 5b72b662a..9cab94131 100644
--- a/lib/libesp32/re1.5/util.c
+++ b/lib/libesp32/re1.5/util.c
@@ -4,10 +4,13 @@
 
 #include "re1.5.h"
 
+extern void berry_log_C(const char * berry_buf, ...);
+
 void
-re1_5_fatal(char *msg)
+re1_5_fatal(const char *msg)
 {
-	fprintf(stderr, "fatal error: %s\n", msg);
+	berry_log_C("BRY: regex fatal error: %s", msg);
+	// fprintf(stderr, "fatal error: %s\n", msg);
 	exit(2);
 }
 
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 3bbbc9f44..b1d7b7eff 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -90,7 +90,7 @@ lib_extra_dirs          = ${library.lib_extra_dirs}
 
 [env:tasmota32_base]
 ; *** Uncomment next line ";" to enable development Tasmota Arduino version ESP32
-;platform_packages       = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/525/framework-arduinoespressif32-release_v4.4-7cac8278e.tar.gz
+;platform_packages       = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/532/framework-arduinoespressif32-release_v4.4-c3ff20355.tar.gz
 build_unflags           = ${esp32_defaults.build_unflags}
 build_flags             = ${esp32_defaults.build_flags}
 
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 380fac213..bb8cc70d6 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -95,7 +95,7 @@ extends                 = env:tasmota32_base
 board                   = esp32c3
 build_unflags           = ${env:tasmota32_base.build_unflags}
                           -mtarget-align
-build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32 -DUSE_AUTOCONF
 lib_ignore              =
                           ESP8266Audio
                           ESP8266SAM
diff --git a/tasmota/berry/drivers/i2c_axp192_M5StackCore2.be b/tasmota/berry/drivers/i2c_axp192_M5StackCore2.be
index 79e6ee7f6..212fc8e32 100644
--- a/tasmota/berry/drivers/i2c_axp192_M5StackCore2.be
+++ b/tasmota/berry/drivers/i2c_axp192_M5StackCore2.be
@@ -67,9 +67,9 @@ class AXP192_M5Stack_Core2 : AXP192
   
       # Reset LCD Controller
       self.set_lcd_reset(false)
-      self.get_tasmota().delay(100)   # wait for 100ms
+      tasmota.delay(100)   # wait for 100ms
       self.set_lcd_reset(true)
-      self.get_tasmota().delay(100)   # wait for 100ms
+      tasmota.delay(100)   # wait for 100ms
 
       # bus power mode_output
       self.set_buf_power_mode(false)
diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index 31dd8a87c..5dfc21424 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -694,7 +694,7 @@ void SettingsLoad(void) {
   if (source) {
     settings_location = 1;
     if (Settings->cfg_holder == (uint16_t)CFG_HOLDER) {
-      AddLog(LOG_LEVEL_NONE, PSTR(D_LOG_CONFIG "Loaded from %s, " D_COUNT " %lu"), (source)?"File":"Nvm", Settings->save_flag);
+      AddLog(LOG_LEVEL_NONE, PSTR(D_LOG_CONFIG "Loaded from %s, " D_COUNT " %lu"), (2 == source)?"File":"NVS", Settings->save_flag);
     }
   }
 #endif  // ESP32
diff --git a/tasmota/support_device_groups.ino b/tasmota/support_device_groups.ino
index 2f2089a12..be23234d0 100644
--- a/tasmota/support_device_groups.ino
+++ b/tasmota/support_device_groups.ino
@@ -591,8 +591,7 @@ bool _SendDeviceGroupMessage(int32_t device, DevGroupMessageType message_type, .
       value_ptr = (uint8_t *)XdrvMailbox.data;
       while ((item = strtoul((char *)value_ptr, (char **)&value_ptr, 0))) {
         item_ptr->item = item;
-        if (*value_ptr != '=') return 1;
-        value_ptr++;
+        if (*value_ptr == '=') value_ptr++;
 
         // If flags were specified for this item, save them.
         item_ptr->flags = 0;
@@ -613,6 +612,12 @@ bool _SendDeviceGroupMessage(int32_t device, DevGroupMessageType message_type, .
             value = (oper == '+' ? old_value + value : oper == '-' ? old_value - value : oper == '^' ? old_value ^ value : oper == '|' ? old_value | value : old_value == '&' ? old_value & value : old_value);
           }
           item_ptr->value = value;
+
+          if (item == DGR_ITEM_STATUS) {
+            if (!(item_ptr->flags & DGR_ITEM_FLAG_NO_SHARE)) device_group->no_status_share = 0;
+            _SendDeviceGroupMessage(-device_group_index, DGR_MSGTYP_FULL_STATUS);
+            item_ptr--;
+          }
         }
         else {
           item_ptr->value_ptr = out_ptr;
diff --git a/tasmota/support_esp.ino b/tasmota/support_esp.ino
index 93abe9daa..81b6ee6f6 100644
--- a/tasmota/support_esp.ino
+++ b/tasmota/support_esp.ino
@@ -137,34 +137,43 @@ String GetDeviceHardware(void) {
 
 #include <esp_phy_init.h>
 
-void NvmLoad(const char *sNvsName, const char *sName, void *pSettings, unsigned nSettingsLen) {
-  nvs_handle handle;
-  noInterrupts();
-  nvs_open(sNvsName, NVS_READONLY, &handle);
+bool NvmLoad(const char *sNvsName, const char *sName, void *pSettings, unsigned nSettingsLen) {
+  nvs_handle_t handle;
+//  noInterrupts();
+  esp_err_t result = nvs_open(sNvsName, NVS_READONLY, &handle);
+  if (result != ESP_OK) {
+    AddLog(LOG_LEVEL_DEBUG, PSTR("NVS: Error %d"), result);
+    return false;
+  }
   size_t size = nSettingsLen;
   nvs_get_blob(handle, sName, pSettings, &size);
   nvs_close(handle);
-  interrupts();
+//  interrupts();
+  return true;
 }
 
 void NvmSave(const char *sNvsName, const char *sName, const void *pSettings, unsigned nSettingsLen) {
-  nvs_handle handle;
-  noInterrupts();
-  nvs_open(sNvsName, NVS_READWRITE, &handle);
+  nvs_handle_t handle;
+//  noInterrupts();
+  esp_err_t result = nvs_open(sNvsName, NVS_READWRITE, &handle);
+  if (result != ESP_OK) {
+    AddLog(LOG_LEVEL_DEBUG, PSTR("NVS: Error %d"), result);
+    return;
+  }
   nvs_set_blob(handle, sName, pSettings, nSettingsLen);
   nvs_commit(handle);
   nvs_close(handle);
-  interrupts();
+//  interrupts();
 }
 
 int32_t NvmErase(const char *sNvsName) {
-  nvs_handle handle;
-  noInterrupts();
+  nvs_handle_t handle;
+//  noInterrupts();
   int32_t result = nvs_open(sNvsName, NVS_READWRITE, &handle);
   if (ESP_OK == result) { result = nvs_erase_all(handle); }
   if (ESP_OK == result) { result = nvs_commit(handle); }
   nvs_close(handle);
-  interrupts();
+//  interrupts();
   return result;
 }
 
@@ -208,23 +217,25 @@ void SettingsErase(uint8_t type) {
 }
 
 uint32_t SettingsRead(void *data, size_t size) {
-  uint32_t source = 1;
-#ifdef USE_UFILESYS
-  if (!TfsLoadFile(TASM_FILE_SETTINGS, (uint8_t*)data, size)) {
-#endif
-    source = 0;
-    NvmLoad("main", "Settings", data, size);
 #ifdef USE_UFILESYS
+  if (TfsLoadFile(TASM_FILE_SETTINGS, (uint8_t*)data, size)) {
+    return 2;
   }
 #endif
-  return source;
+  if (NvmLoad("main", "Settings", data, size)) {
+    return 1;
+  };
+  return 0;
 }
 
 void SettingsWrite(const void *pSettings, unsigned nSettingsLen) {
 #ifdef USE_UFILESYS
   TfsSaveFile(TASM_FILE_SETTINGS, (const uint8_t*)pSettings, nSettingsLen);
 #endif
-  NvmSave("main", "Settings", pSettings, nSettingsLen);
+#ifdef USE_WEBCAM
+  if (!WcStreamActive())
+#endif
+    NvmSave("main", "Settings", pSettings, nSettingsLen);
 }
 
 void QPCRead(void *pSettings, unsigned nSettingsLen) {
diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h
index 77cbd00ce..9aa5c1b27 100644
--- a/tasmota/tasmota.h
+++ b/tasmota/tasmota.h
@@ -343,7 +343,7 @@ enum XsnsFunctions {FUNC_SETTINGS_OVERRIDE, FUNC_PIN_STATE, FUNC_MODULE_INIT, FU
                     FUNC_ENERGY_EVERY_SECOND, FUNC_ENERGY_RESET,
                     FUNC_RULES_PROCESS, FUNC_TELEPERIOD_RULES_PROCESS, FUNC_SERIAL, FUNC_FREE_MEM, FUNC_BUTTON_PRESSED, FUNC_BUTTON_MULTI_PRESSED,
                     FUNC_WEB_ADD_BUTTON, FUNC_WEB_ADD_CONSOLE_BUTTON, FUNC_WEB_ADD_MANAGEMENT_BUTTON, FUNC_WEB_ADD_MAIN_BUTTON,
-                    FUNC_WEB_ADD_HANDLER, FUNC_SET_CHANNELS, FUNC_SET_SCHEME, FUNC_HOTPLUG_SCAN,
+                    FUNC_WEB_GET_ARG, FUNC_WEB_ADD_HANDLER, FUNC_SET_CHANNELS, FUNC_SET_SCHEME, FUNC_HOTPLUG_SCAN,
                     FUNC_DEVICE_GROUP_ITEM };
 
 enum AddressConfigSteps { ADDR_IDLE, ADDR_RECEIVE, ADDR_SEND };
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index ec28f4f23..1e8647ccf 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -1240,35 +1240,6 @@ void HandleRoot(void)
 #endif  // USE_SONOFF_IFAN
     WSContentSend_P(PSTR("</tr></table>"));
   }
-#ifdef USE_TUYA_MCU
-  if (IsModuleTuya()) {
-    if (AsModuleTuyaMS()) {
-      WSContentSend_P(HTTP_TABLE100);
-      WSContentSend_P(PSTR("<tr><div></div>"));
-      snprintf_P(stemp, sizeof(stemp), PSTR("" D_JSON_IRHVAC_MODE ""));
-      WSContentSend_P(HTTP_DEVICE_CONTROL, 26, TasmotaGlobal.devices_present + 1,
-        (strlen(SettingsText(SET_BUTTON1 + TasmotaGlobal.devices_present))) ? SettingsText(SET_BUTTON1 + TasmotaGlobal.devices_present) : stemp, "");
-      WSContentSend_P(PSTR("</tr></table>"));
-    }
-  }
-#endif  // USE_TUYA_MCU
-#ifdef USE_SONOFF_RF
-  if (SONOFF_BRIDGE == TasmotaGlobal.module_type) {
-    WSContentSend_P(HTTP_TABLE100);
-    WSContentSend_P(PSTR("<tr>"));
-    uint32_t idx = 0;
-    for (uint32_t i = 0; i < 4; i++) {
-      if (idx > 0) { WSContentSend_P(PSTR("</tr><tr>")); }
-      for (uint32_t j = 0; j < 4; j++) {
-        idx++;
-        snprintf_P(stemp, sizeof(stemp), PSTR("%d"), idx);
-        WSContentSend_P(PSTR("<td style='width:25%%'><button onclick='la(\"&k=%d\");'>%s</button></td>"), idx,  // &k is related to WebGetArg("k", tmp, sizeof(tmp));
-          (strlen(SettingsText(SET_BUTTON1 + idx -1))) ? SettingsText(SET_BUTTON1 + idx -1) : stemp);
-      }
-    }
-    WSContentSend_P(PSTR("</tr></table>"));
-  }
-#endif  // USE_SONOFF_RF
 
 #ifndef FIRMWARE_MINIMAL
   XdrvCall(FUNC_WEB_ADD_MAIN_BUTTON);
@@ -1405,13 +1376,6 @@ bool HandleRootStatusRefresh(void)
     }
   }
 #endif  // USE_SHUTTER
-#ifdef USE_SONOFF_RF
-  WebGetArg(PSTR("k"), tmp, sizeof(tmp));  // 1 - 16 Pre defined RF keys
-  if (strlen(tmp)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_RFKEY "%s"), tmp);
-    ExecuteWebCommand(svalue);
-  }
-#endif  // USE_SONOFF_RF
 #ifdef USE_ZIGBEE
   WebGetArg(PSTR("zbj"), tmp, sizeof(tmp));
   if (strlen(tmp)) {
@@ -1425,6 +1389,9 @@ bool HandleRootStatusRefresh(void)
   }
 #endif // USE_ZIGBEE
 
+  XsnsCall(FUNC_WEB_GET_ARG);
+  XdrvCall(FUNC_WEB_GET_ARG);
+
 #ifdef USE_WEB_SSE
   WSContentBegin(200, CT_STREAM);
   WSContentSend_P(PSTR("data: "));
diff --git a/tasmota/xdrv_02_9_mqtt.ino b/tasmota/xdrv_02_9_mqtt.ino
index a1a763b47..38f6bcd88 100644
--- a/tasmota/xdrv_02_9_mqtt.ino
+++ b/tasmota/xdrv_02_9_mqtt.ino
@@ -1405,7 +1405,6 @@ void CmndMqttClient(void) {
 void CmndFullTopic(void) {
   if (XdrvMailbox.data_len > 0) {
     MakeValidMqtt(1, XdrvMailbox.data);
-    if (!strcmp(XdrvMailbox.data, TasmotaGlobal.mqtt_client)) { SetShortcutDefault(); }
     char stemp1[TOPSZ];
     strlcpy(stemp1, (SC_DEFAULT == Shortcut()) ? MQTT_FULLTOPIC : XdrvMailbox.data, sizeof(stemp1));
     if (strcmp(stemp1, SettingsText(SET_MQTT_FULLTOPIC))) {
@@ -1460,7 +1459,10 @@ void CmndGroupTopic(void) {
     if (XdrvMailbox.data_len > 0) {
       uint32_t settings_text_index = (1 == XdrvMailbox.index) ? SET_MQTT_GRP_TOPIC : SET_MQTT_GRP_TOPIC2 + XdrvMailbox.index - 2;
       MakeValidMqtt(0, XdrvMailbox.data);
-      if (!strcmp(XdrvMailbox.data, TasmotaGlobal.mqtt_client)) { SetShortcutDefault(); }
+      if (!strcmp(XdrvMailbox.data, TasmotaGlobal.mqtt_topic)) {
+        AddLog(LOG_LEVEL_INFO, PSTR("MQT: Error: GroupTopic must differ from Topic"));
+        SetShortcutDefault();
+      }
       SettingsUpdateText(settings_text_index, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? PSTR(MQTT_GRPTOPIC) : XdrvMailbox.data);
 
       // Eliminate duplicates, have at least one and fill from index 1
@@ -1507,7 +1509,6 @@ void CmndGroupTopic(void) {
 void CmndTopic(void) {
   if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
     MakeValidMqtt(0, XdrvMailbox.data);
-    if (!strcmp(XdrvMailbox.data, TasmotaGlobal.mqtt_client)) { SetShortcutDefault(); }
     char stemp1[TOPSZ];
     strlcpy(stemp1, (SC_DEFAULT == Shortcut()) ? MQTT_TOPIC : XdrvMailbox.data, sizeof(stemp1));
     if (strcmp(stemp1, SettingsText(SET_MQTT_TOPIC))) {
@@ -1523,7 +1524,6 @@ void CmndTopic(void) {
 void CmndButtonTopic(void) {
   if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
     MakeValidMqtt(0, XdrvMailbox.data);
-    if (!strcmp(XdrvMailbox.data, TasmotaGlobal.mqtt_client)) { SetShortcutDefault(); }
     switch (Shortcut()) {
       case SC_CLEAR: SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, ""); break;
       case SC_DEFAULT: SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, TasmotaGlobal.mqtt_topic); break;
@@ -1537,7 +1537,6 @@ void CmndButtonTopic(void) {
 void CmndSwitchTopic(void) {
   if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
     MakeValidMqtt(0, XdrvMailbox.data);
-    if (!strcmp(XdrvMailbox.data, TasmotaGlobal.mqtt_client)) { SetShortcutDefault(); }
     switch (Shortcut()) {
       case SC_CLEAR: SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, ""); break;
       case SC_DEFAULT: SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, TasmotaGlobal.mqtt_topic); break;
diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index b05386f4a..a5db3d58a 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -3214,6 +3214,14 @@ bool Xdrv04(uint8_t function)
       case FUNC_BUTTON_MULTI_PRESSED:
         result = XlgtCall(FUNC_BUTTON_MULTI_PRESSED);
         break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_ADD_MAIN_BUTTON:
+        XlgtCall(FUNC_WEB_ADD_MAIN_BUTTON);
+        break;
+      case FUNC_WEB_GET_ARG:
+        XlgtCall(FUNC_WEB_GET_ARG);
+        break;
+#endif  // USE_WEBSERVER
       case FUNC_COMMAND:
         result = DecodeCommand(kLightCommands, LightCommand, kLightSynonyms);
         if (!result) {
diff --git a/tasmota/xdrv_06_snfbridge.ino b/tasmota/xdrv_06_snfbridge.ino
index bd3f99b34..c3aa42bd8 100644
--- a/tasmota/xdrv_06_snfbridge.ino
+++ b/tasmota/xdrv_06_snfbridge.ino
@@ -501,6 +501,36 @@ void CmndRfRaw(void)
   ResponseCmndStateText(SnfBridge.receive_raw_flag);
 }
 
+#ifdef USE_WEBSERVER
+
+void SonoffBridgeAddButton(void) {
+  WSContentSend_P(HTTP_TABLE100);
+  WSContentSend_P(PSTR("<tr>"));
+  char number[4];
+  uint32_t idx = 0;
+  for (uint32_t i = 0; i < 4; i++) {
+    if (idx > 0) { WSContentSend_P(PSTR("</tr><tr>")); }
+    for (uint32_t j = 0; j < 4; j++) {
+      idx++;
+      WSContentSend_P(PSTR("<td style='width:25%%'><button onclick='la(\"&k=%d\");'>%s</button></td>"), idx,  // &k is related to WebGetArg("k", tmp, sizeof(tmp));
+        (strlen(SettingsText(SET_BUTTON1 + idx -1))) ? SettingsText(SET_BUTTON1 + idx -1) : itoa(idx, number, 10));
+    }
+  }
+  WSContentSend_P(PSTR("</tr></table>"));
+}
+
+void SonoffBridgeWebGetArg(void) {
+  char tmp[8];                             // WebGetArg numbers only
+  WebGetArg(PSTR("k"), tmp, sizeof(tmp));  // 1 - 16 Pre defined RF keys
+  if (strlen(tmp)) {
+    char command[20];
+    snprintf_P(command, sizeof(command), PSTR(D_CMND_RFKEY "%s"), tmp);
+    ExecuteWebCommand(command);
+  }
+}
+
+#endif  // USE_WEBSERVER
+
 /*********************************************************************************************\
  * Interface
 \*********************************************************************************************/
@@ -518,6 +548,14 @@ bool Xdrv06(uint8_t function)
       case FUNC_COMMAND:
         result = DecodeCommand(kSonoffBridgeCommands, SonoffBridgeCommand);
         break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_ADD_MAIN_BUTTON:
+        SonoffBridgeAddButton();
+        break;
+      case FUNC_WEB_GET_ARG:
+        SonoffBridgeWebGetArg();
+        break;
+#endif  // USE_WEBSERVER
       case FUNC_INIT:
         SnfBridge.receive_raw_flag = 0;
         SonoffBridgeSendCommand(0xA7);  // Stop reading RF signals enabling iTead default RF handling
diff --git a/tasmota/xdrv_10_scripter.ino b/tasmota/xdrv_10_scripter.ino
index f744d850b..b567864c1 100755
--- a/tasmota/xdrv_10_scripter.ino
+++ b/tasmota/xdrv_10_scripter.ino
@@ -1302,69 +1302,170 @@ float DoMedian5(uint8_t index, float in) {
 
 
 #ifdef USE_FEXTRACT
-// convert tasmota time stamp to ul seconds
-uint32_t tstamp2l(char *ts) {
-uint16_t year;
-uint8_t month;
-uint8_t day;
-uint8_t hour;
-uint8_t mins;
-uint8_t secs;
 
+struct FE_TM {
+  uint16_t year;
+  uint8_t month;
+  uint8_t day;
+  uint8_t hour;
+  uint8_t mins;
+  uint8_t secs;
+};
+
+// timestamp math add days
+int32_t tso(char *src, int32_t days, int32_t flg) {
+struct tm tmx;
+struct tm *tmp;
+struct FE_TM tm;
+  uint8_t mode = ts2ts(&tm, src);
+
+  tmx.tm_sec = tm.secs;
+  tmx.tm_min = tm.mins;
+  tmx.tm_hour = tm.hour;
+  tmx.tm_mon = tm.month - 1;
+  tmx.tm_year = tm.year + 100;
+  tmx.tm_mday = tm.day;
+  time_t tmd = mktime(&tmx);
+  tmd += days * (24 * 3600);
+  tmp = gmtime(&tmd);
+  if (!flg) {
+    tm.secs = tmp->tm_sec;
+    tm.mins = tmp->tm_min;
+    tm.hour = tmp->tm_hour;
+  } else {
+    tm.secs = 0;
+    tm.mins = 0;
+    tm.hour = 0;
+  }
+  tm.month = tmp->tm_mon + 1;
+  tm.year  = tmp->tm_year - 100;
+  tm.day = tmp->tm_mday;
+  tss2ts(&tm, src, mode);
+  return 0;
+}
+
+uint32_t ts2ts(struct FE_TM *tm, char *ts) {
   if (strchr(ts, 'T')) {
     // 2020-12-16T15:36:41
-    year = strtol(ts, &ts, 10);
-    if (year < 2020 || year > 2040) {
-      year = 2020;
+    tm->year = strtol(ts, &ts, 10);
+    if (tm->year < 2020 || tm->year > 2040) {
+      tm->year = 2020;
     }
-    year -= 2000;
+    tm->year -= 2000;
     ts++;
-    month = strtol(ts, &ts, 10);
+    tm->month = strtol(ts, &ts, 10);
     ts++;
-    day = strtol(ts, &ts, 10);
+    tm->day = strtol(ts, &ts, 10);
     ts++;
-    hour = strtol(ts, &ts, 10);
+    tm->hour = strtol(ts, &ts, 10);
     ts++;
-    mins = strtol(ts, &ts, 10);
+    tm->mins = strtol(ts, &ts, 10);
     ts++;
-    secs = strtol(ts, &ts, 10);
+    tm->secs = strtol(ts, &ts, 10);
+    return 0;
   } else {
     // german excel fromat 16.12.20 15:36
-    day = strtol(ts, &ts, 10);
+    tm->day = strtol(ts, &ts, 10);
     ts++;
-    month = strtol(ts, &ts, 10);
+    tm->month = strtol(ts, &ts, 10);
     ts++;
-    year = strtol(ts, &ts, 10);
+    tm->year = strtol(ts, &ts, 10);
     ts++;
-    hour = strtol(ts, &ts, 10);
+    tm->hour = strtol(ts, &ts, 10);
     ts++;
-    mins = strtol(ts, &ts, 10);
-    secs = 0;
+    tm->mins = strtol(ts, &ts, 10);
+    tm->secs = 0;
+    return 1;
   }
-  return (year*365*86400)+(month*31*86400)+(day*86400)+(hour*3600)+(mins*60)+secs;
+  return 0;
+}
+
+void tss2ts(struct FE_TM *tm, char *dst, uint8_t mode) {
+  if (mode == 1) {
+    // was tsm format go to 16.12.20 15:36
+    sprintf(dst, "%01d.%01d.%01d %01d:%02d", tm->day, tm->month, tm->year, tm->hour, tm->mins);
+  } else {
+    // 2020-12-16T15:36:41
+    sprintf(dst, "%04d-%02d-%02dT%02d:%02d:%02d", tm->year + 2000, tm->month, tm->day, tm->hour, tm->mins, tm->secs);
+  }
+}
+
+// convert time stamp format
+void cnvts(char *dst, char *src, uint8_t flg ) {
+struct FE_TM tm;
+  uint8_t mode = ts2ts(&tm, src);
+  tss2ts(&tm, dst, flg);
+}
+
+// convert tasmota time stamp to ul seconds
+uint32_t tstamp2l(char *ts) {
+struct FE_TM tm;
+
+  ts2ts(&tm, ts);
+
+  return (tm.year*365*86400)+(tm.month*31*86400)+(tm.day*86400)+(tm.hour*3600)+(tm.mins*60)+tm.secs;
 }
 
 // assume 1. entry is timestamp, others are tab delimited values until LF
 // file refernece, from timestamp, to timestampm, column offset, array pointers, array lenght, number of arrays
-int32_t extract_from_file(uint8_t fref,  char *ts_from, char *ts_to, uint8_t coffs, float **a_ptr, uint16_t *a_len, uint8_t numa, int16_t accum) {
+int32_t extract_from_file(uint8_t fref,  char *ts_from, char *ts_to, int8_t coffs, float **a_ptr, uint16_t *a_len, uint8_t numa, int16_t accum) {
   if (!glob_script_mem.file_flags[fref].is_open) return -1;
   char rstr[32];
   uint8_t sindex = 0;
   uint8_t colpos = 0;
   uint8_t range = 0;
+  if (coffs < 0) {
+    uint32_t cpos = glob_script_mem.files[fref].size();
+    if (coffs == -1) {
+      // seek to last entry
+      if (cpos > 1) cpos -= 2;
+      // now seek back to last line
+      uint8_t lbuff[256];
+      uint8_t iob;
+      uint16_t index = sizeof(lbuff) -1;
+      glob_script_mem.files[fref].seek(cpos - sizeof(lbuff), SeekSet);
+      glob_script_mem.files[fref].read(lbuff, sizeof(lbuff));
+      while (cpos) {
+        iob = lbuff[index];
+        if (iob == '\n' || iob == '\r') {
+          break;
+        }
+        cpos--;
+        index--;
+      }
+      glob_script_mem.files[fref].seek(cpos, SeekSet);
+    } else {
+      // seek to line 2
+      for (uint32_t cp = 0; cp < cpos; cp++) {
+        uint8_t buff[2], iob;
+        glob_script_mem.files[fref].read(buff, 1);
+        iob = buff[0];
+        if (iob == '\n' || iob == '\r') {
+          cpos = cp + 1;
+          break;
+        }
+      }
+    }
+    return cpos;
+  }
   uint32_t tsfrom = tstamp2l(ts_from);
   uint32_t tsto = tstamp2l(ts_to);
   uint16_t lines = 0;
   uint16_t rlines = 0;
   float summs[numa];
+  float lastv[numa];
   uint16_t accnt[numa];
+  uint8_t mflg[numa];
+  uint32_t lastpos = 0;
   for (uint8_t cnt = 0; cnt < numa; cnt++) {
      summs[cnt] = 0;
      accnt[cnt] = 0;
+     mflg[cnt] = 0;
+     lastv[cnt] = 0;
   }
-  uint8_t dflg = 1;
+  uint8_t dflg = 0;
   if (accum < 0) {
-    dflg = 0;
+    dflg = 1;
     accum = -accum;
   }
   if (accum == 0) accum = 1;
@@ -1373,14 +1474,32 @@ int32_t extract_from_file(uint8_t fref,  char *ts_from, char *ts_to, uint8_t cof
     uint8_t buff[2], iob;
     glob_script_mem.files[fref].read(buff, 1);
     iob = buff[0];
-    if (iob == '\t' || iob == ',' || iob == '\n') {
+    if (iob == '\t' || iob == ',' || iob == '\n' || iob == '\r') {
       rstr[sindex] = 0;
       sindex = 0;
-      if (colpos == 0) {
+      if (lines == 0) {
+        // header line, analye column names
+        if (colpos >= 1 && colpos >= coffs) {
+          uint8_t curpos = colpos - coffs;
+          if (curpos < numa) {
+            mflg[curpos] = dflg;
+            char *tp = strstr(rstr, "_a");
+            if (tp) {
+              // mark average values
+              mflg[curpos] |= 2;
+            }
+          }
+        }
+      } else {
+        if (colpos == 0) {
           // timestamp  2020-12-16T15:36:41
           // decompose timestamps
           uint32_t cts = tstamp2l(rstr);
-          if (cts > tsto) break;
+          if (cts > tsto) {
+            // end of range must seek back to last LF, for next scan
+            glob_script_mem.files[fref].seek(lastpos, SeekSet);
+            break;
+          }
           if (cts >= tsfrom && cts <= tsto) {
             // we want this range
             range = 1;
@@ -1388,22 +1507,25 @@ int32_t extract_from_file(uint8_t fref,  char *ts_from, char *ts_to, uint8_t cof
           } else {
             range = 0;
           }
-      } else {
+        } else {
           // data columns
           if (range) {
             uint8_t curpos = colpos - coffs;
             if (colpos >= coffs && curpos < numa) {
               if (a_len[curpos]) {
                 float fval = CharToFloat(rstr);
+                if (mflg[curpos] == 3) {
+                  // absolute values, build diffs
+                  float tmp = fval;
+                  fval -= lastv[curpos];
+                  lastv[curpos] = tmp;
+                }
+                // average values
                 //AddLog(LOG_LEVEL_INFO, PSTR("cpos %d colp %d numa %d - %s %d"),curpos, colpos, a_len[curpos], rstr, (uint32_t)fval);
                 summs[curpos] += fval;
                 accnt[curpos] += 1;
                 if (accnt[curpos] == accum) {
-                  if (dflg) {
-                    *a_ptr[curpos]++ = summs[curpos] / accum;
-                  } else {
-                    *a_ptr[curpos]++ = summs[curpos];
-                  }
+                  *a_ptr[curpos]++ = summs[curpos] / accum;
                   summs[curpos] = 0;
                   accnt[curpos] = 0;
                   a_len[curpos]--;
@@ -1413,11 +1535,13 @@ int32_t extract_from_file(uint8_t fref,  char *ts_from, char *ts_to, uint8_t cof
               }
             }
           }
+        }
       }
       colpos++;
-      if (iob == '\n') {
-          colpos = 0;
-          lines ++;
+      if (iob == '\n' || iob == '\r') {
+        lastpos = glob_script_mem.files[fref].position();
+        colpos = 0;
+        lines ++;
       }
     }
     rstr[sindex] = iob;
@@ -1925,25 +2049,25 @@ chknext:
     switch (vname[0]) {
       case 'a':
 #ifdef USE_ANGLE_FUNC
-        if (!strncmp(vname, "acos(", 5)) {
+        if (!strncmp(lp, "acos(", 5)) {
           lp=GetNumericArgument(lp + 5, OPER_EQU, &fvar, gv);
           fvar = acosf(fvar);
           goto nfuncexit;
         }
 #endif
-        if (!strncmp(vname, "abs(", 4)) {
+        if (!strncmp(lp, "abs(", 4)) {
           lp=GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           fvar = fabs(fvar);
           goto nfuncexit;
         }
 
-        if (!strncmp(vname, "asc(", 4)) {
+        if (!strncmp(lp, "asc(", 4)) {
           char str[SCRIPT_MAXSSIZE];
           lp = GetStringArgument(lp + 4, OPER_EQU, str, gv);
           fvar = str[0];
           goto nfuncexit;
         }
-        if (!strncmp(vname, "adc(", 4)) {
+        if (!strncmp(lp, "adc(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           while (*lp==' ') lp++;
           float fvar1 = 1;
@@ -1971,7 +2095,7 @@ chknext:
           len = 0;
           goto exit;
         }
-        if (!strncmp(vname, "acp(", 4)) {
+        if (!strncmp(lp, "acp(", 4)) {
           lp += 4;
           SCRIPT_SKIP_SPACES
           uint16_t alend;
@@ -2002,9 +2126,9 @@ chknext:
           goto exit;
         }
 #ifdef USE_BUTTON_EVENT
-        if (!strncmp(vname, "bt[", 3)) {
+        if (!strncmp(lp, "bt[", 3)) {
           // tasmota button state
-          GetNumericArgument(vname+3, OPER_EQU, &fvar, gv);
+          GetNumericArgument(lp + 3, OPER_EQU, &fvar, gv);
           uint32_t index = fvar;
           if (index<1 || index>MAX_KEYS) index = 1;
           fvar = glob_script_mem.script_button[index - 1];
@@ -2015,11 +2139,11 @@ chknext:
 #endif //USE_BUTTON_EVENT
         break;
       case 'c':
-        if (!strncmp(vname, "chg[", 4)) {
+        if (!strncmp(lp, "chg[", 4)) {
           // var changed
           struct T_INDEX ind;
           uint8_t vtype;
-          isvar(vname + 4, &vtype, &ind, 0, 0, gv);
+          isvar(lp + 4, &vtype, &ind, 0, 0, gv);
           if (!ind.bits.constant) {
             uint8_t index = glob_script_mem.type[ind.index].index;
             if (glob_script_mem.fvars[index] != glob_script_mem.s_fvars[index]) {
@@ -2041,7 +2165,7 @@ chknext:
           goto exit;
         }
 #ifdef USE_M5STACK_CORE2
-        if (!strncmp(vname, "c2ps(", 5)) {
+        if (!strncmp(lp, "c2ps(", 5)) {
           lp = GetNumericArgument(lp + 5, OPER_EQU, &fvar, gv);
           while (*lp==' ') lp++;
           float fvar1;
@@ -2052,7 +2176,7 @@ chknext:
 #endif // USE_M5STACK_CORE2
 
 #ifdef USE_SCRIPT_TASK
-        if (!strncmp(vname, "ct(", 3)) {
+        if (!strncmp(lp, "ct(", 3)) {
           lp = GetNumericArgument(lp + 3, OPER_EQU, &fvar, gv);
           while (*lp==' ') lp++;
           float fvar1;
@@ -2070,12 +2194,31 @@ chknext:
 #endif //USE_SCRIPT_TASK
 #endif //ESP32
 #ifdef USE_ANGLE_FUNC
-        if (!strncmp(vname, "cos(", 4)) {
+        if (!strncmp(lp, "cos(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           fvar = cosf(fvar);
           goto nfuncexit;
         }
 #endif
+#ifdef USE_FEXTRACT
+        if (!strncmp(lp, "cts(", 4)) {
+          char tsin[SCRIPT_MAXSSIZE];
+          lp = GetStringArgument(lp + 4, OPER_EQU, tsin, 0);
+          SCRIPT_SKIP_SPACES
+          int8_t flg = -1;
+          if (*lp != ')') {
+            lp = GetNumericArgument(lp, OPER_EQU, &fvar, gv);
+            flg = fvar;
+          }
+          char tsout[SCRIPT_MAXSSIZE];
+          cnvts(tsout, tsin, flg);
+          if (sp) strlcpy(sp, tsout, glob_script_mem.max_ssize);
+          lp++;
+          len = 0;
+          goto strexit;
+        }
+#endif // USE_FEXTRACT
+
         break;
       case 'd':
         if (!strncmp(vname, "day", 3)) {
@@ -2086,6 +2229,16 @@ chknext:
           if (sp) strlcpy(sp, SettingsText(SET_DEVICENAME), glob_script_mem.max_ssize);
           goto strexit;
         }
+        if (!strncmp(lp, "dp(", 3)) {
+          lp = GetNumericArgument(lp + 3, OPER_EQU, &fvar, gv);
+          while (*lp==' ') lp++;
+          glob_script_mem.script_lzero = fvar;
+          lp = GetNumericArgument(lp , OPER_EQU, &fvar, gv);
+          while (*lp==' ') lp++;
+          glob_script_mem.script_dprec = fvar;
+          fvar = 0;
+          goto nfuncexit;
+        }
         break;
       case 'e':
         if (!strncmp(vname, "epoch", 5)) {
@@ -2103,7 +2256,7 @@ chknext:
           goto exit_settable;
         }
 #ifdef USE_ENERGY_SENSOR
-        if (!strncmp(vname, "enrg[", 5)) {
+        if (!strncmp(lp, "enrg[", 5)) {
           lp=GetNumericArgument(lp + 5, OPER_EQU, &fvar, gv);
           while (*lp==' ') lp++;
           switch ((uint32_t)fvar) {
@@ -2158,7 +2311,7 @@ chknext:
       case 'f':
 //#define DEBUG_FS
 #ifdef USE_SCRIPT_FATFS
-        if (!strncmp(vname, "fo(", 3)) {
+        if (!strncmp(lp, "fo(", 3)) {
           char str[SCRIPT_MAXSSIZE];
           lp = GetStringArgument(lp + 3, OPER_EQU, str, 0);
           while (*lp==' ') lp++;
@@ -2219,7 +2372,7 @@ chknext:
           }
           goto nfuncexit;
         }
-        if (!strncmp(vname, "fc(", 3)) {
+        if (!strncmp(lp, "fc(", 3)) {
           lp = GetNumericArgument(lp + 3, OPER_EQU, &fvar, gv);
           if (fvar>=0) {
             uint8_t ind = fvar;
@@ -2233,7 +2386,7 @@ chknext:
           fvar = 0;
           goto nfuncexit;
         }
-        if (!strncmp(vname, "ff(", 3)) {
+        if (!strncmp(lp, "ff(", 3)) {
           lp = GetNumericArgument(lp + 3, OPER_EQU, &fvar, gv);
           uint8_t ind = fvar;
           if (ind>=SFS_MAX) ind = SFS_MAX - 1;
@@ -2241,7 +2394,7 @@ chknext:
           fvar = 0;
           goto nfuncexit;
         }
-        if (!strncmp(vname, "fw(", 3)) {
+        if (!strncmp(lp, "fw(", 3)) {
           char str[SCRIPT_MAXSSIZE];
           lp = ForceStringVar(lp + 3, str);
           while (*lp==' ') lp++;
@@ -2255,7 +2408,7 @@ chknext:
           }
           goto nfuncexit;
         }
-        if (!strncmp(vname, "fwb(", 4)) {
+        if (!strncmp(lp, "fwb(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           uint8_t buf[2];
           buf[0] = fvar;
@@ -2271,7 +2424,7 @@ chknext:
           goto nfuncexit;
         }
 
-        if (!strncmp(vname, "fr(", 3)) {
+        if (!strncmp(lp, "fr(", 3)) {
           struct T_INDEX ind;
           uint8_t vtype;
           uint8_t sindex = 0;
@@ -2344,7 +2497,7 @@ chknext:
           len = 0;
           goto exit;
         }
-        if (!strncmp(vname, "frb(", 4)) {
+        if (!strncmp(lp, "frb(", 4)) {
           lp = GetNumericArgument(lp, OPER_EQU, &fvar, gv);
           uint8_t ind = fvar;
           if (ind>=SFS_MAX) ind = SFS_MAX - 1;
@@ -2358,7 +2511,7 @@ chknext:
           }
           goto nfuncexit;
         }
-        if (!strncmp(vname, "fa(", 3)) {
+        if (!strncmp(lp, "fa(", 3)) {
           lp = GetNumericArgument(lp + 3, OPER_EQU, &fvar, gv);
           uint8_t ind = fvar;
           if (ind>=SFS_MAX) ind = SFS_MAX - 1;
@@ -2369,7 +2522,7 @@ chknext:
           }
           goto nfuncexit;
         }
-        if (!strncmp(vname, "fs(", 3)) {
+        if (!strncmp(lp, "fs(", 3)) {
           lp = GetNumericArgument(lp + 3, OPER_EQU, &fvar, gv);
           uint8_t ind = fvar;
           SCRIPT_SKIP_SPACES
@@ -2377,13 +2530,13 @@ chknext:
           SCRIPT_SKIP_SPACES
           if (ind>=SFS_MAX) ind = SFS_MAX - 1;
           if (glob_script_mem.file_flags[ind].is_open) {
-            fvar = glob_script_mem.files[ind].seek(fvar, fs::SeekMode::SeekCur);
+            fvar = glob_script_mem.files[ind].seek(fvar, SeekSet);
           } else {
             fvar = -1;
           }
           goto nfuncexit;
         }
-        if (!strncmp(vname, "fz(", 3)) {
+        if (!strncmp(lp, "fz(", 3)) {
           lp = GetNumericArgument(lp + 3, OPER_EQU, &fvar, gv);
           SCRIPT_SKIP_SPACES
           uint8_t ind = fvar;
@@ -2395,14 +2548,14 @@ chknext:
           }
           goto nfuncexit;
         }
-        if (!strncmp(vname, "fd(", 3)) {
+        if (!strncmp(lp, "fd(", 3)) {
           char str[glob_script_mem.max_ssize + 1];
           lp = GetStringArgument(lp + 3, OPER_EQU, str, 0);
           ufsp->remove(str);
           goto nfuncexit;
         }
 #ifdef USE_UFILESYS
-        if (!strncmp(vname, "frw(", 4)) {
+        if (!strncmp(lp, "frw(", 4)) {
           // read file from web
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           SCRIPT_SKIP_SPACES
@@ -2414,7 +2567,7 @@ chknext:
         }
 #endif
 #if defined(ESP32) && defined(USE_WEBCAM)
-        if (!strncmp(vname, "fwp(", 4)) {
+        if (!strncmp(lp, "fwp(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           while (*lp==' ') lp++;
           float fvar1;
@@ -2440,7 +2593,7 @@ chknext:
         }
 #endif //ESP32 && USE_WEBCAM
 #ifdef USE_SCRIPT_FATFS_EXT
-        if (!strncmp(vname, "fe(", 3)) {
+        if (!strncmp(lp, "fe(", 3)) {
           char str[glob_script_mem.max_ssize + 1];
           lp = GetStringArgument(lp + 3, OPER_EQU, str, 0);
           // execute script
@@ -2461,13 +2614,13 @@ chknext:
           }
           goto nfuncexit;
         }
-        if (!strncmp(vname, "fmd(", 4)) {
+        if (!strncmp(lp, "fmd(", 4)) {
           char str[glob_script_mem.max_ssize + 1];
           lp = GetStringArgument(lp + 4, OPER_EQU, str, 0);
           fvar = ufsp->mkdir(str);
           goto nfuncexit;
         }
-        if (!strncmp(vname, "fmt(", 4)) {
+        if (!strncmp(lp, "fmt(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           if (!fvar) {
             LittleFS.format();
@@ -2476,13 +2629,13 @@ chknext:
           }
           goto nfuncexit;
         }
-        if (!strncmp(vname, "frd(", 4)) {
+        if (!strncmp(lp, "frd(", 4)) {
           char str[glob_script_mem.max_ssize + 1];
           lp = GetStringArgument(lp + 4, OPER_EQU, str, 0);
           fvar = ufsp->rmdir(str);
           goto nfuncexit;
         }
-        if (!strncmp(vname, "fx(", 3)) {
+        if (!strncmp(lp, "fx(", 3)) {
           char str[glob_script_mem.max_ssize + 1];
           lp = GetStringArgument(lp + 3, OPER_EQU, str, 0);
           if (ufsp->exists(str)) fvar = 1;
@@ -2490,14 +2643,14 @@ chknext:
           goto nfuncexit;
         }
 
-        if (!strncmp(vname, "fsi(", 4)) {
+        if (!strncmp(lp, "fsi(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           fvar = UfsInfo(fvar, 0);
           goto nfuncexit;
         }
 
 #ifdef USE_FEXTRACT
-        if (!strncmp(vname, "fxt(", 4)) {
+        if (!strncmp(lp, "fxt(", 4)) {
           // extract from file
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           SCRIPT_SKIP_SPACES
@@ -2536,7 +2689,7 @@ chknext:
           goto nfuncexit;
         }
 #endif // USE_FEXTRACT
-        if (!strncmp(vname, "fwa(", 4)) {
+        if (!strncmp(lp, "fwa(", 4)) {
           uint16_t alen;
           float *fa;
           lp = get_array_by_name(lp + 4, &fa, &alen);
@@ -2576,7 +2729,7 @@ chknext:
           }
           goto nfuncexit;
         }
-        if (!strncmp(vname, "fra(", 4)) {
+        if (!strncmp(lp, "fra(", 4)) {
           uint16_t alen;
           float *fa;
           lp = get_array_by_name(lp + 4, &fa, &alen);
@@ -2622,7 +2775,7 @@ chknext:
         }
 
 #endif // USE_SCRIPT_FATFS_EXT
-        if (!strncmp(vname, "fl1(", 4) || !strncmp(vname, "fl2(", 4) )  {
+        if (!strncmp(lp, "fl1(", 4) || !strncmp(lp, "fl2(", 4) )  {
           uint8_t lknum = *(lp+2)&3;
           char str[glob_script_mem.max_ssize + 1];
           lp = GetStringArgument(lp + 4, OPER_EQU, str, 0);
@@ -2631,13 +2784,13 @@ chknext:
           fvar = 0;
           goto nfuncexit;
         }
-        if (!strncmp(vname, "fsm", 3)) {
+        if (!strncmp(lp, "fsm", 3)) {
           fvar=(uint32_t)ufsp;
           //card_init();
           goto exit;
         }
 #endif //USE_SCRIPT_FATFS
-        if (!strncmp(vname, "freq", 4)) {
+        if (!strncmp(lp, "freq", 4)) {
 #ifdef ESP32
           fvar = getCpuFrequencyMhz();
 #else
@@ -2645,7 +2798,7 @@ chknext:
 #endif
           goto exit;
         }
-        if (!strncmp(vname, "frnm", 4)) {
+        if (!strncmp(lp, "frnm", 4)) {
           if (sp) strlcpy(sp, SettingsText(SET_FRIENDLYNAME1), glob_script_mem.max_ssize);
           goto strexit;
         }
@@ -2669,7 +2822,7 @@ chknext:
           goto strexit;
         }
 #ifdef USE_WEBSEND_RESPONSE
-        if (!strncmp(vname, "gwr(", 4)) {
+        if (!strncmp(lp, "gwr(", 4)) {
           char delim[SCRIPT_MAXSSIZE];
           lp = GetStringArgument(lp + 4, OPER_EQU, delim, 0);
           SCRIPT_SKIP_SPACES
@@ -2738,7 +2891,7 @@ chknext:
 #endif
 
 #ifdef SCRIPT_GET_HTTPS_JP
-        if (!strncmp(vname, "gjp(", 4)) {
+        if (!strncmp(lp, "gjp(", 4)) {
           char host[SCRIPT_MAXSSIZE];
           lp = GetStringArgument(lp + 4, OPER_EQU, host, 0);
           SCRIPT_SKIP_SPACES
@@ -2758,7 +2911,7 @@ chknext:
           fvar = ESP_getFreeHeap();
           goto exit;
         }
-        if (!strncmp(vname, "hn(", 3)) {
+        if (!strncmp(lp, "hn(", 3)) {
           lp = GetNumericArgument(lp + 3, OPER_EQU, &fvar, gv);
           if (fvar<0 || fvar>255) fvar = 0;
           lp++;
@@ -2768,7 +2921,7 @@ chknext:
           }
           goto strexit;
         }
-        if (!strncmp(vname, "hx(", 3)) {
+        if (!strncmp(lp, "hx(", 3)) {
           lp = GetNumericArgument(lp + 3, OPER_EQU, &fvar, gv);
           lp++;
           len = 0;
@@ -2777,13 +2930,13 @@ chknext:
           }
           goto strexit;
         }
-        if (!strncmp(vname, "hd(", 3)) {
+        if (!strncmp(lp, "hd(", 3)) {
           char str[SCRIPT_MAXSSIZE];
           lp = GetStringArgument(lp + 3, OPER_EQU, str, 0);
           fvar = strtol(str, NULL, 16);
           goto nfuncexit;
         }
-        if (!strncmp(vname, "hf(", 3)) {
+        if (!strncmp(lp, "hf(", 3)) {
           char str[SCRIPT_MAXSSIZE];
           lp = GetStringArgument(lp + 3, OPER_EQU, str, 0);
           SCRIPT_SKIP_SPACES
@@ -2812,7 +2965,7 @@ chknext:
           }
           goto nfuncexit;
         }
-        if (!strncmp(vname, "http(", 5)) {
+        if (!strncmp(lp, "http(", 5)) {
           char host[SCRIPT_MAXSSIZE];
           lp = GetStringArgument(lp + 5, OPER_EQU, host, 0);
           SCRIPT_SKIP_SPACES
@@ -2823,7 +2976,7 @@ chknext:
           goto nfuncexit;
         }
 #ifdef USE_LIGHT
-        if (!strncmp(vname, "hsvrgb(", 7)) {
+        if (!strncmp(lp, "hsvrgb(", 7)) {
           lp = GetNumericArgument(lp + 7, OPER_EQU, &fvar, gv);
           if (fvar<0 || fvar>360) fvar = 0;
           SCRIPT_SKIP_SPACES
@@ -2843,7 +2996,7 @@ chknext:
 #endif //USE_LIGHT
 
 #ifdef USE_HOMEKIT
-        if (!strncmp(vname, "hki(", 4)) {
+        if (!strncmp(lp, "hki(", 4)) {
           if (!TasmotaGlobal.global_state.wifi_down) {
             // erase nvs
             lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
@@ -2858,7 +3011,7 @@ chknext:
 #endif
         break;
       case 'i':
-        if (!strncmp(vname, "ins(", 4)) {
+        if (!strncmp(lp, "ins(", 4)) {
           char s1[SCRIPT_MAXSSIZE];
           lp = GetStringArgument(lp + 4, OPER_EQU, s1, 0);
           SCRIPT_SKIP_SPACES
@@ -2873,46 +3026,46 @@ chknext:
           }
           goto nfuncexit;
         }
-        if (!strncmp(vname, "int(", 4)) {
+        if (!strncmp(lp, "int(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           fvar = floor(fvar);
           goto nfuncexit;
         }
-        if (!strncmp(vname, "is(", 3)) {
+        if (!strncmp(lp, "is(", 3)) {
           lp = isargs(lp + 3, 0);
           fvar = 0;
           len = 0;
           goto exit;
         }
-        if (!strncmp(vname, "is1(", 4)) {
+        if (!strncmp(lp, "is1(", 4)) {
           lp = isargs(lp + 4, 1);
           fvar = 0;
           len = 0;
           goto exit;
         }
-        if (!strncmp(vname, "is2(", 4)) {
+        if (!strncmp(lp, "is2(", 4)) {
           lp = isargs(lp + 4, 2);
           fvar = 0;
           len = 0;
           goto exit;
         }
-        if (!strncmp(vname, "is[", 3)) {
+        if (!strncmp(lp, "is[", 3)) {
           lp = isget(lp + 3, sp, 0, gv);
           len = 0;
           goto strexit;
         }
-        if (!strncmp(vname, "is1[", 4)) {
+        if (!strncmp(lp, "is1[", 4)) {
           lp = isget(lp + 4, sp, 1, gv);
           len = 0;
           goto strexit;
         }
-        if (!strncmp(vname, "is2[", 4)) {
+        if (!strncmp(lp, "is2[", 4)) {
           lp = isget(lp + 4, sp, 2, gv);
           len = 0;
           goto strexit;
         }
 #ifdef USE_SCRIPT_I2C
-        if (!strncmp(vname, "ia", 2)) {
+        if (!strncmp(lp, "ia", 2)) {
           uint8_t bus = 0;
           lp += 2;
           if (*lp == '2') {
@@ -2923,7 +3076,7 @@ chknext:
           fvar = script_i2c(0, fvar, bus);
           goto nfuncexit;
         }
-        if (!strncmp(vname, "iw", 2)) {
+        if (!strncmp(lp, "iw", 2)) {
           uint8_t bytes = 1;
           lp += 2;
           if (*lp != '(') {
@@ -2940,7 +3093,7 @@ chknext:
           fvar = script_i2c(9 + bytes, fvar, fvar2);
           goto nfuncexit;
         }
-        if (!strncmp(vname, "ir", 2)) {
+        if (!strncmp(lp, "ir", 2)) {
           uint8_t bytes = 1;
           lp += 2;
           if (*lp != '(') {
@@ -2956,7 +3109,7 @@ chknext:
 #endif // USE_SCRIPT_I2C
         break;
       case 'l':
-        if (!strncmp(vname, "lip", 3)) {
+        if (!strncmp(lp, "lip", 3)) {
           if (sp) strlcpy(sp, (const char*)WiFi.localIP().toString().c_str(), glob_script_mem.max_ssize);
           goto strexit;
         }
@@ -2977,7 +3130,7 @@ chknext:
           return lp + len;
         }
 #ifdef USE_LVGL
-        if (!strncmp(vname, "lvgl(", 5)) {
+        if (!strncmp(lp, "lvgl(", 5)) {
           lp = GetNumericArgument(lp + 5, OPER_EQU, &fvar, gv);
           SCRIPT_SKIP_SPACES
           fvar = lvgl_test(&lp, fvar);
@@ -2986,7 +3139,7 @@ chknext:
 #endif // USE_LVGL
         break;
       case 'm':
-        if (!strncmp(vname, "med(", 4)) {
+        if (!strncmp(lp, "med(", 4)) {
           float fvar1;
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar1, gv);
           SCRIPT_SKIP_SPACES
@@ -2997,7 +3150,7 @@ chknext:
           goto nfuncexit;
         }
 #ifdef USE_ANGLE_FUNC
-        if (!strncmp(vname, "mpt(", 4)) {
+        if (!strncmp(lp, "mpt(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           fvar = MeasurePulseTime(fvar);
           goto nfuncexit;
@@ -3037,7 +3190,7 @@ chknext:
           fvar = !TasmotaGlobal.global_state.mqtt_down;
           goto exit;
         }
-        if (!strncmp(vname, "mp(", 3)) {
+        if (!strncmp(lp, "mp(", 3)) {
           float fvar1;
           lp = GetNumericArgument(lp + 3, OPER_EQU, &fvar1, gv);
           SCRIPT_SKIP_SPACES
@@ -3067,7 +3220,7 @@ chknext:
           goto exit;
         }
 #ifdef USE_MORITZ
-        if (!strncmp(vname, "mo(", 3)) {
+        if (!strncmp(lp, "mo(", 3)) {
           float fvar1;
           lp = GetNumericArgument(lp + 3, OPER_EQU, &fvar1, gv);
           SCRIPT_SKIP_SPACES
@@ -3084,23 +3237,23 @@ chknext:
 #endif //USE_MORITZ
         break;
       case 'p':
-        if (!strncmp(vname, "pin[", 4)) {
+        if (!strncmp(lp, "pin[", 4)) {
           // raw pin level
-          GetNumericArgument(vname + 4, OPER_EQU, &fvar, gv);
+          GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           fvar = digitalRead((uint8_t)fvar);
           // skip ] bracket
           len++;
           goto exit;
         }
-        if (!strncmp(vname, "pn[", 3)) {
-          GetNumericArgument(vname + 3, OPER_EQU, &fvar, gv);
+        if (!strncmp(lp, "pn[", 3)) {
+          GetNumericArgument(lp + 3, OPER_EQU, &fvar, gv);
           fvar = Pin(fvar);
           // skip ] bracket
           len++;
           goto exit;
         }
 #if  defined(ESP32) && (defined(USE_I2S_AUDIO) || defined(USE_TTGO_WATCH) || defined(USE_M5STACK_CORE2))
-        if (!strncmp(vname, "pl(", 3)) {
+        if (!strncmp(lp, "pl(", 3)) {
           char path[SCRIPT_MAXSSIZE];
           lp = GetStringArgument(lp + 3, OPER_EQU, path, 0);
           Play_mp3(path);
@@ -3109,8 +3262,8 @@ chknext:
           goto exit;
         }
 #endif // USE_I2S_AUDIO
-        if (!strncmp(vname, "pd[", 3)) {
-          GetNumericArgument(vname + 3, OPER_EQU, &fvar, gv);
+        if (!strncmp(lp, "pd[", 3)) {
+          GetNumericArgument(lp + 3, OPER_EQU, &fvar, gv);
           uint8_t gpiopin = fvar;
 /*
           for (uint8_t i=0;i<GPIO_SENSOR_END;i++) {
@@ -3150,7 +3303,7 @@ chknext:
           if (sp) strlcpy(sp, SettingsText(SET_MQTTPREFIX3), glob_script_mem.max_ssize);
           goto strexit;
         }
-        if (!strncmp(vname, "pow(", 4)) {
+        if (!strncmp(lp, "pow(", 4)) {
           // arg1
           float fvar1;
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar1, gv);
@@ -3161,8 +3314,8 @@ chknext:
           fvar = FastPrecisePowf(fvar1, fvar2);
           goto nfuncexit;
         }
-        if (!strncmp(vname, "pwr[", 4)) {
-          GetNumericArgument(vname + 4, OPER_EQU, &fvar, gv);
+        if (!strncmp(lp, "pwr[", 4)) {
+          GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           uint8_t index = fvar;
           if (index<=TasmotaGlobal.devices_present) {
             fvar = bitRead(TasmotaGlobal.power, index - 1);
@@ -3172,8 +3325,8 @@ chknext:
           len += 1;
           goto exit;
         }
-        if (!strncmp(vname, "pc[", 3)) {
-          GetNumericArgument(vname + 3, OPER_EQU, &fvar, gv);
+        if (!strncmp(lp, "pc[", 3)) {
+          GetNumericArgument(lp + 3, OPER_EQU, &fvar, gv);
           uint8_t index = fvar;
           if (index<1 || index>MAX_COUNTERS) index = 1;
           fvar = RtcSettings.pulse_counter[index - 1];
@@ -3188,9 +3341,9 @@ chknext:
           fvar = glob_script_mem.script_mem_size + (glob_script_mem.script_size) + (PMEM_SIZE);
           goto exit;
         }
-        if (!strncmp(vname, "rnd(", 4)) {
+        if (!strncmp(lp, "rnd(", 4)) {
           // tasmota switch state
-          GetNumericArgument(vname + 4, OPER_EQU, &fvar, gv);
+          GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           if (fvar<0) {
             randomSeed(-fvar);
             fvar = 0;
@@ -3202,7 +3355,7 @@ chknext:
           goto exit;
         }
 #if  defined(ESP32) && (defined(USE_M5STACK_CORE2))
-        if (!strncmp(vname, "rec(", 4)) {
+        if (!strncmp(lp, "rec(", 4)) {
           char str[SCRIPT_MAXSSIZE];
           lp = GetStringArgument(lp + 4, OPER_EQU, str, 0);
           SCRIPT_SKIP_SPACES
@@ -3218,9 +3371,9 @@ chknext:
           fvar = RtcTime.second;
           goto exit;
         }
-        if (!strncmp(vname, "sw[", 3)) {
+        if (!strncmp(lp, "sw[", 3)) {
           // tasmota switch state
-          GetNumericArgument(vname + 3, OPER_EQU, &fvar, gv);
+          GetNumericArgument(lp + 3, OPER_EQU, &fvar, gv);
           fvar = SwitchLastState((uint32_t)fvar);
           // skip ] bracket
           len++;
@@ -3240,13 +3393,13 @@ chknext:
           fvar = strlen(glob_script_mem.script_ram);
           goto exit;
         }
-        if (!strncmp(vname, "sl(", 3)) {
+        if (!strncmp(lp, "sl(", 3)) {
           char str[SCRIPT_MAXSSIZE];
           lp = GetStringArgument(lp + 3, OPER_EQU, str, 0);
           fvar = strlen(str);
           goto nfuncexit;
         }
-        if (!strncmp(vname, "sb(", 3)) {
+        if (!strncmp(lp, "sb(", 3)) {
           char str[SCRIPT_MAXSSIZE];
           lp = GetStringArgument(lp + 3, OPER_EQU, str, 0);
           SCRIPT_SKIP_SPACES
@@ -3264,7 +3417,7 @@ chknext:
           sp[(uint8_t)fvar2] = '\0';
           goto strexit;
         }
-        if (!strncmp(vname, "st(", 3)) {
+        if (!strncmp(lp, "st(", 3)) {
           char str[SCRIPT_MAXSSIZE];
           lp = GetStringArgument(lp + 3, OPER_EQU, str, 0);
           while (*lp==' ') lp++;
@@ -3297,7 +3450,7 @@ chknext:
           }
           goto strexit;
         }
-        if (!strncmp(vname, "s(", 2)) {
+        if (!strncmp(lp, "s(", 2)) {
           lp = GetNumericArgument(lp + 2, OPER_EQU, &fvar, gv);
           char str[glob_script_mem.max_ssize + 1];
           f2char(fvar, glob_script_mem.script_dprec, glob_script_mem.script_lzero, str);
@@ -3307,7 +3460,7 @@ chknext:
           goto strexit;
         }
 #if  defined(ESP32) && (defined(USE_I2S_AUDIO) || defined(USE_TTGO_WATCH) || defined(USE_M5STACK_CORE2))
-        if (!strncmp(vname, "say(", 4)) {
+        if (!strncmp(lp, "say(", 4)) {
           char text[SCRIPT_MAXSSIZE];
           lp = GetStringArgument(lp + 4, OPER_EQU, text, 0);
           Say(text);
@@ -3318,7 +3471,7 @@ chknext:
 #endif // USE_I2S_AUDIO
 
 #ifdef ESP32
-        if (!strncmp(vname, "sf(", 3)) {
+        if (!strncmp(lp, "sf(", 3)) {
           lp = GetNumericArgument(lp + 3, OPER_EQU, &fvar, gv);
           if (fvar<80) fvar = 80;
           if (fvar>240) fvar = 240;
@@ -3328,7 +3481,7 @@ chknext:
         }
 #endif //ESP32
 #ifdef USE_TTGO_WATCH
-        if (!strncmp(vname, "slp(", 4)) {
+        if (!strncmp(lp, "slp(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           SCRIPT_SKIP_SPACES
           TTGO_Sleep(fvar);
@@ -3347,8 +3500,8 @@ chknext:
 #endif //USE_TIMERS
 
 #ifdef USE_SHUTTER
-        if (!strncmp(vname, "sht[", 4)) {
-          GetNumericArgument(vname + 4, OPER_EQU, &fvar, gv);
+        if (!strncmp(lp, "sht[", 4)) {
+          GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           uint8_t index = fvar;
           if (index<=TasmotaGlobal.shutters_present) {
             fvar = Settings->shutter_position[index - 1];
@@ -3360,12 +3513,12 @@ chknext:
         }
 #endif //USE_SHUTTER
 #ifdef USE_ANGLE_FUNC
-        if (!strncmp(vname, "sin(", 4)) {
+        if (!strncmp(lp, "sin(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           fvar = sinf(fvar);
           goto nfuncexit;
         }
-        if (!strncmp(vname, "sqrt(", 5)) {
+        if (!strncmp(lp, "sqrt(", 5)) {
           lp = GetNumericArgument(lp + 5, OPER_EQU, &fvar, gv);
           fvar = sqrtf(fvar);
           goto nfuncexit;
@@ -3373,13 +3526,13 @@ chknext:
 #endif //USE_ANGLE_FUNC
 
 #if defined(USE_SML_M) && defined (USE_SML_SCRIPT_CMD)
-        if (!strncmp(vname, "sml[", 4)) {
+        if (!strncmp(lp, "sml[", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           SCRIPT_SKIP_SPACES
           fvar = SML_GetVal(fvar);
           goto nfuncexit;
         }
-        if (!strncmp(vname, "sml(", 4)) {
+        if (!strncmp(lp, "sml(", 4)) {
           float fvar1;
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar1, gv);
           SCRIPT_SKIP_SPACES
@@ -3417,13 +3570,13 @@ chknext:
           tind->index = SML_JSON_ENABLE;
           goto exit_settable;
         }
-        if (!strncmp(vname, "smld(", 5)) {
+        if (!strncmp(lp, "smld(", 5)) {
           lp = GetNumericArgument(lp + 5, OPER_EQU, &fvar, gv);
           if (fvar < 1) fvar = 1;
           SML_Decode(fvar - 1);
           goto nfuncexit;
         }
-        if (!strncmp(vname, "smlv[", 5)) {
+        if (!strncmp(lp, "smlv[", 5)) {
           lp = GetNumericArgument(lp + 5, OPER_EQU, &fvar, gv);
           fvar = sml_getv(fvar);
           goto nfuncexit;
@@ -3431,7 +3584,7 @@ chknext:
 #endif //USE_SML_M
 
 #ifdef USE_SCRIPT_SERIAL
-        if (!strncmp(vname, "so(", 3)) {
+        if (!strncmp(lp, "so(", 3)) {
           float rxpin, txpin, br;
           lp = GetNumericArgument(lp + 3, OPER_EQU, &rxpin, gv);
           SCRIPT_SKIP_SPACES
@@ -3490,7 +3643,7 @@ chknext:
           }
           goto nfuncexit;
         }
-        if (!strncmp(vname, "sw(", 3)) {
+        if (!strncmp(lp, "sw(", 3)) {
           char str[SCRIPT_MAXSSIZE];
           lp = GetStringArgument(lp + 3, OPER_EQU, str, 0);
           fvar = -1;
@@ -3500,7 +3653,7 @@ chknext:
           }
           goto nfuncexit;
         }
-        if (!strncmp(vname, "swb(", 4)) {
+        if (!strncmp(lp, "swb(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, 0);
           fvar = -1;
           if (glob_script_mem.sp) {
@@ -3509,14 +3662,14 @@ chknext:
           }
           goto nfuncexit;
         }
-        if (!strncmp(vname, "sa(", 3)) {
+        if (!strncmp(lp, "sa(", 3)) {
           fvar = -1;
           if (glob_script_mem.sp) {
             fvar = glob_script_mem.sp->available();
           }
           goto nfuncexit;
         }
-        if (!strncmp(vname, "srb(", 3)) {
+        if (!strncmp(lp, "srb(", 3)) {
           fvar = -1;
           if (glob_script_mem.sp) {
             fvar = glob_script_mem.sp->available();
@@ -3526,7 +3679,7 @@ chknext:
           }
           goto nfuncexit;
         }
-        if (!strncmp(vname, "sp(", 3)) {
+        if (!strncmp(lp, "sp(", 3)) {
           fvar = -1;
           if (glob_script_mem.sp) {
             fvar = glob_script_mem.sp->available();
@@ -3536,7 +3689,7 @@ chknext:
           }
           goto nfuncexit;
         }
-        if (!strncmp(vname, "sr(", 3)) {
+        if (!strncmp(lp, "sr(", 3)) {
           uint16_t size = glob_script_mem.max_ssize;
           char str[size];
           memset(str, 0, size);
@@ -3569,7 +3722,7 @@ chknext:
           if (sp) strlcpy(sp, str, size);
           goto strexit;;
         }
-        if (!strncmp(vname, "sc(", 3)) {
+        if (!strncmp(lp, "sc(", 3)) {
           fvar = -1;
           if (Script_Close_Serial()) {
             fvar = 0;
@@ -3607,25 +3760,25 @@ chknext:
           goto strexit;
         }
 #ifdef USE_SCRIPT_TIMER
-        if (!strncmp(vname, "ts1(", 4)) {
+        if (!strncmp(lp, "ts1(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           if (fvar<10) fvar = 10;
           Script_ticker1.attach_ms(fvar, Script_ticker1_end);
           goto nfuncexit;
         }
-        if (!strncmp(vname, "ts2(", 4)) {
+        if (!strncmp(lp, "ts2(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           if (fvar<10) fvar = 10;
           Script_ticker2.attach_ms(fvar, Script_ticker2_end);
           goto nfuncexit;
         }
-        if (!strncmp(vname, "ts3(", 4)) {
+        if (!strncmp(lp, "ts3(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           if (fvar<10) fvar = 10;
           Script_ticker3.attach_ms(fvar, Script_ticker3_end);
           goto nfuncexit;
         }
-        if (!strncmp(vname, "ts4(", 4)) {
+        if (!strncmp(lp, "ts4(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           if (fvar<10) fvar = 10;
           Script_ticker4.attach_ms(fvar, Script_ticker4_end);
@@ -3635,8 +3788,8 @@ chknext:
 
 #ifdef USE_DISPLAY
 #ifdef USE_TOUCH_BUTTONS
-        if (!strncmp(vname, "tbut[", 5)) {
-          GetNumericArgument(vname + 5, OPER_EQU, &fvar, gv);
+        if (!strncmp(lp, "tbut[", 5)) {
+          GetNumericArgument(lp + 5, OPER_EQU, &fvar, gv);
           uint8_t index = fvar;
           if (index<1 || index>MAX_TOUCH_BUTTONS) index = 1;
           index--;
@@ -3652,7 +3805,7 @@ chknext:
 #endif //USE_TOUCH_BUTTONS
 #endif //USE_DISPLAY
 #if 0
-        if (!strncmp(vname, "test(", 5)) {
+        if (!strncmp(lp, "test(", 5)) {
           lp = GetNumericArgument(lp + 5, OPER_EQU, &fvar, gv);
           uint32_t cycles;
           uint64_t accu=0;
@@ -3675,7 +3828,7 @@ chknext:
 #endif
 
 #ifdef USE_TIMERS
-        if (!strncmp(vname, "ttget(", 6)) {
+        if (!strncmp(lp, "ttget(", 6)) {
           lp = GetNumericArgument(lp + 6, OPER_EQU, &fvar, gv);
           SCRIPT_SKIP_SPACES
           uint8_t index = fvar;
@@ -3686,6 +3839,27 @@ chknext:
           goto nfuncexit;
         }
 #endif
+
+#ifdef USE_FEXTRACT
+        if (!strncmp(lp, "tso(", 4)) {
+          char str[SCRIPT_MAXSSIZE];
+          lp = GetStringArgument(lp + 4, OPER_EQU, str, 0);
+          fvar = -1;
+          SCRIPT_SKIP_SPACES
+          lp = GetNumericArgument(lp, OPER_EQU, &fvar, gv);
+          SCRIPT_SKIP_SPACES
+          uint8_t flg = 0;
+          if (*lp =='0') {
+            lp++;
+            flg = 1;
+          }
+          tso(str, fvar, flg);
+          if (sp) strlcpy(sp, str, glob_script_mem.max_ssize);
+          lp++;
+          len = 0;
+          goto strexit;
+        }
+#endif
         break;
       case 'u':
         if (!strncmp(vname, "uptime", 6)) {
@@ -3696,11 +3870,11 @@ chknext:
           fvar = TasmotaGlobal.uptime;
           goto exit;
         }
-        if (!strncmp(vname, "upd[", 4)) {
+        if (!strncmp(lp, "upd[", 4)) {
           // var was updated
           struct T_INDEX ind;
           uint8_t vtype;
-          isvar(vname + 4, &vtype, &ind, 0, 0, gv);
+          isvar(lp + 4, &vtype, &ind, 0, 0, gv);
           if (!ind.bits.constant) {
             if (!ind.bits.changed) {
               fvar = 0;
@@ -3719,7 +3893,7 @@ chknext:
 
       case 'w':
 #if defined(ESP32) && defined(USE_WEBCAM)
-        if (!strncmp(vname, "wc(", 3)) {
+        if (!strncmp(lp, "wc(", 3)) {
           float fvar1;
           lp = GetNumericArgument(lp + 3, OPER_EQU, &fvar1, gv);
           SCRIPT_SKIP_SPACES
@@ -3787,7 +3961,7 @@ chknext:
         }
 #endif // USE_TTGO_WATCH
 #if defined(USE_FT5206) || defined(USE_XPT2046) || defined(USE_LILYGO47) || defined(USE_M5EPD47)
-        if (!strncmp(vname, "wtch(", 5)) {
+        if (!strncmp(lp, "wtch(", 5)) {
           lp = GetNumericArgument(lp + 5, OPER_EQU, &fvar, gv);
           fvar = Touch_Status(fvar);
           goto nfuncexit;
@@ -4012,9 +4186,10 @@ char *GetStringArgument(char *lp, uint8_t lastop, char *cp, struct GVARS *gv) {
   char *slp;
   struct T_INDEX ind;
   char str[SCRIPT_MAXSSIZE],str1[SCRIPT_MAXSSIZE];
+  while (*lp == ' ') { lp++; } // skip leading spaces
   while (1) {
-    lp=isvar(lp, &vtype, &ind, 0, str1, gv);
-    if (vtype!=STR_RES && !(vtype & STYPE)) {
+    lp = isvar(lp, &vtype, &ind, 0, str1, gv);
+    if (vtype != STR_RES && !(vtype & STYPE)) {
       // numeric type
       glob_script_mem.glob_error = 1;
       return lp;
@@ -4057,6 +4232,7 @@ uint8_t operand = 0;
 float fvar1,fvar;
 char *slp;
 uint8_t vtype;
+while (*lp == ' ') { lp++; } // skip leading spaces
 struct T_INDEX ind;
     while (1) {
         // get 1. value
@@ -7246,7 +7422,7 @@ const char SCRIPT_MSG_CHKBOX[] PROGMEM =
   "<div><center><label><b>%s</b><input type='checkbox' %s onchange='seva(%d,\"%s\")'></label></div>";
 
 const char SCRIPT_MSG_PULLDOWNa[] PROGMEM =
-  "<div><label for=\'pu_%s\'>%s:</label><select style='width:200px' name='pu%d' id='pu_%s' onchange='seva(value,\"%s\")'>";
+  "<div><center><label for=\'pu_%s\'>%s:</label><select style='width:200px' name='pu%d' id='pu_%s' onchange='seva(value,\"%s\")'>";
 const char SCRIPT_MSG_PULLDOWNb[] PROGMEM =
   "<option %s value='%d'>%s</option>";
 const char SCRIPT_MSG_PULLDOWNc[] PROGMEM =
@@ -7255,6 +7431,10 @@ const char SCRIPT_MSG_PULLDOWNc[] PROGMEM =
 const char SCRIPT_MSG_TEXTINP[] PROGMEM =
   "<div><center><label><b>%s</b><input type='text'  value='%s' style='width:200px'  onfocusin='pr(0)' onfocusout='pr(1)' onchange='siva(value,\"%s\")'></label></div>";
 
+const char SCRIPT_MSG_TEXTINP_U[] PROGMEM =
+  "<div><center><label><b>%s</b><input type='%s'  value='%s' min='%s' max='%s' style='width:200px'  onfocusin='pr(0)' onfocusout='pr(1)' onchange='siva(value,\"%s\")'></label></div>";
+
+
 const char SCRIPT_MSG_NUMINP[] PROGMEM =
   "<div><center><label><b>%s</b><input  min='%s' max='%s' step='%s' value='%s' type='number' style='width:200px' onfocusin='pr(0)' onfocusout='pr(1)' onchange='siva(value,\"%s\")'></label></div>";
 
@@ -7502,6 +7682,21 @@ void ScriptWebShow(char mc) {
             optflg = 0;
           }
           // check for input elements
+          // prescan for html tags
+          /*
+          restart:
+          //if (*lp == 0 || *lp == SCRIPT_EOL)
+          if (*lin == '<') {
+            char *cp = strchr(lin, '>');
+            if (cp) {
+              char svd = *(cp + 1);
+              *(cp + 1) = 0;
+              WSContentSend_PD("%s", lin);
+              *(cp + 1) = svd;
+              lin = cp + 1;
+            }
+          }*/
+
           if (!strncmp(lin, "sl(", 3)) {
             // insert slider sl(min max var left mid right)
             char *lp = lin;
@@ -7576,6 +7771,28 @@ void ScriptWebShow(char mc) {
             while (*lp) {
               SCRIPT_SKIP_SPACES
               lp = GetStringArgument(lp, OPER_EQU, pulabel, 0);
+              if (index == 1 && pulabel[0] == '#') {
+                // number range
+                char *cp = &pulabel[1];
+                uint8_t from = strtol(cp, &cp, 10);
+                uint8_t to = from;
+                if (*cp == '-') {
+                  cp++;
+                  to = strtol(cp, &cp, 10);
+                }
+                for (uint32_t cnt = from; cnt <= to; cnt++) {
+                  sprintf(pulabel, "%d", cnt);
+                  if (val == index) {
+                    cp = (char*)"selected";
+                  } else {
+                    cp = (char*)"";
+                  }
+                  WSContentSend_PD(SCRIPT_MSG_PULLDOWNb, cp, index, pulabel);
+                  index++;
+                }
+                break;
+              }
+
               char *cp;
               if (val == index) {
                 cp = (char*)"selected";
@@ -7654,11 +7871,26 @@ void ScriptWebShow(char mc) {
             SCRIPT_SKIP_SPACES
             char label[SCRIPT_MAXSSIZE];
             lp = GetStringArgument(lp, OPER_EQU, label, 0);
-
             char vname[16];
             ScriptGetVarname(vname, slp, sizeof(vname));
-
-            WSContentSend_PD(SCRIPT_MSG_TEXTINP, label, str, vname);
+            SCRIPT_SKIP_SPACES
+            if (*lp != ')') {
+              char type[SCRIPT_MAXSSIZE];
+              lp = GetStringArgument(lp, OPER_EQU, type, 0);
+              SCRIPT_SKIP_SPACES
+              // also requires min max values
+              char min[SCRIPT_MAXSSIZE];
+              lp = GetStringArgument(lp, OPER_EQU, min, 0);
+              SCRIPT_SKIP_SPACES
+              char max[SCRIPT_MAXSSIZE];
+              lp = GetStringArgument(lp, OPER_EQU, max, 0);
+              SCRIPT_SKIP_SPACES
+              WSContentSend_PD(SCRIPT_MSG_TEXTINP_U, label, type, str, min, max, vname);
+            } else {
+              WSContentSend_PD(SCRIPT_MSG_TEXTINP, label, str, vname);
+            }
+            lp++;
+            //goto restart;
 
           } else if (!strncmp(lin, "nm(", 3)) {
             char *lp = lin;
@@ -8210,11 +8442,17 @@ int32_t url2file(uint8_t fref, char *url) {
   WiFiClient http_client;
   HTTPClient http;
   int32_t httpCode = 0;
-  char hbuff[128];
-  strcpy(hbuff, "http://");
-  strcat(hbuff, url);
-  http.begin(http_client, UrlEncode(hbuff));
-  httpCode = http.GET();
+  String weburl = "http://"+UrlEncode(url);
+  for (uint32_t retry = 0; retry < 15; retry++) {
+    http.begin(http_client, weburl);
+    httpCode = http.GET();
+    if (httpCode > 0) {
+      break;
+    }
+  }
+  if (httpCode < 0) {
+    AddLog(LOG_LEVEL_INFO,PSTR("HTTP error %d = %s"), httpCode, http.errorToString(httpCode).c_str());
+  }
   if (httpCode == HTTP_CODE_OK || httpCode == HTTP_CODE_MOVED_PERMANENTLY) {
     WiFiClient *stream = http.getStreamPtr();
     int32_t len = http.getSize();
diff --git a/tasmota/xdrv_16_tuyamcu.ino b/tasmota/xdrv_16_tuyamcu.ino
index 250c28b21..5750839c5 100644
--- a/tasmota/xdrv_16_tuyamcu.ino
+++ b/tasmota/xdrv_16_tuyamcu.ino
@@ -1442,15 +1442,31 @@ void TuyaSensorsShow(bool json)
   #endif  // USE_WEBSERVER
     }
   }
-  #ifdef USE_WEBSERVER
+#ifdef USE_WEBSERVER
   if (AsModuleTuyaMS()) {
     WSContentSend_P(PSTR("{s}" D_JSON_IRHVAC_MODE "{m}%d{e}"), Tuya.ModeSet);
   }
-  #endif  // USE_WEBSERVER
+#endif  // USE_WEBSERVER
 
   if (RootName) { ResponseJsonEnd();}
 }
 
+#ifdef USE_WEBSERVER
+
+void TuyaAddButton(void) {
+  if (AsModuleTuyaMS()) {
+    WSContentSend_P(HTTP_TABLE100);
+    WSContentSend_P(PSTR("<tr><div></div>"));
+    char stemp[33];
+    snprintf_P(stemp, sizeof(stemp), PSTR("" D_JSON_IRHVAC_MODE ""));
+    WSContentSend_P(HTTP_DEVICE_CONTROL, 26, TasmotaGlobal.devices_present + 1,
+      (strlen(SettingsText(SET_BUTTON1 + TasmotaGlobal.devices_present))) ? SettingsText(SET_BUTTON1 + TasmotaGlobal.devices_present) : stemp, "");
+    WSContentSend_P(PSTR("</tr></table>"));
+  }
+}
+
+#endif  // USE_WEBSERVER
+
 /*********************************************************************************************\
  * Interface
 \*********************************************************************************************/
@@ -1507,6 +1523,9 @@ bool Xdrv16(uint8_t function)
         TuyaSensorsShow(1);
         break;
 #ifdef USE_WEBSERVER
+      case FUNC_WEB_ADD_MAIN_BUTTON:
+        TuyaAddButton();
+        break;
       case FUNC_WEB_SENSOR:
         TuyaSensorsShow(0);
         break;
diff --git a/tasmota/xdrv_50_filesystem.ino b/tasmota/xdrv_50_filesystem.ino
index 8a0ed1d16..7150fbd85 100644
--- a/tasmota/xdrv_50_filesystem.ino
+++ b/tasmota/xdrv_50_filesystem.ino
@@ -294,7 +294,23 @@ bool TfsSaveFile(const char *fname, const uint8_t *buf, uint32_t len) {
     return false;
   }
 
-  file.write(buf, len);
+//  This will timeout on ESP32-webcam
+//  file.write(buf, len);
+
+  uint32_t count = len / 512;
+  uint32_t chunk = len / count;
+  for (uint32_t i = 0; i < count; i++) {
+    file.write(buf + (i * chunk), chunk);
+    // do actually wait a little to allow ESP32 tasks to tick
+    // fixes task timeout in ESP32Solo1 style unicore code and webcam.
+    delay(10);
+    OsWatchLoop();
+  }
+  uint32_t left = len % count;
+  if (left) {
+    file.write(buf + (count * chunk), left);
+  }
+
   file.close();
   return true;
 }
diff --git a/tasmota/xdrv_52_0_berry_struct.ino b/tasmota/xdrv_52_0_berry_struct.ino
index fe09b3c84..760358ab0 100644
--- a/tasmota/xdrv_52_0_berry_struct.ino
+++ b/tasmota/xdrv_52_0_berry_struct.ino
@@ -23,6 +23,7 @@
 #include <berry.h>
 #include <LList.h>
 
+#include "be_mapping.h"
 #include "re1.5.h"
 
 /*********************************************************************************************\
diff --git a/tasmota/xdrv_52_1_berry_native.ino b/tasmota/xdrv_52_1_berry_native.ino
index 970d26c48..2bf1f152e 100644
--- a/tasmota/xdrv_52_1_berry_native.ino
+++ b/tasmota/xdrv_52_1_berry_native.ino
@@ -45,8 +45,11 @@ extern "C" {
  * Responds to virtual constants
 \*********************************************************************************************/
 extern "C" {
-  // Clear all elements on the stack
-  void be_pop_all(bvm *vm) {
+  #include "be_vm.h"
+  // Call error handler and pop all from stack
+  void be_error_pop_all(bvm *vm);
+  void be_error_pop_all(bvm *vm) {
+    if (vm->obshook != NULL) (*vm->obshook)(vm, BE_OBS_PCALL_ERROR);
     be_pop(vm, be_top(vm));       // clear Berry stack
   }
 
@@ -267,113 +270,6 @@ extern "C" {
  * Warning, the following expect all parameters to be 32 bits wide
 \*********************************************************************************************/
 
-extern "C" {
-  
-  /*********************************************************************************************\
-   * Callback structures
-   * 
-   * We allow 4 parameters, or 3 if method (first arg is `self`)
-   * This could be extended if needed
-  \*********************************************************************************************/
-  typedef int32_t (*berry_callback_t)(int32_t v0, int32_t v1, int32_t v2, int32_t v3);
-
-  extern void BerryDumpErrorAndClear(bvm *vm, bool berry_console);
-
-  /*********************************************************************************************\
-   * Callback structures
-   * 
-   * We allow 4 parameters, or 3 if method (first arg is `self`)
-   * This could be extended if needed
-  \*********************************************************************************************/
-  int32_t call_berry_cb(int32_t num, int32_t v0, int32_t v1, int32_t v2, int32_t v3) {
-    // call berry cb dispatcher
-    int32_t ret = 0;
-    // get the 'tasmota' object (global) and call 'cb_dispatch'
-    be_getglobal(berry.vm, PSTR("tasmota"));
-    if (!be_isnil(berry.vm, -1)) {
-      be_getmethod(berry.vm, -1, PSTR("cb_dispatch"));
-
-      if (!be_isnil(berry.vm, -1)) {
-        be_pushvalue(berry.vm, -2); // add instance as first arg
-        // push all args as ints (may be revised)
-        be_pushint(berry.vm, num);
-        be_pushint(berry.vm, v0);
-        be_pushint(berry.vm, v1);
-        be_pushint(berry.vm, v2);
-        be_pushint(berry.vm, v3);
-
-        ret = be_pcall(berry.vm, 6);   // 5 arguments
-        if (ret != 0) {
-          BerryDumpErrorAndClear(berry.vm, false);  // log in Tasmota console only
-          be_pop_all(berry.vm);             // clear Berry stack
-          return 0;
-        }
-        be_pop(berry.vm, 6);
-
-        if (be_isint(berry.vm, -1) || be_isnil(berry.vm, -1)) {  // sanity check
-          if (be_isint(berry.vm, -1)) {
-            ret = be_toint(berry.vm, -1);
-          }
-          // All good, we can proceed
-          be_pop(berry.vm, 2);    // remove tasmota instance and result
-          return ret;
-        }
-      }
-      be_pop(berry.vm, 1);
-    }
-    be_pop(berry.vm, 1);
-    AddLog(LOG_LEVEL_ERROR, PSTR(D_LOG_BERRY "can't call 'tasmota.cb_dispatch'"));
-    return 0;
-  }
-
-  #define BERRY_CB(n) int32_t berry_cb_##n(int32_t v0, int32_t v1, int32_t v2, int32_t v3) { return call_berry_cb(n, v0, v1, v2, v3); }
-  // list the callbacks
-  BERRY_CB(0);
-  BERRY_CB(1);
-  BERRY_CB(2);
-  BERRY_CB(3);
-  BERRY_CB(4);
-  BERRY_CB(5);
-  BERRY_CB(6);
-  BERRY_CB(7);
-  BERRY_CB(8);
-  BERRY_CB(9);
-  BERRY_CB(10);
-  BERRY_CB(11);
-  BERRY_CB(12);
-  BERRY_CB(13);
-  BERRY_CB(14);
-  BERRY_CB(15);
-  BERRY_CB(16);
-  BERRY_CB(17);
-  BERRY_CB(18);
-  BERRY_CB(19);
-
-  // array of callbacks
-  berry_callback_t berry_callback_array[] {
-    berry_cb_0,
-    berry_cb_1,
-    berry_cb_2,
-    berry_cb_3,
-    berry_cb_4,
-    berry_cb_5,
-    berry_cb_6,
-    berry_cb_7,
-    berry_cb_8,
-    berry_cb_9,
-    berry_cb_10,
-    berry_cb_11,
-    berry_cb_12,
-    berry_cb_13,
-    berry_cb_14,
-    berry_cb_15,
-    berry_cb_16,
-    berry_cb_17,
-    berry_cb_18,
-    berry_cb_19,
-  };
-}
-
 /*********************************************************************************************\
  * Automatically parse Berry stack and call the C function accordingly
  * 
@@ -416,7 +312,7 @@ extern "C" {
 
 // read a single value at stack position idx, convert to int.
 // if object instance, get `_p` member and convert it recursively
-int32_t be_convert_single_elt(bvm *vm, int32_t idx, const char * arg_type = nullptr, int32_t lv_obj_cb = 0) {
+int32_t be_convert_single_elt(bvm *vm, int32_t idx, const char * arg_type = nullptr, void * lv_obj_cb = nullptr) {
   int32_t ret = 0;
   char provided_type = 0;
   idx = be_absindex(vm, idx);   // make sure we have an absolute index
@@ -436,7 +332,7 @@ int32_t be_convert_single_elt(bvm *vm, int32_t idx, const char * arg_type = null
       be_pushstring(vm, arg_type);
       be_pushvalue(vm, idx);
       be_pushvalue(vm, 1);
-      be_pushint(vm, lv_obj_cb);
+      be_pushcomptr(vm, lv_obj_cb);
       be_call(vm, 5);
       const void * func = be_tocomptr(vm, -6);
       be_pop(vm, 6);
diff --git a/tasmota/xdrv_52_3_berry_lvgl.ino b/tasmota/xdrv_52_3_berry_lvgl.ino
index 39e7737ed..f0cba617a 100644
--- a/tasmota/xdrv_52_3_berry_lvgl.ino
+++ b/tasmota/xdrv_52_3_berry_lvgl.ino
@@ -162,7 +162,7 @@ void be_check_arg_type(bvm *vm, int32_t arg_start, int32_t argc, const char * ar
       }
     }
     // AddLog(LOG_LEVEL_INFO, ">> be_call_c_func arg %i, type %s", i, arg_type_check ? type_short_name : "<null>");
-    p[i] = be_convert_single_elt(vm, i + arg_start, arg_type_check ? type_short_name : nullptr, p[0]);
+    p[i] = be_convert_single_elt(vm, i + arg_start, arg_type_check ? type_short_name : nullptr, (void*) p[0]);
   }
 
   // check if we are missing arguments
diff --git a/tasmota/xdrv_52_3_berry_md5.ino b/tasmota/xdrv_52_3_berry_md5.ino
deleted file mode 100644
index a4adee029..000000000
--- a/tasmota/xdrv_52_3_berry_md5.ino
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-  xdrv_52_3_berry_md5.ino - Berry scripting language, Md5 class
-
-  Copyright (C) 2021 Stephan Hadinger, Berry language by Guan Wenliang https://github.com/Skiars/berry
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#ifdef USE_BERRY
-
-#include <berry.h>
-#include "MD5Builder.h"
-#include "be_mem.h"
-
-/*********************************************************************************************\
- * Md5 class
- * 
-\*********************************************************************************************/
-extern "C" {
-
-  int free_ctx(bvm* vm) {
-    int argc = be_top(vm);
-    if (argc > 0) {
-      be_getmember(vm, 1, ".p");
-      struct MD5Context * ctx = (struct MD5Context *) be_tocomptr(vm, -1);
-      if (ctx != NULL) {
-        be_os_free(ctx);
-      }
-    }
-    be_return_nil(vm);
-  }
-
-  // `Md5.init() -> `
-  int32_t m_md5_init(struct bvm *vm);
-  int32_t m_md5_init(struct bvm *vm) {
-
-    struct MD5Context * ctx = (struct MD5Context *) be_os_malloc(sizeof(struct MD5Context));
-    if (!ctx) {
-      be_throw(vm, BE_MALLOC_FAIL);
-    }
-    MD5Init(ctx);
-
-    be_newcomobj(vm, ctx, &free_ctx);
-    be_setmember(vm, 1, ".p");
-    be_return_nil(vm);
-  }
-
-  // `Md5.update(content:bytes()) -> nil`
-  //
-  // Add raw bytes to the MD5 calculation
-  int32_t m_md5_update(struct bvm *vm);
-  int32_t m_md5_update(struct bvm *vm) {
-    int32_t argc = be_top(vm); // Get the number of arguments
-    if (argc >= 2 && be_isinstance(vm, 2)) {
-      do {
-        be_getglobal(vm, "bytes"); /* get the bytes class */ /* TODO eventually replace with be_getbuiltin */
-        if (!be_isderived(vm, 2)) break;
-        size_t length = 0;
-        const void * bytes = be_tobytes(vm, 2, &length);
-        if (!bytes) break;
-
-        be_getmember(vm, 1, ".p");
-        struct MD5Context * ctx;
-        ctx = (struct MD5Context *) be_tocomptr(vm, -1);
-        if (!ctx) break;
-
-        if (length > 0) {
-          MD5Update(ctx, (const uint8_t*) bytes, length);
-        }
-        be_return_nil(vm);
-        // success
-      } while (0);
-    }
-    be_raise(vm, kTypeError, nullptr);
-  }
-
-  // `Md5.update(content:bytes()) -> nil`
-  //
-  // Add raw bytes to the MD5 calculation
-  int32_t m_md5_finish(struct bvm *vm);
-  int32_t m_md5_finish(struct bvm *vm) {
-    be_getmember(vm, 1, ".p");
-    struct MD5Context * ctx;
-    ctx = (struct MD5Context *) be_tocomptr(vm, -1);
-
-    uint8_t output[16];
-    MD5Final(output, ctx);
-    be_pushbytes(vm, output, sizeof(output));
-    be_return(vm);
-  }
-}
-
-#endif  // USE_BERRY
diff --git a/tasmota/xdrv_52_3_berry_tasmota.ino b/tasmota/xdrv_52_3_berry_tasmota.ino
index cfc847e7a..a9d0ad734 100644
--- a/tasmota/xdrv_52_3_berry_tasmota.ino
+++ b/tasmota/xdrv_52_3_berry_tasmota.ino
@@ -26,25 +26,25 @@
 const uint32_t BERRY_MAX_LOGS = 16;   // max number of print output recorded when outside of REPL, used to avoid infinite grow of logs
 const uint32_t BERRY_MAX_REPL_LOGS = 1024;   // max number of print output recorded when inside REPL
 
-/*********************************************************************************************\
- * Return C callback from index
- *
-\*********************************************************************************************/
-extern "C" {
-  int32_t l_get_cb(struct bvm *vm);
-  int32_t l_get_cb(struct bvm *vm) {
-    int32_t argc = be_top(vm); // Get the number of arguments
-    if (argc >= 2 && be_isint(vm, 2)) {
-      int32_t idx = be_toint(vm, 2);
-      if (idx >= 0 && idx < ARRAY_SIZE(berry_callback_array)) {
-        const berry_callback_t c_ptr = berry_callback_array[idx];
-        be_pushcomptr(vm, (void*) c_ptr);
-        be_return(vm);
-      }
-    }
-    be_raise(vm, kTypeError, nullptr);
-  }
-}
+// /*********************************************************************************************\
+//  * Return C callback from index
+//  *
+// \*********************************************************************************************/
+// extern "C" {
+//   extern int32_t be_cb__get_cb(struct bvm *vm);
+//   int32_t be_cb__get_cb(struct bvm *vm) {
+//     int32_t argc = be_top(vm); // Get the number of arguments
+//     if (argc >= 2 && be_isint(vm, 2)) {
+//       int32_t idx = be_toint(vm, 2);
+//       if (idx >= 0 && idx < ARRAY_SIZE(berry_callback_array)) {
+//         const berry_callback_t c_ptr = berry_callback_array[idx];
+//         be_pushcomptr(vm, (void*) c_ptr);
+//         be_return(vm);
+//       }
+//     }
+//     be_raise(vm, kTypeError, nullptr);
+//   }
+// }
 
 /*********************************************************************************************\
  * Native functions mapped to Berry functions
diff --git a/tasmota/xdrv_52_9_berry.ino b/tasmota/xdrv_52_9_berry.ino
index 84a4f698c..b48281fde 100644
--- a/tasmota/xdrv_52_9_berry.ino
+++ b/tasmota/xdrv_52_9_berry.ino
@@ -110,24 +110,6 @@ size_t callBerryGC(void) {
   return callBerryEventDispatcher(PSTR("gc"), nullptr, 0, nullptr);
 }
 
-void BerryDumpErrorAndClear(bvm *vm, bool berry_console);
-void BerryDumpErrorAndClear(bvm *vm, bool berry_console) {
-  int32_t top = be_top(vm);
-  // check if we have two strings for an Exception
-  if (top >= 2 && be_isstring(vm, -1) && be_isstring(vm, -2)) {
-    if (berry_console) {
-      berry_log_C(PSTR(D_LOG_BERRY "Exception> '%s' - %s"), be_tostring(berry.vm, -2), be_tostring(berry.vm, -1));
-      be_tracestack(vm);
-      top = be_top(vm);   // update top after dump
-    } else {
-      AddLog(LOG_LEVEL_ERROR, PSTR(D_LOG_BERRY "Exception> '%s' - %s"), be_tostring(berry.vm, -2), be_tostring(berry.vm, -1));
-      be_tracestack(vm);
-    }
-  } else {
-    be_dumpstack(vm);
-  }
-}
-
 // void callBerryMqttData(void) {
 //   AddLog(LOG_LEVEL_INFO, D_LOG_BERRY "callBerryMqttData");
 //   if (nullptr == berry.vm) { return; }
@@ -150,53 +132,6 @@ void BerryDumpErrorAndClear(bvm *vm, bool berry_console) {
 //   checkBeTop();
 // }
 
-/*
-// Call a method of a global object, with n args
-// Before: stack must containt n args
-// After: stack contains return value or nil if something wrong (args removes)
-// returns true is successful, false if object or method not found
-bool callMethodObjectWithArgs(const char * objname, const char * method, size_t argc) {
-  if (nullptr == berry.vm) { return false; }
-  int32_t top = be_top(berry.vm);
-  // stacks contains n x arg
-  be_getglobal(berry.vm, objname);
-  // stacks contains n x arg + object
-  if (!be_isnil(berry.vm, -1)) {
-    be_getmethod(berry.vm, -1, method);
-  // stacks contains n x arg + object + method
-    if (!be_isnil(berry.vm, -1)) {
-      // reshuffle the entire stack since we want: method + object + n x arg
-      be_pushvalue(berry.vm, -1); // add instance as first arg
-      // stacks contains n x arg + object + method + method
-      be_pushvalue(berry.vm, -3); // add instance as first arg
-      // stacks contains n x arg + object + method + method + object
-      // now move args 2 slots up to make room for method and object
-      for (uint32_t i = 1; i <= argc; i++) {
-        be_moveto(berry.vm, -4 - i, -2 - i);
-      }
-      // stacks contains free + free + n x arg + method + object
-      be_moveto(berry.vm, -2, -4 - argc);
-      be_moveto(berry.vm, -1, -3 - argc);
-      // stacks contains method + object + n x arg + method + object
-      be_pop(berry.vm, 2);
-      // stacks contains method + object + n x arg
-      be_pcall(berry.vm, argc + 1);
-      // stacks contains return_val + object + n x arg
-      be_pop(berry.vm, argc + 1);
-      // stacks contains return_val
-      return true;
-    }
-    be_pop(berry.vm, 1);  // remove method
-    // stacks contains n x arg + object
-  }
-  // stacks contains n x arg + object
-  be_pop(berry.vm, argc + 1); // clear stack
-  be_pushnil(berry.vm); // put nil object
-  return false;
-}
-*/
-
-
 // call the event dispatcher from Tasmota object
 // if data_len is non-zero, the event is also sent as raw `bytes()` object because the string may lose data
 int32_t callBerryEventDispatcher(const char *type, const char *cmd, int32_t idx, const char *payload, uint32_t data_len) {
@@ -224,8 +159,7 @@ int32_t callBerryEventDispatcher(const char *type, const char *cmd, int32_t idx,
       }
       BrTimeoutReset();
       if (ret != 0) {
-        BerryDumpErrorAndClear(vm, false);  // log in Tasmota console only
-        be_pop_all(berry.vm);             // clear Berry stack
+        be_error_pop_all(berry.vm);             // clear Berry stack
         return ret;
       }
       be_pop(vm, 5);
@@ -252,6 +186,17 @@ void BerryObservability(bvm *vm, int event...) {
   static uint32_t gc_time = 0;
 
   switch (event)  {
+    case BE_OBS_PCALL_ERROR:    // error after be_pcall
+      {
+        int32_t top = be_top(vm);
+        // check if we have two strings for an Exception
+        if (top >= 2 && be_isstring(vm, -1) && be_isstring(vm, -2)) {
+          berry_log_C(PSTR(D_LOG_BERRY "Exception> '%s' - %s"), be_tostring(berry.vm, -2), be_tostring(berry.vm, -1));
+          be_tracestack(vm);
+        } else {
+          be_dumpstack(vm);
+        }
+      }
     case BE_OBS_GC_START:
       {
         gc_time = millis();
@@ -331,21 +276,18 @@ void BerryInit(void) {
 
     ret_code1 = be_loadstring(berry.vm, berry_prog);
     if (ret_code1 != 0) {
-      BerryDumpErrorAndClear(berry.vm, false);
-      be_pop_all(berry.vm);             // clear Berry stack
+      be_error_pop_all(berry.vm);             // clear Berry stack
       break;
     }
     // AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_BERRY "Berry code loaded, RAM used=%u"), be_gc_memcount(berry.vm));
     ret_code2 = be_pcall(berry.vm, 0);
     if (ret_code1 != 0) {
-      BerryDumpErrorAndClear(berry.vm, false);
-      be_pop_all(berry.vm);             // clear Berry stack
+      be_error_pop_all(berry.vm);             // clear Berry stack
       break;
     }
     // AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_BERRY "Berry code ran, RAM used=%u"), be_gc_memcount(berry.vm));
     if (be_top(berry.vm) > 1) {
-      BerryDumpErrorAndClear(berry.vm, false);
-      be_pop_all(berry.vm);             // clear Berry stack
+      be_error_pop_all(berry.vm);             // clear Berry stack
     } else {
       be_pop(berry.vm, 1);
     }
@@ -389,8 +331,7 @@ void BrLoad(const char * script_name) {
 
     BrTimeoutStart();
     if (be_pcall(berry.vm, 1) != 0) {
-      BerryDumpErrorAndClear(berry.vm, false);
-      be_pop_all(berry.vm);             // clear Berry stack
+      be_error_pop_all(berry.vm);             // clear Berry stack
       return;
     }
     BrTimeoutReset();
@@ -495,8 +436,7 @@ void BrREPLRun(char * cmd) {
       }
     }
     if (BE_EXCEPTION == ret_code) {
-      BerryDumpErrorAndClear(berry.vm, true);
-      be_pop_all(berry.vm);             // clear Berry stack
+      be_error_pop_all(berry.vm);             // clear Berry stack
       // be_dumpstack(berry.vm);
       // char exception_s[120];
       // ext_snprintf_P(exception_s, sizeof(exception_s), PSTR("%s: %s"), be_tostring(berry.vm, -2), be_tostring(berry.vm, -1));
diff --git a/tasmota/xdrv_81_esp32_webcam.ino b/tasmota/xdrv_81_esp32_webcam.ino
index dca8ec936..273885049 100644
--- a/tasmota/xdrv_81_esp32_webcam.ino
+++ b/tasmota/xdrv_81_esp32_webcam.ino
@@ -876,6 +876,10 @@ void WcStreamControl() {
   WcSetup(Settings->webcam_config.resolution);
 }
 
+bool WcStreamActive(void) {
+  return (Wc.stream_active);
+}
+
 /*********************************************************************************************/
 
 
diff --git a/tasmota/xlgt_07_lsc_mcsl.ino b/tasmota/xlgt_07_lsc_mcsl.ino
index 9e8ec00e6..d7c9bbfd2 100644
--- a/tasmota/xlgt_07_lsc_mcsl.ino
+++ b/tasmota/xlgt_07_lsc_mcsl.ino
@@ -17,6 +17,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#define USE_LSC_MCSL_GUI
+
 #ifdef USE_LIGHT
 #ifdef USE_LSC_MCSL
 /*********************************************************************************************\
@@ -27,6 +29,17 @@
  * Template:
  * {"NAME":"LSC MC Lights","GPIO":[0,0,0,0,544,32,0,0,3840,0,3872,0,0,0],"FLAG":0,"BASE":18}
  *
+ * Webbutton:
+ * {"WebButton1":"On / Off",
+ *  "WebButton2":"Bright",
+ *  "WebButton3":"Slow",
+ *  "WebButton4":"Star",
+ *  "WebButton5":"Flower",
+ *  "WebButton6":"Marquee",
+ *  "WebButton7":"Fireworks",
+ *  "WebButton8":"Meteor",
+ *  "WebButton9":"Stream"}
+ *
  * NL: Action LSC Multi color smart lights
  *
  * Button usage:
@@ -232,6 +245,51 @@ void LscMcModuleSelected(void) {
 //  AddLog(LOG_LEVEL_DEBUG, PSTR("LGT: LSC Multi Color Found"));
 }
 
+#ifdef USE_WEBSERVER
+#ifdef USE_LSC_MCSL_GUI
+
+void LscMcAddFuctionButtons(void) {
+  uint32_t rows = 1;
+  uint32_t cols = 8;
+  for (uint32_t i = 0; i < 8; i++) {
+    if (strlen(SettingsText(SET_BUTTON1 + i +1))) {
+      rows <<= 1;
+      cols >>= 1;
+      break;
+    }
+  }
+  WSContentSend_P(HTTP_TABLE100);
+  WSContentSend_P(PSTR("<tr>"));
+  char number[4];
+  uint32_t idx = 0;
+  for (uint32_t i = 0; i < rows; i++) {
+    if (idx > 0) { WSContentSend_P(PSTR("</tr><tr>")); }
+    for (uint32_t j = 0; j < cols; j++) {
+      idx++;
+      WSContentSend_P(PSTR("<td style='width:%d%%'><button onclick='la(\"&lsc=%d\");'>%s</button></td>"),  // &lsc is related to WebGetArg("lsc", tmp, sizeof(tmp));
+        100 / cols,
+        idx -1,
+        (strlen(SettingsText(SET_BUTTON1 + idx))) ? SettingsText(SET_BUTTON1 + idx) : itoa(idx, number, 10));
+    }
+  }
+  WSContentSend_P(PSTR("</tr></table>"));
+}
+
+void LscMcWebGetArg(void) {
+  char tmp[8];                               // WebGetArg numbers only
+  WebGetArg(PSTR("lsc"), tmp, sizeof(tmp));  // 0 - 7 functions
+  if (strlen(tmp)) {
+    uint32_t function = atoi(tmp);
+    char command[20];
+    snprintf_P(command, sizeof(command), PSTR(D_CMND_DIMMER " %d"), (function * (100 / 8)) + ((100 / 8) / 2));
+    ExecuteWebCommand(command);
+  }
+}
+
+#endif  // USE_LSC_MCSL_GUI
+#endif  // USE_WEBSERVER
+
+
 /*********************************************************************************************\
  * Interface
 \*********************************************************************************************/
@@ -247,6 +305,16 @@ bool Xlgt07(uint8_t function)
     case FUNC_BUTTON_MULTI_PRESSED:
       result = LscMcMultiButtonPressed();
       break;
+#ifdef USE_WEBSERVER
+#ifdef USE_LSC_MCSL_GUI
+    case FUNC_WEB_ADD_MAIN_BUTTON:
+      LscMcAddFuctionButtons();
+      break;
+    case FUNC_WEB_GET_ARG:
+      LscMcWebGetArg();
+      break;
+#endif  // USE_LSC_MCSL_GUI
+#endif  // USE_WEBSERVER
     case FUNC_MODULE_INIT:
       LscMcModuleSelected();
       break;
diff --git a/tasmota/xsns_53_sml.ino b/tasmota/xsns_53_sml.ino
index d001af112..7a184a4bb 100755
--- a/tasmota/xsns_53_sml.ino
+++ b/tasmota/xsns_53_sml.ino
@@ -79,7 +79,7 @@
 #define DJ_COUNTER "Count"
 
 struct METER_DESC {
-  uint8_t srcpin;
+  int8_t srcpin;
   uint8_t type;
   uint16_t flag;
   int32_t params;
@@ -499,9 +499,7 @@ uint16_t meter_spos[MAX_METERS];
 #ifdef ESP8266
 TasmotaSerial *meter_ss[MAX_METERS];
 #endif  // ESP8266
-#ifdef ESP32
-HardwareSerial *meter_ss[MAX_METERS];
-#endif  // ESP32
+
 
 // serial buffers, may be made larger depending on telegram lenght
 #ifndef SML_BSIZ
@@ -592,6 +590,229 @@ double sml_median(struct SML_MEDIAN_FILTER* mf, double in) {
 }
 #endif
 
+
+// ESP32 software serial read only
+#ifdef ESP32
+#ifdef USE_ESP32_SW_SERIAL
+
+#ifndef ESP32_SWS_BUFFER_SIZE
+#define ESP32_SWS_BUFFER_SIZE 256
+#endif
+
+
+class SML_ESP32_SERIAL : public Stream {
+public:
+	SML_ESP32_SERIAL(uint32_t uart_index);
+  virtual ~SML_ESP32_SERIAL();
+  bool begin(uint32_t speed, uint32_t smode, int32_t recpin, int32_t trxpin);
+  int32_t peek(void);
+  int32_t read(void) override;
+  size_t write(uint8_t byte) override;
+  int32_t available(void) override;
+  void flush(void) override;
+  void setRxBufferSize(uint32_t size);
+  void updateBaudRate(uint32_t baud);
+  void rxRead(void);
+  using Print::write;
+private:
+  // Member variables
+  void setbaud(uint32_t speed);
+  uint32_t uart_index;
+  int8_t m_rx_pin;
+  int8_t m_tx_pin;
+  uint32_t cfgmode;
+  uint32_t ss_byte;
+  uint32_t ss_bstart;
+  uint32_t ss_index;
+  uint32_t m_bit_time;
+  uint32_t m_in_pos;
+  uint32_t m_out_pos;
+  uint16_t serial_buffer_size;
+  bool m_valid;
+  uint8_t *m_buffer;
+  HardwareSerial *hws;
+};
+
+
+void IRAM_ATTR sml_callRxRead(void *self) { ((SML_ESP32_SERIAL*)self)->rxRead(); };
+
+SML_ESP32_SERIAL::SML_ESP32_SERIAL(uint32_t index) {
+  uart_index = index;
+  m_valid = true;
+}
+
+SML_ESP32_SERIAL::~SML_ESP32_SERIAL(void) {
+  if (hws) {
+    hws->end();
+  } else {
+    detachInterrupt(m_rx_pin);
+    if (m_buffer) {
+      free(m_buffer);
+    }
+  }
+}
+
+void SML_ESP32_SERIAL::setbaud(uint32_t speed) {
+  m_bit_time = ESP.getCpuFreqMHz() * 1000000 / speed;
+}
+
+
+bool SML_ESP32_SERIAL::begin(uint32_t speed, uint32_t smode, int32_t recpin, int32_t trxpin) {
+  if (!m_valid) { return false; }
+
+  m_buffer = 0;
+  if (recpin < 0) {
+    setbaud(speed);
+    m_rx_pin = -recpin;
+    serial_buffer_size = ESP32_SWS_BUFFER_SIZE;
+    m_buffer = (uint8_t*)malloc(serial_buffer_size);
+    if (m_buffer == NULL) return false;
+    pinMode(m_rx_pin, INPUT);
+    attachInterruptArg(m_rx_pin, sml_callRxRead, this, CHANGE);
+    m_in_pos = m_out_pos = 0;
+    hws = nullptr;
+  } else {
+    cfgmode = smode;
+    m_rx_pin = recpin;
+    m_tx_pin = trxpin;
+    hws = new HardwareSerial(uart_index);
+    if (hws) {
+      hws->begin(speed, cfgmode, m_rx_pin, m_tx_pin);
+    }
+  }
+  return true;
+}
+
+void SML_ESP32_SERIAL::flush(void) {
+  if (hws) {
+    hws->flush();
+  } else {
+    m_in_pos = m_out_pos = 0;
+  }
+}
+
+int32_t SML_ESP32_SERIAL::peek(void) {
+  if (hws) {
+    return  hws->peek();
+  } else {
+    if (m_in_pos == m_out_pos) return -1;
+    return m_buffer[m_out_pos];
+  }
+}
+
+int32_t SML_ESP32_SERIAL::read(void) {
+  if (hws) {
+    return hws->read();
+  } else {
+    if (m_in_pos == m_out_pos) return -1;
+    uint32_t ch = m_buffer[m_out_pos];
+    m_out_pos = (m_out_pos +1) % serial_buffer_size;
+    return ch;
+  }
+}
+
+int32_t SML_ESP32_SERIAL::available(void) {
+  if (hws) {
+    return hws->available();
+  } else {
+    int avail = m_in_pos - m_out_pos;
+    if (avail < 0) avail += serial_buffer_size;
+    return avail;
+  }
+}
+
+size_t SML_ESP32_SERIAL::write(uint8_t byte) {
+  if (hws) {
+    return hws->write(byte);
+  }
+  return 0;
+}
+
+void SML_ESP32_SERIAL::setRxBufferSize(uint32_t size) {
+  if (hws) {
+    hws->setRxBufferSize(size);
+  } else {
+    if (m_buffer) {
+        free(m_buffer);
+    }
+    serial_buffer_size = size;
+    m_buffer = (uint8_t*)malloc(size);
+  }
+}
+void SML_ESP32_SERIAL::updateBaudRate(uint32_t baud) {
+  if (hws) {
+    hws->updateBaudRate(baud);
+  } else {
+    setbaud(baud);
+  }
+}
+
+// no wait mode only 8N1  (or 7X1, obis only, ignoring parity)
+void IRAM_ATTR SML_ESP32_SERIAL::rxRead(void) {
+  uint32_t diff;
+  uint32_t level;
+
+#define SML_LASTBIT 9
+
+  level = digitalRead(m_rx_pin);
+
+  if (!level && !ss_index) {
+    // start condition
+    ss_bstart = ESP.getCycleCount() - (m_bit_time / 4);
+    ss_byte = 0;
+    ss_index++;
+  } else {
+    // now any bit changes go here
+    // calc bit number
+    diff = (ESP.getCycleCount() - ss_bstart) / m_bit_time;
+
+    if (!level && diff > SML_LASTBIT) {
+      // start bit of next byte, store  and restart
+      // leave irq at change
+      for (uint32_t i = ss_index; i <= SML_LASTBIT; i++) {
+        ss_byte |= (1 << i);
+      }
+      uint32_t next = (m_in_pos + 1) % serial_buffer_size;
+      if (next != (uint32_t)m_out_pos) {
+        m_buffer[m_in_pos] = ss_byte >> 1;
+        m_in_pos = next;
+      }
+
+      ss_bstart = ESP.getCycleCount() - (m_bit_time / 4);
+      ss_byte = 0;
+      ss_index = 1;
+      return;
+    }
+    if (diff >= SML_LASTBIT) {
+      // bit zero was 0,
+      uint32_t next = (m_in_pos + 1) % serial_buffer_size;
+      if (next != (uint32_t)m_out_pos) {
+        m_buffer[m_in_pos] = ss_byte >> 1;
+        m_in_pos = next;
+      }
+      ss_byte = 0;
+      ss_index = 0;
+    } else {
+      // shift in
+      for (uint32_t i = ss_index; i < diff; i++) {
+        if (!level) ss_byte |= (1 << i);
+      }
+      ss_index = diff;
+    }
+  }
+}
+#endif // USE_ESP32_SW_SERIAL
+#endif // ESP32
+
+#ifdef ESP32
+#ifndef USE_ESP32_SW_SERIAL
+HardwareSerial *meter_ss[MAX_METERS];
+#else
+SML_ESP32_SERIAL *meter_ss[MAX_METERS];
+#endif
+#endif  // ESP32
+
+
 #ifdef ANALOG_OPTO_SENSOR
 // sensor over ADS1115 with i2c Bus
 uint8_t ads1115_up;
@@ -1398,12 +1619,12 @@ void sml_shift_in(uint32_t meters,uint32_t shard) {
 void SML_Poll(void) {
 uint32_t meters;
 
-    for (meters=0; meters<meters_used; meters++) {
-      if (meter_desc_p[meters].type!='c') {
+    for (meters = 0; meters < meters_used; meters++) {
+      if (meter_desc_p[meters].type != 'c') {
         // poll for serial input
         if (!meter_ss[meters]) continue;
         while (meter_ss[meters]->available()) {
-          sml_shift_in(meters,0);
+          sml_shift_in(meters, 0);
         }
       }
     }
@@ -2311,7 +2532,7 @@ void SML_Init(void) {
     uint8_t *tp = 0;
     uint16_t index = 0;
     uint8_t section = 0;
-    uint8_t srcpin = 0;
+    int8_t srcpin = 0;
     uint8_t dec_line = 0;
     char *lp = glob_script_mem.scriptptr;
     sml_send_blocks = 0;
@@ -2348,7 +2569,7 @@ void SML_Init(void) {
           }
           index--;
           srcpin  = strtol(lp,&lp,10);
-          if (Gpio_used(srcpin)) {
+          if (Gpio_used(abs(srcpin))) {
             AddLog(LOG_LEVEL_INFO, PSTR("gpio rx double define!"));
 dddef_exit:
             if (script_meter) free(script_meter);
@@ -2481,7 +2702,6 @@ dddef_exit:
           if (*lp == SCRIPT_EOL) lp--;
           goto next_line;
         }
-
 #ifdef SML_REPLACE_VARS
         char dstbuf[SML_SRCBSIZE*2];
         Replace_Cmd_Vars(lp, 1, dstbuf,sizeof(dstbuf));
@@ -2570,13 +2790,13 @@ init10:
   uint8_t cindex=0;
   // preloud counters
   for (byte i = 0; i < MAX_COUNTERS; i++) {
-      RtcSettings.pulse_counter[i]=Settings->pulse_counter[i];
+      RtcSettings.pulse_counter[i] = Settings->pulse_counter[i];
       sml_counters[i].sml_cnt_last_ts=millis();
   }
-  uint32_t uart_index=2;
-  for (uint8_t meters=0; meters<meters_used; meters++) {
-    if (meter_desc_p[meters].type=='c') {
-        if (meter_desc_p[meters].flag&2) {
+  uint32_t uart_index = 2;
+  for (uint8_t meters = 0; meters < meters_used; meters++) {
+    if (meter_desc_p[meters].type == 'c') {
+        if (meter_desc_p[meters].flag & 2) {
           // analog mode
 #ifdef ANALOG_OPTO_SENSOR
           ADS1115_init();
@@ -2613,13 +2833,24 @@ init10:
         meter_ss[meters] = new TasmotaSerial(meter_desc_p[meters].srcpin,meter_desc_p[meters].trxpin,1,0,TMSBSIZ);
 #endif  // ESP8266
 #ifdef ESP32
+        // use hardware serial
+#ifdef USE_ESP32_SW_SERIAL
+        meter_ss[meters] = new SML_ESP32_SERIAL(uart_index);
+        if (meter_desc_p[meters].srcpin >= 0) {
+          if (uart_index == 0) { ClaimSerial(); }
+          uart_index--;
+          if (uart_index < 0) uart_index = 0;
+        }
+#else
         meter_ss[meters] = new HardwareSerial(uart_index);
-        if (uart_index==0) { ClaimSerial(); }
+        if (uart_index == 0) { ClaimSerial(); }
         uart_index--;
-        if (uart_index<0) uart_index=0;
+        if (uart_index < 0) uart_index = 0;
         meter_ss[meters]->setRxBufferSize(TMSBSIZ);
+#endif // USE_ESP32_SW_SERIAL
+
 #endif  // ESP32
-#endif
+#endif // SPECIAL_SS
 
         SerialConfig smode = SERIAL_8N1;
 
@@ -2664,10 +2895,10 @@ init10:
 #endif  // ESP8266
 #ifdef ESP32
         meter_ss[meters]->begin(meter_desc_p[meters].params, smode, meter_desc_p[meters].srcpin, meter_desc_p[meters].trxpin);
+        //meter_ss[meters]->setRxBufferSize(TMSBSIZ);
 #endif  // ESP32
     }
   }
-
 }
 
 
@@ -2685,7 +2916,7 @@ uint32_t sml_getv(uint32_t sel) {
   return sel;
 }
 uint32_t SML_SetBaud(uint32_t meter, uint32_t br) {
-  if (meter<1 || meter>meters_used) return 0;
+  if (meter < 1 || meter > meters_used) return 0;
   meter--;
   if (!meter_ss[meter]) return 0;
 #ifdef ESP8266
@@ -3095,7 +3326,9 @@ bool Xsns53(byte function) {
       case FUNC_LOOP:
         SML_Counter_Poll();
         if (dump2log) Dump2log();
-        else SML_Poll();
+        else {
+          SML_Poll();
+        }
         break;
     //  case FUNC_EVERY_50_MSECOND:
     //    if (dump2log) Dump2log();
diff --git a/tasmota/xsns_90_hrg15.ino b/tasmota/xsns_90_hrg15.ino
index f7ba63721..46c17b28a 100644
--- a/tasmota/xsns_90_hrg15.ino
+++ b/tasmota/xsns_90_hrg15.ino
@@ -53,8 +53,7 @@ struct RG15 {
   float rate = 0.0f;
 } Rg15;
 
-void Rg15Init(void)
-{
+void Rg15Init(void) {
   Rg15.ready = 0;
   if (PinUsed(GPIO_HRG15_RX) && PinUsed(GPIO_HRG15_TX)) {
     HydreonSerial = new TasmotaSerial(Pin(GPIO_HRG15_RX), Pin(GPIO_HRG15_TX));
@@ -92,8 +91,7 @@ bool Rg15Poll(void) {
 
   while (HydreonSerial->available()) {
     Rg15ReadLine(rg15_buffer);
-    AddLog(LOG_LEVEL_DEBUG_MORE,PSTR("%s:" D_JSON_SERIALRECEIVED " = %s"),"HRG", rg15_buffer);
-
+    AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("HRG: Received '%s'"), rg15_buffer);
     Rg15Process(rg15_buffer);
   }
 
@@ -102,11 +100,11 @@ bool Rg15Poll(void) {
   return true;
 }
 
-bool Rg15ReadLine(char* buffer)
-{
+bool Rg15ReadLine(char* buffer) {
   char c;
   uint8_t i = 0;
   uint32_t cmillis = millis();
+  buffer[0] = '\0';
 
   while (1) {
       if (HydreonSerial->available()) {
@@ -121,8 +119,7 @@ bool Rg15ReadLine(char* buffer)
         return false;
       }
   }
-
-  buffer[i-2] = '\0';
+  if (i > 1) { buffer[i-2] = '\0'; }
   return true;
 }
 
@@ -163,14 +160,14 @@ bool Rg15Command(void) {
     HydreonSerial->flush();
 
     if (send[0] == 'k' || send[0] == 'K' || send[0] == 'o' || send[0] == 'O') {
-        ResponseCmndDone();
-        return serviced;
+      ResponseCmndDone();
+      return serviced;
     }
 
     char rg15_buffer[255];
     if (Rg15ReadLine(rg15_buffer)) {
-        Response_P(PSTR("{\"" D_JSON_SERIALRECEIVED "\":%s\"}"), rg15_buffer);
-        Rg15Process(rg15_buffer);
+      Response_P(PSTR("{\"" D_JSON_SERIALRECEIVED "\":\"%s\"}"), rg15_buffer);
+      Rg15Process(rg15_buffer);
     }
   }
 
@@ -184,7 +181,7 @@ void Rg15Show(bool json)
     }
 
     if (json) {
-      ResponseAppend_P(PSTR(",\"" RG15_NAME "\":{\"" D_JSON_ACTIVE "\":%2_f, \"" D_JSON_EVENT "\":%2_f, \"" D_JSON_TOTAL "\":%2_f, \"" D_JSON_FLOWRATE "\":%2_f}"), &Rg15.acc, &Rg15.event, &Rg15.total, &Rg15.rate);
+      ResponseAppend_P(PSTR(",\"" RG15_NAME "\":{\"" D_JSON_ACTIVE "\":%2_f,\"" D_JSON_EVENT "\":%2_f,\"" D_JSON_TOTAL "\":%2_f,\"" D_JSON_FLOWRATE "\":%2_f}"), &Rg15.acc, &Rg15.event, &Rg15.total, &Rg15.rate);
 #ifdef USE_WEBSERVER
     } else {
       WSContentSend_PD(HTTP_RG15, &Rg15.acc, &Rg15.event, &Rg15.total, &Rg15.rate);